From 400318c5740d8f37e7ee8620e77ae3bd4321bde3 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 23 Mar 2023 18:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9C=A8ios?=
 =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=BD=95=E5=BC=B9=E6=A1=86=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E8=A2=AB=E9=81=AE=E6=8C=A1=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=B3=A8=E5=86=8C=E6=97=B6?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0openid?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/auth.js                         |  2 +-
 common/js/util.js                         |  2 +-
 components/diy-components/diy-article.vue |  2 +-
 components/ns-login/ns-login.vue          | 29 +++++++++++++++++------
 pages_tool/article/detail.vue             |  6 ++---
 pages_tool/article/list.vue               |  4 ++--
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/common/js/auth.js b/common/js/auth.js
index d17513a..62855d5 100644
--- a/common/js/auth.js
+++ b/common/js/auth.js
@@ -37,7 +37,7 @@ export default {
 				},
 				fail: () => {
 					this.$util.showToast({
-						title: '请求失败'
+						title: '登录请求失败'
 					});
 				}
 			})
diff --git a/common/js/util.js b/common/js/util.js
index 80a28e6..dcc49a1 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -16,7 +16,7 @@ export default {
 	redirectTo(to, param, mode) {
 		let url = to;
 		let tabbarList = ['/pages/index/index', '/pages/goods/category', '/pages/goods/cart',
-			'/pages/member/index','/pages_tool/article/list'
+			'/pages/member/index','/pages_rush/article/list'
 		]
 		if (param != undefined) {
 			Object.keys(param).forEach(function(key) {
diff --git a/components/diy-components/diy-article.vue b/components/diy-components/diy-article.vue
index 547e3f4..a6ad6d5 100644
--- a/components/diy-components/diy-article.vue
+++ b/components/diy-components/diy-article.vue
@@ -90,7 +90,7 @@ export default {
 			});
 		},
 		toDetail(item) {
-			this.$util.redirectTo('/pages_tool/article/detail', {
+			this.$util.redirectTo('/pages_rush/article/detail', {
 				article_id: item.article_id
 			});
 		},
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index ccb2256..c6608a1 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -65,7 +65,7 @@
                 <view class="head">
                   <!--承诺书相关操作-->
                   <view class="promise-block">
-                    <textarea v-model="promise_text" class="promise-textarea" placeholder-style="color: #e04242" placeholder="请输入以下承诺内容！" auto-height focus/>
+                    <textarea v-model="promise_text" class="promise-textarea" placeholder-style="color: #e04242" placeholder="请输入以下承诺内容！" auto-height/>
                     <view class="promise-content">
                       <view class="promise-text">
                         <span class="promise-text-title">承诺内容：</span>
@@ -608,7 +608,11 @@ export default {
       //let url = type === 'authLogin' ? '/api/login/auth' : '/api/login/authonlylogin';
       let url = '/api/login/auth';
       // 获取登录接口
-      if(this.registerConfig.promise){
+      console.log(data);
+      console.log(this.registerConfig);
+      console.log(this.promise_text);
+
+      if(this.registerConfig.promise.length > 0){
         data.promise_text = this.promise_text;
         data.is_promise = 1;
         data.request_type = this.request_type;
@@ -693,11 +697,20 @@ export default {
 				return;
 			}
       let authData = uni.getStorageSync('authInfo');
-      if (authData) Object.assign(authData, {nickName: this.nickName, avatarUrl: this.headImg});
-			uni.setStorageSync('authInfo', authData);
-			
-			if (this.forceBindingMobileControl) this.bindMobile();
-			else this.authLogin(authData);
+      if (authData) {
+        Object.assign(authData, {nickName: this.nickName, avatarUrl: this.headImg});
+        uni.setStorageSync('authInfo', authData);
+        if (this.forceBindingMobileControl) this.bindMobile();
+        else this.authLogin(authData);
+      } else {
+        this.getCode((authData) => {
+          Object.assign(authData, {nickName: this.nickName, avatarUrl: this.headImg});
+          uni.setStorageSync('authInfo', authData);
+          if (this.forceBindingMobileControl) this.bindMobile();
+          else this.authLogin(authData);
+        })
+      }
+
 		},
     // 承诺书 登录
     promiseLogin(){
@@ -709,6 +722,8 @@ export default {
     // 弹框状态改变
     popupChange(e){
       this.popup_show = e.show;
+      if(e.show) this.$store.commit('setBottomNavHidden', true); //隐藏底部导航
+      else this.$store.commit('setBottomNavHidden', false); //显示底部导航
     },
     // 承诺书 注册 - 显示弹框
     promiseRegisterShow(){
diff --git a/pages_tool/article/detail.vue b/pages_tool/article/detail.vue
index a54de77..f965fa8 100644
--- a/pages_tool/article/detail.vue
+++ b/pages_tool/article/detail.vue
@@ -56,7 +56,7 @@ export default {
 							title: res.message
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages_tool/article/list', {}, 'redirectTo');
+							this.$util.redirectTo('/pages_rush/article/list', {}, 'redirectTo');
 						}, 2000);
 					}
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@@ -69,7 +69,7 @@ export default {
 	},
 	onShareAppMessage(res) {
 		var title = this.detail.article_title;
-		var path = '/pages_tool/article/detail?article_id=' + this.articleId;
+		var path = '/pages_rush/article/detail?article_id=' + this.articleId;
 		return {
 			title: title,
 			path: path,
@@ -80,7 +80,7 @@ export default {
 	//分享到朋友圈
 	onShareTimeline() {
 		var title = this.detail.article_title;
-		var query = '/pages_tool/article/detail?article_id=' + this.articleId;
+		var query = '/pages_rush/article/detail?article_id=' + this.articleId;
 		return {
 			title: title,
 			query: query,
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index 8eececa..6e646b6 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -80,7 +80,7 @@ export default {
 	},
 	onShareAppMessage(res) {
 		var title = '文章列表';
-		var path = '/pages_tool/article/list';
+		var path = '/pages_rush/article/list';
 		return {
 			title: title,
 			path: path,
@@ -91,7 +91,7 @@ export default {
 	//分享到朋友圈
 	onShareTimeline() {
 		var title = '文章列表';
-		var query = '/pages_tool/article/list';
+		var query = '/pages_rush/article/list';
 		return {
 			title: title,
 			query: query,