Forráskód Böngészése

Merge branch 'skk/feat/login_color' into pre

kk.shi 3 éve
szülő
commit
25139b793c

+ 2 - 2
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>
        

+ 2 - 2
pages/welfareMall/personal/personal.wxss

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

+ 1 - 1
project.config.json

@@ -48,7 +48,7 @@
     "ignoreUploadUnusedFiles": false
   },
   "compileType": "miniprogram",
-  "libVersion": "2.18.1",
+  "libVersion": "2.23.4",
   "appid": "wxcc1cdb8babd3f62c",
   "projectname": "%E9%A3%9E%E7%A0%81",
   "debugOptions": {

+ 12 - 0
utils/request.js

@@ -111,6 +111,18 @@ class request {
               success: (res => {
                   if (res?.data.code === 200) {
                       //200: 服务端业务处理正常结束
+                      let jsondata = JSON.stringify(res.data.data)
+                      let signStr = jsondata+"menu20220422";
+                      let sign =  util.sha1(signStr).toString();
+                     
+                      if(sign != res.data.sign){
+                        wx.showModal({
+                            title: "提示",
+                            content: "数据走丢了"
+                          })
+                         return
+                      }
+
                       resolve(res?.data)
                   } else {
                     if (catchErrorFunc) {