wxd / MShopWeApp

Commit 835b069d41042bf0edac336006dfbb767b207b40

Authored by yvan.ni
2 parents 6a76ccc0 22b61abb

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

Inline Side-by-side
Showing 4 changed files with 14 additions and 14 deletions
pages/goods/goodsInfo/goodsInfo.wxml
  View file @835b069
... ... @@ -129,7 +129,7 @@
129 129 </view>
130 130 </view>
131 131  
132   - <!-- <view class="abs white xc-nanber">
  132 + <view class="abs white xc-nanber">
133 133 <text class="fs22">已拼{{prom_act.buy_num}}件</text>
134 134 <view class="flex" style='margin-top:-34rpx'>
135 135 <view class="xc-people-img">
... ... @@ -137,7 +137,7 @@
137 137 </view>
138 138 <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view>
139 139 </view>
140   - </view> -->
  140 + </view>
141 141  
142 142 <!-- 幸运购 -->
143 143 <view class="abs white xc-nanber" wx:if="{{false}}">
... ...
pages/user/cardinfo/cardinfo.wxml
  View file @835b069
... ... @@ -19,16 +19,16 @@
19 19 </view>
20 20  
21 21 <view>
22   - <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费</view>
  22 + <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">立即续费</view>
23 23 <!-- 判断是不是过期，显示变更按钮，但是要看是不是多件 -->
24 24 <block wx:if="{{is_guoqi}}">
25   - <view wx:if="{{buy_list.length>0}}" bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类变更</view>
  25 + <view wx:if="{{buy_list.length>0}}" bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">卡类变更</view>
26 26 </block>
27 27 <block wx:else>
28 28 <!-- 要判断是不是最高级的卡 -->
29   - <view wx:if="{{cardid!=big_card.CardId}}" bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类升级</view>
  29 + <view wx:if="{{cardid!=big_card.CardId}}" bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">卡类升级</view>
30 30 </block>
31   - <view bindtap="goto" class="renew fs28" style="background:{{user_card.CardColor}}" data-url="/packageB/pages/user/buyDetails/buyDetails">购卡明细</view>
  31 + <view bindtap="goto" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}" data-url="/packageB/pages/user/buyDetails/buyDetails">购卡明细</view>
32 32 </view>
33 33  
34 34  
... ...
pages/user/plus/plus.wxml
  View file @835b069
... ... @@ -23,7 +23,7 @@
23 23 <view class="fs36">{{item.CardName}}</view>
24 24 <view class="fs24 Membership_remarks">开通会员卡仅{{item.CardFee}}元</view>
25 25 </view>
26   - <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即购买
  26 + <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}};color:{{item.ButtonColor}}" bindtap="Opening">立即购买
27 27 </view>
28 28  
29 29 </view>
... ...
pages/user/userqy/userqy.wxml
  View file @835b069
... ... @@ -29,10 +29,10 @@
29 29 <view class='li rel'>
30 30 <image class="vip-img li1 {{currentItemId == index ? 'selected' : ''}}" src="{{item.ImageUrl}}">
31 31 <image class="vip-huangguan abs " src="{{iurl}}/miniapp/images/userqy/user_userqy_huang.png"> </image>
32   - <view class="white emerald abs">{{item.GradeName}}</view>
  32 + <view class="white emerald abs" style="color:#{{item.FontColor}};">{{item.GradeName}}</view>
33 33  
34 34 <!-- 上部分的文字判断 -->
35   - <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}">
  35 + <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}" style="color:#{{item.FontColor}};">
36 36 <block wx:if="{{index!=backClass.length-1}}">
37 37 [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
38 38 </block>
... ... @@ -40,21 +40,21 @@
40 40 [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
41 41 </block>
42 42 </view>
43   - <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
  43 + <view class=" abs white discounts four-level-word" wx:if="{{gradeId==item.Id}}" style="color:#{{item.FontColor}};">会员将在{{filter.replace_time2(gradeEndDate)}}到期，<text wx:if="{{need_money>0}}">365天累计成长值≥{{need_money}}可升级[{{ backClass[index+1].GradeName}}]</text><text wx:else >[{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum}}可保级</text>
44 44 </view>
45   - <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}">
  45 + <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}" style="color:#{{item.FontColor}};">
46 46 [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
47 47 </view>
48 48  
49 49 <!-- 下部分的文字判断 -->
50   - <view wx:if="{{cz_val>item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word">
  50 + <view wx:if="{{cz_val>item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word" style="color:#{{item.FontColor}};">
51 51 加入会员尽享优惠
52 52 </view>
53 53  
54   - <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word">
  54 + <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word" style="color:#{{item.FontColor}};">
55 55 距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}成长值
56 56 </view>
57   - <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword">
  57 + <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword" style="color:#{{item.FontColor}};">
58 58 <view class="rel">
59 59 <view class='text'></view>
60 60 <text class='text2 abs'>您当前是此会员</text>
... ...