From 6358102cae4ad697e4e3ac8d1b749a1b7b08f528 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 16:46:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?chore(=E6=B5=AE=E5=8A=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=81=B0=E5=BA=95=E9=BB=91=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/style_color.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/js/style_color.js b/common/js/style_color.js index a1e538a..7bd7a24 100644 --- a/common/js/style_color.js +++ b/common/js/style_color.js @@ -61,8 +61,8 @@ export default { groupby_promotion_aux_color: '#F7B500',//活动辅色 }, ...{ - hover_nav_bg_color: '#c6251b', //背景色: 红色 '#c6251b', 白色： '#FFFC' - hover_nav_text_color: '#FFFFFF' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000' + hover_nav_bg_color: '#FFFC', //背景色: 红色 '#c6251b', 白色： '#FFFC' + hover_nav_text_color: '#000' // 文字颜色: 白色 '#FFFFFF', 黑色： '#000' }, }, 'green': { From d7b07c974dc7bbc143ca3eac2ca9b62c1bdd1ccd Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 17:01:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?chore(=E5=8A=A0=E8=BD=BD=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F):=20=E5=8F=AA=E4=BD=BF=E7=94=A8=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BF=9D=E7=95=99=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=87=BD=E6=95=B0loadTheme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 +++-- common/js/config-external.js | 22 ---------------------- store/index.js | 7 ++++--- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/App.vue b/App.vue index ad9b424..2625d3c 100644 --- a/App.vue +++ b/App.vue @@ -8,7 +8,7 @@ export default { mixins: [auth], - onLaunch: function(options) { + onLaunch: async function(options) { // 方式：支持快应用，从url中query部分获取uniacid，或useragent中获取uniacid if(options.query.uniacid){ uni.setStorageSync('uniacid', options.query.uniacid); @@ -61,7 +61,8 @@ // 主题风格 if (uni.getStorageSync('themeStyle')) { - this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle'))); + const themeData = await configExternal.loadTheme(uni.getStorageSync('themeStyle')); + this.$store.commit('setThemeStyle', themeData); this.$store.dispatch('themeColorSet'); } diff --git a/common/js/config-external.js b/common/js/config-external.js index 26cc8f1..02a189d 100644 --- a/common/js/config-external.js +++ b/common/js/config-external.js @@ -98,28 +98,6 @@ class ConfigExternal { return this.loadPromises[key]; } - /** - * 加载主题配置（同步方式） - * @param {string} theme - 主题名称 - * @returns {object} - 主题配置 - */ - loadThemeSync(theme = themeConfig.defaultTheme) { - if (this.loadedConfigs[`theme_${theme}`]) { - return this.loadedConfigs[`theme_${theme}`]; - } - - try { - // 动态加载主题配置 - const themeData = require(`@/common/js/style_color.js`)['default'][theme]; - console.log('sync themeData => ', themeData); - this.loadedConfigs[`theme_${theme}`] = themeData; - return themeData; - } catch (error) { - console.error(`加载主题 ${theme} 失败:`, error); - return {}; - } - } - /** * 加载主题配置（异步方式） * @param {string} theme - 主题名称 diff --git a/store/index.js b/store/index.js index 17b9fad..4339ebd 100644 --- a/store/index.js +++ b/store/index.js @@ -252,13 +252,14 @@ const store = new Vuex.Store({ }, actions: { init() { - return new Promise((resolve, reject) => { + return new Promise(async (resolve, reject) => { Http.sendRequest({ url: '/api/config/init', - success: res => { + success: async res => { var data = res.data; if (data) { - this.commit('setThemeStyle', configExternal.loadThemeSync(data.style_theme?.name)); + const themeData = await configExternal.loadTheme(data.style_theme?.name); + this.commit('setThemeStyle', themeData); this.dispatch('themeColorSet'); // 底部导航 From 9a63b5ff4e3ae9576ac610c868d26a63dd46e8cc Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 17:03:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?chore(=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F)?= =?UTF-8?q?:=20=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=A8'pink',=20'gold',=20'purple',=20'yel?= =?UTF-8?q?low',=20'black'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/config-external.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/js/config-external.js b/common/js/config-external.js index 02a189d..c1edd73 100644 --- a/common/js/config-external.js +++ b/common/js/config-external.js @@ -14,7 +14,7 @@ export const langConfig = { // 主题配置 export const themeConfig = { // 主题列表 - themeList: ['default', 'red', 'green', 'blue'], + themeList: ['default', 'red', 'green', 'blue', 'pink', 'gold', 'purple', 'yellow', 'black'], // 默认主题 defaultTheme: 'default' }; From 618babf5bf7e418554dfb0ed9a2957f0a32ac391 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 17:57:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix(=E5=A4=9A=E8=AF=AD=E8=A8=80):=20?= =?UTF-8?q?=E5=B0=86=E5=94=AE=E5=90=8E=E5=BE=85=E4=BB=98=E6=AC=BE=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=BF=BB=E8=AF=91=E6=94=BE=E5=88=B0zh-cn/com?= =?UTF-8?q?mon=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .local.config.js | 4 ++++ .local.config.js.example | 4 ++++ common/js/lang.js | 20 +++++++++++++------- lang/zh-cn/common.js | 9 ++++++++- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.local.config.js b/.local.config.js index b733ec7..28cf028 100644 --- a/.local.config.js +++ b/.local.config.js @@ -6,6 +6,10 @@ const localDevConfig = ({ uniacid: 460, domain: 'https://xcx30.5g-quickapp.com/', }, + '576-xcx30.5g': { // 活性石灰装备 + uniacid: 576, + domain: 'https://xcx30.5g-quickapp.com/', + }, '2285': { // 数码喷墨墨水 uniacid: 2285, domain: 'https://xcx.aigc-quickapp.com/', diff --git a/.local.config.js.example b/.local.config.js.example index b733ec7..28cf028 100644 --- a/.local.config.js.example +++ b/.local.config.js.example @@ -6,6 +6,10 @@ const localDevConfig = ({ uniacid: 460, domain: 'https://xcx30.5g-quickapp.com/', }, + '576-xcx30.5g': { // 活性石灰装备 + uniacid: 576, + domain: 'https://xcx30.5g-quickapp.com/', + }, '2285': { // 数码喷墨墨水 uniacid: 2285, domain: 'https://xcx.aigc-quickapp.com/', diff --git a/common/js/lang.js b/common/js/lang.js index bc03c0b..5fec1bf 100644 --- a/common/js/lang.js +++ b/common/js/lang.js @@ -1,8 +1,8 @@ import { langConfig } from './config-external.js'; -var locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 + // 缓存已加载的语言包 -var loadedLangPacks = {}; +const loadedLangPacks = {}; // 处理页面目录映射 function processRoutePath(route) { @@ -64,6 +64,8 @@ export default { let _this = getCurrentPages()[getCurrentPages().length - 1]; if (!_this) return; + const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 + var value = ''; try { //公共语言包（同步加载） @@ -72,7 +74,7 @@ export default { //当前页面语言包（同步加载） let route = _this.route; let langPath = processRoutePath(route); - // console.log(`当前页面语言包路径: ${langPath}`); + console.log(`当前语言: ${locale}, 当前页面语言包路径: ${langPath}`); // 加载当前页面语言包 let currentPageLang = loadLangPackSync(locale, langPath); @@ -113,7 +115,7 @@ export default { if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field // 多语言调试，注释后可以关闭控制台输出 - // console.log(`字段: ${field}, 值: ${value}`) + console.log(`字段: ${field}, 值: ${value}`) return value; }, /** @@ -126,10 +128,14 @@ export default { if (!_this) return; uni.setStorageSync("lang", value); - locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 + const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 // 清空已加载的语言包缓存 - loadedLangPacks = {}; + for (let key in loadedLangPacks) { + if (!key.startsWith(locale)) { + delete loadedLangPacks[key]; + } + } this.refresh(); @@ -141,7 +147,7 @@ export default { refresh() { let _this = getCurrentPages()[getCurrentPages().length - 1]; if (!_this) return; - locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 + const locale = uni.getStorageSync('lang') || "zh-cn"; //设置语言 this.title(this.lang("title")); diff --git a/lang/zh-cn/common.js b/lang/zh-cn/common.js index c19bb2c..b9edf32 100644 --- a/lang/zh-cn/common.js +++ b/lang/zh-cn/common.js @@ -19,5 +19,12 @@ export const lang = { currencySymbol: '¥', submit: '提交', searchTip: '请输入搜索关键词' - } + }, + + + waitpay: '待付款', + waitsend: '待发货', + waitconfirm: '待收货', + activist: '售后', + completed: '已完成', } From d1b9e528f863805ebbda46fb241d6a61d413f04c Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Tue, 6 Jan 2026 18:14:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(=E9=A1=B5=E9=9D=A2=E5=89=8D=E7=BC=80):?= =?UTF-8?q?=20=E5=88=86=E5=8C=85=E9=80=A0=E6=88=90=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=AF=B9=E5=BA=94=E6=9B=B4=E6=96=B0=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/util.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/common/js/util.js b/common/js/util.js index 383881e..d47f9e7 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -32,10 +32,28 @@ export const adaptSubpackageUrl = (url) => { */ // 定义前缀映射表 const urlPrefixMap = { + '/pages/promotion/': '/pages_promotion/', + '/pages/order/': '/pages_order/', '/pages/goods/': '/pages_goods/', + '/pages/contact/': '/pages_tool/contact/', '/pages/member/': '/pages_tool/member/', - '/pages/vr': '/pages_tool/vr/' + '/pages/login/': '/pages_tool/login/', + '/pages/agreement/': '/pages_tool/agreement/', + '/pages/article/': '/pages_tool/article/', + '/pages/cases/': '/pages_tool/cases/', + '/pages/contact/': '/pages_tool/contact/', + '/pages/files/': '/pages_tool/files/', + '/pages/form/': '/pages_tool/form/', + '/pages/help/': '/pages_tool/help/', + '/pages/notice/': '/pages_tool/notice/', + '/pages/pay/': '/pages_tool/pay/', + '/pages/recharge/': '/pages_tool/recharge/', + '/pages/seal/': '/pages_tool/seal/', + '/pages/storeclose/': '/pages_tool/storeclose/', + '/pages/vr/': '/pages_tool/vr/', + '/pages/weapp/': '/pages_tool/weapp/', + '/pages/webview/': '/pages_tool/webview/', }; // 构建正则表达式 From 8df59abd03e00239a13b2fb865b9ef1ce99293df Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Wed, 7 Jan 2026 11:35:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix(=E5=85=B3=E6=B3=A8/=E8=B6=B3=E8=BF=B9):?= =?UTF-8?q?=20=20=E4=BC=98=E5=8C=96=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lang/en-us/common.js | 7 +++++- lang/zh-cn/common.js | 4 ++++ pages_goods/cart.vue | 25 +++++++++++--------- pages_goods/public/js/cart.js | 6 ++--- pages_goods/public/js/common.js | 8 +++++++ pages_tool/member/collection.vue | 21 +++++++++------- pages_tool/member/footprint.vue | 19 +++++++++------ pages_tool/member/public/css/collection.scss | 21 ++++++++++++++++ pages_tool/member/public/css/footprint.scss | 21 ++++++++++++++++ pages_tool/member/public/js/collection.js | 2 +- pages_tool/member/public/js/common.js | 8 +++++++ 11 files changed, 111 insertions(+), 31 deletions(-) create mode 100644 pages_goods/public/js/common.js create mode 100644 pages_tool/member/public/js/common.js diff --git a/lang/en-us/common.js b/lang/en-us/common.js index 3302642..b92c1e6 100644 --- a/lang/en-us/common.js +++ b/lang/en-us/common.js @@ -19,5 +19,10 @@ export const lang = { currencySymbol: '¥', submit: 'Submit', searchTip: 'Please enter search keywords' - } + }, + + login: 'Login/Register', + loginTips: 'Click to login and enjoy more exciting information', + toLogin: 'Go to login', + toGoodsCategoryPage: 'Go shopping', } diff --git a/lang/zh-cn/common.js b/lang/zh-cn/common.js index b9edf32..f029019 100644 --- a/lang/zh-cn/common.js +++ b/lang/zh-cn/common.js @@ -21,6 +21,10 @@ export const lang = { searchTip: '请输入搜索关键词' }, + login: '登录/注册', + loginTpis: '点击登录 享受更多精彩信息', + toLogin: '去登录', + toGoodsCategoryPage: '去逛逛', waitpay: '待付款', waitsend: '待发货', diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue index f72c838..58ab7c3 100644 --- a/pages_goods/cart.vue +++ b/pages_goods/cart.vue @@ -65,7 +65,7 @@ {{ parseFloat(item.member_price).toFixed(2).split('.')[0] }} .{{ parseFloat(item.member_price).toFixed(2).split('.')[1] - }} + }} @@ -79,7 +79,7 @@ }} .{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] - }} + }} @@ -95,7 +95,7 @@ {{ parseFloat(item.member_price).toFixed(2).split('.')[0] }} .{{ parseFloat(item.member_price).toFixed(2).split('.')[1] - }} + }} @@ -108,7 +108,7 @@ {{ parseFloat(item.price).toFixed(2).split('.')[0] }} .{{ parseFloat(item.price).toFixed(2).split('.')[1] - }} + }} @@ -175,7 +175,7 @@ }} .{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] - }} + }} @@ -199,9 +199,12 @@ - - + + + @@ -316,9 +319,9 @@ {{ $lang('common.currencySymbol') }} {{ parseFloat(discount.order_money).toFixed(2).split('.')[0] - }} + }} .{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] - }} + }} {{ parseFloat(totalPrice).toFixed(2).split('.')[0] }} diff --git a/pages_goods/public/js/cart.js b/pages_goods/public/js/cart.js index 5c2f9ab..ba8fbc2 100644 --- a/pages_goods/public/js/cart.js +++ b/pages_goods/public/js/cart.js @@ -1,4 +1,7 @@ +import common from './common.js'; + export default { + mixins: [common], data() { return { cartData: [], // 购物车 @@ -444,9 +447,6 @@ export default { // }); } }, - toLogin() { - this.$refs.login.open(); - }, // 重置编辑状态 resetEditStatus() { if (this.cartData.length) { diff --git a/pages_goods/public/js/common.js b/pages_goods/public/js/common.js new file mode 100644 index 0000000..845ff77 --- /dev/null +++ b/pages_goods/public/js/common.js @@ -0,0 +1,8 @@ +export default { + methods: { + // 跳转至登录页 + toLogin() { + this.$refs.login.open(); + }, + } +} \ No newline at end of file diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue index 1a0a6cd..a28ff1c 100644 --- a/pages_tool/member/collection.vue +++ b/pages_tool/member/collection.vue @@ -1,8 +1,7 @@