Merge branch 'yt' into dev

pages/dashboardModule/performanceRanking/performanceRanking.wxss

@@ -208,7 +208,7 @@
   line-height: 24.23rpx;
 }
 .text-wrapper_9 {
-  padding: 14.61rpx 0 13.33rpx;
+  padding: 14.61rpx 0 14.61rpx;
   background-color: #ffffff;
   border-radius: 28.13rpx;
   height: 56.25rpx;

pages/personCenter/resetPwd/resetPwd.js

@@ -45,7 +45,7 @@ Page({
           })
           setTimeout(() => {
             wx.reLaunch({
-              url: '/pages/loginModule/pwdLogin/pwdLogin',
+              url: '/pages/welcome/homePage/homePage',
             })
           }, 1000); // 1000ms = 1秒
           

project.private.config.json

@@ -3,7 +3,7 @@
   "projectname": "qingcheng-xiaochengxu",
   "setting": {
     "compileHotReLoad": true,
-    "urlCheck": false,
+    "urlCheck": true,
     "bigPackageSizeSupport": false
   },
   "condition": {},

request.js

@@ -3,6 +3,7 @@ export const caozhe = 'http://160.202.242.36:9093'
 export const dev = 'http://160.202.242.36:9091';
 export const test = 'http://160.202.242.36:9092';
 export const localTest = 'http://localhost:9092';
-export const baseUrl = test;
+export const ssl = 'https://www.chenxinzhi.top'
+export const baseUrl = ssl;
 
 export const globalImgUrl = baseUrl + '/file/download/'