From fb00a0766210cc6d46ada13a09c3efda3f0a6cde Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 26 May 2020 17:28:49 +0800
Subject: [PATCH] 优惠促销10个bug优化

---
 packageA/pages/prom_list/prom_list.js     |  6 +++---
 pages/cart/cart/cart.js                   | 15 +++++++++++++--
 pages/cart/cart/cart.wxml                 | 16 ++++++++--------
 pages/cart/cart2/cart2.js                 | 25 +++++++++++++++++++++++++
 pages/cart/cart2/cart2.wxss               |  4 ++--
 pages/goods/goodsList/goodsList.js        | 27 ++++++++++-----------------
 pages/goods/goodsList/goodsList.wxml      | 20 ++++++++++++--------
 pages/user/order_detail/order_detail.js   | 21 ++++++++-------------
 pages/user/order_detail/order_detail.wxml |  7 ++++++-
 pages/user/order_list/order_list.js       | 24 ++++++++----------------
 pages/user/order_list/order_list.wxml     |  7 +++++--
 11 files changed, 100 insertions(+), 72 deletions(-)

diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index e2f5755..2ff76e1 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -1524,14 +1524,14 @@ Page({
 		 var cut_pirce=this.data.collocationList[index].shop_price-price;
 		 if(set==1){
 			 this.data.dp_price=parseFloat(this.data.dp_price)+price;
-			 this.data.cut_pirce=this.data.cut_pirce+cut_pirce;	 
+			 this.data.cut_price=this.data.cut_price+cut_pirce;
 		 }else{
 			 this.data.dp_price=parseFloat(this.data.dp_price)-price;
-			 this.data.cut_pirce=this.data.cut_pirce-cut_pirce;	 
+			 this.data.cut_price=this.data.cut_price-cut_pirce;
 		 }		 
 		 price=price.toFixed(2);		 		 
 		 cut_pirce=cut_pirce.toFixed(2);		 		 
-		 this.setData({dp_price: this.data.dp_price,cut_price:this.data.dp_price});
+		 this.setData({dp_price: this.data.dp_price,cut_price:this.data.cut_price});
 	}
 	
 
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index e571570..83bd301 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1229,6 +1229,17 @@ Page({
                 }
               }
             }
+            else{
+              //---条件不到，删除相应的赠品---
+              for(var gi in list.goods){
+                var item=list.goods[gi];
+                if(item.is_gift==1 && item.prom_id==discount.prom_id){
+                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                     getApp().request.delete(url, {});
+                     list.goods.splice(gi,1);
+                }
+              }
+            }
             //-- 获取 --
             await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{
                data:{prom_id:prom.id}
@@ -1243,8 +1254,8 @@ Page({
                                       make_up_arr.push(elem); break;
                                 }
                            }else{
-                               if(ob.goods_num<item.condition){
-                                    var elem={prom_id:prom.id,diff_type:item.prom_type,diff:(item.condition-ob.price).toFixed(2), content:JSON.parse(item.preferential_type)}
+                               if(ob.num<item.condition){
+                                    var elem={prom_id:prom.id,diff_type:item.prom_type,diff:(item.condition-ob.num).toFixed(2), content:JSON.parse(item.preferential_type)}
                                     make_up_arr.push(elem);break;
                                }
                            }
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index b2f7906..c820f5a 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -87,16 +87,16 @@
       <!--- 去凑单 -->
       <view  style="margin-top: 20rpx; padding: 0 30rpx">
               <view class="flex jc_sb fs28" wx:for="{{item.make_up_arr}}" style="margin-bottom: 20rpx" >
-              <view>再买<text class="co-red">{{item.diff}}<text wx:if="{{item.diff_type==0}}">元</text>
+              <view class="ellipsis-1" style="width: 80%">再买<text class="co-red">{{item.diff}}<text wx:if="{{item.diff_type==0}}">元</text>
                           <text wx:if="{{item.diff_type==1}}">件</text>
                    </text>，
-                  <text wx:if="{{item.content.is_money}}">免{{item.content.is_money}}元|</text>
-                  <text wx:if="{{item.content.is_sale}}">打{{item.content.sale}}折|</text>
-                  <text wx:if="{{item.content.is_past}}">包邮|</text>
-                  <text wx:if="{{item.content.is_coupon}}">送优惠券|</text>
-                  <text wx:if="{{item.content.is_int}}">送积分|</text>
-                  <text wx:if="{{item.content.is_gift}}">送赠品|</text>
-                  <text wx:if="{{item.content.is_libao}}">送礼包|</text>
+                  <text wx:if="{{item.content.is_money==1}}">免{{item.content.money}}元|</text>
+                  <text wx:if="{{item.content.is_sale==1}}">打{{item.content.sale}}折|</text>
+                  <text wx:if="{{item.content.is_past==1}}">包邮|</text>
+                  <text wx:if="{{item.content.is_coupon==1}}">送优惠券|</text>
+                  <text wx:if="{{item.content.is_int==1}}">送积分|</text>
+                  <text wx:if="{{item.content.is_gift==1}}">送赠品|</text>
+                  <text wx:if="{{item.content.is_libao==1}}">送礼包|</text>
                   <text></text>
               </view>
               <view class="co-red" data-prom_id="{{item.prom_id}}" bindtap="go_cou_dang">去凑单></view>
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 2a8bd22..1644ffd 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1302,6 +1302,8 @@ Page({
 
   //--------------------提交订单-----------------------
   async submitForm(t){
+    var sub_value=t;
+
     if(this.data.is_summit_ing==1) return false; //--提交中退出--
     this.data.is_summit_ing=1;
     var th=this,pdata=new Array();
@@ -1349,6 +1351,8 @@ Page({
         'exp_type': th.data.bn_exp_type,    //配送方式
         'order_goods':new Array(),
       };
+      //是不是重新提交
+      if(th.data.is_continue==1) item.is_continue=1;
 
       var order_prom_list={};
       //--判断有没有优惠活动--
@@ -1488,6 +1492,8 @@ Page({
           'exp_type': t_item.exp_type,         //配送方式
           'order_goods': new Array(),
         };
+        //是不是重新提交
+        if(th.data.is_continue==1) item.is_continue=1;
 
         //组装优惠券的钱
         if(t_item.coupon_price) {
@@ -1675,6 +1681,25 @@ Page({
            else{
              //--内容换行--
              var msg=data.msg;
+             //赠品活动已经取消，无法赠送，是否继续买单？
+             if(msg.indexOf("是否继续买单")>0){
+                   wx.showModal({
+                       title:"提示",
+                       content: data.msg,
+                       cancelText:'取消',
+                       confirmText:'确定',
+                       showCancel: true,
+                       success(res){
+                           if(res.cancel){
+                               return;
+                           }else if(res.confirm){
+                               th.data.is_continue=1;
+                               th.submitForm(sub_value);
+                           }
+                       }
+                   })
+                   return;
+             }
              if(msg.length>13){
                  msg=msg.slice(0, 13) + "\r\n"+ msg.slice(13);
              }
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 5d767a2..cb34f2a 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -208,8 +208,8 @@ margin:auto;
     height: 100rpx; width: 100%;
     background-color: #fff;
     position: fixed; bottom: 0;left: 0;
-    border-top:1rpx solid #dee 
-    
+    border-top:1rpx solid #dee; 
+    z-index:9999
 }
 
 .tips-btn {
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 4eb1bd2..ee77df3 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -60,7 +60,7 @@ Page({
               data:{prom_id:t.prom_id }
           }).then(res=>{
                if(res.data.code==0){
-                   var arr= res.data.data.pageData;
+                   var arr= res.data.data;
                    th.set_prom_list(arr);
                }
           })
@@ -104,32 +104,25 @@ Page({
         var th=this;
         for(var i in arr){
              //优惠的实际内容
-             arr[i].preferential_type=JSON.parse(arr[i].preferential_type);
-             //--送优惠券-
-             if(arr[i].preferential_type.is_coupon){
-                 //-- 获取券的内容 --
-                 await getApp().request.promiseGet(" /api/weshop/prom/coupon/get/"+arr[i].coupon, {
-                 }).then(res => {
-                     if(res.data.code==0)
-                        arr[i].quan_name=res.data.data.name;
-                 })
-             }
+            var content=JSON.parse(arr[i].preferential_type);
+            arr[i].content=content;
+
              //--送礼包--
-             if(arr[i].is_libao) {
+             if(content.is_libao) {
                 //-- 获取 --
-                await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+arr[i].is_libao+"&store_id="+oo.stoid, {
+                await getApp().request.promiseGet("/api/weshop/libao/libaoForm/page?id="+content.libao+"&store_id="+oo.stoid, {
                 }).then(res => {
                     if(res.data.code==0)
-                        arr[i].ib_name=res.data.data.pageData[0].lbtitle;
+                        arr[i].content.lb_name=res.data.data.pageData[0].lbtitle;
                 })
              }
              //--送赠品--
-            if(arr[i].is_gift) {
+            if(content.is_gift) {
                 //-- 获取 --
-                await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+arr[i].gift+"&store_id="+oo.stoid, {
+                await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, {
                 }).then(res => {
                     if(res.data.code==0)
-                       arr[i].gift_name=res.data.data.pageData[0].goods_name;
+                        arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
                 })
             }
         }
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 5f49343..ef97e90 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -1,15 +1,19 @@
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view class="container">
-  <view>
-
-    <view> 满50.00元 减5元 包邮 送10积分 送8元优惠券 送海飞丝洗发水丝质 顺滑& </view>
-
+  <view style="padding: 20rpx 30rpx">
+     <block wx:for="{{prom_goods_list}}">
+         <view  class="fs30 ellipsis-1">
+           满{{item.condition}}<text space="{{true}}" wx:if="{{item.prom_type==0}}">元 </text> <text space="{{true}}" wx:else>件 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_money}}">减{{item.content.money}}元 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_sale}}">打{{item.content.sale}}折 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_int}}">送{{item.content.int}}积分 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_coupon}}">送{{item.content.coupon}}元优惠券 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_gift}}">送{{item.content.gift_name}} </text>
+           <text space="{{true}}" wx:if="{{item.content.is_libao}}">送{{item.content.lb_name}} </text>
+         </view>
+     </block>
   </view>
 
-
-
-
-
   <view class="nav">
     <navigator bindtap="changeTab" class="nav-item" data-href="goods_id" data-ad="{{adname}}">综合
       <view class="ico-dg" wx:if="{{tabname=='goods_id'}}">
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 0be576f..9747020 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -259,24 +259,19 @@ Page({
     
     //--------确认收货---------
     confirmOrder: function(e) {
+        var th=this;
         var t = this, o = this.data.order.order_id,order=this.data.order;
         var is_zsorder=order.is_zsorder;
         wx.showModal({
             title: "是否确认收货?",
-            success: function(e) {
-              e.confirm && r.put("/api/weshop/order/updatebyId", {
-                    data: {
-                      order_id: o, order_status: 2
-                    },
-                    success: function(e) {
-                      t.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
-                      //如果是会员团订单
-                      if(is_zsorder==3){
-                         getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+o,{
-                            data:{}, success:function () {  }})
-                      }
+            success: function(t) {
+                t.confirm && rq.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
+                    success:function (e) {
+                        if(e.data.code==0){
+                            th.requestOrderDetail(o)
+                        }
                     }
-                });
+                })
             }
         });
     },
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index b21ba3b..51db5fc 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -110,6 +110,11 @@
                <view> ￥ {{order.integral_money}}元</view>
             </view>
 
+            <view class="item pnew" wx:if="{{order.discount_amount>0}}">
+                <view>优惠活动</view>
+                <view>￥ {{order.discount_amount}}元</view>
+            </view>
+
             <view class="item pnew" wx:if="{{order.order_prom_amount>0}}">
                 <view>订单优惠</view>
                 <view>￥ {{order.order_prom_amount}}元</view>
@@ -150,7 +155,7 @@
          </block>
          <block wx:else>
                           <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 722a076..719f095 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -286,22 +286,14 @@ Page({
     wx.showModal({
       title: "是否确认收货?",
       success: function(t) {
-        t.confirm && rq.put("/api/weshop/order/updatebyId", {
-          data: {
-            order_id: a,
-            order_status: 2
-          },
-          success: function(t) {
-            e.deleteOrderData2(a);
-            //如果是会员团订单
-            if (is_zsorder == 3) {
-              getApp().request.post("/api/weshop/order/vipTuanTebate/" + os.stoid + "/" + a, {
-                data: {},
-                success: function() {}
-              })
+          t.confirm && rq.post("/api/weshop/order/confirmOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id,{
+            success:function (e) {
+               if(e.data.code==0){
+                   th.deleteOrderData2(a);
+                   getApp().confirmBox( "确认收货成功！");
+               }
             }
-          }
-        });
+          })
       }
     });
   },
@@ -315,7 +307,7 @@ Page({
 	var order=th.data.orderList[index];
 	if(order.order_status!=6){
 		up_data.order_status=5;
-	}	
+	}
     wx.showModal({
       title: "是否删除订单？",
       success: function(tt) {
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index efd98b2..eb16b95 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -115,7 +115,8 @@
                 <view class="commodity_money flex baseline" wx:else>
                   <view>合计:</view>
                   <view class="fs24 xc-wc">￥</view>
-                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+                     <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
                   </view>
                 </view>
                 <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
@@ -124,6 +125,8 @@
                   <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
                   </view>
                 </view>
+
+
               </block>
             </view>
           </view>
@@ -139,7 +142,7 @@
           </block>
           <block wx:else>
             <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2  && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
-            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
+            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
             <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
           </block>
           <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
--
libgit2 0.21.4