Merge pull request '优化' (#644) from feature/testing_apply_top_promote into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/644

Application/Home/View/default/Home/landingPage.html

@@ -10,7 +10,7 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
   <script src="__JS__/jquery-1.11.3.min.js"></script>
-  <script type="text/javascript" src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+  <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <script type="text/javascript" src="__JS__/getRem.js"></script>
   <script type="text/javascript" src="__JS__/swiper.min.js"></script>
   <script type="text/javascript" src="__JS__/ladingpage.js"></script>
@@ -1534,7 +1534,7 @@ function getCurUserId() {
           timestamp: response.data.time,
           nonceStr: response.data.randStr,
           signature: response.data.sign,
-          jsApiList: ['onMenuShareAppMessage', 'onMenuShareTimeline', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone']
+          jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo']
         })
         var title = $('[name=title]').val();
         var description = $('[name=desc]').val();
@@ -1546,38 +1546,38 @@ function getCurUserId() {
 
   function wxReady(title, description, img) {
     wx.ready(function () {
-      wx.onMenuShareAppMessage({
+      wx.updateAppMessageShareData({
         title: title,
         desc: description,
         link: window.location.href,
         imgUrl: img,
-        type: '',
+        success: function () {
-        dataUrl: ''
+        }
-      });
-      wx.onMenuShareTimeline({
-        title: title,
-        link: window.location.href,
-        imgUrl: img
       });
-      wx.onMenuShareQQ({
+      wx.updateTimelineShareData({
         title: title,
-        desc: description,
         link: window.location.href,
-        imgUrl: img
+        imgUrl: img,
+        success: function () {
+          // 设置成功
+        }
       });
       wx.onMenuShareWeibo({
         title: title,
         desc: description,
         link: window.location.href,
-        imgUrl: img
+        imgUrl: img,
-      });
+        success: function () {
-      wx.onMenuShareQZone({
+        // 用户确认分享后执行的回调函数
-        title: title,
+        },
-        desc: description,
+        cancel: function () {
-        link: window.location.href,
+        // 用户取消分享后执行的回调函数
-        imgUrl: img
+        }
       });
     });
+    wx.error(function(res){
+      // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+    });
   }
 </script>
 <script type="text/javascript" src="__STATIC__/clipboard-1.6.1.min.js"></script>

Application/Home/View/default/Home/landingPage2.html

@@ -8,7 +8,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
   <script type="text/javascript" src="__JS__/jquery-1.11.1.min.js"></script>
-  <script type="text/javascript" src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+  <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <script type="text/javascript" src="__JS__/getRem.js"></script>
   <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
   <title>{$game['relation_game_name']}</title>
@@ -213,7 +213,7 @@
           timestamp: response.data.time,
           nonceStr: response.data.randStr,
           signature: response.data.sign,
-          jsApiList: ['onMenuShareAppMessage', 'onMenuShareTimeline', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone']
+          jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo']
         })
         var title = $('[name=title]').val();
         var description = $('[name=desc]').val();
@@ -225,38 +225,38 @@
 
   function wxReady(title, description, img) {
     wx.ready(function () {
-      wx.onMenuShareAppMessage({
+      wx.updateAppMessageShareData({
         title: title,
         desc: description,
         link: window.location.href,
         imgUrl: img,
-        type: '',
+        success: function () {
-        dataUrl: ''
+        }
       });
-      wx.onMenuShareTimeline({
+      wx.updateTimelineShareData({
         title: title,
         link: window.location.href,
-        imgUrl: img
+        imgUrl: img,
-      });
+        success: function () {
-      wx.onMenuShareQQ({
+          // 设置成功
-        title: title,
+        }
-        desc: description,
-        link: window.location.href,
-        imgUrl: img
       });
       wx.onMenuShareWeibo({
         title: title,
         desc: description,
         link: window.location.href,
-        imgUrl: img
+        imgUrl: img,
-      });
+        success: function () {
-      wx.onMenuShareQZone({
+        // 用户确认分享后执行的回调函数
-        title: title,
+        },
-        desc: description,
+        cancel: function () {
-        link: window.location.href,
+        // 用户取消分享后执行的回调函数
-        imgUrl: img
+        }
       });
     });
+    wx.error(function(res){
+      // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+    });
   }
 </script>
 </body>