添加:用户开通会员卡后跳转到优惠券列表
This commit is contained in:
parent
346c96ba5a
commit
6e344ba6a3
|
|
@ -99,14 +99,14 @@ export default {
|
||||||
}
|
}
|
||||||
if(this.service.is_user){
|
if(this.service.is_user){
|
||||||
list.push({
|
list.push({
|
||||||
title: '用户管理',
|
title: '顾客管理',
|
||||||
url: '/pages/admin/custom/index?mer_id=' + merId,
|
url: '/pages/admin/custom/index?mer_id=' + merId,
|
||||||
icon: 'iconfont icon-kehu-xuanzhong'
|
icon: 'iconfont icon-kehu-xuanzhong'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if(this.service.staff_manage){
|
if(this.service.staff_manage){
|
||||||
list.push({
|
list.push({
|
||||||
title: '品牌管理',
|
title: '客服经理',
|
||||||
url: '/pages/admin/business/staff?mer_id=' + merId,
|
url: '/pages/admin/business/staff?mer_id=' + merId,
|
||||||
icon: 'iconfont icon-kehu-xuanzhong'
|
icon: 'iconfont icon-kehu-xuanzhong'
|
||||||
});
|
});
|
||||||
|
|
@ -130,7 +130,7 @@ export default {
|
||||||
if(this.service.product_exchange){
|
if(this.service.product_exchange){
|
||||||
list.push({
|
list.push({
|
||||||
type: 'exchange_qr_code',
|
type: 'exchange_qr_code',
|
||||||
title: '商品兑换码',
|
title: '特色菜兑换',
|
||||||
url: '',
|
url: '',
|
||||||
icon: 'iconfont icon-erweima1'
|
icon: 'iconfont icon-erweima1'
|
||||||
});
|
});
|
||||||
|
|
@ -231,7 +231,7 @@ export default {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// 二维码 - 生成商品兑换码
|
// 二维码 - 生成特色菜兑换
|
||||||
createExchangeQrCode(){
|
createExchangeQrCode(){
|
||||||
let _this = this;
|
let _this = this;
|
||||||
// 点击按钮触发弹框输入框的显示
|
// 点击按钮触发弹框输入框的显示
|
||||||
|
|
|
||||||
|
|
@ -418,12 +418,15 @@
|
||||||
},
|
},
|
||||||
// 调用支付
|
// 调用支付
|
||||||
callPay(res) {
|
callPay(res) {
|
||||||
let that = this;
|
let that = this;
|
||||||
let status = res.data.status,
|
let status = res.data.status,
|
||||||
orderId = res.data.result.order_id,
|
orderId = res.data.result.order_id,
|
||||||
callback_key = res.data.result.pay_key,
|
callback_key = res.data.result.pay_key,
|
||||||
jsConfig = res.data.result.config,
|
jsConfig = res.data.result.config,
|
||||||
goPages = '/pages/annx/vip_center/index'
|
// goPages = '/pages/annx/vip_center/index'
|
||||||
|
goPages = '/pages/users/user_coupon/index';
|
||||||
|
|
||||||
|
console.log('支付成功', status)
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 'ORDER_EXIST':
|
case 'ORDER_EXIST':
|
||||||
case 'EXTEND_ORDER':
|
case 'EXTEND_ORDER':
|
||||||
|
|
@ -509,7 +512,7 @@
|
||||||
// #ifdef MP
|
// #ifdef MP
|
||||||
case "routine":
|
case "routine":
|
||||||
jsConfig.timeStamp = jsConfig.timestamp;
|
jsConfig.timeStamp = jsConfig.timestamp;
|
||||||
let mp_pay_name=''
|
let mp_pay_name = '';
|
||||||
if(uni.requestOrderPayment){
|
if(uni.requestOrderPayment){
|
||||||
mp_pay_name='requestOrderPayment'
|
mp_pay_name='requestOrderPayment'
|
||||||
}else{
|
}else{
|
||||||
|
|
@ -518,10 +521,11 @@
|
||||||
uni[mp_pay_name]({
|
uni[mp_pay_name]({
|
||||||
...jsConfig,
|
...jsConfig,
|
||||||
success: function(res) {
|
success: function(res) {
|
||||||
|
console.log("支付成功:", res)
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
that.payClose();
|
that.payClose();
|
||||||
return that.$util.Tips({
|
return that.$util.Tips({
|
||||||
title: '支付成功',
|
title: '支付成功!',
|
||||||
icon: 'success'
|
icon: 'success'
|
||||||
}, {
|
}, {
|
||||||
tab: 5,
|
tab: 5,
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class='item acea-row row-center-wrapper'>
|
<view class='item acea-row row-center-wrapper'>
|
||||||
<block v-if="item.status == 0">
|
<block v-if="item.status == 0">
|
||||||
<view v-if="item.coupon.send_type == 5 && item.coupon.type == 13" class='money vip-coupon'>
|
<view v-if="item.coupon.type == 13" class='money vip-coupon'>
|
||||||
<view class="line1 coupon_value"><text class='num' style="font-size: 45rpx!important;">{{ item.brand ? item.brand.title : '逸路红' }}</text></view>
|
<view class="line1 coupon_value"><text class='num' style="font-size: 45rpx!important;">{{ item.brand ? item.brand.title : '逸路红' }}</text></view>
|
||||||
<view class="pic-num">{{ item.shopMer ? '仅 ' + item.shopMer.mer_name + ' 可用' : '全门店可用' }}</view>
|
<view class="pic-num">{{ item.shopMer ? '仅 ' + item.shopMer.mer_name + ' 可用' : '全门店可用' }}</view>
|
||||||
<!--<view class="line1 coupon_value">¥<text class='num'>{{item.coupon_price}}</text></view>-->
|
<!--<view class="line1 coupon_value">¥<text class='num'>{{item.coupon_price}}</text></view>-->
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<view v-else class='money moneyGray'>
|
<view v-else class='money moneyGray'>
|
||||||
<block v-if="item.coupon.send_type == 5 && item.coupon.type == 13">
|
<block v-if="item.coupon.type == 13">
|
||||||
<view class="line1 coupon_value"><text class='num'>{{ item.brand ? item.brand.title : '逸路红' }}</text></view>
|
<view class="line1 coupon_value"><text class='num'>{{ item.brand ? item.brand.title : '逸路红' }}</text></view>
|
||||||
<view class="pic-num">已核销</view>
|
<view class="pic-num">已核销</view>
|
||||||
</block>
|
</block>
|
||||||
|
|
@ -51,10 +51,10 @@
|
||||||
<view class='data acea-row row-between-wrapper'>
|
<view class='data acea-row row-between-wrapper'>
|
||||||
<view>{{item.start_time | timeYMD}}-{{item.end_time | timeYMD}}</view>
|
<view>{{item.start_time | timeYMD}}-{{item.end_time | timeYMD}}</view>
|
||||||
<view v-if="item.status==0">
|
<view v-if="item.status==0">
|
||||||
<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' :class="item.coupon.send_type == 5 ? 'svip-btn' : ''" hover-class="none" v-if="item.coupon.type != 13">
|
<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' hover-class="none" v-if="item.coupon.type != 13">
|
||||||
去使用
|
去使用
|
||||||
</navigator>
|
</navigator>
|
||||||
<view class='bnt1 b-color' @click="getQRcode(item.write_code)" :class="item.coupon.send_type == 5 ? 'svip-btn' : ''" hover-class="none" v-else>
|
<view class='bnt1 b-color svip-btn' @click="getQRcode(item.write_code)" hover-class="none" v-else>
|
||||||
去核销
|
去核销
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue