From 3b47f90994f1b08356061ecffc6548bd066cc522 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 11 Sep 2019 18:43:21 +0800
Subject: [PATCH] 收货地址，在选择的时候选中。 订单列表取消订单，使用优惠券的时候，要考虑冻结的优惠券， 支付尾款的接口修正

---
 pages/cart/cart2/cart2.js                 | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 pages/cart/cart_wk/cart_wk.js             | 14 +++++++++++---
 pages/goods/goodsInfo/goodsInfo.wxml      |  2 +-
 pages/team/team_ping/team_ping.wxml       |  2 +-
 pages/team/team_ping/team_ping.wxss       |  2 +-
 pages/user/add_address/add_address.js     |  3 +++
 pages/user/add_address/add_address.wxml   |  5 +++--
 pages/user/address_list/address_list.js   | 54 ++++++++++++++++++++++++++++--------------------------
 pages/user/address_list/address_list.wxml | 11 ++++++-----
 pages/user/order_detail/order_detail.js   | 21 ++++++++++++---------
 pages/user/order_list/order_list.js       | 40 +++++++++++++++++++++++++++-------------
 utils/regions/Regions.js                  |  6 +++++-
 12 files changed, 170 insertions(+), 71 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 7e1bcb8..f5c9ba7 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -77,9 +77,18 @@ Page({
 
   },
   onLoad: function(t) {
+
     wx.setNavigationBarTitle({ title: "填写订单",})
     var th = this; this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,});
     th.data.param=t;
+
+    //清空is_pick_up
+    getApp().request.put("/api/weshop/useraddress/updatePickUp", {
+        data: {user_id: getApp().globalData.user_id, is_pickup: 0},
+        success: function (s) {
+        }
+    });
+
     //先获取是否有关闭使用优惠券
     getApp().getConfig2(function (ee) {
       var json_d = JSON.parse(ee.switch_list);
@@ -322,6 +331,19 @@ Page({
                     if(res.data.code==0)
                       arr[ind].quan_list=res.data.data.pageData;
                 })
+
+                var frozenQuan=null;
+                var url0="/api/weshop/users/frozenQuan/listFrozenQuan/"+app.globalData.user_id;
+                await app.request.promiseGet(url0,{1:1}).then(res=>{
+                  if(res.data.code==0){
+                    frozenQuan=res.data.data;
+                  }
+                })
+
+                if(frozenQuan){
+                  arr[ind].quan_list=th.check_is_frozenQuan(arr[ind].quan_list,frozenQuan);
+                }
+
               }
         }
 
@@ -380,6 +402,18 @@ Page({
                 })
               }
 
+              var frozenQuan=null;
+              var url0="/api/weshop/users/frozenQuan/listFrozenQuan/"+app.globalData.user_id;
+              await app.request.promiseGet(url0,{1:1}).then(res=>{
+                if(res.data.code==0){
+                  frozenQuan=res.data.data;
+                }
+              })
+
+              if(frozenQuan){
+                quanlist=th.check_is_frozenQuan(quanlist,frozenQuan);
+              }
+
               t.data.data.prom_id = 0;
               t.data.data.prom_type = 0;
 
