From fcd2e196bbcd81893e62bf1793d83d52bc6f2dfb Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 29 Aug 2023 14:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue                 |  2 +-
 pages/oaLogin/oaLogin.vue               | 20 ++++++++++++++------
 pages/updatePassword/updatePassword.vue | 14 ++++++++++++--
 store/modules/config.js                 |  2 +-
 subpkg/otherTask/otherTask.vue          |  2 +-
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index c85f88f..241fe7d 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -190,7 +190,6 @@ import {
 import {
   noticeList
 } from "@/api/notice.js";
-import { mapState } from "@/store/index.js"
 // import tabbar from '../components/tabbar'
 import {
   getIndexListAPI,
@@ -199,6 +198,7 @@ import {
   getApproveListAPI,
   getUserIndexAPI,
 } from "@/api/oaApi.js";
+import { mapState } from 'vuex';
 import bj from "@/static/animation/home.json"
 //#ifdef APP-PLUS
 var jpushModule = uni.requireNativePlugin("JG-JPush");
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index b88a2c2..cb5775e 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -37,9 +37,9 @@
 <script>
 	import {
 		loginAccount,
-		userInfo,
-		test
+		userInfo
 	} from "@/api/oaUser.js"
+  import { getConfig } from "@/api/config.js";
 	import {
 		Toast
 	} from "../../libs/uniApi";
@@ -102,8 +102,6 @@
 				if (this.formData.scene == 1 && !this.formData.password) return Toast('密码不能为空');
 				if (this.formData.scene == 2 && !this.formData.code) return Toast('验证码不能为空');
 				let that = this;
-				// let res = await test();
-				// console.log(res);
 				uni.showLoading({
 					title: '正在登录中'
 				})
@@ -117,20 +115,30 @@
 					data
 				} = await userInfo();
 				this.$store.commit('setUserInfo', data);
-        await this.$store.dispatch('initConfig');
+        let config = await getConfig();
+        this.$store.commit('SET_CONFIG', config.data);
 				uni.hideLoading()
 				if (data.is_new_user) {
 					uni.showLoading({
 						mask: true,
 						title: '加载中'
 					})
-					uni.switchTab({
+					// #ifdef APP-PLUS
+					return uni.switchTab({
 						url: '/pages/oaHome/oaHome',
 						success: () => {
 							uni.$emit('initOaTask'); // 更新任务
 							uni.hideLoading()
 						}
 					})
+					// #endif
+          return uni.reLaunch({
+            url: '/pages/oaHome/oaHome',
+            success: () => {
+            	uni.$emit('initOaTask'); // 更新任务
+            	uni.hideLoading()
+            }
+          })
 				} else uni.navigateTo({
 					url: '/pages/updatePassword/updatePassword'
 				});
diff --git a/pages/updatePassword/updatePassword.vue b/pages/updatePassword/updatePassword.vue
index f4c3c2a..ca1027a 100644
--- a/pages/updatePassword/updatePassword.vue
+++ b/pages/updatePassword/updatePassword.vue
@@ -91,10 +91,20 @@
                   mask: true,
                   title: '加载中'
                 })
-                uni.switchTab({
+                // #ifdef APP-PLUS
+                return uni.switchTab({
+                	url: '/pages/oaHome/oaHome',
+                	success: () => {
+                		uni.$emit('initOaTask'); // 更新任务
+                		uni.hideLoading()
+                	}
+                })
+                // #endif
+                return uni.reLaunch({
                   url: '/pages/oaHome/oaHome',
                   success: () => {
-                    uni.hideLoading()
+                  	uni.$emit('initOaTask'); // 更新任务
+                  	uni.hideLoading()
                   }
                 })
               })
diff --git a/store/modules/config.js b/store/modules/config.js
index dbfa017..1c1f664 100644
--- a/store/modules/config.js
+++ b/store/modules/config.js
@@ -17,7 +17,7 @@ const mutations = {
     Cache.set('request', state.request);
   },
   SET_CONFIG(state, data){
-    state.config = data;
+    state.config = {...data};
   }
 };
 
diff --git a/subpkg/otherTask/otherTask.vue b/subpkg/otherTask/otherTask.vue
index babf5a0..f850b63 100644
--- a/subpkg/otherTask/otherTask.vue
+++ b/subpkg/otherTask/otherTask.vue
@@ -14,7 +14,7 @@
     <view class="card">
       <view class="title">详情描述</view>
       <u-line style="margin: 14rpx 0;"></u-line>
-      <u--textarea v-model="formData.text" placeholder="请输入内容" style="font-size: 28rpx;background-color: #eee;" autoHeight></u--textarea>
+      <u--textarea v-model="formData.text" height="80" placeholder="请输入内容" placeholderStyle="font-size: 28rpx;" style="font-size: 28rpx;background-color: #eee;" autoHeight></u--textarea>
     </view>
     <mybtn text="确认提交"></mybtn>
   </view>