diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue index 1a9cd1c..b7efe0d 100644 --- a/pages/admin/business/index.vue +++ b/pages/admin/business/index.vue @@ -99,14 +99,14 @@ export default { } if(this.service.is_user){ list.push({ - title: '用户管理', + title: '顾客管理', url: '/pages/admin/custom/index?mer_id=' + merId, icon: 'iconfont icon-kehu-xuanzhong' }); } if(this.service.staff_manage){ list.push({ - title: '品牌管理', + title: '客服经理', url: '/pages/admin/business/staff?mer_id=' + merId, icon: 'iconfont icon-kehu-xuanzhong' }); @@ -130,7 +130,7 @@ export default { if(this.service.product_exchange){ list.push({ type: 'exchange_qr_code', - title: '商品兑换码', + title: '特色菜兑换', url: '', icon: 'iconfont icon-erweima1' }); @@ -231,7 +231,7 @@ export default { }); }); }, - // 二维码 - 生成商品兑换码 + // 二维码 - 生成特色菜兑换 createExchangeQrCode(){ let _this = this; // 点击按钮触发弹框输入框的显示 diff --git a/pages/annex/vip_center/index.vue b/pages/annex/vip_center/index.vue index afa8e57..739ef54 100644 --- a/pages/annex/vip_center/index.vue +++ b/pages/annex/vip_center/index.vue @@ -418,12 +418,15 @@ }, // 调用支付 callPay(res) { - let that = this; - let status = res.data.status, - orderId = res.data.result.order_id, - callback_key = res.data.result.pay_key, - jsConfig = res.data.result.config, - goPages = '/pages/annx/vip_center/index' + let that = this; + let status = res.data.status, + orderId = res.data.result.order_id, + callback_key = res.data.result.pay_key, + jsConfig = res.data.result.config, + // goPages = '/pages/annx/vip_center/index' + goPages = '/pages/users/user_coupon/index'; + + console.log('支付成功', status) switch (status) { case 'ORDER_EXIST': case 'EXTEND_ORDER': @@ -509,7 +512,7 @@ // #ifdef MP case "routine": jsConfig.timeStamp = jsConfig.timestamp; - let mp_pay_name='' + let mp_pay_name = ''; if(uni.requestOrderPayment){ mp_pay_name='requestOrderPayment' }else{ @@ -518,10 +521,11 @@ uni[mp_pay_name]({ ...jsConfig, success: function(res) { + console.log("支付成功:", res) uni.hideLoading(); that.payClose(); return that.$util.Tips({ - title: '支付成功', + title: '支付成功!', icon: 'success' }, { tab: 5, diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue index db181da..2caac12 100644 --- a/pages/users/user_coupon/index.vue +++ b/pages/users/user_coupon/index.vue @@ -16,7 +16,7 @@ - + {{ item.brand ? item.brand.title : '逸路红' }} {{ item.shopMer ? '仅 ' + item.shopMer.mer_name + ' 可用' : '全门店可用' }} @@ -28,7 +28,7 @@ - + {{ item.brand ? item.brand.title : '逸路红' }} 已核销 @@ -51,10 +51,10 @@ {{item.start_time | timeYMD}}-{{item.end_time | timeYMD}} - + 去使用 - + 去核销