From 16eb69e7c8e0333133b92c902295de568ce849b6 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 6 Jan 2025 15:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |  4 +++-
 components/user/visualization.vue                  |  5 ++++-
 pages/index/index.vue                              | 18 +++++++----------
 .../auth/loginAndRegisterAndForgetPassword.vue     |  3 ++-
 store/store.js                                     | 23 +++++++++++-----------
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/App.vue b/App.vue
index a249d09..eb0f964 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,9 @@
 <script>
 	export default {
 		onLaunch: function() {
-			this.$store.commit('getUserInfo')
+			if(uni.getStorageSync('token')){
+				this.$store.commit('getUserInfo')
+			}
 		},
 		onShow: function() {
 			this.$store.commit('initConfig')
diff --git a/components/user/visualization.vue b/components/user/visualization.vue
index c3ff4d7..3210dac 100644
--- a/components/user/visualization.vue
+++ b/components/user/visualization.vue
@@ -195,10 +195,13 @@
 						axisLabel: {
 							color: '#fff',
 							fontSize : '10px',
-						}
+						},
 					},
 					yAxis: {
 						type: 'value',
+						min : function(value){
+							return value.min;
+						},
 						axisLine: {
 							lineStyle: {
 								color: '#fff'
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c0134ab..17eee95 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -63,13 +63,14 @@
 			}
 		},
 		onShow() {
-			this.getImagePhoneOther()
-			if (!this.$store.state.shop && !this.$store.state.buy) {
-				uni.reLaunch({
-					url: '/pages_order/auth/selectionIdentity?back=no&'
-				})
+			// if (!this.$store.state.shop && !this.$store.state.buy) {
+			// 	uni.reLaunch({
+			// 		url: '/pages_order/auth/selectionIdentity?back=no&'
+			// 	})
+			// }
+			if(uni.getStorageSync('token')){
+				this.$store.commit('getUserInfo')
 			}
-			this.$store.commit('getUserInfo')
 			this.getBannerList()
 		},
 		computed: {
@@ -89,11 +90,6 @@
 					url: '/pages_order/order/offerOrBillLading?titleIndex=' + titleIndex
 				})
 			},
-			getImagePhoneOther() {
-				this.$api('getImagePhoneOther', res => {
-
-				})
-			},
 		}
 	}
 </script>
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index 4930ccb..7de7898 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="refundsOrExchange">
-		<navbar :title="titleList[titleIndex]" leftClick @leftClick="$utils.navigateBack" />
+		<navbar :title="titleList[titleIndex]" leftClick 
+		@leftClick="$utils.redirectTo('/pages/index/index')" />
 
 		<view class="frame">
 			
diff --git a/store/store.js b/store/store.js
index 8fbb912..8373092 100644
--- a/store/store.js
+++ b/store/store.js
@@ -94,23 +94,24 @@ const store = new Vuex.Store({
 					state.pic = res.result.pic
 					
 					// 如果什么身份都没有，就去注册
-					if(!state.shopData && !state.buy && 
-					![
-						'/pages_order/auth/selectionIdentity',
-						'/pages_order/auth/registerShop',
-					].includes(this.$route.path)){
-						uni.reLaunch({
-							url: '/pages_order/auth/selectionIdentity?back=no&'
-						})
-					}
+					// if(!state.shopData && !state.buy && 
+					// ![
+					// 	'/pages_order/auth/selectionIdentity',
+					// 	'/pages_order/auth/registerShop',
+					// ].includes(this.$route.path)){
+					// 	uni.reLaunch({
+					// 		url: '/pages_order/auth/selectionIdentity?back=no&'
+					// 	})
+					// }
 					
 					// 没有供应商身份
 					if(!state.shopData){
 						state.shop = false
 					// 没有采购商身份
-					}else if(!state.buy){
-						state.shop = true
 					}
+					// else if(!state.buy){
+					// 	state.shop = true
+					// }
 				}
 			})
 		},