From ef358f33bb775539ac7f9576fe2a9adba8f7524e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 6 Mar 2025 19:32:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=B0=E6=A1=8C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/pay.ts                          |   8 +
 src/store/modules/carts.ts                    |  12 +
 src/utils/request-php.js                      |  12 +-
 src/views/login/index.vue                     |   1 +
 src/views/order/index/components/detail.vue   |  98 +++--
 .../order/index/components/return-money.vue   |  47 ++-
 src/views/order/index/order_goods_util.js     |   2 +-
 .../Instead/components/choose-guazhang.vue    | 175 +++++++++
 src/views/tool/Instead/components/order.vue   | 124 ++++--
 .../components/popup-choose-guazhang.vue      | 353 ++++++++++++++++++
 src/views/tool/Instead/index.vue              |  20 +-
 src/views/tool/table/index.vue                |  35 +-
 12 files changed, 758 insertions(+), 129 deletions(-)
 create mode 100644 src/views/tool/Instead/components/choose-guazhang.vue
 create mode 100644 src/views/tool/Instead/components/popup-choose-guazhang.vue

diff --git a/src/api/order/pay.ts b/src/api/order/pay.ts
index 38fa0d9..81cbbed 100644
--- a/src/api/order/pay.ts
+++ b/src/api/order/pay.ts
@@ -51,6 +51,14 @@ const Api = {
       params
     });
   },
+  //挂账支付
+  creditPay(data: any) {
+    return request<any>({
+      url: `${baseURL}/creditPay`,
+      method: "post",
+      data
+    });
+  },
 
 };
 
diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index 4245091..c1abaa5 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -171,6 +171,7 @@ export const useCartsStore = defineStore("carts", () => {
     return total
   })
 
