zhongyuanhaiju
/
uniapp
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【修改】个人中心

This commit is contained in:
liqianjin 2023-02-20 16:40:42 +08:00
parent 3e9a18639c
commit a8d5d0a513
70 changed files with 488 additions and 2017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/css/main.scss
View File

@ -480,8 +480,8 @@ uni-slider .uni-slider-track {
} }
} }
// ***************余额*************** // ***************消费券***************
// 余额背景色渐变 // 消费券背景色渐变
.balance-wrap { .balance-wrap {
// background: linear-gradient(to right, $base-color, mix($base-color, #fff, 70%)) !important; // background: linear-gradient(to right, $base-color, mix($base-color, #fff, 70%)) !important;
} }

8
common/js/config.js
View File

@ -1,14 +1,14 @@
var config = { var config = {
// api请求地址 // api请求地址
baseUrl: '', baseUrl: 'https://zyhj.zoomtk.com/',
// 图片域名 // 图片域名
imgDomain: '', imgDomain: 'https://zyhj.zoomtk.com/',
// H5端域名 // H5端域名
h5Domain: '', h5Domain: 'https://zyhj.zoomtk.com/',
// 腾讯地图key // 腾讯地图key
mpKey: '', mpKey: '',
//客服地址 //客服地址
webSocket : '', webSocket : 'https://zyhj.zoomtk.com/',
//本地端主动给服务器ping的时间, 0 则不开启 , 单位秒 //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
pingInterval: 1500 pingInterval: 1500
}; };

4
components/common-payment/common-payment.vue
View File

@ -279,7 +279,7 @@
</view> </view>
<view class="order-cell point" v-if="calculateGoodsData && calculateGoodsData.max_usable_point > 0"> <view class="order-cell point" v-if="calculateGoodsData && calculateGoodsData.max_usable_point > 0">
<text class="tit"> <text class="tit">
<text>使用{{ parseInt(calculateGoodsData.max_usable_point) }}积分可抵扣</text> <text>使用{{ parseInt(calculateGoodsData.max_usable_point) }}兑换券可抵扣</text>
<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text> <text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
<text class="money price-font">{{ calculateData.point_money | moneyFormat }}</text> <text class="money price-font">{{ calculateData.point_money | moneyFormat }}</text>
</text> </text>
@ -379,7 +379,7 @@
</view> </view>
</view> </view>
<view class="order-cell" v-if="calculateData.point_money > 0"> <view class="order-cell" v-if="calculateData.point_money > 0">
<text class="tit">积分抵扣</text> <text class="tit">兑换券抵扣</text>
<view class="box color-base-text"> <view class="box color-base-text">
<text class="operator">-</text> <text class="operator">-</text>
<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text> <text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>

4
components/common-payment/payment.js
View File

@ -74,7 +74,7 @@ export default {
calculateGoodsData(){ calculateGoodsData(){
if (this.calculateData) return this.calculateData.shop_goods_list; if (this.calculateData) return this.calculateData.shop_goods_list;
}, },
// 余额可抵扣金额 // 消费券可抵扣金额
balanceDeduct() { balanceDeduct() {
if (this.calculateData) { if (this.calculateData) {
if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) { if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) {
@ -725,7 +725,7 @@ export default {
this.calculate(); this.calculate();
}, },
/** /**
* 使用积分抵扣 * 使用兑换券抵扣
*/ */
usePoint() { usePoint() {
this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1; this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1;

144
components/diy-components/diy-member-info.vue
View File

@ -18,23 +18,25 @@
</block> </block>
<view class="nickname" v-else> <view class="nickname" v-else>
<text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text> <text class="name" @click="getWxAuth">{{ memberInfo.nickname }}</text>
<text <!-- <text-->
class="member-level" <!-- class="member-level"-->
v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level" <!-- v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level"-->
@click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')" <!-- @click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')"-->
> <!-- >-->
<text class="icondiy icon-system-huangguan"></text> <!-- <text class="icondiy icon-system-huangguan"></text>-->
{{ memberInfo.member_level_name }} <!-- {{ memberInfo.member_level_name }}-->
</text> <!-- </text>-->
</view>
<view
class="member-level"
v-if="value.style == 3 && memberInfo.member_level"
@click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')"
>
<image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="heightFix" class="level-icon"></image>
<view class="level-name">{{ memberInfo.member_level_name }}</view>
</view> </view>
<!-- <view-->
<!-- class="member-level"-->
<!-- v-if="value.style == 3 && memberInfo.member_level"-->
<!-- @click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')"-->
<!-- >-->
<!-- <image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="heightFix" class="level-icon"></image>-->
<!-- <view class="level-name">{{ memberInfo.member_level_name }}</view>-->
<!-- </view>-->
<view class="copy" >推荐码:{{memberInfo.rcode}} <view class="allmoney-top-btn" @click="CopyText">复制</view></view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
@ -48,14 +50,14 @@
</block> </block>
<view class="nickname" v-else> <view class="nickname" v-else>
<text class="name">{{ memberInfo.nickname }}</text> <text class="name">{{ memberInfo.nickname }}</text>
<text <!-- <text-->
class="member-level" <!-- class="member-level"-->
v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level" <!-- v-if="(value.style == 1 || value.style == 2) && memberInfo.member_level"-->
@click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')" <!-- @click="redirectBeforeAuth(memberInfo.member_level_type ? '/pages_tool/member/card' : '/pages_tool/member/level')"-->
> <!-- >-->
<text class="icondiy icon-system-huangguan"></text> <!-- <text class="icondiy icon-system-huangguan"></text>-->
{{ memberInfo.member_level_name }} <!-- {{ memberInfo.member_level_name }}-->
</text> <!-- </text>-->
</view> </view>
<view <view
class="member-level" class="member-level"
@ -65,9 +67,10 @@
<image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="heightFix" class="level-icon"></image> <image :src="$util.img('public/uniapp/member/supervip_icon.png')" mode="heightFix" class="level-icon"></image>
<view class="level-name">{{ memberInfo.member_level_name }}</view> <view class="level-name">{{ memberInfo.member_level_name }}</view>
</view> </view>
<view class="copy" >推荐码:{{memberInfo.rcode}} <view class="allmoney-top-btn" @click="CopyText">复制</view></view>
<!-- #endif --> <!-- #endif -->
</view> </view>
<text class="iconfont icon-qrcode member-code" @click="showMemberQrcode"></text> <!-- <text class="iconfont icon-qrcode member-code" @click="showMemberQrcode"></text>-->
<text class="iconfont icon-shezhi user-info" @click="$util.redirectTo('/pages_tool/member/info')"></text> <text class="iconfont icon-shezhi user-info" @click="$util.redirectTo('/pages_tool/member/info')"></text>
</view> </view>
@ -77,7 +80,7 @@
<view class="nickname"><text class="name">登录/注册</text></view> <view class="nickname"><text class="name">登录/注册</text></view>
<view class="desc">点击登录 享受更多精彩信息</view> <view class="desc">点击登录 享受更多精彩信息</view>
</view> </view>
<text class="iconfont icon-qrcode member-code"></text> <!-- <text class="iconfont icon-qrcode member-code"></text>-->
</view> </view>
<view <view
@ -87,18 +90,28 @@
> >
<view class="account-item" @click="redirect('/pages_tool/member/balance')"> <view class="account-item" @click="redirect('/pages_tool/member/balance')">
<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view> <view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
<view class="title">余额</view> <view class="title">消费券</view>
</view> </view>
<view class="solid"></view> <view class="solid"></view>
<view class="account-item" @click="redirect('/pages_tool/member/point')"> <view class="account-item" @click="redirect('/pages_tool/member/point')">
<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view> <view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view>
<view class="title">积分</view> <view class="title">兑换券</view>
</view> </view>
<view class="solid"></view> <view class="solid"></view>
<view class="account-item" @click="redirect('/pages_tool/member/coupon')"> <view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}</view> <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.points != undefined ? fenxiaoInfo.points : '--' }}</view>
<view class="title">优惠券</view> <view class="title">积分</view>
</view> </view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.contribution != undefined ? fenxiaoInfo.contribution : '--' }}</view>
<view class="title">贡献值</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.house_purchase != undefined ? fenxiaoInfo.house_purchase : '--' }}</view>
<view class="title">购房券</view>
</view>
</view> </view>
<view class="super-member" v-if="superMember" :style="superMemberStyle"> <view class="super-member" v-if="superMember" :style="superMemberStyle">
@ -133,18 +146,28 @@
> >
<view class="account-item" @click="redirect('/pages_tool/member/balance')"> <view class="account-item" @click="redirect('/pages_tool/member/balance')">
<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view> <view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
<view class="title">余额</view> <view class="title">消费券</view>
</view> </view>
<view class="solid"></view> <view class="solid"></view>
<view class="account-item" @click="redirect('/pages_tool/member/point')"> <view class="account-item" @click="redirect('/pages_tool/member/point')">
<view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point) : '--' }}</view> <view class="value price-font">{{ memberInfo ? parseFloat(memberInfo.point).toFixed(2) : '--' }}</view>
<view class="title">积分</view> <view class="title">兑换券</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_tool/member/coupon')">
<view class="value price-font">{{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }}</view>
<view class="title">优惠券</view>
</view> </view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.points != undefined ? fenxiaoInfo.points : '--' }}</view>
<view class="title">积分</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.contribution != undefined ? fenxiaoInfo.contribution : '--' }}</view>
<view class="title">贡献值</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.house_purchase != undefined ? fenxiaoInfo.house_purchase : '--' }}</view>
<view class="title">购房券</view>
</view>
</view> </view>
</view> </view>
@ -214,7 +237,8 @@ export default {
avatarUrl: '', // 头像预览 avatarUrl: '', // 头像预览
headImg: '', // 头像保存 headImg: '', // 头像保存
nickName: '', nickName: '',
completeInfoCallback: null completeInfoCallback: null,
fenxiaoInfo: null,
}; };
}, },
options: { styleIsolation: 'shared' }, options: { styleIsolation: 'shared' },
@ -285,11 +309,32 @@ export default {
} }
}, },
methods: { methods: {
CopyText(){
this.$util.copy(this.memberInfo.rcode);
},
init() { init() {
if (uni.getStorageSync('token')) this.getMemberInfo(); if (uni.getStorageSync('token')) {
else this.memberInfo = null; this.getMemberInfo();
this.getFenxiaoInfo();
}
else {
this.memberInfo = null;
this.fenxiaoInfo = null;
}
this.getMemberCardInfo(); 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;
}
}
</style> </style>
<style scoped> <style scoped>
.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom, .member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,

6
components/diy-components/diy-pinfan.vue
View File

@ -47,7 +47,7 @@
}" }"
> >
<text class="text">{{ value.btnStyle.text }}</text> <text class="text">{{ value.btnStyle.text }}</text>
<text class="fan" v-if="item.reward_type == 4">返{{ item.reward_type_num }}积分</text> <text class="fan" v-if="item.reward_type == 4">返{{ item.reward_type_num }}兑换券</text>
<text class="fan" v-if="item.reward_type == 1 || item.reward_type == 2">返￥{{ item.reward_type_num }}</text> <text class="fan" v-if="item.reward_type == 1 || item.reward_type == 2">返￥{{ item.reward_type_num }}</text>
<text class="fan" v-if="item.reward_type == 3">返优惠券</text> <text class="fan" v-if="item.reward_type == 3">返优惠券</text>
</button> </button>
@ -79,7 +79,7 @@
{{ item.pintuan_num }}人团 {{ item.pintuan_num }}人团
</text> </text>
<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4"> <text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4">
返{{ item.reward_type_num }}积分 返{{ item.reward_type_num }}兑换券
</text> </text>
<text <text
class="content-tuan-price" class="content-tuan-price"
@ -127,7 +127,7 @@
{{ item.pintuan_num }}人团 {{ item.pintuan_num }}人团
</text> </text>
<text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4"> <text class="content-tuan-price" :style="{ color: value.theme == 'diy' ? value.groupStyle.bgColor : '' }" v-if="item.reward_type == 4">
返{{ item.reward_type_num }}积分 返{{ item.reward_type_num }}兑换券
</text> </text>
<text <text
class="content-tuan-price" class="content-tuan-price"

2
components/ns-birthday-gift/ns-birthday-gift.vue
View File

@ -18,7 +18,7 @@
<view class="info"> <view class="info">
<text class="num"> <text class="num">
{{ parseFloat(birthday.point) }} {{ parseFloat(birthday.point) }}
<text class="type">积分</text> <text class="type">兑换券</text>
</text> </text>
<view class="desc">用于下单时抵现或兑换商品等</view> <view class="desc">用于下单时抵现或兑换商品等</view>
</view> </view>

2
components/ns-copyright/ns-copyright.vue
View File

@ -14,7 +14,7 @@
export default { export default {
data() { data() {
return { return {
show: true show: false
}; };
}, },
created() {}, created() {},

8
components/ns-goods-sku/ns-goods-sku.vue
View File

@ -19,7 +19,7 @@
<block v-if="type == 'point'"> <block v-if="type == 'point'">
<block v-if="goodsDetail.type == 1"> <block v-if="goodsDetail.type == 1">
<view class="price-wrap"> <view class="price-wrap">
<text class="price price-color font-size-toolbar">{{ goodsDetail.point }}积分</text> <text class="price price-color font-size-toolbar">{{ goodsDetail.point }}兑换券</text>
<block v-if="goodsDetail.exchange_price != '0.00' && goodsDetail.pay_type > 0"> <block v-if="goodsDetail.exchange_price != '0.00' && goodsDetail.pay_type > 0">
<text class="unit price-color font-size-tag">+</text> <text class="unit price-color font-size-tag">+</text>
<text class="price price-color font-size-toolbar price-font">{{ $lang('common.currencySymbol') }}{{ goodsDetail.exchange_price }}</text> <text class="price price-color font-size-toolbar price-font">{{ $lang('common.currencySymbol') }}{{ goodsDetail.exchange_price }}</text>
@ -32,7 +32,7 @@
<view class="price font-size-toolbar">{{ goodsDetail.name }}</view> <view class="price font-size-toolbar">{{ goodsDetail.name }}</view>
</view> </view>
<view class="stock" style="height: auto;"> <view class="stock" style="height: auto;">
积分： 兑换券：
<text class="price-color">{{ goodsDetail.point }}</text> <text class="price-color">{{ goodsDetail.point }}</text>
</view> </view>
<view class="stock"> <view class="stock">
@ -723,7 +723,7 @@ export default {
} }
}); });
}, },
// 【积分】获取所有规格信息 // 【兑换券】获取所有规格信息
getPointGoodsSkuList() { getPointGoodsSkuList() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/pointexchange/api/goods/goodsSku', url: '/pointexchange/api/goods/goodsSku',
@ -1361,7 +1361,7 @@ export default {
} }
}); });
} else if (this.type == 'point') { } else if (this.type == 'point') {
// 积分兑换 // 兑换券兑换
var data = { var data = {
id: this.goodsDetail.exchange_id, id: this.goodsDetail.exchange_id,
sku_id: this.skuId, sku_id: this.skuId,

2
components/ns-new-gift/ns-new-gift.vue
View File

@ -20,7 +20,7 @@
<view class="info"> <view class="info">
<text class="num"> <text class="num">
{{ newgift.award_list.point }} {{ newgift.award_list.point }}
<text class="type">积分</text> <text class="type">兑换券</text>
</text> </text>
<view class="desc">用于参与活动购买商品时抵扣</view> <view class="desc">用于参与活动购买商品时抵扣</view>
</view> </view>

4
components/ns-payment/ns-payment.vue
View File

@ -15,7 +15,7 @@
<view class="payment-item" v-if="balanceDeduct > 0 && balanceConfig == 1 && sale"> <view class="payment-item" v-if="balanceDeduct > 0 && balanceConfig == 1 && sale">
<view class="iconfont icon-yue"></view> <view class="iconfont icon-yue"></view>
<view class="info-wrap"> <view class="info-wrap">
<text class="name">余额抵扣</text> <text class="name">消费券抵扣</text>
<view class="money">可用¥{{ balanceDeduct }}</view> <view class="money">可用¥{{ balanceDeduct }}</view>
</view> </view>
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch> <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
@ -146,7 +146,7 @@ export default {
close() { close() {
this.$refs.choosePaymentPopup.close(); this.$refs.choosePaymentPopup.close();
}, },
// 使用余额 // 使用消费券
useBalance() { useBalance() {
this.$emit('useBalance'); this.$emit('useBalance');
}, },

10
components/payment/payment.vue
View File

@ -15,7 +15,7 @@
<view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1"> <view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
<view class="iconfont icon-yue"></view> <view class="iconfont icon-yue"></view>
<view class="info-wrap"> <view class="info-wrap">
<text class="name">余额抵扣</text> <text class="name">消费券抵扣</text>
<view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view> <view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view>
</view> </view>
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch> <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
@ -61,7 +61,7 @@
nsSwitch nsSwitch
}, },
props: { props: {
// 是否可用余额支付 // 是否可用消费券支付
balanceUsable: { balanceUsable: {
type: Boolean, type: Boolean,
default: true default: true
@ -128,7 +128,7 @@
this.$emit('close'); this.$emit('close');
this.$refs.choosePaymentPopup.close(); this.$refs.choosePaymentPopup.close();
}, },
// 使用余额 // 使用消费券
useBalance() { useBalance() {
this.isBalance = this.isBalance ? 0 : 1; this.isBalance = this.isBalance ? 0 : 1;
this.$emit('useBalance', this.isBalance) this.$emit('useBalance', this.isBalance)
@ -169,7 +169,7 @@
}); });
}, },
/** /**
* 获取余额配置 * 获取消费券配置
*/ */
getBalanceConfig() { getBalanceConfig() {
this.$api.sendRequest({ this.$api.sendRequest({
@ -181,7 +181,7 @@
}); });
}, },
/** /**
* 获取用户余额 * 获取用户消费券
*/ */
getMemberBalance() { getMemberBalance() {
this.$api.sendRequest({ this.$api.sendRequest({

4
components/register-reward/register-reward.vue
View File

@ -11,12 +11,12 @@
<scroll-view scroll-y="true" class="register-box"> <scroll-view scroll-y="true" class="register-box">
<view class="reward-content"> <view class="reward-content">
<view class="reward-item" v-if="reward.point > 0"> <view class="reward-item" v-if="reward.point > 0">
<view class="head">积分奖励</view> <view class="head">兑换券奖励</view>
<view class="content"> <view class="content">
<view class="info"> <view class="info">
<view> <view>
<text class="num">{{ reward.point }}</text> <text class="num">{{ reward.point }}</text>
<text class="type">积分</text> <text class="type">兑换券</text>
</view> </view>
<view class="desc">用于下单时抵现或兑换商品等</view> <view class="desc">用于下单时抵现或兑换商品等</view>
</view> </view>

2
lang/zh-cn/goods/point.js
View File

@ -1,4 +1,4 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '积分中心' title: '兑换券中心'
} }

12
lang/zh-cn/member/balance.js
View File

@ -1,13 +1,13 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '我的余额', title: '我的消费券',
accountBalance: '账户余额 ', accountBalance: '账户消费券 ',
money:' (元)', money:' (元)',
recharge: '充值', recharge: '充值',
withdrawal: '提现', withdrawal: '提现',
balanceDetailed: '余额明细', balanceDetailed: '消费券明细',
emptyTips: '暂无余额记录', emptyTips: '暂无消费券记录',
rechargeRecord:'充值记录', rechargeRecord:'充值记录',
ableAccountBalance:'现金余额 ', ableAccountBalance:'现金消费券 ',
noAccountBalance:'储值余额 ', noAccountBalance:'储值消费券 ',
} }

2
lang/zh-cn/member/balance_detail.js
View File

@ -1,4 +1,4 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '余额明细' title: '消费券明细'
} }

