From ed23222246a548fd6a4689a5b3886b19771c7757 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 1 Nov 2023 16:07:25 +0800
Subject: [PATCH] 卡项预售的优化

---
 packageC/pages/presell/cardInfo/goodsInfo.js |  58 ++--------------------------------------------------------
 packageC/pages/presell/cart/cart.js          |   7 +++++++
 packageC/pages/presell/cart/cart.wxml        |   6 +++---
 packageC/pages/presell/cart/cart2.js         |  21 ++++++++++++---------
 packageC/pages/presell/cart/cart2.wxml       |  13 +++++++------
 packageC/pages/presell/cart/cart2_pre.js     |   3 +++
 pages/user/order_list/order_list.js          | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 pages/user/order_list/order_list.wxml        |  14 ++++++++++++--
 utils/LoadMore.js                            |   2 +-
 9 files changed, 145 insertions(+), 79 deletions(-)

diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js
index a9958c0..314ff79 100644
--- a/packageC/pages/presell/cardInfo/goodsInfo.js
+++ b/packageC/pages/presell/cardInfo/goodsInfo.js
@@ -876,7 +876,7 @@ Page({
 
         var e = this, th = e, o = this.data.sele_g, a = o.goods_id;
         //----------添加到购物车时，要判断限购数量，--------
-        e.get_buy_num(o, function (ee) {
+        e.get_buy_num2(o, function (ee) {
             //---判断商品是否超出限购---
             if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
                 if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
@@ -3420,65 +3420,11 @@ Page({
 	    func(f_more);
 	
 	},
-	
-	
-	
 
 	
-	
-	//-------------获取购买数量的总函数----------------
-	get_buy_num: function (gd, func) {
-	    // var map = this.data.g_buy_num,
-	    var th = this,
-	        user_id = getApp().globalData.user_id;
-	    if (user_id == null) {
-	        // map.set(gd.goods_id, 0);
-	        th.setData({
-	            // g_buy_num: map,
-	            prom_buy_num: 0,
-	        });
-	        "function" == typeof func && func();
-	        return false;
-	    }
-	
-	    // if (map.has(gd.goods_id)) {
-	    //     "function" == typeof func && func();
-	    // } else {
-	        //----获取商品购买数----
-					if (th.data.prom_type == 1) {
-					    //----获取活动购买数----
-					    getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
-					        data: {
-					            store_id: os.stoid,
-					            user_id: user_id,
-					            card_id: th.data.options.goods_id,
-					            prom_type: th.data.options.prom_type,
-					            prom_id: th.data.options.prom_id
-					        },
-					        //-----获取-----
-					        success: function (tt) {
-					            if (tt.data.code == 0) {
-					                // map.set(gd.goods_id, g_buy_num);
-					                th.setData({
-					                    // g_buy_num: map,
-					                    promcardbuynum: tt.data.data.promcardbuynum,
-															cardbuynum: tt.data.data.cardbuynum,
-					                });
-					                "function" == typeof func && func();
-					            }
-					        }
-					    });
-					} else {
-					    "function" == typeof func && func();
-					};
-					
-	},
-	
-	
 	get_buy_num2: async function () {
 	    // var map = this.data.g_buy_num,
-	    var th = this,
-	        user_id = getApp().globalData.user_id;
+	    var th = this,user_id = getApp().globalData.user_id;
 	    // if (user_id == null) {
 	    //     // map.set(gd.goods_id, 0);
 	    //     th.setData({
diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js
index 8b0a0a0..450bee1 100644
--- a/packageC/pages/presell/cart/cart.js
+++ b/packageC/pages/presell/cart/cart.js
@@ -2686,6 +2686,13 @@ Page({
 
     //显示支付选择
     show_pay: function () {
+
+        //-- 服务卡项没有余额支付 --
+        if(this.data.is_fwk){
+            this.to_pay_type(0);
+            return false;
+        }
+
         //不用钱直接支付
         if (this.data.order_m <= 0) {
             this.to_pay_type(1);
diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml
index 8d81464..17a393b 100644
--- a/packageC/pages/presell/cart/cart.wxml
+++ b/packageC/pages/presell/cart/cart.wxml
@@ -233,7 +233,7 @@
                 {{order.store_prom}}
             </view>
 
-            <view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{pickup_id}}"
+            <view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{pickup_id}}" hidden="{{is_fwk}}"
                   wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
                 <view class="work-frame flex-space-between">
                     <view class="work">
@@ -253,7 +253,7 @@
                 </view>
             </view>
 
-            <view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
+            <view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics && !is_fwk}}">
                 <view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
                     <view>选择物流</view>
                     <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
@@ -308,7 +308,7 @@
 
 
         <!-----使用佣金--- 佣金必须要小于尾款的支付的金额 ,同时订单优惠--->
-        <view  class="set-mes bdr_t-14" wx:if="{{goods.use_commission>0 && can_commission && util.get_sum(tail_pay,exp_price,order_prom_amount)>goods.use_commission}}">
+        <view  class="set-mes bdr_t-14" wx:if="{{!is_fwk && goods.use_commission>0 && can_commission && util.get_sum(tail_pay,exp_price,order_prom_amount)>goods.use_commission}}">
             <view class="use-item" bindtap='set_bn_commission'>
                 <icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
                 <view class="yu_er">使用佣金 :￥{{goods.use_commission}} </view>
diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index 9df76eb..7620697 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -183,6 +183,12 @@ Page({
         //判断是不是佣金抵扣
         getApp().is_distribut(this);
 
+        var gg = to.get_b_now();
+        if(gg.fwk){
+            this.setData({is_fwk: 1});
+        }
+
+
     },
     onUnload: function () {
         this.setData({ isclose: 1 })
@@ -572,7 +578,7 @@ Page({
                     bn_goods: t.data.data,
                     bn_pickname: gg.pick_name,
                     bn_pick: gg.pick_id,
-                    act: act
+                    act: act,
                 });
 
                 //计算价格
@@ -1265,7 +1271,7 @@ Page({
         };
 
         //判断是不是购物车购买还是立即购买
-        var gg = getApp().globalData.service_now;
+        var gg = th.data.gg;
         if (!gg.pick_id) {
             getApp().showWarning("未找到门店");
             return false;
@@ -1274,17 +1280,14 @@ Page({
             'card_id': th.data.bn_goods.id,
             'itemid': th.data.bn_goods.erpItemID,
             'qty': gg.goods_num,
-            'price': th.data.bn_goods.money,
+            'price': th.data.bn_goods.shop_price,
             // 'price': th.data.formData.order_amount,
             'pickup_id': gg.pick_id,
             'pickup_keyid': gg.keyid,
-            'prom_type': this.data.postdata.prom_type,  //促销活动类型
-            'prom_id': this.data.postdata.prom_id,     //促销活动id
+            'prom_type': 8,  //促销活动类型
+            'prom_id': this.data.act.id,     //促销活动id
         };
 
-        if(this.data.postdata.prom_type == 1) {
-            goods.price = this.data.postdata.prom_price;
-        };
 
         if(getApp().globalData.skinface_id){
             goods.skinface_id=getApp().globalData.skinface_id;
@@ -1408,7 +1411,7 @@ Page({
     //--------------------提交订单-----------------------
     async submitForm(t) {
 
-        if(th.data.fwk==1){
+        if(this.data.is_fwk==1){
             this.submitForm_card_next();
             return false;
         }
diff --git a/packageC/pages/presell/cart/cart2.wxml b/packageC/pages/presell/cart/cart2.wxml
index 27d3d62..15f0101 100644
--- a/packageC/pages/presell/cart/cart2.wxml
+++ b/packageC/pages/presell/cart/cart2.wxml
@@ -6,7 +6,7 @@
 	<view class="container">
 		
 	    	<!-- 立即购买的时候 -->
-			<view class="tab-container" wx:if="{{show_submit && act.goods_type==0}}">
+			<view class="tab-container" wx:if="{{show_submit && act.goods_type==0 && !is_fwk}}">
 				<view class="tab-wrapper">			
 						<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"  
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
@@ -22,7 +22,7 @@
 			</view>
 
 		<!--要进行判断地址是否显示---->	
-		<view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 && is_b_now==1 &&  act.goods_type==0}}'>
+		<view bindtap="enterAddressPage" class="user-mes mgt20" wx:if="{{!is_fwk}}"  hidden='{{bn_exp_type==1 && is_b_now==1 && act.goods_type==0}}'>
 			<!---默认地址显示------>
 			<block wx:if="{{user_addr!=null}}">
 				<view class="user-contact">
@@ -150,7 +150,8 @@
 					<icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
 				</view>
 
-				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
+				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" hidden="{{is_fwk}}"
+					  wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
 					<view class="work-frame flex-space-between">
 						<view class="work">
 							优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text>
@@ -166,7 +167,7 @@
 					</view>
 				</view>
 
-				<view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics}}">			
+				<view class="xc-coupon-frame" wx:if="{{bn_exp_type==0 && !is_default_logistics && !is_fwk}}">
 					<view class="flex-space-between" style="padding: 20rpx 25rpx; font-size: 30rpx;">
 						<view>选择物流</view>			
 						<view class="flex-vertical" bindtap="show_wu_arr" data-txt='index' style="margin-right: 12rpx;">
@@ -214,7 +215,7 @@
 			</view>
 
 			<!-----使用佣金------>
-			<view  class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission}}">
+			<view  class="set-mes bdr_t-14" wx:if="{{bn_goods.use_commission>0 && can_commission && !is_fwk}}">
 				<view class="use-item" bindtap='set_bn_commission'>
 					<icon color="{{bn_use_commission?'red':'gray'}}" size="16" type="success"></icon>
 					<view class="yu_er">使用佣金 :￥{{bn_goods.use_commission}} </view>
@@ -223,7 +224,7 @@
 
 
 			<!-----使用余额------>
-			<view class="set-mes bdr_t-14" wx:if="{{yuer>0}}">
+			<view class="set-mes bdr_t-14" wx:if="{{yuer>0 && !is_fwk}}">
 				<view class="use-item" bindtap='set_bn_useyuer'>
 					<icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
 					<view class="yu_er">使用余额 :￥{{yuer}} </view>
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index d83eced..75b5fdf 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -944,6 +944,9 @@ Page({
                       icon: 'success',
                       duration: 2000
                     });
+
+                    var url = "/packageC/pages/presell/cart/cart?order_sn=" + data.data.order_sn;
+
                     setTimeout(function () {
                       wx.reLaunch({
                         url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 0091eb5..6c342e5 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -2843,14 +2843,17 @@ Page({
     switch (currentIndex) {
       case 0: { // 全部
         delete data.order_status;
+        delete data.pay_status;
         break;
       };
       case 1: { // 待支付
         data.order_status = 0;
+        delete data.pay_status;
         break;
       };
       case 2: { // 待评价
-        data.order_status = 1;
+        data.pay_status = 1;
+        data.order_status=1;
         break;
       };
     };
@@ -2906,6 +2909,7 @@ Page({
     var pt_act=null;  //-- 拼团活动的优化 --
 
     for (const it of list) {
+      //秒杀
       if (it.prom_type == 1) {
         let act_details = null;
         let redis_num = 0;
@@ -2993,7 +2997,7 @@ Page({
         }
 
       };
-
+      //拼团
       if (it.prom_type == 6) {
         let act_details = null;
         let redis_num = 0;
@@ -3085,6 +3089,98 @@ Page({
         pt_act=act_details;
 
       }
+      //预售
+      if (it.prom_type == 8) {
+        let act_details = null;
+        let redis_num = 0;
+        let promcardbuynum = 0;
+        let qty = it.qty;
+
+        await getApp().request.promiseGet("/api/weshop/teamlist/get/" + store_id + "/" + it.prom_id, {}).then(res => {
+
+          if (res.data.code == 0) {
+
+            act_details = res.data.data;
+
+            if (act_details.is_end == 1) {
+              wx.showModal({
+                title: '提示',
+                content: '活动已结束,无法支付,请取消订单！',
+                showCancel: false,
+              });
+              flag = false;
+              return false;
+            }
+
+            if (act_details.id != it.prom_id) {
+              wx.showModal({
+                title: '提示',
+                content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+                showCancel: false,
+              });
+              flag = false;
+              return false;
+            }
+
+            var t_now = ut.gettimestamp();
+            if (act_details.is_end == 1 || act_details.start_time > t_now || act_details.end_time < t_now) {
+              wx.showModal({
+                title: '提示',
+                content: '活动发生了变化,无法支付,请取消订单,重新购买！',
+                showCancel: false,
+              });
+              flag = false;
+              return false;
+            }
+
+            //指定门店的控制
+            if (act_details.pick_up_lists) {
+              var idx0=act_details.pick_up_lists.findIndex(function (e){
+                return e.pickup_id==it.pickup_id;
+              })
+              if(idx0<0){
+                getApp().confirmBox(it.service_name + "拼团活动的门店不可售");
+                th.setData({ paying: 0 });
+                flag = false;
+                return false;
+              }
+            }
+
+
+          }
+        });
+
+        if(act_details.buy_limit>0 && flag){
+          await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", {
+            data: {
+              store_id: store_id,
+              user_id: user_id,
+              card_id: it.card_id,
+              prom_type: it.prom_type,
+              prom_id: it.prom_id,
+              ispay:1
+            }
+          }).then(res => {
+            if (res.data.code == 0) {
+              console.log('已经购买的数量：', res.data.data);
+              promcardbuynum = res.data.data.promcardbuynum;
+            }
+          })
+          let limited = act_details.buy_limit; // 限购数量a
+          let canBuyNum = limited - promcardbuynum; // 自己还可购买的数量c
+
+          if (canBuyNum < qty ) {
+            wx.showModal({
+              title: '提示',
+              content: '您已超出活动限购数量,无法支付,请取消订单！',
+              showCancel: false,
+            });
+            flag = false;
+          }
+        }
+        pt_act=act_details;
+
+      }
 
     }
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 4644ab6..705788f 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -322,7 +322,6 @@
 	    <!--商品编号 -->
 	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
 
-
 		  <!-- 这是预售的 -->
 		  <block wx:if="{{item.presell}}">
 			  <block wx:if="{{item.order_status==3}}">
@@ -333,6 +332,17 @@
 				  <text wx:if="{{item.presell.presell_type!=1 && item.presell.deposit_pay_time && !item.presell.tail_pay_state}}">待尾款</text>
 				  <text wx:if="{{item.presell.presell_type==1 &&  item.order_status<2  && item.pay_status<1 }}">未支付</text>
 			  </block>
+
+			  <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"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+			  </view>
+			  <view wx:if="{{item.order_status==2}}" class="flex-center">已评价<view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+			  </view>
+			  <view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+			  </view>
+
 		  </block>
 
 		  <block wx:else>
@@ -459,7 +469,7 @@
 				</block>
 
 
-				<block wx:if="{{item.presell && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0}}">
+				<block wx:if="{{item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0}}">
 					<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageC/pages/presell/cart/cart?order_id={{item.order_id}}&is_fwk=1" data-idx="{{index}}" >支付尾款</navigator>
 
 				</block>
diff --git a/utils/LoadMore.js b/utils/LoadMore.js
index 15e6cf2..270ca2e 100644
--- a/utils/LoadMore.js
+++ b/utils/LoadMore.js
@@ -72,7 +72,7 @@ var e = function() {
 
                     //格式化
                     var glist="";
-                    if(g) {
+                    if(g && g.length) {
                         for (var ii = 0; ii < g.length; ii++) {
                             //if(g[i].prom_type == 1 || g[i].prom_type == 2 || g[i].prom_type == 6) {
                             if (g[ii].prom_type && g[ii].prom_type == 1) {
--
libgit2 0.21.4