From 973c8dddd0d14b4da27d005823666ceb516209fc Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Sat, 20 Dec 2025 16:52:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(index):=20=E4=BF=AE=E5=A4=8D=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=9C=A8=E5=B7=B2=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 7 +++++- common/js/config.js | 26 ++++++++++++++++++---- common/js/event-bus.js | 15 ++++++++++++- components/diy-components/diy-category.vue | 2 +- components/diy-components/minx.js | 2 +- main.js | 3 +++ pages/index/public/js/index.js | 2 +- 7 files changed, 48 insertions(+), 9 deletions(-) diff --git a/App.vue b/App.vue index 061c99f..400915e 100644 --- a/App.vue +++ b/App.vue @@ -98,6 +98,11 @@ if (uni.getStorageSync('servicerConfig')) { this.$store.commit('setServicerConfig', uni.getStorageSync('servicerConfig')); } + + // 企业微信配置 + if (uni.getStorageSync('wxworkConfig')) { + this.$store.commit('setWxworkConfig', uni.getStorageSync('wxworkConfig')); + } // 版权信息 if (uni.getStorageSync('copyright')) { @@ -296,7 +301,7 @@ this.shareConfig(); } }, - // 代表在wacth里声明了firstName这个方法之后立即先去执行handler方法 + // 代表在watch里声明了firstName这个方法之后立即先去执行handler方法 immediate: true } } diff --git a/common/js/config.js b/common/js/config.js index e97d99d..62b0079 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -11,19 +11,37 @@ try { } } catch (e) {} +// 本地调试配置, 不同环境的配置 +const localConfig = { + '460': { // 制氧设备平台 + uniacid: 460, + domain: 'https://xcx30.5g-quickapp.com/', + }, + '2285': { // 数码喷墨墨水 + uniacid: 2285, + domain: 'https://xcx.aigc-quickapp.com/', + } +} + +const { + uniacid: defaultUniacid, + domain: defaultDomain, +} = localConfig['2285'] ?? {} + + // 调试版本，配置说明 const devCfg = { // 商户ID - uniacid: 460, //825 + uniacid: defaultUniacid, //825 //api请求地址 - baseUrl: 'https://xcx30.5g-quickapp.com/', + baseUrl: defaultDomain, // 图片域名 - imgDomain: 'https://xcx30.5g-quickapp.com/', + imgDomain: defaultDomain, // H5端域名 - h5Domain: 'https://xcx30.5g-quickapp.com/', + h5Domain: defaultDomain, // // api请求地址 // baseUrl: 'https://tsaas.liveplatform.cn/', diff --git a/common/js/event-bus.js b/common/js/event-bus.js index 51ee3ed..d19be53 100644 --- a/common/js/event-bus.js +++ b/common/js/event-bus.js @@ -145,7 +145,16 @@ class EventBus { ) // 调用 defaultAsyncHandler（仅当允许） - await callDefaultAsyncHandler(event, null, domResult) + await callDefaultAsyncHandler(event, null, domResult ?? true) + + // 如果不允许继续传播，则直接返回（根据 defaultPrevented 判断结果） + if (!allowContinuePropagation) { + return !event.defaultPrevented + } + // 否则继续走普通 EventBus 处理（fallthrough） + } else if (this.platform === 'h5') { + // 调用 defaultAsyncHandler（仅当允许） + await callDefaultAsyncHandler(event, null, true) // 如果不允许继续传播，则直接返回（根据 defaultPrevented 判断结果） if (!allowContinuePropagation) { @@ -192,6 +201,10 @@ class EventBus { await callDefaultAsyncHandler(event, handler, awaitedResult) } catch (error) { console.error(`EventBus ${eventName} error:`, error) + + // 发现错误，默认调用 defaultAsyncHandler（仅当允许） + await callDefaultAsyncHandler(event, handler, true) + // 如果全局或该 handler 指定遇错停止传播，则停止 if (stopOnError || handler.options?.stopOnError) { break diff --git a/components/diy-components/diy-category.vue b/components/diy-components/diy-category.vue index 4a35044..7836927 100644 --- a/components/diy-components/diy-category.vue +++ b/components/diy-components/diy-category.vue @@ -324,7 +324,7 @@ //切换英文标题 if(this.lang == 'en-us'){ this.categoryTree.map(item => { - item.child_list.map(items => { + item?.child_list?.map(items => { items.category_name = items.en_category_name; return items; }) diff --git a/components/diy-components/minx.js b/components/diy-components/minx.js index 9fd5f9e..c5648a4 100644 --- a/components/diy-components/minx.js +++ b/components/diy-components/minx.js @@ -3,7 +3,7 @@ export default { // 异步触发事件 async __$emitEvent(payload = {eventName: '__unnamedEvent', data: {}, promiseCallback: null}) { // console.log('__$emitEvent', payload) - await this.$eventBus?.emit(payload.eventName, payload.data, payload.promiseCallback) + await this.$eventBus.emit(payload.eventName, payload.data, payload.promiseCallback) }, } } \ No newline at end of file diff --git a/main.js b/main.js index caad937..0443141 100644 --- a/main.js +++ b/main.js @@ -44,6 +44,9 @@ uniStorage(); import loadingCover from '@/components/loading-cover/loading-cover.vue'; Vue.component('loading-cover', loadingCover); +import nsMpHtml from '@/components/ns-mp-html/ns-mp-html.vue'; +Vue.component('ns-mp-html', nsMpHtml); + import nsEmpty from '@/components/ns-empty/ns-empty.vue'; Vue.component('ns-empty', nsEmpty); diff --git a/pages/index/public/js/index.js b/pages/index/public/js/index.js index d72fa31..06b1580 100644 --- a/pages/index/public/js/index.js +++ b/pages/index/public/js/index.js @@ -62,7 +62,7 @@ export default { // 统一处理点击及触摸事件 _handleDiyGroupInteractionEvent(payload) { if (this.storeToken) { - return; + return true; } // 打开登录弹窗