diff --git a/App.vue b/App.vue
index 64d8e34..95bc6b6 100644
--- a/App.vue
+++ b/App.vue
@@ -67,6 +67,7 @@
// 主题风格
if (uni.getStorageSync('themeStyle')) {
this.$store.commit('setThemeStyle', configExternal.loadThemeSync(uni.getStorageSync('themeStyle')));
+ this.$store.dispatch('themeColorSet');
}
// 插件是否存在
diff --git a/common/js/config-external.js b/common/js/config-external.js
index 3fd174e..26cc8f1 100644
--- a/common/js/config-external.js
+++ b/common/js/config-external.js
@@ -111,6 +111,7 @@ class ConfigExternal {
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) {
@@ -136,7 +137,8 @@ class ConfigExternal {
this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
try {
// 动态加载主题配置
- const themeData = require(`@/common/js/style_color.js`)[theme];
+ const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+ console.log('async themeData => ', themeData);
this.loadedConfigs[`theme_${theme}`] = themeData;
resolve(themeData);
} catch (error) {
diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js
index 8363dbf..27a27d4 100644
--- a/common/js/golbalConfig.js
+++ b/common/js/golbalConfig.js
@@ -1,21 +1,8 @@
export default {
- data() {
- return {
- // 页面样式，动态设置主色调
- themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
- }
- },
onLoad() { },
onShow() {
// 刷新多语言
this.$langConfig.refresh();
- let time = setInterval(() => {
- let theme = this.themeStyle;
- if (theme && theme.main_color) {
- this.themeColorSet();
- clearInterval(time);
- }
- }, 50);
},
computed: {
// 是否是英文环境
@@ -24,6 +11,9 @@ export default {
},
themeStyle() {
return this.$store.state.themeStyle;
+ },
+ themeColor() {
+ return this.$store.state.themeColor;
},
// 插件是否存在
addonIsExist() {
@@ -111,25 +101,7 @@ export default {
}
},
methods: {
- themeColorSet() {
- let theme = this.themeStyle;
- this.themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
- if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
- Object.keys(theme).forEach(key => {
- let data = theme[key];
- if (typeof (data) == "object") {
- Object.keys(data).forEach(k => {
- this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
- });
- } else if (typeof (key) == "string" && key) {
- this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
- }
- });
- for (let i = 9; i >= 5; i--) {
- let color = this.$util.colourBlend(theme.main_color, '#ffffff', (i / 10));
- this.themeColor += `--base-color-light-${i}:${color};`;
- }
- },
+
// 颜色变浅（>0）、变深函数（<0）
lightenDarkenColor(color, amount) {
diff --git a/common/js/lang.js b/common/js/lang.js
index 7d3ff47..bc03c0b 100644
--- a/common/js/lang.js
+++ b/common/js/lang.js
@@ -72,7 +72,7 @@ export default {
//当前页面语言包（同步加载）
let route = _this.route;
let langPath = processRoutePath(route);
- console.log(`当前页面语言包路径: ${langPath}`);
+ // console.log(`当前页面语言包路径: ${langPath}`);
// 加载当前页面语言包
let currentPageLang = loadLangPackSync(locale, langPath);
@@ -113,7 +113,7 @@ export default {
if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
// 多语言调试，注释后可以关闭控制台输出
- console.log(`字段: ${field}, 值: ${value}`)
+ // console.log(`字段: ${field}, 值: ${value}`)
return value;
},
/**
diff --git a/lang/zh-cn/goods/detail.js b/lang/zh-cn/goods/detail.js
index 24c57da..34efc9b 100644
--- a/lang/zh-cn/goods/detail.js
+++ b/lang/zh-cn/goods/detail.js
@@ -2,7 +2,7 @@ export const lang = {
//title为每个页面的标题
title: '',
select: '选择',
- details:'商品详情',
+ details:'资源详情',
params: '参数',
service: '商品服务',
allGoods: '全部商品',
diff --git a/pages.json b/pages.json
index 19936b6..4e2c1e6 100644
--- a/pages.json
+++ b/pages.json
@@ -43,7 +43,7 @@
{
"path": "detail",
"style": {
- "navigationBarTitleText": "商品详情"
+ "navigationBarTitleText": "资源详情"
}
},
{
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index 7a8eca5..87ddee9 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index 387fcdd..d1792de 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue
index fe50330..fbc82c1 100644
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -1,6 +1,6 @@
-
+
-
-
- 合计：
- {{ $lang('common.currencySymbol') }}
- {{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}
- .{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderItem.sku_name }}
+
+ 返{{ fenxiaoWords.account }}
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}
+
+
+
+
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}
+
+
+
+
+ {{ orderItem.num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue
index 64b1888..36f5fb0 100644
--- a/pages_promotion/fenxiao/order_detail.vue
+++ b/pages_promotion/fenxiao/order_detail.vue
@@ -1,378 +1,378 @@
-
+
-
-
-
-
-
-
-
-
- {{ orderData.sku_name }}
-
-
-
- ￥
- {{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}
- .{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}
-
-
-
-
-
- {{ orderData.num }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订单编号：
- {{ orderData.order_no }}
-
-
- 分佣层级：
- {{ orderData.commission_level }}级
-
-
- 返佣金额：
-
- ￥
- {{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
- .{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ orderData.sku_name }}
+
+
+
+ ￥
+ {{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}
+
+
+
+
+
+ {{ orderData.num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单编号：
+ {{ orderData.order_no }}
+
+
+ 分佣层级：
+ {{ orderData.commission_level }}级
+
+
+ 返佣金额：
+
+ ￥
+ {{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index b1d5b9c..5e30f40 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -1,152 +1,152 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ orderItem.sku_name }}
-
- 返{{ fenxiaoWords.account }}
- {{ $lang('common.currencySymbol') }}
- {{ orderItem.commission }}
-
-
-
-
- {{ $lang('common.currencySymbol') }}
- {{ orderItem.price }}
-
-
-
-
- {{ orderItem.num }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderItem.sku_name }}
+
+ 返{{ fenxiaoWords.account }}
+ {{ $lang('common.currencySymbol') }}
+ {{ orderItem.commission }}
+
+
+
+
+ {{ $lang('common.currencySymbol') }}
+ {{ orderItem.price }}
+
+
+
+
+ {{ orderItem.num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index 878cc7e..63dfed3 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -1,355 +1,355 @@
-
+
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.nickname }}
- {{ fenxiaoWords.fenxiao_name }}
-
- 加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}
-
-
-
- {{ item.one_child_num }}
- 人
-
-
- {{ item.order_num }}
- 单
-
-
- {{ item.order_money | moneyFormat }}
- 元
-
-
-
-
-
-
-
- {{ item.nickname }}
-
-
- 加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}
-
-
-
- 0
- 人
-
-
- {{ item.order_num }}
- 单
-
-
- {{ item.order_money | moneyFormat }}
- 元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.nickname }}
+ {{ fenxiaoWords.fenxiao_name }}
+
+ 加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}
+
+
+
+ {{ item.one_child_num }}
+ 人
+
+
+ {{ item.order_num }}
+ 单
+
+
+ {{ item.order_money | moneyFormat }}
+ 元
+
+
+
+
+
+
+
+ {{ item.nickname }}
+
+
+ 加入时间：{{ $util.timeStampTurnTime(item.bind_fenxiao_time).substring(0, 10) }}
+
+
+
+ 0
+ 人
+
+
+ {{ item.order_num }}
+ 单
+
+
+ {{ item.order_money | moneyFormat }}
+ 元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 4c0a66f..8790457 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -1,209 +1,209 @@
-
+
-
-
-
-
-
-
-
-
- {{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}
-
- {{ $util.timeStampTurnTime(item.create_time) }}
-
-
-
- ￥{{ item.money }}
- {{ item.status_name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}
+
+ {{ $util.timeStampTurnTime(item.create_time) }}
+
+
+
+ ￥{{ item.money }}
+ {{ item.status_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/withdrawal_detail.vue b/pages_promotion/fenxiao/withdrawal_detail.vue
index ab18b5b..804098c 100644
--- a/pages_promotion/fenxiao/withdrawal_detail.vue
+++ b/pages_promotion/fenxiao/withdrawal_detail.vue
@@ -1,127 +1,127 @@
-
+
-
-
- -{{ detail.money }}
-
-
-
-
-
- 当前状态
- {{ detail.status_name }}
-
-
- 交易号
- {{ detail.withdraw_no }}
-
-
- 手续费
- ￥{{ detail.withdraw_rate_money }}
-
-
- 申请时间
- {{ $util.timeStampTurnTime(detail.create_time) }}
-
-
- 审核时间
- {{ $util.timeStampTurnTime(detail.audit_time) }}
-
-
- 银行名称
- {{ detail.bank_name }}
-
-
- 收款账号
- {{ detail.account_number }}
-
-
- 拒绝理由
- {{ detail.refuse_reason }}
-
-
- 转账方式名称
- {{ detail.transfer_name }}
-
-
- 转账时间
- {{ $util.timeStampTurnTime(detail.payment_time) }}
-
-
-
-
-
-
-
-
-
-
+
+
+ -{{ detail.money }}
+
+
+
+
+
+ 当前状态
+ {{ detail.status_name }}
+
+
+ 交易号
+ {{ detail.withdraw_no }}
+
+
+ 手续费
+ ￥{{ detail.withdraw_rate_money }}
+
+
+ 申请时间
+ {{ $util.timeStampTurnTime(detail.create_time) }}
+
+
+ 审核时间
+ {{ $util.timeStampTurnTime(detail.audit_time) }}
+
+
+ 银行名称
+ {{ detail.bank_name }}
+
+
+ 收款账号
+ {{ detail.account_number }}
+
+
+ 拒绝理由
+ {{ detail.refuse_reason }}
+
+
+ 转账方式名称
+ {{ detail.transfer_name }}
+
+
+ 转账时间
+ {{ $util.timeStampTurnTime(detail.payment_time) }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue
index ce7f83e..88d997e 100644
--- a/pages_promotion/merch/merchcategory.vue
+++ b/pages_promotion/merch/merchcategory.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index bf3de74..894b670 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue
index 028bed5..7e13423 100644
--- a/pages_tool/member/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index b4286cb..c8ea568 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -1,6 +1,6 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_tool/webview/webview.vue b/pages_tool/webview/webview.vue
index c12f31f..7f5b84d 100644
--- a/pages_tool/webview/webview.vue
+++ b/pages_tool/webview/webview.vue
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/store/index.js b/store/index.js
index 54de377..17b9fad 100644
--- a/store/index.js
+++ b/store/index.js
@@ -5,6 +5,7 @@ Vue.use(Vuex)
import Http from '../common/js/http.js'
import { themeConfig } from '../common/js/config-external.js'
import configExternal from '../common/js/config-external.js'
+import util from '../common/js/util.js'
const store = new Vuex.Store({
state: {
@@ -14,6 +15,7 @@ const store = new Vuex.Store({
tabBarList: '',
siteState: 1,
themeStyle: '',
+ themeColor: '',
addonIsExist: {
bundling: 0,
coupon: 0,
@@ -236,6 +238,10 @@ const store = new Vuex.Store({
// 设置AI未读消息数量
setAiUnreadCount(state, value) {
state.aiUnreadCount = value;
+ },
+ // 设置主题颜色
+ setThemeColor(state, value) {
+ state.themeColor = value;
}
},
getters: {
@@ -253,6 +259,7 @@ const store = new Vuex.Store({
var data = res.data;
if (data) {
this.commit('setThemeStyle', configExternal.loadThemeSync(data.style_theme?.name));
+ this.dispatch('themeColorSet');
// 底部导航
this.commit('setTabBarList', data.diy_bottom_nav);
@@ -401,6 +408,34 @@ const store = new Vuex.Store({
this.commit('setCartIds', ids);
+ },
+ // 生成主题颜色CSS变量
+ themeColorSet() {
+ console.log('样式颜色设置...');
+ let theme = this.state.themeStyle;
+ if (!theme?.main_color || !theme?.aux_color) return;
+ try {
+ let themeColor = `--base-color:${theme.main_color};--base-help-color:${theme.aux_color};`;
+ if (this.state.tabBarHeight != '56px') themeColor += `--tab-bar-height:${this.state.tabBarHeight};`
+ Object.keys(theme).forEach(key => {
+ let data = theme[key];
+ if (typeof (data) == "object") {
+ Object.keys(data).forEach(k => {
+ themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
+ });
+ } else if (typeof (key) == "string" && key) {
+ themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
+ }
+ });
+ for (let i = 9; i >= 5; i--) {
+ let color = util.colourBlend(theme.main_color, '#ffffff', (i / 10));
+ themeColor += `--base-color-light-${i}:${color};`;
+ }
+ this.commit('setThemeColor', themeColor);
+ } catch (e) {
+ console.error('设置主题颜色失败', e);
+ }
+ console.log('themeColor => ', this.state.themeColor);
}
}
})