From 4d7e9806f86c9cd594705cc43774841b8834fab6 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 5 Feb 2024 13:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E8=B5=A0=E9=80=81=E5=8F=8A=E6=A0=B8=E9=94=80=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/exchange.js                   |  4 ++++
 api/store.js                      |  1 +
 pages/admin/business/index.vue    | 15 +++++++++----
 pages/annex/vip_center/index.vue  | 24 ++++++++++++++++++---
 pages/users/user_coupon/index.vue | 30 +++++++++++++++-----------
 pages/users/write_off/index.vue   | 36 ++++++++++++++++++++++---------
 6 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/api/exchange.js b/api/exchange.js
index 245386e..0cfbd7d 100644
--- a/api/exchange.js
+++ b/api/exchange.js
@@ -60,3 +60,7 @@ export function recordIntegralList(data) {
 export function quotaTransfer(data) {
 	return request.get(`exchange/quota_transfer`,data);
 }
+// 获取门店绑定的酒道馆信息
+export function merBindShop(merId) {
+	return request.get(`exchange/mer_bind_shop/${merId}`);
+}
diff --git a/api/store.js b/api/store.js
index 3e8e05f..d935139 100644
--- a/api/store.js
+++ b/api/store.js
@@ -545,3 +545,4 @@ export function priceRuleApi(id) {
 		noAuth: true
 	});
 }
