From f25483bbb738474d97860da7cad4e446736f5fdb Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 12 May 2025 15:48:02 +0800 Subject: [PATCH 01/19] =?UTF-8?q?Feat(AI):=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8C=B9=E9=85=8D=E7=9B=B8=E5=85=B3=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5f835afd8b309eebaf25da8cd8f478079f013dca) --- aiChat/components/bottomSend.vue | 8 +++ aiChat/mixins/chatMixins.js | 100 ++++++++++++++++++++++++++++- aiChat/views/history.vue | 101 +++++++++++++++++++++++++++++ aiChat/views/index.vue | 107 ++++++++++++++++++++++++++++++- api/chat/index.js | 10 +++ assets/css/aiChat.less | 107 +++++++++++++++++++++++++++++++ 6 files changed, 428 insertions(+), 5 deletions(-) diff --git a/aiChat/components/bottomSend.vue b/aiChat/components/bottomSend.vue index 0b1132e..f7d1af4 100644 --- a/aiChat/components/bottomSend.vue +++ b/aiChat/components/bottomSend.vue @@ -120,6 +120,14 @@ export default { webUrl: this.$VUE_APP_RESOURCES_URL, // 输入模式:input-键盘，sound-语音 inputModel: 'input', + /** + * 端午节送礼攻略 + * 丽江逛吃攻略 + * 云南非遗有哪些? + * 怎么申请地理标志保护产品? + * 想找个像《去有风的地方》那样的治愈县城 + * 云南有哪些小众县城适合旅居? + */ prompt: '', recordManager: null, // 录音权限是否开通 diff --git a/aiChat/mixins/chatMixins.js b/aiChat/mixins/chatMixins.js index 4303c94..7018ffe 100644 --- a/aiChat/mixins/chatMixins.js +++ b/aiChat/mixins/chatMixins.js @@ -1,7 +1,9 @@ import { getSseConfigV1, getCompletionsV2, - deleteChatItemByConversationId + deleteChatItemByConversationId, + getAnalyzeKeywordsV1, + getAnalyzeKeywordsChangeV1 } from '@/api/chat/index' import { VUE_APP_API_URL } from '@/config' import settings from '@/config/baseSetting.js' @@ -104,10 +106,21 @@ export const chatMixins = { copyContentHandle(data) { uni.setClipboardData({ data, - success: () => + success: () => { uni.showToast({ title: '已复制' }) + } + }) + }, + copyMoreInfoHandle(item) { + uni.setClipboardData({ + data: JSON.stringify(item.showMoreInfo), + success: () => { + uni.showToast({ + title: '已复制' + }) + } }) }, shareHandle() { @@ -181,7 +194,8 @@ export const chatMixins = { conversationId: '', prompt, listQuestion: [], - type: -2 + type: -2, + showMoreInfo: {} }) _this.loading = true _this.showCursor = false @@ -207,6 +221,32 @@ export const chatMixins = { _this.chatErrorSetContent() }) }) + getAnalyzeKeywordsV1({ + 'chatNumber': _this.chatNumber, + conversationId, + prompt + }).then(keywordRes => { + if (keywordRes.success) { + const keywordResData = keywordRes.data + const show = (keywordResData.searchArtworks || + keywordResData.searchDiscount || + keywordResData.searchGoods || + keywordResData.searchLandmark || + keywordResData.searchTowns || + keywordResData.searchTravelGuide + ) && (keywordResData.resultItems && keywordResData.resultItems.length > 0) + _this.chatMessageList[_this.chatMessageListLength - 1].showMoreInfo = keywordResData + _this.chatMessageList[_this.chatMessageListLength - 1].showMoreInfo.show = show + // 展示类型 + _this.chatMessageList[_this.chatMessageListLength - 1].showMoreInfo.showType = '' + if (show && keywordResData.resultItems) { + keywordResData.resultItems.map(resItem => { + _this.chatMessageList[_this.chatMessageListLength - 1].showMoreInfo.showType = resItem.type + }) + } + console.log(_this.chatMessageList[_this.chatMessageListLength - 1]) + } + }) } else { _this.chatErrorSetContent() } @@ -215,6 +255,60 @@ export const chatMixins = { _this.chatErrorSetContent() }) }, + analyzeKeywordsChangeHandle(conversationId, showMoreInfo) { + getAnalyzeKeywordsChangeV1({ + conversationId, + ...showMoreInfo + }).then(res => { + const { success, data } = res + if (success) { + let resultItems = [] + let idx = -1 + this.chatMessageList.map((item, index) => { + if (item.conversationId === conversationId) { + resultItems = data.resultItems || [] + idx = index + } + }) + if (idx > -1) { + this.$set(this.chatMessageList[idx].showMoreInfo, 'resultItems', resultItems) + this.$forceUpdate() + } + } + }) + }, + productItemClickHandle(item) { + this.$yrouter.push({ + path: '/pages/shop/GoodsCon/index', + query: { + id: item.id + } + }) + }, + hotelItemClickHandle(item) { + this.$yrouter.push({ + path: '/pagesInn/inn/innHome', + query: { + id: item.id + } + }) + }, + ichItemClickHandle(item) { + this.$yrouter.push({ + path: '/pkg_product/views/heritage/details', + query: { + id: item.id + } + }) + }, + qianxianItemClickHandle(item) { + this.$yrouter.push({ + path: '/pkg_product/views/famousQianxianShop', + query: { + id: item.id + } + }) + }, chatErrorSetContent() { this.chatMessageList[this.chatMessageListLength - 1].isError = true this.chatMessageList[this.chatMessageListLength - 1].content = this.errorMsg diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue index 34c4e39..fa775b2 100644 --- a/aiChat/views/history.vue +++ b/aiChat/views/history.vue @@ -100,6 +100,107 @@ + + + + + + + + {{ productItem.name }} + + + + ￥{{ productItem.price }} + + 立即查看 + + + + + + + + 手工体验 + + + + + {{ hotel.name }} + + + {{ hotel.description || '' }} + + + + + + + + + + {{ ich.name }} + + + {{ ich.description || '' }} + + + + + + + + + + {{ qianxian.name }} + + + + + + + + - - 遮罩层，用于监听实体键返回 + + 遮罩层，用于监听实体键返回 + 重新生成 + 拷贝 + + + + + + + + {{ productItem.name }} + + + + ￥{{ productItem.price }} + + 立即查看 + + + + + + + + 手工体验 + + + + + {{ hotel.name }} + + + {{ hotel.description || '' }} + + + + + + + + + + {{ ich.name }} + + + {{ ich.description || '' }} + + + + + + + + + + {{ qianxian.name }} + + + + + + + + Date: Wed, 14 May 2025 17:58:04 +0800 Subject: [PATCH 02/19] =?UTF-8?q?Fix=EF=BC=9A=E6=97=85=E5=B1=85=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/sojoumStore.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue index b4410d5..49bb744 100644 --- a/pkg_product/views/sojoumStore.vue +++ b/pkg_product/views/sojoumStore.vue @@ -368,7 +368,8 @@ export default { infoArray: [], videoPlayers: [], activeVideo: 'coverVideo', - showShare: false + showShare: false, + posterUrl: '' } }, onPageScroll(e) { From e9aae5e8aea324bec7ca4596f7f5873ac572aef3 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 15 May 2025 16:29:27 +0800 Subject: [PATCH 03/19] =?UTF-8?q?Feat(AI):=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8C=B9=E9=85=8D=E6=8A=BD=E5=A5=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/mixins/chatMixins.js | 3 +++ aiChat/views/history.vue | 16 +++++++++++++++- aiChat/views/index.vue | 16 +++++++++++++++- assets/css/aiChat.less | 10 ++++++++++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/aiChat/mixins/chatMixins.js b/aiChat/mixins/chatMixins.js index 7018ffe..a5f6d29 100644 --- a/aiChat/mixins/chatMixins.js +++ b/aiChat/mixins/chatMixins.js @@ -309,6 +309,9 @@ export const chatMixins = { } }) }, + prizeItemClickHandle() { + this.$yrouter.push({ path: '/pkg-video/views/lottery' }) + }, chatErrorSetContent() { this.chatMessageList[this.chatMessageListLength - 1].isError = true this.chatMessageList[this.chatMessageListLength - 1].content = this.errorMsg diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue index fa775b2..6c5b182 100644 --- a/aiChat/views/history.vue +++ b/aiChat/views/history.vue @@ -192,7 +192,21 @@ - + + + + + + - + + + + + + Date: Thu, 15 May 2025 17:12:23 +0800 Subject: [PATCH 04/19] =?UTF-8?q?Feat(AI):=E5=BA=97=E9=93=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=98=BE=E7=A4=BA=E5=BA=97=E9=93=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/history.vue | 2 +- aiChat/views/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue index 6c5b182..ab7ac7a 100644 --- a/aiChat/views/history.vue +++ b/aiChat/views/history.vue @@ -137,7 +137,7 @@ @click="hotelItemClickHandle(hotel)" > - 手工体验 + {{ item.hotelTypeName }} - 手工体验 + {{ item.hotelTypeName }} Date: Fri, 16 May 2025 14:23:42 +0800 Subject: [PATCH 05/19] =?UTF-8?q?Style(AI):=E6=8E=A8=E8=8D=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BA=A4=E4=BA=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/history.vue | 4 ++-- aiChat/views/index.vue | 6 +++--- pages.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue index ab7ac7a..ec5a13a 100644 --- a/aiChat/views/history.vue +++ b/aiChat/views/history.vue @@ -102,7 +102,7 @@ @@ -137,7 +137,7 @@ @click="hotelItemClickHandle(hotel)" > - {{ item.hotelTypeName }} + {{ hotel.hotelTypeName }} @@ -207,7 +207,7 @@ @click="hotelItemClickHandle(hotel)" > - {{ item.hotelTypeName }} + {{ hotel.hotelTypeName }} Date: Wed, 21 May 2025 15:39:23 +0800 Subject: [PATCH 06/19] =?UTF-8?q?Feat(AI):=E5=A4=A9=E6=B0=94=E5=92=8C?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/index.vue | 80 +++++++++++++++++++++++- api/chat/index.js | 8 +++ assets/css/aiChat.less | 109 +++++++++++++++++++++++++++++++++ components/aiChat/entrance.vue | 8 ++- pages/home/index.vue | 4 +- 5 files changed, 206 insertions(+), 3 deletions(-) diff --git a/aiChat/views/index.vue b/aiChat/views/index.vue index e64871b..dac4d84 100644 --- a/aiChat/views/index.vue +++ b/aiChat/views/index.vue @@ -49,6 +49,57 @@ + + + + + + + {{ weatherData.tem }} + ℃ + + + + + + {{ weatherData.city }} + + + {{ weatherData.wea }}  {{ weatherData.tem2 }}℃~{{ weatherData.tem1 }}℃ + + + 今日风向：{{ weatherData.win }} + + + + 农历{{ holidayData.lunarCalendar }} + {{ holidayData.date.substr(5).replace('-', '/') }} {{ weekDayArr[holidayData.weekDay] }} + + {{ holidayData.yearTips }}年/{{ holidayData.chineseZodiac }} + + 宜 + + {{ holidayData.suit }} + + + + 忌 + + {{ holidayData.avoid }} + + + + { + const { success, data } = res + if (success) { + this.weatherData = data + } + }) + } + getHolidayData().then(res => { + const { success, data } = res + if (success) { + this.holidayData = data + } + }) }) }, // 创建新会话 @@ -489,7 +567,7 @@ export default { display: flex; align-items: center; justify-content: space-between; - padding: 60rpx 40rpx; + padding: 0 40rpx; .guide-left { .avatar { display: block; diff --git a/api/chat/index.js b/api/chat/index.js index 5efb367..e8fc49b 100644 --- a/api/chat/index.js +++ b/api/chat/index.js @@ -37,3 +37,11 @@ export function historyChatMessage(params) { export function deleteChatListByType(type) { return request.delete('/v1/chat/type/' + type, {}, { login: true }) } + +export function getWeatherData(params) { + return request.get('/v1/chat/weatherData', params, { login: true }) +} + +export function getHolidayData(params) { + return request.get('/v1/chat/holidayData', params, { login: true }) +} diff --git a/assets/css/aiChat.less b/assets/css/aiChat.less index 750d94e..aaa8a78 100644 --- a/assets/css/aiChat.less +++ b/assets/css/aiChat.less @@ -1036,4 +1036,113 @@ page { height: 38rpx; } } +} +.weather-holiday-wrap { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 24rpx 48rpx 24rpx; + .data-wrap { + width: calc(50% - 12rpx); + height: 288rpx; + padding: 20rpx; + border-radius: 20rpx; + box-sizing: border-box; + background-color: #fff; + box-shadow: 0rpx 0rpx 20rpx rgba(0,0,0,0.16); + } + .weather-data { + .title { + display: flex; + align-items: center; + color: #3D4CF1; + .icon { + display: block; + width: 100rpx; + height: 100rpx; + margin: 0 12rpx 0 0; + } + .tem-wrap { + display: flex; + align-items: baseline; + } + .tem { + font-size: 70rpx; + line-height: 70rpx; + font-weight: bold; + } + .unit { + font-size: 36rpx; + line-height: 36rpx; + } + } + .loca { + display: flex; + padding: 24rpx 0; + font-size: 26rpx; + line-height: 36rpx; + color: #333; + .addr { + display: flex; + align-items: center; + .icon { + display: block; + width: 24rpx; + height: 24rpx; + margin: 0 4rpx 0 0; + } + } + .tem-range { + padding: 0 0 0 24rpx; + } + } + .content { + color: #3D4CF1; + font-size: 26rpx; + line-height: 36rpx; + } + } + .holiday-data { + .title { + display: flex; + font-size: 24rpx; + color: #333; + line-height: 36rpx; + .day { + margin: 0 8rpx 0 0; + color: #3D4CF1; + font-size: 28rpx; + } + } + .desc { + font-size: 24rpx; + color: #333; + line-height: 36rpx; + } + .tip { + display: flex; + flex-wrap: wrap; + padding: 20rpx 0 0 0; + .label { + display: block; + width: 32rpx; + height: 32rpx; + margin: 0 12rpx 0 0; + border-radius: 8rpx; + text-align: center; + line-height: 32rpx; + font-size: 24rpx; + color: #fff; + background-color: #3D4CF1; + } + .label2 { + background-color: #C52733; + } + .content { + width: calc(100% - 44rpx); + margin: -6rpx 0 0 0; + font-size: 24rpx; + } + } + } } \ No newline at end of file diff --git a/components/aiChat/entrance.vue b/components/aiChat/entrance.vue index 06b82fe..ccbb31d 100644 --- a/components/aiChat/entrance.vue +++ b/components/aiChat/entrance.vue @@ -15,6 +15,12 @@ import { } from '@/api/public' export default { name: 'AiEntrance', + props: { + cityName: { + type: String, + default: '' + } + }, data() { return { showImg: false, @@ -36,7 +42,7 @@ export default { }, enterAiChat() { uni.navigateTo({ - url: '/aiChat/views/index?click=1' + url: '/aiChat/views/index?click=1&cityName=' + this.cityName }) } } diff --git a/pages/home/index.vue b/pages/home/index.vue index e1a15a2..d86130f 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -353,7 +353,9 @@ paddingBottom="200rpx" /> - + From 982fe87cc1a287fb67ce9567ef89714f0a087b53 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 22 May 2025 10:23:49 +0800 Subject: [PATCH 07/19] =?UTF-8?q?Feat(AI):=E5=A4=A9=E6=B0=94=E5=92=8C?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/index.vue | 117 ++++++++++++++++++++++++++--------------- assets/css/aiChat.less | 29 ++++++++-- 2 files changed, 100 insertions(+), 46 deletions(-) diff --git a/aiChat/views/index.vue b/aiChat/views/index.vue index dac4d84..a18dc8c 100644 --- a/aiChat/views/index.vue +++ b/aiChat/views/index.vue @@ -51,38 +51,53 @@ - - - - - {{ weatherData.tem }} - ℃ + + + + + + + {{ weatherData.tem }} + ℃ + + + + + + {{ weatherData.city }} + + + {{ weatherData.wea }}  {{ weatherData.tem2 }}℃~{{ weatherData.tem1 }}℃ + + + 今日风向：{{ weatherData.win }} - - - + - {{ weatherData.city }} + 无法获取天气信息 - - {{ weatherData.wea }}  {{ weatherData.tem2 }}℃~{{ weatherData.tem1 }}℃ - - - 今日风向：{{ weatherData.win }} + + + 加载中... + - + - 农历{{ holidayData.lunarCalendar }} + {{ holidayData.lunarCalendar }} {{ holidayData.date.substr(5).replace('-', '/') }} {{ weekDayArr[holidayData.weekDay] }} {{ holidayData.yearTips }}年/{{ holidayData.chineseZodiac }} @@ -363,7 +378,11 @@ - + { - const { success, data } = res - if (success) { - this.topicList = data || [] - } - }) - if (this.cityName) { - getWeatherData({ - cityName: '桂林' - }).then(res => { - const { success, data } = res - if (success) { - this.weatherData = data - } - }) + this.loadData() + }) + }, + loadData() { + getAiSystemInfoTopic().then(res => { + const { success, data } = res + if (success) { + this.topicList = data || [] } - getHolidayData().then(res => { + }) + if (this.cityName) { + this.weatherDataLoading = true + getWeatherData({ + cityName: this.cityName + }).then(res => { const { success, data } = res if (success) { - this.holidayData = data + this.weatherData = data } + this.weatherIsLoad = true + this.weatherDataLoading = false + }).catch(() => { + this.weatherDataLoading = false + this.weatherIsLoad = false }) + } + getHolidayData().then(res => { + const { success, data } = res + if (success) { + this.holidayData = data + } }) }, // 创建新会话 @@ -499,6 +529,7 @@ export default { this.loading = false this.getConfigLoading = false this.chatMessageList = [] + this.loadData() }, clickBackHandle() { if (!this.chatNumber) { diff --git a/assets/css/aiChat.less b/assets/css/aiChat.less index aaa8a78..735bd23 100644 --- a/assets/css/aiChat.less +++ b/assets/css/aiChat.less @@ -1039,12 +1039,12 @@ page { } .weather-holiday-wrap { display: flex; - align-items: center; + align-items: stretch; justify-content: space-between; + gap: 12px; padding: 0 24rpx 48rpx 24rpx; .data-wrap { - width: calc(50% - 12rpx); - height: 288rpx; + flex: 1; padding: 20rpx; border-radius: 20rpx; box-sizing: border-box; @@ -1101,6 +1101,29 @@ page { font-size: 26rpx; line-height: 36rpx; } + .txt-loading { + display: flex; + align-items: center; + justify-content: center; + font-size: 28rpx; + min-height: 200rpx; + } + .no-weather { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100%; + font-size: 26rpx; + color: #999; + line-height: 38rpx; + .img { + display: block; + width: 226rpx; + height: 130rpx; + margin: 0 0 12rpx 0; + } + } } .holiday-data { .title { From f0a187f2b1bc0263c0b180c5d3ce0731794bc060 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Thu, 22 May 2025 11:06:45 +0800 Subject: [PATCH 08/19] =?UTF-8?q?Feat(AI):=E5=A4=A9=E6=B0=94=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/index.vue | 1 + assets/css/aiChat.less | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/aiChat/views/index.vue b/aiChat/views/index.vue index a18dc8c..4e69c04 100644 --- a/aiChat/views/index.vue +++ b/aiChat/views/index.vue @@ -81,6 +81,7 @@ 今日风向：{{ weatherData.win }} + 紫外线指数：{{ weatherData.uvIndex }}  {{ weatherData.uvDescription }} Date: Thu, 22 May 2025 16:21:17 +0800 Subject: [PATCH 09/19] =?UTF-8?q?Fix(AI):[#3812]=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=AF=B9=E8=AF=9D=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aiChat/views/history.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aiChat/views/history.vue b/aiChat/views/history.vue index ec5a13a..4963bf6 100644 --- a/aiChat/views/history.vue +++ b/aiChat/views/history.vue @@ -337,7 +337,8 @@ export default { conversationId: item.messageId, showCursor: false, listQuestion: item.listQuestion || [], - type: -2 + type: -2, + showMoreInfo: {} }) } } From 6e4a2178730e69089566d3f2dbdc344cb137b0ae Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Sun, 25 May 2025 20:03:02 +0800 Subject: [PATCH 10/19] READMIE --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7e8a3a4..a0fd4bf 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,9 @@ #### 安装教程 + + + 1. xxxx 2. xxxx 3. xxxx From 53457ba83c8039ed6a8a2c02583798042f3da663 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Mon, 2 Jun 2025 10:02:45 +0800 Subject: [PATCH 11/19] =?UTF-8?q?Fix=EF=BC=9A3615=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=8D=E6=9D=A1=E6=90=9C=E7=B4=A2=E5=90=8E?= =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=9C=A8=E6=9C=80=E5=89=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodSearch/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue index b6e73d4..36eaf7c 100644 --- a/pages/shop/GoodSearch/index.vue +++ b/pages/shop/GoodSearch/index.vue @@ -252,7 +252,8 @@ export default { setHistory(word) { const index = this.historyKey.findIndex(item => item.word === word) if (index > -1) { - return + this.historyKey.splice(index, 1) + // return } this.historyKey.unshift({id: this.$global.generateMixed(10), word }) uni.setStorageSync('historyKey', JSON.stringify(this.historyKey)) From 2ebd257a491313cb5984f8355db7be376766388f Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Mon, 2 Jun 2025 10:08:27 +0800 Subject: [PATCH 12/19] =?UTF-8?q?Fix=EF=BC=9A3569=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E7=A4=BC=E5=93=81=E5=8D=A1=E5=88=97=E8=A1=A8=E4=B8=8B?= =?UTF-8?q?=E6=96=B9=E5=87=BA=E7=8E=B0=E9=81=AE=E6=8C=A1=EF=BC=8C=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=8F=B7=EF=BC=9A=E7=BA=A2=E7=B1=B3K40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 1 + pages/order/OrderDetails/index.vue | 2 +- pages/order/OrderSubmission/index.vue | 1 + pkg_user/views/gift/gift.vue | 1 + pkg_user/views/giftList.vue | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index fe861e7..e895d0d 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -178,6 +178,7 @@ - diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index a0c8fbe..b42961c 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -288,6 +288,7 @@ @redirect="addressRedirect" /> From ea5efb50c4a898973e0d4daec0072785c1601784 Mon Sep 17 00:00:00 2001 From: LinCyJang Date: Mon, 2 Jun 2025 11:13:35 +0800 Subject: [PATCH 13/19] =?UTF-8?q?Fix=EF=BC=9A3762=20=E3=80=90=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E9=87=8C=E9=9D=A2=E7=9A=84=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=AD=A3=E6=96=B9?= =?UTF-8?q?=E5=BD=A2=E7=9F=A9=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/UserEvaluation.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/UserEvaluation.vue b/components/UserEvaluation.vue index 1c1b8fb..41d5704 100644 --- a/components/UserEvaluation.vue +++ b/components/UserEvaluation.vue @@ -31,7 +31,7 @@ @@ -106,6 +106,7 @@ export default { };