From 9d2f981ee2c1fcd5287d01d8549a193afcb509de Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 6 Jun 2023 17:12:22 +0800
Subject: [PATCH] 1、拼团成功后跳转 2、参看拼团中的列表的优化

---
 app.json                                               |  10 ++++++----
 packageA/pages/serviceCard_pd/team_more/team_more.js   | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 packageA/pages/serviceCard_pd/team_more/team_more.json |   3 +++
 packageA/pages/serviceCard_pd/team_more/team_more.wxml |  36 ++++++++++++++++++++++++++++++++++++
 packageA/pages/serviceCard_pd/team_more/team_more.wxss |  91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/cart/cart_wk/cart_wk.js                          |   1 +
 pages/user/order_list/order_list.wxml                  |  12 +++++++++---
 7 files changed, 361 insertions(+), 7 deletions(-)
 create mode 100644 packageA/pages/serviceCard_pd/team_more/team_more.js
 create mode 100644 packageA/pages/serviceCard_pd/team_more/team_more.json
 create mode 100644 packageA/pages/serviceCard_pd/team_more/team_more.wxml
 create mode 100644 packageA/pages/serviceCard_pd/team_more/team_more.wxss

diff --git a/app.json b/app.json
index ef5cf8f..97f0284 100644
--- a/app.json
+++ b/app.json
@@ -116,10 +116,12 @@
                 "pages/cart2_ser/cart2_ser",
                 "pages/libao_payment/payment",
                 "pages/details_serviceCard/details_serviceCard",
