From d57e31300c6d0404a0aaae416902bbfafa41e47a Mon Sep 17 00:00:00 2001
From: longjieli <1060695654@qq.com>
Date: Sun, 1 Sep 2024 12:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js            |  2 +-
 api/http.js           |  2 +-
 pages.json            |  6 ++++++
 pages/login/login.vue |  5 +++--
 store/store.js        | 19 ++++++++++++++++++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/api/api.js b/api/api.js
index bdc42c7..d246de3 100644
--- a/api/api.js
+++ b/api/api.js
@@ -55,7 +55,7 @@ export function api(key, data, callback, loadingTitle){
 	if (req.auth) {
 		if (!uni.getStorageSync('token')) {
 			uni.navigateTo({
-				url: '/pages/login/mobile'
+				url: '/pages/login/login'
 			})
 			console.error('需要登录')
 			return
diff --git a/api/http.js b/api/http.js
index 92037cf..b0e5fa0 100644
--- a/api/http.js
+++ b/api/http.js
@@ -29,7 +29,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 				uni.removeStorageSync('token')
 				console.error('登录过期');
 				uni.navigateTo({
-					url: '/pages/auth/login'
+					url: '/pages/login/login'
 				})
 			}
 			
diff --git a/pages.json b/pages.json
index 36e2cf3..e55eaaf 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,12 @@
 			"style": {
 				"navigationBarTitleText": "个人中心"
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1b1fc4b..12dffdb 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,7 +4,7 @@
 			<!-- <image src="/static/image/login/logo.png" mode=""></image> -->
 		</view>
 		<view class="title">
-			欢迎使用xx加油
+			欢迎使用xx知识平台
 		</view>
 		<view class="btn mt">
 			<view class="icon">
@@ -48,9 +48,10 @@
 </template>
 
 <script>
-	import configPopup from '../../components/config/configPopup.vue';
+	import configPopup from '@/components/configPopup/configPopup.vue'
 	export default {
 		name : 'Login',
+		components : { configPopup },
 		data() {
 			return {
 				checkboxValue : []
diff --git a/store/store.js b/store/store.js
index ae7baee..af6e511 100644
--- a/store/store.js
+++ b/store/store.js
@@ -11,7 +11,11 @@ const store = new Vuex.Store({
 		configList: {}, //配置对象
 		userInfo : {},
 	},
-	getters: {},
+	getters: {
+		getConfig(state){
+			return state.configList
+		}
+	},
 	mutations: {
 		// 初始化配置
 		initConfig(state) {
@@ -25,6 +29,14 @@ const store = new Vuex.Store({
 					}
 				})
 			})
+			
+			let apiConfig = [ 'getPrivacyPolicy' , 'getUserAgreement' ]		//需要访问不同接口才能得到的配置数据
+			let key = ['privacyAgreement','userAgreement']
+			apiConfig.forEach((item,index) => {
+				api(item,res => {
+					state.configList[key[index]] = res.result
+				})
+			})
 		},
 		login(state) {
 			uni.login({
@@ -46,7 +58,12 @@ const store = new Vuex.Store({
 							uni.navigateTo({
 								url: '/pages/login/wxUserInfo'
 							})
+						}else{
+							uni.switchTab({
+								url: '/pages/contentDetail/contentDetail'
+							})
 						}
+						
 					})
 				},
 				fail(err) {