Merge branch 'dev' into test

aiChat/components/historyList.vue

@@ -160,7 +160,7 @@ export default {
       })
     },
     historyItemClick(item) {
-      const paramsStr = `?chatNumber=${item.chatNumber}&title=${item.title}`
+      const paramsStr = `?chatNumber=${item.chatNumber}&title=${item.title}&click=1`
       if (!this.formModule) {
         uni.navigateTo({
           url: '/aiChat/views/history' + paramsStr

aiChat/mixins/chatMixins.js

@@ -68,7 +68,11 @@ export const chatMixins = {
       }
     }.bind(this)).exec()
   },
-	onLoad() {
+	onLoad(options) {
+    if (!options.click) {
+      uni.switchTab({ url: '/pages/home/index' })
+      return
+    }
 		// 监听键盘高度变化
     wx.onKeyboardHeightChange((res) => {
 			console.log('监听键盘高度变化%s', res.height)

aiChat/views/history.vue

@@ -183,10 +183,13 @@ export default {
       pageTitle: ''
     }
   },
-  onLoad(optisons) {
+  onLoad(options) {
-    console.log(optisons)
+    if (!options.click) {
-    this.chatNumber = optisons.chatNumber
+      uni.switchTab({ url: '/pages/home/index' })
-    this.pageTitle = optisons.title
+      return
+    }
+    this.chatNumber = options.chatNumber
+    this.pageTitle = options.title
     this.pageTitle = this.pageTitle.length > 8 ? (this.pageTitle.substring(0, 8) + '...') : this.pageTitle
     this.init()
   },

components/aiChat/entrance.vue

@@ -36,7 +36,7 @@ export default {
     },
     enterAiChat() {
       uni.navigateTo({
-        url: '/aiChat/views/index'
+        url: '/aiChat/views/index?click=1'
       })
     }
   }