6
lang/zh-cn/member/index.js
View File

@ -27,10 +27,10 @@ export const lang = {
pintuanOrder: '拼团订单', pintuanOrder: '拼团订单',
yushouOrder: '预售订单', yushouOrder: '预售订单',
message: '我的消息', message: '我的消息',
exchangeOrder: '积分兑换', exchangeOrder: '兑换券兑换',
// 推广中心 // 推广中心
balance: '余额', balance: '消费券',
point: '积分', point: '兑换券',
coupon: '优惠券', coupon: '优惠券',
memberRecommend: '邀请有礼', memberRecommend: '邀请有礼',
myPresale: '我的预售', myPresale: '我的预售',

2
lang/zh-cn/member/point.js
View File

@ -1,4 +1,4 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '我的积分' title: '我的兑换券'
} }

6
lang/zh-cn/member/point_detail.js
View File

@ -1,6 +1,6 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '积分明细', title: '兑换券明细',
emptyTpis: '您暂时还没有积分记录哦!', emptyTpis: '您暂时还没有兑换券记录哦!',
pointExplain: '积分说明' pointExplain: '兑换券说明'
} }

2
lang/zh-cn/point/list.js
View File

@ -1,4 +1,4 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '积分商城' title: '兑换券商城'
} }

2
lang/zh-cn/point/order_detail.js
View File

@ -1,4 +1,4 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '积分兑换订单详情' title: '兑换券兑换订单详情'
} }

2
lang/zh-cn/point/order_list.js
View File

@ -1,5 +1,5 @@
export const lang = { export const lang = {
//title为每个页面的标题 //title为每个页面的标题
title: '积分兑换', title: '兑换券兑换',
emptyTips: '暂无更多数据了' emptyTips: '暂无更多数据了'
} }

17
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "单商户V4", "name" : "单商户V4",
"appid" : "__UNI__AFF44C0", "appid" : "__UNI__460ACE5",
"description" : "", "description" : "",
"versionName" : "5.1.2", "versionName" : "5.1.2",
"versionCode" : "100", "versionCode" : "100",
@ -58,7 +58,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "", "appid" : "wx8bbb428472fccb07",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"postcss" : false, "postcss" : false,
@ -71,12 +71,11 @@
"desc" : "为了更好地为您提供服务" "desc" : "为了更好地为您提供服务"
} }
}, },
"plugins" : { "plugins" : {},
"live-player-plugin" : { // "live-player-plugin" : {
"version" : "1.2.0", // "version" : "1.2.0",
"provider" : "wx2b03c6e691cd7370" // "provider" : "wx2b03c6e691cd7370"
} // }
},
"requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ] "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ]
}, },
"mp-alipay" : { "mp-alipay" : {
@ -97,7 +96,7 @@
} }
}, },
"router" : { "router" : {
"mode" : "history", "mode" : "hash",
"base" : "/h5/" "base" : "/h5/"
}, },
"title" : " ", "title" : " ",

21
pages.json
View File

