Commit d10529fa10574c49c522d5326d1c7037c8300a7b

Authored by 前端研发-钱巧玲
2 parents 5133c7cf 216d2398

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

pages/giftpack/buygiftpack/giftpackbuy.wxml
1 1 <view class="top_img">
2 2 <view class="top_img">
3   - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
  3 + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
4 4 </view>
5 5 <view class="top_title">
6 6 <view class="top_title_box">
... ...
pages/giftpack/buygiftpack/giftpackbuy.wxss
... ... @@ -16,7 +16,7 @@ page {
16 16  
17 17 .top_img image {
18 18 width: 100%;
19   - height: 660rpx;
  19 +
20 20 }
21 21  
22 22 .top_title {
... ...
pages/giftpack/giftpacklist/giftpacklist.wxss
... ... @@ -16,7 +16,7 @@
16 16  
17 17 .box_top image.data-v-3a5b7e36 {
18 18 width: 100%;
19   - height: 540rpx;
  19 + max-height: 540rpx;
20 20 }
21 21  
22 22 .box_title.data-v-3a5b7e36 {
... ...
pages/giftpack/mygiftpack/mygiftpack.wxml
1 1 <view class="top_img">
2 2 <view class="top_img">
3 3 <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> -->
4   - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg'}}" lazy-load="true"></image>
  4 + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
5 5 </view>
6 6 <view class="top_title">
7 7 <view class="top_title_box">
... ...
pages/giftpack/mygiftpack/mygiftpack.wxss
... ... @@ -12,7 +12,6 @@
12 12  
13 13 .top_img image {
14 14 width: 100%;
15   - height: 660rpx;
16 15 }
17 16  
18 17 .top_title {
... ...
pages/user/index/index.wxml
... ... @@ -226,7 +226,7 @@
226 226 </view>
227 227 <view class="item t-c" data-url="/pages/giftpack/mygiftpack/mygiftpack" bindtap="goto_nav">
228 228 <image class="xc-center-img " src="{{iurl}}/miniapp/images//user/wdlb.png"></image>
229   - <view class="four-level-word">我的礼包</view>
  229 + <view class="four-level-word">专享礼包</view>
230 230 </view>
231 231 <block wx:if="{{is_assistance==1}}">
232 232 <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav">
... ...