From 6e344ba6a350448974c3f8e609c7dc637d90fb5a Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 6 Feb 2024 14:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E4=BC=9A=E5=91=98=E5=8D=A1=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/business/index.vue    |  8 ++++----
 pages/annex/vip_center/index.vue  | 20 ++++++++++++--------
 pages/users/user_coupon/index.vue |  8 ++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

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 @@
 				</view>
 				<view class='item acea-row row-center-wrapper'>
 					<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="pic-num">{{ item.shopMer ? '仅 ' + item.shopMer.mer_name + ' 可用' : '全门店可用' }}</view>
 							<!--<view class="line1 coupon_value">￥<text class='num'>{{item.coupon_price}}</text></view>-->
@@ -28,7 +28,7 @@
 						</view>
 					</block>
 					<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="pic-num">已核销</view>
             </block>
@@ -51,10 +51,10 @@
 						<view class='data acea-row row-between-wrapper'>
 							<view>{{item.start_time | timeYMD}}-{{item.end_time | timeYMD}}</view>
 							<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>
-								<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>