+
   //支付总价
   const payMoney = computed(() => {
     const money = list.value.reduce((acc: number, cur: any) => {
@@ -181,6 +182,16 @@ export const useCartsStore = defineStore("carts", () => {
     }, 0)
     return (money + packFee.value + oldOrderMoney.value * 1).toFixed(2)
   })
+  //只算商品的总价
+  const goodsTotal = computed(() => {
+    const money = list.value.reduce((acc: number, cur: any) => {
+      const discount_sale_amount = cur.discount_sale_amount * 1 || 0
+      const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData.salePrice) : 0
+      const price = (cur.discount_sale_amount * 1 || cur.salePrice || 0)
+      return acc + cur.number * (discount_sale_amount || (useVipPrice.value ? memberPrice : price))
+    }, 0)
+    return (money + oldOrderMoney.value * 1).toFixed(2)
+  })
   //总计数量
   const totalNumber = computed(() => {
     const cartNumber = list.value.reduce((acc: number, cur: any) => {
@@ -556,6 +567,7 @@ export const useCartsStore = defineStore("carts", () => {
     WebSocketManager.sendMessage(msg);
   }
   return {
+    goodsTotal,
     isLinkFinshed,
     setOldOrder,
     singleDiscount,
diff --git a/src/utils/request-php.js b/src/utils/request-php.js
index 9b8857a..669dcf4 100644
--- a/src/utils/request-php.js
+++ b/src/utils/request-php.js
@@ -1,16 +1,11 @@
 import axios from "axios";
 import router from "@/router";
-import Config from "@/settings";
-import Cookies from "js-cookie";
-import { setToken } from "@/utils/globalCancelToken.js";
-function getToken() {
-  return localStorage.getItem("bausertoken");
-}
+import { getToken } from "@/utils/auth";
+
 // 创建axios实例
 const service = axios.create({
-  // baseURL: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API : '/',
   baseURL: "https://czgdoumei.sxczgkj.com/index.php/api/", // api 的 base_url
-  timeout: Config.timeout, // 请求超时时间
+  timeout: 1000 * 20, // 请求超时时间
 });
 
 // request拦截器
@@ -21,7 +16,6 @@ service.interceptors.request.use(
     }
     config.headers["Content-Type"] = "application/json";
     // 添加可取消请求配置
-    config.cancelToken = new axios.CancelToken((c) => setToken(c));
     return config;
   },
   (error) => {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fba2194..676a293 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -192,6 +192,7 @@ function handleLogin() {
         .login(user)
         .then(async (res) => {
           await userStore.getUserInfo();
+
           const { path, queryParams } = parseRedirect();
           console.log(res, "Denglv返回");
           router.push({ path: path, query: queryParams });
diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index 6c9eb48..042af74 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -105,23 +105,21 @@
             <el-table
               :data="item"
               :ref="'refTable' + index"
-              @selection-change="selectionChange"
-              @row-click="rowClick($event, index)"
+              @select-all="tableSelectAll($event, index)"
             >
-              <el-table-column type="selection" width="55" />
+              <!-- <el-table-column type="selection" width="55" /> -->
+              <el-table-column label="数量" type="selection">
+                <template v-slot="scope">
+                  <el-checkbox v-model="scope.row.checked" />
+                </template>
+              </el-table-column>
               <el-table-column label="商品">
                 <template v-slot="scope">
                   <div class="shop_info">
                     <el-image
-                      v-if="scope.row.productSkuId != '-999'"
                       :src="scope.row.productImg"
                       style="width: 40px; height: 40px"
                     ></el-image>
-                    <div class="packeFee" v-else>
-                      <span>
-                        {{ scope.row.productName || "客座费" }}
-                      </span>
-                    </div>
                     <div class="info">
                       <span :class="[scope.row.isVip == 1 ? 'colorStyle' : '']">
                         {{ scope.row.productName }}
@@ -143,6 +141,22 @@
               <el-table-column label="实付">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
+              <el-table-column label="可退款数量" align="center">
+                <template v-slot="scope">
+                  <el-input-number
+                    v-if="scope.row.checked"
+                    style="width: 120px"
+                    v-model="scope.row.selNumber"
+                    :max="scope.row.num - scope.row.refundNum"
+                  ></el-input-number>
+                  <span class="" v-else>0</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="已退" width="100" align="center">
+                <template v-slot="scope">
+                  <span>{{ scope.row.refundNum }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="操作">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
@@ -154,7 +168,7 @@
                     >
                       <span>退款</span>
                     </el-button>
-                    <span class="color-999" v-if="isTui(scope.row)">已退款</span>
+                    <span class="color-999" v-if="scope.row.status == 'refund'">已退款</span>
                   </template>
                   <template v-if="detail.status == 'unpaid'">
                     <el-button
@@ -171,7 +185,7 @@
               </el-table-column>
             </el-table>
           </template>
-          <div class="u-p-20 u-flex u-row-right">
+          <div class="u-p-20 u-flex u-row-right" v-if="detail.status !== 'refund'">
             <el-checkbox
               v-model="allSelected"
               @change="allSelectedChange"
@@ -254,6 +268,18 @@ export default {
     },
   },
   methods: {
+    tableSelect(e) {
+      console.log(e);
+    },
+    tableSelectAll(e, index) {
+      const arr = this.detail.detailMap[index];
+      for (let i in arr) {
+        arr[i].checked = e.length ? true : false;
+      }
+    },
+    tableSelectionChange(e) {
+      console.log(e);
+    },
     rowClick(row, index) {
       this.$refs["refTable" + index][0].toggleRowSelection(row);
     },
@@ -262,17 +288,14 @@ export default {
     },
     allSelectedChange(newval) {
       for (let i in this.detail.detailMap) {
-        this.detail.detailMap[i].forEach((item) => {
-          if (newval) {
-            this.$refs["refTable" + i][0].toggleRowSelection(item, true);
-          } else {
-            this.$refs["refTable" + i][0].toggleRowSelection(item, false);
-          }
-        });
+        for (let key in this.detail.detailMap[i]) {
+          this.detail.detailMap[i][key].checked = newval;
+        }
       }
     },
     reset() {
       this.user = "";
+      this.allSelected = false;
     },
     returnPayType(payType) {
       if (!payType) {
@@ -351,13 +374,17 @@ export default {
       let arr = [];
       if (item === "all") {
         for (let i in this.detail.detailMap) {
-          arr.push(...this.$refs["refTable" + i][0].getSelectionRows());
+          this.detail.detailMap[i].map((v) => {
+            if (v.checked) {
+              arr.push(v);
+            }
+          });
         }
       } else {
         arr = [item];
       }
       if (arr.length == 0) {
-        return ElMessage.error("请选择要退款的商品");
+        return ElMessage.error("请选择要退款的商品和数量");
       }
       this.selGoods = item;
       this.$refs.refReturnMoney.open(arr, this.detail);
@@ -367,26 +394,7 @@ export default {
       console.log(item);
       this.$refs.refReturnCart.open(item);
     },
-    // 切换类型
-    getTableData() {
-      if (this.type == "3") {
-        this.tbOrderInfoData();
-      }
-    },
-    // 获取退单列表
-    async tbOrderInfoData() {
-      try {
-        const res = await tbOrderInfoData({
-          source: this.detail.id,
-          page: 0,
-          pageSize: 500,
-          orderType: "0",
-        });
-        this.refoundList = res.content;
-      } catch (error) {
-        console.log(error);
-      }
-    },
+
     // 获取订单详情
     async tbOrderInfoDetail(id) {
       try {
@@ -397,7 +405,15 @@ export default {
             this.user = res1;
           });
         }
-
+        for (let i in res.detailMap) {
+          res.detailMap[i] = res.detailMap[i].map((v) => {
+            return {
+              ...v,
+              checked: false,
+              selNumber: v.num - v.returnNum,
+            };
+          });
+        }
         this.detail = res;
         this.loading = false;
       } catch (error) {
diff --git a/src/views/order/index/components/return-money.vue b/src/views/order/index/components/return-money.vue
index 1ad5982..6e7b013 100644
--- a/src/views/order/index/components/return-money.vue
+++ b/src/views/order/index/components/return-money.vue
@@ -11,15 +11,15 @@
           <span class="">
             {{ goods.productName }}
           </span>
-          <span class="color-999 u-m-l-10">x{{ goods.num || "" }}</span>
+          <span class="color-999 u-m-l-10">x{{ goods.selNumber || "" }}</span>
           <span class="color-333 u-m-l-10 u-font-600">
-            {{ goods.payAmount || "" }}
+            {{ (goods.selNumber * goods.unitPrice).toFixed(2) }}
           </span>
         </div>
       </div>
     </div>
     <div class="u-flex u-col-top u-m-t-22">
-      <h4span class="u-m-0">支付金额</h4span>
+      <span class="u-m-0">支付金额</span>
       <div class="u-p-l-20">
         {{ detail.payAmount }}
       </div>
@@ -32,26 +32,30 @@
     </div>
     <div class="u-p-b-16 u-m-t-22">
       <div class="flex u-row-between">
-        <span>线下收款</span>
+        <span class="color-red">退款金额</span>
         <div class="u-flex u-flex-1 u-p-l-20">
-          <el-input type="number" v-model="number" :min="min" :max="max">
-            <template #append>可退1元</template>
-          </el-input>
+          <el-input-number
+            type="number"
+            v-model="number"
+            :min="min"
+            :max="canReturnMoney"
+          ></el-input-number>
+          <span class="u-m-l-10">可退{{ canReturnMoney }}元</span>
         </div>
       </div>
-      <div class="u-flex u-col-top u-m-t-22">
+      <div class="u-flex u-col-top u-m-t-22" v-if="detail.returnAmount * 1 > 0">
         <span class="u-m-0">退款金额</span>
         <div class="u-p-l-20">
-          <span class="color-red">￥ {{ detail.discountAmount }}</span>
-          <span class="color-666 u-m-l-4">(退款商品金额：260.16)</span>
+          <span class="color-red">￥ {{ detail.returnAmount || 0 }}</span>
+          <!-- <span class="color-666 u-m-l-4">(退款商品金额)</span> -->
         </div>
       </div>
-      <div class="u-flex u-col-top u-m-t-22">
+      <!-- <div class="u-flex u-col-top u-m-t-22">
         <span class="u-m-0">退回优惠券</span>
         <div class="u-p-l-20">
           <span class="color-666 u-m-l-4">该订单未使用优惠券</span>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div class="u-p-b-16 border-bottom">
@@ -130,6 +134,12 @@ export default {
       const danjia = this.goods.price;
       return (danjia * this.number).toFixed(2);
     },
+    canReturnMoney() {
+      if (!this.detail) {
+        return 0;
+      }
+      return this.detail.payAmount - this.detail.refundAmount;
+    },
   },
   filters: {
     to2(val) {
@@ -155,6 +165,11 @@ export default {
       this.note = tag + "," + this.note;
     },
     open(goods, detailInfo) {
+      const totalMoney = goods.reduce((prve, cur) => {
+        console.log(cur);
+        return prve + cur.unitPrice * cur.selNumber;
+      }, 0);
+      this.number = totalMoney.toFixed(2);
       this.goodsList = goods;
       this.show = true;
       this.detail = detailInfo;
@@ -174,12 +189,12 @@ export default {
         return ElMessage.error("请输入退款原因");
       }
       this.$emit("confirm", {
-        refundAmount: (this.goods.price * this.number).toFixed(2) * 1,
+        refundAmount: this.number,
         cash: this.cash,
         refundReason: note,
-        refundDetails: [
-          { id: this.goods.id, num: this.number, returnAmount: this.tuikuanJine * 1 },
-        ],
+        refundDetails: this.goodsList.map((v) => {
+          return { id: v.id, num: v.num };
+        }),
       });
       this.close();
     },
diff --git a/src/views/order/index/order_goods_util.js b/src/views/order/index/order_goods_util.js
index 21bd50b..a3651b2 100644
--- a/src/views/order/index/order_goods_util.js
+++ b/src/views/order/index/order_goods_util.js
@@ -16,7 +16,7 @@ export function canTuicai(orderInfo, item) {
   return true;
 }
 export function canTuiKuan(orderInfo, item) {
-  return orderInfo.status == "done" || orderInfo.status == "part-refund";
+  return (orderInfo.status != "refund" && orderInfo.status != "unpaid") || item.status != "refund";
 }
 export function isTui(item) {
   return item.status == "return" || item.status == "refund" || item.status == "refunding";
diff --git a/src/views/tool/Instead/components/choose-guazhang.vue b/src/views/tool/Instead/components/choose-guazhang.vue
new file mode 100644
index 0000000..780a9c4
--- /dev/null
+++ b/src/views/tool/Instead/components/choose-guazhang.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-dialog title="选择挂账人" width="850px" v-model="show" top="20px">
+    <div class="app-container">
+      <div class="head-container filtration">
+        <div class="r">
+          <el-input
+            v-model="tableData.keywords"
+            placeholder="按挂账人或手机号"
+            style="width: 138px"
+          />
+          <!-- <el-select
+            v-model="tableData.status"
+            placeholder="全部状态"
+            clearable
+            style="width: 123px"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select> -->
+          <el-button type="primary" @click="getTableData()">查询</el-button>
+        </div>
+      </div>
+      <div class="head-container content">
+        <el-table v-loading="tableData.loading" :data="tableData.data" @cell-click="cellClick">
+          <el-table-column label="ID" prop="id" />
+
+          <el-table-column label="挂账人" prop="debtor" />
+          <el-table-column label="手机号" prop="mobile" />
+          <el-table-column label="已挂账金额(元)" prop="owedAmount" />
+          <el-table-column label="可用挂账额度(元)" prop="remainingAmount" />
+          <el-table-column label="操作">
+            <template v-slot="scope">
+              <el-button type="text" @click="cellClick(scope.row)">选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="head-container">
+        <el-pagination
+          :total="tableData.total"
+          :current-page="tableData.page"
+          :page-size="tableData.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          @current-change="paginationChange"
+          @size-change="sizeChange"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+    
+   
+<script>
+import creditApi from "@/api/order/credit";
+export default {
+  data() {
+    return {
+      show: false,
+      options: [
+        {
+          value: "1",
+          label: "启用",
+        },
+        {
+          value: "0",
+          label: "停用",
+        },
+      ],
+      tableData: {
+        keywords: "",
+        status: "1",
+        data: [],
+        page: 1,
+        size: 10,
+        loading: false,
+        total: 0,
+      },
+    };
+  },
+  mounted() {
+    // this.getTableData();
+  },
+  methods: {
+    cellClick(row) {
+      this.$emit("confirm", row);
+      this.show = false;
+    },
+    open() {
+      this.getTableData();
+      this.show = true;
+    },
+    /**
+     * 获取挂账人列表
+     */
+    async getTableData() {
+      this.tableData.loading = true;
+      try {
+        const res = await creditApi.getList({
+          page: this.tableData.page,
+          size: this.tableData.size,
+          keywords: this.tableData.keywords,
+          status: this.tableData.status,
+          shopId: localStorage.getItem("shopId"),
+        });
+        this.tableData.loading = false;
+        this.tableData.data = res.records;
+        this.tableData.total = res.totalRow * 1;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+
+    /**
+     * 删除挂账人
+     * @param id
+     */
+    async delTableHandle(id) {
+      // eslint-disable-next-line no-unused-vars
+      const res = await delCreditBuyer(id);
+      this.getTableData();
+    },
+
+    /**
+     * 操作
+     */
+    openDialog(row, type) {
+      if (type === "add") {
+        this.$refs.creditAdd.show();
+      } else if (type === "edit") {
+        this.$refs.creditAdd.show(row);
+      } else if (type === "repayment" && row.repaymentMethod === "total") {
+        this.$refs.creditRepayment.show(row);
+      } else if (type === "rePaymentRecord") {
+        this.$refs.creditRepaymentRecord.show(row);
+      }
+    },
+
+    // 重置查询
+    resetHandle() {
+      this.page = 1;
+      this.getTableData();
+    },
+    // 分页大小改变
+    sizeChange(e) {
+      this.tableData.size = e;
+      this.getTableData();
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e;
+      this.getTableData();
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.title {
+  font-weight: bold;
+  font-size: 16px;
+  color: #333333;
+}
+.filtration {
+  overflow: hidden;
+  .l {
+    float: left;
+  }
+  .r {
+    float: right;
+  }
+}
+</style>
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index d50fea7..cdf893a 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -134,7 +134,9 @@
       </div>
 
       <div class="u-m-t-30">
-        <el-button size="large" @click="discountShow">整单打折/减免</el-button>
+        <el-button size="large" @click="discountShow">
+          {{ checkOrderPay.discount ? checkOrderPay.discount / 10 + "折" : "整单打折/减免" }}
+        </el-button>
       </div>
       <div class="u-m-t-30">
         <p class="u-font-16 font-bold u-m-r-20 font-bold u-flex">选择支付方式</p>
@@ -157,6 +159,10 @@
     </div>
     <div class="right">
       <h3>账单明细</h3>
+      <p class="u-font-12 u-m-b-20">
+        <span class="color-red">*</span>
+        <span class="color-red">餐位费和打包费不参与折扣和满减</span>
+      </p>
       <div class="order-info">
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">订单号：</span>
@@ -164,15 +170,15 @@
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">餐位费</span>
-          <span class="u-m-l-10 value">￥{{ orderInfo.seatAmount }}</span>
+          <span class="u-m-l-10 value">￥{{ seatAmount }}</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.packFee }}</span>
+          <span class="u-m-l-10 value">￥{{ carts.packFee }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
-          <span class="title">总价</span>
-          <span class="u-m-l-10 value">￥{{ carts.payMoney }}</span>
+          <span class="title">商品订单金额</span>
+          <span class="u-m-l-10 value">￥{{ carts.goodsTotal }}</span>
         </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">商品优惠券</span>
@@ -182,20 +188,25 @@
           <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">-￥{{ discountAmount }}</span>
+        </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">积分抵扣</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>
-          <span class="u-m-l-10 value">-￥{{ checkOrderPay.discountAmount || 0 }}</span>
-        </div>
         <div class="u-flex u-m-b-10 u-row-between">
           <span class="title">抹零</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>
+          <span class="title">总价(商品订单金额-商品优惠券-满减券-整单改价-积分抵扣)</span>
+          <span class="u-m-l-10 value color-red">￥{{ totalMoney }}</span>
+        </div>
+        <div class="u-flex u-m-b-10 u-row-between">
+          <span class="title">应付金额(总价+客座费+打包费)</span>
           <span class="u-m-l-10 value price">￥{{ currentpayMoney }}</span>
         </div>
       </div>
@@ -206,6 +217,12 @@
     <discount ref="refDiscount" @confirm="discountConfirm"></discount>
     <!-- 优惠券 -->
     <popup-coupon ref="refCoupon" :user="user" @confirm="refCouponConfirm"></popup-coupon>
+    <!-- 挂账 -->
+    <chooseGuaZahng
+      ref="refGuaZhang"
+      :payMoney="currentpayMoney"
+      @confirm="refGuaZhangConfirm"
+    ></chooseGuaZahng>
   </div>
 </template>
 
@@ -213,6 +230,9 @@
 import * as quanUtil from "../quan_util.js";
 
 import { useCartsStore } from "@/store/modules/carts";
+import { useUserStore } from "@/store/modules/user";
+import chooseGuaZahng from "./popup-choose-guazhang.vue";
+const shopUser = useUserStore();
 const carts = useCartsStore();
 
 import popupCoupon from "./popup-coupon.vue";
@@ -225,6 +245,14 @@ import discount from "./discount.vue";
 import { ElLoading } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
 
+//挂账
+const refGuaZhang = ref();
+function refGuaZhangConfirm(guazhangRen) {
+  payOrder("arrears", true, guazhangRen);
+}
+function refGuaZhangShow() {
+  refGuaZhang.value.open();
+}
 //商品列表
 let goodsArr = [];
 
@@ -233,7 +261,7 @@ let $goodsPayPriceMap = {};
 const refCoupon = ref();
 let quansSelArr = ref([]);
 function openCoupon() {
-  refCoupon.value.open(carts.payMoney, props.orderInfo);
+  refCoupon.value.open(carts.goodsTotal, props.orderInfo);
 }
 //返回商品券抵扣金额
 function returnProDiscount(row) {
@@ -280,15 +308,14 @@ function discountConfirm(e) {
   console.log(e);
   Object.assign(checkOrderPay, e);
   if (e.discount) {
-    checkOrderPay.discountAmount =
-      carts.payMoney - ((carts.payMoney * (100 - e.discount)) / 100).toFixed(2);
+    checkOrderPay.discountAmount = carts.goodsTotal - (carts.goodsTotal * (100 - e.discount)) / 100;
   } else {
     checkOrderPay.discount = 0;
   }
 }
 function discountShow(e) {
   refDiscount.value.open({
-    amount: carts.payMoney,
+    amount: carts.goodsTotal - productCouponDiscountAmount.value,
   });
 }
 
@@ -303,12 +330,24 @@ const props = defineProps({
       return { id: "" };
     },
   },
+  perpole: {
+    type: [Number, String],
+    default: 0,
+  },
   orderInfo: {
     type: Object,
     default: () => {},
   },
 });
-
+const seatAmount = computed(() => {
+  if (shopUser.userInfo.isTableFee) {
+    return "0.00";
+  }
+  if (props.perpole >= 1) {
+    return (props.perpole * shopUser.userInfo.tableFee).toFixed(2);
+  }
+  return "0.00";
+});
 watch(
   () => props.user.id,
   (newval) => {
@@ -327,10 +366,10 @@ watch(
 );
 
 //002-获取订单可用积分及抵扣金额（支付页面使用）
-const pointsRes = ref({ usable: false, maxUsablePoints: 0, minDeductionPoints: 0 });
+const pointsRes = ref({ usable: true, maxUsablePoints: 0, minDeductionPoints: 0 });
 const usePointsNumber = ref(0);
 const orderAmountOrderAmount = computed(() => {
-  return (carts.payMoney - checkOrderPay.discountAmount).toFixed(2);
+  return (carts.goodsTotal - checkOrderPay.discountAmount).toFixed(2);
 });
 const pointsDiscountAmount = ref(0);
 watch(
@@ -352,6 +391,8 @@ async function pointsInit() {
   usePointsNumber.value = res.usable ? res.maxUsablePoints : 0;
   if (res.usable) {
     pointsToMoney();
+  } else {
+    score.sel = -1;
   }
   return res;
 }
@@ -378,7 +419,7 @@ const coupDiscount = computed(() => {
 });
 const score = reactive({
   list: [],
-  sel: 0,
+  sel: -1,
 });
 
 const payTypes = reactive({
@@ -426,16 +467,18 @@ function returnPayParams() {
       vipPrice: props.user.id && props.user.isVip ? 1 : 0,
       orderId: props.orderInfo.id,
       // discountRatio: (checkOrderPay.discount / 100).toFixed(2),
-      discountRatio: checkOrderPay.discount ? checkOrderPay.discount : 0,
-      seatNum: props.orderInfo.seatNum,
-      originAmount: carts.payMoney * 1,
-      discountAmount: !checkOrderPay.discount ? checkOrderPay.discountAmount * 1 : 0,
-      productCouponDiscountAmount: 0,
+      discountRatio: 0,
+      seatNum: props.perpole * 1,
+      originAmount: carts.payMoney * 1 - productCouponDiscountAmount.value + seatAmount.value * 1,
+      discountAmount: discountAmount.value,
+      productCouponDiscountAmount: productCouponDiscountAmount.value * 1,
       orderAmount: currentpayMoney.value * 1,
       roundAmount: props.orderInfo.roundAmount,
       pointsDiscountAmount: pointsDiscountAmount.value * 1,
       pointsNum: usePointsNumber.value * 1,
-      fullCouponDiscountAmount: 0,
+      fullCouponDiscountAmount: fullCouponDiscountAmount.value * 1,
+      couponList: quansSelArr.value.map((v) => v.id),
+      userId: props.user.userId || "",
     },
   };
 }
@@ -451,6 +494,10 @@ function refScanPayOpen(payType) {
   if (payType == "scanCode") {
     return refScanPay.value.open(returnPayParams(), "scanCode");
   }
+  if (payType == "arrears") {
+    refGuaZhangShow();
+    return;
+  }
 }
 
 async function getPaytype() {
@@ -478,6 +525,7 @@ function nowPayClick(payType) {
     payOrder(payType);
     return;
   }
+
   refScanPayOpen(payType);
 }
 
@@ -490,7 +538,7 @@ function refScanPayConfirm($authCode, isScan) {
 
 let payTimer = null;
 //是否是正扫
-async function payOrder(payType, isScan) {
+async function payOrder(payType, isScan, guazhangren) {
   clearTimeout(payTimer);
   const loading = ElLoading.service({
     lock: true,
@@ -522,6 +570,9 @@ async function payOrder(payType, isScan) {
         shopUserId: props.user.id,
       });
     }
+    if (payType == "arrears") {
+      res = await payApi.creditPay({ ...returnPayParams(), creditBuyerId: guazhangren.id });
+    }
   } catch (error) {
     console.log(error);
     clearTimeout(payTimer);
@@ -535,6 +586,14 @@ async function payOrder(payType, isScan) {
     loading.close();
   }
 }
+//整单改价
+const discountAmount = computed(() => {
+  const money = carts.goodsTotal - productCouponDiscountAmount.value;
+  if (checkOrderPay.discount) {
+    return ((money * (100 - checkOrderPay.discount)) / 100).toFixed(2);
+  }
+  return checkOrderPay.discountAmount;
+});
 //满减优惠券
 const fullCouponDiscountAmount = computed(() => {
   return quansSelArr.value
@@ -551,19 +610,20 @@ const productCouponDiscountAmount = computed(() => {
     return pre + returnProDiscount(cur, index) * 1;
   }, 0);
 });
-//应付金额
-const currentpayMoney = computed(() => {
-  if (checkOrderPay.discount) {
-    return (carts.payMoney * (checkOrderPay.discount / 100)).toFixed(2);
-  }
+//除开客座费，打包费总金额
+const totalMoney = computed(() => {
   return (
-    carts.payMoney -
+    carts.goodsTotal -
     productCouponDiscountAmount.value -
+    discountAmount.value -
     fullCouponDiscountAmount.value -
-    checkOrderPay.discountAmount -
     pointsDiscountAmount.value
   ).toFixed(2);
 });
+//应付金额
+const currentpayMoney = computed(() => {
+  return (totalMoney.value * 1 + carts.packFee * 1 + seatAmount.value * 1).toFixed(2);
+});
 watch(
   () => currentpayMoney.value,
   (newval) => {
diff --git a/src/views/tool/Instead/components/popup-choose-guazhang.vue b/src/views/tool/Instead/components/popup-choose-guazhang.vue
new file mode 100644
index 0000000..b9a50d6
--- /dev/null
+++ b/src/views/tool/Instead/components/popup-choose-guazhang.vue
@@ -0,0 +1,353 @@
+<template>
+  <div class="select_desk">
+    <el-dialog width="410px" title="挂账" v-model="show" @close="reset">
+      <div class="guazhangren u-flex u-row-between" @click="guazhangShow">
+        <template v-if="guazhangRen">
+          <div>
+            <div class="name">{{ guazhangRen.debtor }}/{{ guazhangRen.position }}</div>
+            <div class="u-m-t-6">手机号：{{ guazhangRen.mobile }}</div>
+          </div>
+          <div>
+            <div class="">可用额度</div>
+            <div class="u-m-t-6">{{ guazhangRen.remainingAmount }}</div>
+          </div>
+        </template>
+        <template v-else>
+          <div class="color-999">选择挂账人/单位</div>
+          <span class="el-icon-caret-bottom"></span>
+        </template>
+      </div>
+      <div class="select_desk_dialog u-p-b-20">
+        <div class="u-p-l-20 u-p-r-20 u-flex w-full u-relative box_status">
+          <div class="font-bold u-font-32">¥</div>
+          <el-input
+            placeholder="请输入挂账金额"
+            v-model="number"
+            @input="inputNumber"
+            @change="inputChange"
+            @focus="inputFocus"
+            @blur="inputBlur"
+            :type="focus ? 'number' : 'text'"
+          ></el-input>
+          <div class="zhezhao"></div>
+        </div>
+      </div>
+      <template #footer>
+        <div class="confirm_btns">
+          <el-button size="large" @click="close">取消</el-button>
+          <el-button type="primary" size="large" @click="confirm">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <choose-guazhang ref="refChooseGuazhang" @confirm="chooseGuazhangConfirm"></choose-guazhang>
+  </div>
+</template>
+    
+    <script>
+import { ElMessage } from "element-plus";
+import keyBoard from "./keyboard.vue";
+import chooseGuazhang from "./choose-guazhang.vue";
+export default {
+  components: { keyBoard, chooseGuazhang },
+  props: {
+    payMoney: {
+      type: [Number, String],
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      guazhangRen: "",
+      number: "",
+      show: false,
+      hasOpen: false,
+      loading: false,
+      tips: "",
+      focus: false,
+    };
+  },
+  watch: {
+    number(newval) {
+      console.log(newval);
+      if (newval * 1 > this.payMoney * 1) {
+        this.number = this.payMoney;
+        this.number = newval;
+      }
+      if (newval * 1 > this.payMoney * 1) {
+        this.tips = "已超出未结账金额";
+      } else {
+        const shengyu = this.payMoney - this.number;
+
+        this.tips = shengyu > 0 ? "还需额外支付" + shengyu.toFixed(2) + "元" : "";
+      }
+    },
+  },
+  methods: {
+    inputFocus() {
+      this.focus = true;
+    },
+    inputBlur() {
+      this.focus = false;
+    },
+    chooseGuazhangConfirm(e) {
+      this.guazhangRen = e;
+    },
+    guazhangShow() {
+      this.$refs.refChooseGuazhang.open();
+    },
+
+    inputNumber(e) {
+      console.log("inputNumber");
+      if (e * 1 > this.payMoney * 1) {
+        this.tips = "已超出未结账金额";
+      }
+    },
+    inputChange(e) {
+      if (e * 1 > this.payMoney * 1) {
+        this.tips = "已超出未结账金额";
+      }
+      console.log(e);
+    },
+    clear(e) {
+      console.log(e);
+      this.number = "";
+    },
+    confirm() {
+      if (this.number * 1 > this.payMoney * 1) {
+        return ElMessage("已超出未结账金额");
+      }
+      if (this.number * 1 <= 0) {
+        return ElMessage("支付金额不正确");
+      }
+      if (!this.guazhangRen) {
+        return ElMessage("请选择挂账人");
+      }
+      this.$emit("confirm", this.guazhangRen, this.number);
+      this.close();
+    },
+    open() {
+      console.log(this.payMoney);
+      this.number = this.payMoney * 1;
+      this.show = true;
+      this.tips = "还需额外支付" + this.payMoney + "元";
+    },
+    reset() {
+      this.number = "";
+      this.guazhangRen = "";
+    },
+    close() {
+      this.show = false;
+      this.number = "";
+    },
+  },
+  mounted() {},
+};
+</script>
+    
+    <style lang="scss" scoped>
+:deep(.el-button) {
+  padding: 12px 20px;
+}
+.box_status {
+  margin-bottom: 0;
+  margin-top: 30px;
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+}
+:deep(.el-input__wrapper) {
+  box-shadow: none;
+}
+:deep(.select_desk_dialog .el-input__inner) {
+  border: none;
+  font-size: 32px;
+}
+:deep(.el-input__inner::-webkit-inner-spin-button) {
+  -webkit-appearance: none;
+  margin: 0;
+}
+:deep(.el-input__inner::-webkit-outer-spin-button) {
+  -webkit-appearance: none;
+  margin: 0;
+}
+:deep(.el-button--success) {
+  border-color: #22bf64;
+  background-color: #22bf64;
+}
+.select_desk .btn {
+  height: 34px;
+}
+.tags {
+  font-size: 16px;
+  &.using {
+    color: rgb(234, 64, 37);
+  }
+  &.wait {
+    color: rgb(252, 236, 79);
+  }
+  &.idle {
+    color: rgb(137, 234, 71);
+  }
+  &.closed {
+    color: rgb(221, 221, 221);
+    filter: grayscale(1);
+  }
+}
+:deep(.inputs .el-input__inner) {
+  border-color: transparent !important;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  font-size: 20px;
+}
+.select_desk .select_desk_dialog {
+  display: flex;
+
+  flex-direction: column;
+
+  align-items: center;
+}
+
+.select_desk .select_desk_dialog .nav {
+  width: 286px;
+  height: 38px;
+  background: #dcf0e8;
+
+  justify-content: space-around;
+}
+
+.select_desk .select_desk_dialog .nav .li,
+.select_desk .select_desk_dialog .nav {
+  border-radius: 4px;
+
+  display: flex;
+
+  align-items: center;
+}
+
+.select_desk .select_desk_dialog .nav .li {
+  width: 140px;
+  height: 34px;
+  color: #0fc161;
+
+  justify-content: center;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.select_desk .select_desk_dialog .nav .lion {
+  background: #0fc161;
+  color: #fff;
+}
+
+.select_desk .select_desk_dialog .inputs {
+  width: 370px;
+  line-height: 54px;
+  margin-top: 24px;
+  height: 54px;
+  margin-bottom: 20px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+  font-size: 20px;
+  position: relative;
+}
+.zhezhao {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
+}
+.select_desk .select_desk_dialog .inputs .close {
+  color: #aaa;
+  position: absolute;
+  right: 10px;
+  height: 30px;
+  width: 30px;
+  line-height: 30px;
+  top: 50%;
+  margin-top: -15px;
+  cursor: pointer;
+}
+.guazhangren {
+  padding: 12px 10px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  margin-top: 20px;
+  min-height: 58px;
+  color: #999;
+  cursor: pointer;
+  .name {
+    color: #3f9eff;
+  }
+}
+
+.select_desk .select_desk_dialog .keyboard {
+  display: flex;
+
+  flex-wrap: wrap;
+  width: 100%;
+  margin-top: 20px;
+  margin-bottom: 10px;
+  border-right: 1px solid #dcdfe6;
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.select_desk .select_desk_dialog .keyboard .li {
+  height: 60px;
+  width: 33.333%;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 24px;
+  color: #212121;
+  cursor: pointer;
+
+  user-select: none;
+  border-left: 1px solid #dcdfe6;
+  border-top: 1px solid #dcdfe6;
+
+  transition: all 0.1s;
+}
+
+.select_desk .select_desk_dialog .keyboard .li:hover {
+  background: #dcdfe6;
+}
+
+.select_desk .select_desk_dialog .keyboard .li .icon {
+  font-size: 1.3em;
+}
+
+.select_desk .select_desk_dialog .keyboard .confirm {
+  height: 140px;
+  background: #ff9f2e;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  border-right: none;
+}
+
+.select_desk .select_desk_dialog .keyboard .confirm:hover {
+  background: #f88502;
+}
+
+.confirm_btns {
+  display: flex;
+
+  justify-content: space-between;
+  width: 100%;
+}
+
+.confirm_btns .el-button {
+  width: 175px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 2182c68..936a35d 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -178,6 +178,7 @@
             @chooseUser="showChooseUser"
             @paysuccess="refresh"
             :table="table"
+            :perpole="perpole"
             v-else
             :user="user"
           ></Order>
@@ -628,7 +629,8 @@ function init() {
 }
 
 onMounted(async () => {
-  const { id } = route.query;
+  const { id, tableCode } = route.query;
+  console.log(id, tableCode);
   if (id) {
     // 获取历史订单数据
     const res = await orderApi.getHistoryList({
@@ -667,6 +669,10 @@ onMounted(async () => {
       showOrder.value = true;
     }
   }
+  if (tableCode) {
+    const tableRes = await tableApi.get({ tableCode: tableCode });
+    table.value = tableRes || {};
+  }
   init();
 });
 
@@ -723,7 +729,7 @@ $pl: 30px;
       display: flex;
       max-height: calc(100vh - 256px);
       .left {
-        width: 350px;
+        width: 1;
         padding-right: 14px;
         box-sizing: border-box;
         display: flex;
@@ -736,7 +742,7 @@ $pl: 30px;
         }
       }
       .right {
-        flex: 1;
+        flex: 3;
         overflow-x: hidden;
         overflow-y: scroll;
         &::-webkit-scrollbar {
@@ -886,4 +892,12 @@ $pl: 30px;
   border-radius: 2px;
   margin-right: 6px;
 }
+.vip {
+  padding: 2px 5px;
+  background: #f7793d;
+  color: #fff;
+  border-radius: 4px;
+  margin-left: 10px;
+  font-size: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
index 24aed1c..5f717c0 100644
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@@ -227,7 +227,7 @@
 
 <script setup>
 import status from "./status.js";
-
+const router = useRouter();
 import shopAreaApi from "@/api/account/shopArea";
 import tableApi from "@/api/account/table";
 import addEara from "./components/addEara.vue";
@@ -335,35 +335,16 @@ async function areainit() {
   }, {});
 }
 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, '');
+  if (!key) {
+    router.push({ path: "/tool/index", query: { tableCode: item.tableCode } });
     return;
   }
-  const num = item.useNum || 0;
-  if (item.useNum <= 0) {
-    return this.$refs.refChooseDinersNumber.open();
+  if (key == "isAddGoods") {
+    router.push({ path: "/tool/index", query: { id: item.orderId } });
+  }
+  if (key == "isPayOrder") {
+    router.push({ path: "/tool/index", query: { id: item.orderId } });
   }
-  this.toInstead({ num: num, key });
-  // this.$refs.diancan.open(item, key, num);
 }
 const tabClick = (tab) => {
   console.log(tab);