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

yvan.ni
2 parents 6c3fbe35 d1543c64
Showing 11 changed files with 17 additions and 14 deletions
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
packageE/pages/barCodeBank/barCodeBank.wxml
packageE/pages/user/grow_value/grow_value.wxml
pages/goods/goodsInfo/goodsInfo.wxml
pages/index/index/index.wxml
pages/template/index.wxml
pages/user/index/index.wxml
@@ -122,7 +122,7 @@
 	<!-- 技术支持 -->
 	<view class="logo-container t-c">
 		<!-- <view class="pdt20 fs26 text-underline">帮美店免费开通这个玩法</view> -->
-		<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>
+		<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>
 	</view>
 </view>
@@ -872,7 +872,7 @@
     <!-- 技术支持 -->
     <view class="logo-container t-c">
       <view class="flex ai_c fs24 jc-center pdv30 white">
-        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
         提供技术支持
       </view>
     </view>
@@ -359,7 +359,7 @@
       <!-- 技术支持 -->
       <view class="logo-container t-c">
         <view class="flex ai_c fs24 jc-center pdv30 white">
-          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
           提供技术支持
         </view>
       </view>
@@ -374,7 +374,7 @@
       <!-- 技术支持 -->
       <view class="logo-container t-c">
         <view class="flex ai_c fs24 jc-center pdv30 white">
-          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
           提供技术支持
         </view>
       </view>
@@ -328,7 +328,7 @@
       <!-- 技术支持 -->
       <view class="logo-container t-c">
         <view class="flex ai_c fs24 jc-center pdv30 white">
-          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
           提供技术支持
         </view>
       </view>
@@ -115,7 +115,7 @@
     <!-- 技术支持 -->
     <view class="logo-container t-c">
       <view class="flex ai_c fs24 jc-center pdv30 white">
-        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
         提供技术支持
       </view>
     </view>
@@ -28,14 +28,17 @@
     <view class="flex-vertical-between xc-bills-frame" wx:for="{{val_list}}">
     <view>
       <view class="word-number">
-        {{item.Remark?item.Remark:"未知"}}
+        {{item.Remark?(item.Remark=="单号:"?item.Remark+item.FormNo:item.Remark):"未知"}}
       </view>
       <view class="word-time">
          {{item.BillDate}}
       </view>
     </view>
-    <view class="xc-val" wx:if="{{item.InGrade}}"> +{{item.InGrade}}</view>
+    <view class="xc-val" wx:if="{{item.InGrade}}">
+    <view wx:if="{{item.InGrade>=0}}">   +{{item.InGrade}}</view>
+    <view wx:if="{{item.InGrade<0}}">   {{item.InGrade}}</view>  
+     </view>
     <view class="xc-val" wx:if="{{item.OutGrade}}"> -{{item.OutGrade}}</view>
   </view>
@@ -1073,7 +1073,7 @@
     <!-- 技术支持 -->
     <view class="logo-container t-c">
       <view class="flex ai_c fs24 jc-center pdv30 white">
-        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>
         提供技术支持
       </view>
     </view>
@@ -406,7 +406,7 @@
   <!-- 技术支持 -->
   <view class="logo-container t-c">
     <view class="flex ai_c fs24 jc-center pdv20 white">
-      <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+      <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
     </view>
   </view>
 </view>
@@ -631,7 +631,7 @@
     <!-- 技术支持 -->
     <view class="logo-container t-c">
       <view class="flex ai_c fs24 jc-center pdv20 white">
-        <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+        <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
       </view>
     </view>
   </view>
@@ -189,7 +189,7 @@
   <!-- 技术支持 -->
   <view class="logo-container t-c">
     <view class="flex ai_c fs24 jc-center pdv20 white">
-      <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" style="border-radius: 0;" lazy-load></image>提供技术支持
+      <image src="{{url + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" style="border-radius: 0;" lazy-load></image>提供技术支持
     </view>
   </view>
 </view>
@@ -69,7 +69,7 @@
     <!-- 技术支持 -->
     <view class="logo-container t-c">
       <view class="flex ai_c fs24 jc-center pdv30 white">
-        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
       </view>
     </view>
   </block>
@@ -431,7 +431,7 @@
       <!-- 技术支持 -->
       <view class="logo-container t-c">
         <view class="flex ai_c fs24 jc-center pdv30 white">
-          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+          <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=4'}}" class="logo" lazy-load></image>提供技术支持
         </view>
       </view>