Commit 2510bf00bb49d9d78bcf083b774ec5e0a653b6db
1 parent
77378de8
购物车结算
Showing
6 changed files
with
127 additions
and
41 deletions
pages/cart/cart/cart.wxml
| @@ -40,10 +40,10 @@ | @@ -40,10 +40,10 @@ | ||
| 40 | <view class="goods-name"> | 40 | <view class="goods-name"> |
| 41 | <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator> | 41 | <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator> |
| 42 | 42 | ||
| 43 | - <view class="Specifications flex-center"> | ||
| 44 | - <view class="ellipsis-1" wx:if="{{items.goods_color || items.goods_spec}}"> | 43 | + <view class="specifications ellipsis-1"> |
| 44 | + <view wx:if="{{items.goods_color || items.goods_spec}}"> | ||
| 45 | {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view> | 45 | {{items.goods_color}}{{items.goods_color?"/":''}}{{items.goods_spec}}</view> |
| 46 | - <view class="ellipsis-1" wx:else>规格1</view> | 46 | + <view wx:else>规格1</view> |
| 47 | </view> | 47 | </view> |
| 48 | </view> | 48 | </view> |
| 49 | 49 |
pages/cart/cart/cart.wxss
| @@ -231,17 +231,17 @@ radio { | @@ -231,17 +231,17 @@ radio { | ||
| 231 | color: rgb(0, 0, 0); | 231 | color: rgb(0, 0, 0); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | -.Specifications { | 234 | +.specifications { |
| 235 | padding: 3rpx 8rpx; | 235 | padding: 3rpx 8rpx; |
| 236 | margin-top: 8rpx; | 236 | margin-top: 8rpx; |
| 237 | font-size: 22rpx; | 237 | font-size: 22rpx; |
| 238 | - max-width: 115rpx; | 238 | + min-width: 50rpx; |
| 239 | + width: auto; | ||
| 239 | height: 30rpx; | 240 | height: 30rpx; |
| 240 | line-height: 29rpx; | 241 | line-height: 29rpx; |
| 241 | background-color: rgb(236, 236, 236); | 242 | background-color: rgb(236, 236, 236); |
| 242 | border-radius: 8rpx; | 243 | border-radius: 8rpx; |
| 243 | white-space: nowrap; | 244 | white-space: nowrap; |
| 244 | - overflow: hidden; | ||
| 245 | color: rgb(63, 63, 63); | 245 | color: rgb(63, 63, 63); |
| 246 | } | 246 | } |
| 247 | 247 |
pages/cart/cart2/cart2.wxml
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | <view class="goods-name">{{items.goods_name}}</view> | 50 | <view class="goods-name">{{items.goods_name}}</view> |
| 51 | 51 | ||
| 52 | <!-- 商品属性 --> | 52 | <!-- 商品属性 --> |
| 53 | - <view class="flex-vertical fs28 xc-ash">商品属性: <view class="goods-color"> | 53 | + <view class="flex-vertical fs28 color-gray">商品属性: <view class="goods-color"> |
| 54 | <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}/</text> | 54 | <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}/</text> |
| 55 | {{items.goods_color==null?"":items.goods_color}} | 55 | {{items.goods_color==null?"":items.goods_color}} |
| 56 | </view></view> | 56 | </view></view> |
pages/cart/cart2/cart2.wxss
| @@ -53,9 +53,9 @@ | @@ -53,9 +53,9 @@ | ||
| 53 | 53 | ||
| 54 | .order-detail { | 54 | .order-detail { |
| 55 | padding: 30rpx 0; | 55 | padding: 30rpx 0; |
| 56 | - border-bottom: 1px solid #ddd; | 56 | + border-bottom: 6rpx solid #eee; |
| 57 | color: #777; | 57 | color: #777; |
| 58 | - min-height: 240rpx; | 58 | + min-height: 190rpx; |
| 59 | background-color: #fff; | 59 | background-color: #fff; |
| 60 | 60 | ||
| 61 | } | 61 | } |
| @@ -817,4 +817,8 @@ font-size: 28rpx; | @@ -817,4 +817,8 @@ font-size: 28rpx; | ||
| 817 | line-height: 44rpx; | 817 | line-height: 44rpx; |
| 818 | margin-left: 20rpx; | 818 | margin-left: 20rpx; |
| 819 | 819 | ||
| 820 | +} | ||
| 821 | +.color-gray{ | ||
| 822 | + color: #808080; | ||
| 823 | + | ||
| 820 | } | 824 | } |
| 821 | \ No newline at end of file | 825 | \ No newline at end of file |
pages/cart/cart2_pt/cart2_pt.wxml
| 1 | +<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | ||
| 1 | <form bindsubmit="submitForm"> | 2 | <form bindsubmit="submitForm"> |
| 2 | <view class="container"> | 3 | <view class="container"> |
| 3 | <!--要进行判断地址是否显示----> | 4 | <!--要进行判断地址是否显示----> |
| 4 | <view bindtap="enterAddressPage" class="user-mes" hidden='{{bn_exp_type==1 || kt_type==3}}'> | 5 | <view bindtap="enterAddressPage" class="user-mes" hidden='{{bn_exp_type==1 || kt_type==3}}'> |
| 5 | <!---默认地址显示------> | 6 | <!---默认地址显示------> |
| 6 | <block wx:if="{{user_addr!=null}}"> | 7 | <block wx:if="{{user_addr!=null}}"> |
| 7 | - <view class="user-contact">{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | 8 | + <view class="user-contact">收货人：{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> |
| 8 | <view class="location"> | 9 | <view class="location"> |
| 9 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> | 10 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> |
| 10 | <view class="pos-icon"> | 11 | <view class="pos-icon"> |
| 11 | - <image class="wh100" src="{{imgUrl}}/miniapp/images/iconfont-address.png"></image> | 12 | + <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> |
| 12 | </view> | 13 | </view> |
| 13 | </view> | 14 | </view> |
| 14 | <view class="update-logistics"> | 15 | <view class="update-logistics"> |
| @@ -27,8 +28,9 @@ | @@ -27,8 +28,9 @@ | ||
| 27 | 28 | ||
| 28 | <!------立即购买--------> | 29 | <!------立即购买--------> |
| 29 | <block> | 30 | <block> |
| 31 | + <view class="xc-border main-top"></view> | ||
| 30 | <view class="use-item bfff"> | 32 | <view class="use-item bfff"> |
| 31 | - <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> | 33 | + <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>门店：{{bn_pickname}}</view></view> |
| 32 | <view class="order-detail"> | 34 | <view class="order-detail"> |
| 33 | <view class="goods-img"> | 35 | <view class="goods-img"> |
| 34 | <image class="wh100" src="{{bn_goods.original_img}}" | 36 | <image class="wh100" src="{{bn_goods.original_img}}" |
| @@ -36,28 +38,51 @@ | @@ -36,28 +38,51 @@ | ||
| 36 | </view> | 38 | </view> |
| 37 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> | 39 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
| 38 | <view class="goods-name">{{bn_goods.goods_name}}</view> | 40 | <view class="goods-name">{{bn_goods.goods_name}}</view> |
| 41 | + <!-- 商品属性 --> | ||
| 42 | + <view class="flex-vertical fs28 color-gray">商品属性: | ||
| 39 | <view class="goods-color"> | 43 | <view class="goods-color"> |
| 40 | <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} | 44 | <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} |
| 41 | - </view> | 45 | + </view> </view> |
| 46 | + | ||
| 47 | + | ||
| 48 | + <!-----商品名称规格------> | ||
| 49 | + <view class="order-num flex-space-between"> | ||
| 50 | + <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view> | ||
| 51 | + <view class="goods-num">x{{bn_goods.buynum}}</view> | ||
| 52 | + </view> | ||
| 42 | </navigator> | 53 | </navigator> |
| 43 | - <view class="order-num"> | 54 | + <!-- <view class="order-num"> |
| 44 | <view class="co-red">￥{{bn_goods.shop_price}}</view> | 55 | <view class="co-red">￥{{bn_goods.shop_price}}</view> |
| 45 | <view class="goods-num">x{{bn_goods.buynum}}</view> | 56 | <view class="goods-num">x{{bn_goods.buynum}}</view> |
| 46 | - </view> | 57 | + </view> --> |
| 47 | </view> | 58 | </view> |
| 48 | <view class="set-mes"> | 59 | <view class="set-mes"> |
| 49 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | 60 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} |
| 50 | </view> | 61 | </view> |
| 51 | 62 | ||
| 52 | <!--阶梯团是不显示的--> | 63 | <!--阶梯团是不显示的--> |
| 53 | - <view class="use-item" wx:if="{{kt_type!=3 || is_normal==1}}"> | 64 | + <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}"> |
| 54 | <view class="flex-vertical"> | 65 | <view class="flex-vertical"> |
| 55 | - <view bindtap='setexptype' data-t='1' style="display:{{bn_t_exp_t==2?'none':'flex'}};"> | ||
| 56 | - <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | 66 | + <view bindtap='setexptype' data-t='1' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> |
| 67 | + <!-- <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> --> | ||
| 68 | + <block wx:if="{{bn_exp_type==1}}"> | ||
| 69 | + | ||
| 70 | + <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
| 71 | + </block> | ||
| 72 | + <block wx:else> | ||
| 73 | + <view class="circle xc-hookts on"></view> | ||
| 74 | + </block> | ||
| 57 | <view class="yu_er">自提</view> | 75 | <view class="yu_er">自提</view> |
| 58 | </view> | 76 | </view> |
| 59 | - <view bindtap='setexptype' data-t='0' style="margin-left: 45rpx;display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> | ||
| 60 | - <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | 77 | + <view class="{{bn_t_exp_t==2?'':'xc-left'}}" bindtap='setexptype' data-t='0' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> |
| 78 | + <!-- <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> --> | ||
| 79 | + <block wx:if="{{bn_exp_type==0}}"> | ||
| 80 | + | ||
| 81 | + <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
| 82 | + </block> | ||
| 83 | + <block wx:else> | ||
| 84 | + <view class="circle xc-hookts on"></view> | ||
| 85 | + </block> | ||
| 61 | <view class="yu_er">物流</view> | 86 | <view class="yu_er">物流</view> |
| 62 | </view> | 87 | </view> |
| 63 | </view> | 88 | </view> |
| @@ -86,11 +111,11 @@ | @@ -86,11 +111,11 @@ | ||
| 86 | 111 | ||
| 87 | </view> | 112 | </view> |
| 88 | </view> | 113 | </view> |
| 89 | - <view class="coupon-mes"> | ||
| 90 | - <view>用户备注（50字）</view> | 114 | + <view class="coupon-mes flex-vertical"> |
| 115 | + <view>留言</view> | ||
| 91 | <view class="leave-word"> | 116 | <view class="leave-word"> |
| 92 | - <textarea bindinput="keyUpChangeNum" class="word-box" maxlength="50" name="user_note"></textarea> | ||
| 93 | - <view class="max-word">{{maxWord}}/50</view> | 117 | + <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea> |
| 118 | + | ||
| 94 | </view> | 119 | </view> |
| 95 | </view> | 120 | </view> |
| 96 | </block> | 121 | </block> |
pages/cart/cart2_pt/cart2_pt.wxss
| @@ -6,6 +6,8 @@ | @@ -6,6 +6,8 @@ | ||
| 6 | } | 6 | } |
| 7 | .user-contact { | 7 | .user-contact { |
| 8 | padding: 24rpx 80rpx; | 8 | padding: 24rpx 80rpx; |
| 9 | + font-weight: 600; | ||
| 10 | + | ||
| 9 | } | 11 | } |
| 10 | 12 | ||
| 11 | .location { | 13 | .location { |
| @@ -16,9 +18,9 @@ | @@ -16,9 +18,9 @@ | ||
| 16 | .pos-icon { | 18 | .pos-icon { |
| 17 | position: absolute; | 19 | position: absolute; |
| 18 | left: 30rpx; | 20 | left: 30rpx; |
| 19 | - top: 0; | 21 | + top: 20rpx; |
| 20 | width: 32rpx; | 22 | width: 32rpx; |
| 21 | - height: 32.5rpx; | 23 | + height: 40rpx; |
| 22 | } | 24 | } |
| 23 | 25 | ||
| 24 | .border-img { | 26 | .border-img { |
| @@ -50,17 +52,17 @@ | @@ -50,17 +52,17 @@ | ||
| 50 | 52 | ||
| 51 | .order-detail { | 53 | .order-detail { |
| 52 | padding: 30rpx 0; | 54 | padding: 30rpx 0; |
| 53 | - border-bottom: 1px solid #ddd; | 55 | + border-bottom: 7rpx solid #eee; |
| 54 | color: #777; | 56 | color: #777; |
| 55 | - min-height: 100rpx; | 57 | + min-height: 190rpx; |
| 56 | background-color: #fff; | 58 | background-color: #fff; |
| 57 | 59 | ||
| 58 | } | 60 | } |
| 59 | 61 | ||
| 60 | .goods-img { | 62 | .goods-img { |
| 61 | float: left; | 63 | float: left; |
| 62 | - width: 100rpx; | ||
| 63 | - height: 100rpx; | 64 | + width: 190rpx; |
| 65 | + height: 190rpx; | ||
| 64 | margin: 0 20rpx; | 66 | margin: 0 20rpx; |
| 65 | } | 67 | } |
| 66 | 68 | ||
| @@ -90,20 +92,18 @@ | @@ -90,20 +92,18 @@ | ||
| 90 | line-height: 42rpx; | 92 | line-height: 42rpx; |
| 91 | } | 93 | } |
| 92 | 94 | ||
| 93 | -.set-mes{background-color: #fff; margin-bottom: 20rpx;} | 95 | +.set-mes{background-color: #fff; } |
| 94 | .use-item{ | 96 | .use-item{ |
| 95 | display: flex; | 97 | display: flex; |
| 96 | align-items: center; | 98 | align-items: center; |
| 97 | height: 92rpx; | 99 | height: 92rpx; |
| 98 | border-bottom: 1px solid #ddd; | 100 | border-bottom: 1px solid #ddd; |
| 99 | font-size: 30rpx; | 101 | font-size: 30rpx; |
| 100 | - padding-left: 20rpx; | ||
| 101 | - justify-content: space-between; | ||
| 102 | - | ||
| 103 | - | 102 | + width: 95%; |
| 103 | + margin: auto; | ||
| 104 | } | 104 | } |
| 105 | .use-item>view{ | 105 | .use-item>view{ |
| 106 | - display: flex;margin-right: 20rpx; | 106 | + display: flex;margin-right: 10rpx; |
| 107 | } | 107 | } |
| 108 | .use-item.bfff{ background-color: #fff;} | 108 | .use-item.bfff{ background-color: #fff;} |
| 109 | .use-item .dp{width: 56rpx; height: 56rpx;} | 109 | .use-item .dp{width: 56rpx; height: 56rpx;} |
| @@ -136,11 +136,15 @@ | @@ -136,11 +136,15 @@ | ||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | .coupon-mes { | 138 | .coupon-mes { |
| 139 | - margin-bottom: 20rpx; | 139 | + height:95rpx; |
| 140 | padding: 0 20rpx; | 140 | padding: 0 20rpx; |
| 141 | background-color: #fff; | 141 | background-color: #fff; |
| 142 | font-size: 30rpx; | 142 | font-size: 30rpx; |
| 143 | color: #444; | 143 | color: #444; |
| 144 | + width: 100%; | ||
| 145 | + border-bottom: 6rpx solid #eee; | ||
| 146 | + margin-bottom: 20rpx; | ||
| 147 | + | ||
| 144 | } | 148 | } |
| 145 | 149 | ||
| 146 | .coupon-title { | 150 | .coupon-title { |
| @@ -167,15 +171,16 @@ | @@ -167,15 +171,16 @@ | ||
| 167 | 171 | ||
| 168 | .leave-word { | 172 | .leave-word { |
| 169 | position: relative; | 173 | position: relative; |
| 170 | - margin: 20rpx 0; | ||
| 171 | font-size: 24rpx; | 174 | font-size: 24rpx; |
| 175 | + margin-left: 20rpx; | ||
| 176 | + | ||
| 172 | } | 177 | } |
| 173 | 178 | ||
| 174 | .word-box { | 179 | .word-box { |
| 175 | - border: 1px solid #ddd; | ||
| 176 | - width: 690rpx; | 180 | + |
| 181 | + width: 600rpx; | ||
| 177 | padding: 10rpx; | 182 | padding: 10rpx; |
| 178 | - height: 120rpx; | 183 | + height: 28rpx; |
| 179 | line-height: 40rpx; | 184 | line-height: 40rpx; |
| 180 | } | 185 | } |
| 181 | 186 | ||
| @@ -502,7 +507,59 @@ | @@ -502,7 +507,59 @@ | ||
| 502 | border-right:2rpx solid #000; | 507 | border-right:2rpx solid #000; |
| 503 | transform:rotate(45deg); | 508 | transform:rotate(45deg); |
| 504 | display:inline-block; | 509 | display:inline-block; |
| 510 | + margin-right: 5rpx; | ||
| 511 | + margin-left: 10rpx; | ||
| 505 | 512 | ||
| 506 | } | 513 | } |
| 507 | 514 | ||
| 508 | 515 | ||
| 516 | +.xc-left{ | ||
| 517 | + margin-left: 45rpx; | ||
| 518 | +} | ||
| 519 | +.xc-border{ | ||
| 520 | + border-top:8rpx solid #eee; | ||
| 521 | +width: 100% | ||
| 522 | +} | ||
| 523 | +.main-top{ | ||
| 524 | +margin-top: 20rpx; | ||
| 525 | + | ||
| 526 | +} | ||
| 527 | +.order-num { | ||
| 528 | + margin-top: 25rpx; | ||
| 529 | + font-size: 24rpx; | ||
| 530 | + line-height: 42rpx; | ||
| 531 | + width: 95%; | ||
| 532 | + | ||
| 533 | +} | ||
| 534 | +.goods-num{ | ||
| 535 | + font-size: 28rpx; | ||
| 536 | +color: #333; | ||
| 537 | + | ||
| 538 | +} | ||
| 539 | +.click-buttem{ | ||
| 540 | +width: 90%; | ||
| 541 | +margin: auto; | ||
| 542 | +} | ||
| 543 | +.xc-determine{ | ||
| 544 | + height: 55rpx; | ||
| 545 | + width: 40%; | ||
| 546 | + border-radius: 50rpx; | ||
| 547 | +background: #d60021; | ||
| 548 | +color: #fff; | ||
| 549 | +font-size: 28rpx; | ||
| 550 | +margin: 0 auto; | ||
| 551 | + | ||
| 552 | +} | ||
| 553 | +.xc-hookts{ | ||
| 554 | +border: 1rpx solid #999; | ||
| 555 | + | ||
| 556 | +} | ||
| 557 | +.xc-hookts.on{ | ||
| 558 | + width:30rpx; | ||
| 559 | +height:30rpx; | ||
| 560 | + | ||
| 561 | +} | ||
| 562 | +.color-gray{ | ||
| 563 | + color: #808080; | ||
| 564 | + | ||
| 565 | +} | ||
| 509 | \ No newline at end of file | 566 | \ No newline at end of file |