From 0297094c68fa7b396bef010c7c32e9aaa1164f49 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 29 Aug 2024 13:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                  |  2 +-
 pages/YNEduApp/index/index.vue |  2 +-
 pages/gzt/index.vue            | 31 +++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index d41895b..9f867ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "versionCode" : 104,
     "transformPx" : false,
     "app-plus" : {
-        "popGesture": "none",
+        "popGesture" : "none",
         "useragent" : {
             "value" : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app",
             "concatenate" : true //true则为在默认基础上追加 false则为替换默认
diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue
index 6e1af8d..b60ecde 100644
--- a/pages/YNEduApp/index/index.vue
+++ b/pages/YNEduApp/index/index.vue
@@ -2,7 +2,7 @@
   <view class="page">
     <u-navbar title="首页" placeholder @leftClick="leftClick" />
     <view class="search">
-      <uni-icons type="scan" size="24" style="margin-right: 2vw; color: #bababa" @click="toggleScan"></uni-icons>
+      <!-- <uni-icons type="scan" size="24" style="margin-right: 2vw; color: #bababa" @click="toggleScan"></uni-icons> -->
       <uni-easyinput
         suffixIcon="search"
         v-model="keyword"
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 484a8a3..d5ab176 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -208,19 +208,30 @@
 							console.log(res)
 							let req = res.data
 							console.log('🚀 ~ getUserInfo ~ req:', req)
-							uni.setStorageSync('access_token', req.data.access_token)
-							uni.setStorageSync('userId', req.data.loginUser.userId)
-							uni.setStorageSync('userName', req.data.loginUser.userName)
-							uni.setStorageSync('className', req.data.loginUser.sysUser.className)
-							uni.setStorageSync('facePath', req.data.loginUser.sysUser.facePath)
-							setTimeout(() => {
-								uni.reLaunch({
-									url: '/pages/YNEduApp/index/index'
+							if (req.code == 200) {
+								uni.setStorageSync('access_token', req.data.access_token)
+								uni.setStorageSync('userId', req.data.loginUser.userId)
+								uni.setStorageSync('userName', req.data.loginUser.userName)
+								uni.setStorageSync('className', req.data.loginUser.sysUser.className)
+								uni.setStorageSync('facePath', req.data.loginUser.sysUser.facePath)
+								setTimeout(() => {
+									uni.reLaunch({
+										url: '/pages/YNEduApp/index/index'
+									})
+								}, 500)
+							} else {
+								uni.showToast({
+									title: req.msg,
+									icon: 'none'
 								})
-							}, 500)
+							}
 						},
 						fail: err => {
-							console.log(err)
+							console.log('🚀 ~ gotoYy ~ err:', err)
+							uni.showToast({
+								title: err.msg,
+								icon: 'none'
+							})
 						}
 					})
 					// uni.reLaunch({