@ -94,7 +94,7 @@
// #endif // #endif
} }
}, },
//积分订单详情 //兑换券订单详情
{ {
"path": "pages/order/detail_point", "path": "pages/order/detail_point",
"style": { "style": {
@ -522,7 +522,7 @@
// #endif // #endif
} }
}, },
//----------积分模块（2）---------- //----------兑换券模块（2）----------
{ {
"path": "point/list", "path": "point/list",
"style": { "style": {
@ -622,15 +622,16 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
// {
// "path": "jielong/jielong",
// "style": {
// //#ifdef H5
// "navigationStyle": "custom",
// //#endif
// "navigationBarTitleText": "社群接龙"
// }
// },
{ {
"path": "jielong/jielong",
"style": {
//#ifdef H5
"navigationStyle": "custom",
//#endif
"navigationBarTitleText": "社群接龙"
}
}, {
"path": "giftcard/index", "path": "giftcard/index",
"style": { "style": {
//#ifdef H5 //#ifdef H5

2
pages/goods/public/js/detail.js
View File

@ -403,7 +403,7 @@ export default {
if (item.point != undefined || item.coupon != undefined) { if (item.point != undefined || item.coupon != undefined) {
let text = ''; let text = '';
if (item.point != undefined) { if (item.point != undefined) {
text = '送' + item.point + '积分'; text = '送' + item.point + '兑换券';
} }
if (item.coupon != undefined && item.coupon_data != undefined) { if (item.coupon != undefined && item.coupon_data != undefined) {
item.coupon_data.forEach((couponItem, couponIndex) => { item.coupon_data.forEach((couponItem, couponIndex) => {

13
pages/member/public/js/index.js
View File

@ -2,6 +2,7 @@ export default {
data() { data() {
return { return {
memberInfo: null, memberInfo: null,
fenxiaoInfo:{},
}; };
}, },
computed: { computed: {
@ -13,6 +14,7 @@ export default {
storeToken: function(nVal, oVal) { storeToken: function(nVal, oVal) {
if (nVal) { if (nVal) {
this.getMemberInfo(); this.getMemberInfo();
this.getFenxiaoInfo();
if (uni.getStorageSync('source_member')) this.$util.onSourceMember(uni.getStorageSync( if (uni.getStorageSync('source_member')) this.$util.onSourceMember(uni.getStorageSync(
'source_member')); 'source_member'));
} }
@ -46,6 +48,17 @@ export default {
} }
}, },
methods: { methods: {
getFenxiaoInfo(){
this.$api.sendRequest({
url: '/fenxiao/api/fenxiao/detail',
success: res => {
if (res.code >= 0) {
this.fenxiaoInfo=res.data;
}
}
});
},
/** /**
* 自定义跳转 * 自定义跳转
* @param {Object} data * @param {Object} data

4
pages/order/detail.vue
View File

@ -568,7 +568,7 @@
</view> </view>
</view> </view>
<view class="order-cell" v-if="orderData.balance_money > 0"> <view class="order-cell" v-if="orderData.balance_money > 0">
<text class="tit">使用余额</text> <text class="tit">使用消费券</text>
<view class="box align-right"> <view class="box align-right">
<text class="color-base-text price-font"> <text class="color-base-text price-font">
<text class="operator">-</text> <text class="operator">-</text>
@ -578,7 +578,7 @@
</view> </view>
</view> </view>
<view class="order-cell" v-if="orderData.point_money > 0"> <view class="order-cell" v-if="orderData.point_money > 0">
<text class="tit">积分抵扣</text> <text class="tit">兑换券抵扣</text>
<view class="box align-right"> <view class="box align-right">
<text class="color-base-text price-font"> <text class="color-base-text price-font">
<text class="operator">-</text> <text class="operator">-</text>

4
pages/order/detail_point.vue
View File

@ -29,7 +29,7 @@
<view> <view>
<text class="goods-price color-base-text"> <text class="goods-price color-base-text">
<text> <text>
<text>{{ orderData.point }}积分</text> <text>{{ orderData.point }}兑换券</text>
<text v-if="orderData.price > 0" class="price-color"> <text v-if="orderData.price > 0" class="price-color">
+ +
<text class="unit">{{ $lang('common.currencySymbol') }}</text> <text class="unit">{{ $lang('common.currencySymbol') }}</text>
@ -93,7 +93,7 @@
<!-- 订单金额 --> <!-- 订单金额 -->
<view class="order-money"> <view class="order-money">
<view class="order-cell" v-if="orderData.point > 0"> <view class="order-cell" v-if="orderData.point > 0">
<text class="tit">使用积分</text> <text class="tit">使用兑换券</text>
<view class="box align-right"> <view class="box align-right">
<text class="color-base-text price-font"> <text class="color-base-text price-font">
<text>{{ orderData.point }}</text> <text>{{ orderData.point }}</text>

4
pages/order/payment.vue
View File

@ -70,9 +70,9 @@ export default {
content.mansong += '；' + '满' + item.limit + limit + text; content.mansong += '；' + '满' + item.limit + limit + text;
} }
} }
// 满送积分 // 满送兑换券
if (item.point) { if (item.point) {
let point_text = '可得' + item.point + '积分'; let point_text = '可得' + item.point + '兑换券';
if(content.point_text == undefined) { if(content.point_text == undefined) {
content.point_text = '购物满' + item.limit + limit + point_text content.point_text = '购物满' + item.limit + limit + point_text
}else { }else {

4
pages_promotion/blindbox/index.vue
View File

@ -427,7 +427,7 @@ export default {
} }
}); });
}, },
// 使用余额 // 使用消费券
useBalance() { useBalance() {
if (this.is_balance) { if (this.is_balance) {
this.is_balance = 0; this.is_balance = 0;
@ -603,7 +603,7 @@ export default {
} }
}, },
computed: { computed: {
// 余额抵扣 // 消费券抵扣
balanceDeduct() { balanceDeduct() {
if (this.info.member_info) { if (this.info.member_info) {
if (this.info.is_balance == 1) { if (this.info.is_balance == 1) {

6
pages_promotion/fenxiao/bill.vue
View File

@ -8,6 +8,7 @@
<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image> <image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
<view class="balances-info"> <view class="balances-info">
<text>{{ item.type_name }}</text> <text>{{ item.type_name }}</text>
<text>{{ item.remarks }}</text>
<text>账单编号: {{ item.account_no }}</text> <text>账单编号: {{ item.account_no }}</text>
<text>{{ $util.timeStampTurnTime(item.create_time) }}</text> <text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
</view> </view>
@ -135,6 +136,11 @@ export default {
margin-top: 19rpx; margin-top: 19rpx;
color: $color-tip; color: $color-tip;
} }
&:nth-child(4) {
font-size: $font-size-tag;
margin-top: 19rpx;
color: $color-tip;
}
} }
} }

117
pages_promotion/fenxiao/index.vue
View File

@ -29,31 +29,53 @@
</view> </view>
</view> </view>
<view class="fenxiao-index-allmoney"> <!-- <view class="fenxiao-index-allmoney">-->
<view class="allmoney-top-money"> <!-- <view class="allmoney-top-money">-->
<view class="allmoney-top"> <!-- <view class="allmoney-top">-->
<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view> <!-- <view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>-->
<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">提现记录<text class="iconfont icon-right"></text></view> <!-- <view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">提现记录<text class="iconfont icon-right"></text></view>-->
</view> <!-- </view>-->
<view class="total-commission price-font">{{ info.account }}</view> <!-- <view class="total-commission price-font">{{ info.account }}</view>-->
</view> <!-- </view>-->
<view class="allmoney-bottom"> <!-- <view class="allmoney-bottom">-->
<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')"> <!-- <view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">-->
<view class="title">总{{ fenxiaoWords.account }}</view> <!-- <view class="title">总{{ fenxiaoWords.account }}</view>-->
<view class="money price-font">{{ info.total_commission | moneyFormat }}</view> <!-- <view class="money price-font">{{ info.total_commission | moneyFormat }}</view>-->
</view> <!-- </view>-->
<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')"> <!-- <view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">-->
<view class="title">已提现{{ fenxiaoWords.account }}</view> <!-- <view class="title">已提现{{ fenxiaoWords.account }}</view>-->
<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view> <!-- <view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>-->
</view> <!-- </view>-->
<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')"> <!-- <view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">-->
<view class="title">提现中{{ fenxiaoWords.account }}</view> <!-- <view class="title">提现中{{ fenxiaoWords.account }}</view>-->
<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view> <!-- <view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">申请提现</view> <!-- <view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">申请提现</view>-->
</view> <!-- </view>-->
<view
class="account-info">
<!-- v-show="value.style == 2"-->
<!-- :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }"-->
<!-- <view class="solid"></view>-->
<view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ info && info.points != undefined ? info.points : '--' }}</view>
<view class="title">积分</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ info && info.contribution != undefined ? info.contribution : '--' }}</view>
<view class="title">贡献值</view>
</view>
<view class="solid"></view>
<view class="account-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
<view class="value price-font">{{ info && info.house_purchase != undefined ? info.house_purchase : '--' }}</view>
<view class="title">购房券</view>
</view>
</view>
<view class="fenxiao-team"> <view class="fenxiao-team">
<view class="fenxiao-index-other"> <view class="fenxiao-index-other">
@ -499,6 +521,53 @@
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
.account-info {
display: flex;
padding: 40rpx 0;
align-items: center;
justify-content: center;
view {
color: #fff;
}
.solid {
height: 70rpx;
width: 2rpx;
background: #fff;
border-radius: 2rpx;
}
.account-item {
flex: 1;
text-align: center;
.value {
font-size: 34rpx;
font-weight: bold !important;
margin-bottom: 4rpx;
line-height: 1.3;
}
.title {
font-size: 26rpx;
}
}
}
.account-info {
width: 100%;
background: #fff;
margin: 20rpx 0 0 0;
color: #333;
border-radius: 18rpx;
.solid {
background: #f2f2f2;
}
.account-item {
.value {
color: #000000;
}
.title {
color: #666666;
}
}
}
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box { /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
background: none; background: none;
max-height: unset !important; max-height: unset !important;

6
pages_promotion/fenxiao/withdraw_apply.vue
View File

@ -19,7 +19,7 @@
<text class="tx-to" v-else-if="!isBalance">请添加提现账户</text> <text class="tx-to" v-else-if="!isBalance">请添加提现账户</text>
<view class="tx-wrap" v-else="isBalance"> <view class="tx-wrap" v-else="isBalance">
<text class="tx-to">提现到</text> <text class="tx-to">提现到</text>
<view class="tx-bank">余额</view> <view class="tx-bank">消费券</view>
<view class="tx-img"> <view class="tx-img">
<image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix"></image>
</view> </view>
@ -146,7 +146,7 @@ export default {
if(res.data) if(res.data)
this.bankAccountInfo = res.data; this.bankAccountInfo = res.data;
else if(this.payList && this.payList.balance){ else if(this.payList && this.payList.balance){
// 如果信息为空，将默认为余额 // 如果信息为空，将默认为消费券
this.isBalance = 1; this.isBalance = 1;
} }
} }
@ -206,7 +206,7 @@ export default {
} }
let withdrawType = this.isBalance ? 'balance' : this.bankAccountInfo.withdraw_type; 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 // #ifdef MP-WEIXIN
// this.subscribeMessage(() => { // this.subscribeMessage(() => {
this.$api.sendRequest({ this.$api.sendRequest({

2
pages_promotion/fenxiao/withdraw_list.vue
View File

@ -8,7 +8,7 @@
<view class="cont"> <view class="cont">
<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)"> <view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
<view class="info"> <view class="info">
<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view> <view class="event">{{ item.transfer_type=='balance'&&'消费券' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
<view> <view>
<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text> <text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
</view> </view>

10
pages_promotion/game/cards.vue
View File

@ -14,7 +14,7 @@
<block v-if="gameInfo.status == 1"> <block v-if="gameInfo.status == 1">
<view class="text">刮开试试手气</view> <view class="text">刮开试试手气</view>
<view class="btn color-base-bg" :class="{ disabled: gameInfo.surplus_num == 0 }" @click="lottery"> <view class="btn color-base-bg" :class="{ disabled: gameInfo.surplus_num == 0 }" @click="lottery">
点我刮奖{{ '(' + gameInfo.points + '积分)' }} 点我刮奖{{ '(' + gameInfo.points + '兑换券)' }}
</view> </view>
</block> </block>
<block v-else-if="gameInfo.status == 0"><view class="text">活动尚未开始</view></block> <block v-else-if="gameInfo.status == 0"><view class="text">活动尚未开始</view></block>
@ -54,7 +54,7 @@
</view> </view>
<!-- 操作 --> <!-- 操作 -->
<view class="action-text"> <view class="action-text">
<view class="point">我的积分：{{ point }}</view> <view class="point">我的兑换券：{{ point }}</view>
<view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view> <view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view>
</view> </view>
<!-- 中奖名单 --> <!-- 中奖名单 -->
@ -87,7 +87,7 @@
<view class="tit">参与规则</view> <view class="tit">参与规则</view>
<view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view> <view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view>
<view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view> <view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view>
<view class="text">每次抽奖需消耗 {{ gameInfo.points }} 积分</view> <view class="text">每次抽奖需消耗 {{ gameInfo.points }} 兑换券</view>
<view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view> <view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view>
<block v-if="gameInfo.remark != ''"> <block v-if="gameInfo.remark != ''">
<view class="tit">活动说明</view> <view class="tit">活动说明</view>
@ -303,7 +303,7 @@ export default {
} }
if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) {
this.$util.showToast({ this.$util.showToast({
title: '积分不足' title: '兑换券不足'
}); });
return; return;
} }
@ -332,7 +332,7 @@ export default {
.exec(); .exec();
// #endif // #endif
// 扣除次数 积分 // 扣除次数 兑换券
this.point -= this.gameInfo.points; this.point -= this.gameInfo.points;
this.gameInfo.surplus_num -= 1; this.gameInfo.surplus_num -= 1;
} else { } else {

2
pages_promotion/game/record.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view class="content"> <view class="content">
<view class="name">{{ item.award_name }}</view> <view class="name">{{ item.award_name }}</view>
<view class="cont font-size-goods-tag" v-if="item.award_type == 1">奖励详情：{{ item.point }}个积分</view> <view class="cont font-size-goods-tag" v-if="item.award_type == 1">奖励详情：{{ item.point }}个兑换券</view>
<view class="cont font-size-goods-tag" v-if="item.award_type == 2">奖励详情：{{ item.balance }}元红包</view> <view class="cont font-size-goods-tag" v-if="item.award_type == 2">奖励详情：{{ item.balance }}元红包</view>
<view class="cont font-size-goods-tag" v-if="item.award_type == 3">奖励详情：优惠券“{{ item.relate_name }}”</view> <view class="cont font-size-goods-tag" v-if="item.award_type == 3">奖励详情：优惠券“{{ item.relate_name }}”</view>
<view class="time font-size-goods-tag">中奖时间：{{ $util.timeStampTurnTime(item.create_time) }}</view> <view class="time font-size-goods-tag">中奖时间：{{ $util.timeStampTurnTime(item.create_time) }}</view>

10
pages_promotion/game/smash_eggs.vue
View File

@ -28,7 +28,7 @@
<!-- 操作 --> <!-- 操作 -->
<view class="action-text"> <view class="action-text">
<view class="point">我的积分：{{ point }}</view> <view class="point">我的兑换券：{{ point }}</view>
<view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view> <view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view>
</view> </view>
@ -70,7 +70,7 @@
<image :src="$util.img('public/uniapp/game/coupon.png')" mode="widthFix" v-if="result.award_type == 3" class="look"></image> <image :src="$util.img('public/uniapp/game/coupon.png')" mode="widthFix" v-if="result.award_type == 3" class="look"></image>
<image :src="$util.img('public/uniapp/game/gift.png')" mode="widthFix" v-if="result.award_type == 4" class="look"></image> <image :src="$util.img('public/uniapp/game/gift.png')" mode="widthFix" v-if="result.award_type == 4" class="look"></image>
<view class="msg" v-if="result.award_type == 1">恭喜您抽中{{ result.point }}个积分</view> <view class="msg" v-if="result.award_type == 1">恭喜您抽中{{ result.point }}个兑换券</view>
<view class="msg" v-if="result.award_type == 2">恭喜您抽中{{ result.balance }}元红包</view> <view class="msg" v-if="result.award_type == 2">恭喜您抽中{{ result.balance }}元红包</view>
<view class="msg" v-if="result.award_type == 3">恭喜您抽中优惠券“{{ result.relate_name }}”</view> <view class="msg" v-if="result.award_type == 3">恭喜您抽中优惠券“{{ result.relate_name }}”</view>
@ -103,7 +103,7 @@
<view class="tit">参与规则</view> <view class="tit">参与规则</view>
<view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view> <view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view>
<view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view> <view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view>
<view class="text">每次抽奖需消耗 {{ gameInfo.points }} 积分</view> <view class="text">每次抽奖需消耗 {{ gameInfo.points }} 兑换券</view>
<view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view> <view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view>
<block v-if="gameInfo.remark != ''"> <block v-if="gameInfo.remark != ''">
<view class="tit">活动说明</view> <view class="tit">活动说明</view>
@ -284,7 +284,7 @@ export default {
if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) {
this.$util.showToast({ this.$util.showToast({
title: '积分不足' title: '兑换券不足'
}); });
return; return;
} }
@ -301,7 +301,7 @@ export default {
this.result = res.data; this.result = res.data;
this.start(); this.start();
// 扣除次数 积分 // 扣除次数 兑换券
this.point -= this.gameInfo.points; this.point -= this.gameInfo.points;
this.gameInfo.surplus_num -= 1; this.gameInfo.surplus_num -= 1;
} else { } else {

8
pages_promotion/game/turntable.vue
View File

@ -37,7 +37,7 @@
</view> </view>
</view> </view>
<view class="action-text"> <view class="action-text">
<view class="point">我的积分：{{ point }}</view> <view class="point">我的兑换券：{{ point }}</view>
<view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view> <view class="record" @click="$util.redirectTo('/pages_promotion/game/record', { id: id })">我的中奖记录</view>
</view> </view>
<!-- 中奖名单 --> <!-- 中奖名单 -->
@ -94,7 +94,7 @@
<view class="tit">参与规则</view> <view class="tit">参与规则</view>
<view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view> <view class="text" v-if="gameInfo.join_type == 0">每个用户活动期间共有{{ gameInfo.join_frequency }}次抽奖机会。</view>
<view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view> <view class="text" v-else>每个用户活动期间每天都有{{ gameInfo.join_frequency }}次抽奖机会，每天0点更新。</view>
<view class="text">每次抽奖需消耗 {{ gameInfo.points }} 积分</view> <view class="text">每次抽奖需消耗 {{ gameInfo.points }} 兑换券</view>
<view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view> <view class="text" v-if="gameInfo.level_id != 0">该活动只有{{ gameInfo.level_name }}等级的会员可参与。</view>
<block v-if="gameInfo.remark != ''"> <block v-if="gameInfo.remark != ''">
<view class="tit">活动说明</view> <view class="tit">活动说明</view>
@ -284,7 +284,7 @@ export default {
} }
if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) { if (this.gameInfo.points > 0 && this.point < this.gameInfo.points) {
this.$util.showToast({ this.$util.showToast({
title: '积分不足' title: '兑换券不足'
}); });
return; return;
} }
@ -312,7 +312,7 @@ export default {
this.resultIndex = this.$util.inArray(-1, this.award); this.resultIndex = this.$util.inArray(-1, this.award);
} }
// 扣除次数 积分 // 扣除次数 兑换券
this.point -= this.gameInfo.points; this.point -= this.gameInfo.points;
this.gameInfo.surplus_num -= 1; this.gameInfo.surplus_num -= 1;
} else { } else {

4
pages_promotion/giftcard/card_use.vue
View File

@ -395,7 +395,7 @@ export default {
calculateGoodsData() { calculateGoodsData() {
if (this.calculateData) return this.calculateData.shop_goods_list; if (this.calculateData) return this.calculateData.shop_goods_list;
}, },
// 余额可抵扣金额 // 消费券可抵扣金额
balanceDeduct() { balanceDeduct() {
if (this.calculateData) { if (this.calculateData) {
if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) { if (this.calculateData.member_account.balance_total <= parseFloat(this.calculateData.order_money).toFixed(2)) {
@ -1065,7 +1065,7 @@ export default {
this.calculate(); this.calculate();
}, },
/** /**
* 使用积分抵扣 * 使用兑换券抵扣
*/ */
usePoint() { usePoint() {
this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1; this.orderCreateData.is_point = this.orderCreateData.is_point ? 0 : 1;

1717
pages_promotion/jielong/jielong.vue
View File

File diff suppressed because it is too large Load Diff

4
pages_promotion/pinfan/detail.vue
View File

@ -63,7 +63,7 @@
<text class="price-symbol color-base-text">{{ $lang('common.currencySymbol') }}</text> <text class="price-symbol color-base-text">{{ $lang('common.currencySymbol') }}</text>
<text class="price color-base-text">{{ goodsSkuDetail.promotion_price }}</text> --> <text class="price color-base-text">{{ goodsSkuDetail.promotion_price }}</text> -->
拼中得商品，未拼中 拼中得商品，未拼中
<text class="" v-if="goodsSkuDetail.reward_type == 4">返{{ goodsSkuDetail.reward_type_num }}积分</text> <text class="" v-if="goodsSkuDetail.reward_type == 4">返{{ goodsSkuDetail.reward_type_num }}兑换券</text>
<text class="" v-if="goodsSkuDetail.reward_type == 1 || goodsSkuDetail.reward_type == 2">返￥{{ goodsSkuDetail.reward_type_num }}</text> <text class="" v-if="goodsSkuDetail.reward_type == 1 || goodsSkuDetail.reward_type == 2">返￥{{ goodsSkuDetail.reward_type_num }}</text>
<text class="" v-if="goodsSkuDetail.reward_type == 3">返优惠券</text> <text class="" v-if="goodsSkuDetail.reward_type == 3">返优惠券</text>
</view> </view>
@ -108,7 +108,7 @@
<view> <view>
未拼中获得奖励 未拼中获得奖励
<view class="color-base-text"> <view class="color-base-text">
<text class="font-size-activity-tag" v-if="goodsSkuDetail.reward_type == 4">返{{ goodsSkuDetail.reward_type_num }}积分</text> <text class="font-size-activity-tag" v-if="goodsSkuDetail.reward_type == 4">返{{ goodsSkuDetail.reward_type_num }}兑换券</text>
<text class="font-size-activity-tag" v-if="goodsSkuDetail.reward_type == 1 || goodsSkuDetail.reward_type == 2"> <text class="font-size-activity-tag" v-if="goodsSkuDetail.reward_type == 1 || goodsSkuDetail.reward_type == 2">
返￥{{ goodsSkuDetail.reward_type_num }} 返￥{{ goodsSkuDetail.reward_type_num }}
</text> </text>

2
pages_promotion/pinfan/list.vue
View File

@ -68,7 +68,7 @@
人拼团， 人拼团，
<text class="color-base-text">{{ item.chengtuan_num }}</text> <text class="color-base-text">{{ item.chengtuan_num }}</text>
人拼中，未拼中返 人拼中，未拼中返
<text class="color-base-text" v-if="item.reward_type == 4">{{ item.reward_type_num }}积分</text> <text class="color-base-text" v-if="item.reward_type == 4">{{ item.reward_type_num }}兑换券</text>
<text class="color-base-text" v-if="item.reward_type == 1 || item.reward_type == 2">￥{{ item.reward_type_num }}</text> <text class="color-base-text" v-if="item.reward_type == 1 || item.reward_type == 2">￥{{ item.reward_type_num }}</text>
<text class="color-base-text" v-if="item.reward_type == 3">优惠券</text> <text class="color-base-text" v-if="item.reward_type == 3">优惠券</text>
</view> </view>

10
pages_promotion/point/detail.vue
View File

@ -36,7 +36,7 @@
</view> </view>
<view class="group-wrap padding-top"> <view class="group-wrap padding-top">
<view class="goods-module-wrap"> <view class="goods-module-wrap">
<text class="price-symbol ">{{ pointInfo.point }}积分</text> <text class="price-symbol ">{{ pointInfo.point }}兑换券</text>
<template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0"> <template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0">
<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price }}</text> <text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price }}</text>
</template> </template>
@ -191,7 +191,7 @@
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button disabled>登录之后方可兑换</button></view> <view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button disabled>登录之后方可兑换</button></view>
<block v-else> <block v-else>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button disabled>库存不足</button></view> <view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button disabled>库存不足</button></view>
<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button disabled>积分不足</button></view> <view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button disabled>兑换券不足</button></view>
<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button type="primary" hover-class="none">兑换</button></view> <view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button type="primary" hover-class="none">兑换</button></view>
</block> </block>
@ -280,7 +280,7 @@ export default {
imageUrl = this.pointInfo.image; imageUrl = this.pointInfo.image;
break; break;
} }
title = '仅需' + this.pointInfo.point + '积分即可兑换' + title; title = '仅需' + this.pointInfo.point + '兑换券即可兑换' + title;
imageUrl = this.$util.img(imageUrl); imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberId); var route = this.$util.getCurrentShareRoute(this.memberId);
var path = route.path; var path = route.path;
@ -309,7 +309,7 @@ export default {
imageUrl = this.pointInfo.image; imageUrl = this.pointInfo.image;
break; break;
} }
title = '仅需' + this.pointInfo.point + '积分即可兑换' + title; title = '仅需' + this.pointInfo.point + '兑换券即可兑换' + title;
imageUrl = this.$util.img(imageUrl); imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberId); var route = this.$util.getCurrentShareRoute(this.memberId);
var query = route.query; var query = route.query;
@ -337,7 +337,7 @@ export default {
} }
}, },
methods: { methods: {
//获取个人积分信息 //获取个人兑换券信息
getAccountInfo(e, f) { getAccountInfo(e, f) {
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
this.$api.sendRequest({ this.$api.sendRequest({

10
pages_promotion/point/goods_list.vue
View File

@ -17,7 +17,7 @@
<text :class="{ 'color-base-text': order === '' }">综合</text> <text :class="{ 'color-base-text': order === '' }">综合</text>
</view> </view>
<view class="price-wrap" @click="sortTabClick('point')"> <view class="price-wrap" @click="sortTabClick('point')">
<text :class="{ 'color-base-text': order === 'point' }">积分</text> <text :class="{ 'color-base-text': order === 'point' }">兑换券</text>
<view class="iconfont-wrap"> <view class="iconfont-wrap">
<view class="iconfont icon-shangsanjiao-copy" <view class="iconfont icon-shangsanjiao-copy"
:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view> :class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
@ -58,7 +58,7 @@
<view class="lineheight-clear"> <view class="lineheight-clear">
<view class="discount-price"> <view class="discount-price">
<text class="unit ">{{ item.point }}</text> <text class="unit ">{{ item.point }}</text>
<text class="unit font-size-tag">积分</text> <text class="unit font-size-tag">兑换券</text>
<block v-if="item.price > 0 && item.pay_type > 0"> <block v-if="item.price > 0 && item.pay_type > 0">
<text class="unit font-size-tag">+</text> <text class="unit font-size-tag">+</text>
<text class="unit font-size-tag">{{ $lang('common.currencySymbol') }}</text> <text class="unit font-size-tag">{{ $lang('common.currencySymbol') }}</text>
@ -77,7 +77,7 @@
</view> </view>
</view> </view>
<view class="empty" v-if="goodsList.length == 0"> <view class="empty" v-if="goodsList.length == 0">
<ns-empty :isIndex="false" text="暂无积分商品"></ns-empty> <ns-empty :isIndex="false" text="暂无兑换券商品"></ns-empty>
</view> </view>
</view> </view>
</block> </block>
@ -89,7 +89,7 @@
<scroll-view scroll-y> <scroll-view scroll-y>
<!-- 价格筛选项 --> <!-- 价格筛选项 -->
<view class="item-wrap"> <view class="item-wrap">
<view class="label"><text>积分区间</text></view> <view class="label"><text>兑换券区间</text></view>
<view class="price-wrap"> <view class="price-wrap">
<input class="uni-input" type="digit" v-model="minPoint" placeholder="最低" /> <input class="uni-input" type="digit" v-model="minPoint" placeholder="最低" />
<view class="h-line"></view> <view class="h-line"></view>
@ -162,7 +162,7 @@
this.loadCategoryList(this.categoryId); this.loadCategoryList(this.categoryId);
}, },
methods: { methods: {
//获取积分商品详情 //获取兑换券商品详情
getData(mescroll) { getData(mescroll) {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/pointexchange/api/goods/page', url: '/pointexchange/api/goods/page',

70
pages_promotion/point/list.vue
View File

@ -7,12 +7,12 @@
<ns-adv keyword="NS_POINTEXCHANGE"></ns-adv> <ns-adv keyword="NS_POINTEXCHANGE"></ns-adv>
</view> </view>
<!-- <view class="head-wrap color-base-bg"> <view class="head-wrap color-base-bg">
<image :src="$util.img('public/uniapp/point/point_bg.png')" mode="widthFix"></image> --> <image :src="$util.img('public/uniapp/point/point_bg.png')" mode="widthFix"></image> -->
<!-- <view class="wrap" :class="{ 'no-login': !token }"> <view class="wrap" :class="{ 'no-login': !token }">
<view v-if="!token" @click="login"> <view v-if="!token" @click="login">
<view class="lineheight-clear"><text class="font-size-toolbar login-btn">立即登录</text></view> <view class="lineheight-clear"><text class="font-size-toolbar login-btn">立即登录</text></view>
<view class="lineheight-clear"><text class="font-size-tag">登录后查看我的积分</text></view> <view class="lineheight-clear"><text class="font-size-tag">登录后查看我的兑换券</text></view>
</view> </view>
<view v-else class="member-wrap"> <view v-else class="member-wrap">
<view class="headimg"> <view class="headimg">
@ -23,15 +23,15 @@
></image> ></image>
</view> </view>
<text class="point">{{ point }}</text> <text class="point">{{ point }}</text>
<text class="point-name">积分</text> <text class="point-name">兑换券</text>
<view class="rule"> <view class="rule">
<text class="iconfont icon-wenhao"></text> <!-- <text class="iconfont icon-wenhao"></text>-->
<text class="font-size-tag" @click="openPointPopup()">兑换规则</text> <!-- <text class="font-size-tag" @click="openPointPopup()">兑换规则</text>-->
</view> </view>
</view> </view>
<view class="action-wrap" v-if="token"> <view class="action-wrap" v-if="token">
<view @click="jumpPage('/pages_tool/member/point')"> <view @click="jumpPage('/pages_tool/member/point')">
积分明细 兑换券明细
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
<view class="split"></view> <view class="split"></view>
@ -40,30 +40,30 @@
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
</view> </view>
</view> --> </view>
<!-- </view> --> </view>
<view class="head-box"> <view class="head-box">
<view class="account-content"> <view class="account-content">
<view class="left"> <view class="left">
<image :src="$util.img('public/uniapp/point/point-icon.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/point/point-icon.png')" mode="widthFix"></image>
<view>我的积分</view> <view>我的兑换券</view>
</view> </view>
<view class="right" @click="jumpPage('/pages_tool/member/point')"> <view class="right" @click="jumpPage('/pages_tool/member/point')">
<text class="color-base-text point">{{point}}</text> <text class="color-base-text point">{{point}}</text>
<text class="text">积分</text> <text class="text">兑换券</text>
<text class="iconfont iconright"></text> <text class="iconfont iconright"></text>
</view> </view>
</view> </view>
<view class="remark"> <view class="remark">
<view class="label">提醒</view> <view class="label">提醒</view>
<view class="text">积分兑好礼，每日上新换不停！</view> <view class="text">兑换券兑好礼，每日上新换不停！</view>
</view> </view>
</view> </view>
<view class="body-wrap" :class="{ 'no-login': !token }"> <view class="body-wrap" :class="{ 'no-login': !token }">
<view class="point-exchange-wrap" v-if="couponList.length > 0"> <view class="point-exchange-wrap" v-if="couponList.length > 0">
<view class="type-wrap"> <view class="type-wrap">
<text class="type-name">积分换券</text> <text class="type-name">兑换券换券</text>
<view></view> <view></view>
<text class="type-sub">更多好券，帮你省钱</text> <text class="type-sub">更多好券，帮你省钱</text>
</view> </view>
@ -84,7 +84,7 @@
<view class="coupon-point"> <view class="coupon-point">
<view class="coupon-point-num"> <view class="coupon-point-num">
<image :src="$util.img('public/uniapp/point/rechange.png')"></image> <image :src="$util.img('public/uniapp/point/rechange.png')"></image>
<text>{{couponItem.point}}积分兑换</text> <text>{{couponItem.point}}兑换券兑换</text>
</view> </view>
<view class="coupon-conditions"> <view class="coupon-conditions">
{{couponItem.at_least == 0 ? '无门槛优惠券' : '满'+ parseFloat(couponItem.at_least).toFixed(0) +'可用'}} {{couponItem.at_least == 0 ? '无门槛优惠券' : '满'+ parseFloat(couponItem.at_least).toFixed(0) +'可用'}}
@ -110,7 +110,7 @@
<view class="coupon_type font-size-activity-tag color-base-text">{{ couponItem.goods_type == 2 ? '指定券' : '全场券' }}</view> <view class="coupon_type font-size-activity-tag color-base-text">{{ couponItem.goods_type == 2 ? '指定券' : '全场券' }}</view>
</view> </view>
<view class="coupon_right"> <view class="coupon_right">
<view class="coupon_num color-base-text font-size-tag">{{ couponItem.point }}积分</view> <view class="coupon_num color-base-text font-size-tag">{{ couponItem.point }}兑换券</view>
<view class="coupon_btn color-base-text">兑换</view> <view class="coupon_btn color-base-text">兑换</view>
</view> </view>
</view> </view>
@ -122,7 +122,7 @@
<view class="point-exchange-wrap" v-if="hongbaoList.length > 0"> <view class="point-exchange-wrap" v-if="hongbaoList.length > 0">
<view class="type-wrap"> <view class="type-wrap">
<text class="type-name">积分换红包</text> <text class="type-name">兑换券换红包</text>
<view></view> <view></view>
<text class="type-sub">红包在手，省钱有道</text> <text class="type-sub">红包在手，省钱有道</text>
</view> </view>
@ -145,7 +145,7 @@
<view class="coupon_condition font-size-activity-tag">{{ hongbaoItem.name }}</view> <view class="coupon_condition font-size-activity-tag">{{ hongbaoItem.name }}</view>
</view> </view>
<view class="coupon_right"> <view class="coupon_right">
<view class="coupon_num font-size-tag">{{ hongbaoItem.point }}积分</view> <view class="coupon_num font-size-tag">{{ hongbaoItem.point }}兑换券</view>
<view class="coupon_btn">兑换</view> <view class="coupon_btn">兑换</view>
</view> </view>
</view> </view>
@ -172,7 +172,7 @@
<view class="lineheight-clear"> <view class="lineheight-clear">
<view class="discount-price"> <view class="discount-price">
<text class="unit price-font point">{{ item.point }}</text> <text class="unit price-font point">{{ item.point }}</text>
<text class="unit font-size-tag ">积分</text> <text class="unit font-size-tag ">兑换券</text>
<block v-if="item.price > 0 && item.pay_type > 0"> <block v-if="item.price > 0 && item.pay_type > 0">
<text class="unit font-size-tag">+</text> <text class="unit font-size-tag">+</text>
<text class="unit font-size-tag" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text> <text class="unit font-size-tag" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
@ -199,20 +199,20 @@
<uni-popup ref="pointPopup" type="bottom"> <uni-popup ref="pointPopup" type="bottom">
<view class="tips-layer"> <view class="tips-layer">
<view class="head" @click="closePointPopup()"> <view class="head" @click="closePointPopup()">
<view class="title">积分说明</view> <view class="title">兑换券说明</view>
<text class="iconfont icon-close"></text> <text class="iconfont icon-close"></text>
</view> </view>
<view class="body"> <view class="body">
<view class="detail margin-bottom"> <view class="detail margin-bottom">
<view class="tip">积分的获取</view> <view class="tip">兑换券的获取</view>
<view class="font-size-base">1、积分可在注册、签到、分享、消费、充值时获得。</view> <view class="font-size-base">1、兑换券可在注册、签到、分享、消费、充值时获得。</view>
<view class="font-size-base">2、在购买部分商品时可获得积分。</view> <view class="font-size-base">2、在购买部分商品时可获得兑换券。</view>
<view class="tip">积分的使用</view> <view class="tip">兑换券的使用</view>
<view class="font-size-base">1、积分可用于兑换积分中心的商品。</view> <view class="font-size-base">1、兑换券可用于兑换兑换券中心的商品。</view>
<view class="font-size-base">2、积分可在参与某些活动时使用。</view> <view class="font-size-base">2、兑换券可在参与某些活动时使用。</view>
<view class="font-size-base">3、积分不得转让，出售，不设有效期。</view> <view class="font-size-base">3、兑换券不得转让，出售，不设有效期。</view>
<view class="tip">积分的查询</view> <view class="tip">兑换券的查询</view>
<view class="font-size-base">1、积分可在会员中心中查询具体数额以及明细。</view> <view class="font-size-base">1、兑换券可在会员中心中查询具体数额以及明细。</view>
</view> </view>
</view> </view>
</view> </view>
@ -241,15 +241,15 @@ export default {
categoryList: [ categoryList: [
{ {
id: 1, id: 1,
name: '积分换好物' name: '兑换券换好物'
}, },
{ {
id: 2, id: 2,
name: '积分换券' name: '兑换券换券'
}, },
{ {
id: 3, id: 3,
name: '积分换红包' name: '兑换券换红包'
} }
], ],
isLogin: false, isLogin: false,
@ -294,7 +294,7 @@ export default {
setTimeout( () => { setTimeout( () => {
if (this.addonIsExist && !this.addonIsExist.pointexchange) { if (this.addonIsExist && !this.addonIsExist.pointexchange) {
this.$util.showToast({ this.$util.showToast({
title: '商家未开启积分商城', title: '商家未开启兑换券商城',
mask: true, mask: true,
duration: 2000 duration: 2000
}); });
@ -349,11 +349,11 @@ export default {
jumpPage(url) { jumpPage(url) {
this.$util.redirectTo(url); this.$util.redirectTo(url);
}, },
// 打开积分说明弹出层 // 打开兑换券说明弹出层
openPointPopup() { openPointPopup() {
this.$refs.pointPopup.open(); this.$refs.pointPopup.open();
}, },
// 打开积分说明弹出层 // 打开兑换券说明弹出层
closePointPopup() { closePointPopup() {
this.$refs.pointPopup.close(); this.$refs.pointPopup.close();
}, },
@ -405,7 +405,7 @@ export default {
} }
}); });
}, },
//获取积分商品详情 //获取兑换券商品详情
getData(mescroll) { getData(mescroll) {
// this.mescroll = mescroll; // this.mescroll = mescroll;
this.$api.sendRequest({ this.$api.sendRequest({

6
pages_promotion/point/order_list.vue
View File

@ -40,7 +40,7 @@
<view class="goods-sub-section"> <view class="goods-sub-section">
<text class="goods-price"> <text class="goods-price">
<text class="price-style large">{{ orderItem.point }}</text> <text class="price-style large">{{ orderItem.point }}</text>
<text class="unit price-style small">积分</text> <text class="unit price-style small">兑换券</text>
<block v-if="orderItem.price > 0"> <block v-if="orderItem.price > 0">
+ +
<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text> <text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
@ -70,7 +70,7 @@
</block> </block>
<block v-if="showEmpty && !orderList.length"> <block v-if="showEmpty && !orderList.length">
<view class="cart-empty"> <view class="cart-empty">
<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty> <ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无兑换券兑换订单"></ns-empty>
</view> </view>
</block> </block>
</block> </block>
@ -104,7 +104,7 @@
setTimeout( () => { setTimeout( () => {
if (this.addonIsExist && !this.addonIsExist.pointexchange) { if (this.addonIsExist && !this.addonIsExist.pointexchange) {
this.$util.showToast({ this.$util.showToast({
title: '商家未开启积分商城', title: '商家未开启兑换券商城',
mask: true, mask: true,
duration: 2000 duration: 2000
}); });

8
pages_promotion/point/payment.vue
View File

@ -165,7 +165,7 @@
<view class="goods-sub-section"> <view class="goods-sub-section">
<view v-if="orderPaymentData.exchange_info.pay_type == 1" class="color-base-text"> <view v-if="orderPaymentData.exchange_info.pay_type == 1" class="color-base-text">
<text class="goods-price">{{ orderPaymentData.exchange_info.point }}</text> <text class="goods-price">{{ orderPaymentData.exchange_info.point }}</text>
<text class="unit">积分</text> <text class="unit">兑换券</text>
<template v-if="orderPaymentData.exchange_info.price != '0.00'"> <template v-if="orderPaymentData.exchange_info.price != '0.00'">
<text class="unit">+{{ $lang('common.currencySymbol') }}</text> <text class="unit">+{{ $lang('common.currencySymbol') }}</text>
<text class="goods-price">{{ orderPaymentData.exchange_info.price }}</text> <text class="goods-price">{{ orderPaymentData.exchange_info.price }}</text>
@ -190,10 +190,10 @@
<!-- 金额 --> <!-- 金额 -->
<view class="order-money"> <view class="order-money">
<view class="order-cell"> <view class="order-cell">
<text class="tit">所需积分</text> <text class="tit">所需兑换券</text>
<view class="box"> <view class="box">
<text class="money">{{ orderPaymentData.point }}</text> <text class="money">{{ orderPaymentData.point }}</text>
<text class="unit">积分</text> <text class="unit">兑换券</text>
</view> </view>
</view> </view>
<view class="order-cell" v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0"> <view class="order-cell" v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
@ -212,7 +212,7 @@
<text class="font-size-base color-tip margin-right">共{{ orderPaymentData.goods_num }}件</text> <text class="font-size-base color-tip margin-right">共{{ orderPaymentData.goods_num }}件</text>
<text class="font-size-base">合计：</text> <text class="font-size-base">合计：</text>
<text class="color-base-text money">{{ orderPaymentData.point }}</text> <text class="color-base-text money">{{ orderPaymentData.point }}</text>
<text class="color-base-text unit">积分</text> <text class="color-base-text unit">兑换券</text>
<template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.order_money > 0"> <template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.order_money > 0">
<text class="color-base-text unit">+{{ $lang('common.currencySymbol') }}</text> <text class="color-base-text unit">+{{ $lang('common.currencySymbol') }}</text>
<text class="color-base-text money">{{ orderPaymentData.order_money | moneyFormat }}</text> <text class="color-base-text money">{{ orderPaymentData.order_money | moneyFormat }}</text>

3
pages_promotion/point/public/css/list.scss
View File

@ -648,7 +648,8 @@
padding: 30rpx 24rpx; padding: 30rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
width: calc(100% - 48rpx); width: calc(100% - 48rpx);
margin: -50rpx 24rpx 30rpx; margin: 24rpx 24rpx 30rpx;
//margin: -50rpx 24rpx 30rpx;
position: relative; position: relative;
z-index: 100; z-index: 100;
.account-content{ .account-content{

4
pages_promotion/presale/order_detail.vue
View File

@ -225,7 +225,7 @@
</view> </view>
</view> </view>
<view class="order-cell" v-if="balanceMoney > 0"> <view class="order-cell" v-if="balanceMoney > 0">
<text class="tit">使用余额</text> <text class="tit">使用消费券</text>
<view class="box align-right"> <view class="box align-right">
<text class="color-base-text price-font"> <text class="color-base-text price-font">
<text class="operator price-color">-</text> <text class="operator price-color">-</text>
@ -235,7 +235,7 @@
</view> </view>
</view> </view>
<view class="order-cell" v-if="orderData.point_money > 0"> <view class="order-cell" v-if="orderData.point_money > 0">
<text class="tit">积分抵扣</text> <text class="tit">兑换券抵扣</text>
<view class="box align-right"> <view class="box align-right">
<text class="color-base-text price-font"> <text class="color-base-text price-font">
<text class="operator price-color">-</text> <text class="operator price-color">-</text>

2
pages_promotion/presale/payment.vue
View File

@ -297,7 +297,7 @@
</view> </view>
</view> </view>
<!-- <view class="order-cell" v-if="orderPaymentData.balance_money > 0"> <!-- <view class="order-cell" v-if="orderPaymentData.balance_money > 0">
<text class="tit">使用余额</text> <text class="tit">使用消费券</text>
<view class="box color-base-text"> <view class="box color-base-text">
<text class="operator">-</text> <text class="operator">-</text>
<text class="unit">{{ $lang('common.currencySymbol') }}</text> <text class="unit">{{ $lang('common.currencySymbol') }}</text>

4
pages_promotion/presale/public/js/payment.js
View File

@ -596,7 +596,7 @@ export default {
this.tempData = null; this.tempData = null;
}, },
/** /**
* 使用余额 * 使用消费券
*/ */
useBalance() { useBalance() {
if (this.orderCreateData.is_balance) this.orderCreateData.is_balance = 0; if (this.orderCreateData.is_balance) this.orderCreateData.is_balance = 0;
@ -910,7 +910,7 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.show(); if (this.$refs.loadingCover) this.$refs.loadingCover.show();
}, },
computed: { computed: {
// 余额抵扣 // 消费券抵扣
balanceDeduct() { balanceDeduct() {
let balance = parseFloat(this.orderPaymentData.member_account.balance_total) < parseFloat(this let balance = parseFloat(this.orderPaymentData.member_account.balance_total) < parseFloat(this
.orderPaymentData.presale_deposit_money) ? parseFloat(this.orderPaymentData.member_account .orderPaymentData.presale_deposit_money) ? parseFloat(this.orderPaymentData.member_account

2
pages_tool/hongbao/index.vue
View File

@ -60,7 +60,7 @@
{{ money }} {{ money }}
<text>元</text> <text>元</text>
</view> </view>
<view class="guafen-man color-sub font-size-tag">红包已存入您的账户余额中</view> <view class="guafen-man color-sub font-size-tag">红包已存入您的账户消费券中</view>
<view class="success-btn" @click="toLook()">立即查看</view> <view class="success-btn" @click="toLook()">立即查看</view>
<view class="success-guafen-btn" @click="toGuaFen">瓜分新红包</view> <view class="success-guafen-btn" @click="toGuaFen">瓜分新红包</view>
</view> </view>

39
pages_tool/login/register.vue
View File

@ -20,7 +20,7 @@
<view class="input-wrap" v-show="registerMode == 'account'"> <view class="input-wrap" v-show="registerMode == 'account'">
<view class="content"><input type="text" placeholder="请输入账号" placeholder-class="input-placeholder" class="input" v-model="formData.account" /></view> <view class="content"><input type="text" placeholder="请输入账号" placeholder-class="input-placeholder" class="input" v-model="formData.account" /></view>
</view> </view>
<view class="input-wrap" v-show="registerMode == 'account'"> <view class="input-wrap">
<view class="content"><input type="password" placeholder="请输入密码" placeholder-class="input-placeholder" class="input" v-model="formData.password" /></view> <view class="content"><input type="password" placeholder="请输入密码" placeholder-class="input-placeholder" class="input" v-model="formData.password" /></view>
</view> </view>
<view class="input-wrap" v-show="registerMode == 'account'"> <view class="input-wrap" v-show="registerMode == 'account'">
@ -28,6 +28,11 @@
<input type="password" placeholder="请确认密码" placeholder-class="input-placeholder" class="input" v-model="formData.rePassword" /> <input type="password" placeholder="请确认密码" placeholder-class="input-placeholder" class="input" v-model="formData.rePassword" />
</view> </view>
</view> </view>
<view class="input-wrap" >
<view class="content">
<input type="text" placeholder="请输入推荐码" placeholder-class="input-placeholder" class="input" v-model="formData.rCode" />
</view>
</view>
<view class="input-wrap"> <view class="input-wrap">
<view class="content"> <view class="content">
<input type="text" placeholder="请输入验证码" placeholder-class="input-placeholder" class="input" v-model="formData.vercode" /> <input type="text" placeholder="请输入验证码" placeholder-class="input-placeholder" class="input" v-model="formData.vercode" />
@ -88,6 +93,7 @@ export default {
account: '', account: '',
password: '', password: '',
rePassword: '', rePassword: '',
rCode: '', //推荐码
vercode: '', vercode: '',
dynacode: '', dynacode: '',
key: '' key: ''
@ -121,7 +127,20 @@ export default {
this.getCaptcha(); this.getCaptcha();
this.getRegisiterAggrement(); this.getRegisiterAggrement();
this.getRegisterConfig(); this.getRegisterConfig();
this.authInfo = uni.getStorageSync('authInfo'); if (uni.getStorageSync('authInfo')) {
this.authInfo = uni.getStorageSync('authInfo');
}
if(uni.getStorageSync('source_member')){
this.source_member=uni.getStorageSync('source_member');
}
//分享接收source_member
if (option.source_member){
uni.setStorageSync('source_member', option.source_member);
this.source_member=uni.getStorageSync('source_member');
}
if (option.rcode) uni.setStorageSync('rcode', option.rcode);
this.formData.rCode = option.rcode || uni.getStorageSync('rcode');
if(this.source_member > 0) this.getRecommendationCode();
}, },
onShow() { onShow() {
@ -130,6 +149,17 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}, },
methods: { methods: {
getRecommendationCode(){
this.$api.sendRequest({
url: '/member/api/member/RecommendationCode',
data:{ source_member: this.source_member },
success: res => {
if(res.code === 0){
this.formData.rCode = res.data;
}
}
});
},
/** /**
* 切换注册方式 * 切换注册方式
*/ */
@ -210,13 +240,16 @@ export default {
var url = '/api/register/username'; var url = '/api/register/username';
data = { data = {
username: this.formData.account, username: this.formData.account,
password: this.formData.password password: this.formData.password,
rCode: this.formData.rCode
}; };
} else { } else {
var url = '/api/register/mobile', var url = '/api/register/mobile',
data = { data = {
mobile: this.formData.mobile, mobile: this.formData.mobile,
key: this.formData.key, key: this.formData.key,
password: this.formData.password,
rCode: this.formData.rCode,
code: this.formData.dynacode code: this.formData.dynacode
}; };
} }

2
pages_tool/member/apply_withdrawal.vue
View File

@ -29,7 +29,7 @@
</view> </view>
<view class="bootom"> <view class="bootom">
<view> <view>
<text class="color-tip">可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text> <text class="color-tip">可提现消费券：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
<text class="all-tx color-base-text" @click="allTx">全部提现</text> <text class="all-tx color-base-text" @click="allTx">全部提现</text>
</view> </view>
</view> </view>

2
pages_tool/member/assets.vue
View File

@ -12,7 +12,7 @@
<view class="assets-list"> <view class="assets-list">
<view class="assets-li"> <view class="assets-li">
<view>{{ member_info.point }}</view> <view>{{ member_info.point }}</view>
<view>积分</view> <view>兑换券</view>
</view> </view>
<view class="assets-li"> <view class="assets-li">
<view>￥{{ member_info.balance_money }}</view> <view>￥{{ member_info.balance_money }}</view>

14
pages_tool/member/balance.vue
View File

@ -10,7 +10,7 @@
<view class="navbar-wrap"> <view class="navbar-wrap">
<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text> <text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
<view class="navbar-title"> <view class="navbar-title">
我的余额 我的消费券
</view> </view>
</view> </view>
</view> </view>
@ -18,15 +18,15 @@
<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }"> <view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/balance/balance_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #FE7849 0%, #FF1959 100%)' }">
<view class="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view> <view class="balance price-font">{{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }}</view>
<view class="title">账户余额（元）</view> <view class="title">账户消费券（元）</view>
<view class="flex-box"> <view class="flex-box">
<view class="flex-item"> <view class="flex-item">
<view class="num price-font">{{ balanceInfo.balance_money|moneyFormat }}</view> <view class="num price-font">{{ balanceInfo.balance_money|moneyFormat }}</view>
<view class="font-size-tag">现金余额（元）</view> <view class="font-size-tag">现金消费券（元）</view>
</view> </view>
<view class="flex-item"> <view class="flex-item">
<view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view> <view class="num price-font">{{ balanceInfo.balance|moneyFormat }}</view>
<view class="font-size-tag">储值余额（元）</view> <view class="font-size-tag">储值消费券（元）</view>
</view> </view>
</view> </view>
</view> </view>
@ -36,7 +36,7 @@
<view class="icon"> <view class="icon">
<text class="iconfont icon-yuemingxi"></text> <text class="iconfont icon-yuemingxi"></text>
</view> </view>
<text class="title">余额明细</text> <text class="title">消费券明细</text>
<text class="iconfont icon-right"></text> <text class="iconfont icon-right"></text>
</view> </view>
<view class="menu-item" @click="toOrderList" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use"> <view class="menu-item" @click="toOrderList" v-if="addonIsExist.memberrecharge && memberrechargeConfig && memberrechargeConfig.is_use">
@ -102,7 +102,7 @@ export default {
toList() { toList() {
this.$util.redirectTo('/pages_tool/recharge/list'); this.$util.redirectTo('/pages_tool/recharge/list');
}, },
//获取余额信息 //获取消费券信息
getUserInfo() { getUserInfo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/memberaccount/info', url: '/api/memberaccount/info',
@ -126,7 +126,7 @@ export default {
}); });
}, },
/** /**
* 获取余额提现配置 * 获取消费券提现配置
*/ */
getWithdrawConfig() { getWithdrawConfig() {
this.$api.sendRequest({ this.$api.sendRequest({

4
pages_tool/member/balance_detail.vue
View File

@ -41,7 +41,7 @@
</view> </view>
</view> </view>
</block> </block>
<block v-else><ns-empty :isIndex="false" text="暂无余额明细"></ns-empty></block> <block v-else><ns-empty :isIndex="false" text="暂无消费券明细"></ns-empty></block>
<!-- 无明细列表 --> <!-- 无明细列表 -->
</block> </block>
@ -71,7 +71,7 @@ export default {
label: '全部', label: '全部',
value: '0' value: '0'
} }
], //积分类型 ], //兑换券类型
balanceIndex: 0, balanceIndex: 0,
related_id: 0 related_id: 0
}; };

8
pages_tool/member/card.vue
View File

@ -48,8 +48,8 @@
</view> </view>
<view class="card-privilege-item" v-if="levelInfo.point_feedback > 0"> <view class="card-privilege-item" v-if="levelInfo.point_feedback > 0">
<view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view>
<view class="card-privilege-name">积分回馈</view> <view class="card-privilege-name">兑换券回馈</view>
<view class="card-privilege-text">下单享{{ parseFloat(levelInfo.point_feedback) }}倍积分回馈</view> <view class="card-privilege-text">下单享{{ parseFloat(levelInfo.point_feedback) }}倍兑换券回馈</view>
</view> </view>
</view> </view>
@ -63,8 +63,8 @@
<view class="card-privilege-list"> <view class="card-privilege-list">
<view class="card-privilege-item" v-if="levelInfo.send_point > 0"> <view class="card-privilege-item" v-if="levelInfo.send_point > 0">
<view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view>
<view class="card-privilege-name">积分礼包</view> <view class="card-privilege-name">兑换券礼包</view>
<view class="card-privilege-text">赠送{{ levelInfo.send_point }}积分</view> <view class="card-privilege-text">赠送{{ levelInfo.send_point }}兑换券</view>
</view> </view>
<view class="card-privilege-item" v-if="levelInfo.send_balance > 0"> <view class="card-privilege-item" v-if="levelInfo.send_balance > 0">
<view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view>

8
pages_tool/member/card_buy.vue
View File

@ -122,8 +122,8 @@
</view> </view>
<view class="card-privilege-item" v-if="currCard.point_feedback > 0"> <view class="card-privilege-item" v-if="currCard.point_feedback > 0">
<view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-jifen2 f32"></text></view>
<view class="card-privilege-name">积分回馈</view> <view class="card-privilege-name">兑换券回馈</view>
<view class="card-privilege-text">下单享{{ parseFloat(currCard.point_feedback) }}倍积分回馈</view> <view class="card-privilege-text">下单享{{ parseFloat(currCard.point_feedback) }}倍兑换券回馈</view>
</view> </view>
</view> </view>
@ -137,8 +137,8 @@
<view class="card-privilege-list"> <view class="card-privilege-list">
<view class="card-privilege-item" v-if="currCard.send_point > 0"> <view class="card-privilege-item" v-if="currCard.send_point > 0">
<view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-jifen3"></text></view>
<view class="card-privilege-name">积分礼包</view> <view class="card-privilege-name">兑换券礼包</view>
<view class="card-privilege-text">赠送{{ currCard.send_point }}积分</view> <view class="card-privilege-text">赠送{{ currCard.send_point }}兑换券</view>
</view> </view>
<view class="card-privilege-item" v-if="currCard.send_balance > 0"> <view class="card-privilege-item" v-if="currCard.send_balance > 0">
<view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view> <view class="card-privilege-icon"><text class="iconfont icon-hongbao"></text></view>

6
pages_tool/member/invite_friends.vue
View File

@ -32,7 +32,7 @@
<view class="prize color-base-text font-size-activity-tag"> <view class="prize color-base-text font-size-activity-tag">
<block v-if="item.balance > 0">{{ item.balance }}元现金红包</block> <block v-if="item.balance > 0">{{ item.balance }}元现金红包</block>
<block v-if="(item.point > 0 || item.coupon_num) && item.balance > 0">+</block> <block v-if="(item.point > 0 || item.coupon_num) && item.balance > 0">+</block>
<block v-if="item.point > 0">{{ parseInt(item.point) }}积分</block> <block v-if="item.point > 0">{{ parseInt(item.point) }}兑换券</block>
<block v-if="item.point > 0 && item.balance > 0 && item.coupon_num > 0">+</block> <block v-if="item.point > 0 && item.balance > 0 && item.coupon_num > 0">+</block>
<block v-if="item.coupon_num > 0">{{ item.coupon_num }}张优惠券</block> <block v-if="item.coupon_num > 0">{{ item.coupon_num }}张优惠券</block>
</view> </view>
@ -74,7 +74,7 @@
<view class="price"> <view class="price">
<text>{{ parseInt(info.point) }}</text> <text>{{ parseInt(info.point) }}</text>
</view> </view>
<view class="type">积分</view> <view class="type">兑换券</view>
</view> </view>
</view> </view>
@ -98,7 +98,7 @@
</view> </view>
<view class="" v-if="$util.inArray('point', info.type) != -1"> <view class="" v-if="$util.inArray('point', info.type) != -1">
<text>●</text> <text>●</text>
可得{{ info.point }}积分 可得{{ info.point }}兑换券
</view> </view>
<view class="" v-if="$util.inArray('coupon', info.type) != -1"> <view class="" v-if="$util.inArray('coupon', info.type) != -1">
<text>●</text> <text>●</text>

8
pages_tool/member/level.vue
View File

@ -115,8 +115,8 @@
<view class="equity-itme" v-if="levelList[curIndex].point_feedback > 0"> <view class="equity-itme" v-if="levelList[curIndex].point_feedback > 0">
<image :src="$util.img('public/uniapp/level/integral_feedback.png')" mode="aspectFit"></image> <image :src="$util.img('public/uniapp/level/integral_feedback.png')" mode="aspectFit"></image>
<view class="equity-content"> <view class="equity-content">
<text>享受积分回馈服务</text> <text>享受兑换券回馈服务</text>
<text class="equity-desc">提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率</text> <text class="equity-desc">提供{{ levelList[curIndex].point_feedback }}倍兑换券回馈倍率</text>
</view> </view>
</view> </view>
</view> </view>
@ -126,8 +126,8 @@
<view class="gift-itme" v-if="levelList[curIndex].send_point > 0"> <view class="gift-itme" v-if="levelList[curIndex].send_point > 0">
<image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image> <image :src="$util.img('public/uniapp/level/integral.png')" mode="aspectFit"></image>
<view class="gift-content" :class="{ active: levelList[curIndex].send_balance > 0 }"> <view class="gift-content" :class="{ active: levelList[curIndex].send_balance > 0 }">
<text>积分礼包</text> <text>兑换券礼包</text>
<text class="gift-desc">赠送{{ levelList[curIndex].send_point }}积分</text> <text class="gift-desc">赠送{{ levelList[curIndex].send_point }}兑换券</text>
</view> </view>
</view> </view>
<view class="gift-itme" v-if="levelList[curIndex].send_balance > 0"> <view class="gift-itme" v-if="levelList[curIndex].send_balance > 0">

2
pages_tool/member/level_growth_rules.vue
View File

@ -32,7 +32,7 @@
</view> </view>
<view class="content color-tip"> <view class="content color-tip">
<text>1、注册会员送x成长值。</text> <text>1、注册会员送x成长值。</text>
<text>2、会员充值到余额送x成长值。</text> <text>2、会员充值到消费券送x成长值。</text>
<text>3、会员签到送x成长值。</text> <text>3、会员签到送x成长值。</text>
<text>4、会员消费x元，交易完成即可获得x个成长值。</text> <text>4、会员消费x元，交易完成即可获得x个成长值。</text>
</view> </view>

60
pages_tool/member/point.vue
View File

@ -10,7 +10,7 @@
<view class="navbar-wrap"> <view class="navbar-wrap">
<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text> <text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
<view class="navbar-title"> <view class="navbar-title">
我的积分 我的兑换券
</view> </view>
</view> </view>
</view> </view>
@ -18,11 +18,11 @@
<view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }"> <view class="head-wrap" :style="{ background: 'url(' + $util.img('public/uniapp/point/point_bg.png') + ') no-repeat right bottom/ auto 340rpx, linear-gradient(314deg, #F16914 0%, #FEAA4C 100%)' }">
<view class="point price-font">{{ pointInfo.point }}</view> <view class="point price-font">{{ pointInfo.point }}</view>
<view class="title">当前积分</view> <view class="title">当前兑换券</view>
<view class="flex-box"> <view class="flex-box">
<view class="flex-item"> <view class="flex-item">
<view class="num price-font">{{ pointInfo.totalPoint }}</view> <view class="num price-font">{{ pointInfo.totalPoint }}</view>
<view class="font-size-tag">累计积分</view> <view class="font-size-tag">累计兑换券</view>
</view> </view>
<view class="flex-item"> <view class="flex-item">
<view class="num price-font">{{ pointInfo.totalConsumePoint }}</view> <view class="num price-font">{{ pointInfo.totalConsumePoint }}</view>
@ -40,35 +40,35 @@
<view class="icon"> <view class="icon">
<image :src="$util.img('public/uniapp/point/point_detail_icon.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/point/point_detail_icon.png')" mode="widthFix"></image>
</view> </view>
<text class="title">积分明细</text> <text class="title">兑换券明细</text>
</view> </view>
<view class="menu-item" @click="$util.redirectTo('/pages_promotion/point/list')"> <view class="menu-item" @click="$util.redirectTo('/pages_promotion/point/list')">
<view class="icon"> <view class="icon">
<image :src="$util.img('public/uniapp/point/point_shop.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/point/point_shop.png')" mode="widthFix"></image>
</view> </view>
<text class="title">积分商城</text> <text class="title">兑换券商城</text>
</view> </view>
</view> </view>
<view class="task-wrap"> <!-- <view class="task-wrap">-->
<view class="title">做任务赚积分</view> <!-- <view class="title">做任务赚兑换券</view>-->
<view class="task-item" @click="toSign"> <!-- <view class="task-item" @click="toSign">-->
<view class="icon"><text class="iconfont icon-qiandao1"></text></view> <!-- <view class="icon"><text class="iconfont icon-qiandao1"></text></view>-->
<view class="wrap"> <!-- <view class="wrap">-->
<view class="title">每日签到</view> <!-- <view class="title">每日签到</view>-->
<view class="desc color-tip font-size-tag">连续签到可获得更多积分</view> <!-- <view class="desc color-tip font-size-tag">连续签到可获得更多兑换券</view>-->
</view> <!-- </view>-->
<view class="btn">去签到</view> <!-- <view class="btn">去签到</view>-->
</view> <!-- </view>-->
<view class="task-item" @click="$util.redirectTo('/pages/index/index')"> <!-- <view class="task-item" @click="$util.redirectTo('/pages/index/index')">-->
<view class="icon"><text class="iconfont icon-shangpin"></text></view> <!-- <view class="icon"><text class="iconfont icon-shangpin"></text></view>-->
<view class="wrap"> <!-- <view class="wrap">-->
<view class="title">购买商品</view> <!-- <view class="title">购买商品</view>-->
<view class="desc color-tip font-size-tag">购买商品可获得积分</view> <!-- <view class="desc color-tip font-size-tag">购买商品可获得兑换券</view>-->
</view> <!-- </view>-->
<view class="btn">去下单</view> <!-- <view class="btn">去下单</view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
@ -117,7 +117,8 @@ export default {
}, },
success: res => { success: res => {
if (res.code == 0) { if (res.code == 0) {
this.pointInfo.point = parseInt(res.data.point); this.pointInfo.point = res.data.point;
// this.pointInfo.point = parseInt(res.data.point);
} }
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}, },
@ -135,7 +136,8 @@ export default {
}, },
success: res => { success: res => {
if (res.code == 0) { if (res.code == 0) {
this.pointInfo.totalPoint = parseInt(res.data); this.pointInfo.totalPoint = res.data;
// this.pointInfo.totalPoint = parseInt(res.data);
} }
} }
}); });
@ -149,7 +151,8 @@ export default {
}, },
success: res => { success: res => {
if (res.code == 0) { if (res.code == 0) {
this.pointInfo.totalConsumePoint = Math.abs(parseInt(res.data)); this.pointInfo.totalConsumePoint = Math.abs(res.data);
// this.pointInfo.totalConsumePoint = Math.abs(parseInt(res.data));
} }
} }
}); });
@ -165,7 +168,8 @@ export default {
}, },
success: res => { success: res => {
if (res.code == 0) { if (res.code == 0) {
this.pointInfo.todayPoint = Math.abs(parseInt(res.data)); // this.pointInfo.todayPoint = Math.abs(parseInt(res.data));
this.pointInfo.todayPoint = Math.abs(res.data);
} }
} }
}); });

10
pages_tool/member/point_detail.vue
View File

@ -30,8 +30,10 @@
<text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text> <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
</view> </view>
</view> </view>
<view class="num color-base-text" v-if="item.account_data > 0">+{{ parseInt(item.account_data) }}</view> <!-- <view class="num color-base-text" v-if="item.account_data > 0">+{{ parseInt(item.account_data) }}</view>-->
<view class="num " v-else>{{ parseInt(item.account_data) }}</view> <!-- <view class="num " v-else>{{ parseInt(item.account_data) }}</view>-->
<view class="num color-base-text" v-if="item.account_data > 0">+{{ item.account_data }}</view>
<view class="num " v-else>{{ item.account_data }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -69,7 +71,7 @@ export default {
label: '全部', label: '全部',
value: '0' value: '0'
} }
], //积分类型 ], //兑换券类型
pointIndex: 0, pointIndex: 0,
related_id: 0 related_id: 0
}; };
@ -196,7 +198,7 @@ export default {
}); });
} }
}, },
//获取个人积分信息 //获取个人兑换券信息
getAccountInfo() { getAccountInfo() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/memberaccount/info', url: '/api/memberaccount/info',

2
pages_tool/member/public/js/signin.js
View File

@ -30,7 +30,7 @@ export default {
}; };
}, },
methods: { methods: {
// 获取签到累积积分 // 获取签到累积兑换券
getSignPointData() { getSignPointData() {
this.$api.sendRequest({ this.$api.sendRequest({
url: '/api/memberaccount/sum', url: '/api/memberaccount/sum',

14
pages_tool/member/signin.vue
View File

@ -21,7 +21,7 @@
<text>{{ signDaysSeries }}</text> <text>{{ signDaysSeries }}</text>
天 天
</view> </view>
<view>{{ hasSign ? '明日' : '今日' }}签到可获得{{ pointTomorrow }}积分</view> <view>{{ hasSign ? '明日' : '今日' }}签到可获得{{ pointTomorrow }}兑换券</view>
</view> </view>
</view> </view>
@ -46,7 +46,7 @@
> >
<view class="day">第{{ item.day }}天</view> <view class="day">第{{ item.day }}天</view>
<image :src="$util.img('public/uniapp/signin/sign-icon.png')"></image> <image :src="$util.img('public/uniapp/signin/sign-icon.png')"></image>
<view class="point">{{ item.point }}积分</view> <view class="point">{{ item.point }}兑换券</view>
</view> </view>
<view <view
v-else v-else
@ -58,7 +58,7 @@
> >
<view> <view>
<view class="day">第{{ item.day }}天</view> <view class="day">第{{ item.day }}天</view>
<view class="point">{{ item.point }}积分</view> <view class="point">{{ item.point }}兑换券</view>
</view> </view>
<image :src="$util.img('public/uniapp/signin/sign-box.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/signin/sign-box.png')" mode="widthFix"></image>
</view> </view>
@ -74,8 +74,8 @@
<view class="my-signin-con"> <view class="my-signin-con">
<view class="my-signin-item"> <view class="my-signin-item">
<image :src="$util.img('public/uniapp/signin/sign-bg-yellow.png')"></image> <image :src="$util.img('public/uniapp/signin/sign-bg-yellow.png')"></image>
<view class="my-signin-item-num">积分：{{ signPoint }}</view> <view class="my-signin-item-num">兑换券：{{ signPoint }}</view>
<view>累计获得积分</view> <view>累计获得兑换券</view>
</view> </view>
<view class="my-signin-item"> <view class="my-signin-item">
<image :src="$util.img('public/uniapp/signin/sign-bg-pink.png')"></image> <image :src="$util.img('public/uniapp/signin/sign-bg-pink.png')"></image>
@ -92,7 +92,7 @@
<view class="rule-item" v-for="(item, index) in rule" :key="index"> <view class="rule-item" v-for="(item, index) in rule" :key="index">
<block v-if="index == 0">1. 每日签到奖励：</block> <block v-if="index == 0">1. 每日签到奖励：</block>
<block v-else>{{ index + 1 + '. 连续签到' + item.day + '天额外奖励：' }}</block> <block v-else>{{ index + 1 + '. 连续签到' + item.day + '天额外奖励：' }}</block>
<text v-if="item.point">{{ item.point + '积分 ' }}</text> <text v-if="item.point">{{ item.point + '兑换券 ' }}</text>
<text v-if="item.growth">{{ item.growth + '成长值' }}</text> <text v-if="item.growth">{{ item.growth + '成长值' }}</text>
</view> </view>
@ -116,7 +116,7 @@
<text>恭喜您获得</text> <text>恭喜您获得</text>
<text v-if="successTip.point"> <text v-if="successTip.point">
<text class="num color-base-text">{{ successTip.point }}</text> <text class="num color-base-text">{{ successTip.point }}</text>
积分 兑换券
</text> </text>
<text v-if="successTip.growth"> <text v-if="successTip.growth">
<text class="num color-base-text">{{ successTip.growth }}</text> <text class="num color-base-text">{{ successTip.growth }}</text>

2
pages_tool/order/refund_detail.vue
View File

@ -58,7 +58,7 @@
<view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view> <view class="cell">申请时间：{{ $util.timeStampTurnTime(detail.refund_action_time) }}</view>
<view class="cell" v-if="detail.refund_time">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view> <view class="cell" v-if="detail.refund_time">退款时间：{{ $util.timeStampTurnTime(detail.refund_time) }}</view>
<view class="cell" v-if="detail.refund_remark != ''">退款说明：{{ detail.refund_remark }}</view> <view class="cell" v-if="detail.refund_remark != ''">退款说明：{{ detail.refund_remark }}</view>
<view class="cell" v-if="detail.use_point>0">退款积分：{{ detail.use_point }}</view> <view class="cell" v-if="detail.use_point>0">退款兑换券：{{ detail.use_point }}</view>
</view> </view>
</view> </view>
</view> </view>

2
pages_tool/pay/result.vue
View File

@ -25,7 +25,7 @@
<view class="consume-item" v-if="consumeInfo.point_num > 0"> <view class="consume-item" v-if="consumeInfo.point_num > 0">
<image :src="$util.img('public/uniapp/pay/point.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/pay/point.png')" mode="widthFix"></image>
<view class="consume-value color-base-text">{{ consumeInfo.point_num }}</view> <view class="consume-value color-base-text">{{ consumeInfo.point_num }}</view>
<view class="consume-type">积分</view> <view class="consume-type">兑换券</view>
</view> </view>
<view class="consume-item" v-if="consumeInfo.growth_num > 0"> <view class="consume-item" v-if="consumeInfo.growth_num > 0">
<image :src="$util.img('public/uniapp/pay/growth.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/pay/growth.png')" mode="widthFix"></image>

6
pages_tool/recharge/list.vue
View File

@ -4,7 +4,7 @@
<view> <view>
<view class="recharge-title">充值</view> <view class="recharge-title">充值</view>
<view class="account-box"> <view class="account-box">
<view class="label">账户余额</view> <view class="label">账户消费券</view>
<view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view> <view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view>
</view> </view>
@ -34,7 +34,7 @@
<view class="box-text" v-if="isIndex !== -1"> <view class="box-text" v-if="isIndex !== -1">
注：充值 {{ list[isIndex].face_value }} 元赠送： 注：充值 {{ list[isIndex].face_value }} 元赠送：
<text>{{ list[isIndex].point }} 积分，</text> <text>{{ list[isIndex].point }} 兑换券，</text>
<text>{{ list[isIndex].growth }} 成长值</text> <text>{{ list[isIndex].growth }} 成长值</text>
<text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text> <text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text>
</view> </view>
@ -46,7 +46,7 @@
<view class="explain_list"> <view class="explain_list">
<view v-for="(item,index) in list" :key="index" v-if="item.point || item.growth || item.coupon_id != ''"> <view v-for="(item,index) in list" :key="index" v-if="item.point || item.growth || item.coupon_id != ''">
充值 {{ item.face_value }} 元赠送： 充值 {{ item.face_value }} 元赠送：
<text v-if="item.point">{{ item.point }} 积分，</text> <text v-if="item.point">{{ item.point }} 兑换券，</text>
<text v-if="item.growth">{{ item.growth }} 成长值</text> <text v-if="item.growth">{{ item.growth }} 成长值</text>
<text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text> <text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text>
</view> </view>

2
pages_tool/recharge/order_list.vue
View File

@ -23,7 +23,7 @@
<view class="goods-sub-section"> <view class="goods-sub-section">
<view class="<strong>goods-name</strong> color-tip " v-if="orderItem.point > 0 || orderItem.growth > 0">赠送:</view> <view class="<strong>goods-name</strong> color-tip " v-if="orderItem.point > 0 || orderItem.growth > 0">赠送:</view>
<view class="goods-name color-tip " v-if="orderItem.point > 0">{{ orderItem.point }}积分</view> <view class="goods-name color-tip " v-if="orderItem.point > 0">{{ orderItem.point }}兑换券</view>
<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.growth > 0">、</view> <view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.growth > 0">、</view>
<view class="goods-name color-tip " v-if="orderItem.growth > 0">{{ orderItem.growth }}成长值</view> <view class="goods-name color-tip " v-if="orderItem.growth > 0">{{ orderItem.growth }}成长值</view>
<view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.coupon_id">、</view> <view class="goods-name color-tip " v-if="orderItem.point > 0 && orderItem.coupon_id">、</view>