+
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index db5d486..9fec027 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -254,6 +254,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.business{
+  width: 100vw!important;
+  min-height: 100vh!important;
+  background: linear-gradient(180deg, #2291F8 0%, rgba(34,145,248,0) 100%);
+
+}
 	.businessIcon {
 		color: #2291F8;
 		font-size: 80rpx;
@@ -261,9 +267,9 @@ export default {
 		margin-bottom: 29rpx;
 	}
 	.business-header {
-		height: 305rpx;
-		background: linear-gradient(180deg, #2291F8 0%, rgba(34,145,248,0) 100%);
-		position: fixed;
+		//height: 305rpx;
+		//position: fixed;
+    padding-top: 20rpx;
 		width: 100%;
 		text-align: center;
 		top: 0;
@@ -299,7 +305,8 @@ export default {
 	.business-content {
 		width: 100%;
 		padding: 0 calc((100% - (345rpx * 2)) / 3);
-		margin-top: 151rpx;
+		//margin-top: 151rpx;
+    margin-top: 55rpx;
     display: inline-flex;
     flex-wrap: wrap;
     flex-direction: row;
diff --git a/pages/annex/vip_center/index.vue b/pages/annex/vip_center/index.vue
index 0069e3b..afa8e57 100644
--- a/pages/annex/vip_center/index.vue
+++ b/pages/annex/vip_center/index.vue
@@ -133,7 +133,8 @@
 	import { openPaySubscribe } from '@/utils/SubscribeMessage.js';
 	import dayjs from '@/plugin/dayjs/dayjs.min.js';
 	import { HTTP_REQUEST_URL } from '@/config/app';
-  import spread from "../../../libs/spread";
+  import spread from "@/libs/spread";
+  import {merBindShop} from "@/api/exchange";
 	export default {
 		components: {
 			payment,
@@ -223,11 +224,15 @@
 		onLoad(options) {
       // 二维码参数接收
       if(options.scene){
-        // console.log("接收参数 - 未转义",options.scene)
+        console.log("接收参数 - 未转义",options.scene)
         var scene = this.$util.getUrlParams(decodeURIComponent(options.scene));
-        // console.log("接收参数 - 转义后",scene)
+        console.log("接收参数 - 转义后",scene)
         this.bind_mer_id = scene.mid || 0;
         this.bind_staff_id = scene.suid || 0;
+        // 判断：如果存在邀请人  判断对应的商家是否绑定酒道馆
+        if(this.bind_mer_id > 0 && this.bind_staff_id > 0){
+          this.isBindShop();
+        }
       }
 
 			this.getCouponLst();
@@ -631,6 +636,19 @@
 
 				});
 			},
+      // 判断：邀请人关联的商家是否绑定酒道馆
+      isBindShop(){
+        let _this = this;
+        merBindShop(_this.bind_mer_id).then(res => {
+          let data = res.data || {};
+          let merId = data.mer_id || 0;
+          if(merId <= 0){
+            _this.$util.Tips({
+              title: '该商户未绑定酒道馆！',
+            },{tab:1,url:'/pages/user/index'});
+          }
+        })
+      }
 		},
 		// 滚动监听
 		onPageScroll(e) {
diff --git a/pages/users/user_coupon/index.vue b/pages/users/user_coupon/index.vue
index 429d673..db181da 100644
--- a/pages/users/user_coupon/index.vue
+++ b/pages/users/user_coupon/index.vue
@@ -16,19 +16,26 @@
 				</view>
 				<view class='item acea-row row-center-wrapper'>
 					<block v-if="item.status == 0">
-						<view v-if="item.coupon.send_type == 5" class='money vip-coupon'>
-							<view class="line1 coupon_value">￥<text class='num'>{{item.coupon_price}}</text></view>
-							<view class="pic-num">满{{ item.use_min_price }}元可用</view>
+						<view v-if="item.coupon.send_type == 5 && 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>-->
+							<!--<view class="pic-num">满{{ item.use_min_price }}元可用</view>-->
 						</view>
 						<view v-else class='money' :style="{ 'background-image': `url(${domain}/static/diy/couponBg${keyColor}.png)` }">
 							<view class="line1 coupon_value">￥<text class='num'>{{item.coupon_price}}</text></view>
 							<view class="pic-num">满{{ item.use_min_price }}元可用</view>
 						</view>
 					</block>
-					
 					<view v-else class='money moneyGray'>
-						<view>￥<text class='num'>{{item.coupon_price}}</text></view>
-						<view class="pic-num">满{{ item.use_min_price }}元可用</view>
+            <block v-if="item.coupon.send_type == 5 && 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>
+            <block v-else>
+              <view>￥<text class='num'>{{item.coupon_price}}</text></view>
+              <view class="pic-num">满{{ item.use_min_price }}元可用</view>
+            </block>
 					</view>
 					<view class='text'>
 						<view class='condition line1'>
@@ -48,7 +55,7 @@
 								去使用
 								</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>
 							</view>
 							<view class='bnt1 gray' style="position: static;" v-if="item.status==1">已使用</view>
@@ -68,9 +75,6 @@
 		  <view class="qr-code-content">
 		    <image class="image" :src="qrCode"></image>
 		    <view class="close-qr-code" @click="closeQrCode()">关闭</view>
-			<navigator :url="'/pages/users/write_off/index?write_code=8sesff42seds'" class='bnt1 b-color'>
-			去使用
-			</navigator>
 		  </view>
 		</uni-popup>
 	</view>
@@ -84,9 +88,9 @@
 	import {
 		getUserCoupons
 	} from '@/api/api.js';
-	
+
 	import { createQRcode } from '@/api/user.js';
-	
+
 	import {
 		mapGetters
 	} from "vuex";
@@ -127,7 +131,7 @@
 			if(value){
 				var newDate=/\d{4}-\d{1,2}-\d{1,2}/g.exec(value)
 				return newDate[0]
-			}	
+			}
 		  }
 		},
 		onLoad(options) {
diff --git a/pages/users/write_off/index.vue b/pages/users/write_off/index.vue
index 137acb6..ae5447b 100644
--- a/pages/users/write_off/index.vue
+++ b/pages/users/write_off/index.vue
@@ -36,7 +36,7 @@
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
-	
+
 	import { writeOff } from '@/api/user.js';
 
 	export default {
@@ -109,6 +109,16 @@
 			},
 			goCallate() {
 				let that = this
+
+        console.log('核销码信息：',that.write_code)
+
+        if(!that.write_code || that.write_code.length <= 0){
+          that.$util.Tips({
+            title: '无核销码信息！',
+          });
+          return false;
+        }
+
 				writeOff({
 					write_code: that.write_code,
 				}).then(res => {
@@ -126,11 +136,17 @@
 				var self = this;
 				// #ifdef MP || APP-PLUS
 				wx.scanCode({
-					scanType: ["qrCode", "barCode"],
+					// scanType: ["qrCode", "barCode"],
 					success(res) {
 						console.log(res);
-						self.write_code = res.result
-						goCallate()
+						// self.write_code = res.result
+            // self.goCallate()
+            let page = res.path || '';
+            if(page){
+              uni.redirectTo({
+                url: '/' + page
+              })
+            }
 					},
 					fail(res) {
 						console.log(res);
@@ -138,16 +154,16 @@
 				})
 				// #endif
 				//#ifdef H5
-				if (this.$wechat.isWeixin()) {
-					this.$wechat.wechatEvevt('scanQRCode', {
+				if (self.$wechat.isWeixin()) {
+          self.$wechat.wechatEvevt('scanQRCode', {
 						needResult: 1,
 						scanType: ["qrCode", "barCode"]
 					}).then(res => {
 						console.log(res);
-						this.write_code = res.resultStr
-						goCallate()
+            self.write_code = res.resultStr
+            self.goCallate()
 					}).catch(res => {
-						this.$util.Tips({
+            self.$util.Tips({
 							title: res
 						});
 					});;
@@ -432,4 +448,4 @@
 			background-color: #ffffff;
 		}
 	}
-</style>
\ No newline at end of file
+</style>