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/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..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' }; @@ -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/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/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': { 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/', }; // 构建正则表达式 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 c19bb2c..f029019 100644 --- a/lang/zh-cn/common.js +++ b/lang/zh-cn/common.js @@ -19,5 +19,16 @@ export const lang = { currencySymbol: '¥', submit: '提交', searchTip: '请输入搜索关键词' - } + }, + + login: '登录/注册', + loginTpis: '点击登录 享受更多精彩信息', + toLogin: '去登录', + toGoodsCategoryPage: '去逛逛', + + waitpay: '待付款', + waitsend: '待发货', + waitconfirm: '待收货', + activist: '售后', + completed: '已完成', } 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_tool/cases/index.vue b/pages_tool/cases/index.vue index 6eb35d8..d1b8671 100644 --- a/pages_tool/cases/index.vue +++ b/pages_tool/cases/index.vue @@ -98,7 +98,8 @@ export default { markers: [], Form: { realname: "", - mobile: "" + mobile: "", + remark: "" }, ismessage: 0, video_url: "" @@ -263,6 +264,7 @@ export default { success: (res) => { this.$refs.informationPopup.close(); this.$util.showToast({ title: res.message }); + this.resetForm(); }, fail: (err) => { console.log(err); @@ -280,7 +282,15 @@ export default { closeinformationPopup() { this.ismessage = 0; this.$refs.informationPopup.close(); + this.resetForm(); }, + resetForm() { + this.Form = { + realname: "", + mobile: "", + remark: "" + }; + }, Tel(phone) { uni.makePhoneCall({ phoneNumber: phone + "", diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue index b1fcdbd..b8e84d2 100644 --- a/pages_tool/member/collection.vue +++ b/pages_tool/member/collection.vue @@ -1,4 +1,5 @@ + + diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue index 27a0110..e6ae305 100644 --- a/pages_tool/member/footprint.vue +++ b/pages_tool/member/footprint.vue @@ -3,9 +3,9 @@ {{ manage ? '完成' : '管理' }} - + - + {{ datetime(item) }} @@ -45,7 +45,11 @@ - + + + + @@ -65,7 +69,10 @@