wxd / MShopWeApp

Commit 5df9b85abaf4144f1bb2aa2be81091063ab29a9f

Authored by 泉州测试
2 parents c7cc9fd3 abdca505

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

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
pages/user/coupons/coupons.wxml
  View file @5df9b85
@@ -176,7 +176,7 @@ @@ -176,7 +176,7 @@
176 <view class="qr-container"> 176 <view class="qr-container">
177 <canvas class="qrcode" canvas-id="qrcode"/> 177 <canvas class="qrcode" canvas-id="qrcode"/>
178 </view> 178 </view>
179 - <view class="pdb30 c-7b fs26 bdt"> 179 + <view class="pdv20 c-7b fs26 bdt">
180 <text wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text> 180 <text wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
181 <text wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text> 181 <text wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
182 <text wx:else>有效期:不限</text> 182 <text wx:else>有效期:不限</text>
pages/user/coupons/coupons.wxss
  View file @5df9b85
@@ -562,7 +562,7 @@ page { @@ -562,7 +562,7 @@ page {
562 font-size: 32rpx; 562 font-size: 32rpx;
563 position: absolute; 563 position: absolute;
564 right: 10rpx; 564 right: 10rpx;
565 - top: 10rpx; 565 + top: 2rpx;
566 /* transform: translateY(-50%); */ 566 /* transform: translateY(-50%); */
567 transition: all 0.3s; 567 transition: all 0.3s;
568 } 568 }