wxd / MShopWeApp

Commit 67dc8fe828578388c958f8410c32d3481bacd0b2

Authored by F5VT98DI7XY4X12\Administrator
2 parents c8e7b06d 2e04af9e

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 2 changed files with 42 additions and 29 deletions
pages/cart/cart2/cart2.wxml
  View file @67dc8fe
... ... @@ -258,30 +258,30 @@
258 258  
259 259 <view class="xc-frame flex-level">
260 260 <view class="list-frame">
261   - <view class="xc-coupon-effect flex-vertical flex-space-between" >
  261 + <view class="xc-coupon-effect flex-vertical flex-space-between" bindtap="sele_quan_item" data-no="1">
262 262 <view class="xc-goods-coupon ">
263   - <view class="xc-coupon-money">不使用优惠券</view>
264   - <view class="flex xc-coupon-time"></view>
  263 + <view class="xc-coupon-money0">不使用优惠券</view>
  264 + <view class="flex"></view>
265 265 </view>
266   - <view class="xc-coupon-selection flex-right-vertical" bindtap="sele_quan_item" data-no="1">
267   - <icon color='red' size='25' type='success' wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"></icon>
  266 + <view class="xc-coupon-selection flex-right-vertical" >
  267 + <icon color='red' size='20' type='success' wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"></icon>
268 268 <view class="circle xc-not-Selection" wx:if="{{!using_quan[selected_quan_pick].is_nouse_red }}"></view>
269 269 </view>
270 270 </view>
271 271  
272 272 <!-- 循环那些还没有被其他门店选择的券 -->
273   - <view class="xc-coupon-effect flex-vertical flex-space-between" wx:for="{{selected_quan_list}}" wx:if="{{!item.is_using}}" >
  273 + <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}}">
274 274 <view class="xc-goods-coupon ">
275 275 <view class="xc-coupon-money">{{item.Sum}}元</view>
276   - <view>订单满{{item.BuySum}}元使用</view>
  276 + <view class="xc-coupon-money1">订单满{{item.BuySum}}元使用</view>
277 277 <view class="flex xc-coupon-time">使用期限
278 278 <view class="time" wx:if="{{item.BeginDate && item.ValidDate}}" >
279 279 {{filters.replace_time(item.BeginDate)}}至{{filters.replace_time(item.ValidDate)}}
280 280 </view>
281 281 </view>
282 282 </view>
283   - <view class="xc-coupon-selection flex-right-vertical" bindtap="sele_quan_item" data-ind="{{index}}">
284   - <icon color='red' size='25' type='success' wx:if="{{item.show_red}}"></icon>
  283 + <view class="xc-coupon-selection flex-right-vertical" >
  284 + <icon color='red' size='20' type='success' wx:if="{{item.show_red}}"></icon>
285 285 <view class="circle xc-not-Selection" wx:if="{{!item.show_red }}"></view>
286 286 </view>
287 287 </view>
... ...
pages/cart/cart2/cart2.wxss
  View file @67dc8fe
... ... @@ -310,7 +310,7 @@
310 310  
311 311 .cx-popup .top{
312 312 width:100%;
313   - height:133rpx;
  313 + height:100rpx;
314 314 border-bottom:3rpx solid #ddd;
315 315  
316 316  
... ... @@ -318,7 +318,7 @@
318 318 .xc-top-content{
319 319 width: 88%;
320 320 height:85rpx;
321   - padding-top: 50rpx;
  321 + padding-top: 20rpx;
322 322 font-size: 36rpx;
323 323 }
324 324  
... ... @@ -341,26 +341,25 @@
341 341 height: 100%;
342 342 overflow-y:scroll;
343 343  
344   - margin-top:20rpx;
345   -
346 344 }
347 345 .xc-close-frame{
348   - margin-top:30rpx;
349   - width:15%;
  346 + margin-top:10rpx;
  347 + width:1%;
350 348 display:flex;
351 349 }
352 350  
353 351 .xc-close{
354   - width:70rpx;
355   - height:70rpx;
356   - border-radius:50%;
357   - border:5rpx solid #a5a5a7;
358   - text-align:center;
359   - line-height: 55rpx;
360   - font-size:80rpx;
361   - color:#a5a5a7;
362   - font-family:"微软正黑体";
363   - margin-top:8rpx;
  352 + width: 46rpx;
  353 +height: 46rpx;
  354 +border-radius: 50%;
  355 +border: 5rpx solid #a5a5a7;
  356 +text-align: center;
  357 +line-height: 33rpx;
  358 +font-size: 64rpx;
  359 +color: #a5a5a7;
  360 +margin-top: 5rpx;
  361 +
  362 +
364 363  
365 364 }
366 365 .xc-money{
... ... @@ -374,7 +373,7 @@
374 373 }
375 374 .xc-coupon-effect{
376 375 width: 99%;
377   - height: 128rpx;
  376 + min-height: 100rpx;
378 377 border-bottom:3rpx solid #ddd;
379 378  
380 379  
... ... @@ -389,10 +388,24 @@
389 388 margin-left:222rpx;
390 389  
391 390 }
  391 +.xc-coupon-money0{
  392 + color: #c91e31;
  393 + font-size: 35rpx;
  394 + line-height: 40rpx;
  395 +
  396 +}
392 397 .xc-coupon-money{
393 398 color: #c91e31;
394 399 font-size: 35rpx;
395   - margin-top:20rpx;
  400 + line-height: 40rpx;
  401 + padding-top: 10px;
  402 +
  403 +}
  404 +.xc-coupon-money1{
  405 + color: #444;
  406 + font-size: 28rpx;
  407 + line-height: 60rpx;
  408 +
396 409  
397 410 }
398 411 .xc-coupon-time{
... ... @@ -427,8 +440,8 @@
427 440 @keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
428 441  
429 442 .xc-not-Selection{
430   - width: 60rpx;
431   - height: 60rpx;
  443 + width: 40rpx;
  444 +height: 40rpx;
432 445 background: #eeeeee;
433 446 }
434 447  
... ...