From 38a53cad0d79517b03fe8176bfd122fea8a684a7 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Thu, 5 Sep 2019 21:48:43 +0800
Subject: [PATCH] 小程序BUG  修改

---
 pages/cart/cart2_pt/cart2_pt.wxml         |  9 +++++++--
 pages/cart/cart_wk/cart_wk.js             |  7 ++++++-
 pages/cart/cart_wk/cart_wk.wxml           |  9 ++++-----
 pages/goods/goodsInfo/goodsInfo.wxml      | 28 +++++++++++++++++++---------
 pages/goods/goodsInfo/goodsInfo.wxss      | 20 +++++++++++---------
 pages/team/team_ping/team_ping.wxml       |  2 +-
 pages/user/address_list/address_list.wxml |  2 +-
 pages/user/order_detail/order_detail.wxml |  9 +++++----
 pages/user/order_list/order_list.wxml     |  6 +++---
 utils/util.js                             |  2 ++
 10 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index a6a51a1..a61ed73 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -91,15 +91,20 @@
          </block>
 
          <view class="information">
-            <view class="item">
+            <view class="item" wx:if="{{kt_type<3}}">
                 <view>商品金额</view>
                 <view class="co-red">￥ {{formData.all_price}}元</view>
             </view>
+
+            <view class="item" wx:else>
+                <view>定金金额</view>
+                <view class="co-red">￥ {{formData.all_price}}元</view>
+            </view>
+
             <view class="item">
                 <view>配送费用</view>
                 <view class="co-red">￥ {{formData.shipping_price}}元</view>
             </view>
