From 637ab2bd29f72466dc5b6b2ef6e21988da78cff2 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 4 Sep 2019 22:21:39 +0800
Subject: [PATCH] 小程序支付尾款界面修改， 如果没有图片，就显示默认图

---
 app.wxss                                  |  4 +++-
 pages/cart/cart_wk/cart_wk.js             |  7 ++++++-
 pages/cart/cart_wk/cart_wk.wxml           | 10 +++++-----
 pages/cart/cart_wk/cart_wk.wxss           |  3 +--
 pages/goods/goodsInfo/goodsInfo.js        |  9 +++++++--
 pages/goods/goodsInfo/goodsInfo.wxml      |  6 ++----
 pages/team/team_success/team_success.js   |  8 ++++++++
 pages/team/team_success/team_success.wxml |  2 +-
 8 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/app.wxss b/app.wxss
index 4a90e28..530e4b0 100644
--- a/app.wxss
+++ b/app.wxss
@@ -12,7 +12,7 @@
     box-sizing: border-box;
 }
 page {
-    /*background-color: #f2f2f2;*/  
+  overflow-x: hidden;
 }
 button {
     border-radius: 0; padding-left: 0;
@@ -158,6 +158,8 @@ align-items:center;
  display:flex;
 justify-content:space-around;
 }
+.jc_sb{ justify-content: space-between}
+
 /* 相对定位 */
 .rel{
   position: relative;
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 79c16d4..dafbfea 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -301,6 +301,11 @@ Page({
   },
   //--弹起支付框--
   to_pay(){
+     //--物流支付时要有地址--
+     if (this.data.exp_type == 0 && this.data.user_addr == null) {
+       return getApp().my_warnning("请选择收货地址", 0, this);
+     }
+
       this.setData({show_pay_type:1});
   },
 
@@ -316,7 +321,7 @@ Page({
 
       //--物流支付时要有地址--
       if (th.data.exp_type == 0 && th.data.user_addr==null){
-           return getApp().my_warnning("请先建地址",0,th);
+           return getApp().my_warnning("请选择收货地址",0,th);
       }
 
       //---支付参数--
diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml
index 987536f..adccd77 100644
--- a/pages/cart/cart_wk/cart_wk.wxml
+++ b/pages/cart/cart_wk/cart_wk.wxml
@@ -73,15 +73,15 @@
 
 <!--成团人数-->
 <view class='chentuan'>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团人数</view>
     <view class='ct_one_right'><text class='redwz'>1</text>人</view>
   </view>
-  <view class='ct_one'>
+  <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>
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>支付定金</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{order.order_amount+order.user_money}}</text>
     </view>
@@ -90,13 +90,13 @@
 
 <!--尾款-->
 <view class='chentuan'>
-  <view class='ct_one'>
+  <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>
   </view>
 
-  <view class='ct_one'>
+  <view class='ct_one jc_sb'>
     <view class='ct_one_left'>配送费用</view>
     <view class='ct_one_right'>￥<text class='redwz'>{{exp_price}}</text>
     </view>
diff --git a/pages/cart/cart_wk/cart_wk.wxss b/pages/cart/cart_wk/cart_wk.wxss
index cc9f602..e8f3bf6 100644
--- a/pages/cart/cart_wk/cart_wk.wxss
+++ b/pages/cart/cart_wk/cart_wk.wxss
@@ -168,7 +168,7 @@ margin-top: 10rpx;
   height: 40rpx;
   margin-bottom: 10rpx;
   display: flex;
-  width: 100%;
+  width: 708rpx;
 }
 
 .chentuan .ct_one .ct_one_left {
@@ -177,7 +177,6 @@ margin-top: 10rpx;
 
 .chentuan .ct_one .ct_one_right {
   text-align: right;
-  margin-left: 358rpx;
   width: 200rpx;
 }
 
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 66fc74b..46ee0e0 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1478,8 +1478,6 @@ Page({
                           });
                           th.data.wk_order_id=odr.order_id;
                       }
-
-
                     }
                   },
                 });
@@ -2562,6 +2560,13 @@ Page({
   go_pay_wk:function () {
     var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id;
     getApp().goto(url);
+  },
+
+  pop_err_img:function(e){
+     var txt = e.currentTarget.dataset.errorimg;
+     var ob={};
+     ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+     this.setData(ob);
   }
 
 });
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index b024234..0d40213 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -2,9 +2,7 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 
 <wxs module="" src="filter.wxs"></wxs>
- 
 <block wx:if="{{isshow}}">  
-
   <view class="container">
     <view class="type-navbar">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
@@ -712,7 +710,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image>
+        <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="{{prom_price==null}}">￥ {{sele_g.shop_price}}</view>
@@ -797,7 +795,7 @@
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image>
+        <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}}
diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js
index cc637a3..6686cd0 100644
--- a/pages/team/team_success/team_success.js
+++ b/pages/team/team_success/team_success.js
@@ -658,6 +658,14 @@ Page({
     go_pay_wk:function(){
       var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
       getApp().goto(url);
+    },
+
+    img_show_err:function(e){
+        var err_img = e.currentTarget.dataset.err;
+        var ob={};
+        ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
+        this.setData(ob);
+        
     }
   
 })
diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml
index 58f4690..33db5cb 100644
--- a/pages/team/team_success/team_success.wxml
+++ b/pages/team/team_success/team_success.wxml
@@ -4,7 +4,7 @@
 
   <view class='center'>
     <view class='cenleft'>
-      <image src='{{image}}'></image>
+      <image src='{{image}}' binderror='img_show_err' data-err="image"></image>
     </view>
     <view class='cenright'>
       <!----//图片区域---->
--
libgit2 0.21.4