Commit 850046f72347c3762fd564582724170b944c8173
1 parent
8e393def
订单优惠券及物流列表排版
Showing
3 changed files
with
547 additions
and
73 deletions
pages/cart/cart2/cart2.js
| @@ -4,7 +4,7 @@ var oo=t.globalData.setting; | @@ -4,7 +4,7 @@ var oo=t.globalData.setting; | ||
| 4 | var regeneratorRuntime = require('../../../utils/runtime.js'); | 4 | var regeneratorRuntime = require('../../../utils/runtime.js'); |
| 5 | var util_pay = require("../../../utils/pay.js"); | 5 | var util_pay = require("../../../utils/pay.js"); |
| 6 | 6 | ||
| 7 | -Page({ | 7 | +Page({ |
| 8 | data: { | 8 | data: { |
| 9 | url: t.globalData.setting.url, | 9 | url: t.globalData.setting.url, |
| 10 | resourceUrl: t.globalData.setting.resourceUrl, | 10 | resourceUrl: t.globalData.setting.resourceUrl, |
| @@ -75,7 +75,15 @@ Page({ | @@ -75,7 +75,15 @@ Page({ | ||
| 75 | selected_quan_pick:null, | 75 | selected_quan_pick:null, |
| 76 | is_close_quan:0, | 76 | is_close_quan:0, |
| 77 | disabled:0, | 77 | disabled:0, |
| 78 | + open_express:0,//控制选择物流名列表 的属性 | ||
| 79 | + | ||
| 78 | 80 | ||
| 81 | + is_express:0,//选中物流的属性 | ||
| 82 | + | ||
| 83 | + express_name:"商家自配", | ||
| 84 | + expres_name:"",//点击选定 | ||
| 85 | + isopen:0,//券的说明 | ||
| 86 | + is_coupon:0,//选择券的控制属性 | ||
| 79 | }, | 87 | }, |
| 80 | onLoad: function(t) { | 88 | onLoad: function(t) { |
| 81 | 89 | ||
| @@ -143,6 +151,7 @@ Page({ | @@ -143,6 +151,7 @@ Page({ | ||
| 143 | 151 | ||
| 144 | //-------------------获取物流--------------- | 152 | //-------------------获取物流--------------- |
| 145 | get_wuliu(func) { | 153 | get_wuliu(func) { |
| 154 | + | ||
| 146 | var th = this; | 155 | var th = this; |
| 147 | to.getwuliu(function (e) { | 156 | to.getwuliu(function (e) { |
| 148 | console.log("ws"); | 157 | console.log("ws"); |
| @@ -400,6 +409,7 @@ Page({ | @@ -400,6 +409,7 @@ Page({ | ||
| 400 | }).then(res=>{ | 409 | }).then(res=>{ |
| 401 | if(res.data.code==0) | 410 | if(res.data.code==0) |
| 402 | quanlist=res.data.data.pageData; | 411 | quanlist=res.data.data.pageData; |
| 412 | + | ||
| 403 | }) | 413 | }) |
| 404 | } | 414 | } |
| 405 | 415 | ||
| @@ -417,7 +427,7 @@ Page({ | @@ -417,7 +427,7 @@ Page({ | ||
| 417 | 427 | ||
| 418 | t.data.data.prom_id = 0; | 428 | t.data.data.prom_id = 0; |
| 419 | t.data.data.prom_type = 0; | 429 | t.data.data.prom_type = 0; |
| 420 | - | 430 | + console.log("44444444444444券的列表", quanlist); |
| 421 | th.setData({ | 431 | th.setData({ |
| 422 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, | 432 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, |
| 423 | bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist | 433 | bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist |
| @@ -463,6 +473,7 @@ Page({ | @@ -463,6 +473,7 @@ Page({ | ||
| 463 | } | 473 | } |
| 464 | } | 474 | } |
| 465 | } | 475 | } |
| 476 | + console.log("3333333333券的列表", quanlist); | ||
| 466 | th.setData({ | 477 | th.setData({ |
| 467 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, | 478 | bn_goods: t.data.data, bn_pickname: gg.pick_name, bn_exp_type: et, |
| 468 | bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist | 479 | bn_pick: gg.pick_id, bn_t_exp_t: distr_t,selected_quan_list:quanlist |
| @@ -1198,6 +1209,7 @@ Page({ | @@ -1198,6 +1209,7 @@ Page({ | ||
| 1198 | var is_using= th.check_in_sele(quanlist[i].CashRepNo,pickid); | 1209 | var is_using= th.check_in_sele(quanlist[i].CashRepNo,pickid); |
| 1199 | if(is_using) quanlist[i].is_using=1; | 1210 | if(is_using) quanlist[i].is_using=1; |
| 1200 | } | 1211 | } |
| 1212 | + console.log("2222222券的列表", quanlist); | ||
| 1201 | th.setData({open_quan:1,selected_quan_pick:pickid,selected_quan_list:quanlist,disabled:1}); | 1213 | th.setData({open_quan:1,selected_quan_pick:pickid,selected_quan_list:quanlist,disabled:1}); |
| 1202 | } | 1214 | } |
| 1203 | }, | 1215 | }, |
| @@ -1229,6 +1241,7 @@ Page({ | @@ -1229,6 +1241,7 @@ Page({ | ||
| 1229 | for(var ind in quanlist){ | 1241 | for(var ind in quanlist){ |
| 1230 | quanlist[ind].show_red=0; | 1242 | quanlist[ind].show_red=0; |
| 1231 | } | 1243 | } |
| 1244 | + | ||
| 1232 | this.setData({selected_quan_list:quanlist}); | 1245 | this.setData({selected_quan_list:quanlist}); |
| 1233 | var using_quan=this.data.using_quan; | 1246 | var using_quan=this.data.using_quan; |
| 1234 | var th=this; | 1247 | var th=this; |
| @@ -1335,7 +1348,50 @@ Page({ | @@ -1335,7 +1348,50 @@ Page({ | ||
| 1335 | 1348 | ||
| 1336 | } | 1349 | } |
| 1337 | return arr; | 1350 | return arr; |
| 1338 | - } | 1351 | + }, |
| 1352 | + // 开启物流的弹窗 | ||
| 1353 | + express_name:function(){ | ||
| 1354 | + this.setData({ open_express: 1}); | ||
| 1339 | 1355 | ||
| 1356 | + }, | ||
| 1357 | + // 关闭物流的弹窗 | ||
| 1358 | + close_express:function(){ | ||
| 1359 | + this.setData({ open_express:0 }); | ||
| 1360 | + }, | ||
| 1361 | + // 选择物流 | ||
| 1362 | + click_express_name:function(e){ | ||
| 1363 | + var express_name=e.currentTarget.dataset.name; | ||
| 1364 | + var index=e.currentTarget.dataset.idxe; | ||
| 1365 | + this.setData({ expres_name: express_name, is_express:index}); | ||
| 1366 | + }, | ||
| 1367 | + //点击确定物流 | ||
| 1368 | + determine_expres:function(){ | ||
| 1369 | + | ||
| 1370 | + var name=this.data.expres_name | ||
| 1371 | + this.setData({ express_name: name, open_express: 0}); | ||
| 1372 | + }, | ||
| 1373 | + //设置默认物流 | ||
| 1374 | + set_default:function(){ | ||
| 1375 | + | ||
| 1376 | + }, | ||
| 1377 | + //点击打开优惠券使用说明 | ||
| 1378 | + clik_coupons:function(e){ | ||
| 1379 | + | ||
| 1380 | + var ind = e.currentTarget.dataset.idx; | ||
| 1381 | + var is_open = this.data.selected_quan_list[ind].is_open; | ||
| 1382 | + console.log(is_open,"是什么东西"); | ||
| 1383 | + if (is_open == 1) is_open = 0; | ||
| 1384 | + else is_open = 1; | ||
| 1385 | + | ||
| 1386 | + var txt = "selected_quan_list[" + ind + "].is_open" | ||
| 1387 | + var obj = {}; obj[txt] = is_open; | ||
| 1388 | + this.setData(obj); | ||
| 1389 | + }, | ||
| 1390 | + //选择券 | ||
| 1391 | + sele_coupon:function(e){ | ||
| 1392 | + var ind = e.currentTarget.dataset.ind; | ||
| 1393 | + console.log("下标", ind); | ||
| 1394 | + this.setData({ is_coupon: ind}); | ||
| 1340 | 1395 | ||
| 1396 | + } | ||
| 1341 | }); | 1397 | }); |
pages/cart/cart2/cart2.wxml
| 1 | +<wxs module="filter" src="c_filter.wxs"></wxs> | ||
| 2 | +<wxs src="filter.wxs" module="util"></wxs> | ||
| 3 | +<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | ||
| 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 4 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 2 | <form bindsubmit="submitForm"> | 5 | <form bindsubmit="submitForm"> |
| 3 | - <view class="container"> | 6 | + <view class="container"> |
| 4 | <!--要进行判断地址是否显示----> | 7 | <!--要进行判断地址是否显示----> |
| 5 | <view bindtap="enterAddressPage" class="user-mes" | 8 | <view bindtap="enterAddressPage" class="user-mes" |
| 6 | hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> | 9 | hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> |
| @@ -79,11 +82,12 @@ | @@ -79,11 +82,12 @@ | ||
| 79 | <view bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">快递邮寄</view> | 82 | <view bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">快递邮寄</view> |
| 80 | </view> | 83 | </view> |
| 81 | </view> | 84 | </view> |
| 82 | - <view class="use-item" hidden='{{item.exp_type==1}}'> | 85 | + <view bindtap="express_name" class="use-item" hidden='{{item.exp_type==1}}'> |
| 83 | <view>选择物流：</view> | 86 | <view>选择物流：</view> |
| 84 | - <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind' value="{{item.wind}}" range="{{wu_arr}}" range-key="name"> | 87 | + <view >{{express_name}}</view> |
| 88 | + <!-- <picker bindchange="bindPickerChange_w" data-txt='cartlist[{{pidx}}].wind' value="{{item.wind}}" range="{{wu_arr}}" range-key="name"> | ||
| 85 | <view >{{wu_arr[item.wind].name}}</view> | 89 | <view >{{wu_arr[item.wind].name}}</view> |
| 86 | - </picker> | 90 | + </picker> --> |
| 87 | </view> | 91 | </view> |
| 88 | </view> | 92 | </view> |
| 89 | <view class="coupon-mes"> | 93 | <view class="coupon-mes"> |
| @@ -153,9 +157,10 @@ | @@ -153,9 +157,10 @@ | ||
| 153 | 157 | ||
| 154 | <view class="use-item" hidden='{{bn_exp_type==1}}'> | 158 | <view class="use-item" hidden='{{bn_exp_type==1}}'> |
| 155 | <view>使用物流：</view> | 159 | <view>使用物流：</view> |
| 156 | - <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> | ||
| 157 | - <view >{{wu_arr[index].name}}</view> | ||
| 158 | - </picker> | 160 | + <view >{{wu_arr[index].name}}</view> |
| 161 | + <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> | ||
| 162 | + | ||
| 163 | + </picker> --> | ||
| 159 | </view> | 164 | </view> |
| 160 | 165 | ||
| 161 | <!-- <view class="use-item"> | 166 | <!-- <view class="use-item"> |
| @@ -238,53 +243,174 @@ | @@ -238,53 +243,174 @@ | ||
| 238 | <view class="top flex"> | 243 | <view class="top flex"> |
| 239 | <view class="xc-top-content t-c"> | 244 | <view class="xc-top-content t-c"> |
| 240 | <view class="xc-title"> | 245 | <view class="xc-title"> |
| 241 | - 选择优惠券 | 246 | + 优惠券使用 |
| 242 | </view> | 247 | </view> |
| 243 | </view> | 248 | </view> |
| 244 | <view class="xc-close-frame" bindtap='close_coupon' > | 249 | <view class="xc-close-frame" bindtap='close_coupon' > |
| 245 | <view class="xc-close">×</view> | 250 | <view class="xc-close">×</view> |
| 246 | </view> | 251 | </view> |
| 247 | </view> | 252 | </view> |
| 248 | - | 253 | + <view class="may_use_coupon fs28">可使用的优惠券</view> |
| 249 | <view class="xc-frame flex-level"> | 254 | <view class="xc-frame flex-level"> |
| 250 | <view class="list-frame"> | 255 | <view class="list-frame"> |
| 251 | - <view class="xc-coupon-effect flex-vertical flex-space-between" bindtap="sele_quan_item" data-no="1"> | ||
| 252 | - <view class="xc-goods-coupon "> | ||
| 253 | - <view class="xc-coupon-money0">不使用优惠券</view> | ||
| 254 | - <view class="flex"></view> | ||
| 255 | - </view> | ||
| 256 | - <view class="xc-coupon-selection flex-right-vertical" > | ||
| 257 | - <icon color='red' size='20' type='success' wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"></icon> | ||
| 258 | - <view class="circle xc-not-Selection" wx:if="{{!using_quan[selected_quan_pick].is_nouse_red }}"></view> | ||
| 259 | - </view> | ||
| 260 | - </view> | ||
| 261 | - | ||
| 262 | - <!-- 循环那些还没有被其他门店选择的券 --> | ||
| 263 | - <view class="xc-coupon-effect flex-vertical flex-space-between" wx:for="{{selected_quan_list}}" wx:if="{{!item.is_using}}" bindtap="sele_quan_item" data-ind="{{index}}"> | ||
| 264 | - <view class="xc-goods-coupon "> | ||
| 265 | - <view class="xc-coupon-money">{{item.Sum}}元</view> | ||
| 266 | - <view class="xc-coupon-money1">订单满{{item.BuySum?item.BuySum:0}}元使用</view> | ||
| 267 | - <view class="flex xc-coupon-time">使用期限 | ||
| 268 | - <view class="time" wx:if="{{item.BeginDate && item.ValidDate}}" > | ||
| 269 | - {{filters.replace_time(item.BeginDate)}}至{{filters.replace_time(item.ValidDate)}} | ||
| 270 | - </view> | ||
| 271 | - <view wx:else>: 无限制</view> | ||
| 272 | - </view> | ||
| 273 | - </view> | ||
| 274 | - <view class="xc-coupon-selection flex-right-vertical" > | ||
| 275 | - <icon color='red' size='20' type='success' wx:if="{{item.show_red}}"></icon> | ||
| 276 | - <view class="circle xc-not-Selection" wx:if="{{!item.show_red }}"></view> | ||
| 277 | - </view> | 256 | + |
| 257 | + <view wx:for="{{selected_quan_list}}" bindtap="sele_quan_item" data-ind="{{index}}" wx:for-item="item"wx:for-index="index"> | ||
| 258 | + <view class="xc-coupon-frame flex-center" bindtap="sele_coupon" data-ind="{{index}}"> | ||
| 259 | + <view class="coupon-frame flex rel"> | ||
| 260 | + <!-- 锯齿 --> | ||
| 261 | + <view class="circle-frame abs"> | ||
| 262 | + <view class='circle circle-sawtooth'></view> | ||
| 263 | + <view class='circle circle-sawtooth'></view> | ||
| 264 | + <view class='circle circle-sawtooth'></view> | ||
| 265 | + <view class='circle circle-sawtooth'></view> | ||
| 266 | + <view class='circle circle-sawtooth'></view> | ||
| 267 | + <view class='circle circle-sawtooth'></view> | ||
| 268 | + <view class='circle circle-sawtooth'></view> | ||
| 269 | + <view class='circle circle-sawtooth'></view> | ||
| 270 | + <view class='circle circle-sawtooth'></view> | ||
| 271 | + <view class='circle circle-sawtooth'></view> | ||
| 272 | + <view class='circle circle-sawtooth'></view> | ||
| 273 | + <view class='circle circle-sawtooth'></view> | ||
| 274 | + <view class='circle circle-sawtooth'></view> | ||
| 275 | + <view class='circle circle-sawtooth'></view> | ||
| 276 | + <view class='circle circle-sawtooth'></view> | ||
| 277 | + <view class='circle circle-sawtooth'></view> | ||
| 278 | + <view class='circle circle-sawtooth'></view> | ||
| 279 | + <view class='circle circle-sawtooth'></view> | ||
| 280 | + <view class='circle circle-sawtooth'></view> | ||
| 281 | + <view class='circle circle-sawtooth'></view> | ||
| 282 | + </view> | ||
| 283 | + | ||
| 284 | + <view class="coupon-left rel {{filter.setcolor(item.UseObjectType)}} flex-center"> | ||
| 285 | + | ||
| 286 | + | ||
| 287 | + <view class="white xc-money-frames"> | ||
| 288 | + <view class="f_text"> | ||
| 289 | + <text class="xc-rmb-symbol">￥</text> | ||
| 290 | + <text class="xc-rmb-val">{{item.Sum}}</text> | ||
| 278 | </view> | 291 | </view> |
| 279 | - | 292 | + |
| 293 | + <view class="coupon-explain t-c" wx:if="{{item.BuySum==0}}"> | ||
| 294 | + 无使用门槛 | ||
| 295 | + </view> | ||
| 296 | + <view class="coupon-explain t-c" wx:if="{{item.BuySum>0}}"> | ||
| 297 | + {{UseObjectName}} | ||
| 280 | </view> | 298 | </view> |
| 299 | + | ||
| 300 | + </view> | ||
| 301 | + </view> | ||
| 302 | + <view class="coupon-right flex-center rel"> | ||
| 303 | + <view class="coupon-annotation flex"> | ||
| 304 | + | ||
| 305 | + <view class="flex top-frame"> | ||
| 306 | + | ||
| 307 | + <view class="frame"> | ||
| 308 | + <!-- <view class="flex"> --> | ||
| 309 | + | ||
| 310 | + <view class="coupon-wode ib flex ellipsis-2 "> | ||
| 311 | + <text class="xc-brand t-c ib white {{filter.setcolor(item.UseObjectType)}}">{{filter.get_type_card(item.UseObjectType)}} | ||
| 312 | + </text> | ||
| 313 | + {{item.PrivilegeName}} | ||
| 314 | + <!-- </view> --> | ||
| 315 | + </view> | ||
| 316 | + <view class="coupon-time"> | ||
| 317 | + {{filters.replace_time2(item.BeginDate)}}至{{filters.replace_time2(item.BillDate)}}</view> | ||
| 318 | + </view> | ||
| 319 | + </view> | ||
| 320 | + <!-- <view wx:if="{{item.Obtain>0}}" class="code-img" bindtap="show_quan" data-ind="{{index}}" data-now="{{filter.format_time(now)}}"> | ||
| 321 | + <image class="coupon-code" src='{{iurl}}/miniapp/images/user_r_code.png'></image> | ||
| 322 | + </view> | ||
| 323 | + <view wx:else class="code-img"> | ||
| 324 | + <image class="coupon-code" src='{{iurl}}/miniapp/images/hui-ewm.png'></image> | ||
| 325 | + </view> --> | ||
| 326 | + | ||
| 327 | + <block wx:if="{{is_coupon==index}}"> | ||
| 328 | + <view class="circle white xc-hook fs20 red-b sn"><text>Γ</text></view> | ||
| 329 | + </block> | ||
| 330 | + <block wx:else> | ||
| 331 | + <view class="circle xc-hooks on"></view> | ||
| 332 | + </block> | ||
| 333 | + </view> | ||
| 334 | + | ||
| 335 | + | ||
| 336 | + | ||
| 337 | + <view class="abs flex-vertical-between bottmo-explain" bindtap='clik_coupons' data-idx="{{index}}"> | ||
| 338 | + <view></view> | ||
| 339 | + <view class="font-word flex">优惠券使用说明 | ||
| 340 | + <view class="circle circle-size flex t-c"> | ||
| 341 | + <view class="xc-jiantou">く</view> | ||
| 342 | + </view> | ||
| 343 | + </view> | ||
| 344 | + </view> | ||
| 281 | </view> | 345 | </view> |
| 346 | + </view> | ||
| 347 | + | ||
| 348 | + </view> | ||
| 349 | + <view class="xc-buttom "wx:if="{{item.is_open==1}}"> | ||
| 350 | + <text class="five-level-word explain-coupon">{{util.format(item.Remark)}}</text> | ||
| 351 | + </view> | ||
| 352 | + | ||
| 353 | +</view> | ||
| 282 | 354 | ||
| 355 | + | ||
| 356 | + | ||
| 357 | + | ||
| 358 | + | ||
| 359 | + </view> | ||
| 360 | + </view> | ||
| 361 | + <view class="determine-frame"> | ||
| 283 | <view class="xc-confirm flex-center" bindtap="confirm_quan"> | 362 | <view class="xc-confirm flex-center" bindtap="confirm_quan"> |
| 284 | - <view class="flex-vertical t-c">确定</view> | 363 | + 确定 |
| 364 | + </view> | ||
| 365 | + </view> | ||
| 366 | + </view > | ||
| 367 | +</view> | ||
| 368 | + | ||
| 369 | + | ||
| 370 | +<!----弹起选择物流名的列表----> | ||
| 371 | + | ||
| 372 | +<view wx:if='{{open_express==1}}' > | ||
| 373 | + <view class="cover-layer flex-center " bindtap='close_express'> | ||
| 374 | + </view> | ||
| 375 | + | ||
| 376 | + <view class="cx-popup radius {{open_express==1?'up' : 'down'}}" > | ||
| 377 | + <view class="tops flex"> | ||
| 378 | + <view class="top-content fs32"> | ||
| 379 | + <view> | ||
| 380 | + 选择物流名字 | ||
| 381 | + </view> | ||
| 382 | + </view> | ||
| 383 | + <view class="close-frame" bindtap='close_express' > | ||
| 384 | + <view class="xc-close-express">×</view> | ||
| 385 | + </view> | ||
| 285 | </view> | 386 | </view> |
| 387 | + <view class="express_list"> | ||
| 388 | + <view wx:for="{{wu_arr}}" wx:for-item="express_list" wx:for-index="idx"> | ||
| 389 | + <view class="express_list_frame" bindtap="click_express_name" data-name="{{express_list.name}}" data-idxe="{{idx}}"> | ||
| 390 | + <block wx:if="{{is_express==idx}}"> | ||
| 391 | + <view class="circle white xc-hook fs20 red-b"><text>Γ</text></view> | ||
| 392 | + </block> | ||
| 393 | + <block wx:else> | ||
| 394 | + <view class="circle xc-hooks"></view> | ||
| 395 | + </block> | ||
| 396 | + <view class="fs30">{{express_list.name}}</view> | ||
| 397 | + | ||
| 398 | + </view> | ||
| 399 | + </view> | ||
| 400 | + </view> | ||
| 401 | + <view class="flex click-buttem" > | ||
| 402 | + <view class="xc-determine flex-center" bindtap="determine_expres"> | ||
| 403 | + <view class="flex-vertical t-c">确定</view> | ||
| 404 | + </view> | ||
| 405 | + <view class="xc-confirms flex-center" bindtap="set_default"> | ||
| 406 | + <view class="flex-vertical t-c">设为默认</view> | ||
| 407 | + </view> | ||
| 408 | + </view> | ||
| 409 | + | ||
| 286 | </view > | 410 | </view > |
| 287 | </view> | 411 | </view> |
| 288 | 412 | ||
| 289 | 413 | ||
| 414 | + | ||
| 415 | + | ||
| 290 | <warn id="warn"></warn> | 416 | <warn id="warn"></warn> |
| 291 | \ No newline at end of file | 417 | \ No newline at end of file |
pages/cart/cart2/cart2.wxss
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | .user-contact { | 7 | .user-contact { |
| 8 | padding: 24rpx 80rpx; | 8 | padding: 24rpx 80rpx; |
| 9 | } | 9 | } |
| 10 | - | 10 | + |
| 11 | .location { | 11 | .location { |
| 12 | position: relative; | 12 | position: relative; |
| 13 | padding: 0 80rpx 24rpx; | 13 | padding: 0 80rpx 24rpx; |
| @@ -276,7 +276,7 @@ | @@ -276,7 +276,7 @@ | ||
| 276 | .xc-coupon-frame{ | 276 | .xc-coupon-frame{ |
| 277 | width: 100%; | 277 | width: 100%; |
| 278 | height: 92rpx; | 278 | height: 92rpx; |
| 279 | - border-bottom:1px solid #ddd; | 279 | + |
| 280 | } | 280 | } |
| 281 | .xc-coupon-frame .work-frame{ | 281 | .xc-coupon-frame .work-frame{ |
| 282 | width: 94%; | 282 | width: 94%; |
| @@ -299,27 +299,32 @@ | @@ -299,27 +299,32 @@ | ||
| 299 | /* 自定义弹出窗口 */ | 299 | /* 自定义弹出窗口 */ |
| 300 | .cx-popup{ | 300 | .cx-popup{ |
| 301 | width:100%; | 301 | width:100%; |
| 302 | - height: 775rpx; | 302 | + height:920rpx; |
| 303 | background: #fff; | 303 | background: #fff; |
| 304 | z-index: 35; | 304 | z-index: 35; |
| 305 | - border-top-left-radius: 10rpx; | ||
| 306 | - border-top-right-radius: 10rpx; | 305 | + border-top-left-radius: 20rpx; |
| 306 | + border-top-right-radius: 20rpx; | ||
| 307 | position:fixed; | 307 | position:fixed; |
| 308 | bottom:0; | 308 | bottom:0; |
| 309 | + padding-bottom: 25rpx; | ||
| 310 | + | ||
| 309 | } | 311 | } |
| 310 | 312 | ||
| 311 | .cx-popup .top{ | 313 | .cx-popup .top{ |
| 312 | - width:100%; | 314 | + width:95%; |
| 313 | height:100rpx; | 315 | height:100rpx; |
| 314 | border-bottom:3rpx solid #ddd; | 316 | border-bottom:3rpx solid #ddd; |
| 315 | - | 317 | + margin: auto; |
| 318 | + margin-top: 30rpx; | ||
| 316 | 319 | ||
| 317 | } | 320 | } |
| 318 | .xc-top-content{ | 321 | .xc-top-content{ |
| 319 | - width: 88%; | 322 | + width: 93%; |
| 320 | height:85rpx; | 323 | height:85rpx; |
| 321 | - padding-top: 20rpx; | ||
| 322 | - font-size: 36rpx; | 324 | + padding-top: 30rpx; |
| 325 | + font-size: 34rpx; | ||
| 326 | + font-weight: 600; | ||
| 327 | + | ||
| 323 | } | 328 | } |
| 324 | 329 | ||
| 325 | 330 | ||
| @@ -331,35 +336,31 @@ | @@ -331,35 +336,31 @@ | ||
| 331 | } | 336 | } |
| 332 | .xc-frame{ | 337 | .xc-frame{ |
| 333 | width: 100%; | 338 | width: 100%; |
| 334 | - height: 465rpx; | 339 | + height:68.9%; |
| 335 | margin-top:20rpx; | 340 | margin-top:20rpx; |
| 336 | 341 | ||
| 337 | } | 342 | } |
| 338 | 343 | ||
| 339 | .xc-frame .list-frame{ | 344 | .xc-frame .list-frame{ |
| 340 | - width: 90%; | 345 | + width: 95%; |
| 341 | height: 100%; | 346 | height: 100%; |
| 342 | overflow-y:scroll; | 347 | overflow-y:scroll; |
| 343 | 348 | ||
| 344 | } | 349 | } |
| 345 | .xc-close-frame{ | 350 | .xc-close-frame{ |
| 346 | - margin-top:10rpx; | ||
| 347 | - width:1%; | 351 | + margin-top:-10rpx; |
| 352 | + | ||
| 348 | } | 353 | } |
| 349 | 354 | ||
| 350 | .xc-close{ | 355 | .xc-close{ |
| 351 | - width: 46rpx; | ||
| 352 | -height: 46rpx; | 356 | + width: 37rpx; |
| 357 | +height: 37rpx; | ||
| 353 | border-radius: 50%; | 358 | border-radius: 50%; |
| 354 | -border: 5rpx solid #a5a5a7; | 359 | +border: 3rpx solid #333; |
| 355 | text-align: center; | 360 | text-align: center; |
| 356 | -line-height: 46rpx; | ||
| 357 | -font-size: 34rpx; | ||
| 358 | -font-weight: bolder; | ||
| 359 | -color: #a5a5a7; | ||
| 360 | -margin-top: 5rpx; | ||
| 361 | - | ||
| 362 | - | 361 | +line-height: 34rpx; |
| 362 | +font-size: 29rpx; | ||
| 363 | +color: #333; | ||
| 363 | 364 | ||
| 364 | } | 365 | } |
| 365 | .xc-money{ | 366 | .xc-money{ |
| @@ -422,16 +423,14 @@ margin-top: 5rpx; | @@ -422,16 +423,14 @@ margin-top: 5rpx; | ||
| 422 | } | 423 | } |
| 423 | 424 | ||
| 424 | .xc-confirm { | 425 | .xc-confirm { |
| 425 | - width: 90%; | ||
| 426 | - height: 75rpx; | 426 | + width: 48%; |
| 427 | + border-radius: 50rpx; | ||
| 428 | + height: 50rpx; | ||
| 427 | margin:0 auto; | 429 | margin:0 auto; |
| 428 | - background:#c41830; | 430 | + background:#d60021; |
| 429 | color:#fff; | 431 | color:#fff; |
| 430 | - border-radius:10rpx; | ||
| 431 | - font-size:30rpx; | ||
| 432 | - margin-top: 50rpx; | ||
| 433 | - | ||
| 434 | - | 432 | + font-size:28rpx; |
| 433 | + margin-top: 28rpx; | ||
| 435 | } | 434 | } |
| 436 | 435 | ||
| 437 | .up{ animation: up .7s; } | 436 | .up{ animation: up .7s; } |
| @@ -446,3 +445,296 @@ height: 40rpx; | @@ -446,3 +445,296 @@ height: 40rpx; | ||
| 446 | } | 445 | } |
| 447 | 446 | ||
| 448 | 447 | ||
| 448 | +.xc-close-express{ | ||
| 449 | + width: 40rpx; | ||
| 450 | +height: 40rpx; | ||
| 451 | +border-radius: 50%; | ||
| 452 | +border: 3rpx solid #333; | ||
| 453 | +text-align: center; | ||
| 454 | +font-size:32rpx; | ||
| 455 | +line-height: 38rpx; | ||
| 456 | +color: #333; | ||
| 457 | +margin-top: 5rpx; | ||
| 458 | +} | ||
| 459 | +.cx-popup .tops{ | ||
| 460 | + width: 100%; | ||
| 461 | +height: 145rpx; | ||
| 462 | +border-bottom: 3rpx solid #eee; | ||
| 463 | + | ||
| 464 | +} | ||
| 465 | +.top-content { | ||
| 466 | + width: 82%; | ||
| 467 | +padding-top: 33px; | ||
| 468 | +height: 100%; | ||
| 469 | +padding-left: 40rpx; | ||
| 470 | +} | ||
| 471 | +.close-frame{ | ||
| 472 | + margin-top: 30rpx; | ||
| 473 | + | ||
| 474 | +} | ||
| 475 | +.cx-popup.radius{ | ||
| 476 | + | ||
| 477 | +height: 650rpx; | ||
| 478 | + | ||
| 479 | +} | ||
| 480 | +.xc-hook { | ||
| 481 | +width: 33rpx; | ||
| 482 | +height: 33rpx; | ||
| 483 | +transform: rotate(-135deg); | ||
| 484 | +line-height: 35rpx; | ||
| 485 | +text-align: center; | ||
| 486 | +margin-right: 20rpx | ||
| 487 | + | ||
| 488 | + | ||
| 489 | +} | ||
| 490 | +.xc-hooks { | ||
| 491 | +width: 30rpx; | ||
| 492 | +height: 30rpx; | ||
| 493 | +border: 1rpx solid #999; | ||
| 494 | +margin-right: 20rpx; | ||
| 495 | +} | ||
| 496 | +.express_list_frame{ | ||
| 497 | + display: flex; | ||
| 498 | +height: 80rpx; | ||
| 499 | +align-items: center; | ||
| 500 | +padding-left: 40rpx; | ||
| 501 | +border-bottom: 1rpx solid #eee; | ||
| 502 | + | ||
| 503 | +} | ||
| 504 | +.express_list{ | ||
| 505 | + width: 100%; | ||
| 506 | + height: 65%; | ||
| 507 | + overflow-y: scroll; | ||
| 508 | + overflow: hidden; | ||
| 509 | +} | ||
| 510 | +.xc-confirms { | ||
| 511 | + width: 40%; | ||
| 512 | + border-radius: 50rpx; | ||
| 513 | + height: 55rpx; | ||
| 514 | + margin:0 auto; | ||
| 515 | + font-size:28rpx; | ||
| 516 | + background: #fff; | ||
| 517 | + color: #333; | ||
| 518 | + border: 2rpx solid #333; | ||
| 519 | + | ||
| 520 | +} | ||
| 521 | + | ||
| 522 | + | ||
| 523 | +/* 优惠券的改版样式 */ | ||
| 524 | +.xc-coupon-frame{ | ||
| 525 | + width: 710rpx; | ||
| 526 | + height:auto; | ||
| 527 | + margin: 0 auto; | ||
| 528 | + | ||
| 529 | +} | ||
| 530 | +.xc-coupon-frame .coupon-frame{ | ||
| 531 | + width: 99%; | ||
| 532 | + height: 200rpx; | ||
| 533 | + margin-top:10rpx; | ||
| 534 | + border-bottom: 1rpx solid #eee; | ||
| 535 | + | ||
| 536 | +} | ||
| 537 | +.xc-coupon-frame .coupon-frame .coupon-left{ | ||
| 538 | + width: 215rpx; | ||
| 539 | + height:100%; | ||
| 540 | + overflow: hidden; | ||
| 541 | +} | ||
| 542 | +.xc-money-frames{ | ||
| 543 | + width:96%; | ||
| 544 | + margin-top: -10px; | ||
| 545 | +} | ||
| 546 | + | ||
| 547 | +.xc-rmb-symbol{ | ||
| 548 | + font-size:48rpx; | ||
| 549 | + font-weight: bold | ||
| 550 | +} | ||
| 551 | + | ||
| 552 | +.xc-rmb-val{ | ||
| 553 | + font-size:78rpx; | ||
| 554 | + font-weight: bolder | ||
| 555 | +} | ||
| 556 | +.coupon-explain{ | ||
| 557 | + font-size:25rpx; | ||
| 558 | +width:100%; | ||
| 559 | + | ||
| 560 | + | ||
| 561 | +} | ||
| 562 | +.xc-valuer{ | ||
| 563 | + margin-top:39rpx; | ||
| 564 | + margin-left:28rpx; | ||
| 565 | + font-size:25rpx; | ||
| 566 | +} | ||
| 567 | +.coupon-frame .oval{ | ||
| 568 | + width:155rpx; | ||
| 569 | + height:83rpx; | ||
| 570 | + border-radius: 50%; | ||
| 571 | + right:-78rpx; | ||
| 572 | + top:-37rpx; | ||
| 573 | +} | ||
| 574 | +.coupon-right{ | ||
| 575 | + width:490rpx; | ||
| 576 | + height: 99%; | ||
| 577 | + border-top: 1rpx solid #eaeaea; | ||
| 578 | + /* //border-bottom: 1rpx solid #eaeaea; */ | ||
| 579 | + border-right: 1rpx solid #eaeaea; | ||
| 580 | + | ||
| 581 | +} | ||
| 582 | +.coupon-annotation{ | ||
| 583 | + width: 95%; | ||
| 584 | + height: 100%; | ||
| 585 | + | ||
| 586 | +} | ||
| 587 | +.xc-brand{ | ||
| 588 | + width:100rpx; | ||
| 589 | + height:35rpx; | ||
| 590 | + line-height: 35rpx; | ||
| 591 | + font-size:21rpx; | ||
| 592 | + border-radius:10rpx; position: relative; top:-1px; | ||
| 593 | +} | ||
| 594 | +.top-frame{ | ||
| 595 | + width:82%; | ||
| 596 | + height: 75rpx; | ||
| 597 | + margin-top:10rpx; | ||
| 598 | + | ||
| 599 | +} | ||
| 600 | +.top-frame .coupon-wode{ | ||
| 601 | + font-size: 25rpx; | ||
| 602 | + margin-left:10rpx; | ||
| 603 | + width:340rpx; | ||
| 604 | + height:88rpx; | ||
| 605 | +} | ||
| 606 | +.coupon-code{ | ||
| 607 | + width:60rpx; | ||
| 608 | + height:60rpx; | ||
| 609 | + margin-top:5rpx; | ||
| 610 | + | ||
| 611 | +} | ||
| 612 | +.frame{ | ||
| 613 | + width: 100% | ||
| 614 | +} | ||
| 615 | +.coupon-time{ | ||
| 616 | + font-size: 23rpx; | ||
| 617 | + line-height:33rpx; | ||
| 618 | + color: #333; | ||
| 619 | +} | ||
| 620 | + | ||
| 621 | +.clik-get{ | ||
| 622 | + width:125rpx; | ||
| 623 | + height:45rpx; | ||
| 624 | + border-radius: 25rpx; | ||
| 625 | + line-height: 45rpx; | ||
| 626 | + font-size:25rpx; | ||
| 627 | + bottom:67rpx; | ||
| 628 | + right:6px; | ||
| 629 | +} | ||
| 630 | + | ||
| 631 | +.code-img{ | ||
| 632 | + margin-left:20rpx; | ||
| 633 | +} | ||
| 634 | +.bottmo-explain{ | ||
| 635 | +top:145rpx; | ||
| 636 | +width:94%; | ||
| 637 | +border-top:1rpx dashed #eee; | ||
| 638 | +padding-top:8rpx; | ||
| 639 | +height:38rpx; | ||
| 640 | +line-height: 51rpx; | ||
| 641 | + | ||
| 642 | +} | ||
| 643 | +.font-word{ | ||
| 644 | + font-size: 22rpx; | ||
| 645 | +} | ||
| 646 | +.circle-size{ | ||
| 647 | + background: #a0a0a0; | ||
| 648 | + width: 27rpx; | ||
| 649 | + height: 27rpx; | ||
| 650 | + margin-top:13rpx; | ||
| 651 | +margin-left:8rpx; | ||
| 652 | +display: flex; | ||
| 653 | + | ||
| 654 | +align-items: center; | ||
| 655 | +} | ||
| 656 | +.xc-jiantou{ | ||
| 657 | + /* width: 9rpx; | ||
| 658 | + height: 9rpx; */ | ||
| 659 | + /* border-top: 2rpx solid #fff; | ||
| 660 | + border-right: 2rpx solid #fff; */ | ||
| 661 | + transform: rotate(-90deg); | ||
| 662 | + color: #fff; | ||
| 663 | + font-size: 15rpx; | ||
| 664 | + /* display:inline-block; | ||
| 665 | + margin-top: 6.5rpx; */ | ||
| 666 | + text-align: center; | ||
| 667 | +width: 24rpx; | ||
| 668 | +} | ||
| 669 | +.xc-buttom{ | ||
| 670 | + width:99%; | ||
| 671 | +min-height:76rpx; | ||
| 672 | +height:auto; | ||
| 673 | +line-height:40rpx; | ||
| 674 | +border-left:1rpx solid #eee; | ||
| 675 | +border-right:1rpx solid #eee; | ||
| 676 | +border-bottom:1rpx solid #eee; | ||
| 677 | +} | ||
| 678 | +.explain-coupon{ | ||
| 679 | + | ||
| 680 | + font-size:25rpx; | ||
| 681 | + | ||
| 682 | +} | ||
| 683 | +.circle-frame{ | ||
| 684 | + width: 20rpx; | ||
| 685 | + height: auto; | ||
| 686 | + z-index:1; | ||
| 687 | + left:210rpx; | ||
| 688 | + | ||
| 689 | +} | ||
| 690 | +.circle-sawtooth{ | ||
| 691 | + width: 11rpx; | ||
| 692 | + height: 11rpx; | ||
| 693 | + background: #fff; | ||
| 694 | +} | ||
| 695 | + | ||
| 696 | +.red{background-color: #fe7496;} | ||
| 697 | +.green{ background-color: #22c7c1;} | ||
| 698 | +.blue{background-color:#5e82e3;} | ||
| 699 | +.g_gray{background-color: #aaaaaa} | ||
| 700 | + | ||
| 701 | +.f_text{text-align: center; height:96rpx; } | ||
| 702 | +.xc-hook.sn { | ||
| 703 | + margin-top:12%; | ||
| 704 | +width:45rpx; | ||
| 705 | +height:45rpx; | ||
| 706 | +font-size:28rpx; | ||
| 707 | +line-height:44rpx; | ||
| 708 | + | ||
| 709 | + | ||
| 710 | +} | ||
| 711 | +.xc-hooks.on{ | ||
| 712 | + margin-top:12%; | ||
| 713 | +width:42rpx; | ||
| 714 | +height:42rpx; | ||
| 715 | +} | ||
| 716 | +.may_use_coupon{ | ||
| 717 | + width: 95%; | ||
| 718 | + height: 40rpx; | ||
| 719 | + line-height:68rpx; | ||
| 720 | + margin: auto; | ||
| 721 | +} | ||
| 722 | +.determine-frame{ | ||
| 723 | + width: 100%; | ||
| 724 | + height: 130rpx; | ||
| 725 | + | ||
| 726 | +} | ||
| 727 | +.xc-determine{ | ||
| 728 | + height: 55rpx; | ||
| 729 | + width: 40%; | ||
| 730 | + border-radius: 50rpx; | ||
| 731 | +background: #d60021; | ||
| 732 | +color: #fff; | ||
| 733 | +font-size: 28rpx; | ||
| 734 | +margin: 0 auto; | ||
| 735 | + | ||
| 736 | +} | ||
| 737 | +.click-buttem{ | ||
| 738 | +width: 90%; | ||
| 739 | +margin: auto; | ||
| 740 | +} | ||
| 449 | \ No newline at end of file | 741 | \ No newline at end of file |