diff --git a/common/config.js b/common/config.js index 9cc4952..da0ce2d 100644 --- a/common/config.js +++ b/common/config.js @@ -10,7 +10,7 @@ let isLoading = false; let loadPromise = null; const defaultConfig = { "good_type": [{ "value": 0, "sort_order": 0, "is_show": 1, "name": "全部", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 1, "sort_order": 1, "is_show": 0, "name": "一番赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 2, "sort_order": 2, "is_show": 1, "name": "无限赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 3, "sort_order": 3, "is_show": 0, "name": "擂台赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 5, "sort_order": 4, "is_show": 0, "name": "积分赏", "pay_wechat": 0, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 0 }, { "value": 6, "sort_order": 5, "is_show": 1, "name": "全局赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 8, "sort_order": 6, "is_show": 1, "name": "领主赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 9, "sort_order": 7, "is_show": 1, "name": "连击赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 10, "sort_order": 8, "is_show": 0, "name": "商城赏", "pay_wechat": 1, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 0, "is_deduction": 0 }, { "value": 11, "sort_order": 9, "is_show": 0, "name": "自制赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }], - "app_setting": { "key": "app_setting", "app_name": "友达赏", "purchase_popup": "1", "exchange_times": "2", "balance_name": "钻石", "balance_icon": "https://mh.shhuanmeng.com/app/icons/20250322/3d823aaa01e96aeeafc39cbb2d579612.jpg", "file": "", "currency1_name": "UU币", "currency1_icon": "https://mh.shhuanmeng.com/app/icons/20250322/8188634352e7f9edf5a2a42329b7c2c9.jpg", "currency2_name": "达达卷", "currency2_icon": "", "win_audio": "https://mh.shhuanmeng.com/static/web/static/mp3/open.mp3", "applet_version": "v1.0.0", "sign_in_spend_limit": "0", "update_time": 1743438198 } + "app_setting": { "key": "app_setting", "app_name": "友达赏", "purchase_popup": "1", "exchange_times": "2", "balance_name": "钻石", "balance_icon": "https://mh.shhuanmeng.com/app/icons/20250322/3d823aaa01e96aeeafc39cbb2d579612.jpg", "file": "", "currency1_name": "UU币", "currency1_icon": "https://mh.shhuanmeng.com/app/icons/20250322/8188634352e7f9edf5a2a42329b7c2c9.jpg", "currency2_name": "达达券", "currency2_icon": "", "win_audio": "https://mh.shhuanmeng.com/static/web/static/mp3/open.mp3", "applet_version": "v1.0.0", "sign_in_spend_limit": "0", "update_time": 1743438198 } }; diff --git a/components/order-confirm-popup/order-confirm-popup-flw.vue b/components/order-confirm-popup/order-confirm-popup-flw.vue index 54cc791..d36deeb 100644 --- a/components/order-confirm-popup/order-confirm-popup-flw.vue +++ b/components/order-confirm-popup/order-confirm-popup-flw.vue @@ -165,7 +165,7 @@ export default { // 获取货币名称和余额名称 this.currencyName = this.$config.getAppSetting('currency1_name') || 'UU币'; - this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达卷'; + this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达券'; this.balanceName = this.$config.getAppSetting('balance_name') || '余额'; let goodType = this.$config.getGoodTypeFind(this.orderData.goods.type); //是否显示余额支付 diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue index eabe80e..67d6a45 100644 --- a/components/order-confirm-popup/order-confirm-popup.vue +++ b/components/order-confirm-popup/order-confirm-popup.vue @@ -224,7 +224,7 @@ export default { // 获取货币名称和余额名称 this.currencyName = this.$config.getAppSetting('currency1_name') || 'UU币'; - this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达卷'; + this.currencyName2 = this.$config.getAppSetting('currency2_name') || '达达券'; this.balanceName = this.$config.getAppSetting('balance_name') || '余额'; let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type); this.setPayType(goodType); diff --git a/pages/other/order_info.vue b/pages/other/order_info.vue index 19975c3..5cc80ca 100644 --- a/pages/other/order_info.vue +++ b/pages/other/order_info.vue @@ -40,7 +40,7 @@ ¥{{orderInfo.use_integral}} - 达达卷支付： + 达达券支付： ¥{{orderInfo.use_money2}}