服务卡项的拼团优化

yvan.ni
1 parent 56108b29
Showing 3 changed files with 68 additions and 35 deletions
packageA/pages/serviceCard_pd/team_success/team_success.wxml
pages/index/index/index.js
pages/team/team_ping/team_ping.js
@@ -176,7 +176,7 @@
         <!--会员团 商家团-->
         <button class="bodybutton" style='background-color:#fab55a; color:#fff' bindtap='clickShare'
-                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团{{isLogin}}</button>
+                wx:if="{{(teamlist.kttype==2||teamlist.kttype==1)&&p_status==1}}">邀请好友参团</button>
  <view class="xc-home-page-frame">
   <button class="xc-home-page" bindtap='gohome'> 返回首页</button>
@@ -316,7 +316,7 @@ Page({
 		}
 		//--正再拼团中的处理--
-		var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+		var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
 		await getApp().request.promiseGet(url, {}).then(res => {
 			if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
 				th.data.pt_timer_arr = res.data.data.pageData;
@@ -92,8 +92,7 @@ Page({
     //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0
-
-    await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, {
+    await getApp().request.promiseGet("/api/weshop/order/pageTuanNew?"+where, {
       data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
     }).then(res => {
        order = res.data.data.pageData;
@@ -103,44 +102,78 @@ Page({
     wx.showLoading({ title: "加载中"});
     for (i = 0; i < order.length; i++) {
-      //获取订单从表信息
-      await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
-        data: { store_id: os.stoid, order_id: order[i].order_id }
-      }).then(res => {
-        order_goods = res.data.data.pageData;
-        order[i].order_goods = order_goods;
-        order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img; 
-      })
-
-          
-     //获取订单表信息根据上面查询的订单号order[i].pt_listno
-      await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
-        data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
-      }).then(res => {
-         //console.log("ordertx");
-         ordertx = res.data.data.pageData;
-         //console.log(ordertx);
-         order[i].tx=ordertx;
-      })
       //获取teamgroup中的值
       await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
         data: { store_id: os.stoid, listno: order[i].pt_listno,pageSize:1,page:1}
       }).then(res => {
-         team_g = res.data.data.pageData[0]
-      
+        team_g = res.data.data.pageData[0]
       })
-      //获取预存使用金额
-      await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
-      }).then(res => {
-        if (res.data.code == 0 && res.data.data) {
-          // data[ind].use_commission = res.data.data.use_commission;
-          order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
-          order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
-        }
-      })
-     
+
+      switch (team_g.goods_type){
+          case 0:
+            //获取订单从表信息
+            await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", {
+              data: { store_id: os.stoid, order_id: order[i].order_id }
+            }).then(res => {
+              order_goods = res.data.data.pageData;
+              order[i].order_goods = order_goods;
+              order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img;
+            })
+
+            //获取订单表信息根据上面查询的订单号order[i].pt_listno
+            await getApp().request.promiseGet("/api/weshop/order/pagePtList", {
+              data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1}
+            }).then(res => {
+              //console.log("ordertx");
+              ordertx = res.data.data.pageData;
+              //console.log(ordertx);
+              order[i].tx=ordertx;
+            })
+            //获取预存使用金额
+            await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
+            }).then(res => {
+              if (res.data.code == 0 && res.data.data) {
+                // data[ind].use_commission = res.data.data.use_commission;
+                order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
+                order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+              }
+            })
+            break;
+
+        case 1:
+
+            //获取order信息根据订单编号order_sn
+            await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", {
+              data: { store_id: os.stoid, order_id: order.order_id,}
+            }).then(res => {
+              order_goods = res.data.data.pageData[0];
+              order[i].order_goods = order_goods;
+              order[i].gimage = ee.data.imageurl + order_goods[0]?.original_img;
+            })
+
+            //-- 获取商品信息 --
+            await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + os.stoid + "/" + goods_id, {
+            }).then(res => {
+               //-- 商品地址 --
+               order[i].gimage = ee.data.imageurl + res.data.data.original_img
+            })
+
+            //-- 多少人参团头像 --
+            await getApp().request.promiseGet("/api/weshop/rechargeServicelist/pagePtList", {
+              data: {
+                 store_id: o.stoid,
+                 pt_listno: teamgroup.listno,
+              }
+            }).then(res => {
+               ordertx = res.data.data.pageData;
+               order[i].tx=ordertx;
+            })
+
+           break;
+      }
+
       if (order[i].is_zsorder== 4) {
         var num = 0;