Commit 637ab2bd29f72466dc5b6b2ef6e21988da78cff2
1 parent
f7317623
小程序支付尾款界面修改, 如果没有图片,就显示默认图
Showing
8 changed files
with
33 additions
and
16 deletions
app.wxss
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | box-sizing: border-box; |
13 | 13 | } |
14 | 14 | page { |
15 | - /*background-color: #f2f2f2;*/ | |
15 | + overflow-x: hidden; | |
16 | 16 | } |
17 | 17 | button { |
18 | 18 | border-radius: 0; padding-left: 0; |
... | ... | @@ -158,6 +158,8 @@ align-items:center; |
158 | 158 | display:flex; |
159 | 159 | justify-content:space-around; |
160 | 160 | } |
161 | +.jc_sb{ justify-content: space-between} | |
162 | + | |
161 | 163 | /* 相对定位 */ |
162 | 164 | .rel{ |
163 | 165 | position: relative; | ... | ... |
pages/cart/cart_wk/cart_wk.js
... | ... | @@ -301,6 +301,11 @@ Page({ |
301 | 301 | }, |
302 | 302 | //--弹起支付框-- |
303 | 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 | 309 | this.setData({show_pay_type:1}); |
305 | 310 | }, |
306 | 311 | |
... | ... | @@ -316,7 +321,7 @@ Page({ |
316 | 321 | |
317 | 322 | //--物流支付时要有地址-- |
318 | 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 | 73 | |
74 | 74 | <!--成团人数--> |
75 | 75 | <view class='chentuan'> |
76 | - <view class='ct_one'> | |
76 | + <view class='ct_one jc_sb'> | |
77 | 77 | <view class='ct_one_left'>成团人数</view> |
78 | 78 | <view class='ct_one_right'><text class='redwz'>1</text>人</view> |
79 | 79 | </view> |
80 | - <view class='ct_one'> | |
80 | + <view class='ct_one jc_sb'> | |
81 | 81 | <view class='ct_one_left'>成团单价</view> |
82 | 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 | 83 | </view> |
84 | - <view class='ct_one'> | |
84 | + <view class='ct_one jc_sb'> | |
85 | 85 | <view class='ct_one_left'>支付定金</view> |
86 | 86 | <view class='ct_one_right'>¥<text class='redwz'>{{order.order_amount+order.user_money}}</text> |
87 | 87 | </view> |
... | ... | @@ -90,13 +90,13 @@ |
90 | 90 | |
91 | 91 | <!--尾款--> |
92 | 92 | <view class='chentuan'> |
93 | - <view class='ct_one'> | |
93 | + <view class='ct_one jc_sb'> | |
94 | 94 | <view class='ct_one_left'>尾款金额</view> |
95 | 95 | <view class='ct_one_right'>¥<text class='redwz'>{{order.pt_tail_money}}</text> |
96 | 96 | </view> |
97 | 97 | </view> |
98 | 98 | |
99 | - <view class='ct_one'> | |
99 | + <view class='ct_one jc_sb'> | |
100 | 100 | <view class='ct_one_left'>配送费用</view> |
101 | 101 | <view class='ct_one_right'>¥<text class='redwz'>{{exp_price}}</text> |
102 | 102 | </view> | ... | ... |
pages/cart/cart_wk/cart_wk.wxss
... | ... | @@ -168,7 +168,7 @@ margin-top: 10rpx; |
168 | 168 | height: 40rpx; |
169 | 169 | margin-bottom: 10rpx; |
170 | 170 | display: flex; |
171 | - width: 100%; | |
171 | + width: 708rpx; | |
172 | 172 | } |
173 | 173 | |
174 | 174 | .chentuan .ct_one .ct_one_left { |
... | ... | @@ -177,7 +177,6 @@ margin-top: 10rpx; |
177 | 177 | |
178 | 178 | .chentuan .ct_one .ct_one_right { |
179 | 179 | text-align: right; |
180 | - margin-left: 358rpx; | |
181 | 180 | width: 200rpx; |
182 | 181 | } |
183 | 182 | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
... | ... | @@ -1478,8 +1478,6 @@ Page({ |
1478 | 1478 | }); |
1479 | 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 | 2560 | go_pay_wk:function () { |
2563 | 2561 | var url = "/pages/cart/cart_wk/cart_wk?order_id="+ this.data.wk_order_id; |
2564 | 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 | 2573 | \ No newline at end of file | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
... | ... | @@ -2,9 +2,7 @@ |
2 | 2 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
3 | 3 | |
4 | 4 | <wxs module="" src="filter.wxs"></wxs> |
5 | - | |
6 | 5 | <block wx:if="{{isshow}}"> |
7 | - | |
8 | 6 | <view class="container"> |
9 | 7 | <view class="type-navbar"> |
10 | 8 | <view class="type-box" wx:for="{{categories}}" wx:key="categories"> |
... | ... | @@ -712,7 +710,7 @@ |
712 | 710 | <view class="pding"> |
713 | 711 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> |
714 | 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 | 714 | <view class="spec-goods-info"> |
717 | 715 | <view class="spec-goods-name">{{data.goods_name}}</view> |
718 | 716 | <view class="spec-goods-price" wx:if="{{prom_price==null}}">¥ {{sele_g.shop_price}}</view> |
... | ... | @@ -797,7 +795,7 @@ |
797 | 795 | <view class="pding"> |
798 | 796 | <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> |
799 | 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 | 799 | <view class="spec-goods-info"> |
802 | 800 | <view class="spec-goods-name">{{data.goods_name}}</view> |
803 | 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 | 658 | go_pay_wk:function(){ |
659 | 659 | var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id; |
660 | 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