diff --git a/resources/web/homepage/js/home.js b/resources/web/homepage/js/home.js
index 7be05a331..8547954df 100644
--- a/resources/web/homepage/js/home.js
+++ b/resources/web/homepage/js/home.js
@@ -6,7 +6,6 @@ function OnInit()
//-----Test-----
//Set_RecentFile_MouseRightBtn_Event();
-
//-----Official-----
TranslatePage();
@@ -25,7 +24,7 @@ var MousePosY=0;
function Set_RecentFile_MouseRightBtn_Event()
{
- $("#FileList .FileItem").mousedown(
+ $(".FileItem").mousedown(
function(e)
{
//FilePath
@@ -83,7 +82,6 @@ function Set_RecentFile_MouseRightBtn_Event()
function HandleStudio( pVal )
{
let strCmd = pVal['command'];
- //alert(strCmd);
if(strCmd=='get_recent_projects')
{
@@ -123,6 +121,7 @@ function HandleStudio( pVal )
}
else if( strCmd=="modelmall_model_advise_get")
{
+ //alert('hot');
ShowStaffPick( pVal['hits'] );
}
}
@@ -422,6 +421,8 @@ function InitStaffPick()
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev',
},
+ slidesPerView : 'auto',
+ slidesPerGroup : 3
// autoplay: {
// delay: 3000,
// stopOnLastSlide: false,
@@ -431,10 +432,10 @@ function InitStaffPick()
// pagination: {
// el: '.swiper-pagination',
// },
- scrollbar: {
- el: '.swiper-scrollbar',
- draggable: true
- }
+// scrollbar: {
+// el: '.swiper-scrollbar',
+// draggable: true
+// }
});
}
@@ -444,7 +445,9 @@ function SendMsg_GetStaffPick()
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="modelmall_model_advise_get";
- SendWXMessage( JSON.stringify(tSend) );
+ SendWXMessage( JSON.stringify(tSend) );
+
+ setTimeout("SendMsg_GetStaffPick()",3600*1000*1);
}
function ShowStaffPick( ModelList )
@@ -467,9 +470,13 @@ function ShowStaffPick( ModelList )
let ModelName=OnePickModel['design']['title'];
let ModelCover=OnePickModel['design']['cover'];
+ let DesignerName=OnePickModel['design']['designCreator']['name'];
+ let DesignerAvatar=OnePickModel['design']['designCreator']['avatar'];
+
strPickHtml+='
'+
+ '
'+DesignerName+''+
'
'+
- '
'+ModelName+'
'+
+ '
'+ModelName+'
'+
'
';
}
@@ -480,6 +487,7 @@ function ShowStaffPick( ModelList )
function OpenOneStaffPickModel( ModelID )
{
+ //alert(ModelID);
var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="modelmall_model_open";
@@ -492,4 +500,3 @@ function OpenOneStaffPickModel( ModelID )
//---------------Global-----------------
window.postMessage = HandleStudio;
-
diff --git a/resources/web/include/globalapi.js b/resources/web/include/globalapi.js
index 706d12266..0553483e1 100644
--- a/resources/web/include/globalapi.js
+++ b/resources/web/include/globalapi.js
@@ -244,6 +244,16 @@ function IsJson( strJson )
return tJson;
}
+function DecodeJsonObject( pJson )
+{
+ let tmpJson=JSON.stringify(pJson);
+ tmpJson=decodeURIComponent(tmpJson);
+
+ pJson=JSON.parse(tmpJson);
+
+ return pJson;
+}
+
/*-----------------------Ajax Function--------------------*/
/*对JQuery的Ajax函数的封装，只支持异步
参数说明：
@@ -344,6 +354,16 @@ function SendWXDebugInfo( strMsg )
SendWXMessage( JSON.stringify(tSend) );
}
+function OpenUrlInLocalBrowser( strUrl )
+{
+ var tSend={};
+ tSend['sequence_id']=Math.round(new Date() / 1000);
+ tSend['command']="common_openurl";
+ tSend['url']=strUrl;
+
+ SendWXMessage( JSON.stringify(tSend) );
+}
+
/*------CSS Link Control----*/
function RemoveCssLink( LinkPath )
diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index 10625ff1e..aacffbbbd 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -436,7 +436,7 @@ void WebViewPanel::SendDesignStaffpick(NetworkAgent *agent)
return;
}
CallAfter([this, body] {
- auto body2 = body;
+ auto body2 = from_u8(body);
body2.insert(1, "\"command\": \"modelmall_model_advise_get\", ");
RunScript(wxString::Format("window.postMessage(%s)", body2));
});
-
+ 
-