From 54d4cbb47bce2a693b34ab02303be3c9fc6f6b08 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Tue, 3 Sep 2019 23:24:13 +0800
Subject: [PATCH] 小程序BUG 修改

---
 pages/cart/cart2/cart2.js                 | 32 +++++++++++++++++++-------------
 pages/cart/cart2_pt/cart2_pt.js           |  1 +
 pages/cart/cart_wk/cart_wk.js             | 26 +++++++++++++++++---------
 pages/cart/cart_wk/cart_wk.wxml           |  5 ++---
 pages/goods/goodsInfo/goodsInfo.js        | 19 +++++++++++++------
 pages/goods/goodsInfo/goodsInfo.wxml      |  5 +++--
 pages/team/team_success/team_success.wxml |  6 ++----
 pages/team/team_success/team_success.wxss |  5 +----
 pages/user/order_detail/order_detail.js   |  5 +++++
 pages/user/order_detail/order_detail.wxml | 47 ++++++++++++++++++++++++++++++++++++-----------
 pages/user/order_list/order_list.wxml     | 10 +++++++++-
 pages/user/order_list/order_list.wxss     |  8 ++++----
 12 files changed, 112 insertions(+), 57 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 6e5dfe2..ead433a 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -81,6 +81,7 @@ Page({
     th.data.param=t;
     //-----先获取物流，再获取用户信息，再展示页面-----
     th.get_wuliu(th.get_info(th.show_page));
+   
   },
   onUnload: function () { this.setData({ isclose: 1 })},
   //-------------------获取物流---------------
@@ -101,12 +102,7 @@ Page({
 
   //------获取会员收货地址-----
   getuser_addr:function(func){
-    console.log(to.globalData.baddr);
-    if (to.globalData.baddr!=null){
-      var user_addr = to.globalData.baddr;
-      to.globalData.baddr=null;
-      func(user_addr);
-    }else{
+    
       a.get("/api/weshop/useraddress/page", {
         data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 },
         success: function (su) {
@@ -121,10 +117,11 @@ Page({
             if (user_addr[i]['is_default'] == 1) { item = user_addr[i]; break; }
           }
           if (item == null) item = user_addr[0];
+          if(item==undefined) item=null;
           func(item);
         }
       });
-    }
+    
   },
   //----------------展示页面,是再获取用户信息之后--------------
   show_page:function(){
@@ -375,9 +372,17 @@ Page({
 
     }else{
       this.getuser_addr(function(ie){
-        th.setData({user_addr: ie });
-      });
 
+          console.log("getuser_addr")
+          console.log(ie)
+
+          th.setData({user_addr: ie });
+          if (th.data.is_b_now == 1) {
+              th.calculatePrice2();
+          } else {
+             th.calculatePrice();
+          }
+      });
     }
   },
   //---------------检查是否有收货地址-------------------
@@ -676,7 +681,8 @@ Page({
     if (th.data.is_b_now==1){
       console.log("buy_new");
 
-      if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ ff = false; confirmBox("请新建收货地址"); }
+      if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ 
+          ff = false; getApp().confirmBox("请新建收货地址"); }
       if (!ff) return false;
       var addr = th.data.user_addr;
       if (th.data.bn_exp_type == 1) addr=null;
@@ -687,7 +693,7 @@ Page({
 
       if(th.data.bn_exp_type==0)
         if(th.data.wu_arr==null ||  th.data.wu_arr.length<=0){
-          confirmBox("读取物流失败");
+          getApp().confirmBox("读取物流失败");
           return false;
         }
 
@@ -752,7 +758,7 @@ Page({
       console.log(pdata);
     }else{
       //---------购物车的结算---------
-      if (th.data.is_all_zt == 0 && th.data.user_addr == null) { ff = false;confirmBox("请新建收货地址");}
+      if (th.data.is_all_zt == 0 && th.data.user_addr == null) { ff = false; getApp().confirmBox("请新建收货地址");}
       if (!ff) return false;
 
       var addr = th.data.user_addr;
@@ -763,7 +769,7 @@ Page({
 
       if(th.data.is_all_zt !=1)
         if(th.data.wu_arr==null || th.data.wu_arr.length<=0 ){
-          confirmBox("读取物流失败");
+          getApp().confirmBox("读取物流失败");
           return false;
         }
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index 015109d..b89c832 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -110,6 +110,7 @@ Page({
               if (user_addr[i]['is_default'] == 1) { item = user_addr[i]; break; }
             }
             if (item == null) item = user_addr[0];
+            if (item == undefined) item = null;
             func(item);
           }
         });
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index c53abc7..79c16d4 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -59,12 +59,16 @@ Page({
 	
 	 th.getuser_addr(function(addr) {
       if(addr==null || addr==undefined || addr.length==0) {
-	    	th.setData({ enterAddressPage: 1,});
+        th.setData({ user_addr: null, enterAddressPage: 1,});
       }else {
         th.setData({
           user_addr: addr, enterAddressPage: 0,
         });
       }
+
+     if (th.data.exp_type == 0){
+       th.calculate_wuliu();
+     }
 	 })
 	
   },
@@ -92,13 +96,9 @@ Page({
 
   //------获取会员收货地址-----
   getuser_addr: function(func) {
-    var to = getApp(),
+      var to = getApp(),
       a = to.request;
-    if (to.globalData.baddr != null) {
-      var user_addr = to.globalData.baddr;
-      to.globalData.baddr = null;
-      func(user_addr);
-    } else {
+
       a.get("/api/weshop/useraddress/page", {
         data: {
           user_id: to.globalData.user_id,
@@ -115,10 +115,11 @@ Page({
             }
           }
           if (item == null) item = user_addr[0];
+          if (item == undefined) item = null;
           func(item);
         }
       });
-    }
+    
   },
 
   //----------------展示页面,是再获取用户信息之后--------------
@@ -312,6 +313,12 @@ Page({
   //--立即支付--
   to_pay_type: function(ind) {
       var th=this;
+
+      //--物流支付时要有地址--
+      if (th.data.exp_type == 0 && th.data.user_addr==null){
+           return getApp().my_warnning("请先建地址",0,th);
+      }
+
       //---支付参数--
       var dd = {
         order_sn: th.data.order.order_sn,
@@ -323,6 +330,7 @@ Page({
         prom_id:th.data.order.pt_prom_id,
         tail_pay_type:ind,//0微信支付 1余额支付
       };
+
       if(th.data.exp_type==0){
         var index=th.data.index;
         dd.shipping_code=th.data.wu_arr[index].code;
@@ -391,7 +399,7 @@ Page({
             case 3:
               if (goods_piece < 0) goods_piece = 0;
               //累积商品数量
-              goods_piece += good['buynum'];
+              goods_piece += th.data.order.order_goods['goods_num'];
               break;
           }
            var code = th.data.wu_arr[th.data.index].code;
diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml
index 35a361b..987536f 100644
--- a/pages/cart/cart_wk/cart_wk.wxml
+++ b/pages/cart/cart_wk/cart_wk.wxml
@@ -1,5 +1,4 @@
-<!--pages/cart/cart_wk/cart_wk.wxml-->
-
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <!----要进行判断地址是否显示---->
 <view bindtap="enterAddressPage" class="user-mes"
       hidden='{{exp_type==1 }}'>
@@ -80,7 +79,7 @@
   </view>
   <view class='ct_one'>
     <view class='ct_one_left'>成团单价</view>
-    <view class='ct_one_right'>￥<text class='redwz'>{{order.order_amount+order.user_money+order.pt_tail_money}}</text></view>
+    <view class='ct_one_right'>￥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}</text></view>
   </view>
   <view class='ct_one'>
     <view class='ct_one_left'>支付定金</view>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 335612f..66fc74b 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -174,12 +174,10 @@ Page({
     quan_list:null,    //券列表
 
     coupon:0,
-
     //会员分享的头像
     share_head:"",
     share_goods_img:"",
 
-
     //----------视频图片data参数---------
     current: 0,//图片计数
     swiperCurrent:0,//轮播的下标
@@ -211,7 +209,6 @@ Page({
     var ee = this, that=ee,
       gid = t.goods_id;
 
-
     //如果tg_id是空的话，分享回来
     if (gid == undefined || gid == null || gid == "") {
       gid = decodeURIComponent(postdata.scene);
@@ -395,8 +392,6 @@ Page({
   //---展示---
   onShow: function() {
 
-
-  
     this.data.is_timer=1;
     var ee = this,gid = this.data.gid,i=getApp().request;
     i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
@@ -1476,6 +1471,14 @@ Page({
                           user_order_pt_state: 2
                         });
                       }
+                      
+                      if (odr.pt_status == 2 && odr.is_zsorder == 4) {
+                          th.setData({
+                             user_order_pt_state: 3,
+                          });
+                          th.data.wk_order_id=odr.order_id;
+                      }
+
 
                     }
                   },
@@ -2555,6 +2558,10 @@ Page({
     getApp().goto(url);
   },
 
-
+  //--跳转到支付尾款界面--
+  go_pay_wk:function () {
+    var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id;
+    getApp().goto(url);
+  }
 
 });
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 2da3d7f..b024234 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -682,11 +682,11 @@
 
         </view>
         <!---阶梯团---->
-        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3}}" class="buy-btn cart-btn line-h">
+        <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
           <view>支付定金</view>
         </view>
-
+          
         <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view>
         <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view>
         <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view>
@@ -694,6 +694,7 @@
       <block wx:else>
         <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">您还未支付</view>
         <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">查看支付详情</view>
+        <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk"  class="buy-btn cart-btn">支付尾款</view>
       </block>
     </block>
     <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view>-->
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index 4107f9b..cadedf4 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -157,11 +157,9 @@
         <button wx:if="{{p_status==1}}"  style='background-color:#fab55a; color:#fff'>
           邀请好友参团
         </button>
-        <button style='background-color:#42c780;' wx:if="{{p_status==2}}">
+        <button style='background-color:#42c780;' wx:if="{{order.pt_status==2 && order.is_zsorder==4 }}">
           支付尾款
-        </button>
-        
-        
+        </button>    
       </view>
       <!-- <view wx:elif="{{teamlist.ct_num-ordertx.length>0}}" class='' bindtap='cmeng'> -->
     
diff --git a/pages/team/team_success/team_success.wxss b/pages/team/team_success/team_success.wxss
index 2c25548..4bf2d73 100644
--- a/pages/team/team_success/team_success.wxss
+++ b/pages/team/team_success/team_success.wxss
@@ -234,15 +234,12 @@ width:101rpx;
 }
 
 .bodybutton{
- min-height: 60rpx;
   width: 90%;
   margin: 0 auto;
   text-align: center;
   line-height: 60rpx;
   border-radius:15rpx;
-   height: auto;
-
-
+  height: auto;
 }
 
 .bodybutton button{
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 6c99e8f..30f0417 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -178,4 +178,9 @@ Page({
       _errObj[_errImg] = "public/images/default_goods_image_240.gif";
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;       
     },
+
+    zfwk:function(){
+      var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
+      getApp().goto(url);
+    }
 });
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index e9acc17..3f22b61 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -1,3 +1,4 @@
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
     <view class="user-mes" wx:if="{{order.exp_type==0}}">
         <view class="user-contact">
@@ -61,6 +62,32 @@
     </view>
     <view class="price-information information">
         <view class="title">价格信息</view>
+        <block wx:if="{{order.is_zsorder==4}}">
+           <view class="item">
+                <view>商品总价</view>
+                <view>￥ {{filters.toFix(order.order_goods[0].member_goods_price*order.order_goods[0].goods_num,2)}}元</view>
+           </view>
+           <view class="item">
+                <view>定金金额</view>
+                <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
+           </view>
+           <view class="item" wx:if="{{order.pt_tail_money>0}}">
+              <view>尾款金额</view>
+              <view>￥ {{order.pt_tail_money}}元</view>
+           </view>
+          
+            <view class="item" wx:if="{{order.pt_tail_money>0}}">
+              <view>订单总价</view>
+              <view>￥ {{order.pt_tail_money}}元</view>
+            </view>
+
+           <view class="item" wx:if="{{order.user_money>0}}">
+            <view>使用余额</view>
+            <view>￥ {{order.user_money}}元</view>
+        </view>
+        </block>
+
+        <block wx:else>
         <view class="item">
             <view>商品总价</view>
             <view>￥ {{order.goods_price}}元</view>
@@ -71,34 +98,32 @@
         </view>
         <view class="item" wx:if="{{order.coupon_price>0}}">
             <view>优惠券</view>
-            <view>- ￥ {{order.coupon_price}}元</view>
+            <view> ￥ {{order.coupon_price}}元</view>
         </view>
         <view class="item" wx:if="{{order.integral_money>0}}">
             <view>积分</view>
-            <view>- ￥ {{order.integral_money}}元</view>
+            <view> ￥ {{order.integral_money}}元</view>
         </view>
         <view class="item" wx:if="{{order.user_money>0}}">
             <view>余额</view>
-            <view>- ￥ {{order.user_money}}元</view>
+            <view> ￥ {{order.user_money}}元</view>
         </view>
         <view class="item" wx:if="{{order.order_prom_amount>0}}">
             <view>订单优惠</view>
-            <view>- ￥ {{order.order_prom_amount}}元</view>
-        </view>
-        <view class="item" wx:if="{{order.pt_tail_money>0}}">
-            <view>尾款金额</view>
-            <view>- ￥ {{order.pt_tail_money}}元</view>
+            <view>￥ {{order.order_prom_amount}}元</view>
         </view>
-
-
+       
         <view class="item">
             <view>实付金额</view>
             <view class="pay-amount">￥ {{order.order_amount}}元</view>
         </view>
+
+
+        </block> 
     </view>
 
     <view class="btn-wrap">
-        <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0}}">支付尾款</view>
+        <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
         <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index c0cd004..64d9258 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,3 +1,4 @@
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
     <view class="type-navbar">
         <view class="type-box" wx:for="{{categories}}" wx:key="{{index}}">
@@ -48,8 +49,15 @@
             <view class="goods-tips">
                 <view class="order-total">
                     共{{item.g_num}}件,<view class="goods-total">
-                        <view>金额:￥{{item.order_amount+item.user_money}}</view>
+                      <block wx:if="{{item.pt_status==4 || item.pt_status==5 }}">
+                             <view>金额:￥{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}</view>
+                      </block>    
+                      <block wx:else>
+                        <view wx:if="item.is_zsorder==4">定金:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>          
+                        <view wx:else>金额:￥{{filters.toFix(item.order_amount+item.user_money,2)}}</view>
                         <view wx:if="{{item.pt_tail_money>0}}">尾款:￥{{item.pt_tail_money}}</view>
+                      </block>    
+                     
                     </view>
                 </view>
                 <view class="check-btn">
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index 8d6baa8..769be7b 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -36,7 +36,7 @@
 .goods-box {
     width: 100%;
     background-color: #fff;
-    padding: 0 30rpx;
+    padding: 0 25rpx;
     margin-bottom: 20rpx;
     font-size: 28rpx;
     border-bottom: 1rpx solid #eee;
@@ -117,7 +117,7 @@
 .order-total {
     display: flex;
     justify-content: flex-start;
-    font-size: 32rpx;
+    font-size: 31rpx;
     color: #333;
 }
 
@@ -127,12 +127,12 @@
 }
 
 .order-btn {
-    width: 150rpx;
+    width: 125rpx;
     height: 60rpx;
     line-height: 60rpx;
     text-align: center;
     border: 1px solid #eee;
-    margin-left: 20rpx;
+    margin-left: 10rpx;
     float: right;
     border-radius: 5rpx;
 }
--
libgit2 0.21.4