wxd / MShopWeApp

Commit d718c3526bba7fb71f261c8bd03c9e93fabda58a

Authored by 后端研发-苏明海
2 parents 6a14db97 445c789f

Merge branch 'test' into 'qa' 

Test

See merge request !561
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @d718c35
@@ -4793,9 +4793,9 @@ Page({ @@ -4793,9 +4793,9 @@ Page({
4793 break; 4793 break;
4794 } 4794 }
4795 }else{ 4795 }else{
4796 - if(item.condition>this.data.goodsInputNum){ 4796 + if(item.condition>all_price){
4797 con=item; 4797 con=item;
4798 - con.need=(item.condition-this.data.goodsInputNum)+"元"; 4798 + con.need=(item.condition-all_price)+"元";
4799 break; 4799 break;
4800 } 4800 }
4801 } 4801 }
pages/user/deposit/prepaid/prepaid.wxml
  View file @d718c35
1 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid"> 1 <block wx:for="{{perpaid}}" wx:for-index="idx" wx:for-item="perpaid">
2 - <view class="coupon-container" wx:if="{{perpaid.NewSum>0}}"> 2 + <view class="coupon-container" wx:if="{{perpaid.NewSum>0 || perpaid.NewSum=='' }}">
3 <image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image> 3 <image wx:if="{{idx % 4 == 0}}" class="picture" src="{{iurl+'miniapp/images/usermoney/green.png'}}"></image>
4 <image wx:if="{{idx % 4 == 1}}" class="picture" src="{{iurl+'miniapp/images/usermoney/red.png'}}"></image> 4 <image wx:if="{{idx % 4 == 1}}" class="picture" src="{{iurl+'miniapp/images/usermoney/red.png'}}"></image>
5 <image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image> 5 <image wx:if="{{idx % 4 == 2}}" class="picture" src="{{iurl+'miniapp/images/usermoney/yellow.png'}}"></image>
6 <image wx:if="{{idx % 4 == 3}}" class="picture" src="{{iurl+'miniapp/images/usermoney/blue.png'}}"></image> 6 <image wx:if="{{idx % 4 == 3}}" class="picture" src="{{iurl+'miniapp/images/usermoney/blue.png'}}"></image>
7 <view class="info-container flex"> 7 <view class="info-container flex">
8 - <view class="left" catchtap="go_detail" data-id="{{perpaid.Id}}"> 8 + <view class="left" >
9 <view>{{perpaid.ItemName}}</view> 9 <view>{{perpaid.ItemName}}</view>
10 <view class="pdv20">充{{perpaid.BeginSum}} 10 <view class="pdv20">充{{perpaid.BeginSum}}
11 <text>送{{perpaid.NewSum}}元</text> 11 <text>送{{perpaid.NewSum}}元</text>
12 </view> 12 </view>
13 - <view wx:if="{{perpaid.ItemType==2}}">充值送大礼 ></view> 13 + <view wx:if="{{perpaid.ItemType==2}}" catchtap="go_detail" data-id="{{perpaid.Id}}">充值送大礼 ></view>
14 </view> 14 </view>
15 <view class="right">备注： 15 <view class="right">备注：
16 <view class="">{{perpaid.ItemName}}</view> 16 <view class="">{{perpaid.ItemName}}</view>