Commit 637ab2bd29f72466dc5b6b2ef6e21988da78cff2
1 parent
f7317623
小程序支付尾款界面修改, 如果没有图片,就显示默认图
Showing
8 changed files
with
33 additions
and
16 deletions
app.wxss
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | box-sizing: border-box; | 12 | box-sizing: border-box; |
| 13 | } | 13 | } |
| 14 | page { | 14 | page { |
| 15 | - /*background-color: #f2f2f2;*/ | 15 | + overflow-x: hidden; |
| 16 | } | 16 | } |
| 17 | button { | 17 | button { |
| 18 | border-radius: 0; padding-left: 0; | 18 | border-radius: 0; padding-left: 0; |
| @@ -158,6 +158,8 @@ align-items:center; | @@ -158,6 +158,8 @@ align-items:center; | ||
| 158 | display:flex; | 158 | display:flex; |
| 159 | justify-content:space-around; | 159 | justify-content:space-around; |
| 160 | } | 160 | } |
| 161 | +.jc_sb{ justify-content: space-between} | ||
| 162 | + | ||
| 161 | /* 相对定位 */ | 163 | /* 相对定位 */ |
| 162 | .rel{ | 164 | .rel{ |
| 163 | position: relative; | 165 | position: relative; |
pages/cart/cart_wk/cart_wk.js
| @@ -301,6 +301,11 @@ Page({ | @@ -301,6 +301,11 @@ Page({ | ||
| 301 | }, | 301 | }, |
| 302 | //--弹起支付框-- | 302 | //--弹起支付框-- |
| 303 | to_pay(){ | 303 | to_pay(){ |
| 304 | + //--物流支付时要有地址-- | ||
| 305 | + if (this.data.exp_type == 0 && this.data.user_addr == null) { | ||
| 306 | + return getApp().my_warnning("请选择收货地址", 0, this); | ||
| 307 | + } | ||
| 308 | + | ||
| 304 | this.setData({show_pay_type:1}); | 309 | this.setData({show_pay_type:1}); |
| 305 | }, | 310 | }, |
| 306 | 311 | ||
| @@ -316,7 +321,7 @@ Page({ | @@ -316,7 +321,7 @@ Page({ | ||
| 316 | 321 | ||
| 317 | //--物流支付时要有地址-- | 322 | //--物流支付时要有地址-- |
| 318 | if (th.data.exp_type == 0 && th.data.user_addr==null){ | 323 | if (th.data.exp_type == 0 && th.data.user_addr==null){ |
| 319 | - return getApp().my_warnning("请先建地址",0,th); | 324 | + return getApp().my_warnning("请选择收货地址",0,th); |
| 320 | } | 325 | } |
| 321 | 326 | ||
| 322 | //---支付参数-- | 327 | //---支付参数-- |
pages/cart/cart_wk/cart_wk.wxml
| @@ -73,15 +73,15 @@ | @@ -73,15 +73,15 @@ | ||
| 73 | 73 | ||
| 74 | <!--成团人数--> | 74 | <!--成团人数--> |
| 75 | <view class='chentuan'> | 75 | <view class='chentuan'> |
| 76 | - <view class='ct_one'> | 76 | + <view class='ct_one jc_sb'> |
| 77 | <view class='ct_one_left'>成团人数</view> | 77 | <view class='ct_one_left'>成团人数</view> |
| 78 | <view class='ct_one_right'><text class='redwz'>1</text>人</view> | 78 | <view class='ct_one_right'><text class='redwz'>1</text>人</view> |
| 79 | </view> | 79 | </view> |
| 80 | - <view class='ct_one'> | 80 | + <view class='ct_one jc_sb'> |
| 81 | <view class='ct_one_left'>成团单价</view> | 81 | <view class='ct_one_left'>成团单价</view> |
| 82 | <view class='ct_one_right'>¥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}</text></view> | 82 | <view class='ct_one_right'>¥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}</text></view> |
| 83 | </view> | 83 | </view> |
| 84 | - <view class='ct_one'> | 84 | + <view class='ct_one jc_sb'> |
| 85 | <view class='ct_one_left'>支付定金</view> | 85 | <view class='ct_one_left'>支付定金</view> |
| 86 | <view class='ct_one_right'>¥<text class='redwz'>{{order.order_amount+order.user_money}}</text> | 86 | <view class='ct_one_right'>¥<text class='redwz'>{{order.order_amount+order.user_money}}</text> |
| 87 | </view> | 87 | </view> |
| @@ -90,13 +90,13 @@ | @@ -90,13 +90,13 @@ | ||
| 90 | 90 | ||
| 91 | <!--尾款--> | 91 | <!--尾款--> |
| 92 | <view class='chentuan'> | 92 | <view class='chentuan'> |
| 93 | - <view class='ct_one'> | 93 | + <view class='ct_one jc_sb'> |
| 94 | <view class='ct_one_left'>尾款金额</view> | 94 | <view class='ct_one_left'>尾款金额</view> |
| 95 | <view class='ct_one_right'>¥<text class='redwz'>{{order.pt_tail_money}}</text> | 95 | <view class='ct_one_right'>¥<text class='redwz'>{{order.pt_tail_money}}</text> |
| 96 | </view> | 96 | </view> |
| 97 | </view> | 97 | </view> |
| 98 | 98 | ||
| 99 | - <view class='ct_one'> | 99 | + <view class='ct_one jc_sb'> |
| 100 | <view class='ct_one_left'>配送费用</view> | 100 | <view class='ct_one_left'>配送费用</view> |
| 101 | <view class='ct_one_right'>¥<text class='redwz'>{{exp_price}}</text> | 101 | <view class='ct_one_right'>¥<text class='redwz'>{{exp_price}}</text> |
| 102 | </view> | 102 | </view> |
pages/cart/cart_wk/cart_wk.wxss
| @@ -168,7 +168,7 @@ margin-top: 10rpx; | @@ -168,7 +168,7 @@ margin-top: 10rpx; | ||
| 168 | height: 40rpx; | 168 | height: 40rpx; |
| 169 | margin-bottom: 10rpx; | 169 | margin-bottom: 10rpx; |
| 170 | display: flex; | 170 | display: flex; |
| 171 | - width: 100%; | 171 | + width: 708rpx; |
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | .chentuan .ct_one .ct_one_left { | 174 | .chentuan .ct_one .ct_one_left { |
| @@ -177,7 +177,6 @@ margin-top: 10rpx; | @@ -177,7 +177,6 @@ margin-top: 10rpx; | ||
| 177 | 177 | ||
| 178 | .chentuan .ct_one .ct_one_right { | 178 | .chentuan .ct_one .ct_one_right { |
| 179 | text-align: right; | 179 | text-align: right; |
| 180 | - margin-left: 358rpx; | ||
| 181 | width: 200rpx; | 180 | width: 200rpx; |
| 182 | } | 181 | } |
| 183 | 182 |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1478,8 +1478,6 @@ Page({ | @@ -1478,8 +1478,6 @@ Page({ | ||
| 1478 | }); | 1478 | }); |
| 1479 | th.data.wk_order_id=odr.order_id; | 1479 | th.data.wk_order_id=odr.order_id; |
| 1480 | } | 1480 | } |
| 1481 | - | ||
| 1482 | - | ||
| 1483 | } | 1481 | } |
| 1484 | }, | 1482 | }, |
| 1485 | }); | 1483 | }); |
| @@ -2562,6 +2560,13 @@ Page({ | @@ -2562,6 +2560,13 @@ Page({ | ||
| 2562 | go_pay_wk:function () { | 2560 | go_pay_wk:function () { |
| 2563 | var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id; | 2561 | var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id; |
| 2564 | getApp().goto(url); | 2562 | getApp().goto(url); |
| 2563 | + }, | ||
| 2564 | + | ||
| 2565 | + pop_err_img:function(e){ | ||
| 2566 | + var txt = e.currentTarget.dataset.errorimg; | ||
| 2567 | + var ob={}; | ||
| 2568 | + ob[txt] = this.data.iurl + "/miniapp/images/default_g_img.gif"; | ||
| 2569 | + this.setData(ob); | ||
| 2565 | } | 2570 | } |
| 2566 | 2571 | ||
| 2567 | }); | 2572 | }); |
| 2568 | \ No newline at end of file | 2573 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
| 2 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 2 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 3 | 3 | ||
| 4 | <wxs module="" src="filter.wxs"></wxs> | 4 | <wxs module="" src="filter.wxs"></wxs> |
| 5 | - | ||
| 6 | <block wx:if="{{isshow}}"> | 5 | <block wx:if="{{isshow}}"> |
| 7 | - | ||
| 8 | <view class="container"> | 6 | <view class="container"> |
| 9 | <view class="type-navbar"> | 7 | <view class="type-navbar"> |
| 10 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> | 8 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> |
| @@ -712,7 +710,7 @@ | @@ -712,7 +710,7 @@ | ||
| 712 | <view class="pding"> | 710 | <view class="pding"> |
| 713 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | 711 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> |
| 714 | <view class="spec-goods"> | 712 | <view class="spec-goods"> |
| 715 | - <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image> | 713 | + <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> |
| 716 | <view class="spec-goods-info"> | 714 | <view class="spec-goods-info"> |
| 717 | <view class="spec-goods-name">{{data.goods_name}}</view> | 715 | <view class="spec-goods-name">{{data.goods_name}}</view> |
| 718 | <view class="spec-goods-price" wx:if="{{prom_price==null}}">¥ {{sele_g.shop_price}}</view> | 716 | <view class="spec-goods-price" wx:if="{{prom_price==null}}">¥ {{sele_g.shop_price}}</view> |
| @@ -797,7 +795,7 @@ | @@ -797,7 +795,7 @@ | ||
| 797 | <view class="pding"> | 795 | <view class="pding"> |
| 798 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> | 796 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> |
| 799 | <view class="spec-goods"> | 797 | <view class="spec-goods"> |
| 800 | - <image class="wh100 spec-img" src="{{data.original_img}}" binderror="" data-errorimg="data.original_img"></image> | 798 | + <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> |
| 801 | <view class="spec-goods-info"> | 799 | <view class="spec-goods-info"> |
| 802 | <view class="spec-goods-name">{{data.goods_name}}</view> | 800 | <view class="spec-goods-name">{{data.goods_name}}</view> |
| 803 | <view class="spec-goods-price" wx:if="{{is_normal==1}}">¥ {{sele_g.shop_price}} | 801 | <view class="spec-goods-price" wx:if="{{is_normal==1}}">¥ {{sele_g.shop_price}} |
pages/team/team_success/team_success.js
| @@ -658,6 +658,14 @@ Page({ | @@ -658,6 +658,14 @@ Page({ | ||
| 658 | go_pay_wk:function(){ | 658 | go_pay_wk:function(){ |
| 659 | var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; | 659 | var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; |
| 660 | getApp().goto(url); | 660 | getApp().goto(url); |
| 661 | + }, | ||
| 662 | + | ||
| 663 | + img_show_err:function(e){ | ||
| 664 | + var err_img = e.currentTarget.dataset.err; | ||
| 665 | + var ob={}; | ||
| 666 | + ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif"; | ||
| 667 | + this.setData(ob); | ||
| 668 | + | ||
| 661 | } | 669 | } |
| 662 | 670 | ||
| 663 | }) | 671 | }) |
pages/team/team_success/team_success.wxml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | 4 | ||
| 5 | <view class='center'> | 5 | <view class='center'> |
| 6 | <view class='cenleft'> | 6 | <view class='cenleft'> |
| 7 | - <image src='{{image}}'></image> | 7 | + <image src='{{image}}' binderror='img_show_err' data-err="image"></image> |
| 8 | </view> | 8 | </view> |
| 9 | <view class='cenright'> | 9 | <view class='cenright'> |
| 10 | <!----//图片区域----> | 10 | <!----//图片区域----> |