-								"pages/serviceCard_pd/goodsInfo/goodsInfo",
-								"pages/serviceCard_pd/team_show/team_show",
-								"pages/serviceCard_pd/cart/cart",
-               "pages/serviceCard_pd/team_success/team_success"
+                "pages/serviceCard_pd/goodsInfo/goodsInfo",
+                "pages/serviceCard_pd/team_show/team_show",
+                "pages/serviceCard_pd/cart/cart",
+                "pages/serviceCard_pd/team_success/team_success",
+                "pages/serviceCard_pd/cart_wk/cart_wk",
+                "pages/serviceCard_pd/team_more/team_more"
             ]
         },
         {
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.js b/packageA/pages/serviceCard_pd/team_more/team_more.js
new file mode 100644
index 0000000..2f46371
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.js
@@ -0,0 +1,215 @@
+var t = getApp(), a = t.request, o = t.globalData.setting, os = o,
+  i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js");
+var regeneratorRuntime = require('../../../../utils/runtime.js');
+
+
+Page({
+  data: {
+    ylburl: "https://mshopimg.yolipai.net/",//有礼派图片地址
+    pt_act: null,//拼单数据
+    baseUrl: "/api/weshop/teamgroup/page?1=1",
+    resourceUrl: t.globalData.setting.resourceUrl,
+    currentPage: 1,
+    requestData: null,
+    store_id: 1,
+    team_id:0,
+    requestUrl: "",
+    teamgroup:null,
+  },
+
+  onLoad: function (t) {
+
+    wx.setNavigationBarTitle({ title: "开团列表", })
+
+    var th=this;
+    //初始化加載更多
+    th.data.requestData=new Array();  
+    var team_id=t.team_id;
+    var teamlist=null;
+    th.data.team_id = team_id;
+
+   //获取活动表的ct_num
+    getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + team_id, {
+      data: {}
+    }).then(res => {
+      if (res.data.code == 0) {
+        teamlist = res.data.data;
+        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);
+          var max_num = 0;
+          team_num_arr.forEach(function (val, ind) {
+            if (val.rynum > max_num) max_num = val.rynum;
+          })
+          teamlist.max_num = max_num;
+        }
+
+         th.setData({ pt_act: teamlist });
+         th.init(team_id);
+      }
+    })
+  },
+
+  //加载更多的函数
+  async init(team_id) {
+         
+     var teamgroup_arr = [];//活動从表
+     var teamgroup = null,//活動从表
+      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: req_data
+    }).then(res => {
+      if(ut.ajax_ok(res)){
+        teamgroup = res.data.data.pageData;
+        console.log(teamgroup);
+        ee.data.currentPage++;
+      }
+
+    })
+
+    //获取订单的总数这个接口不能用
+    for (i = 0; i < teamgroup.length; i++) {
+      await getApp().request.promiseGet("/api/weshop/rechargeServicelist/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]);
+    }
+    // //设置值
+    // 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();
+    }
+  },
+   //滚动到底部
+  onReachBottom: function () {
+    this.init(th.data.team_id);
+  },
+
+  resetData: function () {
+    n.resetConfig(), this.data.teamgroup = null, this.data.currentPage = 1;
+  },
+
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+
+  //----拼单倒计时函数-----
+  countDown2() {
+    var th = this;
+    // 获取当前时间，同时得到活动结束时间数组
+    var newTime = ut.gettimestamp();
+    var List = this.data.teamgroup;
+	if(!List || List.length<=0) return false;
+
+    for (var j = 0; j < List.length; j++) {
+      // 对结束时间进行处理渲染到页面
+      var endTime = List[j].kt_end_time;
+      let obj = null;
+      // 如果活动未结束，对时间进行处理
+      if (endTime - newTime > 0) {
+        let time = (endTime - newTime);
+        // 获取天、时、分、秒
+        let day = parseInt(time / (60 * 60 * 24));
+        let hou = parseInt(time % (60 * 60 * 24) / 3600);
+        let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+        let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+        obj = {
+          day: this.timeFormat(day),
+          hou: this.timeFormat(hou),
+          min: this.timeFormat(min),
+          sec: this.timeFormat(sec)
+        }
+      } else {
+        //活动已结束，全部设置为'00'
+        obj = {
+          day: '00',
+          hou: '00',
+          min: '00',
+          sec: '00'
+        }
+      }
+      var txt = "teamgroup[" + j + "].djs";
+      th.setData({
+        [txt]: obj
+      });
+    }
+
+    setTimeout(th.countDown2, 1000);
+  },
+
+  //--跳转到加载更多--
+  go_team_show:function (e) {
+
+    var th=this;
+    var tid=e.currentTarget.dataset.tid;
+    var team_id=e.currentTarget.dataset.team_id;
+    var oo=getApp().globalData;
+
+    getApp().request.get("/api/weshop/rechargeServicelist/page", {
+      data: {
+        prom_id: team_id,
+        user_id: oo.user_id,
+        store_id: os.stoid,
+        pageSize: 1,
+        page: 1
+      },
+      success: function(e) {
+        //--跳转到已经购买的情况--
+        if (e.data.code == 0 && e.data.data.pageData.length > 0) {
+          var odr = e.data.data.pageData[0];
+          //还未支付
+          if (odr.pt_status == 0 && odr.order_status == 1) {
+            wx.navigateTo({
+              url: "/packageA/pages/details_serviceCard/details_serviceCard/details_serviceCard?order_id=" + odr.order_id,
+            });
+          }else if (odr.pt_status == 1 && odr.order_status == 1){
+            wx.navigateTo({
+              url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + odr.order_sn,
+            });
+          }
+        }
+        //--跳转到参团--
+        else if(e.data.code == 0){
+          wx.navigateTo({
+            url: "/packageA/pages/serviceCard_pd/team_show/team_show?tg_id="+tid+"&goods_id="+th.data.pt_act.goods_id,
+          });
+        }
+
+      }
+    });
+
+  }
+ 
+})
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.json b/packageA/pages/serviceCard_pd/team_more/team_more.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.wxml b/packageA/pages/serviceCard_pd/team_more/team_more.wxml
new file mode 100644
index 0000000..45f8693
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.wxml
@@ -0,0 +1,36 @@
+<!--//选项框-->
+<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' >
+      <image src='{{item.user.head_pic}}'></image>
+    </view>
+    <!--//等你来拼-->
+    <view class='gdn'>等你来拼 (^_^)</view>
+    <!--//还差几人，剩余时间-->
+    <view class='ghaicha'>
+      <text class='gred' wx:if="{{pt_act.max_num}}">
+         <text wx:if="prom_act.max_num - item.open_num>0">还差{{pt_act.max_num - item.open_num}}人享最低优惠</text>
+         <text wx:else>您已经享最低优惠</text>
+      </text>
+      <text class='gred' wx:else>还差{{pt_act.ct_num - item.open_num}}人成团</text>
+      <view>
+        <view class="time_show_view">
+          剩余
+		  <text wx:if="{{item.djs.day}}">{{item.djs.day}}天:</text>
+		  <text>{{item.djs.hou}}</text>:
+          <text>{{item.djs.min}}</text>:
+          <text>{{item.djs.sec}}</text>结束
+        </view>
+      </view>
+
+    </view>
+    <!--//参加团-->
+    <view class='cjt'>
+      <navigator>去参团 ></navigator>
+    </view>
+    <view class="clear"></view>
+  </view>
+</view>
+</block>
\ No newline at end of file
diff --git a/packageA/pages/serviceCard_pd/team_more/team_more.wxss b/packageA/pages/serviceCard_pd/team_more/team_more.wxss
new file mode 100644
index 0000000..8b54aca
--- /dev/null
+++ b/packageA/pages/serviceCard_pd/team_more/team_more.wxss
@@ -0,0 +1,91 @@
+/* pages/team/team_more/team_more.wxss */
+
+/* pages/team/test.wxss */
+
+page {
+  background-color: white;
+}
+
+.top {
+  background-color: white;
+  width: 100%;
+  height: 100rpx;
+  font-size: 32rpx;
+  border-bottom: 2rpx #e5e5e5 solid;
+  padding-left: 4rpx;
+  padding-right: 4rpx;
+}
+
+.group {
+  width: 100%;
+  margin-top: 20rpx;
+  min-height: 108rpx;
+}
+
+.group .group-list {
+  border: 1rpx #f48886 solid;
+  border-radius: 200rpx;
+  height: 90rpx;
+  width: 720rpx;
+  margin-left: 15rpx;
+  overflow: hidden;
+  display: flex;
+  position: relative;
+}
+
+.group .group-list .gtou {
+  width: 80rpx;
+  height: 80rpx;
+  top: 6rpx;
+}
+
+.group .group-list .gtou image {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 200rpx;
+  background-color: green;
+}
+
+.group .group-list .gdn {
+  font-size: 24rpx;
+  line-height: 48rpx;
+  height: 48rpx;
+  width: 168rpx;
+  color: #8f8f94;
+  margin-left: 15rpx;
+}
+
+.group .group-list .ghaicha {
+  text-align: right;
+  width: 320rpx;
+  height: 96rpx;
+  font-size: 24rpx;
+  overflow: hidden;
+}
+
+.group .group-list .ghaicha .gred {
+  height: 48rpx;
+  line-height: 48rpx;
+  color: red;
+  width: 300rpx;
+}
+
+
+.group .group-list .cjt {
+  height: 86rpx;
+  width: 120rpx;
+  position: absolute;
+  right: 0;
+  top: 0;
+  border-radius: 0 100rpx 100rpx 0;
+  line-height: 86rpx;
+  font-size: 24rpx;
+  color: #fff;
+  border: 2rpx solid #dd524d;
+  background-color: #dd524d;
+}
+
+.gbody {
+  background-color: white;
+}
+.time_show_view{ height: 40rpx; line-height: 40rpx; color: #8f8f94; }
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 3a50e04..3c861be 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -311,6 +311,7 @@ Page({
     jsarr.forEach(function (value, index) {
       if (count >= value['rynum']) price = value['price'];
     })
+
     var tail_money = (price * order_goods.goods_num - order['order_amount'] - order['user_money']).toFixed(2);
 
     tail_money = parseFloat(tail_money);
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index e0ba483..3b47699 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -312,12 +312,16 @@
 				  <block wx:if="{{item.prom_type==6}}">
 					  <block wx:if="{{item.pt_status==0}}" >未支付</block>
 					  <block wx:if="{{item.pt_status==1}}" >组团中</block>
-					  <block wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</block>
+
 				  </block>
 				  <block wx:else>
 					  待支付
 				  </block>
 			  </view>
+			  <view wx:if="{{item.order_status<2}}">
+				  <block wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</block>
+			  </view>
+
 			  <view wx:if="{{item.order_status == 1 && item.pay_status==1}}" class="flex-center">待评价
 				  <view class="lin"></view>
 				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"
@@ -422,10 +426,12 @@
 
 				<navigator class="commodity_To_evaluate flex-level comment_go"
 						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0}}">立即支付</navigator>
-			  
 
+				<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id={{item.order_id}}"
+						   data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
 
-	        </view>
+
+			</view>
 	      </view>
 	    </view>
 	  </view>
--
libgit2 0.21.4