Browse Source

部分颜色统一

kk.shi 3 years ago
parent
commit
f83d50a88c

+ 14 - 2
pages/luckDraw/profile.wxml

@@ -3,11 +3,23 @@
 <view class="explain flex-row">
   <view class="explain-left flex-column" catchtap="{{isLogin?'getProfile':''}}">
     <view class="explain-discount">优惠券({{couponNum}})</view>
-    <view class="{{noCoupon?'explain-column':'explain-columnNo'}}"></view>
+    <!-- <view class="{{noCoupon?'explain-column':'explain-columnNo'}}"></view> -->
+    <block wx:if="{{noCoupon}}">
+      <view class="explain-column" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+    </block>
+    <block wx:else>
+      <view class="explain-columnNo"></view>
+    </block>
   </view>
   <view class="explain-right flex-column" catchtap="{{isLogin?'getPrize':''}}">
     <view class="explain-utility">奖品({{thirdPrizeNum}})</view>
-    <view class="{{noPrize?'explain-column':'explain-columnNo'}}"></view>
+    <!-- <view class="{{noPrize?'explain-column':'explain-columnNo'}}"></view> -->
+    <block wx:if="{{noPrize}}">
+      <view class="explain-column" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+    </block>
+    <block wx:else>
+      <view class="explain-columnNo"></view>
+    </block>
   </view>
 </view>
 <!-- 主要内容 -->

+ 23 - 11
pages/welfareMall/activityList/activityList.wxml

@@ -2,34 +2,46 @@
   <view class="top_banner flex-row">
     <view class="top_banner_item flex-column" bindtap="gotoPay">
       <view class="t_b_i_title">特惠券包</view>
-      <view class="t_b_i_border {{type==2?'active':''}}"></view>
+      <!-- <view class="t_b_i_border {{type==2?'active':''}}"></view> -->
+      <block wx:if="{{type==2}}">
+        <view class="t_b_i_border active" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+      </block>
+      <block wx:else>
+        <view class="t_b_i_border"></view>
+      </block>
     </view>
 
     <view class="top_banner_item flex-column" bindtap="gotoFree">
       <view class="t_b_i_title">免费券包</view>
-      <view class="t_b_i_border {{type==1?'active':''}}"></view>
+      <!-- <view class="t_b_i_border {{type==1?'active':''}}"></view> -->
+      <block wx:if="{{type==1}}">
+        <view class="t_b_i_border active" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+      </block>
+      <block wx:else>
+        <view class="t_b_i_border"></view>
+      </block>
     </view>
 
   </view>
 
   <view class="coupon-list">
-    <view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique"  bindtap="goCouponDetail" data-id="{{item.activityId}}">
-        <image src="{{item.coverImg}}" class="coupon_item_img"></image>
-        <view class="coupon_item_right flex-column">
+    <view class="coupon_item flex-row" wx:for="{{list}}" wx:key="unique" bindtap="goCouponDetail" data-id="{{item.activityId}}">
+      <image src="{{item.coverImg}}" class="coupon_item_img"></image>
+      <view class="coupon_item_right flex-column">
         <view class="flex-column">
           <view class="coupon_name over-ellipsis-two">{{item.name}}</view>
           <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum > 0}}">含{{item.cashCouponNum}}张代金券、{{item.discountCouponNum}}张折扣券</view>
           <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum > 0}}">含{{item.discountCouponNum}}张折扣券</view>
           <view class="coupon_num" wx:if="{{item.cashCouponNum > 0 && item.discountCouponNum == 0}}">含{{item.cashCouponNum}}张代金券</view>
           <view class="coupon_num" wx:if="{{item.cashCouponNum ==0 && item.discountCouponNum ==0}}"></view>
-        
+
         </view>
-          <view class="coupon_i_r_bottom flex-row">
-            <view class="coupon_price" style="color: {{config.secColor?config.secColor:'#B01717'}};">价值 ¥{{item.formatShowPrice}}</view>
-            <view class="coupon_buy" style="background-color: {{config.mainColor?config.mainColor:'#B01717'}}" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
-            <view class="coupon_buy"  style="background-color: {{config.mainColor?config.mainColor:'#B01717'}}" wx:else>免费领取</view>
-          </view>
+        <view class="coupon_i_r_bottom flex-row">
+          <view class="coupon_price" style="color: {{config.secColor?config.secColor:'#B01717'}};">价值 ¥{{item.formatShowPrice}}</view>
+          <view class="coupon_buy" style="background-color: {{config.mainColor?config.mainColor:'#B01717'}}" wx:if="{{item.isPay!=0}}">{{item.formatPrice}}元抢</view>
+          <view class="coupon_buy" style="background-color: {{config.mainColor?config.mainColor:'#B01717'}}" wx:else>免费领取</view>
         </view>
+      </view>
     </view>
     <view class="no_result" wx:if="{{noResult}}">——— 抱歉,暂无券包 ———</view>
     <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>

+ 8 - 4
pages/welfareMall/coupon/coupon.js

@@ -1,6 +1,6 @@
 // pages/welfareMall/coupon/coupon.js
 import WelfareMall from '../../../api/welfareMall'
-import {getMobileCache, getPhoneNumber as getPhoneNumberSync} from '../../../utils/user'
+import {getMobileCache, getPhoneNumber as getPhoneNumberSync, getColor} from '../../../utils/user'
 Page({
 
   /**
@@ -13,7 +13,8 @@ Page({
     noResult: false,
     noMore: false,
     type:0,
-    couponList: []
+    couponList: [],
+    config:{}
   },
 
   /**
@@ -33,8 +34,11 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
-
+  onShow: async function () {
+    let info =  await getColor();
+    this.setData({
+      config:info.config,
+    })
   },
 
   /**

+ 21 - 3
pages/welfareMall/coupon/coupon.wxml

@@ -5,15 +5,33 @@
     <view class="flex-row top_banner">
       <view class="top_banner_item flex-column" bindtap="showCoupon" data-type="0">
         <view class="t_b_i_title">待使用</view>
-        <view class="t_b_i_border {{type==0?'active':''}}"></view>
+        <!-- <view class="t_b_i_border {{type==0?'active':''}}"></view> -->
+        <block wx:if="{{type==0}}">
+          <view class="t_b_i_border active" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+        </block>
+        <block wx:else>
+          <view class="t_b_i_border"></view>
+        </block>
       </view>
       <view class="top_banner_item flex-column" bindtap="showCoupon" data-type="1">
         <view class="t_b_i_title">已使用</view>
-        <view class="t_b_i_border {{type==1?'active':''}}"></view>
+        <!-- <view class="t_b_i_border {{type==1?'active':''}}"></view> -->
+        <block wx:if="{{type==1}}">
+          <view class="t_b_i_border active" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+        </block>
+        <block wx:else>
+          <view class="t_b_i_border"></view>
+        </block>
       </view>
       <view class="top_banner_item flex-column" bindtap="showCoupon" data-type="2">
         <view class="t_b_i_title">已过期</view>
-        <view class="t_b_i_border {{type==2?'active':''}}"></view>
+        <!-- <view class="t_b_i_border {{type==2?'active':''}}"></view> -->
+        <block wx:if="{{type==2}}">
+          <view class="t_b_i_border active" style="background: {{config.mainColor?config.mainColor:'#B01717'}};"></view>
+        </block>
+        <block wx:else>
+          <view class="t_b_i_border"></view>
+        </block>
       </view>
     </view>
     <view style="padding-top: 130rpx;">