From 3d287016c0b806f930e3d027819099bfb41bb9e8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 18 Nov 2024 18:24:28 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=8A=B5=E6=89=A3=E5=88=B8?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order_manage/order_goods_util.js    |   3 +-
 .../tool/Instead/components/quans copy.vue    | 456 ++++++++++++++++++
 src/views/tool/Instead/components/quans.vue   | 331 +++++++------
 src/views/tool/Instead/index.vue              |  36 +-
 src/views/tool/Instead/quan_util.js           | 206 ++++++++
 src/views/tool/Instead/util.js                |   2 +-
 6 files changed, 870 insertions(+), 164 deletions(-)
 create mode 100644 src/views/tool/Instead/components/quans copy.vue
 create mode 100644 src/views/tool/Instead/quan_util.js

diff --git a/src/views/order_manage/order_goods_util.js b/src/views/order_manage/order_goods_util.js
index d12b29c..c38e1e9 100644
--- a/src/views/order_manage/order_goods_util.js
+++ b/src/views/order_manage/order_goods_util.js
@@ -17,7 +17,8 @@ export function canTuicai(orderInfo,item){
 	return orderInfo.status=='unpaid'&&orderInfo.useType!='dine-in-before'&& item.status!='return'
 }
 export function canTuiKuan(orderInfo,item){
-	return  orderInfo.status!='unpaid'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding'
+	// return  orderInfo.status!='unpaid'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding'
+	return  orderInfo.status=='closed'&& item.status!='return'&&item.status!='refund'&&item.status!='refunding' && !item.userCouponId
 }
 export function isTui(item){
 	return  item.status=='return'||item.status=='refund'||item.status=='refunding'
diff --git a/src/views/tool/Instead/components/quans copy.vue b/src/views/tool/Instead/components/quans copy.vue
new file mode 100644
index 0000000..b7822aa
--- /dev/null
+++ b/src/views/tool/Instead/components/quans copy.vue	
@@ -0,0 +1,456 @@
+<template>
+  <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"
+                label=""
+                v-if="quans.fullReductionCoupon.length > 0"
+              >
+                <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" 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="抵扣">
+                <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"
+              style="width: 100%"
+              @selection-change="productCouponChange"
+            >
+              <el-table-column type="selection" width="55" :selectable="goodsCoupSelectableHandle"> </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="120">
+                <template v-slot="scope">
+                  <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 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>
+              </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 label="商品信息" width="120">
+                <template v-slot="scope">
+                  <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 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>
+          <el-button size="medium" type="primary" @click="confirm"
+            >确定</el-button
+          >
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { $activateByOrderId } from "@/api/table";
+import {
+  returnProductCouponAllPrice,returnProductCoupon,
+  returnProductCouponPrice,
+  returnFullReductionCouponAllPrice,returnNewGoodsList
+} 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, String],
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      propSelCoup: [],
+      fullReductionCouponSel: {
+        id: "",
+      },
+      quansSelArr: [],
+      quans: {
+        fullReductionCoupon: [],
+        productCoupon: [],
+      },
+      currentRow: null,
+      multipleSelection: null,
+      fullReductionCouponSelId: "",
+      activeName: "youhui",
+      form: {},
+      show: false,
+      isSetProductCoup: false,
+    };
+  },
+  watch: {
+    activeName(newval) {
+      if (newval == "youhui") {
+        this.filterFullReductionCoupon();
+      }
+    },
+  },
+  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: {
+    goodsCoupSelectableHandle(row,index){
+      console.log(row,index);
+      return true
+    },
+    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) {
+      const oldval=this.quansSelArr;
+      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 {
+        this.quansSelArr = [...val];
+      }
+    },
+    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);
+      }
+      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;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    tabClick() {},
+    init() {},
+
+    changeKey(key, val) {
+      this[key] = val;
+    },
+
+    confirm() {
+      this.$emit("confirm", [...this.quansSelArr]);
+      this.close();
+    },
+    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 quansRes = await $activateByOrderId({
+          orderId: data.id,
+          memberId: data.memberId,
+        });
+        quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
+          (v) => {
+            return this.orderPrice >= v.fullAmount && v.use;
+          }
+        );
+        const canDikouGoodsArr = returnNewGoodsList(this.goodsArr|| [])
+        $originFullReductionCoupon = quansRes.fullReductionCoupon;
+        this.quans.productCoupon = quansRes.productCoupon.map(v=>{
+          const coup = returnProductCoupon(v, canDikouGoodsArr,this.vipUser)
+          return coup
+        }).filter(v=>v.use)
+        // this.quans = quans;
+        this.filterFullReductionCoupon();
+        this.quansSelArr = this.propSelCoup;
+        this.$nextTick(() => {
+          this.setSelectCoupon();
+        });
+      }
+
+      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/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 9cb1ebd..2de1167 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -63,11 +63,19 @@
               @cell-click="productCouponClick"
               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
