Commit a0f4b1cb6c6f0f8145f824e62fa43fd2d7968a0b
1 parent
bdac0051
提交订单样式修改
Showing
2 changed files
with
634 additions
and
541 deletions
pages/cart/cart2/cart2.wxml
@@ -3,518 +3,550 @@ | @@ -3,518 +3,550 @@ | ||
3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
4 | 4 | ||
5 | <form bindsubmit="submitForm"> | 5 | <form bindsubmit="submitForm"> |
6 | - <view class="container"> | ||
7 | - <!--要进行判断地址是否显示----> | ||
8 | - <view bindtap="enterAddressPage" class="user-mes" | ||
9 | - hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> | ||
10 | - <!---默认地址显示------> | ||
11 | - <block wx:if="{{user_addr!=null}}"> | ||
12 | - | ||
13 | - <view class="user-contact"> | ||
14 | - <text>收货人:</text>{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | ||
15 | - <view class="location"> | ||
16 | - <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> | ||
17 | - <view class="pos-icon"> | ||
18 | - <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | ||
19 | - </view> | ||
20 | - </view> | ||
21 | - <view class="update-logistics"> | ||
22 | - <!-- <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> --> | ||
23 | - <view class="xc-right"></view> | ||
24 | - </view> | ||
25 | - </block> | ||
26 | - <!---先增地址------> | ||
27 | - <block wx:else> | ||
28 | - <view class="add_new"> | ||
29 | - <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址 | ||
30 | - </view> | ||
31 | - </block> | ||
32 | - <view class="border-img"><image class="wh100" src="{{imgUrl}}/miniapp/images/order/new_dividing_line.png"></image></view> | ||
33 | - </view> | ||
34 | - | ||
35 | - <!---------------------购物车进来,有可能多单----------------------> | ||
36 | - <block wx:if="{{is_b_now==0}}"> | ||
37 | - <view class="xc-border main-top"></view> | ||
38 | - <view wx:for="{{cartlist}}" wx:for-index="pidx"> | ||
39 | - <view class="use-item bfff"> | ||
40 | - | ||
41 | - <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>门店:{{item.pname}}</view></view> | ||
42 | - <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | ||
43 | - <!----商品图片-----> | ||
44 | - <view class="goods-img" style="position: relative"> | ||
45 | - <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> | ||
46 | - <image class="wh100" src="{{items.original_img}}" binderror='cart_set_err' | ||
47 | - data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img' ></image> | ||
48 | - </view> | ||
49 | - <!----商品名称规格----> | ||
50 | - <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}"> | ||
51 | - <view class="goods-name">{{items.goods_name}}</view> | ||
52 | - <!-- 商品属性 --> | ||
53 | - <view class="flex-vertical fs28 color-gray n_guige"> | ||
54 | - <view class="goods-color"> | ||
55 | - <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block> | ||
56 | - <!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>--> | ||
57 | - <!--<block wx:else>--> | ||
58 | - <!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>--> | ||
59 | - <!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>--> | ||
60 | - <!--</block>--> | ||
61 | - </view> | ||
62 | - </view> | ||
63 | - | ||
64 | - | ||
65 | - <!-----商品名称规格------> | ||
66 | - <view class="order-num flex-space-between"> | ||
67 | - <view class="co-red">¥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view> | ||
68 | - <view class="goods-num">x{{items.goods_num}}</view> | ||
69 | - </view> | ||
70 | - </navigator> | ||
71 | - | ||
72 | - </view> | ||
73 | - | ||
74 | - <!-----使用优惠券------> | ||
75 | - <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" | ||
76 | - wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null}}" data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}"> | ||
77 | - <view class="work-frame flex-space-between"> | ||
78 | - <view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view> | ||
79 | - <view class="xc-right-frame"> | ||
80 | - <text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text> | ||
81 | - <text wx:if="{{using_quan[item.pickup_id].money}}">¥{{using_quan[item.pickup_id].money}}元优惠券</text> | ||
82 | - <text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text> | 6 | + <view class="container"> |
7 | + <!--要进行判断地址是否显示----> | ||
8 | + <view bindtap="enterAddressPage" class="user-mes mgt20" hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> | ||
9 | + <!---默认地址显示------> | ||
10 | + <block wx:if="{{user_addr!=null}}"> | ||
11 | + | ||
12 | + <view class="user-contact"> | ||
13 | + <text>收货人:</text>{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | ||
14 | + <view class="location"> | ||
15 | + <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> | ||
16 | + <view class="pos-icon"> | ||
17 | + <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | ||
18 | + </view> | ||
19 | + </view> | ||
20 | + <view class="update-logistics"> | ||
21 | + <!-- <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> --> | ||
22 | + <view class="xc-right"></view> | ||
23 | + </view> | ||
24 | + </block> | ||
25 | + <!---先增地址------> | ||
26 | + <block wx:else> | ||
27 | + <view class="add_new"> | ||
28 | + <image class="addr_jia" src="{{imgUrl}}/miniapp/images/jia.png"></image>添加地址 | ||
29 | + </view> | ||
30 | + </block> | ||
31 | + <!-- <view class="border-img"> | ||
32 | + <image class="wh100" src="{{imgUrl}}/miniapp/images/order/new_dividing_line.png"></image> | ||
33 | + </view> --> | ||
34 | + </view> | ||
35 | + | ||
36 | + <!---------------------购物车进来,有可能多单----------------------> | ||
37 | + <block wx:if="{{is_b_now==0}}"> | ||
38 | + <!-- <view class="xc-border main-top"></view> --> | ||
39 | + <view wx:for="{{cartlist}}" wx:for-index="pidx"> | ||
40 | + <view class="use-item bfff bdr_t-14 mgt20"> | ||
41 | + <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> | ||
42 | + <!-- <view>门店:{{item.pname}}</view> --> | ||
43 | + <view>{{item.pname}}</view> | ||
44 | + </view> | ||
45 | + <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | ||
46 | + <!----商品图片-----> | ||
47 | + <view class="goods-img" style="position: relative"> | ||
48 | + <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> | ||
49 | + <image class="wh100" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image> | ||
50 | + </view> | ||
51 | + <!----商品名称规格----> | ||
52 | + <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}"> | ||
53 | + <view class="goods-name">{{items.goods_name}}</view> | ||
54 | + <!-- 商品属性 --> | ||
55 | + <view class="flex-vertical fs28 color-gray n_guige"> | ||
56 | + <view class="goods-color"> | ||
57 | + <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block> | ||
58 | + <!--<block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>--> | ||
59 | + <!--<block wx:else>--> | ||
60 | + <!--<text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>--> | ||
61 | + <!--<text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>--> | ||
62 | + <!--</block>--> | ||
63 | + </view> | ||
64 | + </view> | ||
65 | + | ||
66 | + | ||
67 | + <!-----商品名称规格------> | ||
68 | + <view class="order-num flex-space-between"> | ||
69 | + <view class="co-red">¥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view> | ||
70 | + <view class="goods-num">x{{items.goods_num}}</view> | ||
71 | + </view> | ||
72 | + </navigator> | ||
73 | + | ||
74 | + </view> | ||
75 | + | ||
76 | + <!-----使用优惠券------> | ||
77 | + <view class="xc-coupon-frame flex-center" data-bn="0" bindtap="open_coupon_list" wx:if="{{(item.quan_list && item.quan_list.length>0) || get_by_quan_list_cart[item.pickup_id]!=null}}" | ||
78 | + data-cind="{{pidx}}" data-pickid="{{item.pickup_id}}"> | ||
79 | + <view class="work-frame flex-space-between"> | ||
80 | + <view class="work">优惠券<text class="quan_num_show fs20">{{item.can_num}}张可用</text></view> | ||
81 | + <view class="xc-right-frame"> | ||
82 | + <text wx:if="{{using_quan[item.pickup_id].is_nouse}}">不使用</text> | ||
83 | + <text wx:if="{{using_quan[item.pickup_id].money}}">¥{{using_quan[item.pickup_id].money}}元优惠券</text> | ||
84 | + <text wx:if="{{using_quan[item.pickup_id].isby}}">包邮券</text> | ||
83 | <view class="xc-right"></view> | 85 | <view class="xc-right"></view> |
84 | - </view> | ||
85 | - </view> | ||
86 | - </view> | ||
87 | - | ||
88 | - | ||
89 | - <view class="set-mes"> | ||
90 | - <view wx:if="{{order.store_prom}}"> | ||
91 | - <icon color="#f23030" size="16" type="info"></icon> | ||
92 | - {{order.store_prom}} | ||
93 | - </view> | ||
94 | - <view class="use-item flex-space-between"> | ||
95 | - <view class="flex-vertical"> | ||
96 | - <view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type'style="display:{{item.distr_t==2?'none':'flex;align-items: center'}};"> | ||
97 | - <!-- <icon bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> --> | ||
98 | - | ||
99 | - | ||
100 | - | ||
101 | - <block wx:if="{{item.exp_type==1}}"> | ||
102 | - <!-- <view class="circle white xc-hookt fs20 red-b sn"><text>Γ</text></view> --> | ||
103 | - <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
104 | - </block> | ||
105 | - <block wx:else> | ||
106 | - <view class="circle xc-hookts on"></view> | ||
107 | - </block> | ||
108 | - <view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view> | ||
109 | - </view> | ||
110 | - | ||
111 | - <view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};"> | ||
112 | - <!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> --> | ||
113 | - <block wx:if="{{item.exp_type==0}}"> | ||
114 | - <!-- <view class="circle white xc-hookt fs20 red-b sn"><text>Γ</text></view> --> | ||
115 | - <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
116 | - </block> | ||
117 | - <block wx:else> | ||
118 | - <view class="circle xc-hookts on"></view> | ||
119 | - </block> | ||
120 | - | ||
121 | - <view bindtap='setexptype_w' data-t='0' data-ind="{{pidx}}" | ||
122 | - data-txt='cartlist[{{pidx}}].exp_type' | ||
123 | - data-wl_txt='cartlist[{{pidx}}].wind' | ||
124 | - class="yu_er">快递邮寄</view> | ||
125 | - </view> | ||
126 | - </view> | ||
127 | - <block wx:if="{{item.exp_type==0}}"> | ||
128 | - <!-- 点击显示物流选择 --> | ||
129 | - <view class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}"> | ||
130 | - <view >{{wu_arr[item.wind].name}}</view><view class="xc-right"></view> | ||
131 | - </view> | ||
132 | - </block> | ||
133 | - </view> | ||
134 | - | ||
135 | - <!-- <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'> | 86 | + </view> |
87 | + </view> | ||
88 | + </view> | ||
89 | + | ||
90 | + | ||
91 | + <view class="set-mes bdr_b-14"> | ||
92 | + <view wx:if="{{order.store_prom}}"> | ||
93 | + <icon color="#f23030" size="16" type="info"></icon> | ||
94 | + {{order.store_prom}} | ||
95 | + </view> | ||
96 | + <view class="use-item flex-space-between"> | ||
97 | + <view class="flex-vertical"> | ||
98 | + <view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="padding-right:26rpx;display:{{item.distr_t==2?'none':'flex;align-items: center'}};"> | ||
99 | + <!-- <icon bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> --> | ||
100 | + | ||
101 | + | ||
102 | + | ||
103 | + <block wx:if="{{item.exp_type==1}}"> | ||
104 | + <!-- <view class="circle white xc-hookt fs20 red-b sn"><text>Γ</text></view> --> | ||
105 | + <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
106 | + </block> | ||
107 | + <block wx:else> | ||
108 | + <view class="circle xc-hookts on"></view> | ||
109 | + </block> | ||
110 | + <view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view> | ||
111 | + </view> | ||
112 | + | ||
113 | + <view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};"> | ||
114 | + <!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> --> | ||
115 | + <block wx:if="{{item.exp_type==0}}"> | ||
116 | + <!-- <view class="circle white xc-hookt fs20 red-b sn"><text>Γ</text></view> --> | ||
117 | + <icon data-t='0' data-txt='cartlist[{{pidx}}].exp_type' color="red" size="16" type="success"></icon> | ||
118 | + </block> | ||
119 | + <block wx:else> | ||
120 | + <view class="circle xc-hookts on"></view> | ||
121 | + </block> | ||
122 | + | ||
123 | + <view bindtap='setexptype_w' data-t='0' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind' | ||
124 | + class="yu_er">快递邮寄</view> | ||
125 | + </view> | ||
126 | + </view> | ||
127 | + <block wx:if="{{item.exp_type==0}}"> | ||
128 | + <!-- 点击显示物流选择 --> | ||
129 | + <view class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}" style="padding-right:6rpx;"> | ||
130 | + <view>{{wu_arr[item.wind].name}}</view> | ||
131 | + <view class="xc-right"></view> | ||
132 | + </view> | ||
133 | + </block> | ||
134 | + </view> | ||
135 | + | ||
136 | + <!-- <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'> | ||
136 | <view>选择物流:</view> --> | 137 | <view>选择物流:</view> --> |
137 | - <!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind' value="{{item.wind}}" range="{{wu_arr}}" range-key="name"> | 138 | + <!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind' value="{{item.wind}}" range="{{wu_arr}}" range-key="name"> |
138 | <view >{{wu_arr[item.wind].name}}</view> | 139 | <view >{{wu_arr[item.wind].name}}</view> |
139 | </picker> --> | 140 | </picker> --> |
140 | - <!-- </view> --> | ||
141 | - </view> | ||
142 | - | ||
143 | - <!-- 留言 --> | ||
144 | - <view class="coupon-mes flex-vertical"> | ||
145 | - <view>留言</view> | ||
146 | - <view class="leave-word"> | ||
147 | - <input placeholder-class="fs28" placeholder='给商家留言,最多100字'bindinput="keyUpChangeNum" | ||
148 | - disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></input> | ||
149 | - | ||
150 | - </view> | ||
151 | - </view> | ||
152 | - | ||
153 | - </view> | ||
154 | - | ||
155 | - <!-----使用余额------> | ||
156 | - <view class="set-mes" wx:if="{{yuer>0}}"> | ||
157 | - <view class="use-item" bindtap='set_js_useyuer'> | ||
158 | - <icon color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon> | ||
159 | - <view class="yu_er">使用余额 :¥{{yuer}} </view> | ||
160 | - </view> | ||
161 | - </view> | ||
162 | - | ||
163 | - </block> | ||
164 | - | ||
165 | - <!------立即购买--------> | ||
166 | - <view class="xc-border xc-border"></view> | ||
167 | - <block wx:if="{{is_b_now==1}}"> | ||
168 | - <view class="use-item bfff"> | ||
169 | - <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店:{{bn_pickname}}</view></view> | ||
170 | - <view class="order-detail"> | ||
171 | - <view class="goods-img"> | ||
172 | - <image class="wh100" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image> | ||
173 | - </view> | ||
174 | - <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> | ||
175 | - <view class="goods-name">{{bn_goods.goods_name}}</view> | ||
176 | - <!-- 商品属性 --> | ||
177 | - <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
178 | - <view class="goods-color"> | ||
179 | - <block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block> | ||
180 | - <!--<block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>--> | ||
181 | - <!--<block wx:else>--> | ||
182 | - <!--<text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>--> | ||
183 | - <!--<text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text>--> | ||
184 | - <!--</block>--> | ||
185 | - </view> | ||
186 | - </view> | ||
187 | - | ||
188 | - <!-----商品名称规格------> | ||
189 | - <view class="order-num flex-space-between"> | ||
190 | - <view class="co-red">¥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view> | ||
191 | - <view class="goods-num">x{{bn_goods.buynum}}</view> | ||
192 | - </view> | ||
193 | - </navigator> | ||
194 | - | ||
195 | - </view> | ||
196 | - <!-- 赠品的显示 --> | ||
197 | - <view class="order-detail" wx:if="{{buy_now_gift_goods}}"> | ||
198 | - <view class="goods-img" style="position: relative"> | ||
199 | - <image src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> | ||
200 | - | ||
201 | - <image class="wh100" src="{{buy_now_gift_goods.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods.original_img"></image> | ||
202 | - </view> | ||
203 | - <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{buy_now_gift_goods.goods_id}}"> | ||
204 | - <view class="goods-name">{{buy_now_gift_goods.goods_name}}</view> | ||
205 | - <!-- 商品属性 --> | ||
206 | - <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
207 | - <view class="goods-color"> | ||
208 | - <block><text>{{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}}</text></block> | ||
209 | - </view> | ||
210 | - </view> | ||
211 | - <!-----商品名称规格------> | ||
212 | - <view class="order-num flex-space-between"> | ||
213 | - <view class="co-red">¥<text class="fs36">0</text></view> | ||
214 | - <view class="goods-num">x{{buy_now_gift_goods.buynum}}</view> | ||
215 | - </view> | ||
216 | - </navigator> | ||
217 | - </view> | ||
218 | - | ||
219 | - | ||
220 | - <block wx:if="{{collocation_goods}}"> | ||
221 | - <!-- 搭配购买的功能实现 --> | ||
222 | - <view class="order-detail" wx:for="{{collocation_goods}}"> | ||
223 | - <view class="goods-img"> | ||
224 | - <image class="wh100" src="{{imgUrl+item.original_img}}" binderror='err_img_collocation' data-err="item.original_img"></image> | ||
225 | - </view> | ||
226 | - <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
227 | - <view class="goods-name">{{item.goods_name}}</view> | ||
228 | - <!-- 商品属性 --> | ||
229 | - <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
230 | - <view class="goods-color"> | ||
231 | - <block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block> | ||
232 | - </view> | ||
233 | - </view> | ||
234 | - <!-----商品名称规格------> | ||
235 | - <view class="order-num flex-space-between"> | ||
236 | - <view class="co-red">¥<text class="fs36">{{item.price}}</text></view> | ||
237 | - <view class="goods-num">x{{item.goods_num}}</view> | ||
238 | - </view> | ||
239 | - </navigator> | ||
240 | - </view> | ||
241 | - </block> | ||
242 | - | ||
243 | - | ||
244 | - <view class="set-mes"> | ||
245 | - <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | ||
246 | - </view> | ||
247 | - | ||
248 | - <view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" | ||
249 | - wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}"> | ||
250 | - <view class="work-frame flex-space-between"> | ||
251 | - <view class="work"> | ||
252 | - 优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text> | ||
253 | - </view> | ||
254 | - <view class="xc-right-frame"> | ||
255 | - <text wx:if="{{using_quan[bn_pick].is_nouse}}">不使用</text> | ||
256 | - <block wx:else> | ||
257 | - <text wx:if="{{using_quan[bn_pick].money}}">¥{{using_quan[bn_pick].money}}元优惠券</text> | ||
258 | - <text wx:if="{{using_quan[bn_pick].isby}}">包邮券</text> | ||
259 | - </block> | ||
260 | - <view class="xc-right"></view> | ||
261 | - </view> | ||
262 | - </view> | ||
263 | - </view> | ||
264 | - | ||
265 | - <view class="use-item flex-space-between"> | ||
266 | - <view class="flex"> | ||
267 | - <view bindtap='setexptype' data-t='1' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> | ||
268 | - <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | ||
269 | - <view class="yu_er">自提</view> | ||
270 | - </view> | ||
271 | - <view bindtap='setexptype' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> | ||
272 | - <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | ||
273 | - <view class="yu_er">物流</view> | ||
274 | - </view> | ||
275 | -</view> | ||
276 | - <block wx:if="{{bn_exp_type==0}}"> | ||
277 | - <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index'><view class="logistics-name">{{wu_arr[index].name}}</view><view class="xc-right"></view></view> | ||
278 | - </block> | ||
279 | - </view> | ||
280 | - </view> | ||
281 | - | ||
282 | - <!-----使用余额------> | ||
283 | - <view class="set-mes" wx:if="{{yuer>0}}"> | ||
284 | - <view class="use-item" bindtap='set_bn_useyuer'> | ||
285 | - <icon color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon> | ||
286 | - <view class="yu_er">使用余额 :¥{{yuer}} </view> | ||
287 | - </view> | ||
288 | - </view> | ||
289 | - <view class="coupon-mes flex-vertical"> | ||
290 | - <view>留言</view> | ||
291 | - <view class="leave-word"> | ||
292 | - <input placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input> | ||
293 | - | ||
294 | - </view> | ||
295 | - </view> | ||
296 | - </block> | ||
297 | - | ||
298 | - <view class="information"> | ||
299 | - <view class="item" wx:if="{{formData.all_price>0}}"> | ||
300 | - <view>商品金额</view> | ||
301 | - <view class="co-red">¥ {{formData.all_price}}元</view> | ||
302 | - </view> | ||
303 | - <view class="item" wx:if="{{formData.shipping_price>0}}"> | ||
304 | - <view>配送费用</view> | ||
305 | - <view class="co-red">¥ {{formData.shipping_price}}元</view> | ||
306 | - </view> | ||
307 | - <view class="item" wx:if="{{formData.coupon_price>0}}"> | ||
308 | - <view>使用优惠券</view> | ||
309 | - <view class="co-red">- ¥ {{formData.coupon_price}}元</view> | ||
310 | - </view> | ||
311 | - <!-- 优惠活动优惠金额 --> | ||
312 | - <view class="item" wx:if="{{formData.cut_price>0}}"> | ||
313 | - <view>优惠活动</view> | ||
314 | - <view class="co-red">- ¥ {{filters.toFix(formData.cut_price,2)}}元</view> | ||
315 | - </view> | ||
316 | - <!-- 订单优惠优惠金额 --> | ||
317 | - <view class="item" wx:if="{{formData.order_prom_amount>0}}"> | ||
318 | - <view>订单优惠</view> | ||
319 | - <view class="co-red">- ¥ {{filters.toFix(formData.order_prom_amount,2)}}元</view> | ||
320 | - </view> | ||
321 | - <view class="item" wx:if="{{formData.user_money>0}}"> | ||
322 | - <view>使用余额</view> | ||
323 | - <view class="co-red">- ¥ {{formData.user_money}}元</view> | ||
324 | - </view> | ||
325 | - </view> | ||
326 | - </view> | ||
327 | - | ||
328 | - <view class="btn-wrap"> | ||
329 | - <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> | ||
330 | - <view class="pay-amount"> | ||
331 | - <view class="payable">应付金额 : </view> | ||
332 | - <view class="co-red big">¥ {{formData.order_amount}}元</view> | ||
333 | - </view> | ||
334 | - </view> | 141 | + <!-- </view> --> |
142 | + </view> | ||
143 | + | ||
144 | + <!-- 留言 --> | ||
145 | + <view class="coupon-mes flex-vertical"> | ||
146 | + <view>留言</view> | ||
147 | + <view class="leave-word"> | ||
148 | + <input placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" | ||
149 | + class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></input> | ||
150 | + | ||
151 | + </view> | ||
152 | + </view> | ||
153 | + | ||
154 | + </view> | ||
155 | + | ||
156 | + <!-----使用余额------> | ||
157 | + <view class="set-mes bdr_t-14" wx:if="{{yuer>0}}"> | ||
158 | + <view class="use-item" bindtap='set_js_useyuer'> | ||
159 | + <icon color="{{js_use_money?'red':'gray'}}" size="16" type="success"></icon> | ||
160 | + <view class="yu_er">使用余额 :¥{{yuer}} </view> | ||
161 | + </view> | ||
162 | + </view> | ||
163 | + | ||
164 | + </block> | ||
165 | + | ||
166 | + <!------立即购买--------> | ||
167 | + <!-- <view class="xc-border xc-border"></view> --> | ||
168 | + <block wx:if="{{is_b_now==1}}"> | ||
169 | + <view class="use-item bfff bdr_t-14 mgt20"> | ||
170 | + <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> | ||
171 | + <view>{{bn_pickname}}</view> | ||
172 | + <!-- <view>门店:{{bn_pickname}}</view> --> | ||
173 | + </view> | ||
174 | + <view class="order-detail"> | ||
175 | + <view class="goods-img"> | ||
176 | + <image class="wh100" src="{{bn_goods.original_img}}" binderror='cart_set_err' data-err="bn_goods.original_img"></image> | ||
177 | + </view> | ||
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> | ||
180 | + <!-- 商品属性 --> | ||
181 | + <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
182 | + <view class="goods-color"> | ||
183 | + <block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block> | ||
184 | + <!--<block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>--> | ||
185 | + <!--<block wx:else>--> | ||
186 | + <!--<text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>--> | ||
187 | + <!--<text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text>--> | ||
188 | + <!--</block>--> | ||
189 | + </view> | ||
190 | + </view> | ||
191 | + | ||
192 | + <!-----商品名称规格------> | ||
193 | + <view class="order-num flex-space-between"> | ||
194 | + <view class="co-red">¥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view> | ||
195 | + <view class="goods-num">x{{bn_goods.buynum}}</view> | ||
196 | + </view> | ||
197 | + </navigator> | ||
198 | + | ||
199 | + </view> | ||
200 | + <!-- 赠品的显示 --> | ||
201 | + <view class="order-detail" wx:if="{{buy_now_gift_goods}}"> | ||
202 | + <view class="goods-img" style="position: relative"> | ||
203 | + <image src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> | ||
204 | + | ||
205 | + <image class="wh100" src="{{buy_now_gift_goods.original_img}}" binderror='cart_set_err' data-err="buy_now_gift_goods.original_img"></image> | ||
206 | + </view> | ||
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> | ||
209 | + <!-- 商品属性 --> | ||
210 | + <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
211 | + <view class="goods-color"> | ||
212 | + <block><text>{{filters.show_gui_ge(buy_now_gift_goods.goods_spec,buy_now_gift_goods.goods_color)}}</text></block> | ||
213 | + </view> | ||
214 | + </view> | ||
215 | + <!-----商品名称规格------> | ||
216 | + <view class="order-num flex-space-between"> | ||
217 | + <view class="co-red">¥<text class="fs36">0</text></view> | ||
218 | + <view class="goods-num">x{{buy_now_gift_goods.buynum}}</view> | ||
219 | + </view> | ||
220 | + </navigator> | ||
221 | + </view> | ||
222 | + | ||
223 | + | ||
224 | + <block wx:if="{{collocation_goods}}"> | ||
225 | + <!-- 搭配购买的功能实现 --> | ||
226 | + <view class="order-detail" wx:for="{{collocation_goods}}"> | ||
227 | + <view class="goods-img"> | ||
228 | + <image class="wh100" src="{{imgUrl+item.original_img}}" binderror='err_img_collocation' data-err="item.original_img"></image> | ||
229 | + </view> | ||
230 | + <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}"> | ||
231 | + <view class="goods-name">{{item.goods_name}}</view> | ||
232 | + <!-- 商品属性 --> | ||
233 | + <view class="flex-vertical fs28 xc-ash color-gray n_guige"> | ||
234 | + <view class="goods-color"> | ||
235 | + <block><text>{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</text></block> | ||
236 | + </view> | ||
237 | + </view> | ||
238 | + <!-----商品名称规格------> | ||
239 | + <view class="order-num flex-space-between"> | ||
240 | + <view class="co-red">¥<text class="fs36">{{item.price}}</text></view> | ||
241 | + <view class="goods-num">x{{item.goods_num}}</view> | ||
242 | + </view> | ||
243 | + </navigator> | ||
244 | + </view> | ||
245 | + </block> | ||
246 | + | ||
247 | + | ||
248 | + <view class="set-mes"> | ||
249 | + <view wx:if="{{order.store_prom}}"> | ||
250 | + <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | ||
251 | + </view> | ||
252 | + | ||
253 | + <view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}"> | ||
254 | + <view class="work-frame flex-space-between"> | ||
255 | + <view class="work"> | ||
256 | + 优惠券 <text class="quan_num_show">{{(selected_quan_list?selected_quan_list.length:0)+ (get_by_quan_list?get_by_quan_list.length:0)}}张可用</text> | ||
257 | + </view> | ||
258 | + <view class="xc-right-frame"> | ||
259 | + <text wx:if="{{using_quan[bn_pick].is_nouse}}">不使用</text> | ||
260 | + <block wx:else> | ||
261 | + <text wx:if="{{using_quan[bn_pick].money}}">¥{{using_quan[bn_pick].money}}元优惠券</text> | ||
262 | + <text wx:if="{{using_quan[bn_pick].isby}}">包邮券</text> | ||
263 | + </block> | ||
264 | + <view class="xc-right"></view> | ||
265 | + </view> | ||
266 | + </view> | ||
267 | + </view> | ||
268 | + | ||
269 | + <view class="use-item flex-space-between"> | ||
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;'}};"> | ||
272 | + <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | ||
273 | + <view class="yu_er">自提</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;'}};"> | ||
276 | + <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | ||
277 | + <view class="yu_er">物流</view> | ||
278 | + </view> | ||
279 | + </view> | ||
280 | + <block wx:if="{{bn_exp_type==0}}"> | ||
281 | + <view class="flex-vertical" bindtap="show_wu_arr" data-txt='index'> | ||
282 | + <view class="logistics-name">{{wu_arr[index].name}}</view> | ||
283 | + <view class="xc-right"></view> | ||
284 | + </view> | ||
285 | + </block> | ||
286 | + </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> | ||
296 | + <view class="coupon-mes flex-vertical"> | ||
297 | + <view>留言</view> | ||
298 | + <view class="leave-word"> | ||
299 | + <input placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" | ||
300 | + class="word-box" maxlength="100" name="user_note"></input> | ||
301 | + | ||
302 | + </view> | ||
303 | + </view> | ||
304 | + </block> | ||
305 | + | ||
306 | + <view class="information bdr_b-14"> | ||
307 | + <view class="item" wx:if="{{formData.all_price>0}}"> | ||
308 | + <view>商品金额</view> | ||
309 | + <view class="co-red">¥ {{formData.all_price}}元</view> | ||
310 | + </view> | ||
311 | + <view class="item" wx:if="{{formData.shipping_price>0}}"> | ||
312 | + <view>配送费用</view> | ||
313 | + <view class="co-red">¥ {{formData.shipping_price}}元</view> | ||
314 | + </view> | ||
315 | + <view class="item" wx:if="{{formData.coupon_price>0}}"> | ||
316 | + <view>使用优惠券</view> | ||
317 | + <view class="co-red">- ¥ {{formData.coupon_price}}元</view> | ||
318 | + </view> | ||
319 | + <!-- 优惠活动优惠金额 --> | ||
320 | + <view class="item" wx:if="{{formData.cut_price>0}}"> | ||
321 | + <view>优惠活动</view> | ||
322 | + <view class="co-red">- ¥ {{filters.toFix(formData.cut_price,2)}}元</view> | ||
323 | + </view> | ||
324 | + <!-- 订单优惠优惠金额 --> | ||
325 | + <view class="item" wx:if="{{formData.order_prom_amount>0}}"> | ||
326 | + <view>订单优惠</view> | ||
327 | + <view class="co-red">- ¥ {{filters.toFix(formData.order_prom_amount,2)}}元</view> | ||
328 | + </view> | ||
329 | + <view class="item" wx:if="{{formData.user_money>0}}"> | ||
330 | + <view>使用余额</view> | ||
331 | + <view class="co-red">- ¥ {{formData.user_money}}元</view> | ||
332 | + </view> | ||
333 | + </view> | ||
334 | + </view> | ||
335 | + | ||
336 | + <view class="btn-wrap shadow-1"> | ||
337 | + <view class="pay-amount"> | ||
338 | + <view class="payable">应付金额:¥{{formData.order_amount}}</view> | ||
339 | + <!-- <view class="co-red big"></view> --> | ||
340 | + </view> | ||
341 | + <button class="tips-btn" formType="submit" id="submitOrder">提交订单</button> | ||
342 | + </view> | ||
335 | </form> | 343 | </form> |
336 | 344 | ||
337 | <!-- 使用券列表的弹窗 --> | 345 | <!-- 使用券列表的弹窗 --> |
338 | -<view wx:if='{{open_quan==1}}' > | ||
339 | - <view class="cover-layer flex-center " bindtap='close_coupon'> </view> | ||
340 | - <view class="cx-popup {{open_quan==true?'up' : 'down'}}" > | 346 | +<view wx:if='{{open_quan==1}}'> |
347 | + <view class="cover-layer flex-center " bindtap='close_coupon'> </view> | ||
348 | + <view class="cx-popup {{open_quan==true?'up' : 'down'}}"> | ||
341 | <!-- 最上面 --> | 349 | <!-- 最上面 --> |
342 | - <view class="top flex"> | ||
343 | - <view class="xc-top-content t-c"><view class="xc-title">优惠券使用</view></view> | ||
344 | - <view class="xc-close-frame" bindtap='close_coupon' ><view class="xc-close">×</view></view> | ||
345 | - </view> | ||
346 | - <!-- 使用优惠券和不使用优惠券层--> | ||
347 | - <view class="may_use_coupon fs28 flex"> 可使用的优惠券 | ||
348 | - <view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券 | ||
349 | - <block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"><view class="circle white xc-hooka fs20 red-b sn"><text>Γ</text></view> </block> | ||
350 | - <block wx:else><view class="circle xc-hookst ons"></view></block> | ||
351 | - </view> | ||
352 | - </view> | ||
353 | - | ||
354 | - <!-- 中间券内容显示 --> | ||
355 | - <view class="xc-frame flex-level"> | ||
356 | - <view class="list-frame"> | ||
357 | - <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}" wx:for-item="item" wx:for-index="q_index"> | ||
358 | - <view class="xc-coupon-frame flex-center" data-ind="{{q_index}}"> | 350 | + <view class="top flex"> |
351 | + <view class="xc-top-content t-c"> | ||
352 | + <view class="xc-title">优惠券使用</view> | ||
353 | + </view> | ||
354 | + <view class="xc-close-frame" bindtap='close_coupon'> | ||
355 | + <view class="xc-close">×</view> | ||
356 | + </view> | ||
357 | + </view> | ||
358 | + <!-- 使用优惠券和不使用优惠券层--> | ||
359 | + <view class="may_use_coupon fs28 flex"> 可使用的优惠券 | ||
360 | + <view class=" is_use_coupon flex-vertical" bindtap="sele_quan_item" data-no="1">不使用优惠券 | ||
361 | + <block wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"> | ||
362 | + <view class="circle white xc-hooka fs20 red-b sn"><text>Γ</text></view> | ||
363 | + </block> | ||
364 | + <block wx:else> | ||
365 | + <view class="circle xc-hookst ons"></view> | ||
366 | + </block> | ||
367 | + </view> | ||
368 | + </view> | ||
369 | + | ||
370 | + <!-- 中间券内容显示 --> | ||
371 | + <view class="xc-frame flex-level"> | ||
372 | + <view class="list-frame"> | ||
373 | + <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" wx:if="{{!item.is_using}}" data-ind="{{q_index}}" | ||
374 | + wx:for-item="item" wx:for-index="q_index"> | ||
375 | + <view class="xc-coupon-frame flex-center" data-ind="{{q_index}}"> | ||
376 | + <view class="coupon-frame flex rel"> | ||
377 | + <!-- 锯齿 --> | ||
378 | + <include src="juchi_part.wxml" /> | ||
379 | + <!-- 左边 --> | ||
380 | + <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
381 | + <view class="white xc-money-frames"> | ||
382 | + <view class="f_text"><text class="xc-rmb-symbol">¥</text><text class="xc-rmb-val">{{item.Sum}}</text></view> | ||
383 | + <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用</view> | ||
384 | + <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
385 | + </view> | ||
386 | + </view> | ||
387 | + <!-- 右边 --> | ||
388 | + <view class="coupon-right flex-center rel"> | ||
389 | + <view class="coupon-annotation flex"> | ||
390 | + <view class="flex top-frame"> | ||
391 | + <view class="frame"> | ||
392 | + <view class="coupon-wode ib flex ellipsis-2 "> | ||
393 | + <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}</text> | ||
394 | + <block>{{item.Sum}}元优惠券</block> | ||
395 | + </view> | ||
396 | + <view class="coupon-time">{{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view> | ||
397 | + </view> | ||
398 | + </view> | ||
399 | + <block wx:if="{{item.show_red}}"> | ||
400 | + <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | ||
401 | + </block> | ||
402 | + <block wx:else> | ||
403 | + <view class="circle xc-hooks on"></view> | ||
404 | + </block> | ||
405 | + </view> | ||
406 | + <include src="remark_click_part.wxml" /> | ||
407 | + </view> | ||
408 | + </view> | ||
409 | + </view> | ||
410 | + <!-- 打开是说明 --> | ||
411 | + <include src="remark_part.wxml" /> | ||
412 | + </view> | ||
413 | + <!-- 包邮券的显示,立即购买 --> | ||
414 | + <block wx:if="{{ is_b_now && bn_exp_type==0}}"> | ||
415 | + <view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" | ||
416 | + wx:for-item="item" wx:for-index="byq_index"> | ||
417 | + <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}"> | ||
418 | + <view class="coupon-frame flex rel"> | ||
419 | + <!-- 锯齿 --> | ||
420 | + <include src="juchi_part.wxml" /> | ||
421 | + <!-- 左边 --> | ||
422 | + <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
423 | + <view class="white xc-money-frames"> | ||
424 | + <view class="f_text"><text class="xc-rmb-val">包邮券</text></view> | ||
425 | + <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view> | ||
426 | + <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
427 | + </view> | ||
428 | + </view> | ||
429 | + <!-- 右边 --> | ||
430 | + <view class="coupon-right flex-center rel"> | ||
431 | + <view class="coupon-annotation flex"> | ||
432 | + <view class="flex top-frame"> | ||
433 | + <view class="frame"> | ||
434 | + <view class="coupon-wode ib flex ellipsis-2 "> | ||
435 | + <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text> | ||
436 | + <block>包邮券</block> | ||
437 | + </view> | ||
438 | + <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view> | ||
439 | + </view> | ||
440 | + </view> | ||
441 | + <block wx:if="{{item.show_red}}"> | ||
442 | + <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | ||
443 | + </block> | ||
444 | + <block wx:else> | ||
445 | + <view class="circle xc-hooks on"></view> | ||
446 | + </block> | ||
447 | + </view> | ||
448 | + <include src="remark_click_part2.wxml" /> | ||
449 | + </view> | ||
450 | + </view> | ||
451 | + </view> | ||
452 | + <!-- 打开是说明 --> | ||
453 | + <include src="remark_part.wxml" /> | ||
454 | + </view> | ||
455 | + </block> | ||
456 | + | ||
457 | + <!-- 包邮券的显示,购物车购买 --> | ||
458 | + <block wx:if="{{!is_b_now && sele_exp_type==0}}"> | ||
459 | + <view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" | ||
460 | + wx:for-item="item" wx:for-index="byq_index"> | ||
461 | + <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}"> | ||
359 | <view class="coupon-frame flex rel"> | 462 | <view class="coupon-frame flex rel"> |
360 | - <!-- 锯齿 --> | ||
361 | - <include src="juchi_part.wxml" /> | ||
362 | - <!-- 左边 --> | ||
363 | - <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
364 | - <view class="white xc-money-frames"> | ||
365 | - <view class="f_text"><text class="xc-rmb-symbol">¥</text><text class="xc-rmb-val">{{item.Sum}}</text></view> | ||
366 | - <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}">满{{item.BuySum}}元可用</view> | ||
367 | - <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
368 | - </view> | ||
369 | - </view> | ||
370 | - <!-- 右边 --> | ||
371 | - <view class="coupon-right flex-center rel"> | ||
372 | - <view class="coupon-annotation flex"> | ||
373 | - <view class="flex top-frame"> | ||
374 | - <view class="frame"> | ||
375 | - <view class="coupon-wode ib flex ellipsis-2 "> | ||
376 | - <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}}</text> | ||
377 | - <block>{{item.Sum}}元优惠券</block> | ||
378 | - </view> | ||
379 | - <view class="coupon-time">{{filters.replace_time2(item.BeginDate)}}至{{item.ValidDate?filters.replace_time2(item.ValidDate):'不限'}}</view> | ||
380 | - </view> | ||
381 | - </view> | ||
382 | - <block wx:if="{{item.show_red}}"><view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view></block> | ||
383 | - <block wx:else><view class="circle xc-hooks on"></view></block> | ||
384 | - </view> | ||
385 | - <include src="remark_click_part.wxml" /> | ||
386 | - </view> | ||
387 | - </view> | ||
388 | - </view> | ||
389 | - <!-- 打开是说明 --> | 463 | + <!-- 锯齿 --> |
464 | + <include src="juchi_part.wxml" /> | ||
465 | + <!-- 左边 --> | ||
466 | + <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
467 | + <view class="white xc-money-frames"> | ||
468 | + <view class="f_text"><text class="xc-rmb-val">包邮券</text></view> | ||
469 | + <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view> | ||
470 | + <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
471 | + </view> | ||
472 | + </view> | ||
473 | + <!-- 右边 --> | ||
474 | + <view class="coupon-right flex-center rel"> | ||
475 | + <view class="coupon-annotation flex"> | ||
476 | + <view class="flex top-frame"> | ||
477 | + <view class="frame"> | ||
478 | + <view class="coupon-wode ib flex ellipsis-2 "> | ||
479 | + <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text> | ||
480 | + <block>包邮券</block> | ||
481 | + </view> | ||
482 | + <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view> | ||
483 | + </view> | ||
484 | + </view> | ||
485 | + <block wx:if="{{item.show_red}}"> | ||
486 | + <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | ||
487 | + </block> | ||
488 | + <block wx:else> | ||
489 | + <view class="circle xc-hooks on"></view> | ||
490 | + </block> | ||
491 | + </view> | ||
492 | + <include src="remark_click_part2.wxml" /> | ||
493 | + </view> | ||
494 | + </view> | ||
495 | + </view> | ||
496 | + <!-- 打开是说明 --> | ||
390 | <include src="remark_part.wxml" /> | 497 | <include src="remark_part.wxml" /> |
391 | - </view> | ||
392 | - <!-- 包邮券的显示,立即购买 --> | ||
393 | - <block wx:if="{{ is_b_now && bn_exp_type==0}}"> | ||
394 | - <view wx:for="{{get_by_quan_list}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index"> | ||
395 | - <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}"> | ||
396 | - <view class="coupon-frame flex rel"> | ||
397 | - <!-- 锯齿 --> | ||
398 | - <include src="juchi_part.wxml" /> | ||
399 | - <!-- 左边 --> | ||
400 | - <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
401 | - <view class="white xc-money-frames"> | ||
402 | - <view class="f_text"><text class="xc-rmb-val">包邮券</text></view> | ||
403 | - <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view> | ||
404 | - <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
405 | - </view> | ||
406 | - </view> | ||
407 | - <!-- 右边 --> | ||
408 | - <view class="coupon-right flex-center rel"> | ||
409 | - <view class="coupon-annotation flex"> | ||
410 | - <view class="flex top-frame"> | ||
411 | - <view class="frame"> | ||
412 | - <view class="coupon-wode ib flex ellipsis-2 "> | ||
413 | - <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text> | ||
414 | - <block>包邮券</block> | ||
415 | - </view> | ||
416 | - <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view> | ||
417 | - </view> | ||
418 | - </view> | ||
419 | - <block wx:if="{{item.show_red}}"><view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view></block> | ||
420 | - <block wx:else><view class="circle xc-hooks on"></view></block> | ||
421 | - </view> | ||
422 | - <include src="remark_click_part2.wxml" /> | ||
423 | - </view> | ||
424 | - </view> | ||
425 | - </view> | ||
426 | - <!-- 打开是说明 --> | ||
427 | - <include src="remark_part.wxml" /> | ||
428 | - </view> | ||
429 | - </block> | ||
430 | - | ||
431 | - <!-- 包邮券的显示,购物车购买 --> | ||
432 | - <block wx:if="{{!is_b_now && sele_exp_type==0}}"> | ||
433 | - <view wx:for="{{by_quan_list_cart}}" bindtap="sele_quan_item_by" wx:if="{{!item.is_using}}" data-ind="{{byq_index}}" wx:for-item="item" wx:for-index="byq_index"> | ||
434 | - <view class="xc-coupon-frame flex-center" data-ind="{{byq_index}}"> | ||
435 | - <view class="coupon-frame flex rel"> | ||
436 | - <!-- 锯齿 --> | ||
437 | - <include src="juchi_part.wxml" /> | ||
438 | - <!-- 左边 --> | ||
439 | - <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
440 | - <view class="white xc-money-frames"> | ||
441 | - <view class="f_text"><text class="xc-rmb-val">包邮券</text></view> | ||
442 | - <view class="coupon-explain t-c" wx:if="{{item.condition>0}}">满{{item.condition}}元可用</view> | ||
443 | - <view class="coupon-explain t-c" wx:else>满0元可用</view> | ||
444 | - </view> | ||
445 | - </view> | ||
446 | - <!-- 右边 --> | ||
447 | - <view class="coupon-right flex-center rel"> | ||
448 | - <view class="coupon-annotation flex"> | ||
449 | - <view class="flex top-frame"> | ||
450 | - <view class="frame"> | ||
451 | - <view class="coupon-wode ib flex ellipsis-2 "> | ||
452 | - <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(0)}}</text> | ||
453 | - <block>包邮券</block> | ||
454 | - </view> | ||
455 | - <view class="coupon-time">{{filters.format_time(item.use_start_time)}}至{{item.use_end_time?filters.format_time(item.use_end_time):'不限'}}</view> | ||
456 | - </view> | ||
457 | - </view> | ||
458 | - <block wx:if="{{item.show_red}}"><view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view></block> | ||
459 | - <block wx:else><view class="circle xc-hooks on"></view></block> | ||
460 | - </view> | ||
461 | - <include src="remark_click_part2.wxml" /> | ||
462 | - </view> | ||
463 | - </view> | ||
464 | - </view> | ||
465 | - <!-- 打开是说明 --> | ||
466 | - <include src="remark_part.wxml" /> | ||
467 | - </view> | ||
468 | - </block> | ||
469 | - | ||
470 | - | ||
471 | - </view> | ||
472 | - </view> | ||
473 | - <!-- 最底下确定层--> | ||
474 | - <view class="determine-frame"><view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定 </view></view> | ||
475 | - </view> | 498 | + </view> |
499 | + </block> | ||
500 | + | ||
501 | + | ||
502 | + </view> | ||
503 | + </view> | ||
504 | + <!-- 最底下确定层--> | ||
505 | + <view class="determine-frame"> | ||
506 | + <view class="xc-confirm flex-center" bindtap="confirm_quan"> 确定 </view> | ||
507 | + </view> | ||
508 | + </view> | ||
476 | </view> | 509 | </view> |
477 | <!----弹起选择物流名的列表----> | 510 | <!----弹起选择物流名的列表----> |
478 | -<view wx:if='{{open_express==1}}' > | ||
479 | - <view class="cover-layer flex-center " bindtap='close_express'> | ||
480 | - </view> | ||
481 | - | ||
482 | - <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" > | ||
483 | - <view class="tops flex"> | ||
484 | - <view class="top-content fs32"> | ||
485 | - <view>选择物流名字</view> | ||
486 | - </view> | ||
487 | - <view class="close-frame" bindtap='close_express' > | ||
488 | - <view class="xc-close-express">×</view> | ||
489 | - </view> | ||
490 | - </view> | ||
491 | - <view class="express_list"> | ||
492 | - <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx"> | ||
493 | - <view class="express_list_frame" bindtap="click_express_name" | ||
494 | - data-shippingcode="{{express_list.shipping_code}}" | ||
495 | - data-name="{{express_list.name}}" data-idxe="{{idx}}"> | ||
496 | - | ||
497 | - <block wx:if="{{is_express==idx}}"> | ||
498 | - <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view> | ||
499 | - </block> | ||
500 | - <block wx:else> | ||
501 | - <view class="circle xc-hooks"></view> | ||
502 | - </block> | ||
503 | - <view class="fs30">{{express_list.name}}</view> | ||
504 | - | ||
505 | - </view> | 511 | +<view wx:if='{{open_express==1}}'> |
512 | + <view class="cover-layer flex-center " bindtap='close_express'> | ||
513 | + </view> | ||
514 | + | ||
515 | + <view class="cx-popup radius {{open_express==1?'up' : 'down'}}"> | ||
516 | + <view class="tops flex"> | ||
517 | + <view class="top-content fs32"> | ||
518 | + <view>选择物流名字</view> | ||
519 | + </view> | ||
520 | + <view class="close-frame" bindtap='close_express'> | ||
521 | + <view class="xc-close-express">×</view> | ||
522 | + </view> | ||
523 | + </view> | ||
524 | + <view class="express_list"> | ||
525 | + <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx"> | ||
526 | + <view class="express_list_frame" bindtap="click_express_name" data-shippingcode="{{express_list.shipping_code}}" | ||
527 | + data-name="{{express_list.name}}" data-idxe="{{idx}}"> | ||
528 | + | ||
529 | + <block wx:if="{{is_express==idx}}"> | ||
530 | + <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view> | ||
531 | + </block> | ||
532 | + <block wx:else> | ||
533 | + <view class="circle xc-hooks"></view> | ||
534 | + </block> | ||
535 | + <view class="fs30">{{express_list.name}}</view> | ||
536 | + | ||
506 | </view> | 537 | </view> |
507 | </view> | 538 | </view> |
508 | - <view class="flex click-buttem" > | ||
509 | - <view class="xc-determine flex-center" bindtap="determine_expres"> | ||
510 | - <view class="flex-vertical t-c">确定</view> | ||
511 | - </view> | ||
512 | - <view class="xc-confirms flex-center" bindtap="select_default_logistics"> | ||
513 | - <view class="flex-vertical t-c">设为默认</view> | ||
514 | - </view> | ||
515 | - </view> | ||
516 | - | ||
517 | - </view > | 539 | + </view> |
540 | + <view class="flex click-buttem"> | ||
541 | + <view class="xc-determine flex-center" bindtap="determine_expres"> | ||
542 | + <view class="flex-vertical t-c">确定</view> | ||
543 | + </view> | ||
544 | + <view class="xc-confirms flex-center" bindtap="select_default_logistics"> | ||
545 | + <view class="flex-vertical t-c">设为默认</view> | ||
546 | + </view> | ||
547 | + </view> | ||
548 | + | ||
549 | + </view> | ||
518 | </view> | 550 | </view> |
519 | 551 | ||
520 | -<warn id="warn"></warn> | ||
521 | \ No newline at end of file | 552 | \ No newline at end of file |
553 | +<warn id="warn"></warn> |
pages/cart/cart2/cart2.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 | +.mgt20 { | ||
10 | + margin-top: 20rpx; | ||
11 | +} | ||
12 | +.shadow { | ||
13 | + box-shadow: 0 4rpx 12px #e7e9eb; | ||
14 | +} | ||
15 | +.shadow-1 { | ||
16 | + box-shadow: 16rpx 0px 12px #e7e9eb; | ||
17 | +} | ||
18 | + | ||
19 | + | ||
20 | +page { | ||
21 | + /* background-color: #FAFAFA; */ | ||
22 | + background-color: #F0F0F0; | ||
23 | + padding: 0 22rpx; | ||
24 | + box-sizing: border-box; | ||
25 | +} | ||
26 | +.container { | ||
27 | + background-color: #F0F0F0; | ||
28 | + /* padding-top: 28rpx; */ | ||
29 | + padding-bottom: 120rpx; | ||
30 | +} | ||
1 | .user-mes { | 31 | .user-mes { |
2 | position: relative; | 32 | position: relative; |
3 | background-color: #fff; | 33 | background-color: #fff; |
4 | font-size: 32rpx; | 34 | font-size: 32rpx; |
5 | color: #444; | 35 | color: #444; |
36 | + /* margin-top: 28rpx; */ | ||
37 | + border-radius: 14rpx; | ||
6 | } | 38 | } |
7 | .user-contact { | 39 | .user-contact { |
8 | - padding: 24rpx 70rpx; | 40 | + padding: 24rpx 26rpx; |
9 | font-weight: 600; | 41 | font-weight: 600; |
10 | } | 42 | } |
11 | 43 | ||
@@ -16,10 +48,10 @@ | @@ -16,10 +48,10 @@ | ||
16 | 48 | ||
17 | .pos-icon { | 49 | .pos-icon { |
18 | position: absolute; | 50 | position: absolute; |
19 | - left: 22rpx; | 51 | + left: 28rpx; |
20 | top: 9rpx; | 52 | top: 9rpx; |
21 | - width: 32rpx; | ||
22 | - height: 37.5rpx; | 53 | + width: 30rpx; |
54 | + height: 36rpx; | ||
23 | } | 55 | } |
24 | 56 | ||
25 | .border-img { | 57 | .border-img { |
@@ -32,7 +64,7 @@ | @@ -32,7 +64,7 @@ | ||
32 | right: 0; | 64 | right: 0; |
33 | top: 0; | 65 | top: 0; |
34 | width: 80rpx; | 66 | width: 80rpx; |
35 | - height: 148rpx; | 67 | + height: 100%; |
36 | display: flex; | 68 | display: flex; |
37 | align-items: center; | 69 | align-items: center; |
38 | justify-content: center; | 70 | justify-content: center; |
@@ -51,7 +83,7 @@ | @@ -51,7 +83,7 @@ | ||
51 | 83 | ||
52 | .order-detail { | 84 | .order-detail { |
53 | padding: 30rpx 0; | 85 | padding: 30rpx 0; |
54 | - border-bottom: 6rpx solid #eee; | 86 | + border-bottom: 2rpx solid #eee; |
55 | color: #777; | 87 | color: #777; |
56 | min-height: 190rpx; | 88 | min-height: 190rpx; |
57 | background-color: #fff; | 89 | background-color: #fff; |
@@ -90,22 +122,33 @@ | @@ -90,22 +122,33 @@ | ||
90 | line-height: 42rpx; | 122 | line-height: 42rpx; |
91 | } | 123 | } |
92 | 124 | ||
93 | -.set-mes{background-color: #fff; } | 125 | +.set-mes{ |
126 | + background-color: #fff; | ||
127 | + /* margin-top: 20rpx; */ | ||
128 | +} | ||
94 | .use-item{ | 129 | .use-item{ |
95 | display: flex; | 130 | display: flex; |
96 | align-items: center; | 131 | align-items: center; |
97 | height: 80rpx; | 132 | height: 80rpx; |
98 | - border-bottom: 1px solid #ddd; | 133 | + /* border-bottom: 1px solid #ddd; */ |
99 | font-size: 30rpx; | 134 | font-size: 30rpx; |
100 | - width:95%; | ||
101 | -margin:auto; | ||
102 | - | 135 | + /* width:95%; |
136 | +margin:auto; */ | ||
137 | + padding: 0 26rpx; | ||
103 | } | 138 | } |
104 | .use-item>view{ | 139 | .use-item>view{ |
105 | - display: flex;margin-right: 12rpx; | 140 | + display: flex; |
141 | + /* margin-right: 12rpx; */ | ||
142 | +} | ||
143 | +.use-item.bfff{ | ||
144 | + background-color: #fff; | ||
145 | +} | ||
146 | +.use-item .dp{ | ||
147 | + display: block; | ||
148 | + width: 50rpx; | ||
149 | + height: 50rpx; | ||
150 | + margin-left: -6rpx; | ||
106 | } | 151 | } |
107 | -.use-item.bfff{ background-color: #fff;} | ||
108 | -.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx} | ||
109 | 152 | ||
110 | .set-item { | 153 | .set-item { |
111 | justify-content: space-between; | 154 | justify-content: space-between; |
@@ -135,14 +178,16 @@ margin:auto; | @@ -135,14 +178,16 @@ margin:auto; | ||
135 | } | 178 | } |
136 | 179 | ||
137 | .coupon-mes { | 180 | .coupon-mes { |
181 | + /* box-sizing: border-box; */ | ||
138 | height:95rpx; | 182 | height:95rpx; |
139 | - padding: 0 20rpx; | 183 | + padding: 0 26rpx; |
140 | background-color: #fff; | 184 | background-color: #fff; |
141 | font-size: 30rpx; | 185 | font-size: 30rpx; |
142 | color: #444; | 186 | color: #444; |
143 | - width: 100%; | ||
144 | - | ||
145 | - | 187 | + /* width: 100%; */ |
188 | + border-radius: 14rpx; | ||
189 | + margin-top: 20rpx; | ||
190 | + margin-bottom: 20rpx; | ||
146 | } | 191 | } |
147 | 192 | ||
148 | .coupon-title { | 193 | .coupon-title { |
@@ -169,15 +214,14 @@ margin:auto; | @@ -169,15 +214,14 @@ margin:auto; | ||
169 | 214 | ||
170 | .leave-word { | 215 | .leave-word { |
171 | position: relative; | 216 | position: relative; |
172 | - | ||
173 | font-size: 24rpx; | 217 | font-size: 24rpx; |
174 | margin-left: 20rpx; | 218 | margin-left: 20rpx; |
175 | - | 219 | + flex-grow: 1; |
176 | } | 220 | } |
177 | 221 | ||
178 | .word-box { | 222 | .word-box { |
179 | - | ||
180 | - width: 600rpx; | 223 | + font-size: 26rpx; |
224 | + /* width: 600rpx; */ | ||
181 | padding: 10rpx; | 225 | padding: 10rpx; |
182 | height: 28rpx; | 226 | height: 28rpx; |
183 | line-height: 40rpx; | 227 | line-height: 40rpx; |
@@ -190,9 +234,9 @@ margin:auto; | @@ -190,9 +234,9 @@ margin:auto; | ||
190 | } | 234 | } |
191 | 235 | ||
192 | .information { | 236 | .information { |
193 | - padding: 0 20rpx; | 237 | + padding: 0 26rpx; |
194 | background-color: #fff; | 238 | background-color: #fff; |
195 | - margin-bottom: 120rpx; | 239 | + /* margin-bottom: 120rpx; */ |
196 | } | 240 | } |
197 | 241 | ||
198 | .information .item { | 242 | .information .item { |
@@ -205,36 +249,50 @@ margin:auto; | @@ -205,36 +249,50 @@ margin:auto; | ||
205 | } | 249 | } |
206 | 250 | ||
207 | .btn-wrap { | 251 | .btn-wrap { |
208 | - height: 100rpx; width: 100%; | ||
209 | - background-color: #fff; | ||
210 | - position: fixed; bottom: 0;left: 0; | ||
211 | - border-top:1rpx solid #dee; | ||
212 | - z-index:9999 | 252 | + height: 94rpx; |
253 | + box-sizing: border-box; | ||
254 | + display: flex; | ||
255 | + justify-content: space-between; | ||
256 | + background-color: white; | ||
257 | + align-items: center; | ||
258 | + position: fixed; | ||
259 | + bottom: 0; | ||
260 | + left: 0; | ||
261 | + width: 100%; | ||
262 | + padding: 0 30rpx; | ||
213 | } | 263 | } |
214 | 264 | ||
215 | .tips-btn { | 265 | .tips-btn { |
216 | - float: right; | 266 | + /* float: right; |
217 | width: 200rpx; | 267 | width: 200rpx; |
218 | height: 100rpx; | 268 | height: 100rpx; |
219 | line-height: 100rpx; | 269 | line-height: 100rpx; |
220 | text-align: center; | 270 | text-align: center; |
221 | font-size: 30rpx; | 271 | font-size: 30rpx; |
222 | color: #fff; | 272 | color: #fff; |
223 | - background-color: #f23030; | 273 | + background-color: #f23030; */ |
274 | + color: white; | ||
275 | + background-color: #FE4445; | ||
276 | + height: 72rpx; | ||
277 | + line-height: 72rpx; | ||
278 | + padding: 0 42rpx; | ||
279 | + border-radius: 36rpx; | ||
280 | + margin-left: 0; | ||
281 | + margin-right: 0; | ||
224 | } | 282 | } |
225 | 283 | ||
226 | .pay-amount { | 284 | .pay-amount { |
227 | - float: right; | 285 | + /* float: right; |
228 | display: flex; | 286 | display: flex; |
229 | align-items: center; | 287 | align-items: center; |
230 | height: 100rpx; | 288 | height: 100rpx; |
231 | font-size: 26rpx; | 289 | font-size: 26rpx; |
232 | - margin-right: 40rpx; | 290 | + margin-right: 40rpx; */ |
233 | } | 291 | } |
234 | 292 | ||
235 | .payable { | 293 | .payable { |
236 | color: #444; | 294 | color: #444; |
237 | - margin-right: 20rpx; | 295 | + /* margin-right: 20rpx; */ |
238 | } | 296 | } |
239 | 297 | ||
240 | .shipping-modal { | 298 | .shipping-modal { |
@@ -277,7 +335,11 @@ margin:auto; | @@ -277,7 +335,11 @@ margin:auto; | ||
277 | .add_new{height: 60rpx; line-height: 60rpx;} | 335 | .add_new{height: 60rpx; line-height: 60rpx;} |
278 | .addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; | 336 | .addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; |
279 | margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;} | 337 | margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;} |
280 | -.yu_er{margin-left: 10rpx;margin-right: 60rpx;} .wuliu{margin-left: 20rpx;} | 338 | +.yu_er{ |
339 | + margin-left: 10rpx; | ||
340 | + /* margin-right: 60rpx; */ | ||
341 | +} | ||
342 | +.wuliu{margin-left: 20rpx;} | ||
281 | 343 | ||
282 | 344 | ||
283 | /*---- 优惠券列表 -----*/ | 345 | /*---- 优惠券列表 -----*/ |
@@ -290,8 +352,8 @@ margin:auto; | @@ -290,8 +352,8 @@ margin:auto; | ||
290 | width: 100%; | 352 | width: 100%; |
291 | height: 100%; | 353 | height: 100%; |
292 | border-bottom:3rpx solid #eee; | 354 | border-bottom:3rpx solid #eee; |
293 | - | ||
294 | - | 355 | + padding: 0 26rpx; |
356 | + background-color: white; | ||
295 | } | 357 | } |
296 | .xc-right{ | 358 | .xc-right{ |
297 | width:20rpx; | 359 | width:20rpx; |
@@ -300,7 +362,6 @@ margin:auto; | @@ -300,7 +362,6 @@ margin:auto; | ||
300 | border-right:2rpx solid #000; | 362 | border-right:2rpx solid #000; |
301 | transform:rotate(45deg); | 363 | transform:rotate(45deg); |
302 | display:inline-block; | 364 | display:inline-block; |
303 | - | ||
304 | } | 365 | } |
305 | 366 | ||
306 | .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } | 367 | .xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } |
@@ -309,15 +370,15 @@ margin:auto; | @@ -309,15 +370,15 @@ margin:auto; | ||
309 | /* 自定义弹出窗口 */ | 370 | /* 自定义弹出窗口 */ |
310 | .cx-popup{ | 371 | .cx-popup{ |
311 | width:100%; | 372 | width:100%; |
312 | - height:920rpx; | 373 | + height:900rpx; |
313 | background: #fff; | 374 | background: #fff; |
314 | z-index: 35; | 375 | z-index: 35; |
315 | border-top-left-radius: 20rpx; | 376 | border-top-left-radius: 20rpx; |
316 | border-top-right-radius: 20rpx; | 377 | border-top-right-radius: 20rpx; |
317 | position:fixed; | 378 | position:fixed; |
318 | bottom:0; | 379 | bottom:0; |
319 | - padding-bottom: 25rpx; | ||
320 | - | 380 | + left: 0; |
381 | + /* padding-bottom: 25rpx; */ | ||
321 | } | 382 | } |
322 | 383 | ||
323 | .cx-popup .top{ | 384 | .cx-popup .top{ |
@@ -821,4 +882,4 @@ margin-left: 20rpx; | @@ -821,4 +882,4 @@ margin-left: 20rpx; | ||
821 | .n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } | 882 | .n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } |
822 | .gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} | 883 | .gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} |
823 | 884 | ||
824 | -.quan_num_show{ padding: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx } | ||
825 | \ No newline at end of file | 885 | \ No newline at end of file |
886 | +.quan_num_show{ padding: 6rpx 10rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;} | ||
826 | \ No newline at end of file | 887 | \ No newline at end of file |