Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents a0ad0ac0 311cbe4d
Showing 4 changed files with 34 additions and 6 deletions
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
packageA/pages/serviceCard_pd/team_more/team_more.js
packageF/pages/team/team_more/team_more.js
pages/goods/goodsInfo/goodsInfo.js
@@ -3169,8 +3169,12 @@ Page({
                             }
                         }
  
-                        //-------查看有多少人在开这个团-------
-                        th.get_team_group(prom_id);
+                        //-- 如果不是限定连接的时候 --
+                        if(!t.data.data.is_share){
+                            //-------查看有多少人在开这个团-------
+                            th.get_team_group(prom_id);
+                        }
+
                     }
                 });
             }
@@ -32,8 +32,16 @@ Page({
     getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, {
       data: {}
     }).then(res => {
-      if (res.data.code == 0) {
+      if (res.data.code == 0 && res.data.data) {
         teamlist = res.data.data;
+
+        //是不是限定连接了
+        if(teamlist.is_share){
+          getApp().confirmBox('该活动已经限定链接参团',()=>{
+            getApp().goto('/pages/index/index/index');
+          })
+          return false;
+        }
         var jt_team_num=teamlist.ct_rylist;
         if (jt_team_num != "" && jt_team_num != null && jt_team_num!= undefined) {
           var team_num_arr = JSON.parse(jt_team_num);
@@ -33,8 +33,19 @@ Page({
     getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, {
       data: {}
     }).then(res => {
-      if (res.data.code == 0) {
+      if (res.data.code == 0 && res.data.data) {
         teamlist = res.data.data;
+
+        //是不是限定连接了
+        if(teamlist.is_share){
+
+            getApp().confirmBox('该活动已经限定链接参团',()=>{
+                getApp().goto('/pages/index/index/index');
+            })
+
+            return false;
+        }
+
         var jt_team_num=teamlist.ct_rylist;
         if (jt_team_num != "" && jt_team_num != null && jt_team_num!= undefined) {
           var team_num_arr = JSON.parse(jt_team_num);
@@ -5231,8 +5231,13 @@ Page({
                                     ee.countDown(endTime2);
                                   }
                                 }
-                                //-------查看有多少人在开这个团-------
-                                th.get_team_group(prom_id);
+
+                                //如果不是限定连接的情况下
+                                if(!t.data.data.is_share){
+                                  //-------查看有多少人在开这个团-------
+                                  th.get_team_group(prom_id);
+                                }
+
                               }
                             });
                         }