Merge remote-tracking branch 'origin/skk/feat/login_color' into menu_master

# Conflicts:
#	pages/welfareMall/personal/personal.wxss

pages/welfareMall/personal/personal.wxml

@@ -17,7 +17,7 @@
             <view class="flex-row">
               <view class="head-personal-name" wx:if="{{isLogin}}">{{phone.toHide(mobileTop)}}</view>
               <button class="head-personal-login" style="background-color: transparent;" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">授权手机号</button>
-              <view class="logout" wx:if="{{isLogin}}" bindtap="logout">重新授权</view>
+              <view class="logout" wx:if="{{isLogin}}" bindtap="logout" style="color: {{config.secColor?config.secColor:'#B01717'}};border: {{config.secColor?config.secColor:'#B01717'}} 2rpx solid;">重新授权</view>
             </view>
           </view>
       
@@ -31,7 +31,7 @@
             <view class="flex-row">
               <view class="head-personal-name" wx:if="{{isLogin}}">{{phone.toHide(mobileTop)}}</view>
               <button class="personal-isLogin" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">登录/注册</button>
-              <view class="logout" wx:if="{{isLogin}}" bindtap="logout">重新授权</view>
+              <view class="logout" wx:if="{{isLogin}}" bindtap="logout" style="color: {{config.secColor?config.secColor:'#B01717'}};border: {{config.secColor?config.secColor:'#B01717'}} 2rpx solid;">重新授权</view>
             </view>
           </view>
        

pages/welfareMall/personal/personal.wxss

@@ -280,8 +280,8 @@ page{
   margin-left: 12rpx;
   font-size: 22rpx;
   text-align: center;
-  color: #303030;
-  border: #303030 2rpx solid;
+  /* color: #B0D342;
+  border: #B0D342 2rpx solid; */
   border-radius: 4rpx;
 }