From e9ba76e46aed991090a30c70913e6a59bbb14777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Fri, 9 Apr 2021 18:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=84=E5=86=8D?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |  8 ++++----
 pages/grid/grid.vue                          |  2 +-
 pages/list/detail.vue                        |  6 ++++++
 pages/list/news-list.vue                     |  2 +-
 pages/{ => list}/search/search.nvue          |  2 +-
 pages/{ => ucenter}/about/about.vue          |  0
 pages/ucenter/{ => help}/help.vue            |  0
 pages/{ => ucenter}/settings/dc-push/push.js |  0
 pages/{ => ucenter}/settings/settings.vue    |  4 ++--
 pages/ucenter/ucenter.vue                    | 12 ++++++------
 10 files changed, 21 insertions(+), 15 deletions(-)
 rename pages/{ => list}/search/search.nvue (99%)
 rename pages/{ => ucenter}/about/about.vue (100%)
 rename pages/ucenter/{ => help}/help.vue (100%)
 rename pages/{ => ucenter}/settings/dc-push/push.js (100%)
 rename pages/{ => ucenter}/settings/settings.vue (96%)

diff --git a/pages.json b/pages.json
index 6afe178..dc3cc92 100644
--- a/pages.json
+++ b/pages.json
@@ -37,7 +37,7 @@
 			// "navigationBarTitleText": "",
 			// "navigationBarBackgroundColor": "#FFFFFF",
 		}, {
-			"path": "pages/search/search",
+			"path": "pages/list/search/search",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -72,7 +72,7 @@
 				"navigationBarTitleText": "问题反馈"
 			}
 		}, {
-			"path": "pages/about/about",
+			"path": "pages/ucenter/about/about",
 			"style": {
 				"navigationBarTitleText": "关于"
 			}
@@ -111,7 +111,7 @@
 				}
 			}
 		}, {
-			"path": "pages/settings/settings",
+			"path": "pages/ucenter/settings/settings",
 			"style": {
 				"navigationBarTitleText": "设置"
 			}
@@ -173,7 +173,7 @@
 			}
 
 		}, {
-			"path": "pages/ucenter/help",
+			"path": "pages/ucenter/help/help",
 			"style": {
 				"navigationBarTitleText": "帮助",
 				"enablePullDownRefresh": false
diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue
index 46fbcd3..035042f 100644
--- a/pages/grid/grid.vue
+++ b/pages/grid/grid.vue
@@ -137,7 +137,7 @@
 			searchClick() {
 				uni.hideKeyboard();
 				uni.navigateTo({
-					url: '/pages/search/search',
+					url: '/pages/list/search/search',
 					animationType: 'fade-in'
 				});
 			},
diff --git a/pages/list/detail.vue b/pages/list/detail.vue
index 2a0a761..28b4e5e 100644
--- a/pages/list/detail.vue
+++ b/pages/list/detail.vue
@@ -218,6 +218,12 @@
 	.uni-note {
 		color: #999;
 		font-size: 12px;
+		
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
 	}
 
 	.footer {
diff --git a/pages/list/news-list.vue b/pages/list/news-list.vue
index 96dbcdb..c359c14 100644
--- a/pages/list/news-list.vue
+++ b/pages/list/news-list.vue
@@ -142,7 +142,7 @@
 				
 				if(this.canSearch){
 					uni.navigateTo({
-						url: '/pages/search/search',
+						url: '/pages/list/search/search',
 						animationType: 'fade-in'
 					});
 				}else {
diff --git a/pages/search/search.nvue b/pages/list/search/search.nvue
similarity index 99%
rename from pages/search/search.nvue
rename to pages/list/search/search.nvue
index a80d350..f65b472 100644
--- a/pages/search/search.nvue
+++ b/pages/list/search/search.nvue
@@ -295,7 +295,7 @@
 			loadList(text = '') {
 				getApp().globalData.searchText = text;
 				uni.navigateTo({
-					url:'../list/news-list'
+					url:'/pages/list/news-list'
 				})
 			},
 			backPage(){
diff --git a/pages/about/about.vue b/pages/ucenter/about/about.vue
similarity index 100%
rename from pages/about/about.vue
rename to pages/ucenter/about/about.vue
diff --git a/pages/ucenter/help.vue b/pages/ucenter/help/help.vue
similarity index 100%
rename from pages/ucenter/help.vue
rename to pages/ucenter/help/help.vue
diff --git a/pages/settings/dc-push/push.js b/pages/ucenter/settings/dc-push/push.js
similarity index 100%
rename from pages/settings/dc-push/push.js
rename to pages/ucenter/settings/dc-push/push.js
diff --git a/pages/settings/settings.vue b/pages/ucenter/settings/settings.vue
similarity index 96%
rename from pages/settings/settings.vue
rename to pages/ucenter/settings/settings.vue
index c741a7e..6541a66 100644
--- a/pages/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -25,7 +25,7 @@
 			return {
 				agreeList: [{
 						title: '个人资料',
-						to: ''
+						to: '../edit/edit'
 					},
 					{
 						title: '修改密码',
@@ -67,7 +67,7 @@
 				logout: 'user/logout'
 			}),
 			changePwd(){
-				if(this.userInfo.phone){
+				if(this.userInfo && this.userInfo.phone){
 					uni.navigateTo({
 						url:'/uni_modules/uni-login-page/pages/index/pwd-retrieve?phoneNumber='+ this.userInfo.phone +'&phoneArea=+86'
 					});
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 0100c62..7bc2520 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -59,17 +59,17 @@
 				ucenterList: [
 					[{
 						title: '阅读过的文章',
-						to: '/pages/agree-list/agree-list'
+						to: '/pages/ucenter/agree-list/agree-list'
 					}, {
 						title: '我的积分',
-						to: '/pages/agree-list/agree-list'
+						to: '/pages/ucenter/agree-list/agree-list'
 					}],
 					[{
 							title: '政策与协议',
-							to: '/pages/agree-list/agree-list'
+							to: '/pages/ucenter/agree-list/agree-list'
 						}, {
 							title: '关于',
-							to: '/pages/about/about'
+							to: '/pages/ucenter/about/about'
 						},
 						//#ifdef APP-PLUS
 						{
@@ -81,10 +81,10 @@
 					],
 					[{
 						title: '反馈',
-						to: '/pages/uni-feedback/uni-feedback'
+						to: '/pages/ucenter/uni-feedback/uni-feedback'
 					}, {
 						title: '设置',
-						to: '/pages/settings/settings'
+						to: '/pages/ucenter/settings/settings'
 					}]
 				]
 			}
-- 
GitLab