From fe15b01480498209de6b5a48983ee68ac5ae5b21 Mon Sep 17 00:00:00 2001 From: yma16 <17685043634@163.com> Date: Wed, 3 Apr 2024 23:51:56 +0800 Subject: [PATCH] fix: aibot --- miniprogram/app.js | 12 +++++++++++- miniprogram/pages/aiBot/aiBot.js | 29 +++++++++++++++++++++++------ miniprogram/pages/aiBot/aiBot.wxml | 2 +- miniprogram/pages/index/index.js | 4 ++++ miniprogram/pages/index/index.wxml | 8 +++----- miniprogram/pages/index/index.wxss | 4 ++-- 6 files changed, 44 insertions(+), 15 deletions(-) diff --git a/miniprogram/app.js b/miniprogram/app.js index a1ac211..7332149 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -4,6 +4,10 @@ App({ homePageArticleId: 32, lifePageArricleId: 35, wxProgramConfig: { + "aiBotConfig":{ + "saveKey":"aiBot", + "searchOpenAiText":"画一只猫", + }, authorPageConfig: { cloudEmail: "1575057249@qq.com", cloudPwd: "U2FsdGVkX1+jfEkF2OXTQ5iIG4mrYc5/TLOiIntyENU=", @@ -12,12 +16,16 @@ App({ loginTitle: '点击授权', detailInfo: '关于：code笔记', nextPage: "/pages/home/home", + basePage: "/pages/home/home", userPrefix: '昵称:', userName: '月牙天冲', designPlaceholder: '自定义名称', joinTitle: '微信登录', shopBtnTitle: '虚拟资产', - isOldVersion: false + isOldVersion: false, + "isShowBottom": true, + "isShowBot":true, + "isShowShop":true, }, homePageConfig: { headBackground: [ @@ -171,6 +179,8 @@ App({ }) if (res.data.data && res.data.data[0].option) { that.wxProgramConfig = JSON.parse(res.data.data[0].option) + console.log('that.wxProgramConfig',that.wxProgramConfig) + that.basePage=that.wxProgramConfig.authorPageConfig.basePage||that.basePage wx.navigateTo({ url: that.basePage, success: function (res) { diff --git a/miniprogram/pages/aiBot/aiBot.js b/miniprogram/pages/aiBot/aiBot.js index ad596d8..442dab4 100644 --- a/miniprogram/pages/aiBot/aiBot.js +++ b/miniprogram/pages/aiBot/aiBot.js @@ -13,8 +13,8 @@ Page({ }, saveKey: 'aiBot', baseCloudUrl: app.remoteConfig.baseCloudUrl, - password: app.remoteConfig.cloudPwd || "U2FsdGVkX1+jfEkF2OXTQ5iIG4mrYc5/TLOiIntyENU=", - username: app.remoteConfig.cloudEmail || "1575057249@qq.com", + password: "U2FsdGVkX1+jfEkF2OXTQ5iIG4mrYc5/TLOiIntyENU=", + username: "1575057249@qq.com", token: '', currenTime: '', isLoading: false, @@ -44,7 +44,7 @@ Page({ pasteText: '粘贴', upText: "↑", downText: "↓", - errorMsg: 'openai的服务器异常！', + errorMsg: 'bot ai服务器异常！', emptyText: '欢迎使用aibot', storageKey: 'openAiOptionsConfig', permissionTitle: '很抱歉您没有权限！', @@ -112,6 +112,13 @@ Page({ search(e) { this.scrollToBottom() + if(this.data.isLoading){ + wx.showModal({ + cancelColor: 'cancelColor', + title: '正在响应中，请稍等...' + }) + return + } if (!this.data.searchOpenAiText) { wx.showModal({ cancelColor: 'cancelColor', @@ -143,8 +150,8 @@ Page({ const data = res.data.data const option = that.data.chatObjConfig.option console.log('data', data) - const choices = data.messages[2] - const answer = choices?.content + const choices = data.messages?.[2] + const answer = choices?.content || that.data.layoutConfig.errorMsg option.push({ question: that.data.searchOpenAiText, answer: answer, @@ -181,6 +188,16 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { + const aiBotConfig = app.wxProgramConfig.aiBotConfig + console.log('aiBotConfig', aiBotConfig) + this.setData({ + saveKey: aiBotConfig.saveKey, + searchOpenAiText: aiBotConfig.searchOpenAiText, + password: aiBotConfig.cloudPwd || "U2FsdGVkX1+jfEkF2OXTQ5iIG4mrYc5/TLOiIntyENU=", + username: aiBotConfig.cloudEmail || "1575057249@qq.com", + }) + + this.getUserToken() this.setData({ currenTime: this.getCurrentTime() @@ -233,7 +250,7 @@ Page({ // 缓存 if (this.data.openAiOptionsConfig) { - wx.setStorageSync(this.data.saveKey, this.data.openAiOptionsConfig) + wx.setStorageSync(app.wxProgramConfig.aiBotConfig.saveKey, this.data.openAiOptionsConfig) } }, diff --git a/miniprogram/pages/aiBot/aiBot.wxml b/miniprogram/pages/aiBot/aiBot.wxml index 7341065..fb4d5ba 100644 --- a/miniprogram/pages/aiBot/aiBot.wxml +++ b/miniprogram/pages/aiBot/aiBot.wxml @@ -77,7 +77,7 @@