From efe98ac95116dc93c96ea9afd27c996b74dc5f51 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 22 May 2023 15:38:57 +0800
Subject: [PATCH] 商品的会员团开团的显示

---
 pages/goods/goodsInfo/goodsInfo.js   | 57 ++++++++++++++++++++++++++++++++++++---------------------
 pages/goods/goodsInfo/goodsInfo.wxml |  5 ++++-
 pages/team/team_more/team_more.js    | 33 ++++++++++++++++++++++-----------
 pages/team/team_more/team_more.wxml  |  7 ++++---
 4 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b148c9b..abe1d5f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4678,12 +4678,14 @@ Page({
 
   //--获取有多少人在开团--
   async get_team_group(prom_id) {
-    var teamgroup = [],
+    var teamgroup_arr = [],
       th = this,
       grounp_tatal = 0;
     //如果活动是开团不是商家团
     if (this.data.prom_act.kttype > 1) {
 
+      var teamgroup=null;
+
       var req_data = {
         store_id: os.stoid,
         pageSize: 3,
@@ -4701,30 +4703,43 @@ Page({
       await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
         data: req_data
       }).then(res => {
-        teamgroup = res.data.data.pageData;
-        grounp_tatal = res.data.data.total;
+        if(ut.ajax_ok(res)){
+          teamgroup = res.data.data.pageData;
+          grounp_tatal = res.data.data.total;
+        }
+
       })
-      //获取订单的总数这个接口不能用
-      for (i = 0; i < teamgroup.length; i++) {
-        await getApp().request.promiseGet("/api/weshop/order/page", {
-          data: {
-            store_id: os.stoid,
-            pt_status: 1,
-            pt_listno: teamgroup[i].listno
-          }
-        }).then(res => {
-          var order = res.data.data.pageData;
-          teamgroup[i].open_num = order.length;
-        })
-        await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => {
-          var user = res.data.data;
-          teamgroup[i].user = user;
-        })
+      if(teamgroup){
+        //获取订单的总数这个接口不能用
+        for (i = 0; i < teamgroup.length; i++) {
+          await getApp().request.promiseGet("/api/weshop/order/page", {
+            data: {
+              store_id: os.stoid,
+              pt_status: 1,
+              pt_listno: teamgroup[i].listno
+            }
+          }).then(res => {
+            if(ut.ajax_ok(res)){
+              var order = res.data.data.pageData;
+              teamgroup[i].open_num = order.length;
+            }
+          })
+
+          if(!teamgroup[i].open_num) continue;
+
+          await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => {
+            var user = res.data.data;
+            teamgroup[i].user = user;
+          })
+          teamgroup_arr.push(teamgroup[i]);
+
+        }
       }
 
-      if (teamgroup.length > 0) {
+
+      if (teamgroup_arr.length > 0) {
         th.setData({
-          teamgroup: teamgroup,
+          teamgroup: teamgroup_arr,
           grounp_tatal: grounp_tatal
         });
         th.countDown2();
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index d327e41..09923ec 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -218,7 +218,9 @@
                 </view>
               </view>
             </view>
-            <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup">
+
+            <block wx:for="{{teamgroup}}" wx:for-index="t_ind">
+              <view class='group' wx:if="{{item.open_num>0}}" >
               <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}" data-goodsid="{{data.goods_id}}">
                 <!-- <view class="flex ai_c"> -->
                 <!-- //选项框头像 -->
@@ -245,6 +247,7 @@
                 <!-- <view class="clear"></view> -->
               </view>
             </view>
+            </block>
           </view>
 
 
diff --git a/pages/team/team_more/team_more.js b/pages/team/team_more/team_more.js
index aca7bc4..38d8119 100644
--- a/pages/team/team_more/team_more.js
+++ b/pages/team/team_more/team_more.js
@@ -54,6 +54,7 @@ Page({
   //加载更多的函数
   async init(team_id) {
          
+     var teamgroup_arr = [];//活動从表
      var teamgroup = null,//活動从表
       user = null,
       ee = this, th=ee,
@@ -73,9 +74,12 @@ Page({
     await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
       data: req_data
     }).then(res => {
-      teamgroup = res.data.data.pageData;
-      console.log(teamgroup);
-      ee.data.currentPage++;
+      if(ut.ajax_ok(res)){
+        teamgroup = res.data.data.pageData;
+        console.log(teamgroup);
+        ee.data.currentPage++;
+      }
+
     })
 
     //获取订单的总数这个接口不能用
@@ -83,23 +87,30 @@ Page({
       await getApp().request.promiseGet("/api/weshop/order/page", {
         data: { store_id: os.stoid, pt_status: 1, pt_listno: teamgroup[i].listno }
       }).then(res => {
-        var order = res.data.data.pageData;
-        teamgroup[i].open_num = order.length;
+        if(ut.ajax_ok(res)){
+          var order = res.data.data.pageData;
+          teamgroup[i].open_num = order.length;
+        }
       })
 
+      if(!teamgroup[i].open_num) continue;
+
       await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {
       }).then(res => {
         var user = res.data.data;
         teamgroup[i].user = user;
       })
+
+      teamgroup_arr.push(teamgroup[i]);
     }
-    //设置值
-    for(var ii=0;ii<teamgroup.length;ii++){
-      th.data.requestData.push(teamgroup[ii]);
+    // //设置值
+    // for(var ii=0;ii<teamgroup.length;ii++){
+    //   th.data.requestData.push(teamgroup[ii]);
+    // }
+    if(teamgroup_arr.length){
+      th.setData({ teamgroup: teamgroup_arr});
+      ee.countDown2();
     }
-    th.setData({ teamgroup: th.data.requestData});
-    ee.countDown2();
-
   },
    //滚动到底部
   onReachBottom: function () {
diff --git a/pages/team/team_more/team_more.wxml b/pages/team/team_more/team_more.wxml
index c2a0582..45f8693 100644
--- a/pages/team/team_more/team_more.wxml
+++ b/pages/team/team_more/team_more.wxml
@@ -1,6 +1,6 @@
 <!--//选项框-->
-
-<view class='group' wx:for="{{teamgroup}}">
+<block  wx:for="{{teamgroup}}">
+<view class='group' wx:if="{{item.open_num>0}}">
   <view class='group-list' bindtap="go_team_show" data-tid="{{item.id}}" data-team_id="{{item.team_id}}" >
     <!--//选项框头像-->
     <view class='gtou' >
@@ -32,4 +32,5 @@
     </view>
     <view class="clear"></view>
   </view>
-</view>
\ No newline at end of file
+</view>
+</block>
\ No newline at end of file
--
libgit2 0.21.4