@@ -409,11 +443,23 @@ Page({
 
                        var url="/api/weshop/couponList/getUseCouponList";
                        await app.request.promiseGet(url,{
-                        data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100}
+                          data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:th.data.ckeck_quan_price,WareIds:th.data.check_quan_ware_list,pageSize:100}
                        }).then(res=>{
-                        if(res.data.code==0)
-                          quanlist=res.data.data.pageData;
-                      })
+                         if(res.data.code==0)
+                             quanlist=res.data.data.pageData;
+                       })
+
+                       var frozenQuan=null;
+                       var url0="/api/weshop/users/frozenQuan/listFrozenQuan/"+app.globalData.user_id;
+                       await app.request.promiseGet(url0,{1:1}).then(res=>{
+                            if(res.data.code==0){
+                               frozenQuan=res.data.data;
+                            }
+                       })
+
+                       if(frozenQuan){
+                          quanlist=th.check_is_frozenQuan(quanlist,frozenQuan);
+                       }
                     } 
                   }
                   th.setData({
@@ -756,7 +802,8 @@ Page({
         'twon': addr == null ? 0 : addr.twon,
         'address': addr == null ? "": addr.address,
         'more_address': addr == null ? "" : addr.more_address,
-        'mobile': th.data.userinfo.mobile,
+        //'mobile': th.data.userinfo.mobile,
+        'mobile': addr == null ? th.data.userinfo.mobile : addr.mobile,
         'email':'',
         'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code,
         'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name,
@@ -1118,10 +1165,6 @@ Page({
     var bn=e.currentTarget.dataset.bn;
     var cindx=e.currentTarget.dataset.cind;
 
-    console.log("open_coupon_list--quan");
-    console.log("门店:"+pickid);
-    console.log(bn);
-
 
     if(bn==1){
        th.setData({open_quan:1,selected_quan_pick:pickid, disabled:1});
@@ -1251,6 +1294,26 @@ Page({
        var ob={};
        ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
        this.setData(ob);
+  },
+
+  //--验证是否已经冻结--
+  check_is_frozenQuan:function(quanlist,frozenQuan){
+        var arr=[];
+        for(var i=0;i<quanlist.length;i++){
+            var item=quanlist[i];
+            var is_find=0;
+            var Q_no=quanlist[i].CashRepNo;
+            for(var j=0;j<frozenQuan.length;j++){
+                 var q_no=frozenQuan[j].cashRepNo;
+                 if(Q_no==q_no){
+                   is_find=1; break;
+                 }
+            }
+           if(!is_find)  arr.push(item);
+
+        }
+        return arr;
   }
 
+
 });
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index f456231..355498f 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -43,6 +43,14 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+
+    //清空is_pick_up
+    getApp().request.put("/api/weshop/useraddress/updatePickUp", {
+      data: {user_id: getApp().globalData.user_id, is_pickup: 0},
+      success: function (s) {
+      }
+    });
+
     var th = this;
     this.data.order_id = options.order_id;
     //--初始化--
@@ -256,7 +264,7 @@ Page({
     if(exp_type==0){
       th.calculate_wuliu();
     }else{
-      var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.pt_tail_money;
+      var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.tail_money;
       allpice = allpice.toFixed(2);
       th.setData({ exp_price: 0, allpice: allpice })
     }
@@ -370,7 +378,7 @@ Page({
               var n=t.data.data;
               th.weixinPay(n,
               function () {
-                var allmoney=th.data.order.user_money+th.data.order.order_amount+th.data.order.pt_tail_money;
+                var allmoney=th.data.allpice;
                 th.jumpPaymentPage(th.data.order.order_sn,allmoney);
               },function () {
                   getApp().my_warnning("支付失败",0,th);
@@ -503,7 +511,7 @@ Page({
   //--进入收货地址的编辑页面--
   enterAddressPage: function() {
     this.data.enterAddressPage =1, wx.navigateTo({
-      url: "/pages/user/address_list/address_list?operate=select"
+      url: "/pages/user/address_list/address_list?is_back=1"
     });
   },
   
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index d0c8e97..457321e 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -821,7 +821,7 @@
           </block>
           <block wx:else>
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <view class="spec-goods-stock">可售：{{sele_g.store_count-sele_g.sales_sum}}</view>
+            <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
             <view class="spec-goods-stock">已选：{{sku_g_pt[0].gg}}</view>
           </block>
         </view>
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 15b31b4..d250119 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -64,7 +64,7 @@
       <view class='foot-left'>
         共{{item.order_goods[0].goods_num}}件, 
         <block wx:if="{{item.is_zsorder==4}}">
-            <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
+            <block wx:if="{{item.pt_status==3 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
                金额：<text class="xc-wc">￥</text>
                <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
             </block>       
diff --git a/pages/team/team_ping/team_ping.wxss b/pages/team/team_ping/team_ping.wxss
index c346b6a..4068cb0 100644
--- a/pages/team/team_ping/team_ping.wxss
+++ b/pages/team/team_ping/team_ping.wxss
@@ -374,5 +374,5 @@ margin-left:5rpx;
     color: #e4374d;
     font-weight: normal;
     margin-top:-40rpx; 
-    margin-left:98rpx 
+    margin-left:78rpx 
 }
\ No newline at end of file
diff --git a/pages/user/add_address/add_address.js b/pages/user/add_address/add_address.js
index 201120a..80841e9 100644
--- a/pages/user/add_address/add_address.js
+++ b/pages/user/add_address/add_address.js
@@ -13,6 +13,7 @@ Page({
         address: null,
         isnew:0,
         is_op_co:false,//switch开关
+        disabled:0
     },
     onLoad: function(s) {
         var a = this,th=a;
@@ -26,6 +27,7 @@ Page({
             th.initRegions();
         })
     },
+    
   onReachBottom: function () {
     if (this.data.total <= 6) return;
     if (this.data.ismore) return;
@@ -58,6 +60,7 @@ Page({
                 console.log("initRegions");
                 console.log(t);                        
                 Object.assign(e.data.address, t), e.setData({
+                    "disabled": 0,
                     "address.province_name": e.data.address.province_name,
                     "address.city_name": e.data.address.city_name,
                     "address.district_name": e.data.address.district_name,
diff --git a/pages/user/add_address/add_address.wxml b/pages/user/add_address/add_address.wxml
index ec68548..757adf3 100644
--- a/pages/user/add_address/add_address.wxml
+++ b/pages/user/add_address/add_address.wxml
@@ -22,7 +22,8 @@
        </view>
         <view class="detailed">
             <view class="detailed_item-name">详细地址</view>
-            <textarea class="detailed_item-input" name="address" value="{{address.address}}" placeholder="街道 楼牌号等" placeholder-style="color: rgb(199, 199, 199)"></textarea>
+            <textarea  wx:if="{{!disabled}}" class="detailed_item-input" name="address" disabled="{{disabled}}" data-dis="{{disabled}}"
+            value="{{address.address}}" placeholder="街道 楼牌号等" placeholder-style="color: rgb(199, 199, 199)"></textarea>
         </view>
         <view class="item item_default">
             <view class="item-name">设为默认地址</view>
@@ -35,6 +36,6 @@
         </view>
     </form>
 </view>
-<template is="regions" data="{{regions:regions}}"></template>
 
+<template is="regions" data="{{regions:regions}}"></template>
 <warn id="warn"></warn>
diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js
index e6c5713..8e2a2dd 100644
--- a/pages/user/address_list/address_list.js
+++ b/pages/user/address_list/address_list.js
@@ -1,6 +1,5 @@
 var e = getApp(), t = require("../../../utils/request.js"), os = e.globalData.setting, oo = e.globalData, t = e.request;
 
-
 Page({
   data: {
     url: e.globalData.setting.url,
@@ -16,6 +15,14 @@ Page({
     is_address_read:0
   },
   onLoad: function (e) {
+
+    //清空is_pick_up
+    getApp().request.put("/api/weshop/useraddress/updatePickUp", {
+      data: {user_id: getApp().globalData.user_id, is_pickup: 0},
+      success: function (s) {
+      }
+    });
+
     this.data.operate = e.operate;
     var is_back=e.is_back;
     if (is_back) this.setData({ is_back: is_back})
@@ -27,7 +34,6 @@ Page({
     console.log(this.data.addresses)
   },
 
-
   onReachBottom: function () {
     if (this.data.total <= 6) return;
     if (this.data.ismore) return;
@@ -76,10 +82,12 @@ Page({
           };
           wx.setStorageSync("goodsInfo:goodsInfo:address", t);
       }---*/
+
       oo.baddr = e.currentTarget.dataset.item;
       wx.navigateBack();
     }
   },
+  
   getAddressData: function (e) {
     var t = this.data.addresses;
     for (var s in t) if (t[s].address_id == e) break;
@@ -93,47 +101,41 @@ Page({
   },
   //判断是否选择
   add_is_pickup:function(e){
-    var th = this;
-    var index = e.currentTarget.dataset.icon;
-    var a = this.data.addresses[index]; 
-     
-    if(a.is_pickup==1) {
-      if(th.data.is_back){
-          wx.navigateBack({});
-      }
-      return false;
-    }
+
+     if(this.data.is_back==0) return false;
+
+     var th = this;
+     var index = e.currentTarget.dataset.ind;
+     var a = this.data.addresses[index];
 
      if (th.data.isloading) return;
      th.data.isloading=1;
 
-   
-
-   
        t.put("/api/weshop/useraddress/updatePickUp", {
           data: { user_id: oo.user_id, is_pickup: 0 },
           isShowLoading:0,
           success: function (s) {
-            var add_arr = th.data.addresses;
-            for (var i in add_arr){
-                add_arr[i].is_pickup=0;
-            }
-            th.setData({addresses:add_arr});
+            // var add_arr = th.data.addresses;
+            // for (var i in add_arr){
+            //     add_arr[i].is_pickup=0;
+            // }
+            // th.setData({addresses:add_arr});
+
             a.is_pickup = 1;
             t.put("/api/weshop/useraddress/updateById", {
               data: a,
               isShowLoading: 0,
               success: function (s) {
-                   var obj={};
-                   var txt = "addresses[" + index +"].is_pickup";
-                   obj[txt]=1;
-                   th.setData(obj);  
+                   // var obj={};
+                   // var txt = "addresses[" + index +"].is_pickup";
+                   // obj[txt]=1;
+                   // th.setData(obj);
+
                    th.data.isloading=0         
                    if (th.data.is_back) {
                       wx.navigateBack({});
                    }
-                   
-                         
+
               },fail: function (t) {
                 th.data.isloading = 0;
               }
diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml
index 97036ee..cff6f63 100644
--- a/pages/user/address_list/address_list.wxml
+++ b/pages/user/address_list/address_list.wxml
@@ -16,9 +16,10 @@
         <view class="create-btn">+新建地址</view>
     </navigator>
 </view> -->
+
 <!-- 无收货地址提醒页面 -->
 <view class="topbcolor"></view>
-<view class="nothing" wx:if="{{is_address_read==0?false:true && addresses.length<0}}">
+<view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}">
   <view class="image flex-level">
     <image src="../../../images/nothingaddress.png"></image>
   </view>
@@ -37,16 +38,16 @@
   <!-- 所有的收货地址框架 -->
   <view class="address-box">
 
- <!-- 单个收货地址框架 -->
+    <!-- 单个收货地址框架 -->
     <view class="address-user" wx:for="{{addresses}}" wx:key="{{index}}">
-      <!-- 选择icon -->
+      <!-- 选择icon
       <view class="icon">
         <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
         <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}"  bindtap="add_is_pickup" data-icon="{{index}}"></icon>
-      </view>
+      </view>-->
       
       <!-- 收货地址全部信息 -->
-      <view class="address">
+      <view class="address" bindtap="add_is_pickup" data-ind="{{index}}" >
         <!-- 个人直接信息 -->
         <view class="user">
           <!-- 名字 -->
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index d840150..fc4e3c8 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -112,14 +112,17 @@ Page({
             success: function(e) {
               if(!e.confirm) return false;
               //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
-              if(is_skill==1 || is_zsorder>=2){
-                 getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+o,{
-                   data:{},
-                   success: function(t) {
-                     if(t.data.code==0)
-                       th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
-                   },
-                 })
+              //if(is_skill==1 || is_zsorder>=2){
+
+             getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+o,{
+               data:{},
+               success: function(t) {
+                 if(t.data.code==0)
+                   th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
+               },
+             })
+
+              /*----
               }else{
                   getApp().request.put("/api/weshop/order/updatebyId", {
                     data: {order_id: o, order_status: 3},
@@ -127,7 +130,7 @@ Page({
                       th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
                     }
                   });
-              }
+              }--*/
             }
         });
     },
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 88f202a..efbc818 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -194,7 +194,7 @@ Page({
             success: function(t) {
              //如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
              if(t.confirm){
-                 if(is_skill==1 || is_zsorder>=2){
+                   //if(is_skill==1 || is_zsorder>=2){
                    getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+a,{
                      data:{},
                      success: function(t) {                      
@@ -208,18 +208,7 @@ Page({
                          getApp().confirmBox(e.data.msg);
                        }
                      },
-                   })
-                 }else{
-                      rq.put("/api/weshop/order/updatebyId", {
-                        data: {
-                          order_id: a, order_status: 3
-                        },
-                        success: function (t) {
-                          0 == e.data.activeCategoryId ?
-                            (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData(a);
-                        }
-                      });
-                 }
+                   })        
              }
             }
         });
@@ -289,7 +278,32 @@ Page({
 
     /*----------跳转支付-----------*/
     jumpToCart4: function(t) {
+        var o_index=t.currentTarget.dataset.idx;
         var e = this.data.orderList[t.currentTarget.dataset.idx];
+        var th=this;
+
+        console.log("jumpToCart4");
+        console.log(e);
+
+        if(e.order_amount==0){
+            var dd = {
+                parent_sn: e.order_sn,
+                store_id: e.store_id,
+                type: 1,
+            };
+            getApp().request.post("/api/weshop/order/pay/createOrder", {
+                data: dd,
+                success: function (t) {
+                     if(t.data.code==0){
+                        th.onload();
+                     }else{
+                         getApp().confirmBox(t.data.msg+"请您取消该订单");
+                     }
+                }
+            })
+            return false;
+        }
+
         a.jumpToCart4({
             order_sn: e.order_sn,
             order_amount: e.order_amount,
diff --git a/utils/regions/Regions.js b/utils/regions/Regions.js
index d0f824d..568c458 100644
--- a/utils/regions/Regions.js
+++ b/utils/regions/Regions.js
@@ -38,6 +38,9 @@ var s = function() {
     return s(a, [ {
         key: "openRegionsModal",
         value: function(t) {
+            this.page.setData({
+                disabled:1
+            });
             var s = this, a = t.currentTarget.dataset.id, i = t.currentTarget.dataset.name;        
             isNaN(parseInt(a)) || !parseInt(a) ? (a = 0, this.currentArea = 0) : (0 == this.currentArea ? (this.address.province_name = i, 
             this.address.province = a, this.address.city_name = "", this.address.city = 0, this.address.district_name = "", 
@@ -55,13 +58,14 @@ var s = function() {
                     t.data.data.pageData && t.data.data.pageData.length > 0 ? s.page.setData(e({}, s.dataName, {
                         regions: t.data.data.pageData,
                         showRegionsModal: !0
-                    })) : s.endCall(a, i);                   
+                    })) : s.endCall(a, i);
                 }
             }) : this.endCall(a, i);
         }
     }, {
         key: "closeRegionsModal",
         value: function() {
+            this.page.setData({disabled:0});
             this.page.setData(e({}, this.dataName, {
                 showCategoryModal: !1
             }));
--
libgit2 0.21.4