diff --git a/common/css/main.scss b/common/css/main.scss index 1a2e107..d3879e8 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/common/js/config.js b/common/js/config.js index 543e393..b59aae9 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -1,14 +1,14 @@ var config = { // api请求地址 - baseUrl: '', + baseUrl: 'https://zyhj.zoomtk.com/', // 图片域名 - imgDomain: '', + imgDomain: 'https://zyhj.zoomtk.com/', // H5端域名 - h5Domain: '', + h5Domain: 'https://zyhj.zoomtk.com/', // 腾讯地图key mpKey: '', //客服地址 - webSocket : '', + webSocket : 'https://zyhj.zoomtk.com/', //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒 pingInterval: 1500 }; diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue index dca6372..62da5c4 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 6c8c261..4370be8 100644 --- a/components/common-payment/payment.js +++ b/components/common-payment/payment.js @@ -74,7 +74,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)) { @@ -725,7 +725,7 @@ export default { this.calculate(); }, /** - * 使用积分抵扣 + * 使用兑换券抵扣 */ usePoint() { this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1; diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue index 57fdb07..e2801ce 100644 --- a/components/diy-components/diy-member-info.vue +++ b/components/diy-components/diy-member-info.vue @@ -18,23 +18,25 @@ {{ memberInfo.nickname }} - - - {{ memberInfo.member_level_name }} - - - - - {{ memberInfo.member_level_name }} + + + + + + + + + + + + + + + + + + 推荐码:{{memberInfo.rcode}} 复制 @@ -48,14 +50,14 @@ {{ memberInfo.nickname }} - - - {{ memberInfo.member_level_name }} - + + + + + + + + {{ memberInfo.member_level_name }} + 推荐码:{{memberInfo.rcode}} 复制 - + @@ -77,7 +80,7 @@ 登录/注册 点击登录 享受更多精彩信息 - + {{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }} - 余额 + 消费券 {{ memberInfo ? parseFloat(memberInfo.point) : '--' }} - 积分 + 兑换券 - - {{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }} - 优惠券 + + + + + @@ -133,18 +146,28 @@ > - - + + + + + + @@ -214,7 +237,8 @@ export default { avatarUrl: '', // 头像预览 headImg: '', // 头像保存 nickName: '', - completeInfoCallback: null + completeInfoCallback: null, + fenxiaoInfo: null, }; }, options: { styleIsolation: 'shared' }, @@ -285,11 +309,32 @@ export default { } }, methods: { + CopyText(){ + this.$util.copy(this.memberInfo.rcode); + }, init() { - if (uni.getStorageSync('token')) this.getMemberInfo(); - else this.memberInfo = null; + if (uni.getStorageSync('token')) { + this.getMemberInfo(); + + this.getFenxiaoInfo(); + } + else { + this.memberInfo = null; + this.fenxiaoInfo = null; + } this.getMemberCardInfo(); }, + getFenxiaoInfo(){ + this.$api.sendRequest({ + url: '/fenxiao/api/fenxiao/detail', + success: res => { + if (res.code >= 0) { + this.fenxiaoInfo=res.data; + } + } + }); + + }, /** * 查询会员信息 */ @@ -1027,6 +1072,21 @@ export default { } } } +.copy{ + display: flex; + color: #ffffff; + margin-top:3px; + .allmoney-top-btn { + margin-left: 8px; + color: #ffffff; + font-size: 14px; + border-radius: 18px; + background-color: #b78d39; + width: 50px; + // margin: auto; + text-align: center; + } +} diff --git a/pages_promotion/pinfan/detail.vue b/pages_promotion/pinfan/detail.vue index 9d87070..5417ffc 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 14a1b8d..8674025 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 6ee2a4e..05aee15 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 91c0674..20cea30 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 d0abda0..17e79b4 100644 --- a/pages_promotion/point/list.vue +++ b/pages_promotion/point/list.vue @@ -7,12 +7,12 @@ - - + - 积分明细 + 兑换券明细 @@ -40,30 +40,30 @@ - --> - + + - 我的积分 + 我的兑换券 {{point}} - 积分 + 兑换券 提醒 - 积分兑好礼，每日上新换不停！ + 兑换券兑好礼，每日上新换不停！ - 积分换券 + 兑换券换券 更多好券，帮你省钱 @@ -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 f9d9cd9..7ebc91f 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 9f51f51..73878e4 100644 --- a/pages_promotion/point/payment.vue +++ b/pages_promotion/point/payment.vue @@ -165,7 +165,7 @@ {{ orderPaymentData.exchange_info.point }} - 积分 + 兑换券