wxd / MShopWeApp

Commit df738af608d00b0baec7106b65d5fb5818c000ec

Authored by yvan.ni
2 parents 6c3fbe35 d1543c64

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

Inline Side-by-side
Showing 11 changed files with 17 additions and 14 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @df738af
... ... @@ -122,7 +122,7 @@
122 122 <!-- 技术支持 -->
123 123 <view class="logo-container t-c">
124 124 <!-- <view class="pdt20 fs26 text-underline">帮美店免费开通这个玩法</view> -->
125   - <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{imghost + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
  125 + <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{imghost + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持</view>
126 126 </view>
127 127 </view>
128 128  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @df738af
... ... @@ -872,7 +872,7 @@
872 872 <!-- 技术支持 -->
873 873 <view class="logo-container t-c">
874 874 <view class="flex ai_c fs24 jc-center pdv30 white">
875   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  875 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
876 876 提供技术支持
877 877 </view>
878 878 </view>
... ...
packageC/pages/presell/cardInfo/goodsInfo.wxml
  View file @df738af
... ... @@ -359,7 +359,7 @@
359 359 <!-- 技术支持 -->
360 360 <view class="logo-container t-c">
361 361 <view class="flex ai_c fs24 jc-center pdv30 white">
362   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  362 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
363 363 提供技术支持
364 364 </view>
365 365 </view>
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @df738af
... ... @@ -374,7 +374,7 @@
374 374 <!-- 技术支持 -->
375 375 <view class="logo-container t-c">
376 376 <view class="flex ai_c fs24 jc-center pdv30 white">
377   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  377 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
378 378 提供技术支持
379 379 </view>
380 380 </view>
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
  View file @df738af
... ... @@ -328,7 +328,7 @@
328 328 <!-- 技术支持 -->
329 329 <view class="logo-container t-c">
330 330 <view class="flex ai_c fs24 jc-center pdv30 white">
331   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  331 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
332 332 提供技术支持
333 333 </view>
334 334 </view>
... ...
packageE/pages/barCodeBank/barCodeBank.wxml
  View file @df738af
... ... @@ -115,7 +115,7 @@
115 115 <!-- 技术支持 -->
116 116 <view class="logo-container t-c">
117 117 <view class="flex ai_c fs24 jc-center pdv30 white">
118   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  118 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
119 119 提供技术支持
120 120 </view>
121 121 </view>
... ...
packageE/pages/user/grow_value/grow_value.wxml
  View file @df738af
... ... @@ -28,14 +28,17 @@
28 28 <view class="flex-vertical-between xc-bills-frame" wx:for="{{val_list}}">
29 29 <view>
30 30 <view class="word-number">
31   - {{item.Remark?item.Remark:"未知"}}
  31 + {{item.Remark?(item.Remark=="单号:"?item.Remark+item.FormNo:item.Remark):"未知"}}
32 32 </view>
33 33 <view class="word-time">
34 34 {{item.BillDate}}
35 35 </view>
36 36 </view>
37 37  
38   - <view class="xc-val" wx:if="{{item.InGrade}}"> +{{item.InGrade}}</view>
  38 + <view class="xc-val" wx:if="{{item.InGrade}}">
  39 + <view wx:if="{{item.InGrade>=0}}"> +{{item.InGrade}}</view>
  40 + <view wx:if="{{item.InGrade<0}}"> {{item.InGrade}}</view>
  41 + </view>
39 42 <view class="xc-val" wx:if="{{item.OutGrade}}"> -{{item.OutGrade}}</view>
40 43  
41 44 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @df738af
... ... @@ -1073,7 +1073,7 @@
1073 1073 <!-- 技术支持 -->
1074 1074 <view class="logo-container t-c">
1075 1075 <view class="flex ai_c fs24 jc-center pdv30 white">
1076   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
  1076 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
1077 1077 提供技术支持
1078 1078 </view>
1079 1079 </view>
... ...
pages/index/index/index.wxml
  View file @df738af
... ... @@ -406,7 +406,7 @@
406 406 <!-- 技术支持 -->
407 407 <view class="logo-container t-c">
408 408 <view class="flex ai_c fs24 jc-center pdv20 white">
409   - <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
  409 + <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
410 410 </view>
411 411 </view>
412 412 </view>
... ... @@ -631,7 +631,7 @@
631 631 <!-- 技术支持 -->
632 632 <view class="logo-container t-c">
633 633 <view class="flex ai_c fs24 jc-center pdv20 white">
634   - <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
  634 + <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
635 635 </view>
636 636 </view>
637 637 </view>
... ...
pages/template/index.wxml
  View file @df738af
... ... @@ -189,7 +189,7 @@
189 189 <!-- 技术支持 -->
190 190 <view class="logo-container t-c">
191 191 <view class="flex ai_c fs24 jc-center pdv20 white">
192   - <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" style="border-radius: 0;" lazy-load></image>提供技术支持
  192 + <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" style="border-radius: 0;" lazy-load></image>提供技术支持
193 193 </view>
194 194 </view>
195 195 </view>
... ...
pages/user/index/index.wxml
  View file @df738af
... ... @@ -69,7 +69,7 @@
69 69 <!-- 技术支持 -->
70 70 <view class="logo-container t-c">
71 71 <view class="flex ai_c fs24 jc-center pdv30 white">
72   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
  72 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
73 73 </view>
74 74 </view>
75 75 </block>
... ... @@ -431,7 +431,7 @@
431 431 <!-- 技术支持 -->
432 432 <view class="logo-container t-c">
433 433 <view class="flex ai_c fs24 jc-center pdv30 white">
434   - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
  434 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
435 435 </view>
436 436 </view>
437 437  
... ...