+                label=""
+                v-if="quans.fullReductionCoupon.length > 0"
+              >
+                <template v-slot="scope">
+                  <el-checkbox
+                    @change="productCouponClick(scope.row)"
+                    :value="scope.row.checked"
+                  ></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>
@@ -90,13 +98,13 @@
                   </div>
                 </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> -->
               <el-table-column label="券类型">
                 <template v-slot="scope">
                   {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
@@ -104,6 +112,11 @@
               </el-table-column>
               <el-table-column prop="useRestrictions" label="描述">
               </el-table-column>
+              <el-table-column prop="useRestrictions" label="是否可用">
+                <template v-slot="scope">
+                  {{ scope.row.use ? "可以" : "不可用" }}
+                </template>
+              </el-table-column>
             </el-table>
           </el-tab-pane>
         </el-tabs>
@@ -118,23 +131,32 @@
                 {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
               </template>
             </el-table-column>
-            <el-table-column label="商品信息">
+            <el-table-column label="商品信息" width="120">
               <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 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 prop="discountAmount" label="抵扣">
               <template v-slot="scope">
-                <span class="color-red">
+                <span class="color-red" v-if="scope.row.type == 1">
                   ￥{{ scope.row.discountAmount }}
                 </span>
+                <span class="color-red" v-if="scope.row.type == 2">
+                  ￥{{ returnProDiscount(scope.row, scope.row.index) }}
+                </span>
               </template>
             </el-table-column>
             <el-table-column prop="useRestrictions" label="描述">
@@ -147,9 +169,22 @@
               </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 class="u-flex u-row-between u-m-t-20">
+          <div class="u-flex">
+            <span>抵扣金额:</span>
+            <span class="color-red">￥{{ AllCouponPrice }}</span>
+          </div>
+          <div class="u-flex u-relative">
+            <span>支付金额:</span>
+            <span class="color-red">￥{{ payPrice }}</span>
+            <div
+              class="u-absolute u-flex line-th color-999"
+              style="right: 0; bottom: 100%"
+              v-if="orderPrice * 1 != payPrice * 1"
+            >
+              <span class="">￥{{ orderPrice }}</span>
+            </div>
           </div>
         </div>
         <div class="u-flex u-row-center u-m-t-50">
@@ -165,11 +200,21 @@
 <script>
 import { $activateByOrderId } from "@/api/table";
 import {
-  returnProductCouponAllPrice,returnProductCoupon,
-  returnProductCouponPrice,
-  returnFullReductionCouponAllPrice,returnNewGoodsList
-} from "../util";
+  returnNewGoodsList,
+  returnFullReductionCouponAllPrice,
+  returnCouponAllPrice,
+  returnProductCoupon,
+  returnCanUseFullReductionCoupon,
+  returnCoupCanUse,
+  returnProductCouponAllPrice,
+  returnGoodsPayPriceMap,
+  returnProductCoupAllPrice,
+} from "../quan_util.js";
 let $originFullReductionCoupon = [];
+//可以抵扣的商品列表
+let canDikouGoodsArr = [];
+//商品数量从0到n每一个对应的价格
+let $goodsPayPriceMap = {};
 export default {
   props: {
     title: {
@@ -187,15 +232,11 @@ export default {
           isVip: false,
         };
       },
-    },
-    orderPrice: {
-      type: Number,
-      default: 0,
-    },
+    }
   },
   data() {
     return {
-      propSelCoup: [],
+      orderPrice:0,
       fullReductionCouponSel: {
         id: "",
       },
@@ -223,32 +264,58 @@ export default {
   computed: {
     goodsDiscount() {
       const coupArr = this.quansSelArr.filter((v) => v.type == 2);
-      return returnProductCouponAllPrice(coupArr, this.goodsArr, this.vipUser);
+      return returnProductCouponAllPrice(
+        coupArr,
+        canDikouGoodsArr,
+        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);
+      return returnCouponAllPrice(
+        this.quansSelArr,
+        canDikouGoodsArr,
+        this.vipUser
+      );
+    },
+    payPrice() {
+      const pay = this.orderPrice - this.AllCouponPrice;
+      return (pay < 0 ? 0 : pay).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);
+    returnProDiscount(row) {
+      console.log(row);
+      //相同商品抵扣券数组
+      const arr = this.quans.productCoupon.filter((v) => v.proId == row.proId);
+      const index = arr.findIndex((v) => v.id == row.id);
+      if (index != -1) {
+        return returnProductCoupAllPrice(
+          $goodsPayPriceMap[row.proId],
+          index,
+          row.num
+        );
       } else {
+        return 0;
+      }
+    },
+    goodsCoupSelectableHandle(row, index) {
+      console.log(row, index);
+      return true;
+    },
+    delQuan(row) {
+      const index = this.quansSelArr.findIndex((item) => item.id == row.id);
+      if (row.type == 2 && index != -1) {
+        this.quansSelArr.splice(index, 1);
+        this.quans.productCoupon[index].checked = false;
+      }
+      if (row.type == 1 && index != -1) {
         this.fullReductionCouponSel = { id: "" };
         this.quansSelArr.splice(0, 1);
       }
-      if (index != -1) {
-        const row = this.quansSelArr.find;
-      }
     },
     reset() {
       this.quansSelArr = [];
@@ -256,64 +323,12 @@ export default {
       this.$refs.table1.clearSelection();
     },
     filterFullReductionCoupon() {
-      this.quans.fullReductionCoupon = $originFullReductionCoupon.filter(
-        (v) => this.orderPrice - this.goodsDiscount >= v.fullAmount
+      this.quans.fullReductionCoupon = returnCanUseFullReductionCoupon(
+        $originFullReductionCoupon,
+        this.payPrice,
+        this.fullReductionCouponSel
       );
     },
-    productCouponChange(val) {
-      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 {
-        this.quansSelArr = [...val];
-      }
-    },
     fullReductionCouponClick(row) {
       if (row.id == this.fullReductionCouponSel.id) {
         this.fullReductionCouponSel = { id: "" };
@@ -330,30 +345,51 @@ export default {
       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);
+    productCouponClick(item) {
+      if (!item.use) {
+        return;
+      }
+      if (this.fullReductionCouponSel.id && !item.checked) {
+        const goodsQuan = this.quans.productCoupon.filter((v) => v.checked);
+        const fullReductionCoupon = this.fullReductionCouponSel.id
+          ? [this.fullReductionCouponSel]
+          : [];
+        let coupArr = [...goodsQuan, item];
+        const payPrice =
+          this.orderPrice -
+          returnCouponAllPrice(coupArr, canDikouGoodsArr, this.vipUser);
+        console.log(payPrice);
+        if (this.fullReductionCouponSel.fullAmount > payPrice) {
+          this.$confirm(
+            "选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券",
+            "提示",
+            {
+              confirmButtonText: "继续选择",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          )
+            .then(() => {
+              this.fullReductionCouponSel = {
+                id: "",
+              };
+            })
+            .catch(() => {});
+        }
+      }
+      item.checked = !item.checked;
+      const CheckedArr = this.quans.productCoupon.filter((v) => v.checked);
+      this.quansSelArr = [
+        ...(this.fullReductionCouponSel.id
+          ? [this.fullReductionCouponSel]
+          : []),
+        ...CheckedArr,
+      ];
+      const noCheckedArr = this.quans.productCoupon.filter((v) => !v.checked);
+      noCheckedArr.map((v) => {
+        v.use = returnCoupCanUse(canDikouGoodsArr, v, CheckedArr);
+      });
     },
     handleCurrentChange(val) {
       this.currentRow = val;
@@ -372,46 +408,44 @@ export default {
       this.$emit("confirm", [...this.quansSelArr]);
       this.close();
     },
-    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);
+      this.orderPrice=data.orderPrice;
+      this.quansSelArr = [...propSelCoup];
+      $goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
       if (data.memberId) {
         let quansRes = await $activateByOrderId({
           orderId: data.id,
           memberId: data.memberId,
         });
         quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
-          (v) => {
-            return this.orderPrice >= v.fullAmount && v.use;
-          }
+          (v) => v.use && this.orderPrice * 1 >= v.fullAmount * 1
         );
-        const canDikouGoodsArr = returnNewGoodsList(this.goodsArr|| [])
+        const selFullReductionCoupon = this.quansSelArr.find(
+          (v) => v.type == 1
+        );
+        this.fullReductionCouponSel = selFullReductionCoupon
+          ? selFullReductionCoupon
+          : { id: "" };
+        this.quans.fullReductionCoupon = quansRes.fullReductionCoupon;
+        canDikouGoodsArr = returnNewGoodsList(this.goodsArr || []);
         $originFullReductionCoupon = quansRes.fullReductionCoupon;
-        this.quans.productCoupon = quansRes.productCoupon.map(v=>{
-          const coup = returnProductCoupon(v, canDikouGoodsArr,this.vipUser)
-          return coup
-        }).filter(v=>v.use)
+        this.quans.productCoupon = quansRes.productCoupon
+          .map((v) => {
+            const calcCoup = returnProductCoupon(
+              v,
+              canDikouGoodsArr,
+              this.vipUser
+            );
+            return {
+              ...calcCoup,
+              checked: this.quansSelArr.find((selCoup) => selCoup.id == v.id)
+                ? true
+                : false,
+            };
+          })
+          .filter((v) => v.use);
         // this.quans = quans;
-        this.filterFullReductionCoupon();
-        this.quansSelArr = this.propSelCoup;
-        this.$nextTick(() => {
-          this.setSelectCoupon();
-        });
       }
 
       this.show = true;
@@ -428,6 +462,9 @@ export default {
 </script>
       
     <style  lang="scss" scoped>
+.line-th {
+  text-decoration: line-through;
+}
 .codeImg {
   width: 160px;
   border: 1px solid rgb(220, 223, 230);
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 21e4594..ff92a0a 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -962,16 +962,20 @@
                           {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                         </template>
                       </el-table-column>
-                      <el-table-column label="商品信息">
+                      <el-table-column label="商品信息" width="120">
                         <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 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>
@@ -1394,7 +1398,7 @@
     <quans-pop
       ref="refQuans"
       :vipUser="vipUser"
-      :orderPrice="currentPayMoney"
+      :orderPrice="yinFuJinE"
       :goodsArr="createOrder.data.detailList || []"
       @confirm="quansConfirm"
     >
@@ -1414,9 +1418,7 @@
     ></return-cart>
 
     <!-- 临时菜 -->
-    <cai-add ref="refPopAddCai"
-    
-    ></cai-add>
+    <cai-add ref="refPopAddCai"></cai-add>
   </div>
 </template>
   
@@ -1752,9 +1754,9 @@ export default {
     },
     yinFuJinE() {
       const total = this.currentPayMoney - (this.points.toMoney || 0);
-      if(this.isCreateOrder){
+      if (this.isCreateOrder) {
         return total.toFixed(2);
-      }else{
+      } else {
         return this.allPrice;
       }
     },
@@ -2033,6 +2035,9 @@ export default {
       // this.masterId = masterId;
       console.log("this.createOrder.data");
       console.log(this.createOrder.data);
+      if(this.createOrder.data.memberId==val){
+        return
+      }
       $setUser({
         tableId: this.table.tableId,
         masterId: this.masterId,
@@ -2223,6 +2228,7 @@ export default {
         {
           id: this.createOrder.data.id,
           memberId: this.createOrder.data.memberId || this.vipUser.id,
+          orderPrice:(this.yinFuJinE*1+this.coupdiscount*1).toFixed(2)
         },
         [...this.quansSelArr]
       );
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
new file mode 100644
index 0000000..ff5bd96
--- /dev/null
+++ b/src/views/tool/Instead/quan_util.js
@@ -0,0 +1,206 @@
+export function isTui(item) {
+	return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
+}
+//是否使用会员价
+export function isUseVipPrice(vipUser,goods){
+	return vipUser.id&&vipUser.isVip&&goods.isMember
+}
+
+//计算商品券优惠价格
+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 ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	return price * coup.num
+
+}
+//返回新的商品列表，过滤掉退菜的，退单的商品
+export function returnNewGoodsList(arr) {
+	let goodsMap = {}
+	return arr.filter(v => !isTui(v))
+}
+//根据当前购物车商品以及数量,已选券对应商品数量，判断该商品券是否可用
+export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
+	// if(!coup.use){
+	// 	return false
+	// }
+	const findGoods = goodsArr.filter(v => v.productId == coup.proId)
+	if (!findGoods.length) {
+		return false
+	}
+	const findGoodsTotalNumber = findGoods.reduce((prve, cur) => {
+		return prve + cur.num * 1
+	}, 0)
+	const selCoupNumber = selCoupArr.filter(v => v.proId == coup.proId).reduce((prve, cur) => {
+		return prve + cur.num * 1
+	}, 0)
+	if (selCoupNumber >= findGoodsTotalNumber) {
+		return false
+	}
+	return findGoodsTotalNumber < (coup.num + selCoupNumber) ? false : true
+}
+//查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
+export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
+	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 ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	const discountAmount = (price * coup.num).toFixed(2)
+	console.log(discountAmount);
+
+	const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+	// const canUse=discountAmount>0
+	return {
+		...coup,
+		discountAmount: discountAmount,
+		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 returnProductPayPrice(goods,vipUser){
+	const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
+	const price =  isUseVipPrice(vipUser,goods) ? memberPrice : goods.price;
+	return price
+}
+//返回商品券抵扣的商品价格
+export function returnProductCoupAllPrice(productPriceArr,startIndex,num){
+	return productPriceArr.slice(startIndex,startIndex+num).reduce((prve,cur)=>{
+		let curPrice=0
+		if(typeof cur==='object'){
+			curPrice=cur.memberPrice*1
+		}else{
+			curPrice=cur*1
+		}
+		return prve+curPrice
+	},0)
+}
+//返回同类商品券在同类商品价格数组里的开始位置
+export function returnProCoupStartIndex(coupArr,index){
+	return  coupArr.slice(0,index).reduce((prve,cur)=>{
+		return prve+cur.num*1 
+	},0)
+}
+//返回商品数量从0到n每一个对应的价格对照表
+export function returnGoodsPayPriceMap(goodsArr){
+	return goodsArr.reduce((prve,cur)=>{
+		if(!prve.hasOwnProperty(cur.productId)){
+			prve[cur.productId]=[]
+		}
+		const arr=new Array(cur.num).fill(cur).map(v=>{
+			return {
+				memberPrice:v.memberPrice?v.memberPrice:v.price,
+				price:v.price
+			}
+		})
+		prve[cur.productId].push(...arr)
+		return prve
+	},{})
+}
+//计算商品券总优惠价格
+export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
+	if (coupArr.length == 0) {
+		return 0;
+	}
+	//商品分组
+	const goodsMap={}
+	//商品数量从0到n每一个对应的价格
+	const goodsPayPriceMap={}
+	//商品券分组
+	let coupMap={}
+	for(let i in coupArr){
+		const coup=coupArr[i]
+		if(coupMap.hasOwnProperty(coup.proId)){
+			coupMap[coup.proId].push(coup)
+		}else{
+			coupMap[coup.proId]=[coup]
+		}
+	}
+	let total=0
+	for(let key in coupMap){
+		const arr=coupMap[key]
+		for(let i in arr){
+			const coup=arr[i]
+			if(!goodsMap.hasOwnProperty(coup.proId)){
+				goodsMap[coup.proId]=goodsArr.filter(v=>v.productId==coup.proId).map(v=>{
+					return {
+						...v,
+						payPrice:returnProductPayPrice(v,vipUser)
+					}
+				}).sort((a,b)=>{
+					const aPrice=a.payPrice
+					const bPrice=b.payPrice
+					return aPrice-bPrice
+				})
+				goodsPayPriceMap[coup.proId]=goodsMap[coup.proId].reduce((prve,cur)=>{
+					const arr=new Array(cur.num).fill(cur.payPrice)
+					console.log(arr);
+					 prve.push(...arr)
+					 return prve
+				},[])
+			}
+			const proCoupStartIndex=returnProCoupStartIndex(arr,i)
+			console.log(proCoupStartIndex);
+			total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num) 
+		}
+	}
+	
+	return total.toFixed(2);
+
+}
+//计算满减券总优惠价格
+export function returnFullReductionCouponAllPrice(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 = returnFullReductionCouponAllPrice(coupArr)
+	return (poductAllprice * 1 + pointAllPrice * 1).toFixed(2);
+}
+
+//返回当前满减券列表可用状态
+export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
+	return coupArr.map(v => {
+		if (v.id == selCoup.id) {
+			return v
+		}
+		const isfullAmount = payPrice >= v.fullAmount * 1
+		return {
+			...v,
+			use: v.use && isfullAmount
+		}
+	})
+}
\ No newline at end of file
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index 4869bd6..7d61c8a 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -131,7 +131,7 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
     }
     const memberPrice = item.memberPrice ? item.memberPrice : item.price;
     const price = item ? (vipUser.isVip ? memberPrice : item.price) : 0;
-    return price
+    return price*coup.num
 
 }
 //返回新的商品列表，过滤掉退菜的，退单的商品

From 910fd4b9ad6016df657379dfb480ce1fd5d8d902 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 19 Nov 2024 09:26:32 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E9=80=80=E8=8F=9C=E6=97=B6=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=9A=E8=A2=AB=E6=A0=87=E8=AF=86=E4=B8=BA?=
 =?UTF-8?q?=E5=AE=A2=E5=BA=A7=E8=B4=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/return-cart.vue |  2 +-
 src/views/tool/Instead/index.vue                  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/tool/Instead/components/return-cart.vue b/src/views/tool/Instead/components/return-cart.vue
index 9f9e667..f057392 100644
--- a/src/views/tool/Instead/components/return-cart.vue
+++ b/src/views/tool/Instead/components/return-cart.vue
@@ -115,7 +115,7 @@ export default {
       this.goods = item?item:this.goods;
       console.log(item)
       this.show = true;
-      if (item != "-999") {
+      if (item.productId != "-999") {
         this.number = 1;
       } else {
         this.number = item.num;
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index ff92a0a..12c1433 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1714,6 +1714,9 @@ export default {
   },
   computed: {
     isShowVipPrice() {
+      if(!this.shopInfo.isUseVip){
+        return false
+      }
       return this.vipUser.isVip ? true : false;
     },
     coupdiscount() {
@@ -3061,7 +3064,14 @@ export default {
         return;
       }
       if (key === "returnCart") {
-        const selGoods = this.order.old.list[this.order.old.selIndex];
+        console.log(this.order);
+        let selGoods=undefined
+        if(this.order.selPlaceNum==-10){
+          selGoods = {...this.order.seatFee,num:this.order.seatFee.number}
+        }else{
+          selGoods = this.order.old.list[this.order.selPlaceNum-1].info[this.order.old.selIndex];
+        }
+        console.log(selGoods);
         this.refToggle("refReturnCart", true, selGoods);
       }
     },

From db7c64fa8bf992ea36fd639138876010a0e1a58f Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 19 Nov 2024 10:09:49 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=E4=BC=9A=E5=91=98=E4=BB=B7=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue    | 2 +-
 src/views/tool/Instead/quan_util.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 12c1433..a442b02 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1714,7 +1714,7 @@ export default {
   },
   computed: {
     isShowVipPrice() {
-      if(!this.shopInfo.isUseVip){
+      if(!this.shopInfo.isMemberPrice){
         return false
       }
       return this.vipUser.isVip ? true : false;
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
index ff5bd96..5052034 100644
--- a/src/views/tool/Instead/quan_util.js
+++ b/src/views/tool/Instead/quan_util.js
@@ -2,7 +2,7 @@ export function isTui(item) {
 	return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
 }
 //是否使用会员价
-export function isUseVipPrice(vipUser,goods){
+export function isUseMemberPrice(vipUser,goods){
 	return vipUser.id&&vipUser.isVip&&goods.isMember
 }
 
@@ -13,7 +13,7 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
 		return 0
 	}
 	const memberPrice = item.memberPrice ? item.memberPrice : item.price;
-	const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
 	return price * coup.num
 
 }
@@ -54,7 +54,7 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
 		}
 	}
 	const memberPrice = item.memberPrice ? item.memberPrice : item.price;
-	const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
 	const discountAmount = (price * coup.num).toFixed(2)
 	console.log(discountAmount);
 
@@ -85,7 +85,7 @@ export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
 //返回商品实际支付价格
 export function returnProductPayPrice(goods,vipUser){
 	const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
-	const price =  isUseVipPrice(vipUser,goods) ? memberPrice : goods.price;
+	const price =  isUseMemberPrice(vipUser,goods) ? memberPrice : goods.price;
 	return price
 }
 //返回商品券抵扣的商品价格

From f393b91c2dd787bcd915d3675c3bcd6a708b6f51 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 19 Nov 2024 10:38:55 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=8A=B5=E6=89=A3=E5=88=B8=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index a442b02..eae9e76 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -964,7 +964,7 @@
                       </el-table-column>
                       <el-table-column label="商品信息" width="120">
                         <template v-slot="scope">
-                          <div class="u-flex">
+                          <div class="u-flex" v-if="scope.row.type == 2">
                             <div class="u-flex">
                               <el-image
                                 :src="scope.row.productCover"

From e0822677ffaf2e821eeefa41fa467a7bb7c177e2 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 19 Nov 2024 13:56:31 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=9F=BA=E6=9C=AC=E8=AE=BE=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/application/components/member_points/setting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/application/components/member_points/setting.vue b/src/views/application/components/member_points/setting.vue
index cad01f4..ad224ac 100644
--- a/src/views/application/components/member_points/setting.vue
+++ b/src/views/application/components/member_points/setting.vue
@@ -11,7 +11,7 @@
                         <el-radio label="vip">仅会员</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="费赠送积分" prop="consumeAmount">
+                <el-form-item label="消费赠送积分" prop="consumeAmount">
                     <el-input v-model="form.consumeAmount" style="width: 250px;"
                         @input="inputFilterInt($event, 'consumeAmount')">
                         <template slot="prepend">每消费</template>

From 315b3e536d9fa43232c3749dbcd72a2edc5b33b3 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 19 Nov 2024 15:09:43 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                          | 4 ++--
 src/views/application/components/invite_friend/share.vue | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 2a4f841..1db13cc 100644
--- a/.env.production
+++ b/.env.production
@@ -3,13 +3,13 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws
diff --git a/src/views/application/components/invite_friend/share.vue b/src/views/application/components/invite_friend/share.vue
index a46640c..fda968e 100644
--- a/src/views/application/components/invite_friend/share.vue
+++ b/src/views/application/components/invite_friend/share.vue
@@ -313,6 +313,7 @@ export default {
             width: 100%;
             height: 100%;
             display: block;
+            object-fit: cover;
         }
 
         .icon {
@@ -376,6 +377,8 @@ export default {
 
                 .title {
                     font-size: 12px;
+                    line-height: 16px;
+                    padding: 6px 0;
                 }
 
                 .btm {

From 07d072ce4c4cf7c7980e93e01129966a96cdf014 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 19 Nov 2024 15:21:20 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=88=87=E6=8D=A2=E4=BC=9A=E5=91=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index eae9e76..a9a1272 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1609,6 +1609,7 @@ export default {
         total: 0,
       },
       order: {
+        status:'',
         packFee: {
           totalNumber: 0,
           status: "",
@@ -2038,9 +2039,9 @@ export default {
       // this.masterId = masterId;
       console.log("this.createOrder.data");
       console.log(this.createOrder.data);
-      if(this.createOrder.data.memberId==val){
-        return
-      }
+     if(this.order.status=='finish'){
+      return 
+     }
       $setUser({
         tableId: this.table.tableId,
         masterId: this.masterId,
@@ -2053,6 +2054,8 @@ export default {
           this.getOrderData().then(() => {
             this.pointsValueChange(this.points.value);
           });
+        }else{
+          this.getCart()
         }
       });
     },
@@ -2834,6 +2837,7 @@ export default {
         title: "支付成功",
         type: "success",
       });
+      this.order.status='finish'
       this.close();
       //   this.reset();
     },

From d9c789da8f638b67609b98e45b3d58e8767f8491 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 15:55:31 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=8A=B5=E6=89=A3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/Instead/components/pay-type.vue      |  9 +++
 src/views/tool/Instead/components/quans.vue   | 79 ++++++++++++------
 src/views/tool/Instead/index.vue              | 80 +++++++++++++------
 src/views/tool/Instead/quan_util.js           | 41 ++++++++--
 4 files changed, 153 insertions(+), 56 deletions(-)

diff --git a/src/views/tool/Instead/components/pay-type.vue b/src/views/tool/Instead/components/pay-type.vue
index f5f672d..884fd53 100644
--- a/src/views/tool/Instead/components/pay-type.vue
+++ b/src/views/tool/Instead/components/pay-type.vue
@@ -10,6 +10,7 @@
             v-for="(item, index) in list"
             :key="index"
             :type="sel === item.payType ? 'primary' : ''"
+            :disabled="disabledPayType.includes(item.payType)"
           >
             {{ item.payName }}
           </el-button>
@@ -30,6 +31,10 @@ export default {
       type: [String, Number],
       default: '',
     },
+    disabledPayType:{
+      type:Array,
+      default:()=>[]
+    }
   },
   data() {
     return {
@@ -38,6 +43,10 @@ export default {
     };
   },
   watch: {
+    disabledPayType(){
+      const item = this.list.find(v=>!this.disabledPayType.includes(v.payType))
+      this.sel=item.payType
+    },
     sel(newval) {
       console.log(newval);
       this.$emit("input", newval);
diff --git a/src/views/tool/Instead/components/quans.vue b/src/views/tool/Instead/components/quans.vue
index 2de1167..7540356 100644
--- a/src/views/tool/Instead/components/quans.vue
+++ b/src/views/tool/Instead/components/quans.vue
@@ -16,11 +16,7 @@
               :data="quans.fullReductionCoupon"
               @cell-click="fullReductionCouponClick"
             >
-              <el-table-column
-                type="index"
-                label=""
-                v-if="quans.fullReductionCoupon.length > 0"
-              >
+              <el-table-column type="index" label="">
                 <template v-slot="scope">
                   <el-checkbox
                     @change="fullReductionCouponClick(scope.row)"
@@ -65,10 +61,7 @@
               :data="quans.productCoupon"
               style="width: 100%"
             >
-              <el-table-column
-                label=""
-                v-if="quans.fullReductionCoupon.length > 0"
-              >
+              <el-table-column>
                 <template v-slot="scope">
                   <el-checkbox
                     @change="productCouponClick(scope.row)"
@@ -112,11 +105,11 @@
               </el-table-column>
               <el-table-column prop="useRestrictions" label="描述">
               </el-table-column>
-              <el-table-column prop="useRestrictions" label="是否可用">
+              <!-- <el-table-column prop="useRestrictions" label="是否可用">
                 <template v-slot="scope">
                   {{ scope.row.use ? "可以" : "不可用" }}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </el-tab-pane>
         </el-tabs>
@@ -232,11 +225,11 @@ export default {
           isVip: false,
         };
       },
-    }
+    },
   },
   data() {
     return {
-      orderPrice:0,
+      orderPrice: 0,
       fullReductionCouponSel: {
         id: "",
       },
@@ -297,7 +290,7 @@ export default {
           $goodsPayPriceMap[row.proId],
           index,
           row.num
-        );
+        ).toFixed(2);
       } else {
         return 0;
       }
@@ -310,7 +303,8 @@ export default {
       const index = this.quansSelArr.findIndex((item) => item.id == row.id);
       if (row.type == 2 && index != -1) {
         this.quansSelArr.splice(index, 1);
-        this.quans.productCoupon[index].checked = false;
+        const proIndex=this.quans.productCoupon.findIndex((v) => v.id == row.id);
+        this.quans.productCoupon[proIndex].checked = false;
       }
       if (row.type == 1 && index != -1) {
         this.fullReductionCouponSel = { id: "" };
@@ -350,16 +344,44 @@ export default {
       if (!item.use) {
         return;
       }
+      const hasSelNum = this.quansSelArr
+        .filter((v) => v.type == 2 && v.proId == item.proId)
+        .reduce((a, b) => {
+          return a + b.num;
+        }, 0);
+      const maxSelNum = $goodsPayPriceMap[item.proId].length;
+      const coupMaxUseNum = Math.min(item.num, maxSelNum - hasSelNum);
+      const canUseNum = Math.min(maxSelNum, coupMaxUseNum);
+
       if (this.fullReductionCouponSel.id && !item.checked) {
         const goodsQuan = this.quans.productCoupon.filter((v) => v.checked);
         const fullReductionCoupon = this.fullReductionCouponSel.id
           ? [this.fullReductionCouponSel]
           : [];
-        let coupArr = [...goodsQuan, item];
+
+        let coupArr = [...goodsQuan, { ...item, num: canUseNum }];
         const payPrice =
           this.orderPrice -
           returnCouponAllPrice(coupArr, canDikouGoodsArr, this.vipUser);
         console.log(payPrice);
+        if (payPrice <= 0) {
+          return this.$confirm(
+            "选择该商品券后支付金额将为0，继续选择将取消选择的满减券",
+            "提示",
+            {
+              confirmButtonText: "继续选择",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          )
+            .then(() => {
+              this.fullReductionCouponSel = {
+                id: "",
+              };
+              this.quansSelArr.splice(0, 1);
+            })
+            .catch(() => {});
+        }
         if (this.fullReductionCouponSel.fullAmount > payPrice) {
           this.$confirm(
             "选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券",
@@ -379,13 +401,19 @@ export default {
         }
       }
       item.checked = !item.checked;
+      if (!item.checked) {
+        console.log(index);
+        const index = this.quansSelArr.findIndex((v) => v.id == item.id);
+        this.quansSelArr.splice(index, 1);
+      } else {
+        this.quansSelArr.push({ ...item, num: canUseNum });
+      }
       const CheckedArr = this.quans.productCoupon.filter((v) => v.checked);
-      this.quansSelArr = [
-        ...(this.fullReductionCouponSel.id
-          ? [this.fullReductionCouponSel]
-          : []),
-        ...CheckedArr,
-      ];
+      if (CheckedArr.length <= 0) {
+        return this.quans.productCoupon.map((v) => {
+          v.use = true;
+        });
+      }
       const noCheckedArr = this.quans.productCoupon.filter((v) => !v.checked);
       noCheckedArr.map((v) => {
         v.use = returnCoupCanUse(canDikouGoodsArr, v, CheckedArr);
@@ -405,12 +433,12 @@ export default {
     },
 
     confirm() {
-      this.$emit("confirm", [...this.quansSelArr]);
+      this.$emit("confirm", [...this.quansSelArr], $goodsPayPriceMap);
       this.close();
     },
     async open(data, propSelCoup) {
       console.log(data);
-      this.orderPrice=data.orderPrice;
+      this.orderPrice = data.orderPrice;
       this.quansSelArr = [...propSelCoup];
       $goodsPayPriceMap = returnGoodsPayPriceMap(this.goodsArr || []);
       if (data.memberId) {
@@ -419,7 +447,7 @@ export default {
           memberId: data.memberId,
         });
         quansRes.fullReductionCoupon = quansRes.fullReductionCoupon.filter(
-          (v) => v.use && this.orderPrice * 1 >= v.fullAmount * 1
+          (v) =>this.orderPrice<=0?false:(v.use && this.orderPrice * 1 >= v.fullAmount * 1)  
         );
         const selFullReductionCoupon = this.quansSelArr.find(
           (v) => v.type == 1
@@ -442,6 +470,7 @@ export default {
               checked: this.quansSelArr.find((selCoup) => selCoup.id == v.id)
                 ? true
                 : false,
+                use:this.orderPrice<=0?false:calcCoup.use
             };
           })
           .filter((v) => v.use);
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index a9a1272..d721fa9 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -982,9 +982,14 @@
                       </el-table-column>
                       <el-table-column prop="discountAmount" label="抵扣">
                         <template v-slot="scope">
-                          <span class="color-red">
+                          <span class="color-red" v-if="scope.row.type == 1">
                             ￥{{ scope.row.discountAmount }}
                           </span>
+                          <span class="color-red" v-if="scope.row.type == 2">
+                            ￥{{
+                              returnProDiscount(scope.row, scope.row.index)
+                            }}
+                          </span>
                         </template>
                       </el-table-column>
                       <el-table-column prop="useRestrictions" label="">
@@ -1011,6 +1016,7 @@
                   ref="refPayType"
                   v-model="order.payType"
                   @itemClick="payTypeItemClick"
+                  :disabledPayType="disabledPayType"
                 >
                 </pay-type>
                 <div style="margin-top: 20px">
@@ -1094,13 +1100,7 @@
                   </div>
                   <div class="detail_form_item">
                     <div class="left">应付金额</div>
-                    <div class="right redfont">
-                      ￥{{
-                        currentPayMoney - points.toMoney <= 0
-                          ? 0
-                          : (currentPayMoney - points.toMoney) | to2
-                      }}
-                    </div>
+                    <div class="right redfont">￥{{ yinFuJinE }}</div>
                   </div>
                   <div class="line"></div>
                 </div>
@@ -1481,6 +1481,11 @@ import {
   returnVipDiscountPrice,
   returnCouponAllPrice,
 } from "./util.js";
+import {
+  returnProductCoupAllPrice
+} from "./quan_util.js";
+//商品数量从0到n每一个对应的价格
+let $goodsPayPriceMap = {};
 import { $status } from "@/utils/table.js";
 
 let $originTableList = [];
@@ -1501,6 +1506,7 @@ export default {
   },
   data() {
     return {
+      disabledPayType: [],
       //积分抵扣
       points: {
         res: {
@@ -1609,7 +1615,7 @@ export default {
         total: 0,
       },
       order: {
-        status:'',
+        status: "",
         packFee: {
           totalNumber: 0,
           status: "",
@@ -1715,8 +1721,8 @@ export default {
   },
   computed: {
     isShowVipPrice() {
-      if(!this.shopInfo.isMemberPrice){
-        return false
+      if (!this.shopInfo.isMemberPrice) {
+        return false;
       }
       return this.vipUser.isVip ? true : false;
     },
@@ -1972,6 +1978,13 @@ export default {
     },
   },
   watch: {
+    yinFuJinE: function (newval) {
+      if (newval <= 0) {
+        this.disabledPayType = ["scanCode", "deposit"];
+      } else {
+        this.disabledPayType = [];
+      }
+    },
     "goods.query.categoryId": function (newval) {
       this.goods.query.page = 1;
       this.goods.list = [];
@@ -2039,9 +2052,9 @@ export default {
       // this.masterId = masterId;
       console.log("this.createOrder.data");
       console.log(this.createOrder.data);
-     if(this.order.status=='finish'){
-      return 
-     }
+      if (this.order.status == "finish") {
+        return;
+      }
       $setUser({
         tableId: this.table.tableId,
         masterId: this.masterId,
@@ -2054,8 +2067,8 @@ export default {
           this.getOrderData().then(() => {
             this.pointsValueChange(this.points.value);
           });
-        }else{
-          this.getCart()
+        } else {
+          this.getCart();
         }
       });
     },
@@ -2174,6 +2187,21 @@ export default {
     this.open(this.$route.query);
   },
   methods: {
+    returnProDiscount(row) {
+      console.log(row);
+      //相同商品抵扣券数组
+      const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
+      const index = arr.findIndex((v) => v.id == row.id);
+      if (index != -1) {
+        return returnProductCoupAllPrice(
+          $goodsPayPriceMap[row.proId],
+          index,
+          row.num
+        ).toFixed(2);
+      } else {
+        return 0;
+      }
+    },
     lingshicaiShow() {
       this.$refs.refPopAddCai.open();
     },
@@ -2234,14 +2262,15 @@ export default {
         {
           id: this.createOrder.data.id,
           memberId: this.createOrder.data.memberId || this.vipUser.id,
-          orderPrice:(this.yinFuJinE*1+this.coupdiscount*1).toFixed(2)
+          orderPrice: (this.yinFuJinE * 1 + this.coupdiscount * 1).toFixed(2),
         },
         [...this.quansSelArr]
       );
     },
-    quansConfirm(e) {
+    quansConfirm(e,goodsPayPriceMap) {
       console.log(e);
       this.quansSelArr = [...e];
+      $goodsPayPriceMap=goodsPayPriceMap
     },
     searchInput(e) {
       console.log(e);
@@ -2837,7 +2866,7 @@ export default {
         title: "支付成功",
         type: "success",
       });
-      this.order.status='finish'
+      this.order.status = "finish";
       this.close();
       //   this.reset();
     },
@@ -3069,11 +3098,14 @@ export default {
       }
       if (key === "returnCart") {
         console.log(this.order);
-        let selGoods=undefined
-        if(this.order.selPlaceNum==-10){
-          selGoods = {...this.order.seatFee,num:this.order.seatFee.number}
-        }else{
-          selGoods = this.order.old.list[this.order.selPlaceNum-1].info[this.order.old.selIndex];
+        let selGoods = undefined;
+        if (this.order.selPlaceNum == -10) {
+          selGoods = { ...this.order.seatFee, num: this.order.seatFee.number };
+        } else {
+          selGoods =
+            this.order.old.list[this.order.selPlaceNum - 1].info[
+              this.order.old.selIndex
+            ];
         }
         console.log(selGoods);
         this.refToggle("refReturnCart", true, selGoods);
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
index 5052034..78360d7 100644
--- a/src/views/tool/Instead/quan_util.js
+++ b/src/views/tool/Instead/quan_util.js
@@ -2,7 +2,7 @@ export function isTui(item) {
 	return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
 }
 //是否使用会员价
-export function isUseMemberPrice(vipUser,goods){
+export function isUseVipPrice(vipUser,goods){
 	return vipUser.id&&vipUser.isVip&&goods.isMember
 }
 
@@ -13,7 +13,7 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
 		return 0
 	}
 	const memberPrice = item.memberPrice ? item.memberPrice : item.price;
-	const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
 	return price * coup.num
 
 }
@@ -40,7 +40,8 @@ export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
 	if (selCoupNumber >= findGoodsTotalNumber) {
 		return false
 	}
-	return findGoodsTotalNumber < (coup.num + selCoupNumber) ? false : true
+	console.log(selCoupNumber,findGoodsTotalNumber);
+	return findGoodsTotalNumber < selCoupNumber ? false : true
 }
 //查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
 export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
@@ -54,12 +55,13 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
 		}
 	}
 	const memberPrice = item.memberPrice ? item.memberPrice : item.price;
-	const price = item ? (isUseMemberPrice(vipUser,item) ? memberPrice : item.price) : 0;
+	const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
 	const discountAmount = (price * coup.num).toFixed(2)
 	console.log(discountAmount);
 
-	const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+	// const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
 	// const canUse=discountAmount>0
+	const canUse=coup.use
 	return {
 		...coup,
 		discountAmount: discountAmount,
@@ -85,7 +87,7 @@ export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
 //返回商品实际支付价格
 export function returnProductPayPrice(goods,vipUser){
 	const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
-	const price =  isUseMemberPrice(vipUser,goods) ? memberPrice : goods.price;
+	const price =  isUseVipPrice(vipUser,goods) ? memberPrice : goods.price;
 	return price
 }
 //返回商品券抵扣的商品价格
@@ -100,6 +102,23 @@ export function returnProductCoupAllPrice(productPriceArr,startIndex,num){
 		return prve+curPrice
 	},0)
 }
+
+//返回商品券可抵扣的商品数量
+export function returnProductCanUseNum(productPriceArr,startIndex,num){
+	console.log(productPriceArr);
+	console.log(num);
+	let n=0;
+	for(let i=0;i<num;i++){
+		if(productPriceArr[startIndex*1+i]){
+			n+=1
+			console.log(n);
+		}else{
+			break
+		}
+	}
+	return  n 
+}
+
 //返回同类商品券在同类商品价格数组里的开始位置
 export function returnProCoupStartIndex(coupArr,index){
 	return  coupArr.slice(0,index).reduce((prve,cur)=>{
@@ -166,7 +185,9 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
 			}
 			const proCoupStartIndex=returnProCoupStartIndex(arr,i)
 			console.log(proCoupStartIndex);
-			total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num) 
+			const coupNum=Math.min(goodsPayPriceMap[coup.proId].length,coup.num)
+			console.log(coupNum);
+			total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum) 
 		}
 	}
 	
@@ -198,6 +219,12 @@ export function returnCanUseFullReductionCoupon(coupArr, payPrice, selCoup) {
 			return v
 		}
 		const isfullAmount = payPrice >= v.fullAmount * 1
+		if(payPrice<=0){
+			return {
+				...v,
+				use: false
+			}
+		}
 		return {
 			...v,
 			use: v.use && isfullAmount

From 7ff8632af9af5a85c22adfafdf8ac291326e1294 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:09:44 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=BA=E5=88=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index d721fa9..457e69a 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1481,9 +1481,7 @@ import {
   returnVipDiscountPrice,
   returnCouponAllPrice,
 } from "./util.js";
-import {
-  returnProductCoupAllPrice
-} from "./quan_util.js";
+import { returnProductCoupAllPrice } from "./quan_util.js";
 //商品数量从0到n每一个对应的价格
 let $goodsPayPriceMap = {};
 import { $status } from "@/utils/table.js";
@@ -2267,10 +2265,10 @@ export default {
         [...this.quansSelArr]
       );
     },
-    quansConfirm(e,goodsPayPriceMap) {
+    quansConfirm(e, goodsPayPriceMap) {
       console.log(e);
       this.quansSelArr = [...e];
-      $goodsPayPriceMap=goodsPayPriceMap
+      $goodsPayPriceMap = goodsPayPriceMap;
     },
     searchInput(e) {
       console.log(e);
@@ -3574,6 +3572,7 @@ export default {
     },
     reset() {
       // this.goods.list = [];
+      this.order.status = "";
       this.loading = false;
       this.table = "";
       this.order.list = [];
@@ -3947,7 +3946,6 @@ export default {
         this.$router.replace({ path: "/tool/table_list" });
       } else {
         this.$router.replace({ path: "/tool/Instead/index" });
-        this.$router.go(0);
         // this.reset();
         // this.$router.replace({ path: "/tool/Instead/index" });
       }

From c7283a493c9e5de0dd159c911a671f66e21c4b04 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:36:32 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B4=E5=8D=95?=
 =?UTF-8?q?=E6=94=B9=E4=BB=B7=E6=97=B6=E4=BB=B7=E6=A0=BC=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
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, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 457e69a..7510105 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1757,11 +1757,12 @@ export default {
       const amount = this.createOrder.data.amount || 0;
       const discount = this.createOrder.discount || 1;
       // const total=((amount - this.coupdiscount) * this.createOrder.discount - this.points.toMoney)
-      const total = (amount - this.coupdiscount) * this.createOrder.discount;
+      const total = (amount) * this.createOrder.discount - this.coupdiscount;
       return total <= 0 ? 0 : total;
     },
     yinFuJinE() {
       const total = this.currentPayMoney - (this.points.toMoney || 0);
+      console.log(total)
       if (this.isCreateOrder) {
         return total.toFixed(2);
       } else {
@@ -2676,7 +2677,7 @@ export default {
       if (!canDiscount) {
         return;
       }
-      const amount = this.createOrder.data.amount - this.coupdiscount;
+      const amount = this.createOrder.data.amount;
       this.refToggle("refDiscount", true, {
         amount,
         discount: this.createOrder.discount * 100,

From d9cf881b62b09ceaa41c7b854191426209a40aea Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 16:54:43 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=89=93=E6=8A=98=E5=BC=B9=E7=AA=97=E5=BA=94=E4=BB=98=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E6=96=87=E5=AD=97=E6=94=B9=E4=B8=BA=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/discount.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tool/Instead/components/discount.vue b/src/views/tool/Instead/components/discount.vue
index b3a2f56..b281a44 100644
--- a/src/views/tool/Instead/components/discount.vue
+++ b/src/views/tool/Instead/components/discount.vue
@@ -3,7 +3,7 @@
     <div class="u-p-15">
       <div class="u-m-t-20">
         <el-form label-width="90px" label-position="left">
-          <el-form-item label="应付金额">
+          <el-form-item label="总价">
             <div class="color-red u-font-18 font-600">￥{{ form.money }}</div>
             <!-- <el-input :value="form.money" disabled> </el-input> -->
           </el-form-item>