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

yvan.ni
2 parents 6a76ccc0 22b61abb
Showing 4 changed files with 14 additions and 14 deletions
pages/goods/goodsInfo/goodsInfo.wxml
pages/user/cardinfo/cardinfo.wxml
pages/user/plus/plus.wxml
pages/user/userqy/userqy.wxml
@@ -129,7 +129,7 @@
               </view>
             </view>
-            <!-- <view class="abs white xc-nanber">
+            <view class="abs white xc-nanber">
               <text class="fs22">已拼{{prom_act.buy_num}}件</text>
               <view class="flex" style='margin-top:-34rpx'>
                 <view class="xc-people-img">
@@ -137,7 +137,7 @@
                 </view>
                 <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view>
               </view>
-            </view> -->
+            </view>
 						<!-- 幸运购 -->
 						<view class="abs white xc-nanber" wx:if="{{false}}">
@@ -19,16 +19,16 @@
             </view>
               <view>
-                <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费</view>
+                <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">立即续费</view>
                 <!-- 判断是不是过期，显示变更按钮，但是要看是不是多件 -->
                 <block wx:if="{{is_guoqi}}">
-                    <view  wx:if="{{buy_list.length>0}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类变更</view>
+                    <view  wx:if="{{buy_list.length>0}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">卡类变更</view>
                 </block>
                 <block wx:else>
                     <!-- 要判断是不是最高级的卡 -->
-                    <view  wx:if="{{cardid!=big_card.CardId}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类升级</view>
+                    <view  wx:if="{{cardid!=big_card.CardId}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}">卡类升级</view>
                 </block>
-								<view bindtap="goto" class="renew fs28" style="background:{{user_card.CardColor}}" data-url="/packageB/pages/user/buyDetails/buyDetails">购卡明细</view>
+								<view bindtap="goto" class="renew fs28" style="background:{{user_card.CardColor}};color:{{user_card.ButtonColor}}" data-url="/packageB/pages/user/buyDetails/buyDetails">购卡明细</view>
               </view>
@@ -23,7 +23,7 @@
                     <view class="fs36">{{item.CardName}}</view>
                     <view class="fs24 Membership_remarks">开通会员卡仅{{item.CardFee}}元</view>
                   </view>
-                  <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即购买
+                  <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}};color:{{item.ButtonColor}}" bindtap="Opening">立即购买
                   </view>
                 </view>
@@ -29,10 +29,10 @@
               <view class='li rel'>
               <image class="vip-img li1 {{currentItemId == index ? 'selected' : ''}}" src="{{item.ImageUrl}}">
                 <image class="vip-huangguan abs " src="{{iurl}}/miniapp/images/userqy/user_userqy_huang.png"> </image>
-                <view class="white emerald abs">{{item.GradeName}}</view>
+                <view class="white emerald abs" style="color:#{{item.FontColor}};">{{item.GradeName}}</view>
                 <!--  上部分的文字判断 -->
-                <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}">
+                <view class=" abs white discounts four-level-word" wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id}}"  style="color:#{{item.FontColor}};">
                     <block wx:if="{{index!=backClass.length-1}}">
                         [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
                     </block>
@@ -40,21 +40,21 @@
                         [{{item.GradeName}}]365天累计成长值≥{{item.BuyGradeSum }}可保级
                     </block>
                 </view>
-                <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>
+                <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>
                 </view>
-                <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}">
+                <view class=" abs white discounts four-level-word" wx:if="{{gradeId!=item.Id && cz_val>item.BuyGradeSum }}"  style="color:#{{item.FontColor}};">
                     [{{item.GradeName}}]365天累计成长值≥{{backClass[index+1].BuyGradeSum }}可升级[{{ backClass[index+1].GradeName}}]
                 </view>
                 <!--  下部分的文字判断 -->
-                  <view wx:if="{{cz_val>item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word">
+                  <view wx:if="{{cz_val>item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word"  style="color:#{{item.FontColor}};">
                       加入会员尽享优惠
                   </view>
-                <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word">
+                <view wx:if="{{cz_val<item.BuyGradeSum && gradeId!=item.Id }}" class=" abs white money four-level-word"  style="color:#{{item.FontColor}};">
                      距离{{item.GradeName}}还需{{ filter.pInt(item.BuyGradeSum-cz_val)}}成长值
                 </view>
-                <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword">
+                <view wx:if="{{gradeId==item.Id}}" class=" abs white money four-level-word new curword"  style="color:#{{item.FontColor}};">
                     <view class="rel">
                          <view class='text'></view>
                          <text class='text2 abs'>您当前是此会员</text>