-
             <view class="item">
                 <view>使用余额</view>
                 <view class="co-red">- ￥ {{formData.user_money}}元</view>
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index dafbfea..cb71c0f 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -35,6 +35,8 @@ Page({
 
     allpice:0,
 		show_pay_type:0,
+
+    teamgroup: null,
   },
 
   /**
@@ -243,7 +245,8 @@ Page({
       distr_type: distr_type,
       pickup: pickup,
       exp_type: exp_type,
-      goods:goods
+      goods:goods,
+      teamgroup:teamgroup
     });
 
     //--计算物流--
@@ -417,6 +420,8 @@ Page({
             var exp_price = parseFloat(shipping_price).toFixed(2);
             allpice=parseFloat(exp_price)+parseFloat(allpice);
             allpice=allpice.toFixed(2);
+
+            exp_price = parseFloat(exp_price);
             th.setData({ exp_price: exp_price,allpice:allpice })
         }else {
           var allpice=th.data.order.order_amount+th.data.order.user_money+th.data.order.pt_tail_money;
diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml
index adccd77..2e17de5 100644
--- a/pages/cart/cart_wk/cart_wk.wxml
+++ b/pages/cart/cart_wk/cart_wk.wxml
@@ -75,11 +75,11 @@
 <view class='chentuan'>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团人数</view>
-    <view class='ct_one_right'><text class='redwz'>1</text>人</view>
+    <view class='ct_one_right'><text class='redwz'>{{teamgroup.jt_ct_num}}</text>人</view>
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团单价</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 class='ct_one_right'>￥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.tail_money,2)}}</text></view>
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>支付定金</view>
@@ -92,7 +92,7 @@
 <view class='chentuan'>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>尾款金额</view>
-    <view class='ct_one_right'>￥<text class='redwz'>{{order.pt_tail_money}}</text>
+    <view class='ct_one_right'>￥<text class='redwz'>{{order.tail_money}}</text>
     </view>
   </view>
 
@@ -107,7 +107,7 @@
 <view class='zf'>
   <view class='zf_left'>
     <text class='zf_left_wz'>支付合计：</text>
-    <text class='zf_left_red'>¥{{allpice}}</text>
+    <text class='zf_left_red'>¥{{order.tail_money+exp_price}}</text>
   </view>
   <view class='zf_btn' bindtap="to_pay">
     <text>支付尾款</text>
@@ -126,5 +126,4 @@
 	 </view>
 </block>
 
-
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 90ce198..b1bbff4 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -267,7 +267,7 @@
                   <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
                 </view>
                 <view class="xc-val-price">
-                  <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num}}件</view>
+                  <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
                   <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
                 </view>
               </view>
@@ -281,9 +281,19 @@
             <!-- 许程 7.24 暂时注释 -->
             <view wx:if="{{prom_type==1}}">
               <view class="goods-num" wx:if="{{prom_type==1}}">
-                <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                <view class="stock">限购:{{prom_act.buy_limit}}件</view>
-                <view class="sales">已购:{{prom_act.buy_num}}件</view>
+
+                <block wx:if="prom_st>0" >
+                  <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
+                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                </block>
+
+                <block wx:else>
+                   <view class="stock">总数量：{{prom_act.goods_num}}件</view>
+                   <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                   <view class="sales">已购:{{prom_act.buy_num}}件</view>
+                </block>
+
               </view>
             </view>
 
@@ -714,7 +724,7 @@
       <view class="spec-goods">
         <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
-          <view class="spec-goods-name">{{data.goods_name}}</view>
+          <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
           <view class="spec-goods-price" wx:if="{{prom_price==null}}">￥ {{sele_g.shop_price}}</view>
           <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
           <block wx:if="{{prom_type==0}}">
@@ -723,7 +733,8 @@
             <view class="spec-goods-stock">已选：{{sku_g[0].gg}}</view>
           </block>
           <block wx:if="{{prom_type==1}}">
-            <view class="spec-goods-stock">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
+            <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
+            <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
             <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
             <view class="spec-goods-stock">已选：{{sku_g[0].gg}}</view>
           </block>
@@ -799,9 +810,8 @@
       <view class="spec-goods">
         <image class="wh100 spec-img" src="{{data.original_img}}"  binderror="pop_err_img"  data-errorimg="data.original_img"></image>
         <view class="spec-goods-info">
-          <view class="spec-goods-name">{{data.goods_name}}</view>
-          <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}
-          </view>
+          <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
+          <view class="spec-goods-price" wx:if="{{is_normal==1}}">￥ {{sele_g.shop_price}}</view>
           <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view>
 
           <block wx:if="{{is_normal==0}}">
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 8000c08..71c8b6f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -505,13 +505,13 @@ view.cart-btn-lg {
     /* padding: 0 30rpx; */
     font-size: 32rpx;
     box-sizing: border-box;
-    overflow-x: hidden;
+
 }
 
 .spec-model .pding{padding: 0 30rpx;}
 
 .spec-goods {
-    padding: 15rpx 0 30rpx;
+    padding: 15rpx 0 10rpx;
     float: left;
     width: 100%;
     border-bottom: 1px solid #f8f8f8;
@@ -519,15 +519,17 @@ view.cart-btn-lg {
 
 .spec-img {
     float: left;
-    height: 150rpx;
-    width: 150rpx;
-    margin-top: 16rpx;
+    height: 186rpx;
+    width: 186rpx;
+    position: relative;
+    top:-40rpx;
+     border: 4rpx solid #eee
 }
 
 .spec-goods-info {
     float: left;
     padding: 0 25rpx;
-    width: 490rpx;
+    width: 400rpx;
 }
 
 .spec-goods-name {
@@ -541,13 +543,13 @@ view.cart-btn-lg {
 
 .spec-goods-price {
     color: #ec5151;
-    font-size: 30rpx;
+    font-size: 33rpx;
     font-weight: bold;
 }
 
 .spec-goods-stock {
-    margin-top: 10rpx;
-    font-size: 26rpx;
+    margin-top: 3rpx;
+    font-size: 24rpx;
     color: #999999;
 }
 
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index 4f60b02..15b31b4 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -65,7 +65,7 @@
         共{{item.order_goods[0].goods_num}}件, 
         <block wx:if="{{item.is_zsorder==4}}">
             <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
-               定金：<text class="xc-wc">￥</text>
+               金额：<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>       
             <block wx:else>
diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml
index 72ca32c..abb0994 100644
--- a/pages/user/address_list/address_list.wxml
+++ b/pages/user/address_list/address_list.wxml
@@ -6,7 +6,7 @@
         </view>
         <view bindtap="selectAddress" class="address-info" data-item="{{item}}">
             <view class="mobile">电话：{{item.mobile}}</view>
-            <view class="address">{{item.province_name}} {{item.city_name}} {{item.district_name}} {{item.twon_name}} {{item.address}}</view>
+            <view class="address">{{item.more_address}} {{item.address}}</view>
         </view>
         <view bindtap="editAddress" class="address-edit" data-id="{{item.address_id}}">
             <image src="{{iurl}}/miniapp/images/address_edit.png"></image>
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 9ebf674..b5cb8fd 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -71,13 +71,13 @@
               <view>￥ {{order.goods_price}}元</view>
             </view>
 
-           <view class="item pnew">
+           <view class="item pnew" wx:if="{{order.is_zsorder==4}}">
                 <view>定金金额</view>
                 <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
            </view>
            <view class="item pnew" wx:if="{{order.pt_tail_money>0}}">
               <view>尾款金额</view>
-              <view>￥ {{order.pt_tail_money}}元</view>
+              <view>￥ {{filters.toFix(order.pt_tail_money-order.shipping_price,2)}}元</view>
            </view>
 
             <view class="item pnew" wx:if="{{order.shipping_price>0}}">
@@ -101,13 +101,14 @@
           
             <view class="item">
               <view>订单总价</view>
-              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
+              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
             </view>
 
            <view class="item-line"></view>
            <view class="item" wx:if="{{order.user_money>0}}">
               <view>使用余额</view>
-              <view>￥ {{order.user_money}}元</view>
+              <view wx:if="{{order.tail_pay_type==1}}">￥ {{order.user_money+order.pt_tail_money}}元</view>
+              <view wx:else>￥ {{order.user_money}}元</view>
            </view>
     </view>
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 4136502..14d1e92 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -24,8 +24,8 @@
                         data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
                 </navigator>
                 <navigator class="goods-mes" url="/pages/user/order_detail/order_detail?order_id={{goods.order_id}}">
-                    <view class="goods-name">{{goods.goods_name}}</view>
-                    <view class="goods-name">{{goods.goods_color}} {{goods.goods_spec}}</view>
+                    <view class="goods-name" >{{goods.goods_name}}</view>
+                    <view class="goods-name" style="color:#999">{{goods.goods_color}} {{goods.goods_spec}}</view>
                     <view class="goods-price">¥ {{goods.member_goods_price}}</view>
                     <view class="goods-num">数量 {{goods.goods_num}}</view>
                 </navigator>
@@ -55,7 +55,7 @@
                       <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>
+                        <view wx:if="{{item.pt_tail_money>0}}">尾款:￥{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}</view>
                       </block>    
                      
                     </view>
diff --git a/utils/util.js b/utils/util.js
index 190adb8..9d1d4a5 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -6,6 +6,7 @@ function isArray(obj) {
   return (typeof obj == 'object') && obj.constructor == Array;
 }
 
+
 function sub_last(str){
   return str.substring(0, str.length - 1)
 }
@@ -336,4 +337,5 @@ module.exports = {
     sub_last: sub_last,//去掉末尾一个字符
     measureText: measureText,//画布需要的函数
     check_mobile: check_mobile,//验证手机
+   
 };
--
libgit2 0.21.4