Merge remote-tracking branch 'origin/master' into master

whycq

2023-01-10 3930a1d44ab273a6d7155f4fa4163944458c7ca1

 pages/login/login.vue

@@ -44,11 +44,12 @@
            load: {
               loading: false,
               btnText: '登录'
            }
            },
         }
      },
      onLoad:function(){
         this.user.userName = uni.getStorageSync('userName')
         this.user.password = uni.getStorageSync('password')
         // #ifdef APP-PLUS
         var that=this
         plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
@@ -65,9 +66,9 @@
         onLogin() {
            let that = this
            uni.request({
               url: 'http://192.168.50.101:9528/login.action',
               url: that.baseUrl + '/login.action',
               fail(result) {
                  uni.showToast({title: '请求失败'})
                  uni.showToast({icon:'error',title: '请求失败'})
               },
               data: {
                 username:that.user.userName,
@@ -77,12 +78,17 @@
                  "content-type": "application/json"
               },
               success(result) {
                  if (result.statusCode ===  404) {
                     uni.showToast({title: '登录失败', icon: "error"})
                     return
                  }
                  let res = result.data
                  if (res.code === 200 ){
                     that.load.loading = true;
                     that.load.btnText = '登录中';
                     uni.setStorageSync('token', res.data.token);
                     uni.setStorageSync('userName', that.user.userName);
                     uni.setStorageSync('password', that.user.password);
                     setTimeout(()=> {
                        uni.showToast({title: '登录成功'})
                        setTimeout(()=> {