From 67a892ac01839dabf335b18e872f6f999337d1c8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 5 Nov 2024 16:28:01 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E7=BB=93=E8=B4=A6=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/table.js                              |  46 +++
 src/utils/table.js                            |   4 +
 src/views/order_manage/order_list.vue         |   9 +-
 .../tool/Instead/components/choose-user.vue   |   7 +-
 .../tool/Instead/components/discount.vue      |   4 +-
 src/views/tool/Instead/components/quans.vue   | 189 ++++++++++
 src/views/tool/Instead/index.vue              | 345 ++++++++++++++----
 7 files changed, 535 insertions(+), 69 deletions(-)
 create mode 100644 src/views/tool/Instead/components/quans.vue

diff --git a/src/api/table.js b/src/api/table.js
index 4e7cb83..8eb43e1 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -471,4 +471,50 @@ export function $activateByOrderId(data) {
       ...data
     }
   });
+}
+
+//会员积分列表
+export function $returnMemberPointsList(data) {
+  return request({
+    url: '/api/points/member-points/page',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+
+// 会员积分账户信息
+export function $returnMemberPoints(memberId) {
+  return request({
+    url: '/api/points/member-points/'+memberId,
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+//002-获取订单可用积分及抵扣金额（支付页面使用）
+export function $calcUsablePoints(data) {
+  return request({
+    url: '/api/points/member-points/calc-usable-points',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
+// 003-根据积分计算可抵扣金额
+export function $calcDeDuctionPoints(data) {
+  return request({
+    url: '/api/points/member-points/calc-deduction-amount',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
 }
\ No newline at end of file
diff --git a/src/utils/table.js b/src/utils/table.js
index 110d764..39a1064 100644
--- a/src/utils/table.js
+++ b/src/utils/table.js
@@ -30,5 +30,9 @@ export const $status= {
     cleaning: {
         label: "待清台",
         type: "#FAAD14",
+    },
+    unbind:{
+        label: "未绑定",
+        type: "rgb(221,221,221)",
     }
 }
\ No newline at end of file
diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index aa6bdd8..b158085 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -207,21 +207,24 @@ export default {
   filters: {
     orderTypeFilter(t) {
       if (t) {
-        return t && orderEnum.orderType.find(item => item.key == t).label;
+        const item= orderEnum.orderType.find(item => item.key == t);
+        return t && item?item.label:'';
       } else {
         return t;
       }
     },
     sendTypeFilter(t) {
       if (t) {
-        return orderEnum.sendType.find(item => item.key == t).label;
+        const item= orderEnum.sendType.find(item => item.key == t);
+        return item?item.label:'';
       } else {
         return t;
       }
     },
     statusFilter(t) {
       if (t) {
-        return t && orderEnum.status.find(item => item.key == t).label;
+        const item= orderEnum.status.find(item => item.key == t);
+        return t && item?item.label:'';
       } else {
         return t;
       }
diff --git a/src/views/tool/Instead/components/choose-user.vue b/src/views/tool/Instead/components/choose-user.vue
index f834fca..0b27541 100644
--- a/src/views/tool/Instead/components/choose-user.vue
+++ b/src/views/tool/Instead/components/choose-user.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择用户" width="850px" :visible.sync="show">
+  <el-dialog title="选择用户" width="850px" :visible.sync="show" top="20px">
     <div class="app-container">
       <div class="head-container">
         <el-form :model="query" inline>
@@ -73,7 +73,7 @@
             </template>
           </el-table-column>
           <el-table-column label="余额" prop="amount"></el-table-column>
-          <el-table-column label="积分" prop="totalScore"></el-table-column>
+          <el-table-column label="积分" prop="accountPoints"></el-table-column>
 
           <el-table-column label="操作" width="90" fixed="right">
             <template v-slot="scope">
@@ -99,6 +99,7 @@
   
   <script>
 import { queryAllShopUser, queryAllShopInfo } from "@/api/shop";
+import { $returnMemberPointsList } from "@/api/table";
 import dayjs from "dayjs";
 let cacheData = {};
 export default {
@@ -107,6 +108,7 @@ export default {
       show: false,
       query: {
         name: "",
+        isVip:1
       },
       shopInfo: {
         balanceTotal: 0,
@@ -202,7 +204,6 @@ export default {
       this.tableData.page = e - 1;
       this.getTableData();
     },
-    // 获取商品列表
     async getTableData() {
       this.tableData.loading = true;
       try {
diff --git a/src/views/tool/Instead/components/discount.vue b/src/views/tool/Instead/components/discount.vue
index f7c0270..b3a2f56 100644
--- a/src/views/tool/Instead/components/discount.vue
+++ b/src/views/tool/Instead/components/discount.vue
@@ -154,7 +154,7 @@ export default {
         }
         if (curretnMoney > money) {
           this.$message.error("实收金额不能大于总金额");
-          this.form.curretnMoney = form.money;
+          this.form.curretnMoney = this.form.money;
         }
         this.form.reduceMoney =  (money - this.form.curretnMoney).toFixed(2);
         this.form.discount =toFixedNoRounding( ((this.form.curretnMoney / money) * 100).toFixed(3) );
@@ -173,7 +173,7 @@ export default {
     },
     open(data) {
       console.log(data);
-      this.form.money = data.amount;
+      this.form.money = data.amount*1;
       this.form.discount = data.discount?toFixedNoRounding(data.discount.toFixed(3)):100;
       this.show = true;
       this.init();
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
new file mode 100644
index 0000000..ae34c94
--- /dev/null
+++ b/src/views/tool/Instead/components/quans.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog width="600px" :title="title" :visible.sync="show">
+    <div class="u-p-15">
+      <div class="">
+        <el-tabs v-model="activeName" @tab-click="tabClick">
+          <el-tab-pane label="优惠券(单选)" name="youhui">
+            <el-table
+              empty-text="无可用优惠券"
+              :data="quans.fullReductionCoupon"
+              @cell-click="fullReductionCouponClick"
+            >
+              <el-table-column type="index" width="80" label="">
+                <template v-slot="scope">
+                  <el-checkbox
+                    @change="fullReductionCouponClick(scope.row)"
+                    :value="scope.row.id == fullReductionCouponSel.id"
+                  ></el-checkbox>
+                </template>
+              </el-table-column>
+              <el-table-column type="index" width="50" label="#">
+              </el-table-column>
+              <el-table-column prop="name" label="券名称"> </el-table-column>
+              <el-table-column label="券类型" width="80">
+              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
+            </el-table-column>
+              <el-table-column prop="useRestrictions" label="描述">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="商品券(多选)" name="goods">
+            <el-table
+              empty-text="无可用商品券"
+              :data="quans.productCoupon"
+              tooltip-effect="dark"
+              style="width: 100%"
+              @selection-change="productCouponChange"
+            >
+              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column type="index" width="50" label="#">
+              </el-table-column>
+              <el-table-column prop="name" label="券名称"> </el-table-column>
+              <el-table-column label="券类型" width="80">
+              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
+            </el-table-column>
+              <el-table-column prop="useRestrictions" label="描述">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+
+        <div v-if="quansSelArr.length > 0">
+            <div class="font-bold u-m-b-10">已选优惠券</div>
+          <el-table
+            empty-text="未选择优惠券"
+            :data="quansSelArr"
+          >
+            <el-table-column type="index" width="50" label="#">
+            </el-table-column>
+            <el-table-column prop="name" label="券名称"> </el-table-column>
+            <el-table-column label="券类型" width="80">
+              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
+            </el-table-column>
+            <el-table-column prop="useRestrictions" label="描述">
+            </el-table-column>
+          </el-table>
+        </div>
+
+        <div class="u-flex u-row-center u-m-t-50">
+          <el-button size="medium" @click="close">取消</el-button>
+          <el-button size="medium" type="primary" @click="confirm"
+            >确定</el-button
+          >
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { $activateByOrderId } from "@/api/table";
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "选择优惠券",
+    },
+  },
+  data() {
+    return {
+      fullReductionCouponSel: {
+        id: "",
+      },
+      productCouponSelArr: [],
+      quansSelArr: [],
+      quans: {
+        fullReductionCoupon: [],
+        productCoupon: [],
+      },
+      currentRow: null,
+      multipleSelection: null,
+      fullReductionCouponSelId: "",
+      activeName: "youhui",
+      form: {},
+      show: false,
+    };
+  },
+  watch: {},
+  methods: {
+    productCouponChange(val) {
+      this.productCouponSelArr = val;
+      if (this.productCouponSelArr.length > 0) {
+        this.productCouponSelArr.length = val.length + 1;
+        for (let i in val) {
+          this.quansSelArr[i + 1] = val[i];
+        }
+      } else {
+        this.quansSelArr = val;
+      }
+    },
+    fullReductionCouponClick(row) {
+      if (this.fullReductionCouponSel.id == row.id) {
+        this.fullReductionCouponSel = { id: "" };
+        this.quansSelArr.shift();
+        
+      } else {
+        this.fullReductionCouponSel = row;
+        this.quansSelArr.unshift(row);
+      }
+      console.log(this.quansSelArr)
+    },
+    handleCurrentChange(val) {
+      this.currentRow = val;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    tabClick() {},
+    init() {},
+
+    changeKey(key, val) {
+      this[key] = val;
+    },
+
+    confirm() {
+      this.$emit("confirm", this.quansSelArr);
+      this.close();
+    },
+    async open(data) {
+      console.log(data);
+      if (data.memberId) {
+        let quans = await $activateByOrderId({
+          orderId: data.id,
+          memberId: data.memberId,
+        });
+        quans.fullReductionCoupon = quans.fullReductionCoupon.filter(
+          (v) => v.use
+        );
+        quans.productCoupon = quans.productCoupon.filter((v) => v.use);
+        this.quans = quans;
+      }
+
+      this.show = true;
+      this.init();
+    },
+    close() {
+      this.show = false;
+    },
+  },
+  mounted() {
+    this.number = `${this.value}`;
+  },
+};
+</script>
+      
+    <style  lang="scss" scoped>
+.codeImg {
+  width: 160px;
+  border: 1px solid rgb(220, 223, 230);
+  height: 160px;
+}
+::v-deep .el-input .el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+::v-deep .el-input .el-input__inner::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index e11e399..05c187a 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -23,7 +23,7 @@
             <template v-else>
               <div class="flex cur-pointer" @click="refChooseUserOpen">
                 <img
-                  v-if="vipUser.headImg"
+                  v-if="vipUser.headImg && vipUser.headImg != 'null'"
                   class="headimg"
                   :src="vipUser.headImg"
                   alt=""
@@ -806,11 +806,13 @@
               <div class="cashier_left">
                 <!-- <div class="title">选择优惠</div> -->
                 <div class="detail_box">
-                  <div class="usercard">
+                  <div class="usercard" @click="refChooseUserOpen">
                     <span
                       class="el-avatar el-avatar--square"
                       style="height: 50px; width: 50px; line-height: 50px"
-                      ><img v-if="vipUser.id" :src="vipUser.headImg"
+                      ><img
+                        v-if="vipUser.id && vipUser.headImg != 'null'"
+                        :src="vipUser.headImg"
                     /></span>
                     <div class="info">
                       <div class="nickname">
@@ -820,30 +822,94 @@
                       </div>
                       <div class="other_info">
                         <div class="item">余额：{{ vipUser.amount | to2 }}</div>
-                        <div class="item">积分：{{ vipUser.totalScore }}</div>
+                        <div class="item">
+                          积分：{{ vipUser.accountPoints }}
+                        </div>
                       </div>
                     </div>
                   </div>
 
                   <div class="forms">
-                      <el-form
-                        ref="form"
-                        :model="createOrder.form"
-                        label-width="60px"
-                      >
-                        <el-form-item label="优惠券">
-                          <el-select
-                            style="margin-right: 10px"
-                            v-model="createOrder.quan.sel"
-                            placeholder="选择优惠券"
+                    <div class="u-m-b-20 u-m-t-10" v-if="vipUser.id">
+                      <div class="u-flex u-flex-wrap">
+                        <span class="font-bold no-wrap u-m-r-20">积分抵扣</span>
+                        <el-radio-group
+                          v-model="points.selected"
+                          :disabled="!points.res.usable"
+                          @input="pointsChange"
+                        >
+                          <el-radio :label="1">全部抵扣</el-radio>
+                          <el-radio :label="2">部分抵扣</el-radio>
+                        </el-radio-group>
+                        <div class="u-m-l-20" v-if="points.res.usable">
+                          <el-input-number
+                            @change="pointsValueChange"
+                            v-if="points.selected == 1"
+                            disabled
+                            v-model="points.value"
+                            :min="points.minDeductionPoints"
+                            :max="points.maxUsablePoints"
+                          ></el-input-number>
+                          <el-input-number
+                            @change="pointsValueChange"
+                            v-if="points.selected == 2"
+                            v-model="points.value"
+                            :min="points.minDeductionPoints"
+                            :max="points.maxUsablePoints"
+                          ></el-input-number>
+                        </div>
+                      </div>
+                      <div class="color-999 u-m-t-10">
+                        <template v-if="points.res.usable">
+                          <span class="color-red">*</span>
+                          <span
+                            >最大抵扣积分{{ points.res.maxUsablePoints }}</span
                           >
-                          </el-select>
-                          <el-button size="medium " type="text">
-                            查看不可用券
-                          </el-button>
-                        </el-form-item>
-                      </el-form>
+                          <span
+                            >最小抵扣积分{{
+                              points.res.minDeductionPoints
+                            }}</span
+                          >
+                        </template>
+                        <template v-else>
+                          <span class="color-red">*</span>
+                          <span>{{ points.res.unusableReason || "" }}</span>
+                        </template>
+                      </div>
                     </div>
+
+                    <div class="u-flex flex-wrap">
+                      <span class="font-bold no-wrap">优惠券</span>
+                      <div
+                        class="border u-p-l-20 cur-pointer u-m-r-20 u-flex no-wrap u-p-t-10 u-p-b-10 border-r-4 selQuan"
+                        @click="showQuan"
+                      >
+                        <span class="color-999 u-p-r-10">选择优惠券</span>
+                        <span
+                          class="el-icon-arrow-down color-999 u-m-r-10"
+                        ></span>
+                      </div>
+                      <!-- <el-button size="medium " type="text">
+                        查看不可用券
+                      </el-button> -->
+                    </div>
+                  </div>
+                  <div class="u-p-b-20" v-if="quansSelArr.length > 0">
+                    <div class="font-bold u-m-b-10">已选优惠券</div>
+                    <el-table empty-text="未选择优惠券" :data="quansSelArr">
+                      <el-table-column type="index" width="50" label="#">
+                      </el-table-column>
+                      <el-table-column prop="name" label="券名称">
+                      </el-table-column>
+                      <el-table-column label="券类型" width="80">
+                        <template v-slot="scope">
+                          {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="useRestrictions" label="描述">
+                      </el-table-column>
+                    </el-table>
+                  </div>
                 </div>
                 <div class="btn_group">
                   <el-button size="medium" @click="disCountShow">
@@ -894,13 +960,17 @@
                     <div class="left">门店优惠</div>
                     <div class="right">-￥0.00</div>
                   </div>
-                  <div class="detail_form_item">
+                  <!-- <div class="detail_form_item">
                     <div class="left">满减优惠</div>
-                    <div class="right">-￥0.00</div>
-                  </div>
+                    <div class="right">-￥{{ manjian }}</div>
+                  </div> -->
                   <div class="detail_form_item">
                     <div class="left">优惠券</div>
-                    <div class="right">-￥0.00</div>
+                    <div class="right">-￥{{ manjian }}</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">积分抵扣</div>
+                    <div class="right">-￥{{ points.toMoney | to2 }}</div>
                   </div>
                   <div class="detail_form_item">
                     <div class="left">整单改价</div>
@@ -937,7 +1007,9 @@
                     <div class="left">应付金额</div>
                     <div class="right redfont">
                       ￥{{
-                        (createOrder.data.amount * createOrder.discount) | to2
+                        currentPayMoney - points.toMoney <= 0
+                          ? 0
+                          : (currentPayMoney - points.toMoney) | to2
                       }}
                     </div>
                   </div>
@@ -1233,6 +1305,9 @@
     <!-- 打折 -->
     <money-discount ref="refDiscount" @confirm="ChangeDiscount">
     </money-discount>
+    <!-- 优惠券 -->
+    <quans-pop ref="refQuans" @confirm="quansConfirm"> </quans-pop>
+
     <!-- 选择人数 -->
     <choose-diners-number
       ref="refChooseDinersNumber"
@@ -1256,6 +1331,7 @@ import chooseTable from "./components/choose-table-master.vue";
 import cartItem from "./components/cart-item.vue";
 import scanPay from "./components/scan-pay.vue";
 import moneyDiscount from "./components/discount.vue";
+import quansPop from "./components/quans.vue";
 import orderNote from "./components/note.vue";
 import chooseDinersNumber from "./components/choose-diners-number.vue";
 import returnCart from "./components/return-cart.vue";
@@ -1264,6 +1340,7 @@ import dayjs from "dayjs";
 import { tbShopInfo } from "@/api/user";
 import { hasPermission } from "@/utils/limits.js";
 import { tbOrderInfoDetail } from "@/api/order";
+import { queryAllShopUser } from "@/api/shop";
 
 import {
   getGoodsLists,
@@ -1287,7 +1364,9 @@ import {
   tbShopTableGet,
   $changeUseType,
   $returnTableDetail,
-  $activateByOrderId
+  $activateByOrderId,
+  $calcUsablePoints,
+  $calcDeDuctionPoints,
 } from "@/api/table";
 import { tbShopCategoryGet } from "@/api/shop";
 import {
@@ -1305,6 +1384,7 @@ import { $status } from "@/utils/table.js";
 let $originTableList = [];
 export default {
   components: {
+    quansPop,
     returnCart,
     chooseUser,
     chooseTable,
@@ -1318,6 +1398,20 @@ export default {
   },
   data() {
     return {
+      //积分抵扣
+      points: {
+        res: {
+          usable: true,
+        },
+        selected: "",
+        minDeductionPoints: 0,
+        maxUsablePoints: 0,
+        usable: false,
+        points: 0,
+        toMoney: 0,
+      },
+      //选中可用优惠券
+      quansSelArr: [],
       //台桌搜索文字
       tableSearchText: "",
       //是否允许收款
@@ -1516,6 +1610,30 @@ export default {
     };
   },
   computed: {
+    manjian() {
+      let result = 0;
+      if (this.quansSelArr.length < 0) {
+        result = 0;
+      }
+      const manjianQuan = this.quansSelArr.find((v) => v.type == 1);
+      if (!manjianQuan) {
+        result = 0;
+      } else {
+        result = manjianQuan.discountAmount;
+      }
+      return result.toFixed(2);
+    },
+    currentPayMoney() {
+      const amount = this.createOrder.data.amount || 0;
+      const discount = this.createOrder.discount || 1;
+      // const total=((amount - this.manjian) * this.createOrder.discount - this.points.toMoney)
+      const total = (amount - this.manjian) * this.createOrder.discount;
+      return total <= 0 ? 0 : total;
+    },
+    yinFuJinE(){
+      const total=this.currentPayMoney-( this.points.toMoney||0)
+      return total.toFixed(2);
+    },
     disableTuicai() {
       return (
         this.order.placeNum == 1 ||
@@ -1527,7 +1645,7 @@ export default {
     },
     title() {
       // return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
-      return '代客下单'
+      return "代客下单";
     },
     allGiftMoney() {
       const nowprice = this.order.list
@@ -1691,6 +1809,13 @@ export default {
       this.goods.status = "loadmore";
       this.getGoods();
     },
+    currentPayMoney: function (newval) {
+      if (this.createOrder.data.memberId||this.vipUser.id) {
+        this.getCalcUsablePoints().then((res) => {
+          this.pointsValueChange(this.points.value);
+        });
+      }
+    },
     "useTypes.sel": function (newval, oldval) {
       console.log(newval);
       this.setPostPay();
@@ -1710,13 +1835,13 @@ export default {
     table(newval, oldval) {
       this.setPostPay();
       this.setUseType();
-      if(oldval.tableId&&newval.tableId){
+      if (oldval.tableId && newval.tableId) {
         this.perpole = 1;
         this.isCreateOrder = false;
       }
-      if(this.key=='isJieZhang'){
+      if (this.key == "isJieZhang") {
         this.isCreateOrder = false;
-        this.key=''
+        this.key = "";
       }
       if (newval && newval.tableId) {
         this.createOrder.data.amount = 0;
@@ -1746,8 +1871,10 @@ export default {
         tableId: this.table.tableId,
         masterId: this.masterId,
         vipUserId: val,
-        orderId:this.createOrder.data.id||'',
+        orderId: this.createOrder.data.id || "",
         type: val === "" ? 1 : 0,
+      }).then((res) => {
+        this.createOrder.data.memberId = val.id;
       });
     },
     "prveOrder.list.length": function (val) {
@@ -1865,6 +1992,57 @@ export default {
     this.open(this.$route.query);
   },
   methods: {
+    async getCalcUsablePoints() {
+      const pointsRes = await $calcUsablePoints({
+        memberId: this.createOrder.data.memberId || this.vipUser.id,
+        orderAmount: this.currentPayMoney.toFixed(2),
+      });
+      this.points.res = pointsRes;
+      this.points.minDeductionPoints = pointsRes.minDeductionPoints;
+      this.points.maxUsablePoints = pointsRes.maxUsablePoints;
+      if(this.points.selected){
+        this.points.value = Math.min(
+          this.vipUser.accountPoints,
+          this.points.res.maxUsablePoints || 0
+        );
+      }
+      return pointsRes;
+    },
+    //根据积分输入值变化计算抵扣金额
+    pointsValueChange(e) {
+      console.log(e);
+      if (e == 0 || !e) {
+        return (this.points.toMoney = 0);
+      }
+      $calcDeDuctionPoints({
+        memberId: this.createOrder.data.memberId || this.vipUser.id,
+        orderAmount: this.currentPayMoney.toFixed(2),
+        points: e,
+      }).then((res) => {
+        this.points.toMoney = res * 1;
+      });
+    },
+    //积分抵扣类型改变
+    pointsChange(e) {
+      console.log(e);
+      if (e == 1) {
+        this.points.value = Math.min(
+          this.vipUser.accountPoints,
+          this.points.res.maxUsablePoints || 0
+        );
+        this.pointsValueChange(this.points.value);
+      }
+    },
+    showQuan() {
+      this.$refs.refQuans.open({
+        id: this.createOrder.data.id,
+        memberId: this.createOrder.data.memberId || this.vipUser.id,
+      });
+    },
+    quansConfirm(e) {
+      console.log(e);
+      this.quansSelArr = e;
+    },
     searchInput(e) {
       console.log(e);
       this.tableList = $originTableList.filter((v) =>
@@ -1920,7 +2098,7 @@ export default {
       if (!canJiesuan) {
         return;
       }
-      this.$confirm("是否确认已现金收款:" + this.allPrice + "?", "快捷支付", {
+      this.$confirm("是否确认已现金收款:" + this.yinFuJinE + "?", "快捷支付", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -2042,8 +2220,8 @@ export default {
         //munchies 先付  restaurant 后付
         this.postPay = this.shopInfo.registerType == "munchies" ? false : true;
       }
-      console.log('this.postPay')
-      console.log(this.postPay)
+      console.log("this.postPay");
+      console.log(this.postPay);
     },
     //获取店铺信息
     async getShopInfo() {
@@ -2073,20 +2251,20 @@ export default {
         tableId: this.table.tableId,
         num: this.perpole,
       });
-      this.order.seatFee = res
+      this.order.seatFee = res;
       this.perpole = res.totalNumber || res.number;
       return res;
     },
     //台桌变化时重新获取取餐号、购物车数据，如果是正在结账状态，创建订单到待支付页面
     async onTableChange() {
-      const perpole=this.perpole || ''
+      const perpole = this.perpole || "";
       const tableRes = await $returnTableDetail({
         tableId: this.table.tableId,
       });
       console.log(tableRes);
-      const orderId=tableRes.orderId ||this.table.orderId
+      const orderId = tableRes.orderId || this.table.orderId;
       if (orderId) {
-        this.getOrderData({ orderId:orderId });
+        this.getOrderData({ orderId: orderId });
       }
       const res = await this.getMasterId();
       this.masterId = res.masterId;
@@ -2112,7 +2290,7 @@ export default {
       }
       this.getCacheOrder();
       console.log(this.isCreateOrder);
-      this.perpole=perpole||this.perpole
+      this.perpole = perpole || this.perpole;
       if (!this.shopInfo.isTableFee && this.table.tableId && this.perpole > 0) {
         //不免餐位费
         await this.changePerpole();
@@ -2170,7 +2348,10 @@ export default {
           shopId: localStorage.getItem("shopId"),
         });
         this.tableList = content.filter(
-          (v) => v.status != "closed" && v.status != "cleaning"
+          (v) =>
+            v.status != "closed" &&
+            v.status != "cleaning" &&
+            v.status != "unbind"
         );
         $originTableList = this.tableList;
       } catch (error) {
@@ -2251,7 +2432,7 @@ export default {
       if (!canDiscount) {
         return;
       }
-      const { amount } = this.createOrder.data;
+      const amount = this.createOrder.data.amount - this.manjian;
       this.refToggle("refDiscount", true, {
         amount,
         discount: this.createOrder.discount * 100,
@@ -2386,20 +2567,47 @@ export default {
         orderId: this.createOrder.data.id,
         payType: this.order.payType,
       });
+      if (this.order.payType == "cash") {
+        return this.$confirm(
+          "是否确认已现金收款:" + this.yinFuJinE + "?",
+          "快捷支付",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).then(() => {
+          this.pays();
+        });
+      }
       this.pays();
     },
     // 支付订单
     async pays() {
       this.loading = true;
+      const userCouponInfos = this.quansSelArr.reduce((prve, cur) => {
+        const index = prve.findIndex((v) => v.userCouponId == cur.couponId);
+        if (index != -1) {
+          prve[index].num += 1;
+        } else {
+          prve.push({
+            userCouponId: cur.couponId,
+            num: 1,
+          });
+        }
+        return prve;
+      }, []);
       try {
         const res = await $payOrder({
           tableId: this.table.tableId,
           masterId: this.masterId,
           orderId: this.createOrder.data.id,
           payType: this.order.payType,
-          vipUserId: this.vipUser.id,
+          vipUserId: this.createOrder.data.memberId || this.vipUser.id,
           discount: this.createOrder.discount,
           code: this.createOrder.code,
+          userCouponInfos,
+          pointsNum: this.points.value,
         });
         this.loading = false;
         this.payOrderSuccess();
@@ -2471,7 +2679,7 @@ export default {
         }
         res = await $createOrder({
           masterId: this.order.masterId || this.masterId,
-          vipUserId: this.vipUser.id,
+          vipUserId: this.createOrder.data.memberId || this.vipUser.id,
           tableId: this.table.tableId,
           note: this.note.content,
           postPay: this.postPay,
@@ -2485,7 +2693,7 @@ export default {
       }
       //后付款
       this.createOrder.status = "success";
-      this.order.list=[];
+      this.order.list = [];
       // this.getCart();
       if (this.postPay && !isNowPay) {
         this.$notify({
@@ -2990,7 +3198,7 @@ export default {
         }
       } else {
         //添加
-        console.log(this.table)
+        console.log(this.table);
         res = await addCart({
           masterId: this.masterId,
           vipUserId: this.vipUser.id,
@@ -3141,9 +3349,9 @@ export default {
       this.order.seatFee = seatFee
         ? {
             ...seatFee,
-            totalNumber: seatFee.num||seatFee.number,
+            totalNumber: seatFee.num || seatFee.number,
             num: seatFee.number,
-            name: seatFee.name|| seatFee.productName,
+            name: seatFee.name || seatFee.productName,
             totalAmount: seatFee.priceAmount || seatFee.totalAmount,
           }
         : this.order.seatFee;
@@ -3288,6 +3496,9 @@ export default {
       } else {
         //增加
         console.log(item);
+        if (item.specList.length <= 0) {
+          return this.$message.error("该商品缺少skuID,skuList是空数组");
+        }
         res = await addCart({
           masterId: this.masterId,
           vipUserId: this.vipUser.id,
@@ -3371,7 +3582,7 @@ export default {
       this.getCategory();
       this.getTable();
       console.log(params);
-   
+
       if (key == "isJieZhang") {
         this.table = params.tableId ? { name: item.name } : "";
         if (params.orderId) {
@@ -3383,13 +3594,13 @@ export default {
         this.isCreateOrder = true;
         return;
       }
-      if( key == "isPayOrder" ){
-        this.isCreateOrder =true
+      if (key == "isPayOrder") {
+        this.isCreateOrder = true;
       }
-      if(params.orderId) {
+      if (params.orderId) {
         const orderRes = await this.getOrderData(params);
       }
-      
+
       // this.getCart();
       // this.getCacheOrder();
       // if (!params) {
@@ -3404,26 +3615,33 @@ export default {
             ? item.useType
             : item.useType.replace(/-after|-before/g, "");
       }
-     
 
       this.table = params.tableId ? item : "";
     },
+
     async getOrderData(params) {
-      const orderId= params ? params.orderId : this.createOrder.data.id
-     
+      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
-      })
+      this.createOrder.data = res;
+      if (res.memberId) {
+        await this.getCalcUsablePoints();
+        queryAllShopUser({ id: res.memberId }).then((res) => {
+          if (res.content[0]) {
+            this.vipUser = res.content[0];
+            this.points.maxUsablePoints = Math.min(
+              this.points.maxUsablePoints,
+              this.vipUser.accountPoints || 0
+            );
+          }
+        });
       }
-    
+
       if (res.status != "unpaid") {
         return res;
       }
-      this.createOrder.data = res;
       this.order.packFee.totalAmount = res.seatInfo || { totalAmount: 0 };
       const goodsMap = {};
       for (let i in res.detailList) {
@@ -3511,6 +3729,11 @@ export default {
 </script>
   
   <style scoped lang="scss">
+.selQuan {
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  margin-left: 12px;
+}
 /* 针对所有input type="number" */
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {

From dfe65e0ae64b47a819927dffff16c278e88b932b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 5 Nov 2024 16:41:37 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=8A=B5=E6=89=A3=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 05c187a..d519fcd 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1407,7 +1407,7 @@ export default {
         minDeductionPoints: 0,
         maxUsablePoints: 0,
         usable: false,
-        points: 0,
+        value: 0,
         toMoney: 0,
       },
       //选中可用优惠券
@@ -1857,7 +1857,7 @@ export default {
         this.createOrder.discount = 1;
       }
     },
-    "vipUser.id": async function (val) {
+    "vipUser.id":  function (val) {
       // if (!this.table.tableId) {
       //   return;
       // }
@@ -1875,6 +1875,9 @@ export default {
         type: val === "" ? 1 : 0,
       }).then((res) => {
         this.createOrder.data.memberId = val.id;
+        this.getCalcUsablePoints().then((res) => {
+          this.pointsValueChange(this.points.value);
+        });
       });
     },
     "prveOrder.list.length": function (val) {
@@ -1993,8 +1996,12 @@ export default {
   },
   methods: {
     async getCalcUsablePoints() {
+      const memberId= this.createOrder.data.memberId || this.vipUser.id
+      if(!memberId){
+        return 
+      }
       const pointsRes = await $calcUsablePoints({
-        memberId: this.createOrder.data.memberId || this.vipUser.id,
+        memberId:memberId,
         orderAmount: this.currentPayMoney.toFixed(2),
       });
       this.points.res = pointsRes;

From ef8cd6da3a30f6cee07fffd26a34e54045596b8b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 14:58:46 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BB=B7=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/util.scss                   |  18 ++-
 .../tool/Instead/components/cart-item.vue     |  50 ++++++--
 src/views/tool/Instead/components/quans.vue   |   2 +-
 src/views/tool/Instead/index.vue              | 109 +++++++++++++++---
 src/views/tool/Instead/util.js                |  27 +++--
 5 files changed, 167 insertions(+), 39 deletions(-)

diff --git a/src/assets/styles/util.scss b/src/assets/styles/util.scss
index 9226be0..9cf9bdf 100644
--- a/src/assets/styles/util.scss
+++ b/src/assets/styles/util.scss
@@ -364,4 +364,20 @@ text {
 
 .filter-gray {
 	filter: grayscale(1);
-}
\ No newline at end of file
+}
+.youhui-tips{
+    background: #fff;
+    min-width: 150px;
+    border-radius: 4px;
+    border: 1px solid #ebeef5!important;
+    padding: 12px;
+    color: #606266;
+    line-height: 1.4;
+    text-align: justify;
+    font-size: 14px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+    word-break: break-all;
+  }
+  ::v-deep .youhui-tips .popper__arrow{
+	border-top-color: #ebeef5;
+  }
\ No newline at end of file
diff --git a/src/views/tool/Instead/components/cart-item.vue b/src/views/tool/Instead/components/cart-item.vue
index 65b7197..94cd126 100644
--- a/src/views/tool/Instead/components/cart-item.vue
+++ b/src/views/tool/Instead/components/cart-item.vue
@@ -30,9 +30,7 @@
         </div>
 
         <div class="" v-if="placeNum == 0">
-          <div class="note" v-if="item.note">
-            备注:{{ item.note || "" }}
-          </div>
+          <div class="note" v-if="item.note">备注:{{ item.note || "" }}</div>
           <div class="note flex" v-else>
             <span>备注:</span>
             <span class="el-icon-edit u-font-12" @click="editNote"></span>
@@ -69,15 +67,22 @@
       </div>
 
       <div class="color-333 total-price">
-        <div v-if="item.isGift === 'true' || item.status == 'return'">￥0</div>
-        <div
-          :class="{
-            'free-price': item.isGift === 'true' || item.status == 'return',
-          }"
-        >
-          <span v-if="isSeatFee"> ￥{{ item.totalAmount }}</span>
-          <span v-else> ￥{{ (item.salePrice*item.number+(item.packAmount||0)).toFixed(2) }}</span>
-        </div>
+        <template v-if="item.isGift === 'true' || item.status == 'return'">
+          <div>￥0</div>
+          <div class="free-price">
+            <span v-if="isSeatFee"> ￥{{ item.totalAmount }}</span>
+            <span v-else> ￥{{ isShowVipPrice ? vipAllPrice : allPrice }}</span>
+          </div>
+        </template>
+        <template v-else>
+          <div v-if="isSeatFee">￥{{ item.totalAmount }}</div>
+          <div v-else>
+            <div v-if="isShowVipPrice&&vipAllPrice!=allPrice">￥{{ vipAllPrice }}</div>
+            <div :class="{ 'free-price': isShowVipPrice&&vipAllPrice!=allPrice }">
+              <span> ￥{{ allPrice }}</span>
+            </div>
+          </div>
+        </template>
       </div>
     </div>
   </div>
@@ -86,6 +91,10 @@
 <script>
 export default {
   props: {
+    isShowVipPrice: {
+      type: Boolean,
+      default: false,
+    },
     //是否是餐位费
     isSeatFee: {
       type: Boolean,
@@ -133,6 +142,23 @@ export default {
     };
   },
   computed: {
+    vipAllPrice() {
+      const item = this.item;
+      const price =
+        this.isShowVipPrice &&
+        item.memberPrice != null &&
+        item.memberPrice != undefined
+          ? (item.memberPrice<=0?item.salePrice:item.memberPrice)
+          : item.salePrice;
+      return (price * item.number + (item.packAmount || 0)).toFixed(2);
+    },
+
+    allPrice() {
+      const item = this.item;
+
+      const price = item.salePrice;
+      return (price * item.number + (item.packAmount || 0)).toFixed(2);
+    },
     isActive() {
       const isSel =
         this.selIndex === this.index && this.placeNum === this.selPlaceNum;
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index ae34c94..6f42a77 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -9,7 +9,7 @@
               :data="quans.fullReductionCoupon"
               @cell-click="fullReductionCouponClick"
             >
-              <el-table-column type="index" width="80" label="">
+              <el-table-column type="index" width="80" label="" v-if="quans.fullReductionCoupon.length>0">
                 <template v-slot="scope">
                   <el-checkbox
                     @change="fullReductionCouponClick(scope.row)"
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index d519fcd..34a4cb3 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -32,7 +32,12 @@
                   <i class="el-icon-user"></i>
                 </div>
                 <div>
-                  <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                  <div class="u-flex">
+                    <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                    <div class="vip" v-if="vipUser.isVip">
+                      VIP{{ vipUser.isVip }}
+                    </div>
+                  </div>
                   <div style="margin-top: 2px" class="color-666 ft-12">
                     余额：{{ vipUser.amount }}
                   </div>
@@ -277,6 +282,7 @@
                 <!-- 当前购物车列表 -->
                 <template v-if="order.list.length">
                   <cart-item
+                    :isShowVipPrice="isShowVipPrice"
                     @itemClick="changeOrderSel"
                     @changeOrderNumber="changeOrderNumber"
                     @cartGoodsNumberInput="cartGoodsNumberInput"
@@ -327,6 +333,7 @@
                     第{{ orderItem.placeNum }}次下单
                   </div>
                   <cart-item
+                    :isShowVipPrice="isShowVipPrice"
                     @itemClick="changeOrderOldSel"
                     :canChangeNumber="false"
                     v-for="(item, index) in orderItem.info"
@@ -382,15 +389,23 @@
 
             <div class="w-full bottom">
               <div class="border-top">
-                <div class="flex row-right youhui" v-if="giftLen">
-                  <span> 已优惠￥{{ allGiftMoney }} </span>
-                  <i class="el-icon-arrow-right"></i>
+                <div class="flex row-right youhui" v-if="youhuiAllPrice > 0">
+                  <el-tooltip placement="top"  effect="light" popper-class="youhui-tips">
+                    <div slot="content">
+                      <div class="u-flex">
+                        <span>会员优惠：{{ vipDiscountPrice }} </span>
+                      </div>
+                    </div>
+                    <span> 已优惠￥{{ youhuiAllPrice }} </span>
+                    <i class="el-icon-arrow-right"></i>
+                  </el-tooltip>
                 </div>
 
                 <div class="flex row-between">
                   <el-button type="text" @click="printOrder"
                     >打印制作单</el-button
                   >
+                  <!-- <span v-if="youhuiAllPrice>0" class="youhuiAllPrice">已优惠：{{youhuiAllPrice}} ></span> -->
                   <!-- <el-checkbox
                     v-model="order.allPack"
                     :disabled="!this.order.list.length"
@@ -1378,6 +1393,7 @@ import {
   returnGiftArr,
   returnPackFee,
   formatOrderGoodsList,
+  returnVipDiscountPrice,
 } from "./util.js";
 import { $status } from "@/utils/table.js";
 
@@ -1610,6 +1626,9 @@ export default {
     };
   },
   computed: {
+    isShowVipPrice() {
+      return this.vipUser.isVip ? true : false;
+    },
     manjian() {
       let result = 0;
       if (this.quansSelArr.length < 0) {
@@ -1630,8 +1649,8 @@ export default {
       const total = (amount - this.manjian) * this.createOrder.discount;
       return total <= 0 ? 0 : total;
     },
-    yinFuJinE(){
-      const total=this.currentPayMoney-( this.points.toMoney||0)
+    yinFuJinE() {
+      const total = this.currentPayMoney - (this.points.toMoney || 0);
       return total.toFixed(2);
     },
     disableTuicai() {
@@ -1724,6 +1743,7 @@ export default {
       }, "");
       return result.substring(0, result.length - 1);
     },
+
     allPrice() {
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const bTotal = b.info
@@ -1747,10 +1767,40 @@ export default {
         this.order.seatFee.totalAmount *
         (returnStatus.includes(this.order.seatFee.status) ? 0 : 1);
       return (
-        (oldPrice + price + +packFee + seatFee) *
+        (oldPrice + price + +packFee + seatFee - this.youhuiAllPrice) *
         this.createOrder.discount
       ).toFixed(2);
     },
+    vipDiscountPrice() {
+      if (!this.vipUser.isVip) {
+        return 0;
+      }
+      const oldMemberPrice = this.order.old.list.reduce((a, b) => {
+        const bTotal = b.info
+          .filter(
+            (v) =>
+              v.isGift !== "true" &&
+              v.memberPrice &&
+              v.memberPrice != v.salePrice
+          )
+          .reduce((prve, cur) => {
+            return prve + cur.number * (cur.salePrice - cur.memberPrice);
+          }, 0);
+        return a + bTotal;
+      }, 0);
+      const nowMemberprice = this.order.list
+        .filter(
+          (v) =>
+            v.isGift !== "true" && v.memberPrice && v.memberPrice != v.salePrice
+        )
+        .reduce((a, b) => {
+          return a + b.number * (b.salePrice - b.memberPrice);
+        }, 0);
+      return (oldMemberPrice + nowMemberprice).toFixed(2);
+    },
+    youhuiAllPrice() {
+      return (this.vipDiscountPrice * 1 + this.allGiftMoney * 1).toFixed(2);
+    },
     allNumber() {
       const oldNumber = this.order.old.list.reduce((a, b) => {
         const bTotal = b.info.reduce((prve, cur) => {
@@ -1810,7 +1860,7 @@ export default {
       this.getGoods();
     },
     currentPayMoney: function (newval) {
-      if (this.createOrder.data.memberId||this.vipUser.id) {
+      if (this.createOrder.data.memberId || this.vipUser.id) {
         this.getCalcUsablePoints().then((res) => {
           this.pointsValueChange(this.points.value);
         });
@@ -1857,7 +1907,7 @@ export default {
         this.createOrder.discount = 1;
       }
     },
-    "vipUser.id":  function (val) {
+    "vipUser.id": function (val) {
       // if (!this.table.tableId) {
       //   return;
       // }
@@ -1996,18 +2046,18 @@ export default {
   },
   methods: {
     async getCalcUsablePoints() {
-      const memberId= this.createOrder.data.memberId || this.vipUser.id
-      if(!memberId){
-        return 
+      const memberId = this.createOrder.data.memberId || this.vipUser.id;
+      if (!memberId) {
+        return;
       }
       const pointsRes = await $calcUsablePoints({
-        memberId:memberId,
+        memberId: memberId,
         orderAmount: this.currentPayMoney.toFixed(2),
       });
       this.points.res = pointsRes;
       this.points.minDeductionPoints = pointsRes.minDeductionPoints;
       this.points.maxUsablePoints = pointsRes.maxUsablePoints;
-      if(this.points.selected){
+      if (this.points.selected) {
         this.points.value = Math.min(
           this.vipUser.accountPoints,
           this.points.res.maxUsablePoints || 0
@@ -3736,6 +3786,22 @@ export default {
 </script>
   
   <style scoped lang="scss">
+ .youhui-tips{
+    background: #fff;
+    min-width: 150px;
+    border-radius: 4px;
+    border: 1px solid #ebeef5;
+    padding: 12px;
+    color: #606266;
+    line-height: 1.4;
+    text-align: justify;
+    font-size: 14px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+    word-break: break-all;
+  }
+  ::v-deep .youhui-tips  .popper__arrow{
+	border-top-color: #ebeef5;
+  }
 .selQuan {
   border: 1px solid #d9d9d9;
   border-radius: 4px;
@@ -3926,7 +3992,15 @@ input[type="number"]::-webkit-outer-spin-button {
   font-size: 13px;
   line-height: 16px;
 }
-
+.vip {
+  font-size: 10px;
+  padding: 2px 5px;
+  background: #f7793d;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 10px;
+  font-size: 10px;
+}
 ::v-deep .el-dialog__footer {
   border-top: 1px solid #efefef;
 }
@@ -4034,6 +4108,11 @@ input[type="number"]::-webkit-outer-spin-button {
 .mt-14 {
   margin-top: 14px;
 }
+.youhuiAllPrice {
+  color: #c12a2a;
+  font-size: 13px;
+  line-height: 16px;
+}
 
 .my-btn {
   outline: none;
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index f57ac87..000bdff 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -5,13 +5,13 @@ export function returnPackFee(arr, isOld = true) {
             const bTotal = b.info
                 .filter((v) => v.isGift !== "true" && v.status !== "return")
                 .reduce((prve, cur) => {
-                    return prve + (cur.packFee || cur.packAmount||0);
+                    return prve + (cur.packFee || cur.packAmount || 0);
                 }, 0);
             return a + bTotal;
         }, 0);
     } else {
         return arr.filter(v => v.status !== 'return' && v.isGift !== 'true').reduce((a, b) => {
-            return a + (b.packFee || b.packAmount||0);
+            return a + (b.packFee || b.packAmount || 0);
         }, 0);
     }
 
@@ -90,28 +90,35 @@ export function returnGiftArr(arr) {
     return result
 }
 
-export function formatOrderGoodsList(arr){
+export function formatOrderGoodsList(arr) {
     const goodsMap = {}
     for (let i in arr) {
         const goods = arr[i]
         if (goods.productName != '客座费') {
             if (goodsMap.hasOwnProperty(goods.placeNum)) {
-                goodsMap[goods.placeNum||1].push(goods)
+                goodsMap[goods.placeNum || 1].push(goods)
             } else {
-                goodsMap[goods.placeNum||1] = [goods]
+                goodsMap[goods.placeNum || 1] = [goods]
             }
         }
 
     }
     return Object.entries(goodsMap).map(([key, value]) => ({
         info: value,
-        placeNum: key||1
+        placeNum: key || 1
     }))
 }
 
-export function returnIsSeatFee(item){
-    if(!item){
+export function returnIsSeatFee(item) {
+    if (!item) {
         return false
     }
-    return item.productId=="-999"
-}
\ No newline at end of file
+    return item.productId == "-999"
+}
+/**
+ * 计算购物车会员优惠价格
+ */
+export function returnVipDiscountPrice() {
+   
+}
+

From 8528341101b5249a2ed683d78c5899297bb3cd68 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 15:20:20 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=8C=E6=80=BB=E4=BB=B7=E6=A0=BC=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E8=B5=A0=E9=80=81=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=90=8E=E7=BB=93=E6=9E=9C=E4=B8=BA=E6=80=BB?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC-=E8=B5=A0=E9=80=81=E5=95=86=E5=93=81-?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=98=E6=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/util.scss      | 31 +++++++++++++-------------
 src/views/tool/Instead/index.vue | 37 ++++++++++++++------------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/src/assets/styles/util.scss b/src/assets/styles/util.scss
index 9cf9bdf..4f2478a 100644
--- a/src/assets/styles/util.scss
+++ b/src/assets/styles/util.scss
@@ -365,19 +365,20 @@ text {
 .filter-gray {
 	filter: grayscale(1);
 }
-.youhui-tips{
-    background: #fff;
-    min-width: 150px;
-    border-radius: 4px;
-    border: 1px solid #ebeef5!important;
-    padding: 12px;
-    color: #606266;
-    line-height: 1.4;
-    text-align: justify;
-    font-size: 14px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
-    word-break: break-all;
+.youhui-tips.el-tooltip__popper {
+	background: #fff;
+	min-width: 150px;
+	border-radius: 4px;
+	border: 1px solid #ebeef5 !important;
+	padding: 12px;
+	color: #606266;
+	line-height: 1.4;
+	text-align: justify;
+	font-size: 14px;
+	box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+	word-break: break-all;
   }
-  ::v-deep .youhui-tips .popper__arrow{
-	border-top-color: #ebeef5;
-  }
\ No newline at end of file
+  .youhui-tips.el-tooltip__popper[x-placement^="top"] .popper__arrow:after,
+  .youhui-tips.el-tooltip__popper[x-placement^="top"] .popper__arrow {
+  border-top-color: #fff;
+}
\ No newline at end of file
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 34a4cb3..7a2c0a9 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -390,10 +390,18 @@
             <div class="w-full bottom">
               <div class="border-top">
                 <div class="flex row-right youhui" v-if="youhuiAllPrice > 0">
-                  <el-tooltip placement="top"  effect="light" popper-class="youhui-tips">
+                  <el-tooltip
+                    placement="top"
+                    effect="light"
+                    popper-class="youhui-tips"
+                    :popper-options="{
+                      'background-color': '#fff',
+                    }"
+                  >
                     <div slot="content">
-                      <div class="u-flex">
-                        <span>会员优惠：{{ vipDiscountPrice }} </span>
+                      <div class="u-flex color-000 u-font-14 u-row-between">
+                        <span class="font-bold">会员优惠 </span>
+                        <span class="">{{ vipDiscountPrice }} </span>
                       </div>
                     </div>
                     <span> 已优惠￥{{ youhuiAllPrice }} </span>
@@ -1747,14 +1755,14 @@ export default {
     allPrice() {
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const bTotal = b.info
-          .filter((v) => v.isGift !== "true" && v.status !== "return")
+          .filter((v) =>  v.status !== "return")
           .reduce((prve, cur) => {
             return prve + cur.number * cur.salePrice;
           }, 0);
         return a + bTotal;
       }, 0);
       const price = this.order.list
-        .filter((v) => v.isGift !== "true")
+        .filter((v) => v.isGift !== "return")
         .reduce((a, b) => {
           return a + b.number * b.salePrice;
         }, 0);
@@ -3726,6 +3734,8 @@ export default {
             totalAmount: res.seatAmount || 0,
             status: "",
           };
+          console.log(' this.order.seatFee')
+          console.log( this.order.seatFee)
       this.order.old.list = Object.entries(goodsMap).map(([key, value]) => ({
         info: value.map((v) => {
           return {
@@ -3786,22 +3796,7 @@ export default {
 </script>
   
   <style scoped lang="scss">
- .youhui-tips{
-    background: #fff;
-    min-width: 150px;
-    border-radius: 4px;
-    border: 1px solid #ebeef5;
-    padding: 12px;
-    color: #606266;
-    line-height: 1.4;
-    text-align: justify;
-    font-size: 14px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
-    word-break: break-all;
-  }
-  ::v-deep .youhui-tips  .popper__arrow{
-	border-top-color: #ebeef5;
-  }
+
 .selQuan {
   border: 1px solid #d9d9d9;
   border-radius: 4px;

From 3ad14071733ff0099d528fb15a0b91bfe96afc26 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 15:26:52 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 7a2c0a9..c48450c 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1683,7 +1683,7 @@ export default {
 
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const total = b.info
-          .filter((v) => v.isGift === "true")
+          .filter((v) => v.isGift === "true"||v.status === "return")
           .reduce((prve, cur) => {
             return prve + cur.number * cur.salePrice;
           }, 0);
@@ -1715,9 +1715,9 @@ export default {
       return total;
     },
     giftLen() {
-      const nowlen = this.order.list.filter((v) => v.isGift === "true").length;
+      const nowlen = this.order.list.filter((v) => v.isGift === "true"||v.status === "return").length;
       const oldlen = this.order.old.list.reduce((prve, cur) => {
-        const arr = cur.info.filter((v) => v.isGift === "true");
+        const arr = cur.info.filter((v) => v.isGift === "true"||v.status === "return");
         prve.push(...arr);
         return prve;
       }, []).length;
@@ -1755,14 +1755,14 @@ export default {
     allPrice() {
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const bTotal = b.info
-          .filter((v) =>  v.status !== "return")
+          .filter((v) => v)
           .reduce((prve, cur) => {
             return prve + cur.number * cur.salePrice;
           }, 0);
         return a + bTotal;
       }, 0);
       const price = this.order.list
-        .filter((v) => v.isGift !== "return")
+        .filter((v) => v)
         .reduce((a, b) => {
           return a + b.number * b.salePrice;
         }, 0);
@@ -1787,7 +1787,7 @@ export default {
         const bTotal = b.info
           .filter(
             (v) =>
-              v.isGift !== "true" &&
+              v.isGift !== "true" && v.status !== "return"&& 
               v.memberPrice &&
               v.memberPrice != v.salePrice
           )
@@ -1799,7 +1799,7 @@ export default {
       const nowMemberprice = this.order.list
         .filter(
           (v) =>
-            v.isGift !== "true" && v.memberPrice && v.memberPrice != v.salePrice
+            v.isGift !== "true" && v.status !== "return" && v.memberPrice && v.memberPrice != v.salePrice
         )
         .reduce((a, b) => {
           return a + b.number * (b.salePrice - b.memberPrice);

From 958229f63dff2765d6d41fb06e16a656c98080ac Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 15:29:31 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E7=BB=93=E7=AE=97=E6=97=B6?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E6=9C=AA=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index c48450c..e10c227 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1932,10 +1932,13 @@ export default {
         orderId: this.createOrder.data.id || "",
         type: val === "" ? 1 : 0,
       }).then((res) => {
-        this.createOrder.data.memberId = val.id;
+        if(this.isCreateOrder){
+          this.getOrderData();
+          this.createOrder.data.memberId = val.id;
         this.getCalcUsablePoints().then((res) => {
           this.pointsValueChange(this.points.value);
         });
+        }
       });
     },
     "prveOrder.list.length": function (val) {

From a8c1440a020892431b50a28df9b2607e0670606c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 6 Nov 2024 15:39:52 +0800
Subject: [PATCH 07/10] =?UTF-8?q?1.=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E5=90=AC=E7=94=A8=E6=88=B7=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E4=BA=8B=E4=BB=B6=20=E5=87=8F=E5=B0=91=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=AF=B7=E6=B1=82=202.=E5=BD=93=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=9C=AA0=E6=97=B6=E4=B8=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=9A=E5=91=98=E4=BC=98=E6=83=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 37 ++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index e10c227..3e31363 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -399,7 +399,10 @@
                     }"
                   >
                     <div slot="content">
-                      <div class="u-flex color-000 u-font-14 u-row-between">
+                      <div
+                        class="u-flex color-000 u-font-14 u-row-between"
+                        v-if="vipDiscountPrice > 0"
+                      >
                         <span class="font-bold">会员优惠 </span>
                         <span class="">{{ vipDiscountPrice }} </span>
                       </div>
@@ -1683,7 +1686,7 @@ export default {
 
       const oldPrice = this.order.old.list.reduce((a, b) => {
         const total = b.info
-          .filter((v) => v.isGift === "true"||v.status === "return")
+          .filter((v) => v.isGift === "true" || v.status === "return")
           .reduce((prve, cur) => {
             return prve + cur.number * cur.salePrice;
           }, 0);
@@ -1715,9 +1718,13 @@ export default {
       return total;
     },
     giftLen() {
-      const nowlen = this.order.list.filter((v) => v.isGift === "true"||v.status === "return").length;
+      const nowlen = this.order.list.filter(
+        (v) => v.isGift === "true" || v.status === "return"
+      ).length;
       const oldlen = this.order.old.list.reduce((prve, cur) => {
-        const arr = cur.info.filter((v) => v.isGift === "true"||v.status === "return");
+        const arr = cur.info.filter(
+          (v) => v.isGift === "true" || v.status === "return"
+        );
         prve.push(...arr);
         return prve;
       }, []).length;
@@ -1787,7 +1794,8 @@ export default {
         const bTotal = b.info
           .filter(
             (v) =>
-              v.isGift !== "true" && v.status !== "return"&& 
+              v.isGift !== "true" &&
+              v.status !== "return" &&
               v.memberPrice &&
               v.memberPrice != v.salePrice
           )
@@ -1799,7 +1807,10 @@ export default {
       const nowMemberprice = this.order.list
         .filter(
           (v) =>
-            v.isGift !== "true" && v.status !== "return" && v.memberPrice && v.memberPrice != v.salePrice
+            v.isGift !== "true" &&
+            v.status !== "return" &&
+            v.memberPrice &&
+            v.memberPrice != v.salePrice
         )
         .reduce((a, b) => {
           return a + b.number * (b.salePrice - b.memberPrice);
@@ -1932,12 +1943,11 @@ export default {
         orderId: this.createOrder.data.id || "",
         type: val === "" ? 1 : 0,
       }).then((res) => {
-        if(this.isCreateOrder){
-          this.getOrderData();
+        if (this.isCreateOrder) {
           this.createOrder.data.memberId = val.id;
-        this.getCalcUsablePoints().then((res) => {
-          this.pointsValueChange(this.points.value);
-        });
+          this.getOrderData().then(()=>{
+            this.pointsValueChange(this.points.value);
+          })
         }
       });
     },
@@ -3737,8 +3747,8 @@ export default {
             totalAmount: res.seatAmount || 0,
             status: "",
           };
-          console.log(' this.order.seatFee')
-          console.log( this.order.seatFee)
+      console.log(" this.order.seatFee");
+      console.log(this.order.seatFee);
       this.order.old.list = Object.entries(goodsMap).map(([key, value]) => ({
         info: value.map((v) => {
           return {
@@ -3799,7 +3809,6 @@ export default {
 </script>
   
   <style scoped lang="scss">
-
 .selQuan {
   border: 1px solid #d9d9d9;
   border-radius: 4px;

From a9a4efabe980e6fbbdb637ecd12eba4d47b24160 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 7 Nov 2024 13:30:58 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 173 ++++++++++++++++---------------
 1 file changed, 91 insertions(+), 82 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 3e31363..e7acf03 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -86,7 +86,7 @@
           <!-- 先付后付start -->
           <!-- <el-dropdown @command="changePostPay">
               <el-button plain type="primary" size="mini">
-                {{ postPay ? "后付费" : "先付费" }}
+                {{ payAfter ? "后付费" : "先付费" }}
                 <i class="el-icon-caret-bottom"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
@@ -96,7 +96,7 @@
             </el-dropdown> -->
 
           <!-- <el-button plain type="primary" size="mini">
-            {{ postPay ? "后付费" : "先付费" }}
+            {{ payAfter ? "后付费" : "先付费" }}
           </el-button> -->
 
           <!-- 先付后付end -->
@@ -177,7 +177,7 @@
         <div>
           <el-dropdown @command="changePostPay">
             <el-button plain type="primary" size="mini">
-              {{ postPay ? "后付费" : "先付费" }}
+              {{ payAfter ? "后付费" : "先付费" }}
               <i class="el-icon-caret-bottom"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
@@ -239,9 +239,7 @@
 
                 <div class="u-flex">
                   <div class="u-p-r-14 border-r u-m-r-14">
-                    <template
-                      v-if="!shopInfo.isTableFee && key != 'isJieZhang'"
-                    >
+                    <template v-if="!shopInfo.isTableFee && table.tableId">
                       <div
                         class="u-flex cur-pointer"
                         @click="
@@ -432,10 +430,10 @@
 
                 <div class="flex mt-14">
                   <template v-if="table">
-                    <template v-if="!postPay">
+                    <template v-if="!payAfter">
                       <template
                         v-if="
-                          postPay && isCreateOrder && table && table.tableId
+                          payAfter && isCreateOrder && table && table.tableId
                         "
                       >
                         <!-- <template v-if="false"> -->
@@ -485,7 +483,7 @@
                         </button>
                       </template>
                       <template v-else>
-                        <template v-if="postPay">
+                        <template v-if="payAfter">
                           <div class="flex-1">
                             <el-button
                               type="primary"
@@ -845,6 +843,9 @@
                         <span class="txt">{{
                           vipUser.id ? vipUser.nickName : "服务员下单"
                         }}</span>
+                        <span class="vip" v-if="vipUser.isVip">
+                          VIP{{ vipUser.isVip }}
+                        </span>
                       </div>
                       <div class="other_info">
                         <div class="item">余额：{{ vipUser.amount | to2 }}</div>
@@ -1490,7 +1491,7 @@ export default {
         title: "支付",
       },
       //true后付款false先付款
-      postPay: true,
+      payAfter: true,
       //是否打印
       isPrint: false,
       // 备注
@@ -1901,23 +1902,24 @@ export default {
         // })
       }
     },
-    table(newval, oldval) {
-      this.setPostPay();
-      this.setUseType();
-      if (oldval.tableId && newval.tableId) {
-        this.perpole = 1;
-        this.isCreateOrder = false;
-      }
-      if (this.key == "isJieZhang") {
-        this.isCreateOrder = false;
-        this.key = "";
-      }
-      if (newval && newval.tableId) {
-        this.createOrder.data.amount = 0;
-        this.createOrder.data.id = "";
-        this.onTableChange();
-      }
-    },
+    // table(newval, oldval) {
+    //   this.setPostPay();
+    //   this.setUseType();
+    //   if (oldval.tableId && newval.tableId) {
+    //     this.perpole = 1;
+    //     this.isCreateOrder = false;
+    //   }
+    //   if (this.key == "isJieZhang") {
+    //     this.isCreateOrder = false;
+    //     this.key = "";
+    //     return;
+    //   }
+    //   if (newval && newval.tableId) {
+    //     this.createOrder.data.amount = 0;
+    //     this.createOrder.data.id = "";
+    //     this.onTableChange();
+    //   }
+    // },
     masterId: function (val) {
       console.log(val);
     },
@@ -1926,7 +1928,7 @@ export default {
         this.createOrder.discount = 1;
       }
     },
-    "vipUser.id": function (val) {
+    "vipUser.id": function (val, oldval) {
       // if (!this.table.tableId) {
       //   return;
       // }
@@ -1936,6 +1938,8 @@ export default {
       //   masterId = res.masterId;
       // }
       // this.masterId = masterId;
+      console.log("this.createOrder.data");
+      console.log(this.createOrder.data);
       $setUser({
         tableId: this.table.tableId,
         masterId: this.masterId,
@@ -1945,9 +1949,9 @@ export default {
       }).then((res) => {
         if (this.isCreateOrder) {
           this.createOrder.data.memberId = val.id;
-          this.getOrderData().then(()=>{
+          this.getOrderData().then(() => {
             this.pointsValueChange(this.points.value);
-          })
+          });
         }
       });
     },
@@ -2198,7 +2202,7 @@ export default {
         vipUserId: this.vipUser.id,
         tableId: this.table.tableId,
         note: this.note.content,
-        postPay: this.postPay,
+        payAfter: this.payAfter,
         orderld: this.order.orderId,
       });
       this.isCreateOrder = true;
@@ -2282,7 +2286,7 @@ export default {
         localStorage.setItem("useType", "takeout");
       } else {
         //堂食
-        useType = `dine-in-${this.postPay ? "after" : "before"}`;
+        useType = `dine-in-${this.payAfter ? "after" : "before"}`;
         localStorage.setItem("useType", useType);
       }
       this.changeOrderUseType(useType);
@@ -2290,16 +2294,16 @@ export default {
     //设置先付后付
     setPostPay() {
       // 自取
-      // postPay true 后付 false 先付
+      // payAfter true 后付 false 先付
 
       if (this.useTypes.sel == "takeout") {
-        this.postPay = false;
+        this.payAfter = false;
       } else {
         //munchies 先付  restaurant 后付
-        this.postPay = this.shopInfo.registerType == "munchies" ? false : true;
+        this.payAfter = this.shopInfo.registerType == "munchies" ? false : true;
       }
-      console.log("this.postPay");
-      console.log(this.postPay);
+      console.log("this.payAfter");
+      console.log(this.payAfter);
     },
     //获取店铺信息
     async getShopInfo() {
@@ -2335,6 +2339,9 @@ export default {
     },
     //台桌变化时重新获取取餐号、购物车数据，如果是正在结账状态，创建订单到待支付页面
     async onTableChange() {
+      this.order.list = [];
+      this.order.old.list = [];
+      console.log("onTableChange");
       const perpole = this.perpole || "";
       const tableRes = await $returnTableDetail({
         tableId: this.table.tableId,
@@ -2342,7 +2349,7 @@ export default {
       console.log(tableRes);
       const orderId = tableRes.orderId || this.table.orderId;
       if (orderId) {
-        this.getOrderData({ orderId: orderId });
+        return this.getOrderData({ orderId: orderId });
       }
       const res = await this.getMasterId();
       this.masterId = res.masterId;
@@ -2352,6 +2359,7 @@ export default {
         this.table.status == "idle" &&
         !this.shopInfo.isTableFee
       ) {
+        this.perpole = 1;
         await this.changePerpole();
       }
       //设置就餐类型
@@ -2367,22 +2375,11 @@ export default {
         this.getCart();
       }
       this.getCacheOrder();
-      console.log(this.isCreateOrder);
       this.perpole = perpole || this.perpole;
       if (!this.shopInfo.isTableFee && this.table.tableId && this.perpole > 0) {
         //不免餐位费
         await this.changePerpole();
       }
-      // if (this.isCreateOrder) {
-      //   this.toCreateOrder(true);
-      // }
-    },
-    // 获取台桌详情
-    async getTableDetail() {
-      const res = await tbShopTableGet({
-        qrcode: this.table.tableId,
-      });
-      console.log(res);
     },
     //打印制作单
     printOrder() {
@@ -2436,11 +2433,34 @@ export default {
         console.log(error);
       }
     },
+    async getTableDetail(tableId) {
+      const res = await $returnTableDetail({
+        tableId: tableId ? tableId : this.table.tableId,
+      });
+      this.table = { tableId, ...res };
+      return res;
+    },
     async changeTable(item) {
-      if (this.table || this.order.list.length <= 0) {
+      console.log("changeTable");
+      console.log(this.table, this.table.tableId);
+      if (
+        (this.table && this.table.tableId) ||
+        (!this.table && !this.tableId && this.order.list.length <= 0)
+      ) {
+        //台桌已选，再选台桌视为切换台桌
+        //无台桌下单，且购物车列表为空，选台桌也视为切换台桌
+        this.table = item;
+        this.tableShow = false;
+        this.setPostPay();
+        this.setUseType();
+        this.onTableChange();
+        return;
+      }
+      if (this.table && this.order.list.length <= 0) {
         this.table = item;
         this.tableShow = false;
         console.log(this.table);
+        this.onTableChange();
         return;
       }
       if (item.status != "idle") {
@@ -2465,13 +2485,14 @@ export default {
           console.log(e);
         }
       }
+      this.tableShow = false;
       await $choseTable({
         masterId: this.masterId,
         tableId: item.tableId,
         isClear: res1 == "confirm" ? true : false,
       });
       this.table = item;
-      this.tableShow = false;
+      this.onTableChange();
     },
     chooseDinersNumberConfirm(e) {
       this.perpole = e;
@@ -2586,7 +2607,7 @@ export default {
       this.$refs.refMoneyKeyboard.open();
     },
     changePostPay(val) {
-      this.postPay = val;
+      this.payAfter = val;
     },
     //改变是否打印
     changeIsPrint(e) {
@@ -2760,7 +2781,7 @@ export default {
           vipUserId: this.createOrder.data.memberId || this.vipUser.id,
           tableId: this.table.tableId,
           note: this.note.content,
-          postPay: this.postPay,
+          payAfter: this.payAfter,
           orderld: this.order.orderId,
         });
         this.getOrderData({ orderId: res.id });
@@ -2773,7 +2794,7 @@ export default {
       this.createOrder.status = "success";
       this.order.list = [];
       // this.getCart();
-      if (this.postPay && !isNowPay) {
+      if (this.payAfter && !isNowPay) {
         this.$notify({
           title: "下单成功",
           type: "success",
@@ -2781,8 +2802,7 @@ export default {
         return this.close();
       }
       if (!this.isPrverOrder) {
-        const { masterId } = await this.getMasterId();
-        this.masterId = masterId;
+        await this.getMasterId();
       }
       this.isCreateOrder = true;
     },
@@ -2873,7 +2893,7 @@ export default {
     //右侧控制按钮点击事件
     orderBtnsClick(key) {
       const orderGoods = this.order.list[this.order.selIndex];
-      if (this.key != "isJieZhang" && this.postPay) {
+      if (this.key != "isJieZhang" && this.payAfter) {
         this.createOrderClose();
       }
       if (key === "sku") {
@@ -3629,16 +3649,13 @@ export default {
         key = params.key,
         perpoleNumber = params.num || "";
       this.key = key;
-      this.perpole = perpoleNumber;
 
       const shopId = localStorage.getItem("shopId");
       const shopInfo = await tbShopInfo(shopId);
       for (let i in shopInfo.eatModel) {
         let model = shopInfo.eatModel[i];
         model = model == "take-out" ? model.replace(/-/g, "") : model;
-        console.log(model);
         const item = this.useTypes.list.find((v) => v.value == model);
-        console.log(item);
         if (item) {
           item.disabled = false;
         }
@@ -3651,7 +3668,7 @@ export default {
         this.masterId = params.masterId;
       }
       if (key == "isJieZhang") {
-        this.postPay = false;
+        this.payAfter = false;
       } else {
         this.setPostPay();
       }
@@ -3662,7 +3679,6 @@ export default {
       console.log(params);
 
       if (key == "isJieZhang") {
-        this.table = params.tableId ? { name: item.name } : "";
         if (params.orderId) {
           const orderRes = await this.getOrderData(params);
           if (orderRes.status != "unpaid") {
@@ -3675,9 +3691,7 @@ export default {
       if (key == "isPayOrder") {
         this.isCreateOrder = true;
       }
-      if (params.orderId) {
-        const orderRes = await this.getOrderData(params);
-      }
+      this.perpole = perpoleNumber;
 
       // this.getCart();
       // this.getCacheOrder();
@@ -3695,6 +3709,9 @@ export default {
       }
 
       this.table = params.tableId ? item : "";
+      if (params.tableId) {
+        this.onTableChange();
+      }
     },
 
     async getOrderData(params) {
@@ -3703,6 +3720,15 @@ export default {
       const res = await tbOrderInfoDetail(
         params ? params.orderId : this.createOrder.data.id
       );
+      this.masterId=res.masterId?res.masterId:this.masterId;
+      if (res.tableId) {
+        await this.getTableDetail(res.tableId);
+      }
+      //空闲并且免餐位费设置默认就餐人数1
+      if (this.table.tableId && !this.shopInfo.isTableFee) {
+        this.perpole = res.seatInfo ? res.seatInfo.num : 1;
+        await this.changePerpole();
+      }
       this.createOrder.data = res;
       if (res.memberId) {
         await this.getCalcUsablePoints();
@@ -3732,23 +3758,6 @@ export default {
           }
         }
       }
-      this.order.seatFee = res.seatInfo
-        ? {
-            ...res.seatInfo,
-            totalNumber: res.seatInfo.num,
-            number: res.seatInfo.num,
-            name: res.seatInfo.productName,
-            totalAmount: res.seatInfo.priceAmount,
-          }
-        : {
-            name: "客座费",
-            number: res.seatCount || 0,
-            totalNumber: res.seatCount || 0,
-            totalAmount: res.seatAmount || 0,
-            status: "",
-          };
-      console.log(" this.order.seatFee");
-      console.log(this.order.seatFee);
       this.order.old.list = Object.entries(goodsMap).map(([key, value]) => ({
         info: value.map((v) => {
           return {

From 28fdcd9e5ca6d7ef29400e6248cd9b3085322a07 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 7 Nov 2024 17:04:00 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=B8=E6=8A=B5=E6=89=A3=E4=BB=A5=E5=8F=8A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=B8=E6=8A=B5=E6=89=A3=E5=90=8E=E4=BB=B7=E6=A0=BC=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E8=BF=87=E6=BB=A4=E4=B8=8D=E6=BB=A1=E8=B6=B3=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E6=9D=A1=E4=BB=B6=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/quans.vue | 134 ++++++++++++++++----
 src/views/tool/Instead/index.vue            |  82 +++++++-----
 src/views/tool/Instead/util.js              |  38 +++++-
 3 files changed, 196 insertions(+), 58 deletions(-)

diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 6f42a77..7d2f64a 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -9,7 +9,12 @@
               :data="quans.fullReductionCoupon"
               @cell-click="fullReductionCouponClick"
             >
-              <el-table-column type="index" width="80" label="" v-if="quans.fullReductionCoupon.length>0">
+              <el-table-column
+                type="index"
+                width="80"
+                label=""
+                v-if="quans.fullReductionCoupon.length > 0"
+              >
                 <template v-slot="scope">
                   <el-checkbox
                     @change="fullReductionCouponClick(scope.row)"
@@ -21,8 +26,17 @@
               </el-table-column>
               <el-table-column prop="name" label="券名称"> </el-table-column>
               <el-table-column label="券类型" width="80">
-              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
-            </el-table-column>
+                <template v-slot="scope">
+                  {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="discountAmount" label="抵扣"> 
+                <template v-slot="scope">
+                  <span class="color-red">
+                    ￥{{ scope.row.discountAmount }}
+                  </span>
+                </template>
+              </el-table-column>
               <el-table-column prop="useRestrictions" label="描述">
               </el-table-column>
             </el-table>
@@ -39,32 +53,55 @@
               <el-table-column type="index" width="50" label="#">
               </el-table-column>
               <el-table-column prop="name" label="券名称"> </el-table-column>
+              <el-table-column label="商品信息">
+                <template v-slot="scope">
+                  <div class="u-flex ">
+                    <el-image
+                      :src="scope.row.productCover"
+                      style="width: 40px; height: 40px"
+                      :preview-src-list="[scope.row.productCover]"
+                    ></el-image>
+                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column label="券类型" width="80">
-              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
-            </el-table-column>
+                <template v-slot="scope">
+                  {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
+                </template>
+              </el-table-column>
               <el-table-column prop="useRestrictions" label="描述">
               </el-table-column>
             </el-table>
           </el-tab-pane>
         </el-tabs>
-
         <div v-if="quansSelArr.length > 0">
-            <div class="font-bold u-m-b-10">已选优惠券</div>
-          <el-table
-            empty-text="未选择优惠券"
-            :data="quansSelArr"
-          >
+          <div class="font-bold u-m-b-10">已选优惠券</div>
+          <el-table empty-text="未选择优惠券" :data="quansSelArr">
             <el-table-column type="index" width="50" label="#">
             </el-table-column>
             <el-table-column prop="name" label="券名称"> </el-table-column>
             <el-table-column label="券类型" width="80">
-              <template  v-slot="scope"> {{scope.row.type==1?'优惠券':'商品券'}} </template>
+              <template v-slot="scope">
+                {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
+              </template>
             </el-table-column>
+            <el-table-column label="商品信息">
+                <template v-slot="scope">
+                  <div class="u-flex " v-if="scope.row.type == 2">
+                    <el-image
+                      :src="scope.row.productCover"
+                      style="width: 40px; height: 40px"
+                      :preview-src-list="[scope.row.productCover]"
+                    ></el-image>
+                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
+                  </div>
+                </template>
+              </el-table-column>
             <el-table-column prop="useRestrictions" label="描述">
             </el-table-column>
           </el-table>
         </div>
-
         <div class="u-flex u-row-center u-m-t-50">
           <el-button size="medium" @click="close">取消</el-button>
           <el-button size="medium" type="primary" @click="confirm"
@@ -77,12 +114,30 @@
 </template>
 <script>
 import { $activateByOrderId } from "@/api/table";
+import {returnProductCouponAllPrice} from '../util'
+let $originFullReductionCoupon=[]
 export default {
   props: {
     title: {
       type: String,
       default: "选择优惠券",
     },
+    goodsArr:{
+      type:Array,
+      default:[]
+    },
+    vipUser:{
+      type:Object,
+      default:()=>{
+        return {
+          isVip:false,
+        }
+      }
+    },
+    orderPrice:{
+      type:Number, 
+      default:0
+    }
   },
   data() {
     return {
@@ -103,30 +158,52 @@ export default {
       show: false,
     };
   },
-  watch: {},
+  watch: {
+    activeName(newval){
+      if(newval=='youhui'){
+        this.quans.fullReductionCoupon=$originFullReductionCoupon.filter(v=>(this.orderPrice-this.goodsDiscount)>=v.fullAmount)
+      }
+    }
+  },
+  computed:{
+  
+    goodsDiscount(){
+      const coupArr=this.productCouponSelArr.filter(v=>v.type==2);
+      return  returnProductCouponAllPrice(coupArr,this.goodsArr,this.vipUser)
+    }
+  },
   methods: {
     productCouponChange(val) {
+      console.log(val)
       this.productCouponSelArr = val;
-      if (this.productCouponSelArr.length > 0) {
-        this.productCouponSelArr.length = val.length + 1;
+      const dikouQuan=this.quansSelArr[0]
+      if (this.productCouponSelArr.length > 0&&(dikouQuan&&dikouQuan.type==1) ) {
         for (let i in val) {
-          this.quansSelArr[i + 1] = val[i];
+        this.$set(this.quansSelArr, i+1, val[i])
         }
       } else {
-        this.quansSelArr = val;
-      }
-    },
-    fullReductionCouponClick(row) {
-      if (this.fullReductionCouponSel.id == row.id) {
-        this.fullReductionCouponSel = { id: "" };
-        this.quansSelArr.shift();
-        
-      } else {
-        this.fullReductionCouponSel = row;
-        this.quansSelArr.unshift(row);
+        if(dikouQuan){
+          this.quansSelArr=[dikouQuan]
+        }else{
+          this.quansSelArr = val;
+        }
       }
       console.log(this.quansSelArr)
     },
+    fullReductionCouponClick(row) {
+      if(row.id==this.fullReductionCouponSel.id){
+         this.fullReductionCouponSel={id:''}
+         this.quansSelArr.splice(0,1);
+         return 
+      }
+      const dikouQuan=this.quansSelArr[0]
+      this.fullReductionCouponSel = row;
+      if(dikouQuan&&dikouQuan.type==1){
+        this.$set(this.quansSelArr, 0, row)
+      }else{
+        this.quansSelArr.unshift(row);
+      }
+    },
     handleCurrentChange(val) {
       this.currentRow = val;
     },
@@ -154,6 +231,7 @@ export default {
         quans.fullReductionCoupon = quans.fullReductionCoupon.filter(
           (v) => v.use
         );
+        $originFullReductionCoupon=quans.fullReductionCoupon
         quans.productCoupon = quans.productCoupon.filter((v) => v.use);
         this.quans = quans;
       }
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index e7acf03..6732e9d 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -856,8 +856,8 @@
                     </div>
                   </div>
 
-                  <div class="forms">
-                    <div class="u-m-b-20 u-m-t-10" v-if="vipUser.id">
+                  <div class="forms" v-if="vipUser.id">
+                    <div class="u-m-b-20 u-m-t-10" >
                       <div class="u-flex u-flex-wrap">
                         <span class="font-bold no-wrap u-m-r-20">积分抵扣</span>
                         <el-radio-group
@@ -905,7 +905,7 @@
                       </div>
                     </div>
 
-                    <div class="u-flex flex-wrap">
+                    <div class="u-flex flex-wrap" >
                       <span class="font-bold no-wrap">优惠券</span>
                       <div
                         class="border u-p-l-20 cur-pointer u-m-r-20 u-flex no-wrap u-p-t-10 u-p-b-10 border-r-4 selQuan"
@@ -933,6 +933,18 @@
                           {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                         </template>
                       </el-table-column>
+                      <el-table-column label="商品信息">
+                <template v-slot="scope">
+                  <div class="u-flex " v-if="scope.row.type == 2">
+                    <el-image
+                      :src="scope.row.productCover"
+                      style="width: 40px; height: 40px"
+                      :preview-src-list="[scope.row.productCover]"
+                    ></el-image>
+                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
+                  </div>
+                </template>
+              </el-table-column>
                       <el-table-column prop="useRestrictions" label="描述">
                       </el-table-column>
                     </el-table>
@@ -989,11 +1001,11 @@
                   </div>
                   <!-- <div class="detail_form_item">
                     <div class="left">满减优惠</div>
-                    <div class="right">-￥{{ manjian }}</div>
+                    <div class="right">-￥{{ coupdiscount }}</div>
                   </div> -->
                   <div class="detail_form_item">
                     <div class="left">优惠券</div>
-                    <div class="right">-￥{{ manjian }}</div>
+                    <div class="right">-￥{{ coupdiscount }}</div>
                   </div>
                   <div class="detail_form_item">
                     <div class="left">积分抵扣</div>
@@ -1333,7 +1345,7 @@
     <money-discount ref="refDiscount" @confirm="ChangeDiscount">
     </money-discount>
     <!-- 优惠券 -->
-    <quans-pop ref="refQuans" @confirm="quansConfirm"> </quans-pop>
+    <quans-pop ref="refQuans" :vipUser="vipUser" :orderPrice="currentPayMoney" :goodsArr="createOrder.data.detailList||[]"  @confirm="quansConfirm"> </quans-pop>
 
     <!-- 选择人数 -->
     <choose-diners-number
@@ -1406,6 +1418,7 @@ import {
   returnPackFee,
   formatOrderGoodsList,
   returnVipDiscountPrice,
+  returnCouponAllPrice
 } from "./util.js";
 import { $status } from "@/utils/table.js";
 
@@ -1641,24 +1654,30 @@ export default {
     isShowVipPrice() {
       return this.vipUser.isVip ? true : false;
     },
-    manjian() {
-      let result = 0;
-      if (this.quansSelArr.length < 0) {
-        result = 0;
-      }
-      const manjianQuan = this.quansSelArr.find((v) => v.type == 1);
-      if (!manjianQuan) {
-        result = 0;
-      } else {
-        result = manjianQuan.discountAmount;
+    coupdiscount() {
+      return returnCouponAllPrice(this.quansSelArr,this.createOrder.data.detailList||[],this.vipUser)
+    },
+    goodsDisCount(){
+      const goodsQuanArr=this.quansSelArr.filter(v=>v.type==2);
+      let result=0;
+      if(goodsQuanArr.length<0){
+        result=0;
+      }else{
+        result=goodsQuanArr.reduce((a,b)=>{
+          const item=this.createOrder.data.detailList.find(v=>v.productId==b.proId);
+          const memberPrice=item.memberPrice?item.memberPrice:item.price;
+          const price=item?(this.vipUser.isVip?memberPrice:item.price):0;
+          return a+price;
+        },0);
       }
       return result.toFixed(2);
     },
+    
     currentPayMoney() {
       const amount = this.createOrder.data.amount || 0;
       const discount = this.createOrder.discount || 1;
-      // const total=((amount - this.manjian) * this.createOrder.discount - this.points.toMoney)
-      const total = (amount - this.manjian) * this.createOrder.discount;
+      // const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
+      const total = (amount - this.coupdiscount) * this.createOrder.discount;
       return total <= 0 ? 0 : total;
     },
     yinFuJinE() {
@@ -2531,7 +2550,7 @@ export default {
       if (!canDiscount) {
         return;
       }
-      const amount = this.createOrder.data.amount - this.manjian;
+      const amount = this.createOrder.data.amount - this.coupdiscount;
       this.refToggle("refDiscount", true, {
         amount,
         discount: this.createOrder.discount * 100,
@@ -2776,15 +2795,20 @@ export default {
         if (!this.shopInfo.isTableFee) {
           await this.changePerpole();
         }
-        res = await $createOrder({
-          masterId: this.order.masterId || this.masterId,
-          vipUserId: this.createOrder.data.memberId || this.vipUser.id,
-          tableId: this.table.tableId,
-          note: this.note.content,
-          payAfter: this.payAfter,
-          orderld: this.order.orderId,
-        });
-        this.getOrderData({ orderId: res.id });
+        if (this.order.list.length > 0) {
+          res = await $createOrder({
+            masterId: this.order.masterId || this.masterId,
+            vipUserId: this.createOrder.data.memberId || this.vipUser.id,
+            tableId: this.table.tableId,
+            note: this.note.content,
+            payAfter: this.payAfter,
+            orderld: this.order.orderId,
+          });
+        } else {
+          res = true;
+        }
+        await this.getOrderData();
+        res = true;
       } catch (error) {}
       if (!res) {
         this.createOrder.status = "success";
@@ -3720,7 +3744,7 @@ export default {
       const res = await tbOrderInfoDetail(
         params ? params.orderId : this.createOrder.data.id
       );
-      this.masterId=res.masterId?res.masterId:this.masterId;
+      this.masterId = res.masterId ? res.masterId : this.masterId;
       if (res.tableId) {
         await this.getTableDetail(res.tableId);
       }
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index 000bdff..9d98a7c 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -119,6 +119,42 @@ export function returnIsSeatFee(item) {
  * 计算购物车会员优惠价格
  */
 export function returnVipDiscountPrice() {
-   
+
 }
 
+//计算商品券优惠价格
+export function returnProductCouponPrice(coup, goodsArr, vipUser) {
+    const item = goodsArr.find(v => v.productId == coup.proId);
+    const memberPrice = item.memberPrice ? item.memberPrice : item.price;
+    const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
+    return price
+
+}
+//计算商品券总优惠价格
+export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
+    if(coupArr.length == 0){
+        return 0;
+    }
+    return coupArr.reduce((a, b) => {
+        const price = returnProductCouponPrice(b, goodsArr, vipUser)
+        return a + price;
+    }, 0).toFixed(2);
+
+}
+//计算满减券总优惠价格
+export function returnFullCutCouponAllPrice(coupArr) {
+    if(coupArr.length == 0){
+        return 0;
+    }
+    return coupArr.filter(v => v.type == 1).reduce((a, b) => {
+        const price = b.discountAmount
+        return a + price;
+    }, 0).toFixed(2);
+
+}
+//计算优惠券总价格
+export function returnCouponAllPrice(coupArr, goodsArr, vipUser) {
+    const poductAllprice=returnProductCouponAllPrice(coupArr, goodsArr, vipUser)
+    const pointAllPrice=returnFullCutCouponAllPrice(coupArr)
+    return (poductAllprice+pointAllPrice).toFixed(2);
+}
\ No newline at end of file

From 176fc55a5c950deddd5cc2390e8274234a844aa2 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 11 Nov 2024 14:03:49 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=EF=BC=8C=E7=A7=AF=E5=88=86=E6=8A=B5=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/coup.vue    |   0
 src/views/tool/Instead/components/quans.vue   | 341 ++++++++++++++----
 .../tool/Instead/components/return-cart.vue   |   1 +
 src/views/tool/Instead/index.vue              | 127 +++++--
 src/views/tool/Instead/util.js                |  48 ++-
 5 files changed, 393 insertions(+), 124 deletions(-)
 create mode 100644 src/views/tool/Instead/components/coup.vue

diff --git a/src/views/tool/Instead/components/coup.vue b/src/views/tool/Instead/components/coup.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 7d2f64a..6d75c7c 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -1,17 +1,23 @@
 <template>
-  <el-dialog width="600px" :title="title" :visible.sync="show">
+  <el-dialog
+    width="700px"
+    :title="title"
+    :visible.sync="show"
+    top="20px"
+    @close="reset"
+  >
     <div class="u-p-15">
       <div class="">
         <el-tabs v-model="activeName" @tab-click="tabClick">
           <el-tab-pane label="优惠券(单选)" name="youhui">
             <el-table
+              ref="table"
               empty-text="无可用优惠券"
               :data="quans.fullReductionCoupon"
               @cell-click="fullReductionCouponClick"
             >
               <el-table-column
                 type="index"
-                width="80"
                 label=""
                 v-if="quans.fullReductionCoupon.length > 0"
               >
@@ -22,27 +28,39 @@
                   ></el-checkbox>
                 </template>
               </el-table-column>
-              <el-table-column type="index" width="50" label="#">
-              </el-table-column>
+              <el-table-column type="index" label="#"> </el-table-column>
               <el-table-column prop="name" label="券名称"> </el-table-column>
               <el-table-column label="券类型" width="80">
                 <template v-slot="scope">
                   {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                 </template>
               </el-table-column>
-              <el-table-column prop="discountAmount" label="抵扣"> 
+              <el-table-column prop="discountAmount" label="抵扣">
                 <template v-slot="scope">
                   <span class="color-red">
                     ￥{{ scope.row.discountAmount }}
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column prop="discountAmount" label="限制" width="120">
+                <template v-slot="scope">
+                  <div class="u-flex">
+                    <span>支付满</span>
+                    <span class="color-red no-wrap">
+                      {{ scope.row.fullAmount }}
+                    </span>
+                    <span>元可用</span>
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column prop="useRestrictions" label="描述">
               </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="商品券(多选)" name="goods">
             <el-table
+              ref="table1"
+              @cell-click="productCouponClick"
               empty-text="无可用商品券"
               :data="quans.productCoupon"
               tooltip-effect="dark"
@@ -53,19 +71,33 @@
               <el-table-column type="index" width="50" label="#">
               </el-table-column>
               <el-table-column prop="name" label="券名称"> </el-table-column>
-              <el-table-column label="商品信息">
+
+              <el-table-column label="商品信息" width="120">
                 <template v-slot="scope">
-                  <div class="u-flex ">
-                    <el-image
-                      :src="scope.row.productCover"
-                      style="width: 40px; height: 40px"
-                      :preview-src-list="[scope.row.productCover]"
-                    ></el-image>
-                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
+                  <div class="u-flex">
+                    <div class="u-flex">
+                      <el-image
+                        :src="scope.row.productCover"
+                        fit="cover"
+                        style="width: 40px; height: 40px"
+                        :preview-src-list="[scope.row.productCover]"
+                      ></el-image>
+                    </div>
+                    <div class="u-p-l-10">
+                      <div class="">{{ scope.row.productName }}</div>
+                      <div class="">x{{ scope.row.num || "" }}</div>
+                    </div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="券类型" width="80">
+              <el-table-column prop="discountAmount" label="抵扣">
+                <template v-slot="scope">
+                  <span class="color-red">
+                    ￥{{ scope.row.discountAmount }}
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="券类型">
                 <template v-slot="scope">
                   {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                 </template>
@@ -87,20 +119,38 @@
               </template>
             </el-table-column>
             <el-table-column label="商品信息">
-                <template v-slot="scope">
-                  <div class="u-flex " v-if="scope.row.type == 2">
-                    <el-image
-                      :src="scope.row.productCover"
-                      style="width: 40px; height: 40px"
-                      :preview-src-list="[scope.row.productCover]"
-                    ></el-image>
-                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
-                  </div>
-                </template>
-              </el-table-column>
+              <template v-slot="scope">
+                <div class="u-flex" v-if="scope.row.type == 2">
+                  <el-image
+                    :src="scope.row.productCover"
+                    style="width: 40px; height: 40px"
+                    :preview-src-list="[scope.row.productCover]"
+                  ></el-image>
+                  <div class="u-m-l-10">{{ scope.row.productName }}</div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="discountAmount" label="抵扣">
+              <template v-slot="scope">
+                <span class="color-red">
+                  ￥{{ scope.row.discountAmount }}
+                </span>
+              </template>
+            </el-table-column>
             <el-table-column prop="useRestrictions" label="描述">
             </el-table-column>
+            <el-table-column prop="useRestrictions" label="">
+              <template v-slot="scope">
+                <el-button type="danger" size="mini" @click="delQuan(scope.row)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
           </el-table>
+          <div class="u-flex u-m-t-20">
+            <span class="">抵扣：</span>
+            <span class="color-red font-bold">{{ AllCouponPrice }}</span>
+          </div>
         </div>
         <div class="u-flex u-row-center u-m-t-50">
           <el-button size="medium" @click="close">取消</el-button>
@@ -114,37 +164,41 @@
 </template>
 <script>
 import { $activateByOrderId } from "@/api/table";
-import {returnProductCouponAllPrice} from '../util'
-let $originFullReductionCoupon=[]
+import {
+  returnProductCouponAllPrice,
+  returnProductCouponPrice,
+  returnFullReductionCouponAllPrice,
+} from "../util";
+let $originFullReductionCoupon = [];
 export default {
   props: {
     title: {
       type: String,
       default: "选择优惠券",
     },
-    goodsArr:{
-      type:Array,
-      default:[]
+    goodsArr: {
+      type: Array,
+      default: [],
     },
-    vipUser:{
-      type:Object,
-      default:()=>{
+    vipUser: {
+      type: Object,
+      default: () => {
         return {
-          isVip:false,
-        }
-      }
+          isVip: false,
+        };
+      },
+    },
+    orderPrice: {
+      type: Number,
+      default: 0,
     },
-    orderPrice:{
-      type:Number, 
-      default:0
-    }
   },
   data() {
     return {
+      propSelCoup: [],
       fullReductionCouponSel: {
         id: "",
       },
-      productCouponSelArr: [],
       quansSelArr: [],
       quans: {
         fullReductionCoupon: [],
@@ -156,53 +210,150 @@ export default {
       activeName: "youhui",
       form: {},
       show: false,
+      isSetProductCoup: false,
     };
   },
   watch: {
-    activeName(newval){
-      if(newval=='youhui'){
-        this.quans.fullReductionCoupon=$originFullReductionCoupon.filter(v=>(this.orderPrice-this.goodsDiscount)>=v.fullAmount)
+    activeName(newval) {
+      if (newval == "youhui") {
+        this.filterFullReductionCoupon();
       }
-    }
+    },
   },
-  computed:{
-  
-    goodsDiscount(){
-      const coupArr=this.productCouponSelArr.filter(v=>v.type==2);
-      return  returnProductCouponAllPrice(coupArr,this.goodsArr,this.vipUser)
-    }
+  computed: {
+    goodsDiscount() {
+      const coupArr = this.quansSelArr.filter((v) => v.type == 2);
+      return returnProductCouponAllPrice(coupArr, this.goodsArr, this.vipUser);
+    },
+    fullReductionCouponDiscount() {
+      const coupArr = this.quansSelArr.filter((v) => v.type == 1);
+      return returnFullReductionCouponAllPrice(coupArr);
+    },
+    AllCouponPrice() {
+      return (
+        this.goodsDiscount * 1 +
+        this.fullReductionCouponDiscount * 1
+      ).toFixed(2);
+    },
   },
   methods: {
+    delQuan(row) {
+      if (row.type == 2) {
+        const index = this.quansSelArr.findIndex((item) => item.id == row.id);
+        this.quansSelArr.splice(index, 1);
+        this.$refs.table1.toggleRowSelection(row, false);
+      } else {
+        this.fullReductionCouponSel = { id: "" };
+        this.quansSelArr.splice(0, 1);
+      }
+      if (index != -1) {
+        const row = this.quansSelArr.find;
+      }
+    },
+    reset() {
+      this.quansSelArr = [];
+      this.fullReductionCouponSel = { id: "" };
+      this.$refs.table1.clearSelection();
+    },
+    filterFullReductionCoupon() {
+      this.quans.fullReductionCoupon = $originFullReductionCoupon.filter(
+        (v) => this.orderPrice - this.goodsDiscount >= v.fullAmount
+      );
+    },
     productCouponChange(val) {
-      console.log(val)
-      this.productCouponSelArr = val;
-      const dikouQuan=this.quansSelArr[0]
-      if (this.productCouponSelArr.length > 0&&(dikouQuan&&dikouQuan.type==1) ) {
-        for (let i in val) {
-        this.$set(this.quansSelArr, i+1, val[i])
+      if (this.isSetProductCoup) {
+        return;
+      }
+
+      const firstCoup = this.quansSelArr[0];
+      const firstIsDikouQuan = firstCoup ? firstCoup.type == 1 : false;
+      if (firstCoup && firstIsDikouQuan) {
+        if (
+          this.orderPrice -
+            this.fullReductionCouponDiscount -
+            returnProductCouponAllPrice(val, this.goodsArr, this.vipUser) <
+          firstCoup.fullAmount
+        ) {
+          this.$confirm(
+            "所选优惠券不满足最低抵扣" + firstCoup.fullAmount + "元要求",
+            "提示",
+            {
+              distinguishCancelAndClose: true,
+              confirmButtonText: "放弃选择商品券",
+              cancelButtonText: "删除优惠券",
+              type: "warning",
+            }
+          )
+            .then(() => {
+              val.map((v) => {
+                this.$refs.table1.toggleRowSelection(v);
+              });
+            })
+            .catch((action) => {
+              if (action == "cancel") {
+                this.quansSelArr.splice(0, 1);
+                this.fullReductionCouponSel = { id: "" };
+                this.quansSelArr = [...val];
+              }
+              if (action == "close") {
+                val.map((v) => {
+                  this.$refs.table1.toggleRowSelection(v);
+                });
+              }
+            });
+        } else {
+          this.quansSelArr.splice(
+            val.length <= 0 ? 1 : val.length,
+            this.quansSelArr.length
+          );
+          for (let i in val) {
+            this.$set(this.quansSelArr, i * 1 + 1, { ...val[i] });
+          }
         }
       } else {
-        if(dikouQuan){
-          this.quansSelArr=[dikouQuan]
-        }else{
-          this.quansSelArr = val;
-        }
+        this.quansSelArr = [...val];
       }
-      console.log(this.quansSelArr)
     },
     fullReductionCouponClick(row) {
-      if(row.id==this.fullReductionCouponSel.id){
-         this.fullReductionCouponSel={id:''}
-         this.quansSelArr.splice(0,1);
-         return 
+      if (row.id == this.fullReductionCouponSel.id) {
+        this.fullReductionCouponSel = { id: "" };
+        this.quansSelArr.splice(0, 1);
+        return;
       }
-      const dikouQuan=this.quansSelArr[0]
+      const dikouQuan = this.quansSelArr[0];
       this.fullReductionCouponSel = row;
-      if(dikouQuan&&dikouQuan.type==1){
-        this.$set(this.quansSelArr, 0, row)
-      }else{
+      if (dikouQuan && dikouQuan.type == 1) {
+        this.$set(this.quansSelArr, 0, row);
+      } else {
         this.quansSelArr.unshift(row);
       }
+      if(!this.fullReductionCouponSel.id){
+        return
+      }
+      
+      if (
+        this.orderPrice -
+          this.fullReductionCouponDiscount -
+          this.goodsDiscount <
+            this.fullReductionCouponSel.fullAmount
+      ) {
+        this.fullReductionCouponSel = { id: "" };
+        this.quansSelArr.splice(0, 1);
+        this.$confirm(
+          "所选优惠券不满足最低抵扣" +
+            this.fullReductionCouponSel.fullAmount +
+            "元要求",
+          "提示",
+          {
+            distinguishCancelAndClose: true,
+            confirmButtonText: "确定",
+            type: "warning",
+          }
+        ).then(() => {});
+      }
+    },
+    productCouponClick(row) {
+      this.$refs.table1.toggleRowSelection(row);
     },
     handleCurrentChange(val) {
       this.currentRow = val;
@@ -218,22 +369,54 @@ export default {
     },
 
     confirm() {
-      this.$emit("confirm", this.quansSelArr);
+      this.$emit("confirm", [...this.quansSelArr]);
       this.close();
     },
-    async open(data) {
+    setSelectCoupon() {
+      const dikouQuan = this.propSelCoup.find((v) => v.type == 1);
+      this.fullReductionCouponSel = dikouQuan ? dikouQuan : { id: "" };
+      const productCouArr = this.propSelCoup.filter((v) => v.type == 2);
+      this.quans.productCoupon.map((v) => {
+        for (let i in productCouArr) {
+          this.isSetProductCoup = true;
+          if (v.id == productCouArr[i].id) {
+            this.$refs.table1.toggleRowSelection(v, true);
+          }
+        }
+      });
+
+      this.isSetProductCoup = false;
+    },
+    async open(data, propSelCoup) {
+      this.propSelCoup = [...propSelCoup] || [];
       console.log(data);
       if (data.memberId) {
-        let quans = await $activateByOrderId({
+        let quansRes = await $activateByOrderId({
           orderId: data.id,
           memberId: data.memberId,
         });
-        quans.fullReductionCoupon = quans.fullReductionCoupon.filter(
-          (v) => v.use
+        quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
+          (v) => this.orderPrice >= v.fullAmount
         );
-        $originFullReductionCoupon=quans.fullReductionCoupon
-        quans.productCoupon = quans.productCoupon.filter((v) => v.use);
-        this.quans = quans;
+        $originFullReductionCoupon = quansRes.fullReductionCoupon;
+        this.quans.productCoupon = quansRes.productCoupon
+          .map((v) => {
+            return {
+              ...v,
+              discountAmount: returnProductCouponPrice(
+                v,
+                this.goodsArr,
+                this.vipUser
+              ),
+            };
+          })
+          .filter((v) => v.discountAmount > 0);
+        // this.quans = quans;
+        this.filterFullReductionCoupon();
+        this.quansSelArr = this.propSelCoup;
+        this.$nextTick(() => {
+          this.setSelectCoupon();
+        });
       }
 
       this.show = true;
diff --git a/src/views/tool/Instead/components/return-cart.vue b/src/views/tool/Instead/components/return-cart.vue
index 3b50d08..9f9e667 100644
--- a/src/views/tool/Instead/components/return-cart.vue
+++ b/src/views/tool/Instead/components/return-cart.vue
@@ -113,6 +113,7 @@ export default {
     },
     open(item) {
       this.goods = item?item:this.goods;
+      console.log(item)
       this.show = true;
       if (item != "-999") {
         this.number = 1;
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 6732e9d..f6c69d5 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -857,7 +857,7 @@
                   </div>
 
                   <div class="forms" v-if="vipUser.id">
-                    <div class="u-m-b-20 u-m-t-10" >
+                    <div class="u-m-b-20 u-m-t-10">
                       <div class="u-flex u-flex-wrap">
                         <span class="font-bold no-wrap u-m-r-20">积分抵扣</span>
                         <el-radio-group
@@ -872,12 +872,16 @@
                           <el-input-number
                             @change="pointsValueChange"
                             v-if="points.selected == 1"
+                            :step="1"
                             disabled
+                            step-strictly
                             v-model="points.value"
                             :min="points.minDeductionPoints"
                             :max="points.maxUsablePoints"
                           ></el-input-number>
                           <el-input-number
+                            :step="1"
+                            step-strictly
                             @change="pointsValueChange"
                             v-if="points.selected == 2"
                             v-model="points.value"
@@ -889,6 +893,9 @@
                       <div class="color-999 u-m-t-10">
                         <template v-if="points.res.usable">
                           <span class="color-red">*</span>
+                          <span v-if="points.res.equivalentPoints">
+                            1积分抵扣{{ points.res.equivalentPoints }}元，
+                          </span>
                           <span
                             >最大抵扣积分{{ points.res.maxUsablePoints }}</span
                           >
@@ -905,7 +912,7 @@
                       </div>
                     </div>
 
-                    <div class="u-flex flex-wrap" >
+                    <div class="u-flex flex-wrap">
                       <span class="font-bold no-wrap">优惠券</span>
                       <div
                         class="border u-p-l-20 cur-pointer u-m-r-20 u-flex no-wrap u-p-t-10 u-p-b-10 border-r-4 selQuan"
@@ -934,18 +941,35 @@
                         </template>
                       </el-table-column>
                       <el-table-column label="商品信息">
-                <template v-slot="scope">
-                  <div class="u-flex " v-if="scope.row.type == 2">
-                    <el-image
-                      :src="scope.row.productCover"
-                      style="width: 40px; height: 40px"
-                      :preview-src-list="[scope.row.productCover]"
-                    ></el-image>
-                    <div class="u-m-l-10">{{ scope.row.productName }}</div>
-                  </div>
-                </template>
-              </el-table-column>
-                      <el-table-column prop="useRestrictions" label="描述">
+                        <template v-slot="scope">
+                          <div class="u-flex" v-if="scope.row.type == 2">
+                            <el-image
+                              :src="scope.row.productCover"
+                              style="width: 40px; height: 40px"
+                              :preview-src-list="[scope.row.productCover]"
+                            ></el-image>
+                            <div class="u-m-l-10">
+                              {{ scope.row.productName }}
+                            </div>
+                          </div>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="discountAmount" label="抵扣">
+                        <template v-slot="scope">
+                          <span class="color-red">
+                            ￥{{ scope.row.discountAmount }}
+                          </span>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="useRestrictions" label="">
+                        <template v-slot="scope">
+                          <el-button
+                            type="danger"
+                            size="mini"
+                            @click="delQuan(scope.row)"
+                            >删除</el-button
+                          >
+                        </template>
                       </el-table-column>
                     </el-table>
                   </div>
@@ -1345,7 +1369,14 @@
     <money-discount ref="refDiscount" @confirm="ChangeDiscount">
     </money-discount>
     <!-- 优惠券 -->
-    <quans-pop ref="refQuans" :vipUser="vipUser" :orderPrice="currentPayMoney" :goodsArr="createOrder.data.detailList||[]"  @confirm="quansConfirm"> </quans-pop>
+    <quans-pop
+      ref="refQuans"
+      :vipUser="vipUser"
+      :orderPrice="currentPayMoney"
+      :goodsArr="createOrder.data.detailList || []"
+      @confirm="quansConfirm"
+    >
+    </quans-pop>
 
     <!-- 选择人数 -->
     <choose-diners-number
@@ -1418,7 +1449,7 @@ import {
   returnPackFee,
   formatOrderGoodsList,
   returnVipDiscountPrice,
-  returnCouponAllPrice
+  returnCouponAllPrice,
 } from "./util.js";
 import { $status } from "@/utils/table.js";
 
@@ -1655,24 +1686,34 @@ export default {
       return this.vipUser.isVip ? true : false;
     },
     coupdiscount() {
-      return returnCouponAllPrice(this.quansSelArr,this.createOrder.data.detailList||[],this.vipUser)
+      return returnCouponAllPrice(
+        this.quansSelArr,
+        this.createOrder.data.detailList || [],
+        this.vipUser
+      );
     },
-    goodsDisCount(){
-      const goodsQuanArr=this.quansSelArr.filter(v=>v.type==2);
-      let result=0;
-      if(goodsQuanArr.length<0){
-        result=0;
-      }else{
-        result=goodsQuanArr.reduce((a,b)=>{
-          const item=this.createOrder.data.detailList.find(v=>v.productId==b.proId);
-          const memberPrice=item.memberPrice?item.memberPrice:item.price;
-          const price=item?(this.vipUser.isVip?memberPrice:item.price):0;
-          return a+price;
-        },0);
+    goodsDisCount() {
+      const goodsQuanArr = this.quansSelArr.filter((v) => v.type == 2);
+      let result = 0;
+      if (goodsQuanArr.length < 0) {
+        result = 0;
+      } else {
+        result = goodsQuanArr.reduce((a, b) => {
+          const item = this.createOrder.data.detailList.find(
+            (v) => v.productId == b.proId
+          );
+          const memberPrice = item.memberPrice ? item.memberPrice : item.price;
+          const price = item
+            ? this.vipUser.isVip
+              ? memberPrice
+              : item.price
+            : 0;
+          return a + price;
+        }, 0);
       }
       return result.toFixed(2);
     },
-    
+
     currentPayMoney() {
       const amount = this.createOrder.data.amount || 0;
       const discount = this.createOrder.discount || 1;
@@ -2089,6 +2130,13 @@ export default {
     this.open(this.$route.query);
   },
   methods: {
+    delQuan(row) {
+      const index=this.quansSelArr.findIndex(v=>v.id==row.id);
+      console.log(index);
+      if(index!=-1){
+        this.quansSelArr.splice(index, 1);
+      }
+    },
     async getCalcUsablePoints() {
       const memberId = this.createOrder.data.memberId || this.vipUser.id;
       if (!memberId) {
@@ -2099,7 +2147,7 @@ export default {
         orderAmount: this.currentPayMoney.toFixed(2),
       });
       this.points.res = pointsRes;
-      this.points.minDeductionPoints = pointsRes.minDeductionPoints;
+      // this.points.minDeductionPoints = pointsRes.minDeductionPoints;
       this.points.maxUsablePoints = pointsRes.maxUsablePoints;
       if (this.points.selected) {
         this.points.value = Math.min(
@@ -2138,11 +2186,11 @@ export default {
       this.$refs.refQuans.open({
         id: this.createOrder.data.id,
         memberId: this.createOrder.data.memberId || this.vipUser.id,
-      });
+      },[...this.quansSelArr]);
     },
     quansConfirm(e) {
       console.log(e);
-      this.quansSelArr = e;
+      this.quansSelArr = [...e];
     },
     searchInput(e) {
       console.log(e);
@@ -2706,11 +2754,11 @@ export default {
       const userCouponInfos = this.quansSelArr.reduce((prve, cur) => {
         const index = prve.findIndex((v) => v.userCouponId == cur.couponId);
         if (index != -1) {
-          prve[index].num += 1;
+          prve[index].num += cur.num;
         } else {
           prve.push({
             userCouponId: cur.couponId,
-            num: 1,
+            num: cur.num,
           });
         }
         return prve;
@@ -2804,10 +2852,8 @@ export default {
             payAfter: this.payAfter,
             orderld: this.order.orderId,
           });
-        } else {
-          res = true;
-        }
-        await this.getOrderData();
+        } 
+        await this.getOrderData(res?{orderId: res.id}:{orderId:this.createOrder.data.id});
         res = true;
       } catch (error) {}
       if (!res) {
@@ -2968,7 +3014,8 @@ export default {
         return;
       }
       if (key === "returnCart") {
-        this.refToggle("refReturnCart", true);
+        const selGoods=this.order.old.list[this.order.old.selIndex];
+        this.refToggle("refReturnCart", true,selGoods);
       }
     },
     //选择挂单确认
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index 9d98a7c..c9d3401 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -1,4 +1,5 @@
-//计算打包费
+import {isTui} from '../../order_manage/order_goods_util.js'
+//计算打包费 
 export function returnPackFee(arr, isOld = true) {
     if (isOld) {
         return arr.reduce((a, b) => {
@@ -113,7 +114,7 @@ export function returnIsSeatFee(item) {
     if (!item) {
         return false
     }
-    return item.productId == "-999"
+    return item.productId == "-999"?true:false;
 }
 /**
  * 计算购物车会员优惠价格
@@ -125,11 +126,48 @@ export function returnVipDiscountPrice() {
 //计算商品券优惠价格
 export function returnProductCouponPrice(coup, goodsArr, vipUser) {
     const item = goodsArr.find(v => v.productId == coup.proId);
+    if(!item){
+        return 0
+    }
     const memberPrice = item.memberPrice ? item.memberPrice : item.price;
     const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
     return price
 
 }
+//返回新的商品列表，过滤掉退菜的，退单的商品
+export function returnNewGoodsList(arr) {
+    let goodsMap={}
+    return arr.filter(v => !isTui(v))
+}
+//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
+export function returnProductCoupon(coup, goodsArr, vipUser) {
+    const newGoodsArr = returnNewGoodsList(goodsArr)
+    const item = newGoodsArr.find(v => v.productId == coup.proId);
+    if(!item){
+        return {...coup, discountAmount: 0,use:false}
+    }
+    const memberPrice = item.memberPrice ? item.memberPrice : item.price;
+    const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
+    const canUse=!v.use?false:(discountAmount>0)
+    return { ...coup, discountAmount: price,use:canUse}
+
+}
+/**
+ * 根据购物车商品计算商品券抵扣价格以及是否满足可用需求
+ * 1.商品券对应商品数量大于购物车对应商品数量不可用
+ * 2.未在购物车找到相关商品不可用
+ * @param {*} coupArr 
+ * @param {*} goodsArr 
+ * @param {*} vipUser 
+ * @returns 
+ */
+export function returnProductAllCoup(coupArr, goodsArr, vipUser){
+    return coupArr.map((v) => {
+        return returnProductCoupon(v, goodsArr, vipUser)
+      })
+
+}
+
 //计算商品券总优惠价格
 export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
     if(coupArr.length == 0){
@@ -142,7 +180,7 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
 
 }
 //计算满减券总优惠价格
-export function returnFullCutCouponAllPrice(coupArr) {
+export function returnFullReductionCouponAllPrice(coupArr) {
     if(coupArr.length == 0){
         return 0;
     }
@@ -155,6 +193,6 @@ export function returnFullCutCouponAllPrice(coupArr) {
 //计算优惠券总价格
 export function returnCouponAllPrice(coupArr, goodsArr, vipUser) {
     const poductAllprice=returnProductCouponAllPrice(coupArr, goodsArr, vipUser)
-    const pointAllPrice=returnFullCutCouponAllPrice(coupArr)
-    return (poductAllprice+pointAllPrice).toFixed(2);
+    const pointAllPrice=returnFullReductionCouponAllPrice(coupArr)
+    return (poductAllprice*1+pointAllPrice*1).toFixed(2);
 }
\ No newline at end of file