wxd / MShopWeApp

Commit 988e692414230af3d1054d54ac7a8b33a854c7cf

Authored by 后端研发-苏明海
2 parents ba59a50c a7f4a249

Merge branch 'test' into 'qa' 

Test

See merge request !1096
Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @988e692
@@ -47,9 +47,9 @@ @@ -47,9 +47,9 @@
47 </view> 47 </view>
48 </block> 48 </block>
49 </view> 49 </view>
50 -<!-- <view class="content_ware_price">-->  
51 -<!-- <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>-->  
52 -<!-- </view>--> 50 + <view class="content_ware_price">
  51 + <text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text>
  52 + </view>
53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time"> 53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
54 <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text> 54 <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
55 </view> 55 </view>
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @988e692
@@ -48,9 +48,9 @@ @@ -48,9 +48,9 @@
48 </block> 48 </block>
49 </view> 49 </view>
50 <view class="top_foot data-v-3a5b7e36"> 50 <view class="top_foot data-v-3a5b7e36">
51 -<!-- <view class="top_foot_price data-v-3a5b7e36">-->  
52 -<!-- <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>-->  
53 -<!-- </view>--> 51 + <view class="top_foot_price data-v-3a5b7e36">
  52 + <text class="data-v-3a5b7e36">{{giftPosPrice+"元"}}</text>
  53 + </view>
54 <view class="top_foot_qty data-v-3a5b7e36"> 54 <view class="top_foot_qty data-v-3a5b7e36">
55 <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text> 55 <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text>
56 <text class="data-v-3a5b7e36" wx:elif="{{flag == 1 && giftQty > 0}}">{{"数量:"+giftQty+"件"}}</text> 56 <text class="data-v-3a5b7e36" wx:elif="{{flag == 1 && giftQty > 0}}">{{"数量:"+giftQty+"件"}}</text>
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @988e692
@@ -78,9 +78,9 @@ @@ -78,9 +78,9 @@
78 <text>{{item.actTitle}}</text> 78 <text>{{item.actTitle}}</text>
79 </block> 79 </block>
80 </view> 80 </view>
81 -<!-- <view class="content_ware_price">-->  
82 -<!-- <text>{{"零售价:￥"+item.giftPosPrice}}</text>-->  
83 -<!-- </view>--> 81 + <view class="content_ware_price">
  82 + <text>{{"￥"+item.giftPosPrice}}</text>
  83 + </view>
84 84
85 <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}"> 85 <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
86 <block wx:if="{{getDate>item.endTime}}"> 86 <block wx:if="{{getDate>item.endTime}}">