From afd002fad3470c5cd19121b8109a231faced9447 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 09:46:30 +0800 Subject: [PATCH] =?UTF-8?q?chore(=E7=BB=84=E4=BB=B6):=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?uni-popup-*=E7=BB=84=E4=BB=B6=E6=B3=A8=E5=86=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8F=8A=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .local.config.js | 2 +- common/js/config.js | 26 ++++++++++--------- components/sx-rate/{index.vue => sx-rate.vue} | 0 components/sx-rate/sx-rate/iconfont.css | 10 +++---- pages.json | 15 +++++------ .../uni-popup-sku-category.vue | 0 .../uni-popup-sku}/uni-popup-sku.vue | 0 7 files changed, 26 insertions(+), 27 deletions(-) rename components/sx-rate/{index.vue => sx-rate.vue} (100%) rename uni_modules/{uni-popup/components/uni-popup => uni-popup-sku-category/components/uni-popup-sku-category}/uni-popup-sku-category.vue (100%) rename uni_modules/{uni-popup/components/uni-popup => uni-popup-sku/components/uni-popup-sku}/uni-popup-sku.vue (100%) diff --git a/.local.config.js b/.local.config.js index 9026bc8..7910a3f 100644 --- a/.local.config.js +++ b/.local.config.js @@ -34,6 +34,6 @@ const localDevConfig = ({ uniacid: 1, domain: 'https://test.aigc-quickapp.com', }, -})['2285']; // 选择要使用的环境配置 +})['2811']; // 选择要使用的环境配置 export default localDevConfig; \ No newline at end of file diff --git a/common/js/config.js b/common/js/config.js index 4727bb0..992a535 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -43,19 +43,21 @@ let localDevConfig = { uniacid: 0, domain: defaultDomain }; // #ifndef PRODUCTION // 尝试动态加载本地配置文件 -try { - // 尝试从项目根目录加载本地配置文件 - // 使用相对路径的方式，确保在不同平台下都能正确解析 - let customConfig = require('@/.local.config.js').default; - if (customConfig) { - localDevConfig = customConfig; +if (process?.env?.NODE_ENV === 'development') { + try { + // 尝试从项目根目录加载本地配置文件 + // 使用相对路径的方式，确保在不同平台下都能正确解析 + let customConfig = require('@/.local.config.js').default; + if (customConfig) { + localDevConfig = customConfig; + } + } catch (e) { + // 如果本地配置文件不存在或加载失败，保持使用默认配置 + // 只在开发模式下输出提示信息 + // #ifdef WEB + console.log('本地配置文件 .local.config.js 不存在，使用默认配置'); + // #endif } -} catch (e) { - // 如果本地配置文件不存在或加载失败，保持使用默认配置 - // 只在开发模式下输出提示信息 - // #ifdef WEB - console.log('本地配置文件 .local.config.js 不存在，使用默认配置'); - // #endif } // #endif diff --git a/components/sx-rate/index.vue b/components/sx-rate/sx-rate.vue similarity index 100% rename from components/sx-rate/index.vue rename to components/sx-rate/sx-rate.vue diff --git a/components/sx-rate/sx-rate/iconfont.css b/components/sx-rate/sx-rate/iconfont.css index 48200e0..5cd5397 100644 --- a/components/sx-rate/sx-rate/iconfont.css +++ b/components/sx-rate/sx-rate/iconfont.css @@ -1,10 +1,10 @@ @font-face {font-family: "iconfont"; - src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */ - src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */ + src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */ + src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'), - url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'), - url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ - url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */ + url('~@/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'), + url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */ + url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */ } .iconfont { diff --git a/pages.json b/pages.json index af01abf..a4ee8dd 100644 --- a/pages.json +++ b/pages.json @@ -952,18 +952,15 @@ }, "easycom": { "autoscan": true, - "custom": { - "diy-*(\\W.*)": "@/components-diy/diy$1.vue", - "uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue", + "custom": { + "x-skeleton": "@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue", + "mp-html": "@/uni_modules/mp-html/components/mp-html/mp-html.vue", + "uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue", "mescroll-uni": "@/components/mescroll/my-list-mescroll.vue", - "ns-goods-sku-index": "@/components/ns-goods-sku/ns-goods-sku-index.vue", - "ns-goods-sku-category": "@/components/ns-goods-sku/ns-goods-sku-category.vue", + "ns-goods-sku-*(\\W.*)": "@/components/ns-goods-sku/ns-goods-sku$1.vue", - "x-skeleton": "@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue", - "mp-html": "@/uni_modules/mp-html/components/mp-html/mp-html.vue", - "uni-popup-sku": "@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue", - "uni-popup-sku-category": "@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-category.vue" + "diy-*(\\W.*)": "@/components-diy/diy$1.vue" } }, "preloadRule": { diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-category.vue b/uni_modules/uni-popup-sku-category/components/uni-popup-sku-category/uni-popup-sku-category.vue similarity index 100% rename from uni_modules/uni-popup/components/uni-popup/uni-popup-sku-category.vue rename to uni_modules/uni-popup-sku-category/components/uni-popup-sku-category/uni-popup-sku-category.vue diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue b/uni_modules/uni-popup-sku/components/uni-popup-sku/uni-popup-sku.vue similarity index 100% rename from uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue rename to uni_modules/uni-popup-sku/components/uni-popup-sku/uni-popup-sku.vue