diff --git a/src/api/account/common.ts b/src/api/account/common.ts
index babf297..4aaca6f 100644
--- a/src/api/account/common.ts
+++ b/src/api/account/common.ts
@@ -55,11 +55,11 @@ const CommonApi = {
   /**
    * 发送验证码
    */
-  sms(data: smsRequest) {
+  sms(params: smsRequest) {
     return request<any, smsResponse>({
       url: `${baseURL}/sms`,
-      method: "post",
-      data: data,
+      method: "get",
+      params
     });
   },
 };
diff --git a/src/api/account/coupon.ts b/src/api/account/coupon.ts
index 410dcde..23bd466 100644
--- a/src/api/account/coupon.ts
+++ b/src/api/account/coupon.ts
@@ -32,9 +32,24 @@ const API = {
       data: data,
     });
   },
+  // 查找优惠券 生成订单后使用
+  findCoupon(params: findCouponRequest) {
+    return request<any>({
+      url: `${baseURL}/findCoupon`,
+      method: "get",
+      params
+    });
+  },
 }
 export default API;
-
+export interface findCouponRequest {
+  /**
+   * 店铺用户Id
+   */
+  shopUserId: number;
+  type?: number;
+  [property: string]: any;
+}
 export interface queryReceive {
   /**
    * 优惠券id
diff --git a/src/api/order/credit.ts b/src/api/order/credit.ts
new file mode 100644
index 0000000..2be67ab
--- /dev/null
+++ b/src/api/order/credit.ts
@@ -0,0 +1,52 @@
+import request from "@/utils/request";
+import { Order_BaseUrl } from "@/api/config";
+const baseURL = Order_BaseUrl + "/admin/order/credit/buyer";
+const Api = {
+  getList(params: any) {
+    return request<any, any>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params
+    });
+  },
+  get(params: any) {
+    return request<any, any>({
+      url: `${baseURL}`,
+      method: "get",
+      params
+    });
+  },
+  add(data: any) {
+    return request<any, any>({
+      url: `${baseURL}`,
+      method: "post",
+      data
+    });
+  },
+  edit(data: any) {
+    return request<any, any>({
+      url: `${baseURL}`,
+      method: "put",
+      data
+    });
+  },
+
+  delete(id: string | number) {
+    return request<any, any>({
+      url: `${baseURL}/` + id,
+      method: "delete",
+    });
+  },
+  // 还款
+
+  repayment(data: any) {
+    return request<any, any>({
+      url: `${baseURL}/repayment`,
+      method: "post",
+      data
+    });
+  },
+};
+
+export default Api;
+
diff --git a/src/router/index.ts b/src/router/index.ts
index be7b8b7..f392696 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -66,7 +66,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       {
         path: "credit",
         name: "creditStatistics",
-        component: () => import("@/views/data/credit.vue"),
+        component: () => import("@/views/data/credit/index.vue"),
         meta: {
           title: "挂账管理",
           affix: false,
diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index 006e9d8..4245091 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -18,7 +18,7 @@ export const useCartsStore = defineStore("carts", () => {
 
   //是否启用会员价
   const useVipPrice = computed(() => {
-    return shopUser.userInfo.isMemberPrice && vipUser.value.id && vipUser.value.isVip
+    return (shopUser.userInfo.isMemberPrice && vipUser.value.id && vipUser.value.isVip) ? true : false
   })
 
   //台桌id
@@ -380,7 +380,6 @@ export const useCartsStore = defineStore("carts", () => {
     for (let i in data) {
       newData[i] = data[i].map((v: any) => {
         const skuData = getProductDetails({ product_id: v.productId, sku_id: v.skuId })
-        console.log(v)
         return {
           ...skuData,
           placeNum: v.placeNum,
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 71ca7d8..c0272cc 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -38,7 +38,7 @@ class WebSocketManager {
   private reconnectAttempts = 0;
   private maxReconnectAttempts = 3; // 自定义最大重试次数
   private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
-
+  private timer: any | null = null;
   // 初始化 WebSocket 客户端
   setupWebSocket() {
     const endpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
@@ -60,8 +60,13 @@ class WebSocketManager {
       console.log("WebSocket 连接已建立");
       // ElNotification.success('WebSocket 连接已建立')
       this.sendMessage(this.initParams)
+      clearTimeout(this.timer)
+      this.timer = setInterval(() => {
+        this.sendMessage({ "type": "ping_interval" })
+      }, 1000 * 10);
     };
     this.client.onclose = () => {
+      clearTimeout(this.timer)
       if (!this.connected) {
         // ElMessageBox.alert('WebSocket 连接已断开', 'Title', {
         //   confirmButtonText: '立即重连',
@@ -74,6 +79,7 @@ class WebSocketManager {
       console.log("WebSocket 连接已断开");
     };
     this.client.onerror = (error) => {
+      clearTimeout(this.timer)
       console.error("WebSocket 发生错误:", error);
       // ElNotification({
       //   title: "提示",
diff --git a/src/views/application/marketing/coupon/components/add.vue b/src/views/application/marketing/coupon/components/add.vue
index 445aabd..4af1490 100644
--- a/src/views/application/marketing/coupon/components/add.vue
+++ b/src/views/application/marketing/coupon/components/add.vue
@@ -295,7 +295,25 @@ export default {
   methods: {
     reset() {
       this.$refs.form.resetFields();
-      this.form = this.resetForm;
+      this.form = {
+        id: "",
+        shopId: "",
+        type: "1",
+        title: "",
+        fullAmount: null,
+        discountAmount: null,
+        validityType: "fixed",
+        validStartTime: "",
+        validEndTime: "",
+        userDays: [],
+        validDays: "",
+        useTimeType: "all",
+        useStartTime: "",
+        useEndTime: "",
+        proId: "",
+        proName: "",
+        number: "",
+      };
       this.form.type = 1;
     },
     async open(data) {
diff --git a/src/views/data/credit.vue b/src/views/data/credit.vue
deleted file mode 100644
index e5e6a79..0000000
--- a/src/views/data/credit.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div></div>
-</template>
\ No newline at end of file
diff --git a/src/views/data/credit/config/add.ts b/src/views/data/credit/config/add.ts
new file mode 100644
index 0000000..5dee9c9
--- /dev/null
+++ b/src/views/data/credit/config/add.ts
@@ -0,0 +1,80 @@
+import creditApi from "@/api/order/credit";
+import { returnOptions } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "创建挂账人",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return creditApi.add({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "状态",
+      prop: "status",
+      type: 'switch',
+      attrs: {
+        activeText: '开启',
+        inactiveText: '关闭',
+        activeValue: 1,
+        inactiveValue: 0
+      },
+      initialValue: 1
+    },
+
+    {
+      label: "挂账人",
+      prop: "debtor",
+      rules: [{ required: true, message: "请输入挂账人", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人",
+      },
+    },
+    {
+      label: "手机号",
+      prop: "mobile",
+      rules: [{ required: true, message: "请输入挂账人手机号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人手机号",
+      },
+    },
+    {
+      label: "职务",
+      prop: "position",
+      rules: [{ required: false, message: "请输入挂账人职务", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人职务",
+      },
+    },
+    {
+      label: "挂账额度",
+      prop: "creditAmount",
+      type: "input-number",
+      rules: [{ required: true, message: "请输入挂账额度", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账额度",
+      },
+      initialValue: 0
+    },
+    {
+      label: "还款方式",
+      prop: "repaymentMethod",
+      type: "radio-button",
+      options: returnOptions('repaymentMethod'),
+      initialValue: returnOptions('repaymentMethod')[0].value
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/data/credit/config/config.ts b/src/views/data/credit/config/config.ts
new file mode 100644
index 0000000..eacaf63
--- /dev/null
+++ b/src/views/data/credit/config/config.ts
@@ -0,0 +1,26 @@
+
+const options: Record<string, { label: string; value: string; }[]> = {
+  repaymentMethod: [
+    { label: '按总金额还款', value: "total" },
+    { label: '按订单还款', value: "order" },
+  ]
+};
+
+export function returnOptions(type: keyof typeof options) {
+  return options[type];
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}
+
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}
diff --git a/src/views/data/credit/config/content.ts b/src/views/data/credit/config/content.ts
new file mode 100644
index 0000000..93af92e
--- /dev/null
+++ b/src/views/data/credit/config/content.ts
@@ -0,0 +1,102 @@
+import creditApi from "@/api/order/credit";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexAction: function (params) {
+    return creditApi.getList(params);
+  },
+  deleteAction: creditApi.delete,
+  // modifyAction: function (data) {
+  //   // return creditApi.edit(data);
+  // },
+  pk: "id",
+  toolbar: ["add"],
+  defaultToolbar: ["refresh", "filter", "search"],
+  cols: [
+    {
+      label: "挂账编码",
+      align: "center",
+      prop: "id",
+    },
+    {
+      label: "状态",
+      align: "center",
+      prop: "status",
+      templet: 'custom',
+      slotName: 'status',
+      width: 120,
+    },
+    {
+      label: "挂账人",
+      align: "center",
+      prop: "debtor",
+    },
+    {
+      label: "手机号",
+      align: "center",
+      prop: "mobile",
+    },
+    {
+      label: "挂账额度（元）",
+      align: "center",
+      prop: "creditAmount",
+    },
+    {
+      label: "已挂账金额（元）",
+      align: "center",
+      prop: "owedAmount",
+    },
+    {
+      label: "剩余挂账额度（元）",
+      align: "center",
+      prop: "owedAmount",
+    },
+    {
+      label: "账户余额",
+      align: "center",
+      prop: "accountBalance",
+    },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 300,
+      templet: "tool",
+      operat: [
+        {
+          text: "查看明细",
+          name: 'detail'
+        },
+        {
+          text: "编辑",
+          name: 'edit'
+        },
+        {
+          text: "还款",
+          name: 'huankuan'
+        },
+        {
+          text: "还款记录",
+          name: 'huankuan_detail'
+        },
+        {
+          text: "删除",
+          name: 'delete'
+        },
+      ],
+    },
+  ],
+};
+
+export default contentConfig;
diff --git a/src/views/data/credit/config/edit.ts b/src/views/data/credit/config/edit.ts
new file mode 100644
index 0000000..e1f6bb0
--- /dev/null
+++ b/src/views/data/credit/config/edit.ts
@@ -0,0 +1,80 @@
+import creditApi from "@/api/order/credit";
+import { returnOptions } from "./config";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig = {
+  pageName: "sys:user",
+  dialog: {
+    title: "编辑挂账人",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return creditApi.edit({ ...data });
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "状态",
+      prop: "status",
+      type: 'switch',
+      attrs: {
+        activeText: '开启',
+        inactiveText: '关闭',
+        activeValue: 1,
+        inactiveValue: 0
+      },
+      initialValue: 1
+    },
+
+    {
+      label: "挂账人",
+      prop: "debtor",
+      rules: [{ required: true, message: "请输入挂账人", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人",
+      },
+    },
+    {
+      label: "手机号",
+      prop: "mobile",
+      rules: [{ required: true, message: "请输入挂账人手机号", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人手机号",
+      },
+    },
+    {
+      label: "职务",
+      prop: "position",
+      rules: [{ required: false, message: "请输入挂账人职务", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账人职务",
+      },
+    },
+    {
+      label: "挂账额度",
+      prop: "creditAmount",
+      type: "input-number",
+      rules: [{ required: true, message: "请输入挂账额度", trigger: "blur" }],
+      attrs: {
+        placeholder: "请输入挂账额度",
+      },
+      initialValue: 0
+    },
+    {
+      label: "还款方式",
+      prop: "repaymentMethod",
+      type: "radio-button",
+      options: returnOptions('repaymentMethod'),
+      initialValue: returnOptions('repaymentMethod')[0].value
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/data/credit/config/search.ts b/src/views/data/credit/config/search.ts
new file mode 100644
index 0000000..2d6533d
--- /dev/null
+++ b/src/views/data/credit/config/search.ts
@@ -0,0 +1,39 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  formItems: [
+    {
+      type: "input",
+      label: "挂账人",
+      prop: "keywords",
+      attrs: {
+        placeholder: "请输入挂账人或手机号",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+    {
+      type: "select",
+      label: "还款状态",
+      prop: "repaymentStatus",
+      attrs: {
+        placeholder: "请选择还款状态",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      initialValue: '',
+      options: [
+        { label: "未还款", value: 'unpaid' },
+        { label: "部分还款", value: 'partial' },
+        { label: "已还清", value: 'paid' },
+      ],
+    },
+  ],
+};
+
+export default searchConfig;
diff --git a/src/views/data/credit/index.vue b/src/views/data/credit/index.vue
new file mode 100644
index 0000000..6743c61
--- /dev/null
+++ b/src/views/data/credit/index.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <template #status="scope">
+        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+        </el-tag>
+      </template>
+      <template #options="scope">
+        {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
+      </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal
+      ref="addModalRef"
+      @form-data-change="handleFormDataChange"
+      :modal-config="addModalConfig"
+      @submit-click="handleSubmitClick"
+    >
+      <template #formFooter>
+        <el-form-item label="" label-width="140">
+          <p>一经创建无法更改还款方式</p>
+        </el-form-item>
+      </template>
+    </page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import creditApi from "@/api/order/credit";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import searchConfig from "./config/search";
+import { returnOptionsLabel } from "./config/config";
+
+let version = ref<string | number>("");
+function handleFormDataChange(type: string, value: string | number) {
+  version.value = value;
+  if (type === "version" && value !== "") {
+    addModalConfig.formItems[5].hidden = false;
+    return;
+  }
+  if (type === "version" && value == "") {
+    addModalConfig.formItems[5].hidden = true;
+  }
+}
+
+const refVersionFile = ref<any>();
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // addModalConfig.formItems[2]!.attrs!.data =
+}
+// 编辑
+async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  // const data = await creditApi.getFormData(row.id);
+  console.log({ ...row });
+  editModalRef.value?.setFormData({ ...row, url: [row.url] });
+}
+1;
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+// 其他操作列
+async function handleOperatClick(data: IOperatData) {
+  console.log(data);
+}
+</script>
diff --git a/src/views/online-shop/index.vue b/src/views/online-shop/index.vue
index db64e76..f99c749 100644
--- a/src/views/online-shop/index.vue
+++ b/src/views/online-shop/index.vue
@@ -14,7 +14,7 @@
     <div class="form">
       <div class="preview_wrap">
         <div class="phone_wrap">
-          <div class="index_bg" v-if="tableActive == 'home'">
+          <div class="index_bg" v-if="tableActive == 'index_bg'">
             <img class="bg" :src="selectItem.value" />
             <div class="menu_wrap">
               <div class="menu_wrap_div">
@@ -232,7 +232,7 @@ import shopExtendApi from "@/api/account/shopExtend";
 export default {
   data() {
     return {
-      tableActive: "home",
+      tableActive: "",
       tableData: [],
       selectItem: {},
       imageUrl: "",
@@ -269,7 +269,7 @@ export default {
       try {
         let res = await shopExtendApi.get({});
         this.tableData = res;
-        console.log(this.tableData[0]);
+        this.tableActive = res[0].autoKey;
         this.selectItemChange(this.tableActive);
       } catch (error) {
         console.log(error);
diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index 9059c43..6c9eb48 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -77,6 +77,7 @@
               <div>打包费：{{ detail.packFee || "-" }}</div>
               <div>订单原价：￥{{ detail.originAmount }}</div>
               <div>优惠金额：￥{{ detail.discountAmount }}</div>
+              <div>积分抵扣：￥{{ detail.pointsDiscountAmount }}</div>
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
diff --git a/src/views/shop/config/components/safe.vue b/src/views/shop/config/components/safe.vue
index 61297d6..1aa2207 100644
--- a/src/views/shop/config/components/safe.vue
+++ b/src/views/shop/config/components/safe.vue
@@ -30,9 +30,9 @@
     <hr />
     <el-form ref="form" :model="form" label-width="120px" label-position="left">
       <el-form-item label="校验安全密码">
-        <el-checkbox v-model="form.isReturn">退款</el-checkbox>
-        <el-checkbox v-model="form.isMemberIn">会员充值</el-checkbox>
-        <el-checkbox v-model="form.isMemberReturn">会员退款</el-checkbox>
+        <el-checkbox v-model="form.isReturnPwd">退款</el-checkbox>
+        <el-checkbox v-model="form.isMemberInPwd">会员充值</el-checkbox>
+        <el-checkbox v-model="form.isMemberReturnPwd">会员退款</el-checkbox>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitHandles">保存</el-button>
@@ -43,6 +43,8 @@
 <script>
 import ShopApi from "@/api/account/shop";
 
+import commonApi from "@/api/account/common";
+import { ElMessage } from "element-plus";
 export default {
   data() {
     return {
@@ -61,48 +63,48 @@ export default {
     async getinfo() {
       const res = await ShopApi.get();
       this.form = res;
-      this.form.isReturn = this.form.isReturn == 1 ? true : false;
-      this.form.isMemberIn = this.form.isMemberIn == 1 ? true : false;
-      this.form.isMemberReturn = this.form.isMemberReturn == 1 ? true : false;
+      this.form.isReturnPwd = this.form.isReturnPwd == 1 ? true : false;
+      this.form.isMemberInPwd = this.form.isMemberInPwd == 1 ? true : false;
+      this.form.isMemberReturnPwd = this.form.isMemberReturnPwd == 1 ? true : false;
     },
     async submitHandle() {
       if (!this.form.prepareAmount) {
-        this.$message({
+        ElMessage({
           message: "请输入验证码",
         });
         return;
       }
       if (!this.form.password) {
-        this.$message({
+        ElMessage({
           message: "请输入密码",
         });
         return;
       }
-      const res = await modfiyUserInfo({
+      const res = await ShopApi.edit({
+        id: this.form.id,
         code: this.form.prepareAmount,
-        pwd: md5(this.form.password),
+        operationPwd: this.form.password,
       });
-      console.log(222);
 
       this.form.prepareAmount = "";
       this.form.password = "******";
       this.disabled = true;
-      this.$message({
+      ElMessage({
         message: "修改成功",
         type: "success",
       });
     },
     async submitHandles() {
-      const res = await tbShopInfoPUT({
+      const res = await ShopApi.edit({
         // code: this.form.prepareAmount,
         // id: this.form.id,
         // status:this.form.status,
         ...this.form,
-        isReturn: this.form.isReturn == true ? 1 : 0,
-        isMemberIn: this.form.isMemberIn == true ? 1 : 0,
-        isMemberReturn: this.form.isMemberReturn == true ? 1 : 0,
+        isReturnPwd: this.form.isReturnPwd == true ? 1 : 0,
+        isMemberInPwd: this.form.isMemberInPwd == true ? 1 : 0,
+        isMemberReturnPwd: this.form.isMemberReturnPwd == true ? 1 : 0,
       });
-      this.$message({
+      ElMessage({
         message: "修改成功",
         type: "success",
       });
@@ -112,8 +114,8 @@ export default {
       this.disabled = false;
     },
     async onSubmit() {
-      const res = await sendMsg();
-      this.$message({
+      const res = await commonApi.sms({ type: "editShopInfoOpePwd" });
+      ElMessage({
         message: "发送成功",
         type: "success",
       });
diff --git a/src/views/tool/Instead/components/choose-user.vue b/src/views/tool/Instead/components/choose-user.vue
index e2ffafa..4cf2659 100644
--- a/src/views/tool/Instead/components/choose-user.vue
+++ b/src/views/tool/Instead/components/choose-user.vue
@@ -9,8 +9,8 @@
 
           <el-form-item>
             <div class="flex gap-20">
-              <el-button type="primary" @click="getTableData" size="medium">搜索</el-button>
-              <el-button @click="noChooseUser" size="medium">不选择用户</el-button>
+              <el-button type="primary" @click="getTableData">搜索</el-button>
+              <el-button @click="noChooseUser">不选择用户</el-button>
             </div>
           </el-form-item>
         </el-form>
@@ -49,7 +49,7 @@
 
           <el-table-column label="操作" width="90" fixed="right">
             <template v-slot="scope">
-              <el-button type="primary" size="mini" @click="choose(scope.row)">选择</el-button>
+              <el-button type="primary" size="small" @click="choose(scope.row)">选择</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index efd5b5e..d50fea7 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -31,7 +31,15 @@
           <div class="score">
             <div class="u-flex u-col-center u-m-t-10">
               <span class="u-font-14 font-bold u-m-r-20">积分抵扣</span>
-              <el-radio-group v-model="score.sel" size="small" class="">
+              <el-radio-group
+                :disabled="!pointsRes.usable"
+                v-model="score.sel"
+                size="small"
+                class=""
+              >
+                <el-radio :value="-1">
+                  <span class="u-font-14">不使用</span>
+                </el-radio>
                 <el-radio :value="0">
                   <span class="u-font-14">全部抵扣</span>
                 </el-radio>
@@ -39,10 +47,27 @@
                   <span class="u-font-14">部分抵扣</span>
                 </el-radio>
               </el-radio-group>
+              <el-input-number
+                class="u-m-l-10"
+                v-if="score.sel == 1"
+                v-model="usePointsNumber"
+                step-strictly
+                placeholder="请输入积分抵扣数量"
+                :min="pointsRes.minDeductionPoints"
+                :max="pointsRes.maxUsablePoints"
+                @change="pointsToMoney"
+              ></el-input-number>
             </div>
-            <p class="u-font-14 color-666 u-m-t-10">
+            <p
+              class="u-font-14 color-666 u-m-t-10"
+              v-if="pointsRes.unusableReason && !pointsRes.usable"
+            >
               <span class="color-red">*</span>
-              <span>积分不足或小于最低使用门槛1</span>
+              <span>{{ pointsRes.unusableReason }}</span>
+            </p>
+            <p class="u-font-14 color-666 u-m-t-10" v-else>
+              <span class="color-red">*</span>
+              <span>{{ pointsRes.equivalentPoints }}积分等于1元</span>
             </p>
           </div>
           <div class="u-flex u-col-center u-m-t-20 no-wrap">
@@ -60,6 +85,51 @@
               <el-icon><ArrowDown /></el-icon>
             </div>
           </div>
+          <div class="u-m-t-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 label="商品信息" width="120">
+                <template v-slot="scope">
+                  <div class="u-flex" v-if="scope.row.type == 2">
+                    <div class="u-flex">
+                      <el-image
+                        :src="scope.row.productImg"
+                        fit="cover"
+                        style="width: 40px; height: 40px"
+                        :preview-src-list="[scope.row.productImg]"
+                      ></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" 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="">
+                <template v-slot="scope">
+                  <el-button type="danger" size="small" @click="delQuan(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
         </template>
       </div>
 
@@ -105,12 +175,16 @@
           <span class="u-m-l-10 value">￥{{ carts.payMoney }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
-          <span class="title">优惠券</span>
-          <span class="u-m-l-10 value">￥{{ coupDiscount }}</span>
+          <span class="title">商品优惠券</span>
+          <span class="u-m-l-10 value">￥{{ productCouponDiscountAmount }}</span>
+        </div>
+        <div class="u-flex u-m-b-10 u-row-between">
+          <span class="title">满减优惠券</span>
+          <span class="u-m-l-10 value">￥{{ fullCouponDiscountAmount }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">积分抵扣</span>
-          <span class="u-m-l-10 value">-￥{{ orderInfo.pointsDiscountAmount || 0 }}</span>
+          <span class="u-m-l-10 value">-￥{{ pointsDiscountAmount }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">整单改价</span>
@@ -118,7 +192,7 @@
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">抹零</span>
-          <span class="u-m-l-10 value">-￥{{ orderInfo.pointsDiscountAmount || 0 }}</span>
+          <span class="u-m-l-10 value">-￥{{ 0 }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">应付金额</span>
@@ -127,20 +201,17 @@
       </div>
     </div>
     <!-- 扫码 -->
-    <scanPay
-      ref="refScanPay"
-      :order="orderInfo"
-      @paySuccess="paySuccess"
-      @confirm="refScanPayConfirm"
-    ></scanPay>
+    <scanPay ref="refScanPay" :order="orderInfo" @confirm="refScanPayConfirm"></scanPay>
     <!-- 打折 -->
     <discount ref="refDiscount" @confirm="discountConfirm"></discount>
     <!-- 优惠券 -->
-    <popup-coupon ref="refCoupon" @confirm="refCouponConfirm"></popup-coupon>
+    <popup-coupon ref="refCoupon" :user="user" @confirm="refCouponConfirm"></popup-coupon>
   </div>
 </template>
 
 <script  setup>
+import * as quanUtil from "../quan_util.js";
+
 import { useCartsStore } from "@/store/modules/carts";
 const carts = useCartsStore();
 
@@ -154,10 +225,48 @@ import discount from "./discount.vue";
 import { ElLoading } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
 
+//商品列表
+let goodsArr = [];
+
 //优惠券
+let $goodsPayPriceMap = {};
 const refCoupon = ref();
+let quansSelArr = ref([]);
 function openCoupon() {
-  refCoupon.value.open();
+  refCoupon.value.open(carts.payMoney, props.orderInfo);
+}
+//返回商品券抵扣金额
+function returnProDiscount(row) {
+  //相同商品抵扣券数组
+  const arr = quansSelArr.value.filter((v) => v.type == 2 && v.proId == row.proId);
+  console.log(arr);
+  const index = arr.findIndex((v) => v.id == row.id);
+  const item = goodsArr.find((v) => v.productId == row.proId);
+  if (index != -1) {
+    const n = quanUtil.returnProductCoupAllPrice(
+      $goodsPayPriceMap[row.proId],
+      index,
+      row.num,
+      props.user.id && props.user.isVip
+    );
+    return n.toFixed(2);
+  } else {
+    return 0;
+  }
+}
+function refCouponConfirm(e, goodsPayPriceMap, goodsList) {
+  goodsArr = goodsList;
+  usePointsNumber.value = 0;
+  pointsDiscountAmount.value = 0;
+  score.sel = -1;
+  quansSelArr.value = e;
+  $goodsPayPriceMap = goodsPayPriceMap;
+}
+function delQuan(row) {
+  const index = quansSelArr.value.findIndex((v) => v.id == row.id);
+  if (index != -1) {
+    quansSelArr.value.splice(index, 1);
+  }
 }
 function couponChange(data) {}
 
@@ -172,7 +281,7 @@ function discountConfirm(e) {
   Object.assign(checkOrderPay, e);
   if (e.discount) {
     checkOrderPay.discountAmount =
-      carts.payMoney - (carts.payMoney * (e.discount / 100).toFixed(2)).toFixed(2);
+      carts.payMoney - ((carts.payMoney * (100 - e.discount)) / 100).toFixed(2);
   } else {
     checkOrderPay.discount = 0;
   }
@@ -218,16 +327,43 @@ watch(
 );
 
 //002-获取订单可用积分及抵扣金额（支付页面使用）
-function pointsInit() {
-  if (!props.user.id) {
+const pointsRes = ref({ usable: false, maxUsablePoints: 0, minDeductionPoints: 0 });
+const usePointsNumber = ref(0);
+const orderAmountOrderAmount = computed(() => {
+  return (carts.payMoney - checkOrderPay.discountAmount).toFixed(2);
+});
+const pointsDiscountAmount = ref(0);
+watch(
+  () => orderAmountOrderAmount.value,
+  (newval) => {
+    pointsInit();
+  }
+);
+
+async function pointsInit() {
+  if (!props.user.id || score.sel == -1) {
     return;
   }
-  PointsApi.calcOrderUsablePoints({
+  const res = await PointsApi.calcOrderUsablePoints({
     userId: props.user.id,
-    orderAmount: (carts.payMoney - checkOrderPay.discountAmount).toFixed(2),
+    orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
   });
+  pointsRes.value = res;
+  usePointsNumber.value = res.usable ? res.maxUsablePoints : 0;
+  if (res.usable) {
+    pointsToMoney();
+  }
+  return res;
+}
+// 根据积分计算可抵扣金额
+async function pointsToMoney() {
+  const res = await PointsApi.calcPointsToMoney({
+    userId: props.user.id,
+    orderAmount: currentpayMoney.value - pointsDiscountAmount.value,
+    points: usePointsNumber.value,
+  });
+  pointsDiscountAmount.value = res;
 }
-
 const emits = defineEmits(["chooseUser", "paysuccess"]);
 function chooseUser() {
   emits("chooseUser");
@@ -240,7 +376,7 @@ const coupDiscount = computed(() => {
   }
   return total.toFixed(2);
 });
-const score = ref({
+const score = reactive({
   list: [],
   sel: 0,
 });
@@ -249,6 +385,18 @@ const payTypes = reactive({
   list: [],
   sel: 0,
 });
+watch(
+  () => score.sel,
+  (newval) => {
+    console.log(newval);
+    if (newval == -1) {
+      usePointsNumber.value = 0;
+      pointsDiscountAmount.value = 0;
+    } else {
+      pointsInit();
+    }
+  }
+);
 function canUsePayType(item) {
   if (currentpayMoney.value * 1 == 0) {
     return item.payType == "cash" ? false : true;
@@ -278,16 +426,16 @@ function returnPayParams() {
       vipPrice: props.user.id && props.user.isVip ? 1 : 0,
       orderId: props.orderInfo.id,
       // discountRatio: (checkOrderPay.discount / 100).toFixed(2),
-      discountRatio: 0,
+      discountRatio: checkOrderPay.discount ? checkOrderPay.discount : 0,
       seatNum: props.orderInfo.seatNum,
       originAmount: carts.payMoney * 1,
-      discountAmount: checkOrderPay.discountAmount * 1,
-      productCouponDiscountAmount: props.orderInfo.productCouponDiscountAmount || 0,
+      discountAmount: !checkOrderPay.discount ? checkOrderPay.discountAmount * 1 : 0,
+      productCouponDiscountAmount: 0,
       orderAmount: currentpayMoney.value * 1,
       roundAmount: props.orderInfo.roundAmount,
-      pointsDiscountAmount: props.orderInfo.pointsDiscountAmount || 0,
-      pointsNum: props.orderInfo.pointsNum,
-      fullCouponDiscountAmount: props.orderInfo.fullCouponDiscountAmount || 0,
+      pointsDiscountAmount: pointsDiscountAmount.value * 1,
+      pointsNum: usePointsNumber.value * 1,
+      fullCouponDiscountAmount: 0,
     },
   };
 }
@@ -387,13 +535,34 @@ async function payOrder(payType, isScan) {
     loading.close();
   }
 }
-
+//满减优惠券
+const fullCouponDiscountAmount = computed(() => {
+  return quansSelArr.value
+    .reduce((pre, cur) => {
+      return pre + cur.discountAmount;
+    }, 0)
+    .toFixed(2);
+});
+//商品券抵扣金额
+const productCouponDiscountAmount = computed(() => {
+  let index = -1;
+  return quansSelArr.value.reduce((pre, cur) => {
+    index++;
+    return pre + returnProDiscount(cur, index) * 1;
+  }, 0);
+});
 //应付金额
 const currentpayMoney = computed(() => {
   if (checkOrderPay.discount) {
     return (carts.payMoney * (checkOrderPay.discount / 100)).toFixed(2);
   }
-  return (carts.payMoney - checkOrderPay.discountAmount).toFixed(2);
+  return (
+    carts.payMoney -
+    productCouponDiscountAmount.value -
+    fullCouponDiscountAmount.value -
+    checkOrderPay.discountAmount -
+    pointsDiscountAmount.value
+  ).toFixed(2);
 });
 watch(
   () => currentpayMoney.value,
@@ -405,7 +574,6 @@ watch(
 );
 onMounted(() => {
   getPaytype();
-  pointsInit();
 });
 defineExpose({
   nowPayClick,
diff --git a/src/views/tool/Instead/components/popup-coupon.vue b/src/views/tool/Instead/components/popup-coupon.vue
index 3b055e6..dc9011b 100644
--- a/src/views/tool/Instead/components/popup-coupon.vue
+++ b/src/views/tool/Instead/components/popup-coupon.vue
@@ -14,23 +14,23 @@
                 <template v-slot="scope">
                   <el-checkbox
                     @change="fullReductionCouponClick(scope.row)"
-                    :value="scope.row.id == fullReductionCouponSel.id"
+                    :model-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">
+              <!-- <el-table-column label="券类型" width="80">
                 <template v-slot="scope">
                   {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                 </template>
-              </el-table-column>
+              </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">
+              <el-table-column prop="discountAmount" label="限制" width="180">
                 <template v-slot="scope">
                   <div class="u-flex">
                     <span>支付满</span>
@@ -52,31 +52,31 @@
               :data="quans.productCoupon"
               style="width: 100%"
             >
-              <el-table-column>
+              <el-table-column width="80">
                 <template v-slot="scope">
                   <el-checkbox
                     @change="productCouponClick(scope.row)"
-                    :value="scope.row.checked"
+                    :model-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>
 
-              <el-table-column label="商品信息" width="120">
+              <el-table-column label="商品信息" width="220">
                 <template v-slot="scope">
                   <div class="u-flex">
                     <div class="u-flex">
                       <el-image
-                        :src="scope.row.productCover"
+                        :src="scope.row.productImg"
                         fit="cover"
                         style="width: 40px; height: 40px"
-                        :preview-src-list="[scope.row.productCover]"
+                        :preview-src-list="[scope.row.productImg]"
                       ></el-image>
                     </div>
                     <div class="u-p-l-10">
                       <div class="">{{ scope.row.productName }}</div>
-                      <div class="">x{{ scope.row.num || "" }}</div>
+                      <div class="">x{{ scope.row.num || 1 }}</div>
                     </div>
                   </div>
                 </template>
@@ -88,11 +88,11 @@
                   </span>
                 </template>
               </el-table-column> -->
-              <el-table-column label="券类型">
+              <!-- <el-table-column label="券类型">
                 <template v-slot="scope">
                   {{ scope.row.type == 1 ? "优惠券" : "商品券" }}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column prop="useRestrictions" label="描述"></el-table-column>
               <!-- <el-table-column prop="useRestrictions" label="是否可用">
                 <template v-slot="scope">
@@ -117,15 +117,15 @@
                 <div class="u-flex" v-if="scope.row.type == 2">
                   <div class="u-flex">
                     <el-image
-                      :src="scope.row.productCover"
+                      :src="scope.row.productImg"
                       fit="cover"
                       style="width: 40px; height: 40px"
-                      :preview-src-list="[scope.row.productCover]"
+                      :preview-src-list="[scope.row.productImg]"
                     ></el-image>
                   </div>
                   <div class="u-p-l-10">
                     <div class="">{{ scope.row.productName }}</div>
-                    <div class="">x{{ scope.row.num || "" }}</div>
+                    <div class="">x{{ scope.row.num || 1 }}</div>
                   </div>
                 </div>
               </template>
@@ -143,7 +143,7 @@
             <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>
+                <el-button type="danger" size="small" @click="delQuan(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -166,14 +166,17 @@
           </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>
+          <el-button size="large" @click="close">取消</el-button>
+          <el-button size="large" type="primary" @click="confirm">确定</el-button>
         </div>
       </div>
     </div>
   </el-dialog>
 </template>
 <script setup>
+import couponApi from "@/api/account/coupon";
+import { ElMessageBox } from "element-plus";
+import * as quanUtil from "../quan_util.js";
 const props = defineProps({
   title: {
     type: String,
@@ -183,7 +186,7 @@ const props = defineProps({
     type: Array,
     default: [],
   },
-  vipUser: {
+  user: {
     type: Object,
     default: () => {
       return {
@@ -196,7 +199,6 @@ function tabClick() {}
 
 const state = reactive({
   discount: 1,
-  orderPrice: 0,
   fullReductionCouponSel: {
     id: "",
   },
@@ -216,36 +218,210 @@ const state = reactive({
 
 const {
   discount,
-  orderPrice,
   fullReductionCouponSel,
   quansSelArr,
   quans,
   currentRow,
   multipleSelection,
-  fullReductionCouponSelId,
   activeName,
   form,
   show,
   isSetProductCoup,
 } = toRefs(state);
-const AllCouponPrice = computed(() => {
-  return 0;
-});
-const payPrice = computed(() => {
-  return 0;
-});
-function open() {
+
+let orderPrice = ref(0);
+let $originFullReductionCoupon = [];
+//可以抵扣的商品列表
+let canDikouGoodsArr = [];
+//商品数量从0到n每一个对应的价格
+let $goodsPayPriceMap = {};
+let goodsArr = [];
+
+function open(money, orderInfo) {
+  let arr = [];
+  for (let i in orderInfo.detailMap) {
+    arr.push(...orderInfo.detailMap[i]);
+  }
+  goodsArr = arr;
+  $goodsPayPriceMap = quanUtil.returnGoodsPayPriceMap(goodsArr || []);
+  canDikouGoodsArr = quanUtil.returnNewGoodsList(goodsArr);
+  console.log(canDikouGoodsArr);
+  getcoup();
+  orderPrice.value = money;
   show.value = true;
 }
 
+async function getcoup() {
+  const res = await couponApi.findCoupon({ shopUserId: props.user.id });
+  quans.value.fullReductionCoupon = res.filter(
+    (v) => v.type == 1 && orderPrice.value * 1 >= v.fullAmount * 1
+  );
+  quans.value.productCoupon = res
+    .filter((v) => v.type == 2 && canDikouGoodsArr.find((goods) => v.proId == goods.productId))
+    .map((v) => {
+      const findGoods = goodsArr.find((goods) => goods.productId == v.proId);
+      return {
+        ...v,
+        productImg: findGoods ? findGoods.productImg : "",
+        productName: findGoods ? findGoods.productName : "",
+      };
+    });
+}
+function fullReductionCouponClick(row) {
+  if (row.id == fullReductionCouponSel.value.id) {
+    fullReductionCouponSel.value = { id: "" };
+    quansSelArr.value.splice(0, 1);
+    return;
+  }
+  const dikouQuan = quansSelArr.value[0];
+  fullReductionCouponSel.value = row;
+  if (dikouQuan && dikouQuan.type == 1) {
+    quansSelArr.value[0] = row;
+  } else {
+    quansSelArr.value.unshift(row);
+  }
+  if (!fullReductionCouponSel.value.id) {
+    return;
+  }
+}
+const AllCouponPrice = computed(() => {
+  return quanUtil.returnCouponAllPrice(quansSelArr.value, canDikouGoodsArr, props.user);
+});
+
+const payPrice = computed(() => {
+  return (orderPrice.value - AllCouponPrice.value).toFixed(2);
+});
+function productCouponClick(item) {
+  if (!item.use) {
+    return;
+  }
+  const hasSelNum = quansSelArr.value
+    .filter((v) => v.type == 2 && v.proId == item.proId)
+    .reduce((a, b) => {
+      return a + (b.num || 1);
+    }, 0);
+  console.log($goodsPayPriceMap[item.proId]);
+  const maxSelNum = $goodsPayPriceMap[item.proId].length;
+  const coupMaxUseNum = Math.min(item.num || 1, maxSelNum - hasSelNum);
+  const canUseNum = Math.min(maxSelNum, coupMaxUseNum);
+  console.log("maxSelNum", maxSelNum);
+  console.log("coupMaxUseNum", coupMaxUseNum);
+  console.log("canUseNum", canUseNum);
+  if (!item.checked && canUseNum <= 0) {
+    return ElMessage.error("购物车该商品券可使用最大数量为" + maxSelNum);
+  }
+
+  if (fullReductionCouponSel.value.id && !item.checked) {
+    const goodsQuan = quans.value.productCoupon.filter((v) => v.checked);
+    const fullReductionCoupon = fullReductionCouponSel.value.id
+      ? [fullReductionCouponSel.value]
+      : [];
+
+    let coupArr = [...goodsQuan, { ...item, num: canUseNum }];
+    const payPrice =
+      orderPrice.value - quanUtil.returnCouponAllPrice(coupArr, canDikouGoodsArr, props.user);
+    console.log(payPrice);
+    if (payPrice <= 0) {
+      return ElMessageBox.confirm(
+        "选择该商品券后支付金额将为0，继续选择将取消选择的满减券",
+        "提示",
+        {
+          confirmButtonText: "继续选择",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          fullReductionCouponSel.value = {
+            id: "",
+          };
+          quansSelArr.value.splice(0, 1);
+        })
+        .catch(() => {});
+    }
+    if (fullReductionCouponSel.value.fullAmount > payPrice) {
+      ElMessageBox.confirm(
+        "选择该商品券后将不满足选择抵扣券的最低满减需求，继续选择将取消选择的满减券",
+        "提示",
+        {
+          confirmButtonText: "继续选择",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          fullReductionCouponSel.value = {
+            id: "",
+          };
+        })
+        .catch(() => {
+          item.checked = false;
+          const index = quansSelArr.value.findIndex((v) => v.id == item.id);
+          quansSelArr.value.splice(index, 1);
+        });
+    }
+  }
+  item.checked = !item.checked;
+  if (!item.checked) {
+    const index = quansSelArr.value.findIndex((v) => v.id == item.id);
+    quansSelArr.value.splice(index, 1);
+  } else {
+    quansSelArr.value.push({ ...item, num: canUseNum });
+  }
+  const CheckedArr = quans.value.productCoupon.filter((v) => v.checked);
+  if (CheckedArr.length <= 0) {
+    return quans.value.productCoupon.map((v) => {
+      v.use = true;
+    });
+  }
+  const noCheckedArr = quans.value.productCoupon.filter((v) => !v.checked);
+  noCheckedArr.map((v) => {
+    v.use = quanUtil.returnCoupCanUse(canDikouGoodsArr, v, CheckedArr);
+  });
+}
+//返回商品券抵扣金额
+function returnProDiscount(row) {
+  //相同商品抵扣券数组
+  const arr = quansSelArr.value.filter((v) => v.type == 2 && v.proId == row.proId);
+  const index = arr.findIndex((v) => v.id == row.id);
+  const item = goodsArr.find((v) => v.productId == row.proId);
+  if (index != -1) {
+    const n = quanUtil.returnProductCoupAllPrice(
+      $goodsPayPriceMap[row.proId],
+      index,
+      row.num,
+      props.user.id && props.user.isVip
+    );
+    return n.toFixed(2);
+  } else {
+    return 0;
+  }
+}
+//删除选中的优惠券
+function delQuan(row) {
+  const index = quansSelArr.value.findIndex((item) => item.id == row.id);
+  if (row.type == 2 && index != -1) {
+    quansSelArr.value.splice(index, 1);
+    const proIndex = quans.value.productCoupon.findIndex((v) => v.id == row.id);
+    quans.value.productCoupon[proIndex].checked = false;
+  }
+  if (row.type == 1 && index != -1) {
+    fullReductionCouponSel.value = { id: "" };
+    quansSelArr.value.splice(0, 1);
+  }
+}
 function close() {
   show.value = false;
 }
 const emits = defineEmits(["confirm"]);
-function confirm() {
-  emits("confirm");
+function reset() {
+  quansSelArr.value = [];
+  fullReductionCouponSel.value = { id: "" };
+}
+function confirm() {
+  emits("confirm", [...quansSelArr.value], $goodsPayPriceMap, goodsArr);
+  close();
 }
-function reset() {}
 defineExpose({
   close,
   open,
diff --git a/src/views/tool/Instead/quan_util.js b/src/views/tool/Instead/quan_util.js
index 14b4747..00a24d6 100644
--- a/src/views/tool/Instead/quan_util.js
+++ b/src/views/tool/Instead/quan_util.js
@@ -1,250 +1,247 @@
 export function isTui(item) {
-	return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
+  return item.status == "return" || item.status == "refund" || item.status == "refunding";
 }
 //是否使用会员价
-export function isUseVipPrice(vipUser,goods){
-	return vipUser.id&&vipUser.isVip&&goods.isMember
+export function isUseVipPrice(vipUser, goods) {
+  return vipUser.id && vipUser.isVip;
 }
 
 //计算商品券优惠价格
 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
-
+  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))
+  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
-	}
-	console.log(selCoupNumber,findGoodsTotalNumber);
-	return findGoodsTotalNumber < selCoupNumber ? false : true
+  // 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 < 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
-	const canUse=coup.use
-	return {
-		...coup,
-		discountAmount: discountAmount,
-		use: canUse
-	}
-
+  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);
+  // const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
+  // const canUse=discountAmount>0
+  const canUse = coup.use;
+  return {
+    ...coup,
+    discountAmount: discountAmount,
+    use: canUse,
+  };
 }
 /**
  * 根据购物车商品计算商品券抵扣价格以及是否满足可用需求
  * 1.商品券对应商品数量大于购物车对应商品数量不可用
  * 2.未在购物车找到相关商品不可用
- * @param {*} coupArr 
- * @param {*} goodsArr 
- * @param {*} vipUser 
- * @returns 
+ * @param {*} coupArr
+ * @param {*} goodsArr
+ * @param {*} vipUser
+ * @returns
  */
 export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
-	return coupArr.map((v) => {
-		return returnProductCoupon(v, 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 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,isMember=true){
-	console.log(productPriceArr);
-	return productPriceArr.slice(startIndex,startIndex+num).reduce((prve,cur)=>{
-		let curPrice=0
-		if(typeof cur==='object'){
-			curPrice=isMember?cur.memberPrice*1:cur.price
-		}else{
-			curPrice=cur*1
-		}
-		return prve+curPrice
-	},0)
+export function returnProductCoupAllPrice(productPriceArr, startIndex, num = 1, isVip = true) {
+  num = num || 1;
+  return productPriceArr.slice(startIndex, startIndex + num).reduce((prve, cur) => {
+    let curPrice = 0;
+    if (typeof cur === "object") {
+      curPrice = isVip ? cur.memberPrice * 1 : cur.price;
+    } else {
+      curPrice = cur * 1;
+    }
+
+    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 returnProductCanUseNum(productPriceArr, startIndex, num) {
+  let n = 0;
+  for (let i = 0; i < num; i++) {
+    if (productPriceArr[startIndex * 1 + i]) {
+      n += 1;
+    } else {
+      break;
+    }
+  }
+  return n;
 }
 
 //返回同类商品券在同类商品价格数组里的开始位置
-export function returnProCoupStartIndex(coupArr,index){
-	return  coupArr.slice(0,index).reduce((prve,cur)=>{
-		return prve+cur.num*1 
-	},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 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);
-			const coupNum=Math.min(goodsPayPriceMap[coup.proId].length,coup.num)
-			console.log(coupNum);
-			total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum) 
-		}
-	}
-	
-	return total.toFixed(2);
+  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);
+          prve.push(...arr);
+          return prve;
+        }, []);
+      }
+      const proCoupStartIndex = returnProCoupStartIndex(arr, i);
+      const coupNum = Math.min(goodsPayPriceMap[coup.proId].length, coup.num);
+      total += returnProductCoupAllPrice(goodsPayPriceMap[coup.proId], proCoupStartIndex, coupNum);
+    }
+  }
 
