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

taiyuan
2 parents 9e1c897a 870c0199
Showing 2 changed files with 28 additions and 7 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_more/team_more.js
@@ -501,6 +501,11 @@ Page({
         }, 500)
       },700)
     });	 
+  
+    //更新点击量
+	getApp().request.put("/api/weshop/goods/updateClick",{
+		data:{store_id:os.stoid,goods_id:gid}
+	})
   },
@@ -3091,16 +3096,23 @@ Page({
         grounp_tatal = 0;
     //如果活动是开团不是商家团
     if (this.data.prom_act.kttype > 1) {
-      //获取活动从表信息team_id
-      await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
-        data: {
+		
+	  var req_data={
           store_id: os.stoid,
           pageSize: 3,
           page: 1,
           state: 2,
           team_id: prom_id,
           ordernum:1
-        }
+        };
+		
+		if(this.data.prom_act.kttype==3 && this.data.prom_act.max_ct_num ){
+			req_data.max_num=this.data.prom_act.max_ct_num;
+		}
+				
+      //获取活动从表信息team_id
+      await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
+        data: req_data
       }).then(res => {
         teamgroup = res.data.data.pageData;
         grounp_tatal = res.data.data.total;
@@ -58,11 +58,20 @@ Page({
       user = null,
       ee = this, th=ee,
       pt_status = 1;//已支付
-    
+	 	  
+	  var req_data={
+		 store_id: os.stoid, pageSize:6,page:ee.data.currentPage,
+		 state: 2, team_id: team_id,ordernum:1
+	  }
+	  
+	  if(this.data.pt_act.kttype==3 && this.data.pt_act.max_num){
+		 req_data.max_num=this.data.pt_act.max_num; 
+	  }
+	  
+
     //获取活动从表信息team_id
     await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
-      data: { store_id: os.stoid, pageSize:6,page:ee.data.currentPage,
-      state: 2, team_id: team_id,ordernum:1 }
+      data: req_data
     }).then(res => {
       teamgroup = res.data.data.pageData;
       console.log(teamgroup);