Commit 90b370d5a0193121b9d39bfa02c09067d2d3d022
1 parent
8deb2342
提交订单页(团购、支付尾款、普通提交)样式修改
Showing
6 changed files
with
695 additions
and
275 deletions
pages/cart/cart2/cart2.wxml
... | ... | @@ -38,7 +38,7 @@ |
38 | 38 | <!-- <view class="xc-border main-top"></view> --> |
39 | 39 | <view wx:for="{{cartlist}}" wx:for-index="pidx"> |
40 | 40 | <view class="use-item bfff bdr_t-14 mgt20"> |
41 | - <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> | |
41 | + <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image> | |
42 | 42 | <!-- <view>门店:{{item.pname}}</view> --> |
43 | 43 | <view>{{item.pname}}</view> |
44 | 44 | </view> |
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 | </view> |
51 | 51 | <!----商品名称规格----> |
52 | 52 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}"> |
53 | - <view class="goods-name">{{items.goods_name}}</view> | |
53 | + <view class="goods-name ellipsis-2">{{items.goods_name}}</view> | |
54 | 54 | <!-- 商品属性 --> |
55 | 55 | <view class="flex-vertical fs28 color-gray n_guige"> |
56 | 56 | <view class="goods-color"> |
... | ... | @@ -176,7 +176,7 @@ |
176 | 176 | <image class="wh100 bdr14" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image> |
177 | 177 | </view> |
178 | 178 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
179 | - <view class="goods-name">{{bn_goods.goods_name}}</view> | |
179 | + <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view> | |
180 | 180 | <!-- 商品属性 --> |
181 | 181 | <view class="flex-vertical fs28 xc-ash color-gray n_guige"> |
182 | 182 | <view class="goods-color"> |
... | ... | @@ -205,7 +205,7 @@ |
205 | 205 | <image class="wh100 bdr14" src="{{buy_now_gift_goods.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods.original_img"></image> |
206 | 206 | </view> |
207 | 207 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{buy_now_gift_goods.goods_id}}"> |
208 | - <view class="goods-name">{{buy_now_gift_goods.goods_name}}</view> | |
208 | + <view class="goods-name ellipsis-2">{{buy_now_gift_goods.goods_name}}</view> | |
209 | 209 | <!-- 商品属性 --> |
210 | 210 | <view class="flex-vertical fs28 xc-ash color-gray n_guige"> |
211 | 211 | <view class="goods-color"> |
... | ... | @@ -228,7 +228,7 @@ |
228 | 228 | <image class="wh100 bdr14" src="{{imgUrl+item.original_img}}" binderror='err_img_collocation' data-err="item.original_img"></image> |
229 | 229 | </view> |
230 | 230 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> |
231 | - <view class="goods-name">{{item.goods_name}}</view> | |
231 | + <view class="goods-name ellipsis-2">{{item.goods_name}}</view> | |
232 | 232 | <!-- 商品属性 --> |
233 | 233 | <view class="flex-vertical fs28 xc-ash color-gray n_guige"> |
234 | 234 | <view class="goods-color"> | ... | ... |
pages/cart/cart2/cart2.wxss
... | ... | @@ -95,8 +95,8 @@ page { |
95 | 95 | |
96 | 96 | .goods-img { |
97 | 97 | float: left; |
98 | - width: 191rpx; | |
99 | - height: 191rpx; | |
98 | + width: 200rpx; | |
99 | + height: 200rpx; | |
100 | 100 | margin: 0 20rpx; |
101 | 101 | } |
102 | 102 | |
... | ... | @@ -335,9 +335,14 @@ margin:auto; */ |
335 | 335 | } |
336 | 336 | |
337 | 337 | /*----------nyf新增,地址---------*/ |
338 | -.add_new{height: 60rpx; line-height: 60rpx;} | |
338 | +.add_new{ | |
339 | + height: 90rpx; | |
340 | + display: flex; | |
341 | + align-items: center; | |
342 | + padding: 0 26rpx; | |
343 | +} | |
339 | 344 | .addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; |
340 | - margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;} | |
345 | + margin-right: 15rpx;vertical-align: middle;} | |
341 | 346 | .yu_er{ |
342 | 347 | margin-left: 10rpx; |
343 | 348 | /* margin-right: 60rpx; */ | ... | ... |
pages/cart/cart2_pt/cart2_pt.wxml
... | ... | @@ -2,14 +2,14 @@ |
2 | 2 | <form bindsubmit="submitForm"> |
3 | 3 | <view class="container"> |
4 | 4 | <!--要进行判断地址是否显示----> |
5 | - <view bindtap="enterAddressPage" class="user-mes" hidden='{{bn_exp_type==1 || kt_type==3}}'> | |
5 | + <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{bn_exp_type==1 || kt_type==3}}'> | |
6 | 6 | <!---默认地址显示------> |
7 | 7 | <block wx:if="{{user_addr!=null}}"> |
8 | 8 | <view class="user-contact">收货人:{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> |
9 | 9 | <view class="location"> |
10 | 10 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> |
11 | 11 | <view class="pos-icon"> |
12 | - <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | |
12 | + <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | |
13 | 13 | </view> |
14 | 14 | </view> |
15 | 15 | <view class="update-logistics"> |
... | ... | @@ -22,22 +22,22 @@ |
22 | 22 | <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址 |
23 | 23 | </view> |
24 | 24 | </block> |
25 | - <view class="border-img"><image class="wh100" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> | |
25 | + <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> --> | |
26 | 26 | </view> |
27 | 27 | |
28 | 28 | |
29 | 29 | <!------立即购买--------> |
30 | 30 | <block> |
31 | - <view class="xc-border main-top"></view> | |
32 | - <view class="use-item bfff"> | |
33 | - <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>门店:{{bn_pickname}}</view></view> | |
31 | + <!-- <view class="xc-border main-top"></view> --> | |
32 | + <view class="use-item bfff bdr_t-14 mgt20"> | |
33 | + <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view> | |
34 | 34 | <view class="order-detail"> |
35 | 35 | <view class="goods-img"> |
36 | - <image class="wh100" src="{{bn_goods.original_img}}" | |
36 | + <image class="wh100 bdr14" src="{{bn_goods.original_img}}" | |
37 | 37 | binderror='cart_set_err' data-err="bn_goods.original_img"></image> |
38 | 38 | </view> |
39 | 39 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
40 | - <view class="goods-name">{{bn_goods.goods_name}}</view> | |
40 | + <view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view> | |
41 | 41 | <!-- 商品属性 --> |
42 | 42 | <view class="flex-vertical fs28 color-gray n_guige"> |
43 | 43 | <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text> |
... | ... | @@ -54,14 +54,14 @@ |
54 | 54 | <view class="goods-num">x{{bn_goods.buynum}}</view> |
55 | 55 | </view> --> |
56 | 56 | </view> |
57 | - <view class="set-mes"> | |
57 | + <view class="set-mes bdr_b-14"> | |
58 | 58 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} |
59 | 59 | </view> |
60 | 60 | |
61 | 61 | <!--阶梯团是不显示的--> |
62 | 62 | <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}"> |
63 | 63 | <view class="flex-vertical"> |
64 | - <view bindtap='setexptype' data-t='1' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> | |
64 | + <view bindtap='setexptype' data-t='1' style="padding-right:26rpx;display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}}"> | |
65 | 65 | <!-- <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> --> |
66 | 66 | <block wx:if="{{bn_exp_type==1}}"> |
67 | 67 | |
... | ... | @@ -70,9 +70,9 @@ |
70 | 70 | <block wx:else> |
71 | 71 | <view class="circle xc-hookts on"></view> |
72 | 72 | </block> |
73 | - <view class="yu_er">自提</view> | |
73 | + <view class="yu_er">门店自提</view> | |
74 | 74 | </view> |
75 | - <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;'}};"> | |
75 | + <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;'}}"> | |
76 | 76 | <!-- <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> --> |
77 | 77 | <block wx:if="{{bn_exp_type==0}}"> |
78 | 78 | |
... | ... | @@ -81,7 +81,7 @@ |
81 | 81 | <block wx:else> |
82 | 82 | <view class="circle xc-hookts on"></view> |
83 | 83 | </block> |
84 | - <view class="yu_er">物流</view> | |
84 | + <view class="yu_er">快递邮寄</view> | |
85 | 85 | </view> |
86 | 86 | </view> |
87 | 87 | <block wx:if="{{bn_exp_type==0}}"> |
... | ... | @@ -101,14 +101,7 @@ |
101 | 101 | |
102 | 102 | </view> |
103 | 103 | |
104 | - <!-----使用余额------> | |
105 | - <view class="set-mes" wx:if="{{userinfo.user_money>0}}"> | |
106 | - <view class="use-item" bindtap='set_bn_useyuer'> | |
107 | - <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon> | |
108 | - <view class="yu_er">使用余额 :¥{{yuer}} </view> | |
109 | - | |
110 | - </view> | |
111 | - </view> | |
104 | + | |
112 | 105 | <view class="coupon-mes flex-vertical"> |
113 | 106 | <view>留言</view> |
114 | 107 | <view class="leave-word"> |
... | ... | @@ -118,7 +111,14 @@ |
118 | 111 | </view> |
119 | 112 | </block> |
120 | 113 | |
121 | - <view class="information"> | |
114 | + <view class="information bdr14"> | |
115 | + <!-----使用余额------> | |
116 | + <view class="set-mes" wx:if="{{userinfo.user_money>0}}"> | |
117 | + <view class="use-item" bindtap='set_bn_useyuer' style="padding-left:0;padding-right:0;"> | |
118 | + <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon> | |
119 | + <view class="yu_er">使用余额 :¥{{yuer}} </view> | |
120 | + </view> | |
121 | + </view> | |
122 | 122 | <view class="item" wx:if="{{kt_type<3 || is_normal==1}}"> |
123 | 123 | <view>商品金额</view> |
124 | 124 | <view class="co-red">¥ {{formData.all_price}}元</view> |
... | ... | @@ -142,11 +142,11 @@ |
142 | 142 | </view> |
143 | 143 | |
144 | 144 | <view class="btn-wrap"> |
145 | - <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> | |
146 | - <view class="pay-amount"> | |
147 | - <view class="payable">应付金额 : </view> | |
148 | - <view class="co-red big">¥ {{formData.order_amount}}元</view> | |
149 | - </view> | |
145 | + <view class="pay-amount"> | |
146 | + <view class="payable">应付金额:<text class="co-red">¥{{formData.order_amount}}</text></view> | |
147 | + <!-- <view class="co-red big"></view> --> | |
148 | + </view> | |
149 | + <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> | |
150 | 150 | </view> |
151 | 151 | </form> |
152 | 152 | ... | ... |
pages/cart/cart2_pt/cart2_pt.wxss
1 | +.bdr_t-14 { | |
2 | + border-top-left-radius: 14rpx; | |
3 | + border-top-right-radius: 14rpx; | |
4 | +} | |
5 | +.bdr_b-14 { | |
6 | + border-bottom-left-radius: 14rpx; | |
7 | + border-bottom-right-radius: 14rpx; | |
8 | +} | |
9 | +.bdr14 { | |
10 | + border-radius: 14rpx; | |
11 | +} | |
12 | +.mgt20 { | |
13 | + margin-top: 20rpx; | |
14 | +} | |
15 | +.shadow { | |
16 | + box-shadow: 0 4rpx 12px #e7e9eb; | |
17 | +} | |
18 | +.shadow-1 { | |
19 | + box-shadow: 16rpx 0px 12px #e7e9eb; | |
20 | +} | |
21 | + | |
22 | + | |
23 | +page { | |
24 | + /* background-color: #FAFAFA; */ | |
25 | + background-color: #F0F0F0; | |
26 | + padding: 0 22rpx; | |
27 | + box-sizing: border-box; | |
28 | +} | |
29 | +.container { | |
30 | + background-color: #F0F0F0; | |
31 | + /* padding-top: 28rpx; */ | |
32 | + padding-bottom: 120rpx; | |
33 | +} | |
1 | 34 | .user-mes { |
2 | 35 | position: relative; |
3 | 36 | background-color: #fff; |
4 | 37 | font-size: 32rpx; |
5 | 38 | color: #444; |
39 | + /* margin-top: 28rpx; */ | |
40 | + border-radius: 14rpx; | |
6 | 41 | } |
7 | 42 | .user-contact { |
8 | - padding: 24rpx 70rpx; | |
9 | - font-weight: 600; | |
10 | - | |
43 | + padding: 24rpx 26rpx; | |
44 | + font-weight: 600; | |
11 | 45 | } |
12 | - | |
46 | + | |
13 | 47 | .location { |
14 | 48 | position: relative; |
15 | 49 | padding: 0 70rpx 24rpx; |
... | ... | @@ -17,15 +51,15 @@ |
17 | 51 | |
18 | 52 | .pos-icon { |
19 | 53 | position: absolute; |
20 | - left: 22rpx; | |
21 | - top: 20rpx; | |
22 | - width: 32rpx; | |
23 | - height: 40rpx; | |
54 | + left: 28rpx; | |
55 | + top: 6rpx; | |
56 | + width: 30rpx; | |
57 | + height: 36rpx; | |
24 | 58 | } |
25 | 59 | |
26 | 60 | .border-img { |
27 | 61 | width: 100%; |
28 | - height: 16rpx; | |
62 | + height: 12rpx; | |
29 | 63 | } |
30 | 64 | |
31 | 65 | .update-logistics { |
... | ... | @@ -33,7 +67,7 @@ |
33 | 67 | right: 0; |
34 | 68 | top: 0; |
35 | 69 | width: 80rpx; |
36 | - height: 148rpx; | |
70 | + height: 100%; | |
37 | 71 | display: flex; |
38 | 72 | align-items: center; |
39 | 73 | justify-content: center; |
... | ... | @@ -52,7 +86,7 @@ |
52 | 86 | |
53 | 87 | .order-detail { |
54 | 88 | padding: 30rpx 0; |
55 | - border-bottom: 7rpx solid #eee; | |
89 | + border-bottom: 2rpx solid #eee; | |
56 | 90 | color: #777; |
57 | 91 | min-height: 190rpx; |
58 | 92 | background-color: #fff; |
... | ... | @@ -61,14 +95,14 @@ |
61 | 95 | |
62 | 96 | .goods-img { |
63 | 97 | float: left; |
64 | - width: 190rpx; | |
65 | - height: 190rpx; | |
98 | + width: 200rpx; | |
99 | + height: 200rpx; | |
66 | 100 | margin: 0 20rpx; |
67 | 101 | } |
68 | 102 | |
69 | 103 | .order-cont { |
70 | 104 | float: left; |
71 | - width: 400rpx; | |
105 | + width: 438rpx; | |
72 | 106 | } |
73 | 107 | |
74 | 108 | .goods-name { |
... | ... | @@ -78,7 +112,7 @@ |
78 | 112 | margin-bottom: 16rpx; |
79 | 113 | font-size: 28rpx; |
80 | 114 | color: #333; |
81 | - | |
115 | + | |
82 | 116 | } |
83 | 117 | |
84 | 118 | .goods-color { |
... | ... | @@ -86,29 +120,38 @@ |
86 | 120 | } |
87 | 121 | |
88 | 122 | .order-num { |
89 | - float: right; | |
123 | + margin-top: 25rpx; | |
90 | 124 | font-size: 24rpx; |
91 | - margin-top: 10rpx; | |
92 | - margin-right: 20rpx; | |
93 | - text-align: right; | |
94 | 125 | line-height: 42rpx; |
95 | 126 | } |
96 | 127 | |
97 | -.set-mes{background-color: #fff; } | |
128 | +.set-mes{ | |
129 | + background-color: #fff; | |
130 | + /* margin-top: 20rpx; */ | |
131 | +} | |
98 | 132 | .use-item{ |
99 | 133 | display: flex; |
100 | 134 | align-items: center; |
101 | - height: 92rpx; | |
102 | - border-bottom: 1px solid #ddd; | |
135 | + height: 80rpx; | |
136 | + /* border-bottom: 1px solid #ddd; */ | |
103 | 137 | font-size: 30rpx; |
104 | - width: 95%; | |
105 | - margin: auto; | |
138 | + /* width:95%; | |
139 | +margin:auto; */ | |
140 | + padding: 0 26rpx; | |
106 | 141 | } |
107 | 142 | .use-item>view{ |
108 | - display: flex;margin-right: 10rpx; | |
143 | + display: flex; | |
144 | + /* margin-right: 12rpx; */ | |
145 | +} | |
146 | +.use-item.bfff{ | |
147 | + background-color: #fff; | |
148 | +} | |
149 | +.use-item .dp{ | |
150 | + display: block; | |
151 | + width: 50rpx; | |
152 | + height: 50rpx; | |
153 | + margin-left: -6rpx; | |
109 | 154 | } |
110 | -.use-item.bfff{ background-color: #fff;} | |
111 | -.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx} | |
112 | 155 | |
113 | 156 | .set-item { |
114 | 157 | justify-content: space-between; |
... | ... | @@ -138,15 +181,16 @@ |
138 | 181 | } |
139 | 182 | |
140 | 183 | .coupon-mes { |
141 | - height:95rpx; | |
142 | - padding: 0 20rpx; | |
184 | + /* box-sizing: border-box; */ | |
185 | + height:95rpx; | |
186 | + padding: 0 26rpx; | |
143 | 187 | background-color: #fff; |
144 | 188 | font-size: 30rpx; |
145 | 189 | color: #444; |
146 | - width: 100%; | |
147 | - border-bottom: 6rpx solid #eee; | |
148 | - margin-bottom: 20rpx; | |
149 | - | |
190 | + /* width: 100%; */ | |
191 | + border-radius: 14rpx; | |
192 | + margin-top: 20rpx; | |
193 | + margin-bottom: 20rpx; | |
150 | 194 | } |
151 | 195 | |
152 | 196 | .coupon-title { |
... | ... | @@ -175,12 +219,12 @@ |
175 | 219 | position: relative; |
176 | 220 | font-size: 24rpx; |
177 | 221 | margin-left: 20rpx; |
178 | - | |
222 | + flex-grow: 1; | |
179 | 223 | } |
180 | 224 | |
181 | 225 | .word-box { |
182 | - | |
183 | - width: 600rpx; | |
226 | + font-size: 26rpx; | |
227 | + /* width: 600rpx; */ | |
184 | 228 | padding: 10rpx; |
185 | 229 | height: 28rpx; |
186 | 230 | line-height: 40rpx; |
... | ... | @@ -193,9 +237,9 @@ |
193 | 237 | } |
194 | 238 | |
195 | 239 | .information { |
196 | - padding: 0 20rpx; | |
240 | + padding: 0 26rpx; | |
197 | 241 | background-color: #fff; |
198 | - margin-bottom: 120rpx; | |
242 | + /* margin-bottom: 120rpx; */ | |
199 | 243 | } |
200 | 244 | |
201 | 245 | .information .item { |
... | ... | @@ -208,34 +252,50 @@ |
208 | 252 | } |
209 | 253 | |
210 | 254 | .btn-wrap { |
211 | - height: 100rpx; width: 100%; | |
212 | - background-color: #fff; | |
213 | - position: fixed; bottom: 0;left: 0 | |
255 | + height: 94rpx; | |
256 | + box-sizing: border-box; | |
257 | + display: flex; | |
258 | + justify-content: space-between; | |
259 | + background-color: white; | |
260 | + align-items: center; | |
261 | + position: fixed; | |
262 | + bottom: 0; | |
263 | + left: 0; | |
264 | + width: 100%; | |
265 | + padding: 0 30rpx; | |
214 | 266 | } |
215 | 267 | |
216 | 268 | .tips-btn { |
217 | - float: right; | |
269 | + /* float: right; | |
218 | 270 | width: 200rpx; |
219 | 271 | height: 100rpx; |
220 | 272 | line-height: 100rpx; |
221 | 273 | text-align: center; |
222 | 274 | font-size: 30rpx; |
223 | 275 | color: #fff; |
224 | - background-color: #f23030; | |
276 | + background-color: #f23030; */ | |
277 | + color: white; | |
278 | + background-color: #FE4445; | |
279 | + height: 72rpx; | |
280 | + line-height: 72rpx; | |
281 | + padding: 0 42rpx; | |
282 | + border-radius: 36rpx; | |
283 | + margin-left: 0; | |
284 | + margin-right: 0; | |
225 | 285 | } |
226 | 286 | |
227 | 287 | .pay-amount { |
228 | - float: right; | |
288 | + /* float: right; | |
229 | 289 | display: flex; |
230 | 290 | align-items: center; |
231 | 291 | height: 100rpx; |
232 | 292 | font-size: 26rpx; |
233 | - margin-right: 40rpx; | |
293 | + margin-right: 40rpx; */ | |
234 | 294 | } |
235 | 295 | |
236 | 296 | .payable { |
237 | 297 | color: #444; |
238 | - margin-right: 20rpx; | |
298 | + /* margin-right: 20rpx; */ | |
239 | 299 | } |
240 | 300 | |
241 | 301 | .shipping-modal { |
... | ... | @@ -275,24 +335,58 @@ |
275 | 335 | } |
276 | 336 | |
277 | 337 | /*----------nyf新增,地址---------*/ |
278 | -.add_new{height: 60rpx; line-height: 60rpx;} | |
338 | +.add_new{ | |
339 | + height: 90rpx; | |
340 | + display: flex; | |
341 | + align-items: center; | |
342 | + padding: 0 26rpx; | |
343 | +} | |
279 | 344 | .addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; |
280 | - margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;} | |
281 | -.yu_er{margin-left: 15rpx;} .wuliu{margin-left: 20rpx;} | |
345 | + margin-right: 15rpx;vertical-align: middle;} | |
346 | +.yu_er{ | |
347 | + margin-left: 10rpx; | |
348 | + /* margin-right: 60rpx; */ | |
349 | +} | |
350 | +.wuliu{margin-left: 20rpx;} | |
282 | 351 | |
283 | 352 | |
353 | +/*---- 优惠券列表 -----*/ | |
354 | +.xc-coupon-frame{ | |
355 | + width: 100%; | |
356 | + height: 92rpx; | |
357 | + | |
358 | +} | |
359 | +.xc-coupon-frame .work-frame{ | |
360 | + width: 100%; | |
361 | + height: 100%; | |
362 | + border-bottom:3rpx solid #eee; | |
363 | + padding: 0 26rpx; | |
364 | + background-color: white; | |
365 | +} | |
366 | +.xc-right{ | |
367 | + width:20rpx; | |
368 | + height:20rpx; | |
369 | + border-top:2rpx solid #000; | |
370 | + border-right:2rpx solid #000; | |
371 | + transform:rotate(45deg); | |
372 | + display:inline-block; | |
373 | +} | |
374 | + | |
375 | +.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } | |
376 | +.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } | |
377 | + | |
284 | 378 | /* 自定义弹出窗口 */ |
285 | 379 | .cx-popup{ |
286 | 380 | width:100%; |
287 | - height:920rpx; | |
381 | + height:880rpx; | |
288 | 382 | background: #fff; |
289 | 383 | z-index: 35; |
290 | 384 | border-top-left-radius: 20rpx; |
291 | 385 | border-top-right-radius: 20rpx; |
292 | 386 | position:fixed; |
293 | 387 | bottom:0; |
294 | - padding-bottom: 25rpx; | |
295 | - | |
388 | + left: 0; | |
389 | + /* padding-bottom: 25rpx; */ | |
296 | 390 | } |
297 | 391 | |
298 | 392 | .cx-popup .top{ |
... | ... | @@ -300,7 +394,7 @@ |
300 | 394 | height:100rpx; |
301 | 395 | border-bottom:3rpx solid #ddd; |
302 | 396 | margin: auto; |
303 | - margin-top: 30rpx; | |
397 | + margin-top: 30rpx; | |
304 | 398 | |
305 | 399 | } |
306 | 400 | .xc-top-content{ |
... | ... | @@ -321,7 +415,7 @@ |
321 | 415 | } |
322 | 416 | .xc-frame{ |
323 | 417 | width: 100%; |
324 | - height:68.9%; | |
418 | + height:60%; | |
325 | 419 | } |
326 | 420 | |
327 | 421 | .xc-frame .list-frame{ |
... | ... | @@ -332,18 +426,18 @@ |
332 | 426 | } |
333 | 427 | .xc-close-frame{ |
334 | 428 | margin-top:-10rpx; |
335 | - | |
429 | + | |
336 | 430 | } |
337 | 431 | |
338 | 432 | .xc-close{ |
339 | - width: 37rpx; | |
340 | - height: 37rpx; | |
341 | - border-radius: 50%; | |
342 | - border: 3rpx solid #333; | |
343 | - text-align: center; | |
344 | - line-height: 34rpx; | |
345 | - font-size: 29rpx; | |
346 | - color: #333; | |
433 | + width: 37rpx; | |
434 | +height: 37rpx; | |
435 | +border-radius: 50%; | |
436 | +border: 3rpx solid #333; | |
437 | +text-align: center; | |
438 | +line-height: 34rpx; | |
439 | +font-size: 29rpx; | |
440 | +color: #333; | |
347 | 441 | |
348 | 442 | } |
349 | 443 | .xc-money{ |
... | ... | @@ -388,7 +482,7 @@ |
388 | 482 | .xc-coupon-money1{ |
389 | 483 | color: #444; |
390 | 484 | font-size: 28rpx; |
391 | - line-height: 60rpx; | |
485 | + line-height: 60rpx; | |
392 | 486 | |
393 | 487 | |
394 | 488 | } |
... | ... | @@ -406,9 +500,9 @@ |
406 | 500 | } |
407 | 501 | |
408 | 502 | .xc-confirm { |
409 | - width: 48%; | |
410 | - border-radius: 50rpx; | |
411 | - height: 50rpx; | |
503 | + width: 50%; | |
504 | + border-radius: 50rpx; | |
505 | + height: 80rpx; | |
412 | 506 | margin:0 auto; |
413 | 507 | background:#d60021; |
414 | 508 | color:#fff; |
... | ... | @@ -422,128 +516,300 @@ |
422 | 516 | @keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } } |
423 | 517 | |
424 | 518 | .xc-not-Selection{ |
425 | - width: 40rpx; | |
426 | - height: 40rpx; | |
519 | + width: 40rpx; | |
520 | +height: 40rpx; | |
427 | 521 | background: #eeeeee; |
428 | 522 | } |
429 | 523 | |
430 | 524 | |
431 | 525 | .xc-close-express{ |
432 | - width: 40rpx; | |
433 | - height: 40rpx; | |
434 | - border-radius: 50%; | |
435 | - border: 3rpx solid #333; | |
436 | - text-align: center; | |
437 | - font-size:32rpx; | |
438 | - line-height: 38rpx; | |
439 | - color: #333; | |
440 | - margin-top: 5rpx; | |
526 | + width: 40rpx; | |
527 | +height: 40rpx; | |
528 | +border-radius: 50%; | |
529 | +border: 3rpx solid #333; | |
530 | +text-align: center; | |
531 | +font-size:32rpx; | |
532 | +line-height: 38rpx; | |
533 | +color: #333; | |
534 | +margin-top: 5rpx; | |
441 | 535 | } |
442 | 536 | .cx-popup .tops{ |
443 | - width: 100%; | |
444 | - height: 145rpx; | |
445 | - border-bottom: 3rpx solid #eee; | |
537 | + width: 100%; | |
538 | +height: 145rpx; | |
539 | +border-bottom: 3rpx solid #eee; | |
446 | 540 | |
447 | 541 | } |
448 | 542 | .top-content { |
449 | - width: 82%; | |
450 | - padding-top: 33px; | |
451 | - height: 100%; | |
452 | - padding-left: 40rpx; | |
543 | + width: 82%; | |
544 | +padding-top: 33px; | |
545 | +height: 100%; | |
546 | +padding-left: 40rpx; | |
453 | 547 | } |
454 | 548 | .close-frame{ |
455 | - margin-top: 30rpx; | |
549 | + margin-top: 30rpx; | |
456 | 550 | |
457 | 551 | } |
458 | -.cx-popup.radius{ | |
459 | - | |
460 | - height: 650rpx; | |
461 | 552 | |
462 | -} | |
463 | 553 | .xc-hook { |
464 | - width: 33rpx; | |
465 | - height: 33rpx; | |
466 | - transform: rotate(-135deg); | |
467 | - line-height: 35rpx; | |
468 | - text-align: center; | |
469 | - margin-right: 20rpx | |
554 | +width: 33rpx; | |
555 | +height: 33rpx; | |
556 | +transform: rotate(-135deg); | |
557 | +line-height: 35rpx; | |
558 | +text-align: center; | |
559 | +margin-right: 20rpx | |
470 | 560 | |
471 | 561 | |
472 | 562 | } |
473 | 563 | .xc-hooks { |
474 | - width: 30rpx; | |
475 | - height: 30rpx; | |
476 | - border: 1rpx solid #999; | |
477 | - margin-right: 20rpx; | |
564 | +width: 30rpx; | |
565 | +height: 30rpx; | |
566 | +border: 1rpx solid #999; | |
567 | +margin-right: 20rpx; | |
478 | 568 | } |
479 | 569 | .express_list_frame{ |
480 | - display: flex; | |
481 | - height: 80rpx; | |
482 | - align-items: center; | |
483 | - padding-left: 40rpx; | |
484 | - border-bottom: 1rpx solid #eee; | |
570 | + display: flex; | |
571 | +height: 80rpx; | |
572 | +align-items: center; | |
573 | +padding-left: 40rpx; | |
574 | +border-bottom: 1rpx solid #eee; | |
485 | 575 | |
486 | 576 | } |
487 | 577 | .express_list{ |
488 | - width: 100%; | |
489 | - height: 65%; | |
490 | - overflow-y: scroll; | |
491 | - overflow: hidden; | |
578 | + width: 100%; | |
579 | + height: 65%; | |
580 | + overflow-y: auto; | |
581 | + margin-bottom: 40rpx; | |
582 | + | |
492 | 583 | } |
493 | 584 | .xc-confirms { |
494 | - width: 40%; | |
495 | - border-radius: 50rpx; | |
496 | - height: 55rpx; | |
497 | - margin:0 auto; | |
498 | - font-size:28rpx; | |
499 | - background: #fff; | |
500 | - color: #333; | |
501 | - border: 2rpx solid #333; | |
502 | - | |
585 | + box-sizing: border-box; | |
586 | + width: 40%; | |
587 | + border-radius: 50rpx; | |
588 | + height: 80rpx; | |
589 | + margin:0 auto; | |
590 | + font-size:28rpx; | |
591 | + background: #fff; | |
592 | + color: #333; | |
593 | + border: 2rpx solid #333; | |
503 | 594 | } |
504 | 595 | |
505 | -.xc-right{ | |
506 | - width:20rpx; | |
507 | - height:20rpx; | |
508 | - border-top:2rpx solid #000; | |
509 | - border-right:2rpx solid #000; | |
510 | - transform:rotate(45deg); | |
511 | - display:inline-block; | |
512 | - margin-right: 5rpx; | |
513 | - margin-left: 10rpx; | |
514 | 596 | |
515 | -} | |
597 | +/* 优惠券的改版样式 */ | |
598 | +.xc-coupon-frame{ | |
599 | + /* width: 710rpx; */ | |
600 | + width: 100%; | |
601 | + height:auto; | |
602 | + margin: 0 auto; | |
516 | 603 | |
604 | +} | |
605 | +.xc-coupon-frame .coupon-frame{ | |
606 | + width: 100%; | |
607 | + height: 200rpx; | |
608 | + margin-top:10rpx; | |
609 | + border-bottom: 1rpx solid #eee; | |
517 | 610 | |
518 | -.xc-left{ | |
519 | - margin-left: 45rpx; | |
520 | 611 | } |
521 | -.xc-border{ | |
522 | - border-top:8rpx solid #eee; | |
523 | -width: 100% | |
612 | +.xc-coupon-frame .coupon-frame .coupon-left{ | |
613 | + width: 215rpx; | |
614 | + height:100%; | |
615 | + overflow: hidden; | |
524 | 616 | } |
525 | -.main-top{ | |
526 | -margin-top: 20rpx; | |
617 | +.xc-money-frames{ | |
618 | + width:96%; | |
619 | + margin-top: -10px; | |
620 | +} | |
621 | + | |
622 | +.xc-rmb-symbol{ | |
623 | + font-size:40rpx; | |
527 | 624 | |
528 | 625 | } |
529 | -.order-num { | |
530 | - margin-top: 25rpx; | |
531 | - font-size: 24rpx; | |
532 | - line-height: 42rpx; | |
533 | - width: 95%; | |
534 | 626 | |
627 | +.xc-rmb-val{ | |
628 | + font-size:60rpx; | |
629 | + | |
630 | +} | |
631 | +.coupon-explain{ | |
632 | + font-size:25rpx; | |
633 | +width:100%; | |
634 | + | |
635 | + | |
636 | +} | |
637 | +.xc-valuer{ | |
638 | + margin-top:39rpx; | |
639 | + margin-left:28rpx; | |
640 | + font-size:25rpx; | |
641 | +} | |
642 | +.coupon-frame .oval{ | |
643 | + width:155rpx; | |
644 | + height:83rpx; | |
645 | + border-radius: 50%; | |
646 | + right:-78rpx; | |
647 | + top:-37rpx; | |
648 | +} | |
649 | +.coupon-right{ | |
650 | + /* width:490rpx; */ | |
651 | + height: 99%; | |
652 | + border-top: 1rpx solid #eaeaea; | |
653 | + /* //border-bottom: 1rpx solid #eaeaea; */ | |
654 | + border-right: 1rpx solid #eaeaea; | |
655 | + flex-grow: 1; | |
656 | +} | |
657 | +.coupon-annotation{ | |
658 | + width: 95%; | |
659 | + height: 100%; | |
660 | + | |
535 | 661 | } |
662 | +.xc-brand{ | |
663 | + width:100rpx; | |
664 | + height:35rpx; | |
665 | + line-height: 35rpx; | |
666 | + font-size:21rpx; | |
667 | + border-radius:10rpx; position: relative; top:-1px; | |
668 | + margin-right: 8rpx | |
669 | +} | |
670 | +.top-frame{ | |
671 | + width:82%; | |
672 | + height: 75rpx; | |
673 | + margin-top:10rpx; | |
674 | +} | |
675 | +.top-frame .coupon-wode{ | |
676 | + font-size: 25rpx; | |
677 | + margin-left:10rpx; | |
678 | + width:340rpx; | |
679 | + height:88rpx; | |
680 | +} | |
681 | +.coupon-code{ | |
682 | + width:60rpx; | |
683 | + height:60rpx; | |
684 | + margin-top:5rpx; | |
685 | + | |
686 | +} | |
687 | +.frame{ | |
688 | + width: 100% | |
689 | +} | |
690 | +.coupon-time{ | |
691 | + font-size: 23rpx; | |
692 | + line-height:33rpx; | |
693 | + color: #333; | |
694 | +} | |
695 | + | |
696 | +.clik-get{ | |
697 | + width:125rpx; | |
698 | + height:45rpx; | |
699 | + border-radius: 25rpx; | |
700 | + line-height: 45rpx; | |
701 | + font-size:25rpx; | |
702 | + bottom:67rpx; | |
703 | + right:6px; | |
704 | +} | |
705 | + | |
706 | +.code-img{ | |
707 | + margin-left:20rpx; | |
708 | +} | |
709 | +.bottmo-explain{ | |
710 | +top:145rpx; | |
711 | +width:94%; | |
712 | +border-top:1rpx dashed #eee; | |
713 | +padding-top:8rpx; | |
714 | +height:38rpx; | |
715 | +line-height: 51rpx; | |
716 | + | |
717 | +} | |
718 | +.font-word{ | |
719 | + font-size: 22rpx; | |
720 | +} | |
721 | +.circle-size{ | |
722 | + background: #a0a0a0; | |
723 | + width: 27rpx; | |
724 | + height: 27rpx; | |
725 | + margin-top:13rpx; | |
726 | +margin-left:8rpx; | |
727 | +display: flex; | |
728 | + | |
729 | +align-items: center; | |
730 | +} | |
731 | +.xc-jiantou{ | |
732 | + /* width: 9rpx; | |
733 | + height: 9rpx; */ | |
734 | + /* border-top: 2rpx solid #fff; | |
735 | + border-right: 2rpx solid #fff; */ | |
736 | + transform: rotate(-90deg); | |
737 | + color: #fff; | |
738 | + font-size: 15rpx; | |
739 | + /* display:inline-block; | |
740 | + margin-top: 6.5rpx; */ | |
741 | + text-align: center; | |
742 | +width: 24rpx; | |
743 | +} | |
744 | +.xc-buttom{ | |
745 | + box-sizing: border-box; | |
746 | + width:100%; | |
747 | + min-height:76rpx; | |
748 | + height:auto; | |
749 | + line-height:40rpx; | |
750 | + border-left:1rpx solid #eee; | |
751 | + border-right:1rpx solid #eee; | |
752 | + border-bottom:1rpx solid #eee; | |
753 | +/* margin-left: 6rpx; */ | |
754 | +} | |
755 | + | |
536 | 756 | .goods-num{ |
537 | 757 | font-size: 28rpx; |
538 | -color: #333; | |
758 | + color: #333; | |
759 | +} | |
539 | 760 | |
761 | +.explain-coupon{ | |
762 | + font-size:25rpx; | |
763 | + padding: 10rpx 10rpx | |
540 | 764 | } |
541 | -.click-buttem{ | |
542 | -width: 90%; | |
543 | -margin: auto; | |
765 | +.circle-frame{ | |
766 | + width: 20rpx; | |
767 | + height: auto; | |
768 | + z-index:1; | |
769 | + left:210rpx; | |
770 | + | |
771 | +} | |
772 | +.circle-sawtooth{ | |
773 | + width: 11rpx; | |
774 | + height: 11rpx; | |
775 | + background: #fff; | |
776 | +} | |
777 | + | |
778 | +.red{background-color: #fe7496;} | |
779 | +.green{ background-color: #22c7c1;} | |
780 | +.blue{background-color:#5e82e3;} | |
781 | +.g_gray{background-color: #aaaaaa} | |
782 | + | |
783 | +.f_text{text-align: center; height:96rpx; } | |
784 | +.xc-hook.sn { | |
785 | + margin-top:12%; | |
786 | +width:45rpx; | |
787 | +height:45rpx; | |
788 | +font-size:28rpx; | |
789 | +line-height:44rpx; | |
790 | + | |
791 | + | |
792 | +} | |
793 | +.xc-hooks.on{ | |
794 | + margin-top:12%; | |
795 | +width:42rpx; | |
796 | +height:42rpx; | |
797 | +} | |
798 | +.may_use_coupon{ | |
799 | + /* width: 95%; */ | |
800 | + /* height: 68rpx; */ | |
801 | + line-height:78rpx; | |
802 | + padding: 0 26rpx; | |
803 | + justify-content: space-between; | |
804 | + align-items: center; | |
805 | +} | |
806 | +.determine-frame{ | |
807 | + width: 100%; | |
808 | + height: 130rpx; | |
809 | + | |
544 | 810 | } |
545 | 811 | .xc-determine{ |
546 | - height: 55rpx; | |
812 | + height: 80rpx; | |
547 | 813 | width: 40%; |
548 | 814 | border-radius: 50rpx; |
549 | 815 | background: #d60021; |
... | ... | @@ -552,6 +818,21 @@ font-size: 28rpx; |
552 | 818 | margin: 0 auto; |
553 | 819 | |
554 | 820 | } |
821 | +.click-buttem{ | |
822 | +width: 90%; | |
823 | +margin: auto; | |
824 | +} | |
825 | +.logistics-name{ | |
826 | + margin-right:20rpx; | |
827 | +} | |
828 | +.xc-border{ | |
829 | + border-top:8rpx solid #eee; | |
830 | +width: 100% | |
831 | +} | |
832 | +.main-top{ | |
833 | +margin-top: 20rpx; | |
834 | + | |
835 | +} | |
555 | 836 | .xc-hookts{ |
556 | 837 | border: 1rpx solid #999; |
557 | 838 | |
... | ... | @@ -561,8 +842,60 @@ border: 1rpx solid #999; |
561 | 842 | height:30rpx; |
562 | 843 | |
563 | 844 | } |
845 | +.xc-hookt.sn{ | |
846 | + width: 32rpx; | |
847 | +height: 32rpx; | |
848 | +font-size: 28rpx; | |
849 | +line-height: 34rpx; | |
850 | +} | |
851 | +.xc-hookt{ | |
852 | + transform: rotate(-135deg); | |
853 | +text-align: center; | |
854 | + | |
855 | +} | |
856 | +.main-bottom{ | |
857 | + margin-bottom: 20rpx; | |
858 | + | |
859 | +} | |
860 | +.xc-hookst{ | |
861 | + border: 1rpx solid #999; | |
862 | + | |
863 | +} | |
864 | +.xc-hookst.ons{ | |
865 | + width: 42rpx; | |
866 | +height: 42rpx; | |
867 | +margin-left: 20rpx; | |
868 | + | |
869 | +} | |
870 | +.is_use_coupon{ | |
871 | + width: 65%; | |
872 | +justify-content: flex-end; | |
873 | +padding-top: 10rpx; | |
874 | + | |
875 | + | |
876 | +} | |
877 | +.xc-hooka{ | |
878 | + transform: rotate(-135deg); | |
879 | +text-align: center; | |
880 | + | |
881 | +} | |
882 | +.xc-hooka.sn{ | |
883 | + width: 45rpx; | |
884 | +height: 45rpx; | |
885 | +font-size: 28rpx; | |
886 | +line-height: 44rpx; | |
887 | +margin-left: 20rpx; | |
888 | + | |
889 | +} | |
564 | 890 | .color-gray{ |
565 | 891 | color: #808080; |
566 | 892 | } |
893 | +.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } | |
894 | +.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} | |
567 | 895 | |
568 | -.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } | |
569 | 896 | \ No newline at end of file |
897 | +.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} | |
898 | + | |
899 | +.navigator-hover { | |
900 | + background: none; | |
901 | + opacity: 1; | |
902 | +} | ... | ... |
pages/cart/cart_wk/cart_wk.wxml
1 | 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
2 | 2 | <!----要进行判断地址是否显示----> |
3 | -<view bindtap="enterAddressPage" class="user-mes" | |
3 | +<view bindtap="enterAddressPage" class="user-mes mgt20" | |
4 | 4 | hidden='{{exp_type==1 }}'> |
5 | 5 | <!-----默认地址显示----> |
6 | 6 | <block wx:if="{{user_addr!=null}}"> |
7 | - <view class="user-contact">{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | |
7 | + <view class="user-contact">收货人:{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | |
8 | 8 | <view class="location"> |
9 | 9 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> |
10 | 10 | <view class="pos-icon"> |
11 | - <image class="wh100" src="{{imgUrl}}/miniapp/images/iconfont-address.png"></image> | |
11 | + <image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | |
12 | 12 | </view> |
13 | 13 | </view> |
14 | 14 | <view class="update-logistics"> |
... | ... | @@ -21,15 +21,13 @@ |
21 | 21 | <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址 |
22 | 22 | </view> |
23 | 23 | </block> |
24 | - <view class="border-img"><image class="wh100" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> | |
24 | + <!-- <view class="border-img"><image class="wh100 bdr14" src="{{imgUrl}}/miniapp/images/tt.png"></image></view> --> | |
25 | 25 | </view> |
26 | 26 | |
27 | 27 | <!--头部--> |
28 | -<view class='top'> | |
29 | - <view class='t_img'> | |
30 | - <image src='{{imgUrl}}/miniapp/images/11.png'></image> | |
31 | - </view> | |
32 | - <view class='t_wz'>{{pickup.pickup_name}}</view> | |
28 | +<view class='top bdr_t-14 flex'> | |
29 | + <image class="t_img" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'></image> | |
30 | + <view class='t_wz'>美得得超市{{pickup.pickup_name}}</view> | |
33 | 31 | </view> |
34 | 32 | |
35 | 33 | <!--商品图片显示--> |
... | ... | @@ -39,17 +37,19 @@ |
39 | 37 | <image src="{{order.show_img}}" binderror="bind_bnerr" data-errorimg="order.show_img"></image> |
40 | 38 | </view> |
41 | 39 | |
42 | - <view class='cen_name'>{{order.order_goods.goods_name}}</view> | |
43 | - | |
44 | - <view class='cen_jg'>¥{{order.order_goods.goods_price}} | |
45 | - <view class='cen_sl'>x{{order.order_goods.goods_num}}</view> | |
46 | - </view> | |
47 | - | |
40 | + <view class="details-container"> | |
41 | + <view class='cen_name ellipsis-3'>{{order.order_goods.goods_name}}</view> | |
42 | + <view class="flex jc_sb"> | |
43 | + <view class='cen_jg'>¥{{order.order_goods.goods_price}}</view> | |
44 | + <view class='cen_sl'>x{{order.order_goods.goods_num}}</view> | |
45 | + </view> | |
46 | + </view> | |
47 | + | |
48 | 48 | </view> |
49 | 49 | |
50 | 50 | <!--取货方式--> |
51 | 51 | |
52 | -<view class='quhou'> | |
52 | +<view class='quhou bdr_b-14'> | |
53 | 53 | |
54 | 54 | <view bindtap="set_wuliu" data-type="1" class='qu_fs' wx:if="{{distr_type==0 || distr_type==1}}"> |
55 | 55 | <image wx:if="{{exp_type==0}}" src='{{imgUrl}}/miniapp/images/kon.png'></image> |
... | ... | @@ -64,7 +64,7 @@ |
64 | 64 | </view> |
65 | 65 | |
66 | 66 | </view> |
67 | -<view class="use-item" wx:if='{{exp_type==0}}'> | |
67 | +<view class="use-item bdr_b-14" wx:if='{{exp_type==0}}'> | |
68 | 68 | <view>使用物流:</view> |
69 | 69 | <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> |
70 | 70 | <view >{{wu_arr[index].name}}</view> |
... | ... | @@ -72,46 +72,45 @@ |
72 | 72 | </view> |
73 | 73 | |
74 | 74 | <!--成团人数--> |
75 | -<view class='chentuan'> | |
75 | +<view class='chentuan bdr14'> | |
76 | 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'>{{teamgroup.jt_ct_num}}</text>人</view> |
79 | 79 | </view> |
80 | 80 | <view class='ct_one jc_sb'> |
81 | 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.tail_money,2)}}</text></view> | |
82 | + <view class='ct_one_right'><text class='redwz'>¥{{filters.toFix(order.order_amount+order.user_money+order.tail_money,2)}}</text></view> | |
83 | 83 | </view> |
84 | 84 | <view class='ct_one jc_sb'> |
85 | 85 | <view class='ct_one_left'>支付定金</view> |
86 | - <view class='ct_one_right'>¥<text class='redwz'>{{filters.toFix(order.order_amount+order.user_money,2)}}</text> | |
86 | + <view class='ct_one_right'><text class='redwz'>¥{{filters.toFix(order.order_amount+order.user_money,2)}}</text> | |
87 | 87 | </view> |
88 | 88 | </view> |
89 | 89 | </view> |
90 | 90 | |
91 | 91 | <!--尾款--> |
92 | -<view class='chentuan'> | |
92 | +<view class='chentuan bdr14'> | |
93 | 93 | <view class='ct_one jc_sb'> |
94 | 94 | <view class='ct_one_left'>尾款金额</view> |
95 | - <view class='ct_one_right'>¥<text class='redwz'>{{order.tail_money}}</text> | |
95 | + <view class='ct_one_right'><text class='redwz'>¥{{order.tail_money}}</text> | |
96 | 96 | </view> |
97 | 97 | </view> |
98 | 98 | |
99 | 99 | <view class='ct_one jc_sb' wx:if="{{exp_price>0}}"> |
100 | 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 | 102 | </view> |
103 | 103 | </view> |
104 | 104 | </view> |
105 | 105 | |
106 | 106 | <!--支付--> |
107 | -<view class='zf'> | |
108 | - <view class='zf_left'> | |
107 | +<view class='zf shadow'> | |
108 | + <!-- <view class='zf_left'> | |
109 | 109 | <text class='zf_left_wz'>支付合计:</text> |
110 | 110 | <text class='zf_left_red'>¥{{filters.toFix(order.tail_money+exp_price,2)}}</text> |
111 | - </view> | |
112 | - <view class='zf_btn' bindtap="to_pay"> | |
113 | - <text>支付尾款</text> | |
114 | - </view> | |
111 | + </view> --> | |
112 | + <view class='zf_left'>支付合计:<text class='zf_left_red'>¥{{filters.toFix(order.tail_money+exp_price,2)}}</text></view> | |
113 | + <view class='zf_btn' bindtap="to_pay">支付尾款</view> | |
115 | 114 | </view> |
116 | 115 | |
117 | 116 | <!--支付的方式选择,0微信支付 1余额支付--> | ... | ... |
pages/cart/cart_wk/cart_wk.wxss
1 | -/* pages/cart/cart_wk/cart_wk.wxss */ | |
1 | +.bdr_t-14 { | |
2 | + border-top-left-radius: 14rpx; | |
3 | + border-top-right-radius: 14rpx; | |
4 | +} | |
5 | +.bdr_b-14 { | |
6 | + border-bottom-left-radius: 14rpx; | |
7 | + border-bottom-right-radius: 14rpx; | |
8 | +} | |
9 | +.bdr14 { | |
10 | + border-radius: 14rpx; | |
11 | +} | |
12 | +.mgt20 { | |
13 | + margin-top: 20rpx; | |
14 | +} | |
15 | +.shadow { | |
16 | + box-shadow: 0 4rpx 12px #e7e9eb; | |
17 | +} | |
18 | +.shadow-1 { | |
19 | + box-shadow: 16rpx 0px 12px #e7e9eb; | |
20 | +} | |
21 | + | |
22 | +page { | |
23 | + background-color: #F0F0F0; | |
24 | + padding: 0 22rpx; | |
25 | + box-sizing: border-box; | |
26 | +} | |
2 | 27 | |
3 | 28 | .user-mes { |
4 | - position: relative; | |
5 | - background-color: #fff; | |
6 | - font-size: 30rpx; | |
7 | - color: #444; | |
29 | + position: relative; | |
30 | + background-color: #fff; | |
31 | + font-size: 32rpx; | |
32 | + color: #444; | |
33 | + /* margin-top: 28rpx; */ | |
34 | + border-radius: 14rpx; | |
8 | 35 | } |
9 | 36 | .user-contact { |
10 | - padding: 24rpx 80rpx; | |
37 | + padding: 24rpx 26rpx; | |
38 | + font-weight: 600; | |
11 | 39 | } |
12 | - | |
40 | + | |
13 | 41 | .location { |
14 | - position: relative; | |
15 | - padding: 0 80rpx 24rpx; | |
42 | + position: relative; | |
43 | + padding: 0 70rpx 24rpx; | |
16 | 44 | } |
17 | 45 | |
18 | 46 | .pos-icon { |
19 | - position: absolute; | |
20 | - left: 30rpx; | |
21 | - top: 0; | |
22 | - width: 32rpx; | |
23 | - height: 32.5rpx; | |
47 | + position: absolute; | |
48 | + left: 28rpx; | |
49 | + top: 6rpx; | |
50 | + width: 30rpx; | |
51 | + height: 36rpx; | |
24 | 52 | } |
25 | 53 | |
26 | 54 | .border-img { |
... | ... | @@ -29,14 +57,14 @@ |
29 | 57 | } |
30 | 58 | |
31 | 59 | .update-logistics { |
32 | - position: absolute; | |
33 | - right: 0; | |
34 | - top: 0; | |
35 | - width: 80rpx; | |
36 | - height: 148rpx; | |
37 | - display: flex; | |
38 | - align-items: center; | |
39 | - justify-content: center; | |
60 | + position: absolute; | |
61 | + right: 0; | |
62 | + top: 0; | |
63 | + width: 80rpx; | |
64 | + height: 100%; | |
65 | + display: flex; | |
66 | + align-items: center; | |
67 | + justify-content: center; | |
40 | 68 | } |
41 | 69 | |
42 | 70 | .arrow-rigth { |
... | ... | @@ -60,56 +88,65 @@ |
60 | 88 | } |
61 | 89 | |
62 | 90 | .top { |
63 | - | |
64 | - background-color: white; | |
65 | -height: 40px; | |
66 | -display: flex; | |
67 | -padding: 10rpx 0 0 0; | |
68 | -border-bottom: 2rpx solid rgb(238, 238, 238); | |
69 | -margin-top: 10rpx; | |
70 | - | |
91 | + background-color: white; | |
92 | + height: 40px; | |
93 | + display: flex; | |
94 | + padding: 0 26rpx; | |
95 | + /* border-bottom: 2rpx solid rgb(238, 238, 238); */ | |
96 | + margin-top: 20rpx; | |
97 | + align-items: center; | |
71 | 98 | } |
72 | 99 | |
73 | -.t_img image { | |
74 | - width: 70rpx; | |
75 | - height: 70rpx; | |
100 | +.t_img { | |
101 | + display: block; | |
102 | + width: 50rpx; | |
103 | + height: 50rpx; | |
104 | + margin-left:-6rpx; | |
76 | 105 | } |
77 | 106 | |
78 | 107 | .t_wz { |
79 | 108 | font-size: 30rpx; |
80 | - font-weight: bold; | |
109 | + /* font-weight: bold; */ | |
81 | 110 | color: rgb(0, 0, 0); |
82 | 111 | line-height: 65rpx; |
83 | - margin-left: 18rpx; | |
112 | + /* margin-left: 18rpx; */ | |
84 | 113 | } |
85 | 114 | |
86 | 115 | .center { |
116 | + box-sizing: border-box; | |
87 | 117 | background-color: white; |
88 | 118 | width: 100%; |
89 | 119 | min-height: 80rpx; |
90 | 120 | display: flex; |
91 | - padding: 24rpx 140rpx 24rpx 20rpx; | |
121 | + padding: 24rpx 26rpx; | |
92 | 122 | border-bottom: 2rpx solid #eee; |
93 | 123 | } |
94 | 124 | |
95 | 125 | .center .cen_img { |
96 | - width: 120rpx; | |
97 | - height: 120rpx; | |
126 | + width: 200rpx; | |
127 | + height: 200rpx; | |
128 | + border-radius: 14rpx; | |
129 | + overflow: hidden; | |
130 | + flex-shrink: 0; | |
98 | 131 | } |
99 | 132 | |
100 | 133 | .center .cen_img image { |
101 | - width: 120rpx; | |
102 | - height: 120rpx; | |
134 | + display: block; | |
135 | + width: 100%; | |
136 | + height: 100%; | |
137 | +} | |
138 | + | |
139 | +.details-container { | |
140 | + display: flex; | |
141 | + padding-left:20rpx; | |
142 | + flex:1; | |
143 | + flex-direction: column; | |
144 | + justify-content: space-between; | |
103 | 145 | } |
104 | 146 | |
105 | 147 | .center .cen_name { |
106 | 148 | height: 120rpx; |
107 | - width: 370rpx; | |
108 | 149 | font-size: 30rpx; |
109 | - padding-left: 10rpx; | |
110 | - overflow:hidden; | |
111 | - text-overflow:ellipsis; | |
112 | - white-space:nowraps | |
113 | 150 | } |
114 | 151 | |
115 | 152 | .center .cen_jg { |
... | ... | @@ -117,7 +154,6 @@ margin-top: 10rpx; |
117 | 154 | font-size: 32rpx; |
118 | 155 | width: 200rpx; |
119 | 156 | height: 40rpx; |
120 | - text-align: right; | |
121 | 157 | } |
122 | 158 | |
123 | 159 | .center .cen_jg .cen_sl { |
... | ... | @@ -128,20 +164,23 @@ margin-top: 10rpx; |
128 | 164 | } |
129 | 165 | |
130 | 166 | .quhou { |
167 | + box-sizing: border-box; | |
131 | 168 | background-color: white; |
132 | 169 | border-bottom: 2rpx solid #eee; |
133 | 170 | font-size: 28rpx; |
134 | - min-height: 70rpx; | |
171 | + height: 92rpx; | |
135 | 172 | display: flex; |
136 | - padding-top: 20rpx; | |
173 | + align-items: center; | |
174 | + padding: 0 26rpx; | |
137 | 175 | } |
138 | 176 | |
139 | 177 | .quhou .qu_fs { |
140 | 178 | font-size: 30rpx; |
141 | 179 | display: flex; |
142 | 180 | height: 60rpx; |
143 | - margin-left: 25rpx; | |
181 | + /* margin-left: 25rpx; */ | |
144 | 182 | line-height: 62rpx; |
183 | + margin-right: 20rpx; | |
145 | 184 | } |
146 | 185 | |
147 | 186 | .quhou .qu_fs image { |
... | ... | @@ -156,23 +195,26 @@ margin-top: 10rpx; |
156 | 195 | .quhou .qu_fs .qu_wz {} |
157 | 196 | |
158 | 197 | .chentuan { |
198 | + box-sizing: border-box; | |
159 | 199 | width: 100%; |
160 | 200 | min-height: 90rpx; |
161 | 201 | background-color: white; |
162 | - padding: 20rpx 10rpx; | |
202 | + padding: 20rpx 26rpx; | |
163 | 203 | margin-top: 20rpx; |
164 | 204 | font-size: 28rpx; |
165 | 205 | } |
166 | 206 | |
167 | 207 | .chentuan .ct_one { |
168 | - height: 40rpx; | |
169 | - margin-bottom: 10rpx; | |
208 | + /* height: 40rpx; */ | |
209 | + /* margin-bottom: 10rpx; */ | |
170 | 210 | display: flex; |
171 | - width: 708rpx; | |
211 | + line-height: 60rpx; | |
212 | + font-size: 30rpx; | |
213 | + /* width: 708rpx; */ | |
172 | 214 | } |
173 | 215 | |
174 | 216 | .chentuan .ct_one .ct_one_left { |
175 | - margin-left: 10rpx; | |
217 | + /* margin-left: 10rpx; */ | |
176 | 218 | } |
177 | 219 | |
178 | 220 | .chentuan .ct_one .ct_one_right { |
... | ... | @@ -185,14 +227,26 @@ margin-top: 10rpx; |
185 | 227 | } |
186 | 228 | |
187 | 229 | .zf { |
188 | - background-color: white; | |
230 | + /* background-color: white; | |
189 | 231 | width: 100%; |
190 | 232 | min-height: 80rpx; |
191 | 233 | line-height: 80rpx; |
192 | 234 | font-size: 30rpx; |
193 | 235 | position: fixed; |
194 | 236 | bottom: 0; |
195 | - text-align: right; | |
237 | + text-align: right; */ | |
238 | + | |
239 | + height: 94rpx; | |
240 | + box-sizing: border-box; | |
241 | + display: flex; | |
242 | + justify-content: space-between; | |
243 | + background-color: white; | |
244 | + align-items: center; | |
245 | + position: fixed; | |
246 | + bottom: 0; | |
247 | + left: 0; | |
248 | + width: 100%; | |
249 | + padding: 0 30rpx; | |
196 | 250 | } |
197 | 251 | |
198 | 252 | .zf view{ |
... | ... | @@ -204,13 +258,29 @@ margin-top: 10rpx; |
204 | 258 | margin-right: 20rpx; |
205 | 259 | } |
206 | 260 | |
207 | -.zf .zf_btn { | |
208 | - color: white; | |
261 | +.zf_btn { | |
262 | + /* color: white; | |
209 | 263 | background-color: #c4182e; |
210 | 264 | font-size: 28rpx; |
211 | 265 | width: 170rpx; |
212 | 266 | text-align: center; |
213 | - line-height: 80rpx; | |
267 | + line-height: 80rpx; */ | |
268 | + /* float: right; | |
269 | + width: 200rpx; | |
270 | + height: 100rpx; | |
271 | + line-height: 100rpx; | |
272 | + text-align: center; | |
273 | + font-size: 30rpx; | |
274 | + color: #fff; | |
275 | + background-color: #f23030; */ | |
276 | + color: white; | |
277 | + background-color: #FE4445; | |
278 | + height: 72rpx; | |
279 | + line-height: 72rpx; | |
280 | + padding: 0 42rpx; | |
281 | + border-radius: 36rpx; | |
282 | + margin-left: 0; | |
283 | + margin-right: 0; | |
214 | 284 | } |
215 | 285 | |
216 | 286 | .zf .zf_left .zf_left_red { |
... | ... | @@ -218,9 +288,22 @@ margin-top: 10rpx; |
218 | 288 | } |
219 | 289 | |
220 | 290 | /*----------nyf新增,地址---------*/ |
221 | -.add_new{height: 60rpx; line-height: 60rpx;} | |
222 | -.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; | |
223 | - margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;} | |
291 | +.add_new{ | |
292 | + box-sizing: border-box; | |
293 | + height: 92rpx; | |
294 | + padding: 0 26rpx; | |
295 | + display: flex; | |
296 | + align-items: center; | |
297 | + /* line-height: 60rpx; */ | |
298 | +} | |
299 | +.addr_jia{ | |
300 | + width: 45rpx; | |
301 | + height: 45rpx; | |
302 | + border: 1rpx solid #ddd; | |
303 | + margin-right: 15rpx; | |
304 | + /* margin-left: 20rpx; */ | |
305 | + vertical-align: middle; | |
306 | +} | |
224 | 307 | .yu_er{margin-left: 15rpx;} .wuliu{margin-left: 20rpx;} |
225 | 308 | |
226 | 309 | |
... | ... | @@ -228,9 +311,9 @@ margin-top: 10rpx; |
228 | 311 | display: flex; |
229 | 312 | align-items: center; |
230 | 313 | height: 92rpx; |
231 | - border-bottom: 1px solid #ddd; | |
314 | + /* border-bottom: 1px solid #ddd; */ | |
232 | 315 | font-size: 30rpx; |
233 | - padding-left: 20rpx; | |
316 | + padding:0 26rpx; | |
234 | 317 | background: #fff; |
235 | 318 | } |
236 | 319 | .use-item>view{ | ... | ... |