+  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);
-
+  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);
+  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,use:true}
-		}
-		const isfullAmount = payPrice*1 >= v.fullAmount * 1
-		if(payPrice<=0){
-			return {
-				...v,
-				use: false
-			}
-		}
-		return {
-			...v,
-			use: v.use && isfullAmount
-		}
-	}).filter(v => v.use)
+  return coupArr
+    .map((v) => {
+      if (v.id == selCoup.id) {
+        return { ...v, use: true };
+      }
+      const isfullAmount = payPrice * 1 >= v.fullAmount * 1;
+      if (payPrice <= 0) {
+        return {
+          ...v,
+          use: false,
+        };
+      }
+      return {
+        ...v,
+        use: v.use && isfullAmount,
+      };
+    })
+    .filter((v) => v.use);
 }
 
 //根据商品数量还有商品券数量返回优惠券可以使用的数量数组
-export function  returnCanUseNumProductCoup(coupArr,){
-	let productCoup = coupArr.filter(v => v.type == 2)
-	//商品券分组
-	let coupMap={}
-	for(let i in productCoup){
-		const coup=productCoup[i]
-		if(coupMap.hasOwnProperty(coup.proId)){
-			coupMap[coup.proId].push(coup)
-		}else{
-			coupMap[coup.proId]=[coup]
-		}
-	}
-	return arr
-}
\ No newline at end of file
+export function returnCanUseNumProductCoup(coupArr) {
+  let productCoup = coupArr.filter((v) => v.type == 2);
+  //商品券分组
+  let coupMap = {};
+  for (let i in productCoup) {
+    const coup = productCoup[i];
+    if (coupMap.hasOwnProperty(coup.proId)) {
+      coupMap[coup.proId].push(coup);
+    } else {
+      coupMap[coup.proId] = [coup];
+    }
+  }
+  return arr;
+}
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
index 22d80e7..24aed1c 100644
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@@ -143,7 +143,7 @@
                 >
                   <el-button
                     type="primary"
