Merge branch 'feature/group-buy' of git.yoho.cn:fe/yohobuywap-node into feature/group-buy

@@ -58,9 +58,6 @@ class GroupApi extends global.yoho.BaseModel {
             result = result.data;
 
             return result;
-        }).catch(error => {
-            console.log(error);
-            return error;
         });
     }
     _getShareInfo(params) {
@@ -204,8 +201,6 @@ class GroupApi extends global.yoho.BaseModel {
         }).then(result => {
             result = result.data;
             return result;
-        }).catch(error => {
-            console.log(error);
         });
     }
 
@@ -246,8 +241,6 @@ class GroupApi extends global.yoho.BaseModel {
         }).then(result => {
             result = result.data;
             return result;
-        }).catch(error => {
-            console.log(error);
         });
     }
 
@@ -264,8 +257,6 @@ class GroupApi extends global.yoho.BaseModel {
         }).then(result => {
             result = result.data;
             return result;
-        }).catch(error => {
-            console.log(error);
         });
     }
 
@@ -307,9 +298,6 @@ class GroupApi extends global.yoho.BaseModel {
         })
             .then(data => {
                 return data.data;
-            })
-            .catch(function(error) {
-                console.log(error);
             });
     }
 
@@ -326,8 +314,6 @@ class GroupApi extends global.yoho.BaseModel {
         })
             .then(function(data) {
                 return data.data;
-            }).catch(function(error) {
-                console.log(error);
             });
     }
 
@@ -349,9 +335,6 @@ class GroupApi extends global.yoho.BaseModel {
                 }];
 
                 return free.concat(data.data);
-            })
-            .catch(function(error) {
-                console.log(error);
             });
     }
 }

@@ -226,7 +226,6 @@ class GroupService extends global.yoho.BaseModel {
             ...params
         };
 
-
         try {
             const result = await this.api._getGroupList(newParams);
             let finalResult = {};

@@ -222,6 +222,5 @@
         {{#if showPannel}}
             <input type="hidden" id="showPannel" value="1">
         {{/if}}
-        {{> common/suspend-home}}
     </div>
 {{/ result}}

@@ -314,7 +314,7 @@ class Detail extends Page {
         let chosePanel = require('js/activity/group/chose-panel');
 
         if (!user.uid) {
-            yoho.goLogin(location.href);
+            return yoho.goLogin(location.href);
         }
         if (!this.pickData.goodsList) {
             return;

@@ -54,7 +54,6 @@ class ProductList extends Page {
         let productSkn = $this.data('product-skn');
         let activityId = $this.data('activity-id');
 
-        console.log(productSkn, activityId);
         window.location.href = `/activity/group/detail?activityId=${activityId}&productSkn=${productSkn}`;
     }
     shareInfo() {

@@ -101,6 +101,7 @@ class GroupProgress extends Page {
         sharePlugin({
             title: `【还差${_this.data.lackNum}人】${_this.data.groupPrice}金额  拼${_this.data.productName}`,
             imgUrl: _this.data.shareImgUrl,
+            desc: _this.data.productName,
             link: link
         });
 

@@ -144,8 +144,6 @@ class Group extends Page {
         let productSkn = $this.data('product-skn');
         let activityId = $this.data('activity-id');
 
-        console.log(productSkn, activityId);
-
         window.location.href = `/activity/group/detail?activityId=${activityId}&productSkn=${productSkn}`;
     }
 
@@ -333,7 +331,6 @@ class Group extends Page {
         };
         let catchKey = '/activity/group/search?' + $.param(searchParams);
 
-        console.log(searchParams);
         if (nav.end) {
             // 不需要重新加载并且数据请求结束
             return false;
@@ -420,7 +417,6 @@ class Group extends Page {
         let filterPage = this.filterPage;
 
         delete requestParams.$pre;
-        console.log('initParam', requestParams);
         $.ajax({
             type: 'GET',
             url: '/activity/group/filter',
@@ -432,7 +428,6 @@ class Group extends Page {
                 // 初始化filter&注册filter回调
                 filter.initFilter({
                     fCbFn: (params) => {
-                        console.log(params);
 
                         // 存储筛选页数据
                         filterPage[selectedChannel][params.type] = !params.id ? '' : params.id;

 
 function h5Path(activityId, productSkn, groupNo) {
-    return location.protocol + `//m.yohobuy.com/activity/group/detail?
-    activtiyId=${activityId}&productSkn=${productSkn}&groupNo=${groupNo || ''}`;
+    return location.protocol + '//m.yohobuy.com/activity/group/detail?activityId=' +
+    `${activityId}&productSkn=${productSkn}&groupNo=${groupNo || ''}`;
 }
 
 
@@ -21,7 +21,7 @@ function shareData({name, imgUrl, activityId, productSkn, groupNo}) {
             imgUrl: shareImg,
             link: link,
             desc: name,
-            copyDeac: `【包邮】${name} ${link} （分享自@Yoho!Buy有货APP）`
+            copyDeac: `【包邮】${name}>> ${link} （分享自@Yoho!Buy有货APP）`
         }
     };
 }

@@ -25,7 +25,7 @@ let shareData = {
 const getShareData = function(shareType) {
     let data = {
         success: function() {
-            window._yas.sendCustomInfo && window._yas.sendCustomInfo({
+            window._yas && window._yas.sendCustomInfo && window._yas.sendCustomInfo({
                 op: 'YB_SHARE_SUCCESS_L',
                 param: JSON.stringify({
                     SHARE_TYPE: shareType,

@@ -366,22 +366,6 @@
         }
     }
 
-    .dialog-wrapper .dialog-box.group-guide-mask {
-        width: 284px;
-        height: 278px;
-        background: url("img/activity/group/share-tip.png");
-        background-size: 100% 100%;
-        margin: 0 !important;
-        border: 0;
-        right: 92px;
-        top: 28px !important;
-        left: auto;
-
-        > * {
-            display: none !important;
-        }
-    }
-
     .chose-panel {
         position: fixed;
         top: 0;
@@ -659,3 +643,19 @@
         }
     }
 }
+
+.dialog-wrapper .dialog-box.group-guide-mask {
+    width: 284px;
+    height: 278px;
+    background: url("img/activity/group/share-tip.png");
+    background-size: 100% 100%;
+    margin: 0 !important;
+    border: 0;
+    right: 92px;
+    top: 28px !important;
+    left: auto;
+
+    > * {
+        display: none !important;
+    }
+}