From a9736e69f1bb5a70ed959ac29229c11ca155f58d Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 14:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/table.js                 | 11 +++++++++++
 src/views/tool/Instead/index.vue | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/api/table.js b/src/api/table.js
index 1a691c3..4e7cb83 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -461,3 +461,14 @@ export function $returnTableDetail(data) {
     }
   });
 }
+//获取订单可用优惠券
+export function $activateByOrderId(data) {
+  return request({
+    url: '/api/tbShopCoupon/activateByOrderId',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
\ No newline at end of file
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index e219e29..e11e399 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -825,7 +825,7 @@
                     </div>
                   </div>
 
-                  <!-- <div class="forms">
+                  <div class="forms">
                       <el-form
                         ref="form"
                         :model="createOrder.form"
@@ -843,7 +843,7 @@
                           </el-button>
                         </el-form-item>
                       </el-form>
-                    </div> -->
+                    </div>
                 </div>
                 <div class="btn_group">
                   <el-button size="medium" @click="disCountShow">
@@ -1287,6 +1287,7 @@ import {
   tbShopTableGet,
   $changeUseType,
   $returnTableDetail,
+  $activateByOrderId
 } from "@/api/table";
 import { tbShopCategoryGet } from "@/api/shop";
 import {
@@ -1745,6 +1746,7 @@ export default {
         tableId: this.table.tableId,
         masterId: this.masterId,
         vipUserId: val,
+        orderId:this.createOrder.data.id||'',
         type: val === "" ? 1 : 0,
       });
     },
@@ -3407,9 +3409,17 @@ export default {
       this.table = params.tableId ? item : "";
     },
     async getOrderData(params) {
+      const orderId= params ? params.orderId : this.createOrder.data.id
+     
       const res = await tbOrderInfoDetail(
         params ? params.orderId : this.createOrder.data.id
       );
+      if(res.memberId){
+        $activateByOrderId({
+        orderId,memberId:res.memberId
+      })
+      }
+    
       if (res.status != "unpaid") {
         return res;
       }