Merge branch 'develop' into 'sit'

修改下拉页

See merge request K17_AITS/tra-app!147

src/pages.json

@@ -4,7 +4,6 @@
             "path": "pages/index/dialog",
             "style": {
                 "navigationBarTitleText": "AI问答",
-				"disableSwipeBack": true,
                 "app-plus": {
                     "titleNView": false,
                     "animationType": "fade-in"

src/pages/login/login.vue

@@ -144,7 +144,8 @@
 						const pages = getCurrentPages();
 						if (pages.length <= 1) {
 							// 页面栈小于等于1，里面还有本身的login，说明就只有login页
-							common.navigateTo('/pages/index/dialog', { animationType: 'slide-in-bottom' });
+							// common.navigateTo('/pages/index/dialog', { animationType: 'slide-in-bottom' });
+							common.redirectTo('/pages/index/dialog', { animationType: 'slide-in-bottom' });
 							return;
 						}
 						const prevPage = pages[pages.length - 2];

src/pagesOther.json

@@ -3,11 +3,11 @@
 		{
 			"path": "pages/index/dialog",
 			"style": {
-				"navigationBarTitleText": "AI问答",
-				"app-plus": {
-					"titleNView": false,
-					"animationType": "fade-in"
-				}
+			    "navigationBarTitleText": "AI问答",
+			    "app-plus": {
+			        "titleNView": false,
+			        "animationType": "fade-in"
+			    }
 			}
 		},
 		{