From 992bb55fa653061e7eea44bf0f8f966bd58170c9 Mon Sep 17 00:00:00 2001 From: liqianjin <949671634@qq.com> Date: Sat, 4 Mar 2023 15:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=85=91?= =?UTF-8?q?=E6=8D=A2=E5=88=B8=E6=94=B9=E7=A7=AF=E5=88=86=EF=BC=8C=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E5=88=B8=E6=94=B9=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/main.scss | 4 +- components/common-payment/common-payment.vue | 4 +- components/common-payment/payment.js | 4 +- .../diy-components/diy-many-goods-list.vue | 17 ++++-- components/diy-components/diy-member-info.vue | 56 +++++++++--------- components/diy-components/diy-pinfan.vue | 6 +- .../ns-birthday-gift/ns-birthday-gift.vue | 2 +- components/ns-goods-sku/ns-goods-sku.vue | 8 +-- components/ns-new-gift/ns-new-gift.vue | 2 +- components/ns-payment/ns-payment.vue | 4 +- components/payment/payment.vue | 10 ++-- .../register-reward/register-reward.vue | 4 +- lang/zh-cn/goods/point.js | 2 +- lang/zh-cn/member/balance.js | 12 ++-- lang/zh-cn/member/balance_detail.js | 2 +- lang/zh-cn/member/index.js | 6 +- lang/zh-cn/member/point.js | 2 +- lang/zh-cn/member/point_detail.js | 6 +- lang/zh-cn/point/list.js | 2 +- lang/zh-cn/point/order_detail.js | 2 +- lang/zh-cn/point/order_list.js | 2 +- node_modules/jweixin-module/README.md | 4 +- node_modules/jweixin-module/package.json | 37 +++++++----- pages.json | 4 +- pages/goods/public/js/detail.js | 2 +- pages/order/detail.vue | 4 +- pages/order/detail_point.vue | 4 +- pages/order/payment.vue | 4 +- pages_promotion/blindbox/index.vue | 4 +- pages_promotion/fenxiao/withdraw_apply.vue | 6 +- pages_promotion/fenxiao/withdraw_list.vue | 2 +- pages_promotion/futures/order.vue | 2 +- pages_promotion/game/cards.vue | 10 ++-- pages_promotion/game/record.vue | 2 +- pages_promotion/game/smash_eggs.vue | 10 ++-- pages_promotion/game/turntable.vue | 8 +-- pages_promotion/giftcard/card_use.vue | 4 +- pages_promotion/pinfan/detail.vue | 4 +- pages_promotion/pinfan/list.vue | 2 +- pages_promotion/point/detail.vue | 10 ++-- pages_promotion/point/goods_list.vue | 10 ++-- pages_promotion/point/list.vue | 58 +++++++++---------- pages_promotion/point/order_list.vue | 6 +- pages_promotion/point/payment.vue | 8 +-- pages_promotion/presale/order_detail.vue | 4 +- pages_promotion/presale/payment.vue | 2 +- pages_promotion/presale/public/js/payment.js | 4 +- pages_tool/hongbao/index.vue | 2 +- pages_tool/member/apply_withdrawal.vue | 2 +- pages_tool/member/assets.vue | 2 +- pages_tool/member/balance.vue | 14 ++--- pages_tool/member/balance_detail.vue | 4 +- pages_tool/member/card.vue | 8 +-- pages_tool/member/card_buy.vue | 8 +-- pages_tool/member/invite_friends.vue | 6 +- pages_tool/member/level.vue | 8 +-- pages_tool/member/level_growth_rules.vue | 2 +- pages_tool/member/point.vue | 16 ++--- pages_tool/member/point_detail.vue | 4 +- pages_tool/member/public/js/signin.js | 2 +- pages_tool/member/signin.vue | 14 ++--- pages_tool/order/refund_detail.vue | 2 +- pages_tool/pay/result.vue | 2 +- pages_tool/recharge/list.vue | 6 +- pages_tool/recharge/order_list.vue | 2 +- 65 files changed, 246 insertions(+), 230 deletions(-) diff --git a/common/css/main.scss b/common/css/main.scss index d3879e8..1a2e107 100644 --- a/common/css/main.scss +++ b/common/css/main.scss @@ -480,8 +480,8 @@ uni-slider .uni-slider-track { } } -// ***************消费券*************** -// 消费券背景色渐变 +// ***************余额*************** +// 余额背景色渐变 .balance-wrap { // background: linear-gradient(to right, $base-color, mix($base-color, #fff, 70%)) !important; } diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue index 023e865..cd1c047 100644 --- a/components/common-payment/common-payment.vue +++ b/components/common-payment/common-payment.vue @@ -279,7 +279,7 @@ - 使用{{ parseInt(calculateGoodsData.max_usable_point) }}兑换券可抵扣 + 使用{{ parseInt(calculateGoodsData.max_usable_point) }}积分可抵扣 {{ $lang('common.currencySymbol') }} {{ calculateData.point_money | moneyFormat }} @@ -379,7 +379,7 @@ - 兑换券抵扣 + 积分抵扣 - {{ $lang('common.currencySymbol') }} diff --git a/components/common-payment/payment.js b/components/common-payment/payment.js index be999c7..095d82b 100644 --- a/components/common-payment/payment.js +++ b/components/common-payment/payment.js @@ -77,7 +77,7 @@ export default { calculateGoodsData(){ if (this.calculateData) return this.calculateData.shop_goods_list; }, - // 消费券可抵扣金额 + // 余额可抵扣金额 balanceDeduct() { if (this.calculateData) { if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) { @@ -728,7 +728,7 @@ export default { this.calculate(); }, /** - * 使用兑换券抵扣 + * 使用积分抵扣 */ usePoint() { this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1; diff --git a/components/diy-components/diy-many-goods-list.vue b/components/diy-components/diy-many-goods-list.vue index 547869a..b9288fb 100644 --- a/components/diy-components/diy-many-goods-list.vue +++ b/components/diy-components/diy-many-goods-list.vue @@ -34,7 +34,7 @@ {{ item.point }} - 兑换券 + 积分 + {{ $lang('common.currencySymbol') }} @@ -53,7 +53,7 @@ - + @@ -106,7 +106,16 @@ export default { goodsValue: null, // 商品列表数据 goodsList: [], list : [], - msg: '' + msg: '暂无捡漏商品', + status_text: { + 1 : '库存', + 2 : '正在销售', + 3 : '已售出', + 4 : '提货中', + 5 : '提货完成', + 6 : '待支付', + 7 : '捡漏', + }, }; }, created() { @@ -158,7 +167,7 @@ export default { // this.$refs.diyGoodsList.goodsValue = this.goodsValue; // this.$refs.diyGoodsList.getGoodsList(); }, - //获取兑换券商品详情 + //获取积分商品详情 getData(mescroll) { this.$api.sendRequest({ url: '/pointexchange/api/goods/page', diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue index e2801ce..1acff02 100644 --- a/components/diy-components/diy-member-info.vue +++ b/components/diy-components/diy-member-info.vue @@ -90,28 +90,28 @@ > - - - - + + + + + + + + + + @@ -146,28 +146,28 @@ > - - - - + + + + + + + + + + diff --git a/components/diy-components/diy-pinfan.vue b/components/diy-components/diy-pinfan.vue index 20d4e95..f8c12fc 100644 --- a/components/diy-components/diy-pinfan.vue +++ b/components/diy-components/diy-pinfan.vue @@ -47,7 +47,7 @@ }" > {{ value.btnStyle.text }} - 返{{ item.reward_type_num }}兑换券 + 返{{ item.reward_type_num }}积分 返￥{{ item.reward_type_num }} 返优惠券 @@ -79,7 +79,7 @@ {{ item.pintuan_num }}人团 - 返{{ item.reward_type_num }}兑换券 + 返{{ item.reward_type_num }}积分 - 返{{ item.reward_type_num }}兑换券 + 返{{ item.reward_type_num }}积分 {{ parseFloat(birthday.point) }} - 兑换券 + 积分 用于下单时抵现或兑换商品等 diff --git a/components/ns-goods-sku/ns-goods-sku.vue b/components/ns-goods-sku/ns-goods-sku.vue index 3739434..aad69e1 100644 --- a/components/ns-goods-sku/ns-goods-sku.vue +++ b/components/ns-goods-sku/ns-goods-sku.vue @@ -19,7 +19,7 @@ - {{ goodsDetail.point }}兑换券 + {{ goodsDetail.point }}积分 + {{ $lang('common.currencySymbol') }}{{ goodsDetail.exchange_price }} @@ -32,7 +32,7 @@ {{ goodsDetail.name }} - 兑换券： + 积分： {{ goodsDetail.point }} @@ -723,7 +723,7 @@ export default { } }); }, - // 【兑换券】获取所有规格信息 + // 【积分】获取所有规格信息 getPointGoodsSkuList() { this.$api.sendRequest({ url: '/pointexchange/api/goods/goodsSku', @@ -1361,7 +1361,7 @@ export default { } }); } else if (this.type == 'point') { - // 兑换券兑换 + // 积分兑换 var data = { id: this.goodsDetail.exchange_id, sku_id: this.skuId, diff --git a/components/ns-new-gift/ns-new-gift.vue b/components/ns-new-gift/ns-new-gift.vue index 060deec..8b15123 100644 --- a/components/ns-new-gift/ns-new-gift.vue +++ b/components/ns-new-gift/ns-new-gift.vue @@ -20,7 +20,7 @@ {{ newgift.award_list.point }} - 兑换券 + 积分 用于参与活动购买商品时抵扣 diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue index 37d237b..4500e7a 100644 --- a/components/ns-payment/ns-payment.vue +++ b/components/ns-payment/ns-payment.vue @@ -15,7 +15,7 @@ - 消费券抵扣 + 余额抵扣 可用¥{{ balanceDeduct }} @@ -146,7 +146,7 @@ export default { close() { this.$refs.choosePaymentPopup.close(); }, - // 使用消费券 + // 使用余额 useBalance() { this.$emit('useBalance'); }, diff --git a/components/payment/payment.vue b/components/payment/payment.vue index bfd0f5c..dc8e4e9 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -15,7 +15,7 @@ - 消费券抵扣 + 余额抵扣 可用¥{{ balanceDeduct|moneyFormat }} @@ -61,7 +61,7 @@ nsSwitch }, props: { - // 是否可用消费券支付 + // 是否可用余额支付 balanceUsable: { type: Boolean, default: true @@ -128,7 +128,7 @@ this.$emit('close'); this.$refs.choosePaymentPopup.close(); }, - // 使用消费券 + // 使用余额 useBalance() { this.isBalance = this.isBalance ? 0 : 1; this.$emit('useBalance', this.isBalance) @@ -169,7 +169,7 @@ }); }, /** - * 获取消费券配置 + * 获取余额配置 */ getBalanceConfig() { this.$api.sendRequest({ @@ -181,7 +181,7 @@ }); }, /** - * 获取用户消费券 + * 获取用户余额 */ getMemberBalance() { this.$api.sendRequest({ diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue index d8ed7c1..a156c4f 100644 --- a/components/register-reward/register-reward.vue +++ b/components/register-reward/register-reward.vue @@ -11,12 +11,12 @@ - 兑换券奖励 + 积分奖励 {{ reward.point }} - 兑换券 + 积分 用于下单时抵现或兑换商品等 diff --git a/lang/zh-cn/goods/point.js b/lang/zh-cn/goods/point.js index 305fa38..4c12e0b 100644 --- a/lang/zh-cn/goods/point.js +++ b/lang/zh-cn/goods/point.js @@ -1,4 +1,4 @@ export const lang = { //title为每个页面的标题 - title: '兑换券中心' + title: '积分中心' } diff --git a/lang/zh-cn/member/balance.js b/lang/zh-cn/member/balance.js index e9673fc..49fb93d 100644 --- a/lang/zh-cn/member/balance.js +++ b/lang/zh-cn/member/balance.js @@ -1,13 +1,13 @@ export const lang = { //title为每个页面的标题 - title: '我的消费券', - accountBalance: '账户消费券 ', + title: '我的余额', + accountBalance: '账户余额 ', money:' (元)', recharge: '充值', withdrawal: '提现', - balanceDetailed: '消费券明细', - emptyTips: '暂无消费券记录', + balanceDetailed: '余额明细', + emptyTips: '暂无余额记录', rechargeRecord:'充值记录', - ableAccountBalance:'现金消费券 ', - noAccountBalance:'储值消费券 ', + ableAccountBalance:'现金余额 ', + noAccountBalance:'储值余额 ', } diff --git a/lang/zh-cn/member/balance_detail.js b/lang/zh-cn/member/balance_detail.js index af6cfd3..538ab54 100644 --- a/lang/zh-cn/member/balance_detail.js +++ b/lang/zh-cn/member/balance_detail.js @@ -1,4 +1,4 @@ export const lang = { //title为每个页面的标题 - title: '消费券明细' + title: '余额明细' } diff --git a/lang/zh-cn/member/index.js b/lang/zh-cn/member/index.js index bf1572e..197ce92 100644 --- a/lang/zh-cn/member/index.js +++ b/lang/zh-cn/member/index.js @@ -27,10 +27,10 @@ export const lang = { pintuanOrder: '拼团订单', yushouOrder: '预售订单', message: '我的消息', - exchangeOrder: '兑换券兑换', + exchangeOrder: '积分兑换', // 推广中心 - balance: '消费券', - point: '兑换券', + balance: '余额', + point: '积分', coupon: '优惠券', memberRecommend: '邀请有礼', myPresale: '我的预售', diff --git a/lang/zh-cn/member/point.js b/lang/zh-cn/member/point.js index dbf1a79..bd74dd9 100644 --- a/lang/zh-cn/member/point.js +++ b/lang/zh-cn/member/point.js @@ -1,4 +1,4 @@ export const lang = { //title为每个页面的标题 - title: '我的兑换券' + title: '我的积分' } diff --git a/lang/zh-cn/member/point_detail.js b/lang/zh-cn/member/point_detail.js index 6a1e7c5..5c33ed8 100644 --- a/lang/zh-cn/member/point_detail.js +++ b/lang/zh-cn/member/point_detail.js @@ -1,6 +1,6 @@ export const lang = { //title为每个页面的标题 - title: '兑换券明细', - emptyTpis: '您暂时还没有兑换券记录哦!', - pointExplain: '兑换券说明' + title: '积分明细', + emptyTpis: '您暂时还没有积分记录哦!', + pointExplain: '积分说明' } diff --git a/lang/zh-cn/point/list.js b/lang/zh-cn/point/list.js index 7b5fd33..35fa006 100644 --- a/lang/zh-cn/point/list.js +++ b/lang/zh-cn/point/list.js @@ -1,4 +1,4 @@ export const lang = { //title为每个页面的标题 - title: '兑换券商城' + title: '积分商城' } diff --git a/lang/zh-cn/point/order_detail.js b/lang/zh-cn/point/order_detail.js index ec11504..02b134b 100644 --- a/lang/zh-cn/point/order_detail.js +++ b/lang/zh-cn/point/order_detail.js @@ -1,4 +1,4 @@ export const lang = { //title为每个页面的标题 - title: '兑换券兑换订单详情' + title: '积分兑换订单详情' } diff --git a/lang/zh-cn/point/order_list.js b/lang/zh-cn/point/order_list.js index 6dbefad..5139a9a 100644 --- a/lang/zh-cn/point/order_list.js +++ b/lang/zh-cn/point/order_list.js @@ -1,5 +1,5 @@ export const lang = { //title为每个页面的标题 - title: '兑换券兑换', + title: '积分兑换', emptyTips: '暂无更多数据了' } diff --git a/node_modules/jweixin-module/README.md b/node_modules/jweixin-module/README.md index 7c91d7b..f4e08bd 100644 --- a/node_modules/jweixin-module/README.md +++ b/node_modules/jweixin-module/README.md @@ -19,8 +19,8 @@ https://unpkg.com/jweixin-module/out/index.js ## 使用 ```js -var jweixin = require('jweixin-module') -jweixin.ready(function(){ +var wx = require('jweixin-module') +wx.ready(function(){ // TODO }); ``` diff --git a/node_modules/jweixin-module/package.json b/node_modules/jweixin-module/package.json index c74eb4c..4f3cd45 100644 --- a/node_modules/jweixin-module/package.json +++ b/node_modules/jweixin-module/package.json @@ -1,27 +1,28 @@ { - "_from": "jweixin-module@1.6.0", - "_id": "jweixin-module@1.6.0", + "_from": "jweixin-module", + "_id": "jweixin-module@1.4.1", "_inBundle": false, - "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==", + "_integrity": "sha512-2R2oa1lYhAsclfjKSf3DP4ZiP1dcrQUbM7aklbeJA+UAg/LS7MqoA6UbTy1cs4sbB34z62K4bKW0Z9iazD8ejg==", "_location": "/jweixin-module", "_phantomChildren": {}, "_requested": { - "type": "version", + "type": "tag", "registry": true, - "raw": "jweixin-module@1.6.0", + "raw": "jweixin-module", "name": "jweixin-module", "escapedName": "jweixin-module", - "rawSpec": "1.6.0", + "rawSpec": "", "saveSpec": null, - "fetchSpec": "1.6.0" + "fetchSpec": "latest" }, "_requiredBy": [ + "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz", - "_shasum": "4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd", - "_spec": "jweixin-module@1.6.0", - "_where": "D:\\Web-Object\\rush-goods", + "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.4.1.tgz", + "_shasum": "1fc8fa42622243f6c35651d272cd587debf56cd1", + "_spec": "jweixin-module", + "_where": "E:\\demo\\niushop_uniapp", "author": { "name": "Shengqiang Guo" }, @@ -31,7 +32,10 @@ "bundleDependencies": false, "deprecated": false, "description": "微信JS-SDK", - "devDependencies": {}, + "devDependencies": { + "textfile": "^1.2.0", + "uglify-js": "^3.4.9" + }, "homepage": "https://github.com/zhetengbiji/jweixin-module#readme", "keywords": [ "wxjssdk", @@ -42,12 +46,15 @@ "wx" ], "license": "ISC", - "main": "lib/index.js", + "main": "out/index.js", "name": "jweixin-module", "repository": { "type": "git", "url": "git+https://github.com/zhetengbiji/jweixin-module.git" }, - "scripts": {}, - "version": "1.6.0" + "scripts": { + "build": "node build", + "prepublish": "npm run build" + }, + "version": "1.4.1" } diff --git a/pages.json b/pages.json index fe3c4bb..22d7574 100644 --- a/pages.json +++ b/pages.json @@ -94,7 +94,7 @@ // #endif } }, - //兑换券订单详情 + //积分订单详情 { "path": "pages/order/detail_point", "style": { @@ -522,7 +522,7 @@ // #endif } }, - //----------兑换券模块（2）---------- + //----------积分模块（2）---------- { "path": "point/list", "style": { diff --git a/pages/goods/public/js/detail.js b/pages/goods/public/js/detail.js index d804b1d..eb06b86 100644 --- a/pages/goods/public/js/detail.js +++ b/pages/goods/public/js/detail.js @@ -403,7 +403,7 @@ export default { if (item.point != undefined || item.coupon != undefined) { let text = ''; if (item.point != undefined) { - text = '送' + item.point + '兑换券'; + text = '送' + item.point + '积分'; } if (item.coupon != undefined && item.coupon_data != undefined) { item.coupon_data.forEach((couponItem, couponIndex) => { diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 3084936..a5db067 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -568,7 +568,7 @@ - 使用消费券 + 使用余额 - @@ -578,7 +578,7 @@ - 兑换券抵扣 + 积分抵扣 - diff --git a/pages/order/detail_point.vue b/pages/order/detail_point.vue index 4cae26f..1074935 100644 --- a/pages/order/detail_point.vue +++ b/pages/order/detail_point.vue @@ -29,7 +29,7 @@ - {{ orderData.point }}兑换券 + {{ orderData.point }}积分 + {{ $lang('common.currencySymbol') }} @@ -93,7 +93,7 @@ - 使用兑换券 + 使用积分 {{ orderData.point }} diff --git a/pages/order/payment.vue b/pages/order/payment.vue index 5d8e6eb..bc78e01 100644 --- a/pages/order/payment.vue +++ b/pages/order/payment.vue @@ -70,9 +70,9 @@ export default { content.mansong += '；' + '满' + item.limit + limit + text; } } - // 满送兑换券 + // 满送积分 if (item.point) { - let point_text = '可得' + item.point + '兑换券'; + let point_text = '可得' + item.point + '积分'; if(content.point_text == undefined) { content.point_text = '购物满' + item.limit + limit + point_text }else { diff --git a/pages_promotion/blindbox/index.vue b/pages_promotion/blindbox/index.vue index 5492bf6..78032f7 100644 --- a/pages_promotion/blindbox/index.vue +++ b/pages_promotion/blindbox/index.vue @@ -427,7 +427,7 @@ export default { } }); }, - // 使用消费券 + // 使用余额 useBalance() { if (this.is_balance) { this.is_balance = 0; @@ -603,7 +603,7 @@ export default { } }, computed: { - // 消费券抵扣 + // 余额抵扣 balanceDeduct() { if (this.info.member_info) { if (this.info.is_balance == 1) { diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue index 394a46b..549a7da 100644 --- a/pages_promotion/fenxiao/withdraw_apply.vue +++ b/pages_promotion/fenxiao/withdraw_apply.vue @@ -19,7 +19,7 @@ 请添加提现账户 提现到 - 消费券 + 余额 @@ -146,7 +146,7 @@ export default { if(res.data) this.bankAccountInfo = res.data; else if(this.payList && this.payList.balance){ - // 如果信息为空，将默认为消费券 + // 如果信息为空，将默认为余额 this.isBalance = 1; } } @@ -206,7 +206,7 @@ export default { } let withdrawType = this.isBalance ? 'balance' : this.bankAccountInfo.withdraw_type; - let branchBankName = this.isBalance ? "消费券" : this.bankAccountInfo.branch_bank_name; + let branchBankName = this.isBalance ? "余额" : this.bankAccountInfo.branch_bank_name; // #ifdef MP-WEIXIN // this.subscribeMessage(() => { this.$api.sendRequest({ diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue index e6f594d..b0938d4 100644 --- a/pages_promotion/fenxiao/withdraw_list.vue +++ b/pages_promotion/fenxiao/withdraw_list.vue @@ -8,7 +8,7 @@ - {{ item.transfer_type=='balance'&&'消费券' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }} + {{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }} {{ $util.timeStampTurnTime(item.create_time) }} diff --git a/pages_promotion/futures/order.vue b/pages_promotion/futures/order.vue index 237fc7c..c0a6423 100644 --- a/pages_promotion/futures/order.vue +++ b/pages_promotion/futures/order.vue @@ -4,7 +4,7 @@ - + diff --git a/pages_promotion/game/cards.vue b/pages_promotion/game/cards.vue index b0df14d..dc020f8 100644 --- a/pages_promotion/game/cards.vue +++ b/pages_promotion/game/cards.vue @@ -14,7 +14,7 @@ 刮开试试手气 - 点我刮奖{{ '(' + gameInfo.points + '兑换券)' }} + 点我刮奖{{ '(' + gameInfo.points + '积分)' }} 活动尚未开始 @@ -54,7 +54,7 @@ - 我的兑换券：{{ point }} + 我的积分：{{ point }} 我的中奖记录 @@ -87,7 +87,7 @@ 参与规则 每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。 每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。 - 每次抽奖需消耗 {{ gameInfo.points }} 兑换券 + 每次抽奖需消耗 {{ gameInfo.points }} 积分 该活动只有{{ gameInfo.level_name }}等级的会员可参与。 活动说明 @@ -303,7 +303,7 @@ export default { } if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { this.$util.showToast({ - title: '兑换券不足' + title: '积分不足' }); return; } @@ -332,7 +332,7 @@ export default { .exec(); // #endif - // 扣除次数 兑换券 + // 扣除次数 积分 this.point -= this.gameInfo.points; this.gameInfo.surplus_num -= 1; } else { diff --git a/pages_promotion/game/record.vue b/pages_promotion/game/record.vue index 5c066c4..f89517f 100644 --- a/pages_promotion/game/record.vue +++ b/pages_promotion/game/record.vue @@ -11,7 +11,7 @@ {{ item.award_name }} - 奖励详情：{{ item.point }}个兑换券 + 奖励详情：{{ item.point }}个积分 奖励详情：{{ item.balance }}元红包 奖励详情：优惠券“{{ item.relate_name }}” 中奖时间：{{ $util.timeStampTurnTime(item.create_time) }} diff --git a/pages_promotion/game/smash_eggs.vue b/pages_promotion/game/smash_eggs.vue index 796252d..6b11124 100644 --- a/pages_promotion/game/smash_eggs.vue +++ b/pages_promotion/game/smash_eggs.vue @@ -28,7 +28,7 @@ - 我的兑换券：{{ point }} + 我的积分：{{ point }} 我的中奖记录 @@ -70,7 +70,7 @@ - 恭喜您抽中{{ result.point }}个兑换券 + 恭喜您抽中{{ result.point }}个积分 恭喜您抽中{{ result.balance }}元红包 恭喜您抽中优惠券“{{ result.relate_name }}” @@ -103,7 +103,7 @@ 参与规则 每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。 每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。 - 每次抽奖需消耗 {{ gameInfo.points }} 兑换券 + 每次抽奖需消耗 {{ gameInfo.points }} 积分 该活动只有{{ gameInfo.level_name }}等级的会员可参与。 活动说明 @@ -284,7 +284,7 @@ export default { if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { this.$util.showToast({ - title: '兑换券不足' + title: '积分不足' }); return; } @@ -301,7 +301,7 @@ export default { this.result = res.data; this.start(); - // 扣除次数 兑换券 + // 扣除次数 积分 this.point -= this.gameInfo.points; this.gameInfo.surplus_num -= 1; } else { diff --git a/pages_promotion/game/turntable.vue b/pages_promotion/game/turntable.vue index 9a86267..420f58f 100644 --- a/pages_promotion/game/turntable.vue +++ b/pages_promotion/game/turntable.vue @@ -37,7 +37,7 @@ - 我的兑换券：{{ point }} + 我的积分：{{ point }} 我的中奖记录 @@ -94,7 +94,7 @@ 参与规则 每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。 每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。 - 每次抽奖需消耗 {{ gameInfo.points }} 兑换券 + 每次抽奖需消耗 {{ gameInfo.points }} 积分 该活动只有{{ gameInfo.level_name }}等级的会员可参与。 活动说明 @@ -284,7 +284,7 @@ export default { } if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { this.$util.showToast({ - title: '兑换券不足' + title: '积分不足' }); return; } @@ -312,7 +312,7 @@ export default { this.resultIndex = this.$util.inArray(-1, this.award); } - // 扣除次数 兑换券 + // 扣除次数 积分 this.point -= this.gameInfo.points; this.gameInfo.surplus_num -= 1; } else { diff --git a/pages_promotion/giftcard/card_use.vue b/pages_promotion/giftcard/card_use.vue index edbd18a..1d513d7 100644 --- a/pages_promotion/giftcard/card_use.vue +++ b/pages_promotion/giftcard/card_use.vue @@ -395,7 +395,7 @@ export default { calculateGoodsData() { if (this.calculateData) return this.calculateData.shop_goods_list; }, - // 消费券可抵扣金额 + // 余额可抵扣金额 balanceDeduct() { if (this.calculateData) { if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) { @@ -1065,7 +1065,7 @@ export default { this.calculate(); }, /** - * 使用兑换券抵扣 + * 使用积分抵扣 */ usePoint() { this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1; diff --git a/pages_promotion/pinfan/detail.vue b/pages_promotion/pinfan/detail.vue index 5417ffc..9d87070 100644 --- a/pages_promotion/pinfan/detail.vue +++ b/pages_promotion/pinfan/detail.vue @@ -63,7 +63,7 @@ {{ $lang('common.currencySymbol') }} {{ goodsSkuDetail.promotion_price }} --> 拼中得商品，未拼中 - 返{{ goodsSkuDetail.reward_type_num }}兑换券 + 返{{ goodsSkuDetail.reward_type_num }}积分 返￥{{ goodsSkuDetail.reward_type_num }} 返优惠券 @@ -108,7 +108,7 @@ 未拼中获得奖励 - 返{{ goodsSkuDetail.reward_type_num }}兑换券 + 返{{ goodsSkuDetail.reward_type_num }}积分 返￥{{ goodsSkuDetail.reward_type_num }} diff --git a/pages_promotion/pinfan/list.vue b/pages_promotion/pinfan/list.vue index 8674025..14a1b8d 100644 --- a/pages_promotion/pinfan/list.vue +++ b/pages_promotion/pinfan/list.vue @@ -68,7 +68,7 @@ 人拼团， {{ item.chengtuan_num }} 人拼中，未拼中返 - {{ item.reward_type_num }}兑换券 + {{ item.reward_type_num }}积分 ￥{{ item.reward_type_num }} 优惠券 diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue index 05aee15..6ee2a4e 100644 --- a/pages_promotion/point/detail.vue +++ b/pages_promotion/point/detail.vue @@ -36,7 +36,7 @@ - {{ pointInfo.point }}兑换券 + {{ pointInfo.point }}积分 @@ -191,7 +191,7 @@ - + @@ -280,7 +280,7 @@ export default { imageUrl = this.pointInfo.image; break; } - title = '仅需' + this.pointInfo.point + '兑换券即可兑换' + title; + title = '仅需' + this.pointInfo.point + '积分即可兑换' + title; imageUrl = this.$util.img(imageUrl); var route = this.$util.getCurrentShareRoute(this.memberId); var path = route.path; @@ -309,7 +309,7 @@ export default { imageUrl = this.pointInfo.image; break; } - title = '仅需' + this.pointInfo.point + '兑换券即可兑换' + title; + title = '仅需' + this.pointInfo.point + '积分即可兑换' + title; imageUrl = this.$util.img(imageUrl); var route = this.$util.getCurrentShareRoute(this.memberId); var query = route.query; @@ -337,7 +337,7 @@ export default { } }, methods: { - //获取个人兑换券信息 + //获取个人积分信息 getAccountInfo(e, f) { if (uni.getStorageSync('token')) { this.$api.sendRequest({ diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue index 20cea30..91c0674 100644 --- a/pages_promotion/point/goods_list.vue +++ b/pages_promotion/point/goods_list.vue @@ -17,7 +17,7 @@ 综合 - 兑换券 + 积分 @@ -58,7 +58,7 @@ {{ item.point }} - 兑换券 + 积分 + {{ $lang('common.currencySymbol') }} @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - 兑换券区间 + 积分区间 @@ -162,7 +162,7 @@ this.loadCategoryList(this.categoryId); }, methods: { - //获取兑换券商品详情 + //获取积分商品详情 getData(mescroll) { this.$api.sendRequest({ url: '/pointexchange/api/goods/page', diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue index 17e79b4..c8b6d13 100644 --- a/pages_promotion/point/list.vue +++ b/pages_promotion/point/list.vue @@ -12,7 +12,7 @@ - 登录后查看我的兑换券 + 登录后查看我的积分 @@ -23,7 +23,7 @@ > {{ point }} - 兑换券 + 积分 @@ -31,7 +31,7 @@ - 兑换券明细 + 积分明细 @@ -46,24 +46,24 @@ 提醒 - 兑换券兑好礼，每日上新换不停！ + 积分兑好礼，每日上新换不停！ - 兑换券换券 + 积分换券 更多好券，帮你省钱 @@ -84,7 +84,7 @@ - {{couponItem.point}}兑换券兑换 + {{couponItem.point}}积分兑换 {{couponItem.at_least == 0 ? '无门槛优惠券' : '满'+ parseFloat(couponItem.at_least).toFixed(0) +'可用'}} @@ -110,7 +110,7 @@ {{ couponItem.goods_type == 2 ? '指定券' : '全场券' }} - {{ couponItem.point }}兑换券 + {{ couponItem.point }}积分 兑换 @@ -122,7 +122,7 @@ - 兑换券换红包 + 积分换红包 红包在手，省钱有道 @@ -145,7 +145,7 @@ {{ hongbaoItem.name }} - {{ hongbaoItem.point }}兑换券 + {{ hongbaoItem.point }}积分 兑换 @@ -172,7 +172,7 @@ {{ item.point }} - 兑换券 + 积分 + {{ parseFloat(item.price).toFixed(2).split(".")[0] }} @@ -199,20 +199,20 @@ - 兑换券说明 + 积分说明 - 兑换券的获取 - 1、兑换券可在注册、签到、分享、消费、充值时获得。 - 2、在购买部分商品时可获得兑换券。 - 兑换券的使用 - 1、兑换券可用于兑换兑换券中心的商品。 - 2、兑换券可在参与某些活动时使用。 - 3、兑换券不得转让，出售，不设有效期。 - 兑换券的查询 - 1、兑换券可在会员中心中查询具体数额以及明细。 + 积分的获取 + 1、积分可在注册、签到、分享、消费、充值时获得。 + 2、在购买部分商品时可获得积分。 + 积分的使用 + 1、积分可用于兑换积分中心的商品。 + 2、积分可在参与某些活动时使用。 + 3、积分不得转让，出售，不设有效期。 + 积分的查询 + 1、积分可在会员中心中查询具体数额以及明细。 @@ -241,15 +241,15 @@ export default { categoryList: [ { id: 1, - name: '兑换券换好物' + name: '积分换好物' }, { id: 2, - name: '兑换券换券' + name: '积分换券' }, { id: 3, - name: '兑换券换红包' + name: '积分换红包' } ], isLogin: false, @@ -294,7 +294,7 @@ export default { setTimeout( () => { if (this.addonIsExist && !this.addonIsExist.pointexchange) { this.$util.showToast({ - title: '商家未开启兑换券商城', + title: '商家未开启积分商城', mask: true, duration: 2000 }); @@ -349,11 +349,11 @@ export default { jumpPage(url) { this.$util.redirectTo(url); }, - // 打开兑换券说明弹出层 + // 打开积分说明弹出层 openPointPopup() { this.$refs.pointPopup.open(); }, - // 打开兑换券说明弹出层 + // 打开积分说明弹出层 closePointPopup() { this.$refs.pointPopup.close(); }, @@ -405,7 +405,7 @@ export default { } }); }, - //获取兑换券商品详情 + //获取积分商品详情 getData(mescroll) { // this.mescroll = mescroll; this.$api.sendRequest({ diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue index 7ebc91f..f9d9cd9 100644 --- a/pages_promotion/point/order_list.vue +++ b/pages_promotion/point/order_list.vue @@ -40,7 +40,7 @@ {{ orderItem.point }} - 兑换券 + 积分 + {{ $lang('common.currencySymbol') }} @@ -70,7 +70,7 @@ - + @@ -104,7 +104,7 @@ setTimeout( () => { if (this.addonIsExist && !this.addonIsExist.pointexchange) { this.$util.showToast({ - title: '商家未开启兑换券商城', + title: '商家未开启积分商城', mask: true, duration: 2000 }); diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue index 73878e4..9f51f51 100644 --- a/pages_promotion/point/payment.vue +++ b/pages_promotion/point/payment.vue @@ -165,7 +165,7 @@ {{ orderPaymentData.exchange_info.point }} - 兑换券 + 积分