From e91e1b60f30a08535d2ee0b5e183ecb3233ee696 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 6 Mar 2024 16:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=89=B9=E8=89=B2=E5=92=8C=E9=85=92=E9=81=93=E9=A6=86=E7=89=B9?=
 =?UTF-8?q?=E8=89=B2=E5=85=91=E6=8D=A2=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=88=E9=83=BD=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=A1=E4=BA=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/admin/business/index.vue                | 30 +++++++++++++------
 pages/admin/business/login.vue                | 10 +++----
 pages/user/index.vue                          |  4 +--
 pages/users/online_payment/exchange/index.vue |  6 ++--
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/pages.json b/pages.json
index 9530e27..d60ca9b 100644
--- a/pages.json
+++ b/pages.json
@@ -694,7 +694,7 @@
 				{
 					"path": "business/index",
 					"style": {
-						"navigationBarTitleText": "商家管理"
+						"navigationBarTitleText": "联盟商家管理"
 					}
 				},
 				{
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 62533a8..1253e61 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -133,12 +133,23 @@ export default {
         });
       }
       if(this.service.product_exchange){
-        list.push({
-          type: 'exchange_qr_code',
-          title: '特色菜兑换',
-          url: '',
-          icon: 'iconfont icon-erweima1'
-        });
+        if(merchantInfo.merchant_type == 1){
+          // 酒道馆核销用户优惠券
+          list.push({
+            type: 'exchange_qr_code',
+            title: '特色酒兑换',
+            url: '',
+            icon: 'iconfont icon-erweima1'
+          });
+        }else{
+          // 普通商户核销用户订单
+          list.push({
+            type: 'exchange_qr_code',
+            title: '特色菜兑换',
+            url: '',
+            icon: 'iconfont icon-erweima1'
+          });
+        }
       }
       if(this.service.purchase_permission){
         list.push({
@@ -163,7 +174,7 @@ export default {
     }
     // 设置页面标题
     uni.setNavigationBarTitle({
-      title: this.is_sys == 1 ? '平台管理' : (this.is_sys == 2 ? '酒道馆管理' : '商家管理')
+      title: this.is_sys == 1 ? '平台管理' : (this.is_sys == 2 ? '酒道馆管理' : '联盟商家管理')
     })
     // 登录后操作
     if(this.is_sys == 1 || this.shopIsLogin){
@@ -229,7 +240,7 @@ export default {
         })
       }else{
         uni.setNavigationBarTitle({
-          title: (!data.mer_id) ? '平台管理' : '商家管理'
+          title: (!data.mer_id) ? '平台管理' : '联盟商家管理'
         })
       }
     },
@@ -264,6 +275,7 @@ export default {
     // 二维码 - 生成特色菜兑换
     createExchangeQrCode(){
       let _this = this;
+      let merchantInfo = this.service.merchant || {};
       // 点击按钮触发弹框输入框的显示
       uni.showModal({
         title: '兑换商品金额', // 弹框标题
@@ -279,7 +291,7 @@ export default {
             let params = {
               mer_id: this.service.mer_id,
               total_money: inputValue,
-              quota_type: 2,
+              quota_type: merchantInfo.merchant_type == 1 ? 1 : 2,
             };
             getSiteQrCode(params).then(res => {
               if (res.status == 200) {
diff --git a/pages/admin/business/login.vue b/pages/admin/business/login.vue
index 87e052a..09e0c33 100644
--- a/pages/admin/business/login.vue
+++ b/pages/admin/business/login.vue
@@ -82,11 +82,11 @@ export default {
     this.is_sys = options.is_sys;
     // 登录后操作
     let isChange = options.change || false;
-    if((this.is_sys == 1 || this.shopIsLogin) && !isChange){
-      uni.navigateTo({
-        url: '/pages/admin/business/index?is_sys=' + is_sys
-      })
-    }
+    // if((this.is_sys == 1 || this.shopIsLogin) && !isChange){
+    //   uni.navigateTo({
+    //     url: '/pages/admin/business/index?is_sys=' + this.is_sys
+    //   })
+    // }
     // 设置页面标题
     uni.setNavigationBarTitle({
       title: this.is_sys == 2 ? '酒道馆登录' : '商家登录'
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 5e1ba22..387dbe0 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -267,9 +267,9 @@
           <!--固定菜单-->
           <template v-if="identityCurrentName == 'county'">
             <view class="_list-item" v-if="userInfo.service" @click="toService(0)">
-              <view class="top">商家管理</view>
+              <view class="top">联盟商家管理</view>
               <view class="tag-list">
-                <view class="tag-list-item">商家管理中心</view>
+                <view class="tag-list-item">联盟商家管理中心</view>
               </view>
             </view>
             <view class="_list-item" v-if="userInfo.shopMerService" @click="toService(2)">
diff --git a/pages/users/online_payment/exchange/index.vue b/pages/users/online_payment/exchange/index.vue
index 7d2df93..5facd4a 100644
--- a/pages/users/online_payment/exchange/index.vue
+++ b/pages/users/online_payment/exchange/index.vue
@@ -380,14 +380,14 @@ export default {
       pointList(this.point_search)
           .then(res => {
             _this.point_list = res.data || {};
-            // 判断：是否不存在替换点
+            // 判断：是否不存在提货点
             if(Object.values(_this.point_list).length <= 0){
               this.$util.Tips({
                 title: '非操作员，无操作权限！',
               },{tab:1,url:'/pages/user/index'});
               return false;
             }
-            // 判断：是否只有一个替换点-是则选中
+            // 判断：是否只有一个提货点-是则选中
             if(Object.values(_this.point_list).length == 1){
               _this.selectedPoint(_this.point_list[0]);
             }
@@ -455,7 +455,7 @@ export default {
       consumeList(this.consume_search)
           .then(res => {
             _this.consume_list = res.data || {};
-            // 判断：是否只有一个替换点-是则选中
+            // 判断：是否只有一个提货点-是则选中
             if(Object.values(_this.consume_list).length == 1){
               _this.selectedConsume(_this.consume_list[0]);
             }