From 1dd8d2bba2d2725198edaa92233e64c6f81be82c Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 25 Jul 2023 15:53:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaLogin/oaLogin.vue | 31 ++++++++++++-------------------
 utils/oahttp.js           |  1 +
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index e632f17..f3a3d2a 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -13,18 +13,18 @@
               itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"></u-tabs>
           </view>
           <input v-if="current==0" class="mobile item" v-model="formData.account" placeholder="输入账号" />
-          <input v-if="current==0" class="mobile item" v-model="formData.password" placeholder="输入密码" password
+          <input v-if="current==0" class="mobile item" v-model="formData.password" maxlength="26" placeholder="输入密码" password
             type="safe-password" />
           <input v-if="current==1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
           <view v-if="current==1" class="code item">
-            <input placeholder="输入验证码" v-model="formData.code" />
+            <input placeholder="输入验证码" v-model="formData.code" maxlength="6" />
             <u-code :seconds="seconds" @end="end" @start="start" ref="uCode" 
             		@change="codeChange"></u-code>
             <view class="get-code" @click="getCode">{{tips}}</view>
           </view>
           <view class="btn">
             <!-- <view>新用户注册</view> -->
-            <view>忘记密码?</view>
+            <view @click="forgetPWD">忘记密码?</view>
           </view>
         </view>
         <button class="submit_btn" @click="login">登录</button>
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-  import { loginAccount, userInfo, test } from "@/api/oaUser.js"
+import { loginAccount, userInfo, test } from "@/api/oaUser.js"
 import { Toast } from "../../libs/uniApi";
   export default {
     data() {
@@ -64,6 +64,9 @@ import { Toast } from "../../libs/uniApi";
         let that = this;
         // let res = await test();
         // console.log(res);
+        uni.showLoading({
+          title:'正在登录中'
+        })
         let res = await loginAccount(that.formData);
         this.$store.commit('SET_USERINFO', {
           user: data,
@@ -71,24 +74,10 @@ import { Toast } from "../../libs/uniApi";
         })
         let { data } = await userInfo();
         this.$store.commit('setUserInfo', data);
+        uni.hideLoading()
         uni.switchTab({
           url: '/pages/oaHome/oaHome'
         })
-        // uni.request({
-        //   url: 'https://worker-task.lihaink.cn/api/login/account',
-        //   method: 'POST',
-        //   data: {
-        //     account: 'admin123',
-        //     terminal: '3',
-        //     scene: '1',
-        //     password: 'qq123456'
-        //   },
-        //   success: (res) => {
-        //     console.log(res);
-        //     this.res = res.data.m
-        //   }
-        // })
-
       },
       initTerminal() {
         // #ifndef APP-PLUS
@@ -138,6 +127,10 @@ import { Toast } from "../../libs/uniApi";
       },
       start() {
       	// uni.$u.toast('倒计时开始');
+      },
+      //忘记密码
+      forgetPWD(){
+        Toast('暂未开放')
       }
     },
     mounted() {
diff --git a/utils/oahttp.js b/utils/oahttp.js
index 99a66d5..4d860e4 100644
--- a/utils/oahttp.js
+++ b/utils/oahttp.js
@@ -68,6 +68,7 @@ function baseRequestTwo(url, method, data, {
           })
           reject(res.data);
         } else {
+          uni.hideLoading();
           uni.showToast({
             title: res.data.msg || '请检查网络',
             icon: 'none'