-                    :disabled="!item.tableId || item.status === 'closed'"
+                    :disabled="!item.tableCode || item.status === 'closed'"
                     @click="diancanShow(item)"
                   >
                     点餐
@@ -334,7 +334,37 @@ async function areainit() {
     return prve;
   }, {});
 }
-
+async function diancanShow(item, key) {
+  // if (key === "isPayOrder") {
+  //   const canShoukuan = await hasPermission("允许收款");
+  //   if (!canShoukuan) {
+  //     return;
+  //   }
+  // }
+  // const canXiadan = await hasPermission("允许下单");
+  // if (!canXiadan) {
+  //   return;
+  // }
+  // if (key === "subscribe") {
+  //   this.$refs.subscribe.show();
+  //   return;
+  // }
+  // key isAddGoods 加菜
+  // key isPayOrder 结账
+  this.selTable = item;
+  if (this.shopInfo.isTableFee) {
+    // 免餐位费
+    this.toInstead({ num: 0, key });
+    // this.$refs.diancan.open(item, key, '');
+    return;
+  }
+  const num = item.useNum || 0;
+  if (item.useNum <= 0) {
+    return this.$refs.refChooseDinersNumber.open();
+  }
+  this.toInstead({ num: num, key });
+  // this.$refs.diancan.open(item, key, num);
+}
 const tabClick = (tab) => {
   console.log(tab);
 };