Commit 6401bb39858d578c253919d121e45b562b3ab1b1
1 parent
a0f4b1cb
提交订单页样式修改
Showing
2 changed files
with
46 additions
and
37 deletions
pages/cart/cart2/cart2.wxml
@@ -167,7 +167,7 @@ | @@ -167,7 +167,7 @@ | ||
167 | <!-- <view class="xc-border xc-border"></view> --> | 167 | <!-- <view class="xc-border xc-border"></view> --> |
168 | <block wx:if="{{is_b_now==1}}"> | 168 | <block wx:if="{{is_b_now==1}}"> |
169 | <view class="use-item bfff bdr_t-14 mgt20"> | 169 | <view class="use-item bfff bdr_t-14 mgt20"> |
170 | - <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> | 170 | + <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> |
171 | <view>{{bn_pickname}}</view> | 171 | <view>{{bn_pickname}}</view> |
172 | <!-- <view>门店:{{bn_pickname}}</view> --> | 172 | <!-- <view>门店:{{bn_pickname}}</view> --> |
173 | </view> | 173 | </view> |
@@ -245,7 +245,7 @@ | @@ -245,7 +245,7 @@ | ||
245 | </block> | 245 | </block> |
246 | 246 | ||
247 | 247 | ||
248 | - <view class="set-mes"> | 248 | + <view class="set-mes bdr_b-14"> |
249 | <view wx:if="{{order.store_prom}}"> | 249 | <view wx:if="{{order.store_prom}}"> |
250 | <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | 250 | <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} |
251 | </view> | 251 | </view> |
@@ -268,13 +268,13 @@ | @@ -268,13 +268,13 @@ | ||
268 | 268 | ||
269 | <view class="use-item flex-space-between"> | 269 | <view class="use-item flex-space-between"> |
270 | <view class="flex"> | 270 | <view class="flex"> |
271 | - <view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> | 271 | + <view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> |
272 | <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | 272 | <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> |
273 | - <view class="yu_er">自提</view> | 273 | + <view class="yu_er">门店自提</view> |
274 | </view> | 274 | </view> |
275 | <view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> | 275 | <view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> |
276 | <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | 276 | <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> |
277 | - <view class="yu_er">物流</view> | 277 | + <view class="yu_er">快递邮寄</view> |
278 | </view> | 278 | </view> |
279 | </view> | 279 | </view> |
280 | <block wx:if="{{bn_exp_type==0}}"> | 280 | <block wx:if="{{bn_exp_type==0}}"> |
@@ -285,22 +285,23 @@ | @@ -285,22 +285,23 @@ | ||
285 | </block> | 285 | </block> |
286 | </view> | 286 | </view> |
287 | </view> | 287 | </view> |
288 | - | ||
289 | - <!-----使用余额------> | ||
290 | - <view class="set-mes" wx:if="{{yuer>0}}"> | ||
291 | - <view class="use-item" bindtap='set_bn_useyuer'> | ||
292 | - <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon> | ||
293 | - <view class="yu_er">使用余额 :¥{{yuer}} </view> | ||
294 | - </view> | ||
295 | - </view> | 288 | + |
296 | <view class="coupon-mes flex-vertical"> | 289 | <view class="coupon-mes flex-vertical"> |
297 | <view>留言</view> | 290 | <view>留言</view> |
298 | <view class="leave-word"> | 291 | <view class="leave-word"> |
299 | <input placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" | 292 | <input placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" |
300 | class="word-box" maxlength="100" name="user_note"></input> | 293 | class="word-box" maxlength="100" name="user_note"></input> |
294 | + </view> | ||
295 | + </view> | ||
301 | 296 | ||
297 | + <!-----使用余额------> | ||
298 | + <view class="set-mes bdr_t-14" wx:if="{{yuer>0}}"> | ||
299 | + <view class="use-item" bindtap='set_bn_useyuer'> | ||
300 | + <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon> | ||
301 | + <view class="yu_er">使用余额 :¥{{yuer}} </view> | ||
302 | </view> | 302 | </view> |
303 | </view> | 303 | </view> |
304 | + | ||
304 | </block> | 305 | </block> |
305 | 306 | ||
306 | <view class="information bdr_b-14"> | 307 | <view class="information bdr_b-14"> |
@@ -335,7 +336,7 @@ | @@ -335,7 +336,7 @@ | ||
335 | 336 | ||
336 | <view class="btn-wrap shadow-1"> | 337 | <view class="btn-wrap shadow-1"> |
337 | <view class="pay-amount"> | 338 | <view class="pay-amount"> |
338 | - <view class="payable">应付金额:¥{{formData.order_amount}}</view> | 339 | + <view class="payable">应付金额:<text class="co-red">¥{{formData.order_amount}}</text></view> |
339 | <!-- <view class="co-red big"></view> --> | 340 | <!-- <view class="co-red big"></view> --> |
340 | </view> | 341 | </view> |
341 | <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> | 342 | <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> |
pages/cart/cart2/cart2.wxss
@@ -370,7 +370,7 @@ margin:auto; */ | @@ -370,7 +370,7 @@ margin:auto; */ | ||
370 | /* 自定义弹出窗口 */ | 370 | /* 自定义弹出窗口 */ |
371 | .cx-popup{ | 371 | .cx-popup{ |
372 | width:100%; | 372 | width:100%; |
373 | - height:900rpx; | 373 | + height:880rpx; |
374 | background: #fff; | 374 | background: #fff; |
375 | z-index: 35; | 375 | z-index: 35; |
376 | border-top-left-radius: 20rpx; | 376 | border-top-left-radius: 20rpx; |
@@ -492,9 +492,9 @@ color: #333; | @@ -492,9 +492,9 @@ color: #333; | ||
492 | } | 492 | } |
493 | 493 | ||
494 | .xc-confirm { | 494 | .xc-confirm { |
495 | - width: 48%; | 495 | + width: 50%; |
496 | border-radius: 50rpx; | 496 | border-radius: 50rpx; |
497 | - height: 50rpx; | 497 | + height: 80rpx; |
498 | margin:0 auto; | 498 | margin:0 auto; |
499 | background:#d60021; | 499 | background:#d60021; |
500 | color:#fff; | 500 | color:#fff; |
@@ -570,13 +570,13 @@ border-bottom: 1rpx solid #eee; | @@ -570,13 +570,13 @@ border-bottom: 1rpx solid #eee; | ||
570 | width: 100%; | 570 | width: 100%; |
571 | height: 65%; | 571 | height: 65%; |
572 | overflow-y: auto; | 572 | overflow-y: auto; |
573 | - margin-bottom: 10rpx; | 573 | + margin-bottom: 40rpx; |
574 | 574 | ||
575 | } | 575 | } |
576 | .xc-confirms { | 576 | .xc-confirms { |
577 | width: 40%; | 577 | width: 40%; |
578 | border-radius: 50rpx; | 578 | border-radius: 50rpx; |
579 | - height: 55rpx; | 579 | + height: 80rpx; |
580 | margin:0 auto; | 580 | margin:0 auto; |
581 | font-size:28rpx; | 581 | font-size:28rpx; |
582 | background: #fff; | 582 | background: #fff; |
@@ -588,13 +588,14 @@ border-bottom: 1rpx solid #eee; | @@ -588,13 +588,14 @@ border-bottom: 1rpx solid #eee; | ||
588 | 588 | ||
589 | /* 优惠券的改版样式 */ | 589 | /* 优惠券的改版样式 */ |
590 | .xc-coupon-frame{ | 590 | .xc-coupon-frame{ |
591 | - width: 710rpx; | 591 | + /* width: 710rpx; */ |
592 | + width: 100%; | ||
592 | height:auto; | 593 | height:auto; |
593 | margin: 0 auto; | 594 | margin: 0 auto; |
594 | 595 | ||
595 | } | 596 | } |
596 | .xc-coupon-frame .coupon-frame{ | 597 | .xc-coupon-frame .coupon-frame{ |
597 | - width: 99%; | 598 | + width: 100%; |
598 | height: 200rpx; | 599 | height: 200rpx; |
599 | margin-top:10rpx; | 600 | margin-top:10rpx; |
600 | border-bottom: 1rpx solid #eee; | 601 | border-bottom: 1rpx solid #eee; |
@@ -638,12 +639,12 @@ width:100%; | @@ -638,12 +639,12 @@ width:100%; | ||
638 | top:-37rpx; | 639 | top:-37rpx; |
639 | } | 640 | } |
640 | .coupon-right{ | 641 | .coupon-right{ |
641 | - width:490rpx; | 642 | + /* width:490rpx; */ |
642 | height: 99%; | 643 | height: 99%; |
643 | border-top: 1rpx solid #eaeaea; | 644 | border-top: 1rpx solid #eaeaea; |
644 | /* //border-bottom: 1rpx solid #eaeaea; */ | 645 | /* //border-bottom: 1rpx solid #eaeaea; */ |
645 | border-right: 1rpx solid #eaeaea; | 646 | border-right: 1rpx solid #eaeaea; |
646 | - | 647 | + flex-grow: 1; |
647 | } | 648 | } |
648 | .coupon-annotation{ | 649 | .coupon-annotation{ |
649 | width: 95%; | 650 | width: 95%; |
@@ -733,15 +734,15 @@ align-items: center; | @@ -733,15 +734,15 @@ align-items: center; | ||
733 | width: 24rpx; | 734 | width: 24rpx; |
734 | } | 735 | } |
735 | .xc-buttom{ | 736 | .xc-buttom{ |
736 | - width:99%; | ||
737 | -min-height:76rpx; | ||
738 | -height:auto; | ||
739 | -line-height:40rpx; | ||
740 | -border-left:1rpx solid #eee; | ||
741 | -border-right:1rpx solid #eee; | ||
742 | -border-bottom:1rpx solid #eee; | ||
743 | -margin-left: 6rpx; | ||
744 | - | 737 | + box-sizing: border-box; |
738 | + width:100%; | ||
739 | + min-height:76rpx; | ||
740 | + height:auto; | ||
741 | + line-height:40rpx; | ||
742 | + border-left:1rpx solid #eee; | ||
743 | + border-right:1rpx solid #eee; | ||
744 | + border-bottom:1rpx solid #eee; | ||
745 | +/* margin-left: 6rpx; */ | ||
745 | } | 746 | } |
746 | 747 | ||
747 | .goods-num{ | 748 | .goods-num{ |
@@ -787,10 +788,12 @@ width:42rpx; | @@ -787,10 +788,12 @@ width:42rpx; | ||
787 | height:42rpx; | 788 | height:42rpx; |
788 | } | 789 | } |
789 | .may_use_coupon{ | 790 | .may_use_coupon{ |
790 | - width: 95%; | ||
791 | - height: 68rpx; | 791 | + /* width: 95%; */ |
792 | + /* height: 68rpx; */ | ||
792 | line-height:78rpx; | 793 | line-height:78rpx; |
793 | - margin: auto; | 794 | + padding: 0 26rpx; |
795 | + justify-content: space-between; | ||
796 | + align-items: center; | ||
794 | } | 797 | } |
795 | .determine-frame{ | 798 | .determine-frame{ |
796 | width: 100%; | 799 | width: 100%; |
@@ -798,7 +801,7 @@ height:42rpx; | @@ -798,7 +801,7 @@ height:42rpx; | ||
798 | 801 | ||
799 | } | 802 | } |
800 | .xc-determine{ | 803 | .xc-determine{ |
801 | - height: 55rpx; | 804 | + height: 80rpx; |
802 | width: 40%; | 805 | width: 40%; |
803 | border-radius: 50rpx; | 806 | border-radius: 50rpx; |
804 | background: #d60021; | 807 | background: #d60021; |
@@ -882,4 +885,9 @@ margin-left: 20rpx; | @@ -882,4 +885,9 @@ margin-left: 20rpx; | ||
882 | .n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } | 885 | .n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } |
883 | .gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} | 886 | .gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} |
884 | 887 | ||
885 | -.quan_num_show{ padding: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;} | ||
886 | \ No newline at end of file | 888 | \ No newline at end of file |
889 | +.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} | ||
890 | + | ||
891 | +.navigator-hover { | ||
892 | + background: none; | ||
893 | + opacity: 1; | ||
894 | +} |