From 13bd39fbed82121ed5f3da9ea327843e7174d0a1 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 7 May 2026 15:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |    3 +-
 src/api/account/payType.ts                    |   23 +
 src/api/order/fince.ts                        |   26 +
 src/components/CURD/PageContent.vue           |  305 ++-
 src/components/CURD/PageSearch.vue            |    2 +-
 src/components/CURD/types.ts                  |    3 +
 src/components/importData/index copy.vue      |  305 +++
 src/components/importData/index.vue           |  156 +-
 src/lib/coupon.ts                             |   98 +-
 src/lib/goods.ts                              | 1946 ++++++++---------
 src/lib/limit.ts                              |   10 +-
 src/lib/utils.ts                              |   33 +
 src/store/modules/carts-back.ts               |    3 +-
 src/store/modules/user.ts                     |    5 +-
 src/views/data/credit/config/add.ts           |   75 +-
 src/views/data/credit/config/content.ts       |   32 +-
 src/views/data/credit/config/edit.ts          |   75 +-
 src/views/data/credit/config/search.ts        |   39 +-
 src/views/data/credit/index.vue               |   21 +
 src/views/data/index.vue                      |  321 ++-
 src/views/devices/config/config.ts            |    4 +-
 .../index/components/GoodsListCollapse.vue    |   98 +
 src/views/order/index/config/config.ts        |   14 +-
 src/views/order/index/config/content.ts       |    8 +
 src/views/order/index/index.vue               |   72 +-
 .../system-setting/pay-types/config/add.ts    |   14 +-
 .../pay-types/config/content.ts               |   64 +-
 .../system-setting/pay-types/config/edit.ts   |   14 +-
 .../system-setting/pay-types/index copy.vue   |  123 ++
 src/views/system-setting/pay-types/index.vue  |  140 +-
 .../Instead/components/choose-guazhang.vue    |    7 +-
 src/views/tool/Instead/components/order.vue   |  196 +-
 .../components/popup-choose-guazhang.vue      |   12 +-
 .../Instead/components/popup-linshiCai.vue    |   12 +-
 src/views/tool/Instead/index.vue              |  130 +-
 src/views/tool/table/index.vue                |    8 +-
 36 files changed, 2915 insertions(+), 1482 deletions(-)
 create mode 100644 src/api/order/fince.ts
 create mode 100644 src/components/importData/index copy.vue
 create mode 100644 src/lib/utils.ts
 create mode 100644 src/views/order/index/components/GoodsListCollapse.vue
 create mode 100644 src/views/system-setting/pay-types/index copy.vue

diff --git a/package.json b/package.json
index a2a93f7..63acc46 100644
--- a/package.json
+++ b/package.json
@@ -65,9 +65,10 @@
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-clipboard3": "^2.0.0",
+    "vue-draggable-plus": "^0.6.1",
     "vue-i18n": "^11.1.0",
     "vue-router": "^4.5.0",
-    "ysk-utils": "^1.0.85"
+    "ysk-utils": "^1.0.91"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
diff --git a/src/api/account/payType.ts b/src/api/account/payType.ts
index b0b46c9..1d750e2 100644
--- a/src/api/account/payType.ts
+++ b/src/api/account/payType.ts
@@ -27,11 +27,34 @@ const Api = {
       method: "post",
       data
     });
+  },
+  // 排序
+  sort(params: sortRequest) {
+    return request<any>({
+      url: `${baseURL}/sort`,
+      method: "get",
+      params
+    });
   }
 
 };
 
 export default Api;
+export interface sortRequest {
+  /**
+   * 拖动的支付类型ID
+   */
+  id: number;
+  /**
+   * 店铺ID
+   */
+  shopId: number;
+  /**
+   * 目标位置排序号
+   */
+  targetSort: number;
+  [property: string]: any;
+}
 
 interface getRequset {
   id?: string
diff --git a/src/api/order/fince.ts b/src/api/order/fince.ts
new file mode 100644
index 0000000..62590eb
--- /dev/null
+++ b/src/api/order/fince.ts
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+import { Order_BaseUrl } from "@/api/config";
+const baseURL = Order_BaseUrl + "/admin";
+const FinanceApi = {
+  financeBase(params: Request) {
+    return request<any, any>({
+      url: `${baseURL}/finance/base`,
+      method: "get",
+      params
+    });
+  },
+
+};
+
+export interface Request {
+  /**
+   * 日期yyyy-MM-dd
+   */
+  date: string;
+  shopId: number;
+  type: string;
+  [property: string]: any;
+}
+
+
+export default FinanceApi;
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 6b202d3..bb296e2 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -3,43 +3,64 @@
     <!-- 表格工具栏 -->
     <div class="flex-x-between mb-[10px]">
       <!-- 左侧工具栏 -->
-      <div style="display: flex;">
+      <div style="display: flex">
         <template v-for="item in toolbar" :key="item">
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="primary" icon="plus"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="primary"
+                icon="plus"
+                @click="handleToolbar(item)"
+              >
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
-                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="danger"
+                icon="delete"
+                :disabled="removeIds.length === 0"
+                @click="handleToolbar(item)"
+              >
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="upload"
+                @click="handleToolbar(item)"
+              >
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="download"
+                @click="handleToolbar(item)"
+              >
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button v-if="item.hidden === undefined || item.hidden === false"
-              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" :type="item.type ?? 'default'"
-              @click="handleToolbar(item.name)">
+            <el-button
+              v-if="item.hidden === undefined || item.hidden === false"
+              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+              :icon="item.icon"
+              :type="item.type ?? 'default'"
+              @click="handleToolbar(item.name)"
+            >
               {{ item.text }}
             </el-button>
           </template>
@@ -70,36 +91,68 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:export`]"
+                icon="download"
+                circle
+                title="导出"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:import`]"
+                icon="upload"
+                circle
+                title="导入"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:query`]"
+                icon="search"
+                circle
+                title="搜索"
+                @click="handleToolbar(item)"
+              />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
-                :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
             <template v-else>
-              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
-      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      v-bind="contentConfig.table"
+      :data="pageData"
+      :row-key="pk"
+      @selection-change="handleSelectionChange"
+      @filter-change="handleFilterChange"
+    >
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -108,15 +161,24 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
-                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
-                        }px`" />
+                    <el-image
+                      :src="item"
+                      :preview-src-list="scope.row[col.prop]"
+                      :initial-index="index"
+                      :preview-teleported="true"
+                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
+                        col.imageHeight ?? 40
+                      }px`"
+                    />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
+                  <el-image
+                    :src="scope.row[col.prop]"
+                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                  />
                 </template>
               </template>
             </template>
@@ -138,20 +200,30 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
-                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
+                <el-switch
+                  v-model="scope.row[col.prop]"
+                  :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0"
+                  :inline-prompt="true"
+                  :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''"
+                  :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                    " />
+                  "
+                />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
+                <el-input
+                  v-model="scope.row[col.prop]"
+                  :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
+                />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -183,7 +255,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                      .value
+                        .value
                     : ""
                 }}
               </template>
@@ -194,15 +266,21 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
+                    <el-button
+                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'"
+                      :icon="item"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
@@ -210,43 +288,63 @@
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
                   <template v-if="item.hidden === undefined || item.hidden === false">
-                    <el-button v-if="item.isBtn" v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-                      :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
+                    <el-button
+                      v-if="item.isBtn"
+                      v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                      :icon="item.icon"
+                      :type="item.type ?? 'primary'"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item.name,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item.text }}
                     </el-button>
 
                     <el-dropdown style="margin-top: 4px" v-else>
-                      <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth
-                        ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] }
-                        : {}
-                        " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
+                      <el-button
+                        v-if="item.render === undefined || item.render(scope.row)"
+                        v-bind="
+                          item.auth
+                            ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] }
+                            : {}
+                        "
+                        :icon="item.icon"
+                        :type="item.type ?? 'primary'"
+                        size="small"
+                        link
+                        @click="
                           handleOperat({
                             name: item.name,
                             row: scope.row,
                             column: scope.column,
                             $index: scope.$index,
                           })
-                          ">
+                        "
+                      >
                         {{ item.text }}
                       </el-button>
                       <template #dropdown v-if="item.options && item.options.length > 0">
                         <el-dropdown-menu>
-                          <el-dropdown-item @click="
-                            handleOperat({
-                              name: item.name,
-                              row: scope.row,
-                              column: scope.column,
-                              $index: scope.$index,
-                              command: opt.command ? opt.command : '',
-                            })
-                            " v-for="opt in item.options" :key="opt.value">
+                          <el-dropdown-item
+                            @click="
+                              handleOperat({
+                                name: item.name,
+                                row: scope.row,
+                                column: scope.column,
+                                $index: scope.$index,
+                                command: opt.command ? opt.command : '',
+                              })
+                            "
+                            v-for="opt in item.options"
+                            :key="opt.value"
+                          >
                             {{ opt.label }}
                           </el-dropdown-item>
                         </el-dropdown-menu>
@@ -268,18 +366,33 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination
+            v-bind="pagination"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
-      @close="handleCloseExportsModal">
+    <el-dialog
+      v-model="exportsModalVisible"
+      :align-center="true"
+      title="导出数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseExportsModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData" :rules="exportsFormRules">
+        <el-form
+          ref="exportsFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="exportsFormData"
+          :rules="exportsFormRules"
+        >
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -289,10 +402,16 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
-                :disabled="selectionData.length <= 0" />
-              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined" />
+              <el-option
+                label="选中数据 (所有选中的数据)"
+                :value="ExportsOriginEnum.SELECTED"
+                :disabled="selectionData.length <= 0"
+              />
+              <el-option
+                label="全量数据 (所有分页的数据)"
+                :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -313,17 +432,35 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
-      @close="handleCloseImportModal">
+    <el-dialog
+      v-model="importModalVisible"
+      :align-center="true"
+      title="导入数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseImportModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData" :rules="importFormRules">
+        <el-form
+          ref="importFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData"
+          :rules="importFormRules"
+        >
           <el-form-item label="文件名" prop="files">
-            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
+            <el-upload
+              ref="uploadRef"
+              v-model:file-list="importFormData.files"
+              class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
+              :drag="true"
+              :limit="1"
+              :auto-upload="false"
+              :on-exceed="handleFileExceed"
+            >
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -332,8 +469,13 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
-                    @click="handleDownloadTemplate">
+                  <el-link
+                    v-if="contentConfig.importTemplate"
+                    type="primary"
+                    icon="download"
+                    :underline="false"
+                    @click="handleDownloadTemplate"
+                  >
                     下载模板
                   </el-link>
                 </div>
@@ -345,7 +487,11 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
+          <el-button
+            type="primary"
+            :disabled="importFormData.files.length === 0"
+            @click="handleImportSubmit"
+          >
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -861,10 +1007,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-          [request.pageName]: pagination.currentPage,
-          [request.limitName]: pagination.pageSize,
-          ...formData,
-        }
+            [request.pageName]: pagination.currentPage,
+            [request.limitName]: pagination.pageSize,
+            ...formData,
+          }
         : formData
     )
     .then((data) => {
@@ -929,7 +1075,7 @@ function saveXlsx(fileData: BlobPart, fileName: string) {
   document.body.removeChild(downloadLink);
   window.URL.revokeObjectURL(downloadUrl);
 }
-function test(rows: any[]) { }
+function test(rows: any[]) {}
 
 const defaultSelData = ref<IObject[]>([]);
 // 设置默认选择
@@ -964,6 +1110,7 @@ defineExpose({
   pagination,
   test,
   setSelectTable,
+  pageData,
 });
 </script>
 
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index b05e811..1ec0a29 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -177,7 +177,7 @@ const formItems = reactive(props.searchConfig.formItems);
 // 是否可展开/收缩
 const isExpandable = ref(props.searchConfig.isExpandable ?? true);
 // 是否已展开
-const isExpand = ref(false);
+const isExpand = ref(props.searchConfig.isExpand ?? false);
 // 表单项展示数量，若可展开，超出展示数量的表单项隐藏
 const showNumber = computed(() => {
   if (isExpandable.value === true) {
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index d1f97b4..5d4cd5d 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -31,6 +31,7 @@ export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
   pageName: string;
   inline?: Boolean;
+  isExpand?: boolean;
   // 表单项
   formItems: Array<{
     // 组件类型(如input,select等)
@@ -58,6 +59,7 @@ export interface ISearchConfig {
 }
 
 export interface IContentConfig<T = any> {
+  rowDraggable?: boolean;
   resultListKey?: string;
   // 页面名称(参与组成权限标识,如sys:user:xxx)
   pageName: string;
@@ -189,6 +191,7 @@ export interface IContentConfig<T = any> {
     | "icon"
     | "date"
     | "tool"
+    | "drag-handle"
     | "custom";
     // image模板相关参数
     imageWidth?: number;
diff --git a/src/components/importData/index copy.vue b/src/components/importData/index copy.vue
new file mode 100644
index 0000000..d95d5ad
--- /dev/null
+++ b/src/components/importData/index copy.vue	
@@ -0,0 +1,305 @@
+<!-- 批量导入数据dialog -->
+<template>
+  <div>
+    <div class="btn_row">
+      <el-button type="success" icon="RefreshRight" @click="updateData">数据更新</el-button>
+
+      <el-button type="primary" icon="Upload" @click="show">批量导入</el-button>
+      <el-button icon="Download" @click="downloadTemplateAjax">下载银收客模板</el-button>
+    </div>
+    <el-dialog
+      title="批量导入"
+      width="800px"
+      v-model="visible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      @close="dialogClose"
+    >
+      <div class="row">
+        <tabHeader v-model="tabActive" :list="tabs" />
+      </div>
+      <div class="row mt14">
+        <div class="import_container" v-if="tabActive == 0">
+          <div class="header_title">第一步：选择模板</div>
+          <div class="row mt14 pb50">
+            <div class="list">
+              <div
+                class="item"
+                :class="{ active: platformActive == index }"
+                v-for="(item, index) in platformList"
+                :key="item.id"
+                @click="selectPlatform(item)"
+              >
+                <img class="img" :src="item.img" alt="" />
+              </div>
+            </div>
+          </div>
+          <div class="header_title">
+            第二步：上传文件
+            <span>单次仅可上传一个文件</span>
+          </div>
+          <div class="row mt14">
+            <GfileUpload
+              v-model="form.files"
+              :accept="platformList[platformActive]?.file_type || ''"
+              :limit="1"
+              @file-selected="fileSelected"
+            />
+          </div>
+          <div class="row mt14">
+            <div class="footer_wrap">
+              <el-button @click="visible = false">取 消</el-button>
+              <el-button
+                type="primary"
+                :disabled="!form.files.length"
+                :loading="loading"
+                @click="startImportHandle"
+              >
+                <template v-if="!form.files.length">请选择文件</template>
+                <template v-else>开始导入</template>
+              </el-button>
+            </div>
+          </div>
+        </div>
+        <el-table :data="tableData" border stripe v-if="tabActive == 1" height="419px">
+          <el-table-column prop="file_name" label="文件名称" width="300" />
+          <el-table-column prop="created_time" label="导入时间" width="200" />
+          <el-table-column prop="status_text" label="导入状态" width="150">
+            <template #default="scope">
+              <el-tag v-if="scope.row.status == 0" type="info" disable-transitions>
+                待处理...
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == 1" type="warning" disable-transitions>
+                处理中...
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == 2" type="success" disable-transitions>
+                处理完成
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == -1" type="danger" disable-transitions>
+                导入失败
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="importResult" label="导入结果">
+            <template #default="scope">
+              <template v-if="scope.row.status == 2">
+                <div class="column">
+                  <div>
+                    <el-text type="success">成功：{{ scope.row.success_num }} 条</el-text>
+                  </div>
+                  <div>
+                    <el-text type="danger">失败：{{ scope.row.fail_num }} 条</el-text>
+                  </div>
+                </div>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from "vue";
+import { getplatlist, uploadFile, importlist, downloadTemp } from "@/importDataApi/index.js";
+import GfileUpload from "../Upload/GfileUpload.vue";
+import tabHeader from "@/views/marketing_center/components/tabHeader.vue";
+import { ElMessage } from "element-plus";
+
+const props = defineProps({
+  type: {
+    type: [String, Number],
+    default: 3, // 3商品 4台桌区域 5台桌 6会员 7菜品销售统计 8台桌销售统计 9订单销售统计
+  },
+});
+
+const platformList = ref([]);
+const platformActive = ref(0);
+function selectPlatform(item) {
+  form.value.files = [];
+  platformActive.value = platformList.value.findIndex((i) => i.id === item.id);
+}
+
+const tabs = ref([
+  { label: "导入数据", name: "importData" },
+  { label: "导入记录", name: "importRecord" },
+]);
+
+const tabActive = ref(0);
+
+watch(tabActive, (newVal) => {
+  if (newVal === 1) {
+    getImportRecord();
+  }
+});
+
+const visible = ref(false);
+const loading = ref(false);
+const form = ref({
+  files: [],
+  platform: "",
+});
+
+function fileSelected(file) {
+  console.log("fileSelected", file);
+}
+
+// 开始导入
+async function startImportHandle() {
+  try {
+    form.value.platform = platformList.value[platformActive.value]?.id;
+    const formData = new FormData();
+    formData.append("file", form.value.files[0].raw);
+    formData.append("shop_id", localStorage.getItem("shopId"));
+    formData.append("type", props.type);
+    formData.append("platform", form.value.platform);
+    loading.value = true;
+    await uploadFile(formData);
+    ElMessage.success("文件上传成功，正在导入数据，请在导入记录中查看导入结果");
+    form.value.files = [];
+    tabActive.value = 1;
+  } catch (error) {
+    console.log(error);
+  }
+  setTimeout(() => {
+    loading.value = false;
+  }, 500);
+}
+
+// 获取平台列表
+async function getPlatformList() {
+  try {
+    const res = await getplatlist({ plat_type: props.type });
+    platformList.value = res;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+// 导入记录
+const tableData = ref([]);
+async function getImportRecord() {
+  try {
+    const res = await importlist({ shop_id: localStorage.getItem("shopId") });
+    tableData.value = res;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+// 下载模板
+async function downloadTemplateAjax() {
+  try {
+    const res = await downloadTemp({ plat_type: props.type });
+    window.open(res, "_blank");
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+const emits = defineEmits(["close", "update"]);
+
+function updateData() {
+  // 把 ElMessage 改成 ElMessageBox 就好了
+  ElMessageBox.confirm("确认需要更新经营数据吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(() => {
+      emits("update");
+    })
+    .catch(() => {
+      // 取消操作，空着就行
+    });
+}
+
+function dialogClose() {
+  emits("close");
+}
+
+onMounted(() => {
+  getPlatformList();
+});
+
+function show() {
+  visible.value = true;
+}
+
+defineExpose({
+  show,
+});
+</script>
+
+<style scoped lang="scss">
+.btn_row {
+  display: flex;
+  gap: 4px;
+  margin-left: 14px;
+}
+
+.header_title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  display: flex;
+  align-items: center;
+
+  span {
+    font-size: 12px;
+    color: #999999;
+    margin-left: 10px;
+  }
+}
+
+.row {
+  &.mt14 {
+    margin-top: 14px;
+  }
+
+  &.pb50 {
+    padding-bottom: 50px;
+  }
+}
+
+.import_container {
+  .list {
+    display: flex;
+    gap: 24px;
+
+    .item {
+      width: 122px;
+      height: 42px;
+      border: 1px solid #fff;
+      border-radius: 4px;
+      overflow: hidden;
+
+      &:hover {
+        cursor: pointer;
+        border-color: var(--el-color-primary);
+      }
+
+      &.active {
+        border-color: var(--el-color-primary);
+      }
+
+      .img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+
+  .footer_wrap {
+    display: flex;
+    gap: 14px;
+    justify-content: flex-end;
+  }
+}
+
+.column {
+  display: flex;
+  flex-direction: column;
+}
+</style>
diff --git a/src/components/importData/index.vue b/src/components/importData/index.vue
index 63427cf..1010157 100644
--- a/src/components/importData/index.vue
+++ b/src/components/importData/index.vue
@@ -2,11 +2,19 @@
 <template>
   <div>
     <div class="btn_row">
+      <el-button type="success" icon="RefreshRight" @click="updateData">数据更新</el-button>
+
       <el-button type="primary" icon="Upload" @click="show">批量导入</el-button>
       <el-button icon="Download" @click="downloadTemplateAjax">下载银收客模板</el-button>
     </div>
-    <el-dialog title="批量导入" width="800px" v-model="visible" :close-on-click-modal="false" :close-on-press-escape="false"
-      @close="dialogClose">
+    <el-dialog
+      title="批量导入"
+      width="800px"
+      v-model="visible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      @close="dialogClose"
+    >
       <div class="row">
         <tabHeader v-model="tabActive" :list="tabs" />
       </div>
@@ -15,23 +23,38 @@
           <div class="header_title">第一步：选择模板</div>
           <div class="row mt14 pb50">
             <div class="list">
-              <div class="item" :class="{ active: platformActive == index }" v-for="(item, index) in platformList"
-                :key="item.id" @click="selectPlatform(item)">
-                <img class="img" :src="item.img" alt="">
+              <div
+                class="item"
+                :class="{ active: platformActive == index }"
+                v-for="(item, index) in platformList"
+                :key="item.id"
+                @click="selectPlatform(item)"
+              >
+                <img class="img" :src="item.img" alt="" />
               </div>
             </div>
           </div>
-          <div class="header_title">第二步：上传文件
+          <div class="header_title">
+            第二步：上传文件
             <span>单次仅可上传一个文件</span>
           </div>
           <div class="row mt14">
-            <GfileUpload v-model="form.files" :accept="platformList[platformActive]?.file_type || ''" :limit="1"
-              @file-selected="fileSelected" />
+            <GfileUpload
+              v-model="form.files"
+              :accept="platformList[platformActive]?.file_type || ''"
+              :limit="1"
+              @file-selected="fileSelected"
+            />
           </div>
           <div class="row mt14">
             <div class="footer_wrap">
               <el-button @click="visible = false">取 消</el-button>
-              <el-button type="primary" :disabled="!form.files.length" :loading="loading" @click="startImportHandle">
+              <el-button
+                type="primary"
+                :disabled="!form.files.length"
+                :loading="loading"
+                @click="startImportHandle"
+              >
                 <template v-if="!form.files.length">请选择文件</template>
                 <template v-else>开始导入</template>
               </el-button>
@@ -43,10 +66,18 @@
           <el-table-column prop="created_time" label="导入时间" width="200" />
           <el-table-column prop="status_text" label="导入状态" width="150">
             <template #default="scope">
-              <el-tag v-if="scope.row.status == 0" type="info" disable-transitions>待处理...</el-tag>
-              <el-tag v-else-if="scope.row.status == 1" type="warning" disable-transitions>处理中...</el-tag>
-              <el-tag v-else-if="scope.row.status == 2" type="success" disable-transitions>处理完成</el-tag>
-              <el-tag v-else-if="scope.row.status == -1" type="danger" disable-transitions>导入失败</el-tag>
+              <el-tag v-if="scope.row.status == 0" type="info" disable-transitions>
+                待处理...
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == 1" type="warning" disable-transitions>
+                处理中...
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == 2" type="success" disable-transitions>
+                处理完成
+              </el-tag>
+              <el-tag v-else-if="scope.row.status == -1" type="danger" disable-transitions>
+                导入失败
+              </el-tag>
             </template>
           </el-table-column>
           <el-table-column prop="importResult" label="导入结果">
@@ -66,19 +97,45 @@
         </el-table>
       </div>
     </el-dialog>
+
+    <!-- 日期选择弹窗 -->
+    <el-dialog
+      v-model="dateDialogVisible"
+      title="选择更新日期"
+      width="500px"
+      @close="dateDialogVisible = false"
+    >
+      <div style="padding: 20px 0">
+        <el-date-picker
+          v-model="selectDate"
+          type="date"
+          label="选择日期"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择日期"
+          style="width: 100%"
+        />
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dateDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="confirmUpdateDate">确认更新</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue';
-import { getplatlist, uploadFile, importlist, downloadTemp } from '@/importDataApi/index.js';
-import GfileUpload from '../Upload/GfileUpload.vue';
-import tabHeader from '@/views/marketing_center/components/tabHeader.vue';
+import { ref, onMounted, watch } from "vue";
+import { getplatlist, uploadFile, importlist, downloadTemp } from "@/importDataApi/index.js";
+import GfileUpload from "../Upload/GfileUpload.vue";
+import tabHeader from "@/views/marketing_center/components/tabHeader.vue";
+import { ElMessage, ElMessageBox } from "element-plus";
 
 const props = defineProps({
   type: {
     type: [String, Number],
-    default: 3, // 3商品 4台桌区域 5台桌 6会员 7菜品销售统计 8台桌销售统计 9订单销售统计
+    default: 3,
   },
 });
 
@@ -86,15 +143,15 @@ const platformList = ref([]);
 const platformActive = ref(0);
 function selectPlatform(item) {
   form.value.files = [];
-  platformActive.value = platformList.value.findIndex(i => i.id === item.id);
+  platformActive.value = platformList.value.findIndex((i) => i.id === item.id);
 }
 
 const tabs = ref([
-  { label: '导入数据', name: 'importData' },
-  { label: '导入记录', name: 'importRecord' },
+  { label: "导入数据", name: "importData" },
+  { label: "导入记录", name: "importRecord" },
 ]);
 
-const tabActive = ref(0)
+const tabActive = ref(0);
 
 watch(tabActive, (newVal) => {
   if (newVal === 1) {
@@ -106,11 +163,16 @@ const visible = ref(false);
 const loading = ref(false);
 const form = ref({
   files: [],
-  platform: ''
-})
+  platform: "",
+});
+
+// 日期选择弹窗
+const dateDialogVisible = ref(false);
+const today = new Date().toISOString().split("T")[0];
+const selectDate = ref(today); // 默认当天
 
 function fileSelected(file) {
-  console.log('fileSelected', file);
+  console.log("fileSelected", file);
 }
 
 // 开始导入
@@ -118,15 +180,15 @@ async function startImportHandle() {
   try {
     form.value.platform = platformList.value[platformActive.value]?.id;
     const formData = new FormData();
-    formData.append('file', form.value.files[0].raw);
-    formData.append('shop_id', localStorage.getItem('shopId'));
-    formData.append('type', props.type);
-    formData.append('platform', form.value.platform);
+    formData.append("file", form.value.files[0].raw);
+    formData.append("shop_id", localStorage.getItem("shopId"));
+    formData.append("type", props.type);
+    formData.append("platform", form.value.platform);
     loading.value = true;
     await uploadFile(formData);
-    ElMessage.success('文件上传成功，正在导入数据，请在导入记录中查看导入结果');
-    form.value.files = []
-    tabActive.value = 1
+    ElMessage.success("文件上传成功，正在导入数据，请在导入记录中查看导入结果");
+    form.value.files = [];
+    tabActive.value = 1;
   } catch (error) {
     console.log(error);
   }
@@ -149,7 +211,7 @@ async function getPlatformList() {
 const tableData = ref([]);
 async function getImportRecord() {
   try {
-    const res = await importlist({ shop_id: localStorage.getItem('shopId') });
+    const res = await importlist({ shop_id: localStorage.getItem("shopId") });
     tableData.value = res;
   } catch (error) {
     console.log(error);
@@ -160,20 +222,38 @@ async function getImportRecord() {
 async function downloadTemplateAjax() {
   try {
     const res = await downloadTemp({ plat_type: props.type });
-    window.open(res, '_blank');
+    window.open(res, "_blank");
   } catch (error) {
     console.log(error);
   }
 }
 
-const emits = defineEmits(['close'])
+const emits = defineEmits(["close", "update"]);
+
+// ==================================
+// 数据更新（打开日期选择框）
+// ==================================
+function updateData() {
+  dateDialogVisible.value = true;
+}
+
+// 确认选择日期并更新
+function confirmUpdateDate() {
+  if (!selectDate.value) {
+    ElMessage.warning("请选择日期");
+    return;
+  }
+  dateDialogVisible.value = false;
+  emits("update", selectDate.value); // 把选中的日期传给父组件
+  // ElMessage.success("已选择日期：" + selectDate.value);
+}
 
 function dialogClose() {
-  emits('close')
+  emits("close");
 }
 
 onMounted(() => {
-  getPlatformList()
+  getPlatformList();
 });
 
 function show() {
@@ -255,4 +335,4 @@ defineExpose({
   display: flex;
   flex-direction: column;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/lib/coupon.ts b/src/lib/coupon.ts
index 1d1709f..2632cc6 100644
--- a/src/lib/coupon.ts
+++ b/src/lib/coupon.ts
@@ -16,6 +16,8 @@ import {
   OrderCostSummary,
 } from "./types";
 
+import { getCompatibleFieldValue } from "./utils";
+
 /**
  * 返回商品单价
  * @param goods 商品
@@ -46,7 +48,13 @@ export function returnGoodsPrice(
   // 限时折扣
   if (limitTimeDiscount && limitTimeDiscount.id) {
     //优先使用
-    if (goods.isTimeDiscount || goods.is_time_discount) {
+    // 兼容 isTimeDiscount/is_time_discount（这里顺便处理该字段的命名兼容）
+    const isTimeDiscount = getCompatibleFieldValue(
+      goods,
+      "isTimeDiscount",
+      "is_time_discount"
+    );
+    if (isTimeDiscount) {
       return new BigNumber(goods.salePrice)
         .times(limitTimeDiscount.discountRate / 100)
         .decimalPlaces(2, BigNumber.ROUND_UP)
@@ -169,7 +177,15 @@ export function returnCanDikouGoodsArr(args: CanDikouGoodsArrArgs) {
     })
     .filter((v) => {
       const canUseNum = (v.num ?? 0) - (v.returnNum || 0);
-      if (canUseNum <= 0 || v.is_temporary || v.is_gift) {
+      // 兼容 is_temporary/isTemporary 和 is_gift/isGift
+      const isTemporary = getCompatibleFieldValue(
+        v,
+        "isTemporary",
+        "is_temporary"
+      );
+      const isGift = getCompatibleFieldValue(v, "isGift", "is_gift");
+
+      if (canUseNum <= 0 || isTemporary || isGift) {
         return false;
       }
 
@@ -188,7 +204,13 @@ function returnGoodsIsUseVipPrice(
   user: ShopUserInfo,
   goods: BaseCartItem
 ) {
-  if (goods.is_time_discount) {
+  // 兼容 isTimeDiscount/is_time_discount
+  const isTimeDiscount = getCompatibleFieldValue(
+    goods,
+    "isTimeDiscount",
+    "is_time_discount"
+  );
+  if (isTimeDiscount) {
     return false;
   }
   if (shopInfo.isMemberPrice != 1 || user.isVip != 1) {
@@ -214,12 +236,16 @@ function returnCanCalcGoodsList(
   user: ShopUserInfo
 ) {
   return canCalcGoodsArr.filter((goods) => {
-    if (
-      !coupon.discountShare &&
-      (goods.is_time_discount || goods.isTimeDiscount)
-    ) {
+    // 兼容 isTimeDiscount/is_time_discount
+    const isTimeDiscount = getCompatibleFieldValue(
+      goods,
+      "isTimeDiscount",
+      "is_time_discount"
+    );
+    if (!coupon.discountShare && isTimeDiscount) {
       return false;
     }
+
     if (
       !coupon.vipPriceShare &&
       returnGoodsIsUseVipPrice(shopInfo, user, goods)
@@ -288,12 +314,14 @@ export function returnCouponCanUse(args: couponCalcParams) {
       return coupon.thresholdFoods.find((food) => food.id == v.productId);
     });
   }
+
   canCalcGoodsArr = returnCanCalcGoodsList(
     canCalcGoodsArr,
     coupon,
     shopInfo,
     user
   );
+
   fullAmount = canCalcGoodsArr.reduce((pre, cur) => {
     return (
       pre +
@@ -328,6 +356,7 @@ export function returnCouponCanUse(args: couponCalcParams) {
       reason: "当前选中的券不可与其他券同享",
     };
   }
+
   // 满减券和折扣券计算门槛金额是否满足
   if ([1, 3].includes(coupon.type)) {
     if (canCalcGoodsArr.length <= 0) {
@@ -438,7 +467,7 @@ export function calcDiscountGoodsArrPrice(
 ) {
   let hasCountNum = 0;
   let discountPrice = 0;
-  let hasDiscountGoodsArr = [];
+  let hasDiscountGoodsArr:BaseCartItem[] = [];
 
   for (let i = 0; i < discountGoodsArr.length; i++) {
     if (hasCountNum >= discountNum) {
@@ -457,10 +486,13 @@ export function calcDiscountGoodsArrPrice(
     discountPrice += realPrice * num;
 
     hasCountNum += num;
-    hasDiscountGoodsArr.push({
-      ...goods,
-      num,
-    });
+    if(goods){
+      hasDiscountGoodsArr.push({
+        ...goods,
+        num,
+      });
+    }
+    
   }
 
   return {
@@ -609,7 +641,7 @@ export function returnCouponProductDiscount(
   let { useFoods, discountNum, useRule } = coupon;
   discountNum = discountNum || 0;
   //抵扣商品数组
-  let discountGoodsArr = [];
+  let discountGoodsArr:BaseCartItem[] = [];
 
   //抵扣全部商品
   if (useFoods.length === 0) {
@@ -656,9 +688,17 @@ function returnCouponBuyOneGiveOneDiscount(
 ) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
-  let discountGoods = undefined;
-  //符合买一送一条件的商品
-  const canUseGoods = canDikouGoodsArr.filter((v) => (v.num || 0) >= 2);
+  let discountGoods:BaseCartItem | undefined = undefined;
+  //符合买一送一条件的商品（数量>=2 + 非临时/非赠品）
+  const canUseGoods = canDikouGoodsArr.filter((v) => {
+    const isTemporary = getCompatibleFieldValue(
+      v,
+      "isTemporary",
+      "is_temporary"
+    );
+    const isGift = getCompatibleFieldValue(v, "isGift", "is_gift");
+    return (v.num || 0) >= 2 && !isTemporary && !isGift;
+  });
   //抵扣全部商品
   if (useFoods.length === 0) {
     if (useRule == "price_asc") {
@@ -710,9 +750,17 @@ function returnSecoendDiscount(
 ) {
   const { useFoods, useRule } = coupon;
   //抵扣商品
-  let discountGoods = undefined;
-  //符合条件的商品
-  const canUseGoods = canDikouGoodsArr.filter((v) => (v.num || 0) >= 2);
+  let discountGoods:BaseCartItem | undefined = undefined;
+  //符合条件的商品（数量>=2 + 非临时/非赠品）
+  const canUseGoods = canDikouGoodsArr.filter((v) => {
+    const isTemporary = getCompatibleFieldValue(
+      v,
+      "isTemporary",
+      "is_temporary"
+    );
+    const isGift = getCompatibleFieldValue(v, "isGift", "is_gift");
+    return (v.num || 0) >= 2 && !isTemporary && !isGift;
+  });
   //抵扣全部商品
   if (useFoods.length === 0) {
     if (useRule == "price_asc") {
@@ -767,7 +815,14 @@ export function returnCanDikouGoods(
 ) {
   const result = arr
     .filter((v) => {
-      return !v.is_temporary && !v.is_gift;
+      // 兼容 is_temporary/isTemporary 和 is_gift/isGift
+      const isTemporary = getCompatibleFieldValue(
+        v,
+        "isTemporary",
+        "is_temporary"
+      );
+      const isGift = getCompatibleFieldValue(v, "isGift", "is_gift");
+      return !isTemporary && !isGift;
     })
     .filter((v) => {
       return (v.num || 0) > 0;
@@ -781,9 +836,6 @@ export function returnCanDikouGoods(
   return result;
 }
 
-
-
-
 export const utils = {
   returnGoodsPrice,
   returnGoodsGroupMap,
diff --git a/src/lib/goods.ts b/src/lib/goods.ts
index f75f9fd..874e890 100644
--- a/src/lib/goods.ts
+++ b/src/lib/goods.ts
@@ -2,8 +2,8 @@ import { BigNumber } from "bignumber.js";
 
 // 配置BigNumber精度
 BigNumber.set({
-  DECIMAL_PLACES: 2,
-  ROUNDING_MODE: BigNumber.ROUND_DOWN, // 向下取整，符合业务需求
+	DECIMAL_PLACES: 2,
+	ROUNDING_MODE: BigNumber.ROUND_DOWN, // 向下取整，符合业务需求
 });
 /**
  * 购物车订单价格计算公共库
@@ -20,26 +20,26 @@ BigNumber.set({
  */
 
 import {
-  Coupon,
-  GoodsType,
-  BackendCoupon,
-  ExchangeCalculationResult,
-  PointDeductionRule,
-  ShopUserInfo,
-  OrderCostSummary,
-  CouponResult,
-  SeatFeeConfig,
-  FullReductionActivity,
-  BaseCartItem,
-  TimeLimitDiscountConfig,
-  BaseCoupon,
-  OrderExtraConfig,
-  ActivityConfig,
-  FullReductionThreshold,
-  CouponType,
-  ActivityType,
-  MerchantReductionType,
-  WEEKDAY_MAP,
+	Coupon,
+	GoodsType,
+	BackendCoupon,
+	ExchangeCalculationResult,
+	PointDeductionRule,
+	ShopUserInfo,
+	OrderCostSummary,
+	CouponResult,
+	SeatFeeConfig,
+	FullReductionActivity,
+	BaseCartItem,
+	TimeLimitDiscountConfig,
+	BaseCoupon,
+	OrderExtraConfig,
+	ActivityConfig,
+	FullReductionThreshold,
+	CouponType,
+	ActivityType,
+	MerchantReductionType,
+	WEEKDAY_MAP,
 } from "./types";
 
 /**
@@ -49,30 +49,30 @@ import {
  * @returns 是否在时段内
  */
 function isInDailyTimeRange(
-  activity: FullReductionActivity,
-  currentTime: Date
+	activity: FullReductionActivity,
+	currentTime: Date
 ): boolean {
-  // 全时段无需校验
-  if (activity.useTimeType === "all") return true;
-  // 无时段配置则不通过
-  if (!activity.useStartTime || !activity.useEndTime) return false;
+	// 全时段无需校验
+	if (activity.useTimeType === "all") return true;
+	// 无时段配置则不通过
+	if (!activity.useStartTime || !activity.useEndTime) return false;
 
-  const [startHour, startMinute] = activity.useStartTime.split(":").map(Number);
-  const [endHour, endMinute] = activity.useEndTime.split(":").map(Number);
-  const currentHour = currentTime.getHours();
-  const currentMinute = currentTime.getMinutes();
+	const [startHour, startMinute] = activity.useStartTime.split(":").map(Number);
+	const [endHour, endMinute] = activity.useEndTime.split(":").map(Number);
+	const currentHour = currentTime.getHours();
+	const currentMinute = currentTime.getMinutes();
 
-  // 转换为分钟数比较
-  const startTotalMin = startHour * 60 + startMinute;
-  const endTotalMin = endHour * 60 + endMinute;
-  const currentTotalMin = currentHour * 60 + currentMinute;
+	// 转换为分钟数比较
+	const startTotalMin = startHour * 60 + startMinute;
+	const endTotalMin = endHour * 60 + endMinute;
+	const currentTotalMin = currentHour * 60 + currentMinute;
 
-  // 处理跨天场景（如23:00-02:00）
-  if (startTotalMin <= endTotalMin) {
-    return currentTotalMin >= startTotalMin && currentTotalMin <= endTotalMin;
-  } else {
-    return currentTotalMin >= startTotalMin || currentTotalMin <= endTotalMin;
-  }
+	// 处理跨天场景（如23:00-02:00）
+	if (startTotalMin <= endTotalMin) {
+		return currentTotalMin >= startTotalMin && currentTotalMin <= endTotalMin;
+	} else {
+		return currentTotalMin >= startTotalMin || currentTotalMin <= endTotalMin;
+	}
 }
 
 /**
@@ -82,16 +82,16 @@ function isInDailyTimeRange(
  * @returns 是否在周期内
  */
 function isInWeeklyCycle(
-  activity: FullReductionActivity,
-  currentTime: Date
+	activity: FullReductionActivity,
+	currentTime: Date
 ): boolean {
-  // 无周期配置则不通过
-  if (!activity.useDays) return false;
-  const currentWeekday = currentTime.getDay(); // 0=周日，1=周一...6=周六
-  const allowedWeekdays = activity.useDays
-    .split(",")
-    .map((day) => WEEKDAY_MAP[day as keyof typeof WEEKDAY_MAP]);
-  return allowedWeekdays.includes(currentWeekday);
+	// 无周期配置则不通过
+	if (!activity.useDays) return false;
+	const currentWeekday = currentTime.getDay(); // 0=周日，1=周一...6=周六
+	const allowedWeekdays = activity.useDays
+		.split(",")
+		.map((day) => WEEKDAY_MAP[day as keyof typeof WEEKDAY_MAP]);
+	return allowedWeekdays.includes(currentWeekday);
 }
 
 /**
@@ -101,118 +101,103 @@ function isInWeeklyCycle(
  * @returns 是否匹配
  */
 function isDinnerTypeMatch(
-  activity: FullReductionActivity,
-  currentDinnerType: string
+	activity: FullReductionActivity,
+	currentDinnerType: string
 ): boolean {
-  if (!activity.useType) return false;
-  const allowedTypes = activity.useType.split(",");
-  //满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
-  return true;
+	if (!activity.useType) return false;
+	const allowedTypes = activity.useType.split(",");
+	//满减活动的就餐类型和当前券类型字段值不一样，暂时返回true
+	return true;
 }
 
 //判断商品是否可以使用限时折扣
 export function returnCanUseLimitTimeDiscount(
-  goods: BaseCartItem,
-  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
-  useVipPrice: boolean,
-  idKey = "product_id"
+	goods: BaseCartItem,
+	limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+	useVipPrice: boolean,
+	idKey = "product_id"
 ) {
-  goods={...goods,product_id:goods.product_id||goods.productId|| goods.id|| ''}
-  if (!limitTimeDiscount || !limitTimeDiscount.id) {
-    return false;
-  }
-  const canUseFoods = (limitTimeDiscount.foods || "").split(",");
-  const goodsCanUse =
-    limitTimeDiscount.foodType == 1 ||
-    canUseFoods.includes("" + goods[idKey as keyof BaseCartItem]);
-  if (!goodsCanUse) {
-    return false;
-  }
-  if (limitTimeDiscount.discountPriority == "limit-time") {
-    return true;
-  }
-  if (limitTimeDiscount.discountPriority == "vip-price") {
-    if (!useVipPrice) {
-      return true;
-    }
-    if (useVipPrice && goods.hasOwnProperty("memberPrice")) {
+	goods = { ...goods, product_id: goods.product_id || goods.productId || goods.id || '' }
+	if (!limitTimeDiscount || !limitTimeDiscount.id) {
+		return false;
+	}
+	const canUseFoods = (limitTimeDiscount.foods || "").split(",");
+	const goodsCanUse =
+		limitTimeDiscount.foodType == 1 ||
+		canUseFoods.includes("" + goods[idKey as keyof BaseCartItem]);
+	if (!goodsCanUse) {
+		return false;
+	}
+	if (limitTimeDiscount.discountPriority == "limit-time") {
+		return true;
+	}
+	if (limitTimeDiscount.discountPriority == "vip-price") {
+		if (!useVipPrice) {
+			return true;
+		}
+		if (useVipPrice && goods.hasOwnProperty("memberPrice")) {
 
-      if ( goods.memberPrice * 1 <= 0) {
+			if (goods.memberPrice * 1 <= 0) {
 
-        return true;
-      }else{
-        return false;
-      }
-    }
-  }
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
 
-  return false;
+	return false;
 }
 
 function returnMemberPrice(useVipPrice: boolean, goods: BaseCartItem) {
-  if (useVipPrice) {
-    return goods.memberPrice || goods.salePrice;
-  } else {
-    return goods.salePrice;
-  }
+	if (useVipPrice) {
+		return goods.memberPrice || goods.salePrice;
+	} else {
+		return goods.salePrice;
+	}
 }
 
 /**
  * 返回商品限时折扣价格
  */
 function returnLimitPrice(
-  goods: BaseCartItem,
-  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
-  useVipPrice: boolean
+	goods: BaseCartItem,
+	limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+	useVipPrice: boolean
 ) {
-  if (!limitTimeDiscount) {
-    return 0;
-  }
-  const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
-    100
-  );
+	if (!limitTimeDiscount) {
+		return 0;
+	}
+	const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
+		100
+	);
+	let canuseLimit = false;
+	if (goods.hasOwnProperty('isTimeDiscount') || goods.hasOwnProperty('is_time_discount')) {
+		canuseLimit = goods.isTimeDiscount ? true : goods.is_time_discount ? true : false;
+	} else {
+		canuseLimit = returnCanUseLimitTimeDiscount(
+			goods,
+			limitTimeDiscount,
+			useVipPrice
+		);
+	}
 
-  const canuseLimit = returnCanUseLimitTimeDiscount(
-    goods,
-    limitTimeDiscount,
-    useVipPrice
-  );
 
-  if (canuseLimit) {
-    //可以使用限时折扣
-    if (limitTimeDiscount.discountPriority == "limit-time") {
-      //限时价优先
-      const result = BigNumber(goods.salePrice)
-        .times(discountRate)
-        .decimalPlaces(2, BigNumber.ROUND_UP)
-        .toNumber();
-      return result;
-    }
-    if (limitTimeDiscount.discountPriority == "vip-price") {
-
-      //会员价优先
-      if (useVipPrice && goods.memberPrice && goods.memberPrice * 1 > 0) {
-        //使用会员价
-        return returnMemberPrice(useVipPrice, goods);
-      } else {
-        //不使用会员价
-        const result = BigNumber(goods.salePrice)
-          .times(discountRate)
-          .decimalPlaces(2, BigNumber.ROUND_UP)
-          .toNumber();
-        return result;
-      }
-    }
-  } else {
-    //不可以使用限时折扣
-    //会员价优先
-    if (useVipPrice) {
-      //使用会员价
-      return returnMemberPrice(useVipPrice, goods);
-    } else {
-      return goods.salePrice;
-    }
-  }
+	if (canuseLimit) {
+		//可以使用限时折扣
+		const result = BigNumber(goods.salePrice)
+			.times(discountRate)
+			.decimalPlaces(2, BigNumber.ROUND_UP)
+			.toNumber();
+		return result;
+	}
+	//会员价优先
+	if (useVipPrice) {
+		//使用会员价
+		return returnMemberPrice(useVipPrice, goods);
+	} else {
+		return goods.salePrice;
+	}
 }
 
 /**
@@ -220,89 +205,89 @@ function returnLimitPrice(
  */
 
 export function returnCalcPrice(
-  goods: BaseCartItem,
-  fullReductionActivitie: FullReductionActivity | undefined,
-  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
-  useVipPrice: boolean,
-  idKey = "product_id"
+	goods: BaseCartItem,
+	fullReductionActivitie: FullReductionActivity | undefined,
+	limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+	useVipPrice: boolean,
+	idKey = "product_id"
 ) {
-  if (goods.discountSaleAmount && goods.discountSaleAmount * 1 > 0) {
-    return goods.salePrice;
-  }
-  //限时折扣和满减活动都有
-  if (fullReductionActivitie && limitTimeDiscount) {
-    if (
-      fullReductionActivitie.discountShare == 1 &&
-      fullReductionActivitie.vipPriceShare == 1
-    ) {
-      //与限时折扣同享，与会员价同享
-      return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
-    }
-    if (
-      fullReductionActivitie.discountShare != 1 &&
-      fullReductionActivitie.vipPriceShare == 1
-    ) {
-      //与限时折扣不同享，与会员价同享
-      return returnMemberPrice(useVipPrice, goods);
-    }
-    if (fullReductionActivitie.vipPriceShare != 1) {
-      //与会员价不同享
-      return goods.salePrice;
-    }
-    return goods.salePrice;
-  }
-  //只有满减活动
-  if (fullReductionActivitie) {
-    if (fullReductionActivitie.vipPriceShare == 1) {
-      return returnMemberPrice(useVipPrice, goods);
-    } else {
-      return goods.salePrice;
-    }
-  }
-  //只有限时折扣
-  if (limitTimeDiscount) {
-    return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
-  }
+	if (goods.discountSaleAmount && goods.discountSaleAmount * 1 > 0) {
+		return goods.salePrice;
+	}
+	//限时折扣和满减活动都有
+	if (fullReductionActivitie && limitTimeDiscount) {
+		if (
+			fullReductionActivitie.discountShare == 1 &&
+			fullReductionActivitie.vipPriceShare == 1
+		) {
+			//与限时折扣同享，与会员价同享
+			return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+		}
+		if (
+			fullReductionActivitie.discountShare != 1 &&
+			fullReductionActivitie.vipPriceShare == 1
+		) {
+			//与限时折扣不同享，与会员价同享
+			return returnMemberPrice(useVipPrice, goods);
+		}
+		if (fullReductionActivitie.vipPriceShare != 1) {
+			//与会员价不同享
+			return goods.salePrice;
+		}
+		return goods.salePrice;
+	}
+	//只有满减活动
+	if (fullReductionActivitie) {
+		if (fullReductionActivitie.vipPriceShare == 1) {
+			return returnMemberPrice(useVipPrice, goods);
+		} else {
+			return goods.salePrice;
+		}
+	}
+	//只有限时折扣
+	if (limitTimeDiscount) {
+		return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
+	}
 
-  if (useVipPrice) {
-    return returnMemberPrice(useVipPrice, goods);
-  }
-  return goods.salePrice;
+	if (useVipPrice) {
+		return returnMemberPrice(useVipPrice, goods);
+	}
+	return goods.salePrice;
 }
 
 /**
  * 计算满减活动门槛
  */
 export function calcFullReductionActivityFullAmount(
-  goodsList: BaseCartItem[],
-  fullReductionActivitie: FullReductionActivity | undefined,
-  limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
-  useVipPrice: boolean,
-  seatFee: number,
-  packFee: number
+	goodsList: BaseCartItem[],
+	fullReductionActivitie: FullReductionActivity | undefined,
+	limitTimeDiscount: TimeLimitDiscountConfig | null | undefined,
+	useVipPrice: boolean,
+	seatFee: number,
+	packFee: number
 ): number {
-  if (!fullReductionActivitie) {
-    return 0;
-  }
-  let amount = 0;
-  for (let goods of goodsList) {
-    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
-    if (goods.is_temporary ||goods.isTemporary || goods.is_gift ||goods.isGift  || availableNum <= 0) {
-      //临时菜，赠菜，数量<=0的商品不计算
-      continue;
-    }
-    const calcPrice = returnCalcPrice(
-      goods,
-      fullReductionActivitie,
-      limitTimeDiscount,
-      useVipPrice,
-      "product_id"
-    );
-    if (calcPrice !== undefined) {
-      amount += calcPrice * availableNum;
-    }
-  }
-  return amount + seatFee + packFee;
+	if (!fullReductionActivitie) {
+		return 0;
+	}
+	let amount = 0;
+	for (let goods of goodsList) {
+		const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+		if (goods.is_temporary || goods.isTemporary || goods.is_gift || goods.isGift || availableNum <= 0) {
+			//临时菜，赠菜，数量<=0的商品不计算
+			continue;
+		}
+		const calcPrice = returnCalcPrice(
+			goods,
+			fullReductionActivitie,
+			limitTimeDiscount,
+			useVipPrice,
+			"product_id"
+		);
+		if (calcPrice !== undefined) {
+			amount += calcPrice * availableNum;
+		}
+	}
+	return amount + seatFee + packFee;
 }
 
 /**
@@ -314,70 +299,70 @@ export function calcFullReductionActivityFullAmount(
  * @returns 最优满减活动（无符合条件则返回undefined）
  */
 export function filterOptimalFullReductionActivity(
-  activities: FullReductionActivity[],
-  currentShopId: number,
-  currentDinnerType: string,
-  currentTime: Date = new Date()
+	activities: FullReductionActivity[],
+	currentShopId: number,
+	currentDinnerType: string,
+	currentTime: Date = new Date()
 ): FullReductionActivity | undefined {
-  if (!activities || !activities.length) return undefined;
-  // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
-  const baseEligible = activities.filter((activity) => {
-    return (
-      // activity.isDel !== true && // 未删除
-      // activity.shopId === currentShopId && // 当前店铺
-      // activity.status === 2 && // 状态=2（进行中）
-      isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
-      activity.thresholds?.length // 至少有一个满减阈值
-    );
-  });
+	if (!activities || !activities.length) return undefined;
+	// 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
+	const baseEligible = activities.filter((activity) => {
+		return (
+			// activity.isDel !== true && // 未删除
+			// activity.shopId === currentShopId && // 当前店铺
+			// activity.status === 2 && // 状态=2（进行中）
+			isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
+			activity.thresholds?.length // 至少有一个满减阈值
+		);
+	});
 
-  if (!baseEligible.length) return undefined;
+	if (!baseEligible.length) return undefined;
 
-  // 第二步：时间筛选（有效期内+周期内+时段内）
-  const timeEligible = baseEligible.filter((activity) => {
-    // 1. 校验有效期（validStartTime ~ validEndTime）
-    if (activity.useTimeType == "all") {
-      return true;
-    }
-    if (!activity.validStartTime || !activity.validEndTime) return false;
-    const startDate = new Date(activity.validStartTime);
-    const endDate = new Date(activity.validEndTime);
-    // 处理有效期结束日期的23:59:59
-    endDate.setHours(23, 59, 59, 999);
-    if (currentTime < startDate || currentTime > endDate) return false;
+	// 第二步：时间筛选（有效期内+周期内+时段内）
+	const timeEligible = baseEligible.filter((activity) => {
+		// 1. 校验有效期（validStartTime ~ validEndTime）
+		if (activity.useTimeType == "all") {
+			return true;
+		}
+		if (!activity.validStartTime || !activity.validEndTime) return false;
+		const startDate = new Date(activity.validStartTime);
+		const endDate = new Date(activity.validEndTime);
+		// 处理有效期结束日期的23:59:59
+		endDate.setHours(23, 59, 59, 999);
+		if (currentTime < startDate || currentTime > endDate) return false;
 
-    // 2. 校验可用周期（如周一至周日）
-    if (!isInWeeklyCycle(activity, currentTime)) return false;
+		// 2. 校验可用周期（如周一至周日）
+		if (!isInWeeklyCycle(activity, currentTime)) return false;
 
-    // 3. 校验每日可用时段（如09:00-22:00）
-    if (!isInDailyTimeRange(activity, currentTime)) return false;
+		// 3. 校验每日可用时段（如09:00-22:00）
+		if (!isInDailyTimeRange(activity, currentTime)) return false;
 
-    return true;
-  });
+		return true;
+	});
 
-  if (!timeEligible.length) return undefined;
+	if (!timeEligible.length) return undefined;
 
-  // 第三步：按优先级排序（需求规则）
-  return timeEligible.sort((a, b) => {
-    // 1. 先比排序值：排序值大的优先
-    if ((a.sort || 0) !== (b.sort || 0)) {
-      return (b.sort || 0) - (a.sort || 0);
-    }
-    // 2. 再比修改时间：最新修改的优先（时间戳降序）
-    const aUpdateTime = a.updateTime ? new Date(a.updateTime).getTime() : 0;
-    const bUpdateTime = b.updateTime ? new Date(b.updateTime).getTime() : 0;
-    return bUpdateTime - aUpdateTime;
-  })[0]; // 取最优活动
+	// 第三步：按优先级排序（需求规则）
+	return timeEligible.sort((a, b) => {
+		// 1. 先比排序值：排序值大的优先
+		if ((a.sort || 0) !== (b.sort || 0)) {
+			return (b.sort || 0) - (a.sort || 0);
+		}
+		// 2. 再比修改时间：最新修改的优先（时间戳降序）
+		const aUpdateTime = a.updateTime ? new Date(a.updateTime).getTime() : 0;
+		const bUpdateTime = b.updateTime ? new Date(b.updateTime).getTime() : 0;
+		return bUpdateTime - aUpdateTime;
+	})[0]; // 取最优活动
 }
 /**
  * 折扣率格式化：后端discountRate（%）→ 工具库小数（如90→0.9）
  */
 export function formatDiscountRate(backendDiscountRate?: number): number {
-  if (!backendDiscountRate || backendDiscountRate <= 0) return 1; // 默认无折扣（1=100%）
-  // 后端若为百分比（如90=9折），除以100；若已为小数（如0.9）直接返回
-  return backendDiscountRate >= 1
-    ? backendDiscountRate / 100
-    : backendDiscountRate;
+	if (!backendDiscountRate || backendDiscountRate <= 0) return 1; // 默认无折扣（1=100%）
+	// 后端若为百分比（如90=9折），除以100；若已为小数（如0.9）直接返回
+	return backendDiscountRate >= 1
+		? backendDiscountRate / 100
+		: backendDiscountRate;
 }
 
 /**
@@ -387,7 +372,7 @@ export function formatDiscountRate(backendDiscountRate?: number): number {
  * @returns 处理后保留两位小数的数字
  */
 export function truncateToTwoDecimals(num: number | string): number {
-  return new BigNumber(num).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+	return new BigNumber(num).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
 }
 
 /**
@@ -396,7 +381,7 @@ export function truncateToTwoDecimals(num: number | string): number {
  * @returns 是否临时菜
  */
 export function isTemporaryGoods(goods: BaseCartItem): boolean {
-  return !!goods.is_temporary|| !!goods.isTemporary;
+	return !!goods.is_temporary || !!goods.isTemporary;
 }
 
 /**
@@ -405,14 +390,14 @@ export function isTemporaryGoods(goods: BaseCartItem): boolean {
  * @returns 是否赠菜
  */
 export function isGiftGoods(goods: BaseCartItem): boolean {
-  return !!goods.is_gift || !!goods.isGift;
+	return !!goods.is_gift || !!goods.isGift;
 }
 /**
  * 判断可用类型是否可用
  */
 export function useTypeCanUse(useType: string[]) {
-  const arr = ["all", "dine-in", "take-out", "take-away", "post"];
-  return useType.some((item) => arr.includes(item));
+	const arr = ["all", "dine-in", "take-out", "take-away", "post"];
+	return useType.some((item) => arr.includes(item));
 }
 
 /**
@@ -423,22 +408,22 @@ export function useTypeCanUse(useType: string[]) {
  * @returns 会员价（元）
  */
 export function calcMemberPrice(
-  goods: BaseCartItem,
-  isMember: boolean,
-  memberDiscountRate?: number
+	goods: BaseCartItem,
+	isMember: boolean,
+	memberDiscountRate?: number
 ): number {
-  if (!isMember) return truncateToTwoDecimals(goods.salePrice);
+	if (!isMember) return truncateToTwoDecimals(goods.salePrice);
 
-  // 优先级：SKU会员价 > 商品会员价 > 商品原价（无会员价时用会员折扣）
-  const basePrice = goods.memberPrice || goods.salePrice;
-  // 仅当无SKU会员价、无商品会员价时，才应用会员折扣率
-  if (memberDiscountRate && !goods.skuData?.memberPrice && !goods.memberPrice) {
-    return truncateToTwoDecimals(
-      new BigNumber(basePrice).multipliedBy(memberDiscountRate).toNumber()
-    );
-  }
+	// 优先级：SKU会员价 > 商品会员价 > 商品原价（无会员价时用会员折扣）
+	const basePrice = goods.memberPrice || goods.salePrice;
+	// 仅当无SKU会员价、无商品会员价时，才应用会员折扣率
+	if (memberDiscountRate && !goods.skuData?.memberPrice && !goods.memberPrice) {
+		return truncateToTwoDecimals(
+			new BigNumber(basePrice).multipliedBy(memberDiscountRate).toNumber()
+		);
+	}
 
-  return truncateToTwoDecimals(basePrice);
+	return truncateToTwoDecimals(basePrice);
 }
 
 /**
@@ -448,15 +433,15 @@ export function calcMemberPrice(
  * @returns 可参与优惠券计算的商品列表
  */
 export function filterCouponEligibleGoods(
-  goodsList: BaseCartItem[],
-  excludedProductIds: string[] = []
+	goodsList: BaseCartItem[],
+	excludedProductIds: string[] = []
 ): BaseCartItem[] {
-  return goodsList.filter(
-    (goods) =>
-      !isTemporaryGoods(goods) &&
-      !isGiftGoods(goods) &&
-      !excludedProductIds.includes(String(goods.product_id)) // 核心修正：用商品ID排除
-  );
+	return goodsList.filter(
+		(goods) =>
+			!isTemporaryGoods(goods) &&
+			!isGiftGoods(goods) &&
+			!excludedProductIds.includes(String(goods.product_id)) // 核心修正：用商品ID排除
+	);
 }
 
 /**
@@ -466,15 +451,15 @@ export function filterCouponEligibleGoods(
  * @returns 最终参与优惠券计算的商品列表
  */
 export function filterThresholdGoods(
-  baseEligibleGoods: BaseCartItem[],
-  applicableProductIds: string[]
+	baseEligibleGoods: BaseCartItem[],
+	applicableProductIds: string[]
 ): BaseCartItem[] {
-  // 空数组=全部基础合格商品；非空=仅商品ID匹配的商品（转字符串兼容类型）
-  return applicableProductIds.length === 0
-    ? baseEligibleGoods
-    : baseEligibleGoods.filter((goods) =>
-        applicableProductIds.includes(String(goods.product_id))
-      ); // 核心修正：用商品ID匹配
+	// 空数组=全部基础合格商品；非空=仅商品ID匹配的商品（转字符串兼容类型）
+	return applicableProductIds.length === 0
+		? baseEligibleGoods
+		: baseEligibleGoods.filter((goods) =>
+			applicableProductIds.includes(String(goods.product_id))
+		); // 核心修正：用商品ID匹配
 }
 
 /**
@@ -485,28 +470,28 @@ export function filterThresholdGoods(
  * @returns 排序后的商品列表
  */
 export function sortGoodsForCoupon(
-  goodsList: BaseCartItem[],
-  sortRule: "low_price_first" | "high_price_first",
-  cartOrder: Record<string, number> = {}
+	goodsList: BaseCartItem[],
+	sortRule: "low_price_first" | "high_price_first",
+	cartOrder: Record<string, number> = {}
 ): BaseCartItem[] {
-  return [...goodsList].sort((a, b) => {
-    // 1. 按商品单价排序（优先级最高）
-    const priceA = a.skuData?.salePrice ?? a.salePrice;
-    const priceB = b.skuData?.salePrice ?? b.salePrice;
-    if (priceA !== priceB) {
-      return sortRule === "low_price_first" ? priceA - priceB : priceB - priceA;
-    }
+	return [...goodsList].sort((a, b) => {
+		// 1. 按商品单价排序（优先级最高）
+		const priceA = a.skuData?.salePrice ?? a.salePrice;
+		const priceB = b.skuData?.salePrice ?? b.salePrice;
+		if (priceA !== priceB) {
+			return sortRule === "low_price_first" ? priceA - priceB : priceB - priceA;
+		}
 
-    // 2. 同价格按商品数量排序（降序，多的优先）
-    if (a.number !== b.number) {
-      return b.number - a.number;
-    }
+		// 2. 同价格按商品数量排序（降序，多的优先）
+		if (a.number !== b.number) {
+			return b.number - a.number;
+		}
 
-    // 3. 同价格同数量按加入购物车顺序（早的优先，用购物车ID匹配）
-    const orderA = cartOrder[String(a.id)] ?? Infinity;
-    const orderB = cartOrder[String(b.id)] ?? Infinity;
-    return orderA - orderB;
-  });
+		// 3. 同价格同数量按加入购物车顺序（早的优先，用购物车ID匹配）
+		const orderA = cartOrder[String(a.id)] ?? Infinity;
+		const orderB = cartOrder[String(b.id)] ?? Infinity;
+		return orderA - orderB;
+	});
 }
 
 /**
@@ -518,50 +503,50 @@ export function sortGoodsForCoupon(
  * @returns 满足优惠券门槛的金额基数
  */
 export function calcCouponThresholdAmount(
-  eligibleGoods: BaseCartItem[],
-  coupon: BaseCoupon,
-  config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
-  activities: ActivityConfig[] = []
+	eligibleGoods: BaseCartItem[],
+	coupon: BaseCoupon,
+	config: Pick<OrderExtraConfig, "isMember" | "memberDiscountRate">,
+	activities: ActivityConfig[] = []
 ): number {
-  let total = new BigNumber(0);
+	let total = new BigNumber(0);
 
-  for (const goods of eligibleGoods) {
-    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
-    if (availableNum <= 0) continue;
+	for (const goods of eligibleGoods) {
+		const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+		if (availableNum <= 0) continue;
 
-    // 1. 基础金额：默认用商品原价（SKU原价优先）
-    const basePrice = new BigNumber(
-      goods.skuData?.salePrice ?? goods.salePrice
-    );
-    let itemAmount = basePrice.multipliedBy(availableNum);
+		// 1. 基础金额：默认用商品原价（SKU原价优先）
+		const basePrice = new BigNumber(
+			goods.skuData?.salePrice ?? goods.salePrice
+		);
+		let itemAmount = basePrice.multipliedBy(availableNum);
 
-    // 2. 处理「与会员价/会员折扣同享」规则：若开启，用会员价计算
-    if (coupon.vipPriceShare) {
-      const memberPrice = new BigNumber(
-        calcMemberPrice(goods, config.isMember, config.memberDiscountRate)
-      );
-      itemAmount = memberPrice.multipliedBy(availableNum);
-    }
+		// 2. 处理「与会员价/会员折扣同享」规则：若开启，用会员价计算
+		if (coupon.vipPriceShare) {
+			const memberPrice = new BigNumber(
+				calcMemberPrice(goods, config.isMember, config.memberDiscountRate)
+			);
+			itemAmount = memberPrice.multipliedBy(availableNum);
+		}
 
-    // 3. 处理「与限时折扣同享」规则：若开启，叠加限时折扣（按商品ID匹配活动）
-    if (coupon.discountShare) {
-      const activity =
-        goods.activityInfo ??
-        activities.find(
-          (act) =>
-            act.type === ActivityType.TIME_LIMIT_DISCOUNT &&
-            (act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
-        );
+		// 3. 处理「与限时折扣同享」规则：若开启，叠加限时折扣（按商品ID匹配活动）
+		if (coupon.discountShare) {
+			const activity =
+				goods.activityInfo ??
+				activities.find(
+					(act) =>
+						act.type === ActivityType.TIME_LIMIT_DISCOUNT &&
+						(act.applicableProductIds || []).includes(String(goods.product_id)) // 核心修正：用商品ID匹配活动
+				);
 
-      if (activity) {
-        itemAmount = itemAmount.multipliedBy(activity.discountRate); // 叠加限时折扣
-      }
-    }
+			if (activity) {
+				itemAmount = itemAmount.multipliedBy(activity.discountRate); // 叠加限时折扣
+			}
+		}
 
-    total = total.plus(itemAmount);
-  }
+		total = total.plus(itemAmount);
+	}
 
-  return truncateToTwoDecimals(total.toNumber());
+	return truncateToTwoDecimals(total.toNumber());
 }
 
 // ============================ 3. 商品核心价格计算（核心修正：按商品ID匹配营销活动） ============================
@@ -572,94 +557,102 @@ export function calcCouponThresholdAmount(
  * @returns 单个商品实际单价（元）
  */
 export function calcSingleGoodsRealPrice(
-  goods: BaseCartItem,
-  config: Pick<
-    OrderExtraConfig,
-    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
-  >
+	goods: BaseCartItem,
+	config: Pick<
+		OrderExtraConfig,
+		"isMember" | "memberDiscountRate" | "limitTimeDiscount"
+	>
 ): number {
-  const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
+	const { isMember, memberDiscountRate, limitTimeDiscount: activity } = config;
 
-  //如果是增菜价格为0
-  if (goods.is_gift||goods.isGift) {
-    return 0;
-  }
+	//如果是增菜价格为0
+	if (goods.is_gift || goods.isGift) {
+		return 0;
+	}
+	//临时菜
+	if (goods.is_temporary || goods.isTemporary) {
+		return new BigNumber(goods.discountSaleAmount || 0)
+			.toNumber()
+	}
+	console.log("calcSingleGoodsRealPrice", goods);
 
-  // 1. 优先级1：商家改价（改价后单价>0才生效）
-  if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
-    return truncateToTwoDecimals(goods.discountSaleAmount);
-  }
+	// 1. 优先级1：商家改价（改价后单价>0才生效）
+	if (goods.discountSaleAmount && goods.discountSaleAmount > 0) {
+		return truncateToTwoDecimals(goods.discountSaleAmount);
+	}
 
-  // 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
-  const memberPrice = new BigNumber(
-    calcMemberPrice(goods, isMember, memberDiscountRate)
-  );
-  if(goods.is_time_discount||goods.isTimeDiscount){
-    //限时折扣优先
-   return truncateToTwoDecimals(
-     new BigNumber(goods.salePrice)
-       .times((activity?activity.discountRate:100)  / 100)
-       .decimalPlaces(2, BigNumber.ROUND_UP)
-       .toNumber()
-   );
- }
-  // 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
-  let isActivityApplicable = false;
-  if (activity) {
-    if (activity.foodType == 1) {
-      isActivityApplicable = true;
-    } else {
-      const canUseGoods = activity.foods?.split(",") || [];
-      if (canUseGoods.find((v) => v == String(goods.product_id))) {
-        isActivityApplicable = true;
-      }
-    }
-  }
+	// 2. 优先级2：会员价（含会员折扣率，SKU会员价优先）
+	const memberPrice = new BigNumber(
+		calcMemberPrice(goods, isMember, memberDiscountRate)
+	);
 
-  if (!activity || !isActivityApplicable) {
-    return memberPrice.toNumber();
-  }
- 
-  //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
-  if (
-    activity.discountPriority == "limit-time" ||
-    (activity.discountPriority == "vip-price" && !isMember) ||
-    (activity.discountPriority == "vip-price" && isMember && !goods.memberPrice)
-  )
-   {
-    //限时折扣优先
-    return truncateToTwoDecimals(
-      new BigNumber(goods.salePrice)
-        .times(activity.discountRate / 100)
-        .decimalPlaces(2, BigNumber.ROUND_UP)
-        .toNumber()
-    );
-  }
-  if (activity.discountPriority == "vip-price" && isMember) {
-    return memberPrice.toNumber();
-  }
+	if (goods.is_time_discount || goods.isTimeDiscount) {
+		//限时折扣优先
+		const limitPrice = truncateToTwoDecimals(
+			new BigNumber(goods.salePrice)
+				.times((activity ? activity.discountRate : 100) / 100)
+				.decimalPlaces(2, BigNumber.ROUND_UP)
+				.toNumber()
+		);
+		return limitPrice;
+	}
+	// 3. 优先级3：营销活动折扣（如限时折扣，需按商品ID匹配活动）
+	let isActivityApplicable = false;
+	if (activity) {
+		if (activity.foodType == 1) {
+			isActivityApplicable = true;
+		} else {
+			const canUseGoods = activity.foods?.split(",") || [];
+			if (canUseGoods.find((v) => v == String(goods.product_id))) {
+				isActivityApplicable = true;
+			}
+		}
+	}
 
-  // 处理活动与会员的同享/不同享逻辑
-  if (activity.vipPriceShare) {
-    // 同享：会员价基础上叠加工活动折扣
-    return truncateToTwoDecimals(
-      memberPrice.multipliedBy(activity.discountRate).toNumber()
-    );
-  } else {
-    // 不同享：取会员价和活动价的最小值（活动价用SKU原价计算）
-    const basePriceForActivity = new BigNumber(
-      goods.skuData?.salePrice ?? goods.salePrice
-    );
-    const activityPrice = basePriceForActivity.multipliedBy(
-      activity.discountRate
-    );
+	if (!activity || !isActivityApplicable) {
+		return memberPrice.toNumber();
+	}
+	// //限时折扣优先或者会员价优先但是不是会员或者未开启会员价格时限时折扣优先
+	// if (
+	//   activity.discountPriority == "limit-time" ||
+	//   (activity.discountPriority == "vip-price" && !isMember) ||
+	//   (activity.discountPriority == "vip-price" && isMember && !goods.memberPrice)
+	// )
+	//  {
+	//   //限时折扣优先
+	//   return truncateToTwoDecimals(
+	//     new BigNumber(goods.salePrice)
+	//       .times(activity.discountRate / 100)
+	//       .decimalPlaces(2, BigNumber.ROUND_UP)
+	//       .toNumber()
+	//   );
+	// }
 
-    return truncateToTwoDecimals(
-      memberPrice.isLessThanOrEqualTo(activityPrice)
-        ? memberPrice.toNumber()
-        : activityPrice.toNumber()
-    );
-  }
+	if (activity.discountPriority == "vip-price" && isMember) {
+		return memberPrice.toNumber();
+	}
+
+	// 处理活动与会员的同享/不同享逻辑
+	if (activity.vipPriceShare) {
+		// 同享：会员价基础上叠加工活动折扣
+		return truncateToTwoDecimals(
+			memberPrice.multipliedBy(activity.discountRate).toNumber()
+		);
+	} else {
+		// 不同享：取会员价和活动价的最小值（活动价用SKU原价计算）
+		const basePriceForActivity = new BigNumber(
+			goods.skuData?.salePrice ?? goods.salePrice
+		);
+		const activityPrice = basePriceForActivity.multipliedBy(
+			activity.discountRate
+		);
+
+		return truncateToTwoDecimals(
+			memberPrice.isLessThanOrEqualTo(activityPrice)
+				? memberPrice.toNumber()
+				: activityPrice.toNumber()
+		);
+	}
 }
 
 /**
@@ -668,23 +661,27 @@ export function calcSingleGoodsRealPrice(
  * @returns 商品原价总和（元）
  */
 export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
-  let total = new BigNumber(0);
+	let total = new BigNumber(0);
 
-  for (const goods of goodsList) {
-    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
-    let basePrice = new BigNumber(0);
-    if (goods.is_temporary||goods.isTemporary) {
-      basePrice = new BigNumber(goods?.discountSaleAmount ?? 0);
-    } else if (goods.is_gift||goods.isGift) {
-      basePrice = new BigNumber(0);
-    } else {
-      basePrice = new BigNumber(goods.skuData?.salePrice ?? goods.salePrice); // SKU原价优先
-    }
+	for (const goods of goodsList) {
+		const availableNum = Number(goods.number || 0) - Number(goods.returnNum || 0);
+		const safeNum = Math.max(0, availableNum);
 
-    total = total.plus(basePrice.multipliedBy(availableNum));
-  }
+		let basePrice = new BigNumber(0);
 
-  return truncateToTwoDecimals(total.toNumber());
+		if (goods.is_temporary || goods.isTemporary) {
+			// ✅ 修复这里：用 ?? 0，永远不会把 0 变成 NaN
+			basePrice = new BigNumber(Number(goods.discountSaleAmount) ?? 0);
+		} else if (goods.is_gift || goods.isGift) {
+			basePrice = new BigNumber(0);
+		} else {
+			basePrice = new BigNumber(goods.skuData?.salePrice ?? goods.salePrice ?? 0);
+		}
+
+		total = total.plus(basePrice.multipliedBy(safeNum));
+	}
+
+	return truncateToTwoDecimals(total.toNumber());
 }
 
 /**
@@ -695,22 +692,23 @@ export function calcGoodsOriginalAmount(goodsList: BaseCartItem[]): number {
  * @returns 商品实际总价（元）
  */
 export function calcGoodsRealAmount(
-  goodsList: BaseCartItem[],
-  config: Pick<
-    OrderExtraConfig,
-    "isMember" | "memberDiscountRate" | "limitTimeDiscount"
-  >
+	goodsList: BaseCartItem[],
+	config: Pick<
+		OrderExtraConfig,
+		"isMember" | "memberDiscountRate" | "limitTimeDiscount"
+	>
 ): number {
-  let total = new BigNumber(0);
+	let total = new BigNumber(0);
 
-  for (const goods of goodsList) {
-    const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
-    if (availableNum <= 0) continue;
-    const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
-    total = total.plus(realPrice.multipliedBy(availableNum));
-  }
+	for (const goods of goodsList) {
+		const availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+		if (availableNum <= 0) continue;
+		const realPrice = new BigNumber(calcSingleGoodsRealPrice(goods, config));
+		console.log("realPrice", realPrice.toNumber());
+		total = total.plus(realPrice.multipliedBy(availableNum));
+	}
 
-  return truncateToTwoDecimals(total.toNumber());
+	return truncateToTwoDecimals(total.toNumber());
 }
 
 /**
@@ -720,14 +718,14 @@ export function calcGoodsRealAmount(
  * @returns 商品折扣总金额（元，≥0）
  */
 export function calcGoodsDiscountAmount(
-  goodsOriginalAmount: number,
-  goodsRealAmount: number
+	goodsOriginalAmount: number,
+	goodsRealAmount: number
 ): number {
-  const original = new BigNumber(goodsOriginalAmount);
-  const real = new BigNumber(goodsRealAmount);
-  const discount = original.minus(real);
+	const original = new BigNumber(goodsOriginalAmount);
+	const real = new BigNumber(goodsRealAmount);
+	const discount = original.minus(real);
 
-  return truncateToTwoDecimals(Math.max(0, discount.toNumber()));
+	return truncateToTwoDecimals(Math.max(0, discount.toNumber()));
 }
 /**
  * 从满减活动的多门槛中，选择最优阈值（满金额最小且减免金额最大）
@@ -739,43 +737,43 @@ export function calcGoodsDiscountAmount(
  * @returns 最优阈值（无符合条件则返回undefined）
  */
 export function selectOptimalThreshold(
-  thresholds: FullReductionThreshold[] = [],
-  baseAmount: number,
-  goodsOriginalAmount: number,
-  goodsRealAmount: number,
-  discountShare: number = 0
+	thresholds: FullReductionThreshold[] = [],
+	baseAmount: number,
+	goodsOriginalAmount: number,
+	goodsRealAmount: number,
+	discountShare: number = 0
 ): FullReductionThreshold | undefined {
-  if (!thresholds.length) return undefined;
+	if (!thresholds.length) return undefined;
 
-  // 第一步：确定满减门槛基数（根据discountShare规则）
-  const thresholdBase = baseAmount;
+	// 第一步：确定满减门槛基数（根据discountShare规则）
+	const thresholdBase = baseAmount;
 
-  // 第二步：筛选「满金额≤基数」且「减免金额>0」的有效阈值
-  const validThresholds = thresholds.filter((threshold) => {
-    const fullAmount = new BigNumber(threshold.fullAmount || 0);
-    const discountAmount = new BigNumber(threshold.discountAmount || 0);
+	// 第二步：筛选「满金额≤基数」且「减免金额>0」的有效阈值
+	const validThresholds = thresholds.filter((threshold) => {
+		const fullAmount = new BigNumber(threshold.fullAmount || 0);
+		const discountAmount = new BigNumber(threshold.discountAmount || 0);
 
-    return (
-      fullAmount.isLessThanOrEqualTo(thresholdBase) &&
-      discountAmount.isGreaterThan(0)
-    );
-  });
+		return (
+			fullAmount.isLessThanOrEqualTo(thresholdBase) &&
+			discountAmount.isGreaterThan(0)
+		);
+	});
 
-  if (!validThresholds.length) return undefined;
+	if (!validThresholds.length) return undefined;
 
-  // 找到抵扣金额最大的门槛项
-  const maxDiscountThreshold = validThresholds.reduce(
-    (maxItem, currentItem) => {
-      // 处理空值，默认抵扣金额为0
-      const maxDiscount = new BigNumber(maxItem?.discountAmount || 0);
-      const currentDiscount = new BigNumber(currentItem?.discountAmount || 0);
+	// 找到抵扣金额最大的门槛项
+	const maxDiscountThreshold = validThresholds.reduce(
+		(maxItem, currentItem) => {
+			// 处理空值，默认抵扣金额为0
+			const maxDiscount = new BigNumber(maxItem?.discountAmount || 0);
+			const currentDiscount = new BigNumber(currentItem?.discountAmount || 0);
 
-      // 比较当前项和已存最大项的抵扣金额，保留更大的
-      return currentDiscount.gt(maxDiscount) ? currentItem : maxItem;
-    },
-    validThresholds[0] || null
-  ); // 初始值为数组第一项（若数组为空则返回null）
-  return maxDiscountThreshold;
+			// 比较当前项和已存最大项的抵扣金额，保留更大的
+			return currentDiscount.gt(maxDiscount) ? currentItem : maxItem;
+		},
+		validThresholds[0] || null
+	); // 初始值为数组第一项（若数组为空则返回null）
+	return maxDiscountThreshold;
 }
 
 /**
@@ -786,25 +784,25 @@ export function selectOptimalThreshold(
  * @returns 实际减免金额（元，未达门槛则0）
  */
 export function calcFullReductionAmount(
-  baseAmount: number,
-  optimalActivity?: FullReductionActivity,
-  optimalThreshold?: FullReductionThreshold
+	baseAmount: number,
+	optimalActivity?: FullReductionActivity,
+	optimalThreshold?: FullReductionThreshold
 ): number {
-  if (!optimalActivity || !optimalThreshold) return 0;
+	if (!optimalActivity || !optimalThreshold) return 0;
 
-  const baseAmountBn = new BigNumber(baseAmount);
-  const discountAmountBn = new BigNumber(optimalThreshold.discountAmount || 0);
+	const baseAmountBn = new BigNumber(baseAmount);
+	const discountAmountBn = new BigNumber(optimalThreshold.discountAmount || 0);
 
-  // 1. 基数必须为正（避免减免后为负）
-  if (baseAmountBn.isLessThanOrEqualTo(0)) return 0;
+	// 1. 基数必须为正（避免减免后为负）
+	if (baseAmountBn.isLessThanOrEqualTo(0)) return 0;
 
-  // 2. 减免金额不能超过基数（避免减成负数）
-  const maxReducible = baseAmountBn;
-  const actualReduction = discountAmountBn.isLessThanOrEqualTo(maxReducible)
-    ? discountAmountBn
-    : maxReducible;
+	// 2. 减免金额不能超过基数（避免减成负数）
+	const maxReducible = baseAmountBn;
+	const actualReduction = discountAmountBn.isLessThanOrEqualTo(maxReducible)
+		? discountAmountBn
+		: maxReducible;
 
-  return truncateToTwoDecimals(actualReduction.toNumber());
+	return truncateToTwoDecimals(actualReduction.toNumber());
 }
 
 // ------------------------------ 策略辅助函数 ------------------------------
@@ -812,13 +810,13 @@ export function calcFullReductionAmount(
  * 根据优惠券useShops列表判断门店是否匹配（适配BaseCoupon的useShops字段）
  */
 function isStoreMatchByList(
-  useShops: string[],
-  currentStoreId: string
+	useShops: string[],
+	currentStoreId: string
 ): boolean {
-  // 适用门店为空数组 → 无限制（所有门店适用）
-  if (useShops.length === 0) return true;
-  // 匹配当前门店ID（字符串比较，避免类型问题）
-  return useShops.includes(currentStoreId);
+	// 适用门店为空数组 → 无限制（所有门店适用）
+	if (useShops.length === 0) return true;
+	// 匹配当前门店ID（字符串比较，避免类型问题）
+	return useShops.includes(currentStoreId);
 }
 
 /**
@@ -829,61 +827,61 @@ function isStoreMatchByList(
  * @returns 最优优惠券的抵扣结果（含商品券/满减券细分）
  */
 export function calcCouponDeduction(
-  backendCoupons: BackendCoupon[],
-  goodsList: BaseCartItem[],
-  config: Pick<
-    OrderExtraConfig,
-    "currentStoreId" | "isMember" | "memberDiscountRate"
-  > & {
-    activities: ActivityConfig[];
-    cartOrder: Record<string, number>;
-    dinnerType: "dine-in" | "take-out";
-    currentTime?: Date;
-  }
+	backendCoupons: BackendCoupon[],
+	goodsList: BaseCartItem[],
+	config: Pick<
+		OrderExtraConfig,
+		"currentStoreId" | "isMember" | "memberDiscountRate"
+	> & {
+		activities: ActivityConfig[];
+		cartOrder: Record<string, number>;
+		dinnerType: "dine-in" | "take-out";
+		currentTime?: Date;
+	}
 ): {
-  deductionAmount: number;
-  productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券/折扣券/买一送一等）
-  fullCouponDeduction: number; // 新增：满减优惠券抵扣
-  usedCoupon?: Coupon;
-  excludedProductIds: string[]; // 排除的商品ID列表（商品ID）
+	deductionAmount: number;
+	productCouponDeduction: number; // 新增：商品优惠券抵扣（兑换券/折扣券/买一送一等）
+	fullCouponDeduction: number; // 新增：满减优惠券抵扣
+	usedCoupon?: Coupon;
+	excludedProductIds: string[]; // 排除的商品ID列表（商品ID）
 } {
-  const goodsCoupon = backendCoupons.filter((v) => v.type == 2);
-  const discountCoupon = backendCoupons.filter((v) => v.type != 2);
+	const goodsCoupon = backendCoupons.filter((v) => v.type == 2);
+	const discountCoupon = backendCoupons.filter((v) => v.type != 2);
 
-  // 3. 计算非兑换券最优抵扣（传递已抵扣商品ID，避免重复，统计细分字段）
-  let nonExchangeResult: CouponResult = {
-    deductionAmount: discountCoupon.reduce((prve, cur): number => {
-      return prve + (cur.discountAmount || 0);
-    }, 0),
-    excludedProductIds: [],
-    usedCoupon: undefined,
-    productCouponDeduction: 0,
-    fullCouponDeduction: 0,
-  };
+	// 3. 计算非兑换券最优抵扣（传递已抵扣商品ID，避免重复，统计细分字段）
+	let nonExchangeResult: CouponResult = {
+		deductionAmount: discountCoupon.reduce((prve, cur): number => {
+			return prve + (cur.discountAmount || 0);
+		}, 0),
+		excludedProductIds: [],
+		usedCoupon: undefined,
+		productCouponDeduction: 0,
+		fullCouponDeduction: 0,
+	};
 
-  // 4. 计算兑换券抵扣（排除非兑换券已抵扣的商品ID，统计商品券细分）
-  let exchangeResult: ExchangeCalculationResult = {
-    deductionAmount: goodsCoupon.reduce((prve, cur): number => {
-      return prve + (cur.discountAmount || 0);
-    }, 0),
-    excludedProductIds: [],
-    productCouponDeduction: 0,
-  };
+	// 4. 计算兑换券抵扣（排除非兑换券已抵扣的商品ID，统计商品券细分）
+	let exchangeResult: ExchangeCalculationResult = {
+		deductionAmount: goodsCoupon.reduce((prve, cur): number => {
+			return prve + (cur.discountAmount || 0);
+		}, 0),
+		excludedProductIds: [],
+		productCouponDeduction: 0,
+	};
 
-  // 5. 汇总结果：兑换券与非兑换券不可同时使用，取抵扣金额大的
-  const exchangeBn = new BigNumber(exchangeResult.deductionAmount);
-  const nonExchangeBn = new BigNumber(nonExchangeResult.deductionAmount);
-  const isExchangeBetter = exchangeBn.isGreaterThan(nonExchangeBn);
+	// 5. 汇总结果：兑换券与非兑换券不可同时使用，取抵扣金额大的
+	const exchangeBn = new BigNumber(exchangeResult.deductionAmount);
+	const nonExchangeBn = new BigNumber(nonExchangeResult.deductionAmount);
+	const isExchangeBetter = exchangeBn.isGreaterThan(nonExchangeBn);
 
-  return {
-    deductionAmount: exchangeBn.plus(nonExchangeBn).toNumber(),
-    productCouponDeduction: exchangeResult.deductionAmount,
-    fullCouponDeduction: nonExchangeResult.deductionAmount, // 兑换券与满减券互斥，满减券抵扣置0
-    usedCoupon: isExchangeBetter ? undefined : nonExchangeResult.usedCoupon,
-    excludedProductIds: isExchangeBetter
-      ? exchangeResult.excludedProductIds
-      : nonExchangeResult.excludedProductIds,
-  };
+	return {
+		deductionAmount: exchangeBn.plus(nonExchangeBn).toNumber(),
+		productCouponDeduction: exchangeResult.deductionAmount,
+		fullCouponDeduction: nonExchangeResult.deductionAmount, // 兑换券与满减券互斥，满减券抵扣置0
+		usedCoupon: isExchangeBetter ? undefined : nonExchangeResult.usedCoupon,
+		excludedProductIds: isExchangeBetter
+			? exchangeResult.excludedProductIds
+			: nonExchangeResult.excludedProductIds,
+	};
 }
 
 // ============================ 5. 其他费用计算（无ID依赖，逻辑不变） ============================
@@ -894,31 +892,31 @@ export function calcCouponDeduction(
  * @returns 总打包费（元）
  */
 export function calcTotalPackFee(
-  goodsList: BaseCartItem[],
-  dinnerType: "dine-in" | "take-out"
+	goodsList: BaseCartItem[],
+	dinnerType: "dine-in" | "take-out"
 ): number {
-  // if (dinnerType !== "take-out") return 0;
-  let total = new BigNumber(0);
+	// if (dinnerType !== "take-out") return 0;
+	let total = new BigNumber(0);
 
-  for (const goods of goodsList) {
-    const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
-    let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
+	for (const goods of goodsList) {
+		const packNumber = goods.packNumber ? goods.packNumber * 1 : 0;
+		let availableNum = Math.max(0, goods.number - (goods.returnNum || 0));
 
-    if (availableNum === 0) continue;
+		if (availableNum === 0) continue;
 
-    // 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
-    let packNum = Math.min(availableNum, packNumber);
-    if (dinnerType === "take-out") {
-      packNum = availableNum;
-    }
-    if (goods.product_type === GoodsType.WEIGHT) {
-      packNum = Math.min(packNum, 1);
-    }
+		// 计算单个商品打包数量（外卖全打包，堂食按配置，称重商品≤1）
+		let packNum = Math.min(availableNum, packNumber);
+		if (dinnerType === "take-out") {
+			packNum = availableNum;
+		}
+		if (goods.product_type === GoodsType.WEIGHT) {
+			packNum = Math.min(packNum, 1);
+		}
 
-    total = total.plus(new BigNumber(goods.packFee || 0).multipliedBy(packNum));
-  }
+		total = total.plus(new BigNumber(goods.packFee || 0).multipliedBy(packNum));
+	}
 
-  return truncateToTwoDecimals(total.toNumber());
+	return truncateToTwoDecimals(total.toNumber());
 }
 
 /**
@@ -927,11 +925,11 @@ export function calcTotalPackFee(
  * @returns 餐位费（元，未启用则0）
  */
 export function calcSeatFee(config: SeatFeeConfig): number {
-  if (!config.isEnabled || config.personCount == 0) return 0;
-  const personCount = Math.max(1, config.personCount); // 至少1人
-  return truncateToTwoDecimals(
-    new BigNumber(config.pricePerPerson).multipliedBy(personCount).toNumber()
-  );
+	if (!config.isEnabled || config.personCount == 0) return 0;
+	const personCount = Math.max(1, config.personCount); // 至少1人
+	return truncateToTwoDecimals(
+		new BigNumber(config.pricePerPerson).multipliedBy(personCount).toNumber()
+	);
 }
 
 /**
@@ -942,56 +940,56 @@ export function calcSeatFee(config: SeatFeeConfig): number {
  * @returns 积分抵扣金额 + 实际使用积分
  */
 export function calcPointDeduction(
-  userPoints: number,
-  rule: PointDeductionRule,
-  maxDeductionLimit: number
+	userPoints: number,
+	rule: PointDeductionRule,
+	maxDeductionLimit: number
 ): {
-  deductionAmount: number;
-  usedPoints: number;
+	deductionAmount: number;
+	usedPoints: number;
 } {
-  if (rule.pointsPerYuan <= 0 || userPoints <= 0) {
-    return { deductionAmount: 0, usedPoints: 0 };
-  }
+	if (rule.pointsPerYuan <= 0 || userPoints <= 0) {
+		return { deductionAmount: 0, usedPoints: 0 };
+	}
 
-  const userPointsBn = new BigNumber(userPoints);
-  const pointsPerYuanBn = new BigNumber(rule.pointsPerYuan);
-  const maxLimitBn = new BigNumber(maxDeductionLimit);
+	const userPointsBn = new BigNumber(userPoints);
+	const pointsPerYuanBn = new BigNumber(rule.pointsPerYuan);
+	const maxLimitBn = new BigNumber(maxDeductionLimit);
 
-  // 最大可抵扣金额（积分可抵金额 vs 规则最大 vs 订单上限）
-  const maxDeductByPoints = userPointsBn.dividedBy(pointsPerYuanBn);
-  const maxDeductAmount = maxDeductByPoints.isLessThan(
-    rule.maxDeductionAmount ?? Infinity
-  )
-    ? maxDeductByPoints
-    : new BigNumber(rule.maxDeductionAmount || Infinity).isLessThan(maxLimitBn)
-    ? maxDeductByPoints
-    : maxLimitBn;
+	// 最大可抵扣金额（积分可抵金额 vs 规则最大 vs 订单上限）
+	const maxDeductByPoints = userPointsBn.dividedBy(pointsPerYuanBn);
+	const maxDeductAmount = maxDeductByPoints.isLessThan(
+		rule.maxDeductionAmount ?? Infinity
+	)
+		? maxDeductByPoints
+		: new BigNumber(rule.maxDeductionAmount || Infinity).isLessThan(maxLimitBn)
+			? maxDeductByPoints
+			: maxLimitBn;
 
-  // 实际使用积分 = 抵扣金额 * 积分兑换比例
-  const usedPoints = maxDeductAmount.multipliedBy(pointsPerYuanBn);
+	// 实际使用积分 = 抵扣金额 * 积分兑换比例
+	const usedPoints = maxDeductAmount.multipliedBy(pointsPerYuanBn);
 
-  return {
-    deductionAmount: truncateToTwoDecimals(maxDeductAmount.toNumber()),
-    usedPoints: truncateToTwoDecimals(
-      Math.min(usedPoints.toNumber(), userPoints)
-    ), // 避免积分超扣
-  };
+	return {
+		deductionAmount: truncateToTwoDecimals(maxDeductAmount.toNumber()),
+		usedPoints: truncateToTwoDecimals(
+			Math.min(usedPoints.toNumber(), userPoints)
+		), // 避免积分超扣
+	};
 }
 
 function calcVipDiscountAmount(
-  goodsRealAmount: number,
-  shopUserInfo: ShopUserInfo
+	goodsRealAmount: number,
+	shopUserInfo: ShopUserInfo,
+	isMember: boolean,
+
 ): number {
-  if (!shopUserInfo.isVip || shopUserInfo.discount === 0) return 0;
-  if (shopUserInfo.isVip == 1 && shopUserInfo.isMemberPrice != 1) {
-    return 0;
-  }
-  return truncateToTwoDecimals(
-    new BigNumber(goodsRealAmount)
-      .times((100 - (shopUserInfo.discount || 100)) / 100)
-      .decimalPlaces(2, BigNumber.ROUND_DOWN)
-      .toNumber()
-  );
+	if (!isMember) return 0;
+	if (!shopUserInfo.isVip || shopUserInfo.discount === 0) return 0;
+	return truncateToTwoDecimals(
+		new BigNumber(goodsRealAmount)
+			.times((100 - (shopUserInfo.discount || 100)) / 100)
+			.decimalPlaces(2, BigNumber.ROUND_DOWN)
+			.toNumber()
+	);
 }
 
 // ============================ 6. 订单总费用汇总与实付金额计算（核心入口，补充细分字段） ============================
@@ -1007,372 +1005,374 @@ function calcVipDiscountAmount(
  * @returns 订单费用汇总（含所有子项和实付金额，新增商品券/满减券细分）
  */
 export function calculateOrderCostSummary(
-  goodsList: BaseCartItem[],
-  dinnerType: "dine-in" | "take-out", // 前端就餐类型
-  backendCoupons: BackendCoupon[] = [],
-  activities: ActivityConfig[] = [],
-  config: OrderExtraConfig, // 含后端满减活动、currentDinnerType
-  cartOrder: Record<string, number> = {},
-  currentTime: Date = new Date()
+	goodsList: BaseCartItem[],
+	dinnerType: "dine-in" | "take-out", // 前端就餐类型
+	backendCoupons: BackendCoupon[] = [],
+	activities: ActivityConfig[] = [],
+	config: OrderExtraConfig, // 含后端满减活动、currentDinnerType
+	cartOrder: Record<string, number> = {},
+	currentTime: Date = new Date()
 ): OrderCostSummary {
-  //是否使用霸王餐，霸王餐配置
-  const {
-    isFreeDine,
-    freeDineConfig,
-    limitTimeDiscount,
-    fullReductionActivities,
-    shopUserInfo,
-  } = config;
+	//是否使用霸王餐，霸王餐配置
+	const {
+		isFreeDine,
+		freeDineConfig,
+		limitTimeDiscount,
+		fullReductionActivities,
+		shopUserInfo,
+	} = config;
 
-  // ------------------------------ 1. 基础费用计算 ------------------------------
-  const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
-  const goodsRealAmount = calcGoodsRealAmount(
-    // 商品折扣后总和
-    goodsList,
-    {
-      isMember: config.isMember,
-      memberDiscountRate: config.memberDiscountRate,
-      limitTimeDiscount: config.limitTimeDiscount,
-    }
-  );
-  const goodsDiscountAmount = calcGoodsDiscountAmount(
-    goodsOriginalAmount,
-    goodsRealAmount
-  ); // 商品折扣金额
+	// ------------------------------ 1. 基础费用计算 ------------------------------
+	const goodsOriginalAmount = calcGoodsOriginalAmount(goodsList); // 商品原价总和
+	const goodsRealAmount = calcGoodsRealAmount(
+		// 商品折扣后总和
+		goodsList,
+		{
+			isMember: config.isMember,
+			memberDiscountRate: config.memberDiscountRate,
+			limitTimeDiscount: config.limitTimeDiscount,
+		}
+	);
+	const goodsDiscountAmount = calcGoodsDiscountAmount(
+		goodsOriginalAmount,
+		goodsRealAmount
+	); // 商品折扣金额
+	console.log("goodsOriginalAmount", goodsOriginalAmount);
+	console.log("goodsRealAmount", goodsRealAmount);
+	const newUserDiscount = config.newUserDiscount || 0; // 新客立减
 
-  const newUserDiscount = config.newUserDiscount || 0; // 新客立减
+	//  其他费用计算（原有逻辑不变） ------------------------------
+	const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
+	let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
+	seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
+	const additionalFee = Math.max(0, config.additionalFee); // 附加费
 
-  //  其他费用计算（原有逻辑不变） ------------------------------
-  const packFee = calcTotalPackFee(goodsList, dinnerType); // 打包费
-  let seatFee = calcSeatFee(config.seatFeeConfig); // 餐位费
-  seatFee = dinnerType === "dine-in" ? seatFee : 0; // 外卖不收餐位费
-  const additionalFee = Math.max(0, config.additionalFee); // 附加费
+	// ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
+	let usedFullReductionActivity: FullReductionActivity | undefined;
+	let usedFullReductionThreshold: FullReductionThreshold | undefined;
+	let fullReductionAmount = 0;
+	let usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+		goodsList,
+		usedFullReductionActivity,
+		config.limitTimeDiscount,
+		config.isMember,
+		seatFee,
+		packFee
+	);
 
-  // ------------------------------ 2. 满减活动计算（核心步骤） ------------------------------
-  let usedFullReductionActivity: FullReductionActivity | undefined;
-  let usedFullReductionThreshold: FullReductionThreshold | undefined;
-  let fullReductionAmount = 0;
-  let usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
-    goodsList,
-    usedFullReductionActivity,
-    config.limitTimeDiscount,
-    config.isMember,
-    seatFee,
-    packFee
-  );
+	// 2.1 筛选最优满减活动（后端活动列表、当前店铺、就餐类型、时间）
+	usedFullReductionActivity = filterOptimalFullReductionActivity(
+		config.fullReductionActivities,
+		Number(config.currentStoreId), // 转换为数字（后端shopId是number）
+		config.currentDinnerType, // 后端useType匹配的就餐类型（如"dine"）
+		currentTime
+	);
 
-  // 2.1 筛选最优满减活动（后端活动列表、当前店铺、就餐类型、时间）
-  usedFullReductionActivity = filterOptimalFullReductionActivity(
-    config.fullReductionActivities,
-    Number(config.currentStoreId), // 转换为数字（后端shopId是number）
-    config.currentDinnerType, // 后端useType匹配的就餐类型（如"dine"）
-    currentTime
-  );
+	// 2.2 计算满减基数（先扣新客立减）
+	let baseAfterNewUserDiscount = new BigNumber(
+		limitTimeDiscount &&
+			limitTimeDiscount.id &&
+			usedFullReductionActivity &&
+			!usedFullReductionActivity.discountShare
+			? goodsRealAmount
+			: goodsRealAmount
+	)
+		.minus(newUserDiscount)
+		.plus(packFee)
+		.plus(seatFee)
+		.plus(additionalFee)
+		.toNumber();
+	baseAfterNewUserDiscount =
+		baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
 
-  // 2.2 计算满减基数（先扣新客立减）
-  let baseAfterNewUserDiscount = new BigNumber(
-    limitTimeDiscount &&
-    limitTimeDiscount.id &&
-    usedFullReductionActivity &&
-    !usedFullReductionActivity.discountShare
-      ? goodsRealAmount
-      : goodsRealAmount
-  )
-    .minus(newUserDiscount)
-    .plus(packFee)
-    .plus(seatFee)
-    .plus(additionalFee)
-    .toNumber();
-  baseAfterNewUserDiscount =
-    baseAfterNewUserDiscount > 0 ? baseAfterNewUserDiscount : 0;
+	// 2.3 选择最优满减阈值（多门槛场景）
+	if (usedFullReductionActivity) {
+		//计算当前满减活动的门槛金额
+		usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
+			goodsList,
+			usedFullReductionActivity,
+			config.limitTimeDiscount,
+			config.isMember,
+			seatFee,
+			packFee
+		);
+		usedFullReductionThreshold = selectOptimalThreshold(
+			usedFullReductionActivity.thresholds,
+			usedFullReductionActivityFullAmount,
+			goodsOriginalAmount,
+			goodsRealAmount,
+			usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
+		);
+		// 2.4 计算满减实际减免金额
+		fullReductionAmount = calcFullReductionAmount(
+			baseAfterNewUserDiscount,
+			usedFullReductionActivity,
+			usedFullReductionThreshold
+		);
+	}
 
-  // 2.3 选择最优满减阈值（多门槛场景）
-  if (usedFullReductionActivity) {
-    //计算当前满减活动的门槛金额
-    usedFullReductionActivityFullAmount = calcFullReductionActivityFullAmount(
-      goodsList,
-      usedFullReductionActivity,
-      config.limitTimeDiscount,
-      config.isMember,
-      seatFee,
-      packFee
-    );
-    usedFullReductionThreshold = selectOptimalThreshold(
-      usedFullReductionActivity.thresholds,
-      usedFullReductionActivityFullAmount,
-      goodsOriginalAmount,
-      goodsRealAmount,
-      usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
-    );
-    // 2.4 计算满减实际减免金额
-    fullReductionAmount = calcFullReductionAmount(
-      baseAfterNewUserDiscount,
-      usedFullReductionActivity,
-      usedFullReductionThreshold
-    );
-  }
+	// ------------------------------ 3. 优惠券抵扣（适配满减同享规则） ------------------------------
+	let couponDeductionAmount = 0;
+	let productCouponDeduction = 0;
+	let fullCouponDeduction = 0;
+	let usedCoupon: Coupon | undefined;
+	let excludedProductIds: string[] = [];
 
-  // ------------------------------ 3. 优惠券抵扣（适配满减同享规则） ------------------------------
-  let couponDeductionAmount = 0;
-  let productCouponDeduction = 0;
-  let fullCouponDeduction = 0;
-  let usedCoupon: Coupon | undefined;
-  let excludedProductIds: string[] = [];
+	const couponResult = calcCouponDeduction(
+		// 原有优惠券计算函数
+		backendCoupons,
+		goodsList,
+		{
+			currentStoreId: config.currentStoreId,
+			isMember: config.isMember,
+			memberDiscountRate: config.memberDiscountRate,
+			activities,
+			cartOrder,
+			dinnerType,
+			currentTime,
+		}
+	);
+	couponDeductionAmount = couponResult.deductionAmount;
+	productCouponDeduction = couponResult.productCouponDeduction;
+	fullCouponDeduction = couponResult.fullCouponDeduction;
+	usedCoupon = couponResult.usedCoupon;
+	excludedProductIds = couponResult.excludedProductIds;
 
-  const couponResult = calcCouponDeduction(
-    // 原有优惠券计算函数
-    backendCoupons,
-    goodsList,
-    {
-      currentStoreId: config.currentStoreId,
-      isMember: config.isMember,
-      memberDiscountRate: config.memberDiscountRate,
-      activities,
-      cartOrder,
-      dinnerType,
-      currentTime,
-    }
-  );
-  couponDeductionAmount = couponResult.deductionAmount;
-  productCouponDeduction = couponResult.productCouponDeduction;
-  fullCouponDeduction = couponResult.fullCouponDeduction;
-  usedCoupon = couponResult.usedCoupon;
-  excludedProductIds = couponResult.excludedProductIds;
+	// 若满减与优惠券同享（couponShare=1），才计算优惠券；否则优惠券抵扣为0
+	if (
+		usedFullReductionThreshold &&
+		(!usedFullReductionActivity || !usedFullReductionActivity.couponShare)
+	) {
+		couponDeductionAmount = 0;
+		productCouponDeduction = 0;
+		fullCouponDeduction = 0;
+		usedCoupon = undefined;
+		excludedProductIds = [];
+	}
 
-  // 若满减与优惠券同享（couponShare=1），才计算优惠券；否则优惠券抵扣为0
-  if (
-    usedFullReductionThreshold &&
-    (!usedFullReductionActivity || !usedFullReductionActivity.couponShare)
-  ) {
-    couponDeductionAmount = 0;
-    productCouponDeduction = 0;
-    fullCouponDeduction = 0;
-    usedCoupon = undefined;
-    excludedProductIds = [];
-  }
+	// ------------------------------ 4. 积分抵扣（适配满减同享规则） ------------------------------
+	let pointDeductionAmount = 0;
+	let usedPoints = 0;
 
-  // ------------------------------ 4. 积分抵扣（适配满减同享规则） ------------------------------
-  let pointDeductionAmount = 0;
-  let usedPoints = 0;
+	// 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券 + 餐位费 + 打包费 + 附加费）
+	let maxPointDeductionLimit = new BigNumber(goodsRealAmount)
+		.minus(newUserDiscount)
+		.minus(fullReductionAmount)
+		.minus(couponDeductionAmount)
+		.plus(seatFee)
+		.plus(packFee)
+		.plus(additionalFee)
+		.toNumber();
+	maxPointDeductionLimit =
+		maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
 
-  // 计算积分抵扣基数（商品折扣后 - 新客立减 - 满减 - 优惠券 + 餐位费 + 打包费 + 附加费）
-  let maxPointDeductionLimit = new BigNumber(goodsRealAmount)
-    .minus(newUserDiscount)
-    .minus(fullReductionAmount)
-    .minus(couponDeductionAmount)
-    .plus(seatFee)
-    .plus(packFee)
-    .plus(additionalFee)
-    .toNumber();
-  maxPointDeductionLimit =
-    maxPointDeductionLimit > 0 ? maxPointDeductionLimit : 0;
+	const pointResult = calcPointDeduction(
+		config.userPoints,
+		config.pointDeductionRule,
+		maxPointDeductionLimit
+	);
 
-  const pointResult = calcPointDeduction(
-    config.userPoints,
-    config.pointDeductionRule,
-    maxPointDeductionLimit
-  );
+	pointDeductionAmount = pointResult.deductionAmount;
+	usedPoints = pointResult.usedPoints;
+	// 若满减与积分不同享（pointsShare=1）积分抵扣为0
+	if (
+		usedFullReductionThreshold &&
+		(!usedFullReductionActivity || !usedFullReductionActivity.pointsShare)
+	) {
+		pointDeductionAmount = 0;
+		usedPoints = 0;
+	}
 
-  pointDeductionAmount = pointResult.deductionAmount;
-  usedPoints = pointResult.usedPoints;
-  // 若满减与积分不同享（pointsShare=1）积分抵扣为0
-  if (
-    usedFullReductionThreshold &&
-    (!usedFullReductionActivity || !usedFullReductionActivity.pointsShare)
-  ) {
-    pointDeductionAmount = 0;
-    usedPoints = 0;
-  }
+	//使用霸王餐
+	if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+		fullReductionAmount = 0;
+		//不与优惠券同享
+		if (!freeDineConfig.withCoupon) {
+			couponDeductionAmount = 0;
+			productCouponDeduction = 0;
+			fullCouponDeduction = 0;
+			usedCoupon = undefined;
+			excludedProductIds = [];
+		}
+		//不与积分同享
+		if (!freeDineConfig.withPoints) {
+			pointDeductionAmount = 0;
+			usedPoints = 0;
+		}
+	}
 
-  //使用霸王餐
-  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
-    fullReductionAmount = 0;
-    //不与优惠券同享
-    if (!freeDineConfig.withCoupon) {
-      couponDeductionAmount = 0;
-      productCouponDeduction = 0;
-      fullCouponDeduction = 0;
-      usedCoupon = undefined;
-      excludedProductIds = [];
-    }
-    //不与积分同享
-    if (!freeDineConfig.withPoints) {
-      pointDeductionAmount = 0;
-      usedPoints = 0;
-    }
-  }
+	// 商家减免计算（原有逻辑不变）
+	const merchantReductionConfig = config.merchantReduction;
+	let merchantReductionActualAmount = 0;
+	const maxMerchantReductionLimit = new BigNumber(goodsRealAmount)
+		.minus(newUserDiscount)
+		.minus(fullReductionAmount)
+		.minus(couponDeductionAmount)
+		.minus(pointDeductionAmount)
+		.plus(seatFee)
+		.plus(packFee)
+		.isGreaterThan(0)
+		? new BigNumber(goodsRealAmount)
+			.minus(newUserDiscount)
+			.minus(fullReductionAmount)
+			.minus(couponDeductionAmount)
+			.minus(pointDeductionAmount)
+			.plus(seatFee)
+			.plus(packFee)
+			.toNumber()
+		: 0;
 
-  // 商家减免计算（原有逻辑不变）
-  const merchantReductionConfig = config.merchantReduction;
-  let merchantReductionActualAmount = 0;
-  const maxMerchantReductionLimit = new BigNumber(goodsRealAmount)
-    .minus(newUserDiscount)
-    .minus(fullReductionAmount)
-    .minus(couponDeductionAmount)
-    .minus(pointDeductionAmount)
-    .plus(seatFee)
-    .plus(packFee)
-    .isGreaterThan(0)
-    ? new BigNumber(goodsRealAmount)
-        .minus(newUserDiscount)
-        .minus(fullReductionAmount)
-        .minus(couponDeductionAmount)
-        .minus(pointDeductionAmount)
-        .plus(seatFee)
-        .plus(packFee)
-        .toNumber()
-    : 0;
+	switch (merchantReductionConfig.type) {
+		case MerchantReductionType.FIXED_AMOUNT:
+			merchantReductionActualAmount = Math.min(
+				merchantReductionConfig.fixedAmount || 0,
+				maxMerchantReductionLimit
+			);
+			break;
+		case MerchantReductionType.DISCOUNT_RATE:
+			const validRate =
+				Math.max(0, Math.min(100, merchantReductionConfig.discountRate || 0)) /
+				100;
+			merchantReductionActualAmount =
+				maxMerchantReductionLimit * (1 - validRate);
+			break;
+	}
+	merchantReductionActualAmount = Math.max(
+		0,
+		truncateToTwoDecimals(merchantReductionActualAmount)
+	);
 
-  switch (merchantReductionConfig.type) {
-    case MerchantReductionType.FIXED_AMOUNT:
-      merchantReductionActualAmount = Math.min(
-        merchantReductionConfig.fixedAmount || 0,
-        maxMerchantReductionLimit
-      );
-      break;
-    case MerchantReductionType.DISCOUNT_RATE:
-      const validRate =
-        Math.max(0, Math.min(100, merchantReductionConfig.discountRate || 0)) /
-        100;
-      merchantReductionActualAmount =
-        maxMerchantReductionLimit * (1 - validRate);
-      break;
-  }
-  merchantReductionActualAmount = Math.max(
-    0,
-    truncateToTwoDecimals(merchantReductionActualAmount)
-  );
+	// 会员折扣减免
+	const vipDiscountAmount = calcVipDiscountAmount(
+		new BigNumber(goodsRealAmount)
+			.minus(couponDeductionAmount)
+			.plus(packFee)
+			.plus(seatFee)
+			.minus(newUserDiscount)
+			.minus(fullReductionAmount)
+			.toNumber(),
+		shopUserInfo,
+		config.isMember,
+	);
+	// ------------------------------ 6. 最终实付金额计算 ------------------------------
+	const finalPayAmountBn = new BigNumber(goodsRealAmount)
+		.minus(newUserDiscount)
+		.minus(vipDiscountAmount)
+		.minus(fullReductionAmount)
+		.minus(couponDeductionAmount)
+		.minus(pointDeductionAmount)
+		.minus(merchantReductionActualAmount)
+		.plus(seatFee)
+		.plus(packFee)
+		.plus(additionalFee);
+	let finalPayAmount = Math.max(
+		0,
+		truncateToTwoDecimals(finalPayAmountBn.toNumber())
+	);
+	// ------------------------------ 使用霸王餐计算 ------------------------------
+	let orderOriginFinalPayAmount = finalPayAmount;
+	if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
+		finalPayAmount = BigNumber(finalPayAmount)
+			.times(freeDineConfig.rechargeTimes)
+			.toNumber();
+	}
 
-  // 会员折扣减免
-  const vipDiscountAmount = calcVipDiscountAmount(
-    new BigNumber(goodsRealAmount)
-      .minus(couponDeductionAmount)
-      .plus(packFee)
-      .plus(seatFee)
-      .minus(newUserDiscount)
-      .minus(fullReductionAmount)
-      .toNumber(),
-    shopUserInfo
-  );
-  // ------------------------------ 6. 最终实付金额计算 ------------------------------
-  const finalPayAmountBn = new BigNumber(goodsRealAmount)
-    .minus(newUserDiscount)
-    .minus(vipDiscountAmount)
-    .minus(fullReductionAmount)
-    .minus(couponDeductionAmount)
-    .minus(pointDeductionAmount)
-    .minus(merchantReductionActualAmount)
-    .plus(seatFee)
-    .plus(packFee)
-    .plus(additionalFee);
-  let finalPayAmount = Math.max(
-    0,
-    truncateToTwoDecimals(finalPayAmountBn.toNumber())
-  );
-  // ------------------------------ 使用霸王餐计算 ------------------------------
-  let orderOriginFinalPayAmount = finalPayAmount;
-  if (isFreeDine && freeDineConfig && freeDineConfig.enable) {
-    finalPayAmount = BigNumber(finalPayAmount)
-      .times(freeDineConfig.rechargeTimes)
-      .toNumber();
-  }
+	// ------------------------------ 7. 总优惠金额计算 ------------------------------
+	const totalDiscountAmount = truncateToTwoDecimals(
+		new BigNumber(goodsDiscountAmount)
+			.plus(newUserDiscount)
+			.plus(fullReductionAmount)
+			.plus(couponDeductionAmount)
+			.plus(pointDeductionAmount)
+			.plus(merchantReductionActualAmount)
+			.plus(vipDiscountAmount)
+			.toNumber()
+	);
+	//积分可抵扣最大金额 最终支付金额+积分抵扣-商家减免
+	const scoreMaxMoney = new BigNumber(finalPayAmount)
+		.plus(pointDeductionAmount)
+		.minus(merchantReductionActualAmount)
+		.toNumber();
 
-  // ------------------------------ 7. 总优惠金额计算 ------------------------------
-  const totalDiscountAmount = truncateToTwoDecimals(
-    new BigNumber(goodsDiscountAmount)
-      .plus(newUserDiscount)
-      .plus(fullReductionAmount)
-      .plus(couponDeductionAmount)
-      .plus(pointDeductionAmount)
-      .plus(merchantReductionActualAmount)
-      .plus(vipDiscountAmount)
-      .toNumber()
-  );
-  //积分可抵扣最大金额 最终支付金额+积分抵扣-商家减免
-  const scoreMaxMoney = new BigNumber(finalPayAmount)
-    .plus(pointDeductionAmount)
-    .minus(merchantReductionActualAmount)
-    .toNumber();
-
-  // ------------------------------ 8. 返回完整结果 ------------------------------
-  return {
-    goodsList: goodsList,
-    goodsTotal: goodsList.reduce(
-      (sum, g) => sum + Math.max(0, g.number - (g.returnNum || 0)),
-      0
-    ),
-    goodsRealAmount,
-    goodsOriginalAmount,
-    goodsDiscountAmount,
-    couponDeductionAmount,
-    productCouponDeduction,
-    fullCouponDeduction,
-    pointDeductionAmount,
-    seatFee,
-    packFee,
-    totalDiscountAmount,
-    //最终支付原金额
-    orderOriginFinalPayAmount,
-    //积分最大可抵扣金额
-    scoreMaxMoney,
-    // 满减活动明细（后端字段）
-    fullReduction: {
-      usedFullReductionActivityFullAmount: usedFullReductionActivityFullAmount,
-      usedActivity: usedFullReductionActivity,
-      usedThreshold: usedFullReductionThreshold,
-      actualAmount: truncateToTwoDecimals(fullReductionAmount),
-    },
-    vipDiscountAmount: vipDiscountAmount, //会员折扣减免金额
-    merchantReduction: {
-      type: merchantReductionConfig.type,
-      originalConfig: merchantReductionConfig,
-      actualAmount: merchantReductionActualAmount,
-    },
-    additionalFee,
-    finalPayAmount,
-    couponUsed: usedCoupon,
-    pointUsed: usedPoints,
-    newUserDiscount,
-    dinnerType,
-    config,
-  };
+	// ------------------------------ 8. 返回完整结果 ------------------------------
+	return {
+		goodsList: goodsList,
+		goodsTotal: goodsList.reduce(
+			(sum, g) => sum + Math.max(0, g.number - (g.returnNum || 0)),
+			0
+		),
+		goodsRealAmount,
+		goodsOriginalAmount,
+		goodsDiscountAmount,
+		couponDeductionAmount,
+		productCouponDeduction,
+		fullCouponDeduction,
+		pointDeductionAmount,
+		seatFee,
+		packFee,
+		totalDiscountAmount,
+		//最终支付原金额
+		orderOriginFinalPayAmount,
+		//积分最大可抵扣金额
+		scoreMaxMoney,
+		// 满减活动明细（后端字段）
+		fullReduction: {
+			usedFullReductionActivityFullAmount: usedFullReductionActivityFullAmount,
+			usedActivity: usedFullReductionActivity,
+			usedThreshold: usedFullReductionThreshold,
+			actualAmount: truncateToTwoDecimals(fullReductionAmount),
+		},
+		vipDiscountAmount: vipDiscountAmount, //会员折扣减免金额
+		merchantReduction: {
+			type: merchantReductionConfig.type,
+			originalConfig: merchantReductionConfig,
+			actualAmount: merchantReductionActualAmount,
+		},
+		additionalFee,
+		finalPayAmount,
+		couponUsed: usedCoupon,
+		pointUsed: usedPoints,
+		newUserDiscount,
+		dinnerType,
+		config,
+	};
 }
 
 export function isWeightGoods(goods: BaseCartItem): boolean {
-  return goods.product_type === GoodsType.WEIGHT;
+	return goods.product_type === GoodsType.WEIGHT;
 }
 
 // ============================ 7. 对外暴露工具库 ============================
 export const OrderPriceCalculator = {
-  // 基础工具
-  truncateToTwoDecimals,
-  isTemporaryGoods,
-  isGiftGoods,
-  formatDiscountRate,
-  filterThresholdGoods,
-  isWeightGoods,
-  // 商品价格计算
-  calcSingleGoodsRealPrice,
-  calcGoodsOriginalAmount,
-  calcGoodsRealAmount,
-  calcGoodsDiscountAmount,
-  //满减活动工具
-  filterOptimalFullReductionActivity,
-  // 优惠券计算
-  calcCouponDeduction,
-  // 其他费用计算
-  calcTotalPackFee,
-  calcSeatFee,
-  calcPointDeduction,
-  // 核心入口
-  calculateOrderCostSummary,
-  // 枚举导出
-  Enums: {
-    GoodsType,
-    CouponType,
-    ActivityType,
-    WEEKDAY_MAP,
-  },
+	// 基础工具
+	truncateToTwoDecimals,
+	isTemporaryGoods,
+	isGiftGoods,
+	formatDiscountRate,
+	filterThresholdGoods,
+	isWeightGoods,
+	// 商品价格计算
+	calcSingleGoodsRealPrice,
+	calcGoodsOriginalAmount,
+	calcGoodsRealAmount,
+	calcGoodsDiscountAmount,
+	//满减活动工具
+	filterOptimalFullReductionActivity,
+	// 优惠券计算
+	calcCouponDeduction,
+	// 其他费用计算
+	calcTotalPackFee,
+	calcSeatFee,
+	calcPointDeduction,
+	// 核心入口
+	calculateOrderCostSummary,
+	// 枚举导出
+	Enums: {
+		GoodsType,
+		CouponType,
+		ActivityType,
+		WEEKDAY_MAP,
+	},
 };
 
-export default OrderPriceCalculator;
+export default OrderPriceCalculator;
\ No newline at end of file
diff --git a/src/lib/limit.ts b/src/lib/limit.ts
index f0591b3..5e39ee9 100644
--- a/src/lib/limit.ts
+++ b/src/lib/limit.ts
@@ -29,9 +29,7 @@ export function canUseLimitTimeDiscount(
 ) {
   shopInfo = shopInfo || {};
   shopUserInfo = shopUserInfo || {};
-  if(shopInfo.isMemberPrice){
-    shopUserInfo.isMemberPrice=1
-  }
+
   if (!limitTimeDiscountRes || !limitTimeDiscountRes.id) {
     return false;
   }
@@ -88,6 +86,9 @@ export function returnPrice(args: returnPriceArgs) {
     shopId: 0,
     useType: "",
   };
+  if(!goods){
+    return 0;
+  }
   const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
   const includesGoods =
     limitTimeDiscountRes.foodType == 1 ||
@@ -96,8 +97,7 @@ export function returnPrice(args: returnPriceArgs) {
   shopUserInfo = shopUserInfo || {};
   if (
     shopUserInfo.isMemberPrice == 1 &&
-    shopUserInfo.isVip == 1 &&
-    shopInfo.isMemberPrice == 1
+    shopUserInfo.isVip == 1 
   ) {
     const memberPrice = goods.memberPrice || goods.salePrice;
 
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
new file mode 100644
index 0000000..5e25e75
--- /dev/null
+++ b/src/lib/utils.ts
@@ -0,0 +1,33 @@
+/**
+ * 通用字段兼容工具函数：处理驼峰/下划线命名的字段取值
+ * @param obj 目标对象（如商品信息 BaseCartItem）
+ * @param camelCaseKey 驼峰命名字段（如 'isTemporary'）
+ * @param snakeCaseKey 下划线命名字段（如 'is_temporary'）
+ * @param defaultValue 默认值（默认 false，适配布尔类型字段）
+ * @returns 字段值（优先取存在的字段，无则返回默认值）
+ */
+export function getCompatibleFieldValue(
+  obj: Record<string, any>,
+  camelCaseKey: string,
+  snakeCaseKey: string,
+  defaultValue: boolean = false
+): boolean {
+  // 优先判断驼峰字段（如果存在且不是 undefined/null）
+  if (
+    obj.hasOwnProperty(camelCaseKey) &&
+    obj[camelCaseKey] !== undefined &&
+    obj[camelCaseKey] !== null
+  ) {
+    return Boolean(obj[camelCaseKey]);
+  }
+  // 再判断下划线字段
+  if (
+    obj.hasOwnProperty(snakeCaseKey) &&
+    obj[snakeCaseKey] !== undefined &&
+    obj[snakeCaseKey] !== null
+  ) {
+    return Boolean(obj[snakeCaseKey]);
+  }
+  // 都不存在时返回默认值（布尔类型字段默认 false）
+  return defaultValue;
+}
\ No newline at end of file
diff --git a/src/store/modules/carts-back.ts b/src/store/modules/carts-back.ts
index 947df0f..e85b1ee 100644
--- a/src/store/modules/carts-back.ts
+++ b/src/store/modules/carts-back.ts
@@ -2,10 +2,11 @@ import { store } from "@/store";
 import WebSocketManager, { type ApifoxModel, msgType } from "@/utils/websocket";
 import orderApi from "@/api/order/order";
 import { useUserStoreHook } from "@/store/modules/user";
+const shopUser = useUserStoreHook();
+
 import { customTruncateToTwoDecimals } from '@/utils/tools'
 import productApi from "@/api/product/index";
 
-const shopUser = useUserStoreHook();
 export interface CartsState {
   id: string | number;
   [property: string]: any;
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 93b4224..4469a2d 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -11,6 +11,7 @@ import { setToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/
 export const useUserStore = defineStore("user", () => {
   // const isShopAdmin = ref(false) // 0商户 1员工
   const isShopAdmin = useStorage("isShopAdmin", false) // 0商户 1员工
+  const isAdmin = useStorage("isAdmin", false) // 是否是管理员
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
   const promissionList = useStorage<string[]>("promissionList", [] as string[]);
   //美团抖音核销店铺信息
@@ -32,6 +33,7 @@ export const useUserStore = defineStore("user", () => {
       AuthAPI.login(loginRequest)
         .then((data) => {
           isShopAdmin.value = data.loginType == 0 ? true : false;
+          isAdmin.value = data.shopInfo.id == 1 ? true : false
           Object.assign(userInfo.value, { ...data.shopInfo, shopId: data.shopInfo.id });
           promissionList.value = data.promissionList;
           const token = data.tokenInfo.tokenValue;
@@ -120,6 +122,7 @@ export const useUserStore = defineStore("user", () => {
       userInfo.value = {} as UserInfo
       meituan_douyin_info.value = {}
       isShopAdmin.value = false
+      isAdmin.value = false
       clearToken();
       usePermissionStoreHook().resetRouter();
       useDictStoreHook().clearDictionaryCache();
@@ -137,7 +140,7 @@ export const useUserStore = defineStore("user", () => {
   }
 
   return {
-    isShopAdmin,
+    isShopAdmin, isAdmin,
     meituan_douyin_info,
     userInfo,
     promissionList,
diff --git a/src/views/data/credit/config/add.ts b/src/views/data/credit/config/add.ts
index 5dee9c9..290d639 100644
--- a/src/views/data/credit/config/add.ts
+++ b/src/views/data/credit/config/add.ts
@@ -19,18 +19,7 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-    {
-      label: "状态",
-      prop: "status",
-      type: 'switch',
-      attrs: {
-        activeText: '开启',
-        inactiveText: '关闭',
-        activeValue: 1,
-        inactiveValue: 0
-      },
-      initialValue: 1
-    },
+
 
     {
       label: "挂账人",
@@ -66,6 +55,56 @@ const modalConfig: IModalConfig = {
       },
       initialValue: 0
     },
+    // ===================== 新增 =====================
+    {
+      label: "还款提醒日",
+      prop: "expireRemindDay",
+      type: "input",
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if (!value) return callback();
+            const num = Number(value);
+            if (!Number.isInteger(num) || num < 1 || num > 28) {
+              callback(new Error("请输入 1~28 之间的整数"));
+            }
+            callback();
+          }
+        }
+      ],
+      attrs: {
+        type: "number",
+        placeholder: "每月几号提醒（1-28）",
+        style: { width: "200px" },
+        oninput: "value=value.replace(/\\D|\\./g,'')" // 禁止输入小数点
+      },
+      initialValue: "",
+    },
+    {
+      label: "还款提醒",
+      prop: "expireRemind",
+      type: "input",
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if (!value) return callback();
+            const num = Number(value);
+            if (!Number.isInteger(num) || num < 0) {
+              callback(new Error("请输入大于等于 0 的整数"));
+            }
+            callback();
+          }
+        }
+      ],
+      attrs: {
+        type: "number",
+        placeholder: "提醒多久以前的数据单位(月)",
+        style: { width: "240px" },
+        oninput: "value=value.replace(/\\D|\\./g,'')" // 禁止输入小数点
+      },
+      initialValue: "",
+    },
+    // ================================================
     {
       label: "还款方式",
       prop: "repaymentMethod",
@@ -73,6 +112,18 @@ const modalConfig: IModalConfig = {
       options: returnOptions('repaymentMethod'),
       initialValue: returnOptions('repaymentMethod')[0].value
     },
+    {
+      label: "状态",
+      prop: "status",
+      type: 'switch',
+      attrs: {
+        activeText: '开启',
+        inactiveText: '关闭',
+        activeValue: 1,
+        inactiveValue: 0
+      },
+      initialValue: 1
+    },
   ],
 };
 
diff --git a/src/views/data/credit/config/content.ts b/src/views/data/credit/config/content.ts
index f29af88..6223afa 100644
--- a/src/views/data/credit/config/content.ts
+++ b/src/views/data/credit/config/content.ts
@@ -58,16 +58,36 @@ const contentConfig: IContentConfig = {
       label: "已挂账金额（元）",
       align: "center",
       prop: "owedAmount",
+      templet: "custom",
+      slotName: 'owedAmount',
     },
+    // {
+    //   label: "剩余挂账额度（元）",
+    //   align: "center",
+    //   prop: "remainingAmount",
+    //   templet: "custom",
+    //   slotName: 'remainingAmount',
+    // },
     {
-      label: "剩余挂账额度（元）",
-      align: "center",
-      prop: "remainingAmount",
-    },
-    {
-      label: "账户余额",
+      label: "账户余额（挂账额度+用户余额）",
       align: "center",
       prop: "accountBalance",
+      templet: "custom",
+      slotName: 'accountBalance',
+    },
+    {
+      label: "还款提醒日",
+      align: "center",
+      prop: "expireRemindDay",
+      templet: "custom",
+      slotName: 'expireRemindDay',
+    },
+    {
+      label: "还款提醒",
+      align: "center",
+      prop: "expireRemind",
+      templet: "custom",
+      slotName: 'expireRemind',
     },
     {
       label: "操作",
diff --git a/src/views/data/credit/config/edit.ts b/src/views/data/credit/config/edit.ts
index e1f6bb0..143d0ce 100644
--- a/src/views/data/credit/config/edit.ts
+++ b/src/views/data/credit/config/edit.ts
@@ -19,18 +19,7 @@ const modalConfig: IModalConfig = {
     console.log("提交之前处理", data);
   },
   formItems: [
-    {
-      label: "状态",
-      prop: "status",
-      type: 'switch',
-      attrs: {
-        activeText: '开启',
-        inactiveText: '关闭',
-        activeValue: 1,
-        inactiveValue: 0
-      },
-      initialValue: 1
-    },
+
 
     {
       label: "挂账人",
@@ -66,6 +55,56 @@ const modalConfig: IModalConfig = {
       },
       initialValue: 0
     },
+    // ===================== 新增 =====================
+    {
+      label: "还款提醒日",
+      prop: "expireRemindDay",
+      type: "input",
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if (!value) return callback();
+            const num = Number(value);
+            if (!Number.isInteger(num) || num < 1 || num > 28) {
+              callback(new Error("请输入 1~28 之间的整数"));
+            }
+            callback();
+          }
+        }
+      ],
+      attrs: {
+        type: "number",
+        placeholder: "每月几号提醒（1-28）",
+        style: { width: "200px" },
+        oninput: "value=value.replace(/\\D|\\./g,'')" // 禁止输入小数点
+      },
+      initialValue: "",
+    },
+    {
+      label: "还款提醒",
+      prop: "expireRemind",
+      type: "input",
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if (!value) return callback();
+            const num = Number(value);
+            if (!Number.isInteger(num) || num < 0) {
+              callback(new Error("请输入大于等于 0 的整数"));
+            }
+            callback();
+          }
+        }
+      ],
+      attrs: {
+        type: "number",
+        placeholder: "提醒多久以前的数据单位(月)",
+        style: { width: "240px" },
+        oninput: "value=value.replace(/\\D|\\./g,'')" // 禁止输入小数点
+      },
+      initialValue: "",
+    },
+    // ================================================
     {
       label: "还款方式",
       prop: "repaymentMethod",
@@ -73,6 +112,18 @@ const modalConfig: IModalConfig = {
       options: returnOptions('repaymentMethod'),
       initialValue: returnOptions('repaymentMethod')[0].value
     },
+    {
+      label: "状态",
+      prop: "status",
+      type: 'switch',
+      attrs: {
+        activeText: '开启',
+        inactiveText: '关闭',
+        activeValue: 1,
+        inactiveValue: 0
+      },
+      initialValue: 1
+    },
   ],
 };
 
diff --git a/src/views/data/credit/config/search.ts b/src/views/data/credit/config/search.ts
index 2d6533d..ef86f2b 100644
--- a/src/views/data/credit/config/search.ts
+++ b/src/views/data/credit/config/search.ts
@@ -2,19 +2,49 @@ import type { ISearchConfig } from "@/components/CURD/types";
 
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
+  isExpand: true,
   formItems: [
     {
       type: "input",
       label: "挂账人",
-      prop: "keywords",
+      prop: "debtor",
       attrs: {
-        placeholder: "请输入挂账人或手机号",
+        placeholder: "请输入挂账人名称",
         clearable: true,
         style: {
           width: "200px",
         },
       },
     },
+    {
+      type: "input",
+      label: "手机号",
+      prop: "mobile",
+      attrs: {
+        placeholder: "请输入手机号",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+    {
+      type: "select",
+      label: "状态",
+      prop: "status",
+      attrs: {
+        placeholder: "请选择状态",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+      initialValue: '',
+      options: [
+        { label: "停用", value: '0' },
+        { label: "启用", value: '1' },
+      ],
+    },
     {
       type: "select",
       label: "还款状态",
@@ -28,9 +58,8 @@ const searchConfig: ISearchConfig = {
       },
       initialValue: '',
       options: [
-        { label: "未还款", value: 'unpaid' },
-        { label: "部分还款", value: 'partial' },
-        { label: "已还清", value: 'paid' },
+        { label: "有欠款", value: '0' },
+        { label: "无欠款", value: '1' },
       ],
     },
   ],
diff --git a/src/views/data/credit/index.vue b/src/views/data/credit/index.vue
index 38a5d55..8c20d04 100644
--- a/src/views/data/credit/index.vue
+++ b/src/views/data/credit/index.vue
@@ -28,6 +28,27 @@
       <template #options="scope">
         {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
       </template>
+      <template #accountBalance="scope">
+        {{ scope.row.accountBalance }}
+      </template>
+
+      <template #owedAmount="scope">
+        {{
+          scope.row.creditAmount - scope.row.accountBalance > 0
+            ? scope.row.creditAmount - scope.row.accountBalance
+            : 0
+        }}
+      </template>
+
+      <template #expireRemindDay="scope">
+        <el-text>{{ scope.row.expireRemindDay }}号</el-text>
+      </template>
+      <template #expireRemind="scope">
+        <el-text>{{ scope.row.expireRemind }}月前</el-text>
+      </template>
+      <template #remainingAmount="scope">
+        {{ scope.row.creditAmount - scope.row.accountBalance }}
+      </template>
       <template #gender="scope">
         <DictLabel v-model="scope.row[scope.prop]" code="gender" />
       </template>
diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index 800841a..7406521 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -52,15 +52,35 @@
           <span>营业</span>
         </div>
         <div class="u-flex" style="flex-wrap: wrap">
-          <importData :type="9" style="margin-right: 14px;" @close="importDataClose" />
-          <el-select v-if="isHeadShop == 1 && loginType == 0" v-model="shopId" placeholder="选择分店"
-            style="width: 200px; margin-right: 10px;" @change="shopChange">
-            <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
+          <importData
+            :type="9"
+            style="margin-right: 14px"
+            @close="importDataClose"
+            @update="updateData"
+          />
+          <el-select
+            v-if="isHeadShop == 1 && loginType == 0"
+            v-model="shopId"
+            placeholder="选择分店"
+            style="width: 200px; margin-right: 10px"
+            @change="shopChange"
+          >
+            <el-option
+              v-for="item in branchList"
+              :key="item.shopId"
+              :label="item.shopName"
+              :value="item.shopId"
+            />
           </el-select>
           <div class="time_wrap u-flex" style="flex-shrink: 0">
             <div class="date_list">
-              <div class="item" :class="{ active: dataListActive == index }" v-for="(item, index) in dateList"
-                :key="item.value" @click="timeChange(item.value, index)">
+              <div
+                class="item"
+                :class="{ active: dataListActive == index }"
+                v-for="(item, index) in dateList"
+                :key="item.value"
+                @click="timeChange(item.value, index)"
+              >
                 <!-- 标签文本 -->
                 <span class="date-tab-item">{{ item.label }}</span>
                 <!-- 分隔符：非最后一项才显示 -->
@@ -68,9 +88,16 @@
               </div>
             </div>
             <div class="u-flex">
-              <el-date-picker v-if="timeValue == 'custom'" v-model="query.createdAt" type="daterange"
-                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"
-                @change="summarytrade" />
+              <el-date-picker
+                v-if="timeValue == 'custom'"
+                v-model="query.createdAt"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="YYYY-MM-DD"
+                @change="summarytrade"
+              />
             </div>
           </div>
         </div>
@@ -79,7 +106,9 @@
         <div class="top">
           <div class="item earnings">
             <div class="num_wrap">
-              <div class="num">{{ formatDecimal(trade.payAmount + trade.rechargeAmount || 0) }}</div>
+              <div class="num">
+                {{ formatDecimal(trade.payAmount + trade.rechargeAmount || 0) }}
+              </div>
               <div class="tips">
                 营业额(元)
                 <el-tooltip popper-class="popper" effect="light" placement="bottom">
@@ -156,20 +185,27 @@
                   <!-- <div class="t">{{ formatDecimal(tradeSale.totalpayAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
-                  <div class="gropress l" :style="{
-                    width: `${trade.payAmount
-                      ? (trade.payAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
-                      100
-                      : 0
+                  <div
+                    class="gropress l"
+                    :style="{
+                      width: `${
+                        trade.payAmount
+                          ? (trade.payAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) * 100
+                          : 0
                       }%`,
-                  }" />
-                  <div class="gropress r" :style="{
-                    width: `${trade.refundAmount
-                      ? (trade.refundAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
-                      100
-                      : 0
+                    }"
+                  />
+                  <div
+                    class="gropress r"
+                    :style="{
+                      width: `${
+                        trade.refundAmount
+                          ? (trade.refundAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
+                            100
+                          : 0
                       }%`,
-                  }" />
+                    }"
+                  />
                 </div>
                 <div class="line_btm">
                   <el-icon class="icon el-icon-caret-right" />
@@ -185,22 +221,30 @@
                   <!-- <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
-                  <div class="gropress l" :style="{
-                    width: `${trade.rechargeAmount
-                      ? (trade.rechargeAmount /
-                        (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
-                      100
-                      : 0
+                  <div
+                    class="gropress l"
+                    :style="{
+                      width: `${
+                        trade.rechargeAmount
+                          ? (trade.rechargeAmount /
+                              (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
+                            100
+                          : 0
                       }%`,
-                  }" />
-                  <div class="gropress r" :style="{
-                    width: `${trade.rechargeRefundAmount
-                      ? (trade.rechargeRefundAmount /
-                        (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
-                      100
-                      : 0
+                    }"
+                  />
+                  <div
+                    class="gropress r"
+                    :style="{
+                      width: `${
+                        trade.rechargeRefundAmount
+                          ? (trade.rechargeRefundAmount /
+                              (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
+                            100
+                          : 0
                       }%`,
-                  }" />
+                    }"
+                  />
                 </div>
                 <div class="line_btm">
                   <el-icon class="icon el-icon-caret-right" />
@@ -251,8 +295,11 @@
           <div class="item item1">
             <div class="title">
               客单价
-              <el-tooltip effect="dark" :content="`订单实付金额（${trade.payAmount}）/就餐人数（${trade.customerCount || 0}）`"
-                placement="top">
+              <el-tooltip
+                effect="dark"
+                :content="`订单实付金额（${trade.payAmount}）/就餐人数（${trade.customerCount || 0}）`"
+                placement="top"
+              >
                 <el-icon>
                   <QuestionFilled />
                 </el-icon>
@@ -260,15 +307,19 @@
             </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item1_icon.png" />
-              <div class="t" style="color: #0080FF;">{{ formatDecimal(trade.avgPayAmount || 0) }}</div>
+              <div class="t" style="color: #0080ff">
+                {{ formatDecimal(trade.avgPayAmount || 0) }}
+              </div>
             </div>
           </div>
           <div class="item item2">
             <div class="title">
               翻台率
-              <el-tooltip effect="dark"
+              <el-tooltip
+                effect="dark"
                 :content="`翻台率=（客单数（${trade.customerCount || 0}）-桌台数（${trade.tableCount || 0}））/桌台数*100%`"
-                placement="top">
+                placement="top"
+              >
                 <el-icon>
                   <QuestionFilled />
                 </el-icon>
@@ -276,7 +327,7 @@
             </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item2_icon.png" />
-              <div class="t" style="color: #FFB200;">{{ trade.turnoverRate || 0 }}%</div>
+              <div class="t" style="color: #ffb200">{{ trade.turnoverRate || 0 }}%</div>
             </div>
           </div>
           <div class="item item3">
@@ -295,43 +346,57 @@
                       <div class="left">
                         <span>新客立减</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.newCustomerDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.newCustomerDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>满减活动</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.fullDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.fullDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>优惠券抵扣</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.couponDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.couponDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>积分抵扣</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.pointDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.pointDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>霸王餐</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.backDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.backDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>会员折扣</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.memberDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.memberDiscountAmount || 0) }}
+                      </span>
                     </div>
                     <div class="item">
                       <div class="left">
                         <span>订单改价</span>
                       </div>
-                      <span class="num">{{ multiplyAndFormat(trade.orderPriceDiscountAmount || 0) }}</span>
+                      <span class="num">
+                        {{ multiplyAndFormat(trade.orderPriceDiscountAmount || 0) }}
+                      </span>
                     </div>
                   </div>
                 </template>
@@ -342,14 +407,16 @@
             </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item3_icon.png" />
-              <div class="t" style="color: #FF8000;">{{ formatDecimal(trade.discountAmount || 0) }}</div>
+              <div class="t" style="color: #ff8000">
+                {{ formatDecimal(trade.discountAmount || 0) }}
+              </div>
             </div>
           </div>
           <div class="item item4">
             <div class="title">优惠笔数</div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item4_icon.png" />
-              <div class="t" style="color: #00CB71;">{{ trade.discountCount || 0 }}</div>
+              <div class="t" style="color: #00cb71">{{ trade.discountCount || 0 }}</div>
             </div>
           </div>
           <div class="item item5">
@@ -357,13 +424,13 @@
               <div class="row">
                 <div class="title">毛利润</div>
                 <div class="icon_wrap">
-                  <div class="t" style="color: #0000C2;">{{ trade.profitAmount || 0 }}</div>
+                  <div class="t" style="color: #0000c2">{{ trade.profitAmount || 0 }}</div>
                 </div>
               </div>
               <div class="row">
                 <div class="title">毛利率</div>
                 <div class="icon_wrap">
-                  <div class="t" style="color: #0000C2;">{{ trade.profitRate || 0 }}%</div>
+                  <div class="t" style="color: #0000c2">{{ trade.profitRate || 0 }}%</div>
                 </div>
               </div>
             </div>
@@ -392,10 +459,18 @@
       <div class="item">
         <div class="header">
           <div class="tab_wrap">
-            <div class="item" :class="{ active: lineChartType == 0 }" @click="lineChartTypeChange(0)">
+            <div
+              class="item"
+              :class="{ active: lineChartType == 0 }"
+              @click="lineChartTypeChange(0)"
+            >
               销售趋势
             </div>
-            <div class="item" :class="{ active: lineChartType == 1 }" @click="lineChartTypeChange(1)">
+            <div
+              class="item"
+              :class="{ active: lineChartType == 1 }"
+              @click="lineChartTypeChange(1)"
+            >
               支付占比
             </div>
           </div>
@@ -404,9 +479,20 @@
             <el-radio-button value="30">30天</el-radio-button>
           </el-radio-group>
         </div>
-        <div v-show="lineChartType == 0" ref="saleChart" v-loading="saleLoading" class="chart" style="height: 350px" />
-        <div v-show="lineChartType == 1" ref="payChart" v-loading="payChartLoading" class="chart"
-          style="height: 350px" />
+        <div
+          v-show="lineChartType == 0"
+          ref="saleChart"
+          v-loading="saleLoading"
+          class="chart"
+          style="height: 350px"
+        />
+        <div
+          v-show="lineChartType == 1"
+          ref="payChart"
+          v-loading="payChartLoading"
+          class="chart"
+          style="height: 350px"
+        />
       </div>
       <!-- 商品销售排行 -->
       <div class="item">
@@ -466,7 +552,12 @@
             </el-radio-group>
           </div>
         </div>
-        <div ref="initInterestRate" v-loading="initInterestRateLoading" class="chart" style="height: 350px" />
+        <div
+          ref="initInterestRate"
+          v-loading="initInterestRateLoading"
+          class="chart"
+          style="height: 350px"
+        />
       </div>
       <!-- 成本（元） -->
       <div class="item">
@@ -505,12 +596,16 @@
 <script>
 import importData from "@/components/importData/index.vue";
 import dataSummaryApi from "@/api/order/data-summary";
+import finceApi from "@/api/order/fince";
+
 import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
 import * as echarts from "echarts";
 import { debounce, formatDecimal } from "@/utils/tools";
-import { formatDateRange } from './utils/index.js'
-import { multiplyAndFormat } from '@/utils/index.js'
+import { formatDateRange } from "./utils/index.js";
+import { multiplyAndFormat } from "@/utils/index.js";
+import { ElMessage, ElMessageBox } from "element-plus";
+
 export default {
   name: "home",
   components: { importData },
@@ -635,12 +730,12 @@ export default {
       shopInfo: JSON.parse(localStorage.getItem("userInfo")),
       initInterestRateLoading: true,
       initInterestRate: null,
-      initInterestRateTime: '',
+      initInterestRateTime: "",
       costLoading: true,
       costRef: null,
-      costUpdateTime: '',
-      interestRateDay: '7',
-      costDay: '7'
+      costUpdateTime: "",
+      interestRateDay: "7",
+      costDay: "7",
     };
   },
   computed: {
@@ -660,11 +755,11 @@ export default {
     },
   },
   mounted() {
-    let shopInfo = JSON.parse(localStorage.getItem('userInfo'))
+    let shopInfo = JSON.parse(localStorage.getItem("userInfo"));
     if (shopInfo.isHeadShop) {
-      this.shopId = shopInfo.id
+      this.shopId = shopInfo.id;
     } else {
-      this.shopId = localStorage.getItem('shopId')
+      this.shopId = localStorage.getItem("shopId");
     }
 
     // 增加首页提示是否账号30天过期
@@ -680,8 +775,8 @@ export default {
     this.dateProduct();
     // this.summaryDateGet();
     this.timeChange(this.timeValue);
-    this.profitRateBarChart()
-    this.costLineChart()
+    this.profitRateBarChart();
+    this.costLineChart();
 
     this.__resizeHandler = debounce(() => {
       if (this.saleChart) {
@@ -710,18 +805,33 @@ export default {
       // }
     }, 100);
     window.addEventListener("resize", this.__resizeHandler);
-    this.geiShopList()
+    this.geiShopList();
     // this.initCardUserChart();
   },
   methods: {
+    updateData(e) {
+      finceApi
+        .financeBase({
+          shopId: this.shopId,
+          type: "all",
+          date: e,
+        })
+        .then((res) => {
+          ElMessageBox.confirm("经营数据重新计算中，请稍后刷新页面查看", "提示", {
+            confirmButtonText: "知道了",
+            showCancelButton: false,
+            type: "warning",
+          });
+        });
+    },
     importDataClose() {
       // this.summaryGet();
       this.dateAmount();
       this.dateProduct();
       // this.summaryDateGet();
       this.timeChange(this.timeValue);
-      this.profitRateBarChart()
-      this.costLineChart()
+      this.profitRateBarChart();
+      this.costLineChart();
     },
     /**
      * 获取分店列表
@@ -729,29 +839,29 @@ export default {
     async geiShopList() {
       try {
         if (this.shopInfo.isHeadShop) {
-          let res = await ShopApi.getBranchList()
+          let res = await ShopApi.getBranchList();
           this.branchList = res;
-          this.shopId = res[0].shopId
+          this.shopId = res[0].shopId;
         } else {
-          this.shopId = this.shopInfo.id
+          this.shopId = this.shopInfo.id;
         }
       } catch (error) {
-        console.log('获取分店列表===', error);
+        console.log("获取分店列表===", error);
       }
     },
     shopChange() {
       this.summarytrade();
-      this.lineChartTypeChange(this.lineChartType)
-      this.dateProduct()
+      this.lineChartTypeChange(this.lineChartType);
+      this.dateProduct();
 
-      this.profitRateBarChart()
-      this.costLineChart()
+      this.profitRateBarChart();
+      this.costLineChart();
     },
     // 切换时间
     timeChange(e, index = 0) {
       this.dataListActive = index;
       this.timeValue = e;
-      this.query.createdAt = formatDateRange(e)
+      this.query.createdAt = formatDateRange(e);
       if (e != "custom") {
         this.summarytrade();
       }
@@ -767,7 +877,7 @@ export default {
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
           rangeType: this.timeValue,
-          shopId: this.shopId
+          shopId: this.shopId,
         });
         this.trade = res;
         this.tradeSale = res.sale;
@@ -990,7 +1100,7 @@ export default {
           backgroundColor: "#fff",
           borderColor: "#eee",
           borderWidth: 1,
-          boxShadow: "0 2px 8px rgba(0,0,0,0.08)"
+          boxShadow: "0 2px 8px rgba(0,0,0,0.08)",
         },
         xAxis: [
           {
@@ -1006,11 +1116,11 @@ export default {
           },
         ],
         grid: {
-          top: '5%',
-          right: '5%',
-          bottom: '8%',
-          left: '8%',
-          containLabel: true // 确保标签不溢出，不影响点的显示
+          top: "5%",
+          right: "5%",
+          bottom: "8%",
+          left: "8%",
+          containLabel: true, // 确保标签不溢出，不影响点的显示
         },
         color: "#165DFF", // 折线和默认点的颜色
         yAxis: [
@@ -1035,8 +1145,8 @@ export default {
                 borderColor: "#000", // 黑色边框
                 borderWidth: 2, // 边框宽度
                 // 悬浮时填充色不变（仍为 #165DFF）
-                color: "#165DFF"
-              }
+                color: "#165DFF",
+              },
             },
             // 确保所有数据点都显示（避免自动隐藏）
             showAllSymbol: true,
@@ -1044,8 +1154,8 @@ export default {
             itemStyle: {
               color: "#165DFF", // 点的填充色（与折线一致）
               borderWidth: 1, // 基础状态可加细边框（可选，不加则无）
-              borderColor: "#fff" // 基础状态边框颜色（与背景区分，可选）
-            }
+              borderColor: "#fff", // 基础状态边框颜色（与背景区分，可选）
+            },
           },
         ],
       });
@@ -1131,8 +1241,8 @@ export default {
       this.initInterestRate = echarts.init(this.$refs.initInterestRate);
 
       // 预处理数据：将毛利率和净利率按索引对应（关键，用于手动匹配）
-      const profitRateData = data.map(item => item.profitRate || 0);
-      const netProfitRateData = data.map(item => item.netProfitRate || 0);
+      const profitRateData = data.map((item) => item.profitRate || 0);
+      const netProfitRateData = data.map((item) => item.netProfitRate || 0);
 
       this.initInterestRate.setOption({
         tooltip: {
@@ -1159,7 +1269,7 @@ export default {
           backgroundColor: "#fff",
           borderColor: "#eee",
           borderWidth: 1,
-          boxShadow: "0 2px 8px rgba(0,0,0,0.08)"
+          boxShadow: "0 2px 8px rgba(0,0,0,0.08)",
         },
         xAxis: [
           {
@@ -1184,10 +1294,10 @@ export default {
           },
         ],
         grid: {
-          top: '5%',
-          right: '5%',
-          bottom: '8%',
-          left: '8%',
+          top: "5%",
+          right: "5%",
+          bottom: "8%",
+          left: "8%",
         },
         series: [
           {
@@ -1196,7 +1306,7 @@ export default {
             barGap: "0%", // 保持柱子紧贴
             barWidth: time.length <= 7 ? "50%" : "30%",
             data: profitRateData, // 预处理后的毛利率数据
-          }
+          },
         ],
       });
     },
@@ -1359,9 +1469,12 @@ export default {
     async profitRateBarChart() {
       try {
         this.initInterestRateLoading = true;
-        const res = await dataSummaryApi.profitRateBarChart({ day: this.interestRateDay, shopId: this.shopId });
+        const res = await dataSummaryApi.profitRateBarChart({
+          day: this.interestRateDay,
+          shopId: this.shopId,
+        });
 
-        this.initInterestRateTime = dayjs().format('HH:mm')
+        this.initInterestRateTime = dayjs().format("HH:mm");
 
         const data = res.map((item) => {
           return {
@@ -1385,7 +1498,7 @@ export default {
         this.costLoading = true;
         const res = await dataSummaryApi.costLineChart({ day: this.costDay, shopId: this.shopId });
 
-        this.costUpdateTime = dayjs().format('HH:mm')
+        this.costUpdateTime = dayjs().format("HH:mm");
 
         const data = res.map((item) => item.productCostAmount || 0);
         const time = res.map((item) => item.tradeDay);
diff --git a/src/views/devices/config/config.ts b/src/views/devices/config/config.ts
index 68b8606..5226fb7 100644
--- a/src/views/devices/config/config.ts
+++ b/src/views/devices/config/config.ts
@@ -1,8 +1,8 @@
 export const options: optionObject = {
   connectionType: [
     { label: "USB", value: 'USB' },
-    { label: "网络", value: '网络' },
-    { label: "蓝牙", value: '蓝牙' },
+    { label: "云打印", value: '云打印' },
+    { label: "局域网", value: '局域网' },
   ],
   subType: [
     { label: "标签", value: 'label' },
diff --git a/src/views/order/index/components/GoodsListCollapse.vue b/src/views/order/index/components/GoodsListCollapse.vue
new file mode 100644
index 0000000..4982f0e
--- /dev/null
+++ b/src/views/order/index/components/GoodsListCollapse.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="goods_info">
+    <div v-for="(item, index) in showList" :key="item.id || index" class="row">
+      <el-image :src="item.productImg" class="cover" lazy />
+      <div class="info">
+        <div class="name">
+          <span :class="[item.isVip == 1 ? 'colorStyle' : '']">
+            {{ item.productName }}
+          </span>
+          <span v-if="item.refundNum" class="refund">(退 - {{ item.refundNum }})</span>
+        </div>
+        <div class="sku">{{ item.skuName }}</div>
+      </div>
+    </div>
+
+    <div v-if="needShowMore" class="show-more" @click="showAll = !showAll">
+      {{ showAll ? "收起" : "查看全部" }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue";
+
+// 接收商品列表
+const props = defineProps<{
+  goods: any[];
+}>();
+
+// 组件内部独立状态，自己控制，不影响外部
+const showAll = ref(false);
+
+// 计算需要展示的列表
+const showList = computed(() => {
+  const list = props.goods || [];
+  return showAll.value ? list : list.slice(0, 2);
+});
+
+// 是否需要显示查看更多
+const needShowMore = computed(() => {
+  return (props.goods || []).length > 2;
+});
+</script>
+
+<style scoped lang="scss">
+.goods_info {
+  .row {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    &:not(:first-child) {
+      margin-top: 10px;
+    }
+
+    .cover {
+      width: 40px;
+      height: 40px;
+      object-fit: cover;
+    }
+
+    .info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      margin-top: 2px;
+      text-align: center;
+
+      .name {
+        font-size: 12px;
+      }
+
+      .sku {
+        color: #999;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.show-more {
+  color: #1989fa;
+  font-size: 12px;
+  margin-top: 6px;
+  cursor: pointer;
+  text-align: center;
+}
+
+.colorStyle {
+  color: #ffc315;
+}
+
+.refund {
+  color: #ff9731;
+  font-weight: bold;
+}
+</style>
diff --git a/src/views/order/index/config/config.ts b/src/views/order/index/config/config.ts
index c7f8eec..636f995 100644
--- a/src/views/order/index/config/config.ts
+++ b/src/views/order/index/config/config.ts
@@ -2,10 +2,10 @@ import type { statusType } from "@/api/order/order";
 export const statusOptions: statusOptions[] = [
   { label: "全部", value: "" },
   { label: "待支付", value: "unpaid" },
-  { label: "制作中", value: "in-production" },
-  { label: "待取餐", value: "wait-out" },
+  // { label: "制作中", value: "in-production" },
+  // { label: "待取餐", value: "wait-out" },
   { label: "订单完成", value: "done" },
-  { label: "申请退单", value: "refunding" },
+  // { label: "申请退单", value: "refunding" },
   { label: "退单", value: "refund" },
   { label: "部分退单", value: "part_refund" },
   { label: "取消订单", value: "cancelled" },
@@ -107,6 +107,14 @@ export function returnOptionsLabel(optionsType: optionsType, value: string | num
   const option = options.find((item) => item.value === value);
   return option ? option.label : "";
 }
+export function returnPayTypeOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType).filter(v => v.value);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}
 
 
 export interface options {
diff --git a/src/views/order/index/config/content.ts b/src/views/order/index/config/content.ts
index b7f8d99..0246ba4 100644
--- a/src/views/order/index/config/content.ts
+++ b/src/views/order/index/config/content.ts
@@ -86,6 +86,14 @@ const contentConfig: IContentConfig = {
       prop: "payAmount",
       width: 120,
     },
+    {
+      label: "支付方式",
+      align: "center",
+      prop: "payType",
+      width: 120,
+      templet: "custom",
+      slotName: "payType",
+    },
     {
       label: "订单金额 (扣除各类折扣)",
       align: "center",
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index 5595ec1..4aa2a45 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -2,19 +2,37 @@
   <div class="app-container">
     <!-- 列表 -->
     <!-- 搜索 -->
-    <page-search ref="searchRef" :search-config="searchConfig" :isOpenAutoSearch="true" @query-click="handleQueryClick"
-      @reset-click="handleResetClick" />
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      :isOpenAutoSearch="true"
+      @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">
+    <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 #originAmount="scope">
         {{ returnOriginAmount(scope.row) }}
       </template>
 
       <template #orderNo="scope">
         <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap">
-          <el-tooltip class="box-item" effect="dark" :content="scope.row.orderNo" placement="top-start">
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            :content="scope.row.orderNo"
+            placement="top-start"
+          >
             {{ scope.row.orderNo }}
           </el-tooltip>
         </div>
@@ -26,7 +44,7 @@
         </el-tag>
       </template>
       <template #goods="scope">
-        <div class="goods_info">
+        <!-- <div class="goods_info">
           <div v-for="item in scope.row.goods" :key="item.id" class="row">
             <el-image :src="item.productImg" class="cover" lazy />
             <div class="info">
@@ -39,7 +57,8 @@
               <div class="sku">{{ item.skuName }}</div>
             </div>
           </div>
-        </div>
+        </div> -->
+        <GoodsListCollapse :goods="scope.row.goods" />
       </template>
       <template #table="scope">
         <div>
@@ -47,14 +66,14 @@
             名称：
             <el-tag type="primary">{{ scope.row.tableName || "无" }}</el-tag>
           </p>
-          <p v-if="scope.row.tableCode">编号：{{ scope.row.tableCode }}</p>
+          <!-- <p v-if="scope.row.tableCode">编号：{{ scope.row.tableCode }}</p> -->
         </div>
       </template>
 
       <!-- 打印状态 -->
       <template #printStatus="scope">
         <span v-if="scope.row.printStatus.length > 0" style="color: var(--el-color-danger)">
-          打印失败（{{scope.row.printStatus.map(item => item.name).join('、')}}）
+          打印失败（{{ scope.row.printStatus.map((item) => item.name).join("、") }}）
         </span>
       </template>
 
@@ -68,14 +87,25 @@
       </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" />
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+      <template #payType="scope">
+        {{ returnPayTypeOptionsLabel(scope.prop, scope.row[scope.prop]) }}
       </template>
       <template #operate="scope">
         <div>
           <el-button link @click="printOrderHandle(scope.row)">打印</el-button>
           <el-button link @click="showdetail(scope.row)">详情</el-button>
-          <el-button v-if="scope.row.status == 'done'" link>开票</el-button>
-          <el-button v-if="scope.row.status == 'unpaid'" type="primary" @click="toPayOrder(scope.row)">
+          <!-- <el-button v-if="scope.row.status == 'done'" link>开票</el-button> -->
+          <el-button
+            v-if="scope.row.status == 'unpaid'"
+            type="primary"
+            @click="toPayOrder(scope.row)"
+          >
             结账
           </el-button>
         </div>
@@ -91,7 +121,11 @@
     </page-modal>
 
     <!-- 编辑 -->
-    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    >
       <template #url="scope">
         <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
         <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
@@ -111,8 +145,8 @@ 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";
-
+import { returnOptionsLabel, returnPayTypeOptionsLabel } from "./config/config";
+import GoodsListCollapse from "./components/GoodsListCollapse.vue";
 const {
   searchRef,
   contentRef,
@@ -161,7 +195,7 @@ async function printOrderHandle(order: getListResponse) {
   try {
     await orderApi.printOrder({
       id: order.id,
-      type: 0
+      type: 0,
     });
     ElMessage.success("打印成功");
   } catch (error) {
@@ -370,7 +404,7 @@ function showdetail(row: OrderInfoVo) {
     left: 36%;
     padding: 18px;
 
-    >div:first-child {
+    > div:first-child {
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -381,7 +415,7 @@ function showdetail(row: OrderInfoVo) {
       transform: translateX(-80px);
     }
 
-    >div:last-child {
+    > div:last-child {
       text-align: center;
     }
   }
diff --git a/src/views/system-setting/pay-types/config/add.ts b/src/views/system-setting/pay-types/config/add.ts
index 169d453..9f2ab8d 100644
--- a/src/views/system-setting/pay-types/config/add.ts
+++ b/src/views/system-setting/pay-types/config/add.ts
@@ -7,7 +7,7 @@ import type { IModalConfig } from "@/components/CURD/types";
 const modalConfig: IModalConfig<payType> = {
   pageName: "sys:user",
   dialog: {
-    title: "添加支付方式",
+    title: "添加收银方式",
     width: 800,
     draggable: true,
   },
@@ -23,12 +23,12 @@ const modalConfig: IModalConfig<payType> = {
   formItems: [
 
     {
-      label: "支付类型",
+      label: "收银类型",
       prop: "payType",
-      rules: [{ required: true, message: "请选择支付类型", trigger: "blur" }],
+      rules: [{ required: true, message: "请选择收银类型", trigger: "blur" }],
       type: "select",
       attrs: {
-        placeholder: "请选择支付类型",
+        placeholder: "请选择收银类型",
       },
       options: returnOptions("payType"),
       col: {
@@ -38,11 +38,11 @@ const modalConfig: IModalConfig<payType> = {
     },
     {
       type: "input",
-      label: "支付名称",
+      label: "收银名称",
       prop: "payName",
-      rules: [{ required: true, message: "请输入支付名称", trigger: "blur" }],
+      rules: [{ required: true, message: "请输入收银名称", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入支付名称",
+        placeholder: "请输入收银名称",
       },
       col: {
         xs: 24,
diff --git a/src/views/system-setting/pay-types/config/content.ts b/src/views/system-setting/pay-types/config/content.ts
index 915240c..e4f762b 100644
--- a/src/views/system-setting/pay-types/config/content.ts
+++ b/src/views/system-setting/pay-types/config/content.ts
@@ -1,64 +1,72 @@
 import Api from "@/api/account/payType";
 import type { IContentConfig } from "@/components/CURD/types";
+import { ElMessage } from "element-plus";
 
 const contentConfig: IContentConfig = {
   pageName: "sys:user",
+  // ✅ 开启拖动排序
+  rowDraggable: true,
   table: {
     border: true,
     highlightCurrentRow: true,
+
+    // ✅ 拖动完成后调用接口
+    onRowDrop: async ({ row, oldIndex, newIndex }) => {
+      try {
+        await Api.sort({
+          id: row.id,
+          oldIndex,
+          newIndex,
+        });
+        ElMessage.success("排序成功");
+      } catch (e) {
+        ElMessage.error("排序失败");
+      }
+    },
   },
-  pagination: {
-    background: true,
-    layout: "prev,pager,next,jumper,total,sizes",
-    pageSize: 20,
-    pageSizes: [10, 20, 30, 50],
-  },
+  pagination: false,
   indexAction: function (params) {
     return Api.getList();
   },
   modifyAction: async function (data) {
     const res = await Api.edit(data);
-    ElMessage.success(res ? '修改成功' : '修改失败');
-    return res
+    ElMessage.success(res ? "修改成功" : "修改失败");
+    return res;
   },
   pk: "id",
-  toolbar: ["add"],
+  toolbar: [],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
-    // { type: "selection", width: 50, align: "center" },
+    // ✅ 拖动图标列
+    {
+      label: "排序",
+      align: "center",
+      width: 60,
+      templet: "custom", // 拖动把手
+      prop: "sort",
+    },
+
     {
       label: "图标",
       align: "center",
       prop: "icon",
-      templet: 'image'
+      templet: "image",
     },
     {
-      label: "支付方式",
+      label: "收银方式",
       align: "center",
       prop: "payName",
     },
     {
-      label: "支付类型",
+      label: "收银类型",
       align: "center",
       prop: "payType",
     },
-
-    {
-      label: "开钱箱权限",
-      align: "center",
-      prop: "isOpenCashDrawer",
-      templet: 'switch',
-    },
     {
       label: "是否显示",
       align: "center",
       prop: "isDisplay",
-      templet: 'switch',
-    },
-    {
-      label: "条件排序",
-      align: "center",
-      prop: "sorts",
+      templet: "switch",
     },
     {
       label: "操作",
@@ -66,9 +74,9 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: ["edit"],
+      operat: [],
     },
   ],
 };
 
-export default contentConfig;
+export default contentConfig;
\ No newline at end of file
diff --git a/src/views/system-setting/pay-types/config/edit.ts b/src/views/system-setting/pay-types/config/edit.ts
index 8f6f1be..e8f1b8f 100644
--- a/src/views/system-setting/pay-types/config/edit.ts
+++ b/src/views/system-setting/pay-types/config/edit.ts
@@ -7,7 +7,7 @@ import type { IModalConfig } from "@/components/CURD/types";
 const modalConfig: IModalConfig<payType> = {
   pageName: "sys:user",
   dialog: {
-    title: "编辑支付方式",
+    title: "编辑收银方式",
     width: 800,
     draggable: true,
   },
@@ -23,12 +23,12 @@ const modalConfig: IModalConfig<payType> = {
   formItems: [
 
     {
-      label: "支付类型",
+      label: "收银类型",
       prop: "payType",
-      rules: [{ required: true, message: "请选择支付类型", trigger: "blur" }],
+      rules: [{ required: true, message: "请选择收银类型", trigger: "blur" }],
       type: "select",
       attrs: {
-        placeholder: "请选择支付类型",
+        placeholder: "请选择收银类型",
       },
       options: returnOptions("payType"),
       col: {
@@ -38,11 +38,11 @@ const modalConfig: IModalConfig<payType> = {
     },
     {
       type: "input",
-      label: "支付名称",
+      label: "收银名称",
       prop: "payName",
-      rules: [{ required: true, message: "请输入支付名称", trigger: "blur" }],
+      rules: [{ required: true, message: "请输入收银名称", trigger: "blur" }],
       attrs: {
-        placeholder: "请输入支付名称",
+        placeholder: "请输入收银名称",
       },
       col: {
         xs: 24,
diff --git a/src/views/system-setting/pay-types/index copy.vue b/src/views/system-setting/pay-types/index copy.vue
new file mode 100644
index 0000000..854b154
--- /dev/null
+++ b/src/views/system-setting/pay-types/index copy.vue	
@@ -0,0 +1,123 @@
+<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 #switch="scope">
+        <el-switch
+          v-model="scope.row[scope.prop]"
+          disabled
+          :inactive-value="0"
+          :active-value="1"
+        ></el-switch>
+      </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"
+      :modal-config="addModalConfig"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import VersionApi from "@/api/system/version";
+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";
+
+import { useUserStoreHook } from "@/store/modules/user";
+const shopUser = useUserStoreHook();
+console.log(shopUser.isAdmin);
+if (shopUser.isAdmin) {
+  contentConfig.toolbar = ["add"];
+  contentConfig.cols[contentConfig.cols.length - 1].operat = ["edit"];
+}
+
+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获取数据进行填充
+  console.log(row);
+  editModalRef.value?.setFormData({ ...row });
+}
+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/system-setting/pay-types/index.vue b/src/views/system-setting/pay-types/index.vue
index 8f34dca..c3b9c05 100644
--- a/src/views/system-setting/pay-types/index.vue
+++ b/src/views/system-setting/pay-types/index.vue
@@ -9,42 +9,56 @@
       @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"
+    <VueDraggable
+      v-model="list"
+      target="tbody"
+      handle=".sort-span"
+      :animation="150"
+      ghost-class="draggable-ghost"
+      @end="onDragEnd"
     >
-      <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 #switch="scope">
-        <el-switch
-          v-model="scope.row[scope.prop]"
-          disabled
-          :inactive-value="0"
-          :active-value="1"
-        ></el-switch>
-      </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-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 #sort="scope">
+          <span class="sort-span">
+            <el-icon><Rank /></el-icon>
+          </span>
+        </template>
+        <template #switch="scope">
+          <el-switch
+            v-model="scope.row[scope.prop]"
+            disabled
+            :inactive-value="0"
+            :active-value="1"
+          ></el-switch>
+        </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>
+    </VueDraggable>
 
     <!-- 新增 -->
     <page-modal
@@ -63,7 +77,7 @@
 </template>
 
 <script setup lang="ts">
-import VersionApi from "@/api/system/version";
+import PayTypeApi, { sortRequest } from "@/api/account/payType";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
@@ -71,6 +85,15 @@ import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
+import { VueDraggable } from "vue-draggable-plus";
+
+import { useUserStoreHook } from "@/store/modules/user";
+const shopUser = useUserStoreHook();
+console.log(shopUser.isAdmin);
+if (shopUser.isAdmin) {
+  contentConfig.toolbar = ["add"];
+  contentConfig.cols[contentConfig.cols.length - 1].operat = ["edit"];
+}
 
 const {
   searchRef,
@@ -86,6 +109,50 @@ const {
   handleSearchClick,
   handleFilterChange,
 } = usePage();
+// ✅ 拖拽只用这个 list
+const list = ref([]);
+
+// ✅ 监听表格数据，同步到拖拽列表
+watch(
+  () => contentRef.value?.pageData,
+  (val) => {
+    if (val) {
+      list.value = val;
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+// ==========================================
+// ✅ 拖拽结束 → 调用排序接口
+// ==========================================
+async function onDragEnd(e) {
+  console.log("拖拽结束===", e);
+
+  const { oldIndex, newIndex } = e;
+  if (oldIndex === newIndex) return;
+  console.log(oldIndex, newIndex);
+
+  // 当前拖动的行
+  const row = contentRef.value?.pageData[oldIndex];
+  const newRow = contentRef.value?.pageData[newIndex];
+  console.log(row, newRow);
+  // 目标排序号（newIndex + 1）
+  const targetSort = newRow.sorts;
+
+  try {
+    await PayTypeApi.sort({
+      shopId: row.shopId, // 店铺ID
+      id: row.id, // 支付类型ID
+      targetSort: targetSort, // 目标位置排序
+    });
+    ElMessage.success("排序成功");
+    // 刷新列表
+    contentRef.value?.fetchPageData();
+  } catch (err) {
+    ElMessage.error("排序失败");
+  }
+}
 
 // 新增
 async function handleAddClick() {
@@ -100,7 +167,6 @@ async function handleEditClick(row: IObject) {
   console.log(row);
   editModalRef.value?.setFormData({ ...row });
 }
-1;
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);
diff --git a/src/views/tool/Instead/components/choose-guazhang.vue b/src/views/tool/Instead/components/choose-guazhang.vue
index 780a9c4..4a7dc63 100644
--- a/src/views/tool/Instead/components/choose-guazhang.vue
+++ b/src/views/tool/Instead/components/choose-guazhang.vue
@@ -30,8 +30,8 @@
 
           <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="账户余额(元)" prop="accountBalance" />
+          <el-table-column label="可用挂账额度(元)" prop="creditAmount" />
           <el-table-column label="操作">
             <template v-slot="scope">
               <el-button type="text" @click="cellClick(scope.row)">选择</el-button>
@@ -52,8 +52,7 @@
     </div>
   </el-dialog>
 </template>
-    
-   
+
 <script>
 import creditApi from "@/api/order/credit";
 export default {
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index f03d265..3d8c264 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -44,12 +44,23 @@
                   <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
-                :step="pointsRes.equivalentPoints" placeholder="请输入积分抵扣数量" :min="pointsRes.minDeductionPoints"
-                :max="pointsRes.maxUsablePoints" :disabled="!pointsRes.usable"
-                @change="pointsToMoney"></el-input-number>
+              <el-input-number
+                class="u-m-l-10"
+                v-if="score.sel != -1"
+                v-model="usePointsNumber"
+                step-strictly
+                :step="pointsRes.equivalentPoints"
+                placeholder="请输入积分抵扣数量"
+                :min="pointsRes.minDeductionPoints"
+                :max="pointsRes.maxUsablePoints"
+                :disabled="!pointsRes.usable"
+                @change="pointsToMoney"
+              ></el-input-number>
             </div>
-            <p class="u-font-14 color-666 u-m-t-10" v-if="pointsRes.unusableReason && !pointsRes.usable">
+            <p
+              class="u-font-14 color-666 u-m-t-10"
+              v-if="pointsRes.unusableReason && !pointsRes.usable"
+            >
               <span class="color-red">*</span>
               <span>{{ pointsRes.unusableReason }}</span>
             </p>
@@ -70,10 +81,13 @@
           </div>
           <div class="u-flex u-col-center u-m-t-20 no-wrap">
             <span class="u-font-14 font-bold u-m-r-20">优惠券</span>
-            <div v-if="
-              carts.orderCostSummary.fullReduction !== undefined &&
-              carts.orderCostSummary.fullReduction.actualAmount > 0
-            " style="font-size: 14px; color: #555">
+            <div
+              v-if="
+                carts.orderCostSummary.fullReduction !== undefined &&
+                carts.orderCostSummary.fullReduction.actualAmount > 0
+              "
+              style="font-size: 14px; color: #555"
+            >
               参与满减活动不可用优惠券！
             </div>
             <div class="u-flex my-select" @click="openCoupon" v-else>
@@ -124,9 +138,14 @@
         <p class="u-font-16 font-bold u-m-r-20 font-bold u-flex">选择支付方式</p>
         <div class="u-m-t-20">
           <div>
-            <el-button v-for="(item, index) in payTypes.list" :key="index" size="large"
-              :type="index == payTypes.sel ? 'primary' : ''" :disabled="canUsePayType(item)"
-              @click="changePayType(index)">
+            <el-button
+              v-for="(item, index) in payTypes.list"
+              :key="index"
+              size="large"
+              :type="index == payTypes.sel ? 'primary' : ''"
+              :disabled="canUsePayType(item)"
+              @click="changePayType(index)"
+            >
               {{ item.payName }}
             </el-button>
           </div>
@@ -213,20 +232,43 @@
       </div>
     </div>
     <!-- 扫码 -->
-    <scanPay ref="refScanPay" :order="orderInfo" @confirm="refScanPayConfirm" @paysuccess="paysuccess"></scanPay>
+    <scanPay
+      ref="refScanPay"
+      :order="orderInfo"
+      @confirm="refScanPayConfirm"
+      @paysuccess="paysuccess"
+    ></scanPay>
     <!-- 打折 -->
     <discount ref="refDiscount" @confirm="discountConfirm"></discount>
     <!-- 优惠券 -->
     <popup-coupon ref="refCoupon" :user="carts.vipUser" @confirm="refCouponConfirm"></popup-coupon>
     <!-- 挂账 -->
-    <chooseGuaZahng ref="refGuaZhang" :payMoney="currentpayMoney" @confirm="refGuaZhangConfirm"></chooseGuaZahng>
+    <chooseGuaZahng
+      ref="refGuaZhang"
+      :payMoney="currentpayMoney"
+      @confirm="refGuaZhangConfirm"
+    ></chooseGuaZahng>
     <!-- 扫码等待用户支付转台查询 -->
-    <el-dialog v-model="showCheckPayStauts" width="400" title="订单支付状态查询中..." :close-on-click-modal="false"
-      :show-close="false">
+    <el-dialog
+      v-model="showCheckPayStauts"
+      width="400"
+      title="订单支付状态查询中..."
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
       <div class="pay_status_content">
-        <div class="loading" v-loading="checkPayStautsLoading" element-loading-text="用户支付中..."></div>
+        <div
+          class="loading"
+          v-loading="checkPayStautsLoading"
+          element-loading-text="用户支付中..."
+        ></div>
         <div class="btn">
-          <el-button style="width: 100%" :disabled="!closeState" type="primary" @click="resetScanCode">
+          <el-button
+            style="width: 100%"
+            :disabled="!closeState"
+            type="primary"
+            @click="resetScanCode"
+          >
             <span v-if="!closeState">{{ closeStateTime }}秒后可重新扫码</span>
             <span v-else>重新扫码</span>
           </el-button>
@@ -262,7 +304,7 @@ import discount from "./discount.vue";
 import { ElLoading } from "element-plus";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { BigNumber } from "bignumber.js";
-import { onUnmounted } from 'vue'
+import { onUnmounted } from "vue";
 
 // 配置BigNumber精度
 BigNumber.set({
@@ -272,7 +314,7 @@ BigNumber.set({
 //挂账
 const refGuaZhang = ref();
 function refGuaZhangConfirm(guazhangRen) {
-  payOrder("arrears", true, guazhangRen);
+  payOrder("virtual", true, guazhangRen);
 }
 function refGuaZhangShow() {
   refGuaZhang.value.open();
@@ -377,7 +419,7 @@ function discountShow(e) {
 const props = defineProps({
   table: {
     type: Object,
-    default: () => { },
+    default: () => {},
   },
   user: {
     type: Object,
@@ -391,7 +433,7 @@ const props = defineProps({
   },
   orderInfo: {
     type: Object,
-    default: () => { },
+    default: () => {},
   },
 });
 
@@ -506,7 +548,16 @@ async function pointsInit() {
         computedMax = Math.floor(computedMax / eq) * eq;
       }
       res.maxUsablePoints = computedMax;
-      console.debug("pointsInit debug:", { finalPay: finalPay, basePay: basePay, eq, rawMaxRatio, maxRatio, maxByMoney, userPoints, computedMax });
+      console.debug("pointsInit debug:", {
+        finalPay: finalPay,
+        basePay: basePay,
+        eq,
+        rawMaxRatio,
+        maxRatio,
+        maxByMoney,
+        userPoints,
+        computedMax,
+      });
       // 最小抵扣积分为配置值或等于换算比
       res.minDeductionPoints = pointsConfig?.minDeductionPoints || eq;
       if (res.maxUsablePoints < res.minDeductionPoints) {
@@ -565,7 +616,10 @@ function pointsToMoney(val) {
   }
 
   // 计算抵扣金额（元），向下保留两位
-  const money = new BigNumber(pts).div(cfg.equivalentPoints).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+  const money = new BigNumber(pts)
+    .div(cfg.equivalentPoints)
+    .decimalPlaces(2, BigNumber.ROUND_DOWN)
+    .toNumber();
 
   // 再次校验不超过允许的最大抵扣金额（基于比例或门槛）
   let finalPay = Number(carts.orderCostSummary.finalPayAmount) || 0;
@@ -577,7 +631,9 @@ function pointsToMoney(val) {
     carts.orderCostSummary.pointDeductionAmount = 0;
     return;
   }
-  const maxAllowedMoney = new BigNumber(maxByRatio).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+  const maxAllowedMoney = new BigNumber(maxByRatio)
+    .decimalPlaces(2, BigNumber.ROUND_DOWN)
+    .toNumber();
   console.debug("pointsToMoney debug:", { finalPay, cfg, pts, money, maxByRatio, maxAllowedMoney });
   if (money > maxAllowedMoney) {
     // 调整积分到允许的最大金额对应的积分
@@ -586,12 +642,15 @@ function pointsToMoney(val) {
   }
 
   usePointsNumber.value = pts;
-  const finalMoney = new BigNumber(pts).div(cfg.equivalentPoints).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+  const finalMoney = new BigNumber(pts)
+    .div(cfg.equivalentPoints)
+    .decimalPlaces(2, BigNumber.ROUND_DOWN)
+    .toNumber();
   carts.orderCostSummary.pointUsed = pts;
   carts.orderCostSummary.pointDeductionAmount = finalMoney;
 }
 
-const emits = defineEmits(["chooseUser", "paysuccess", 'createOrder']);
+const emits = defineEmits(["chooseUser", "paysuccess", "createOrder"]);
 function chooseUser() {
   emits("chooseUser");
 }
@@ -669,8 +728,7 @@ function returnPayParams() {
       allPack: carts.dinnerType == "take-out" ? 1 : 0,
       limitRate: carts.limitDiscountRes,
       newCustomerDiscountId: carts.newUserDiscount !== null ? carts.newUserDiscount.id : "", // 新客立减Id
-      newCustomerDiscountAmount:
-        carts.newUserDiscount !== null ? carts.newUserDiscount.amount : 0, // 新客立减金额
+      newCustomerDiscountAmount: carts.newUserDiscount !== null ? carts.newUserDiscount.amount : 0, // 新客立减金额
       vipDiscountAmount: carts.orderCostSummary.vipDiscountAmount, // 超级会员折扣
       remark: cashRemark.value, // 现金支付备注
     },
@@ -688,7 +746,8 @@ function refScanPayOpen(payType) {
   if (payType == "scanCode") {
     return refScanPay.value.open(returnPayParams(), "scanCode");
   }
-  if (payType == "arrears") {
+  console.log("payType", payType);
+  if (payType == "virtual") {
     refGuaZhangShow();
     return;
   }
@@ -705,9 +764,8 @@ async function getPaytype() {
 const cashRemark = ref("");
 async function nowPayClick(payType) {
   if (carts.list.length) {
-    await emits('createOrder', 'only-create')
+    await emits("createOrder", "only-create");
   }
-
   setTimeout(() => {
     payType = payType || payTypes.list[payTypes.sel].payType;
     if (payType === "cash") {
@@ -715,13 +773,13 @@ async function nowPayClick(payType) {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        inputPlaceholder: '请输入现金支付备注（选填）',
+        inputPlaceholder: "请输入现金支付备注（选填）",
       })
         .then(({ value }) => {
           cashRemark.value = value || "";
           payOrder("cash");
         })
-        .catch(() => { });
+        .catch(() => {});
       return;
     }
     if (payType == "member-account") {
@@ -777,16 +835,16 @@ async function payOrder(payType, isScan, guazhangren) {
         shopUserId: carts.vipUser.id,
       });
     }
-    if (payType == "arrears") {
+    if (payType == "virtual") {
       res = await payApi.creditPay({ ...returnPayParams(), creditBuyerId: guazhangren.id });
     }
     carts.clear();
   } catch (error) {
-    console.log('payOrder===', error);
+    console.log("payOrder===", error);
     // 启动状态查询
     if (error.code == 211) {
-      showCheckPayStauts.value = true
-      autoCheckOrder()
+      showCheckPayStauts.value = true;
+      autoCheckOrder();
     }
     clearTimeout(payTimer);
     loading.close();
@@ -799,68 +857,68 @@ async function payOrder(payType, isScan, guazhangren) {
 }
 
 function clearAutoCheckOrder() {
-  clearInterval(timer.value)
-  timer.value = null
+  clearInterval(timer.value);
+  timer.value = null;
 }
 
 // 关闭查询
 function closeScanCode() {
   showCheckPayStauts.value = false;
-  reset()
+  reset();
 }
 
 // 重新扫码
 function resetScanCode() {
-  reset()
+  reset();
   showCheckPayStauts.value = false;
-  clearInterval(timer.value)
-  timer.value = null
+  clearInterval(timer.value);
+  timer.value = null;
 
-  clearInterval(closeStateTimer.value)
-  closeStateTimer.value = null
+  clearInterval(closeStateTimer.value);
+  closeStateTimer.value = null;
 
   setTimeout(() => {
-    refScanPay.value.open(returnPayParams(), "scanCode")
-  }, 500)
+    refScanPay.value.open(returnPayParams(), "scanCode");
+  }, 500);
 }
 
-const closeState = ref(false)
+const closeState = ref(false);
 const closeStateTime = ref(5);
-const closeStateTimer = ref(null)
+const closeStateTimer = ref(null);
 
 function closeStateTimerFuc() {
   closeStateTimer.value = setInterval(() => {
-    closeStateTime.value--
+    closeStateTime.value--;
     if (closeStateTime.value <= 0) {
-      clearInterval(closeStateTimer.value)
-      closeStateTimer.value = null
-      closeState.value = true
+      clearInterval(closeStateTimer.value);
+      closeStateTimer.value = null;
+      closeState.value = true;
     }
-  }, 1000)
+  }, 1000);
 }
 
 // 自动查询订单状态
-const timer = ref(null)
+const timer = ref(null);
 function autoCheckOrder() {
-  closeStateTimerFuc()
+  closeStateTimerFuc();
   timer.value = setInterval(() => {
     // 开始锁单
     // goodsStore.isOrderLock({
     //   table_code: table_code.value
     // }, 'pay_lock')
-    checkPayStauts(false)
-  }, 2000)
+    checkPayStauts(false);
+  }, 2000);
 }
 
 function reset() {
   checkPayStautsLoading.value = true;
-  closeState.value = false
-  closeStateTime.value = 5
+  closeState.value = false;
+  closeStateTime.value = 5;
 }
 
 // 查询订单支付状态
-const showCheckPayStauts = ref(false)
-const checkPayStautsLoading = ref(true)
+const showCheckPayStauts = ref(false);
+const checkPayStautsLoading = ref(true);
 async function checkPayStauts(tips = true) {
   try {
     // 扫码下单
@@ -875,7 +933,7 @@ async function checkPayStauts(tips = true) {
       checkPayStautsLoading.value = false;
       // scanCode.value = "";
       showCheckPayStauts.value = false;
-      clearAutoCheckOrder()
+      clearAutoCheckOrder();
       paysuccess();
       return;
     }
@@ -885,8 +943,8 @@ async function checkPayStauts(tips = true) {
       }
       return;
     } else {
-      clearAutoCheckOrder()
-      ElMessage.warning(res.msg || '');
+      clearAutoCheckOrder();
+      ElMessage.warning(res.msg || "");
       return;
     }
   } catch (error) {
@@ -955,8 +1013,8 @@ watch(
 );
 
 onUnmounted(() => {
-  clearAutoCheckOrder()
-})
+  clearAutoCheckOrder();
+});
 
 onMounted(() => {
   carts.payParamsInit();
@@ -1061,4 +1119,4 @@ defineExpose({
     padding-top: var(--el-font-size-base);
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/tool/Instead/components/popup-choose-guazhang.vue b/src/views/tool/Instead/components/popup-choose-guazhang.vue
index b9a50d6..d16d41b 100644
--- a/src/views/tool/Instead/components/popup-choose-guazhang.vue
+++ b/src/views/tool/Instead/components/popup-choose-guazhang.vue
@@ -9,7 +9,7 @@
           </div>
           <div>
             <div class="">可用额度</div>
-            <div class="u-m-t-6">{{ guazhangRen.remainingAmount }}</div>
+            <div class="u-m-t-6">{{ guazhangRen.creditAmount + guazhangRen.accountBalance }}</div>
           </div>
         </template>
         <template v-else>
@@ -43,8 +43,8 @@
     <choose-guazhang ref="refChooseGuazhang" @confirm="chooseGuazhangConfirm"></choose-guazhang>
   </div>
 </template>
-    
-    <script>
+
+<script>
 import { ElMessage } from "element-plus";
 import keyBoard from "./keyboard.vue";
 import chooseGuazhang from "./choose-guazhang.vue";
@@ -144,8 +144,8 @@ export default {
   mounted() {},
 };
 </script>
-    
-    <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 :deep(.el-button) {
   padding: 12px 20px;
 }
@@ -350,4 +350,4 @@ export default {
 .confirm_btns .el-button {
   width: 175px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/tool/Instead/components/popup-linshiCai.vue b/src/views/tool/Instead/components/popup-linshiCai.vue
index c162c20..f7b973c 100644
--- a/src/views/tool/Instead/components/popup-linshiCai.vue
+++ b/src/views/tool/Instead/components/popup-linshiCai.vue
@@ -29,8 +29,9 @@
     </template>
   </el-dialog>
 </template>
-  <script>
+<script>
 import { ElMessage } from "element-plus";
+import { BigNumber } from "bignumber.js";
 export default {
   data() {
     return {
@@ -60,6 +61,7 @@ export default {
     open(opt) {
       this.show = true;
       this.option = opt;
+      console.log(new BigNumber("0.00"));
     },
     close() {
       this.show = false;
@@ -73,7 +75,7 @@ export default {
         if (valid) {
           console.log(valid);
           if (this.form.discount_sale_amount * 1 <= 0 || this.form.discount_sale_amount * 1 <= 0) {
-            return ElMessage.error("价格和数量必须大于0");
+            // return ElMessage.error("价格和数量必须大于0");
           }
           this.submit();
         } else {
@@ -86,8 +88,8 @@ export default {
   mounted() {},
 };
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 :deep(.el-dialog__body) {
   margin-bottom: 14px;
   margin-top: 14px;
@@ -108,4 +110,4 @@ input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 4d1e54c..b26d9ea 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box" v-loading="!carts.isLinkFinshed" element-loading-text="购物车连接初始化中，请稍等……">
+  <div class="box">
     <div class="content">
       <div class="top">
         <div class="left u-flex u-col-center">
@@ -9,8 +9,12 @@
               <el-button type="primary" v-if="!carts.vipUser.id">选择用户</el-button>
 
               <div v-else class="flex cur-pointer">
-                <img v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'" class="headimg"
-                  :src="carts.vipUser.headImg" alt="" />
+                <img
+                  v-if="carts.vipUser.headImg && carts.vipUser.headImg != 'null'"
+                  class="headimg"
+                  :src="carts.vipUser.headImg"
+                  alt=""
+                />
                 <div v-else class="headimg flex flex-x-y-center">
                   <i class="el-icon-user"></i>
                 </div>
@@ -28,11 +32,19 @@
               </div>
             </div>
             <el-popover placement="right" width="333" trigger="click" ref="refTable">
-              <el-input placeholder="请输入内容" prefix-icon="search" v-model="tableSearchText"
-                @input="tablesearchInput"></el-input>
+              <el-input
+                placeholder="请输入内容"
+                prefix-icon="search"
+                v-model="tableSearchText"
+                @input="tablesearchInput"
+              ></el-input>
               <div style="max-height: 398px; overflow-y: scroll" class="u-m-t-12">
-                <div class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30" v-for="(item, index) in tableList"
-                  :key="index" @click="tableClick(item, index)">
+                <div
+                  class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
+                  v-for="(item, index) in tableList"
+                  :key="index"
+                  @click="tableClick(item, index)"
+                >
                   <span>{{ item.name }}</span>
                   <span :style="{ color: returnTableColor(item.status) }">
                     {{ returnTableLabel(item.status) }}
@@ -52,7 +64,12 @@
           </div>
         </div>
         <div class="right">
-          <el-input placeholder="请输入商品名称" v-model="goods.query.name" clearable @change="getGoods">
+          <el-input
+            placeholder="请输入商品名称"
+            v-model="goods.query.name"
+            clearable
+            @change="getGoods"
+          >
             <template #suffix>
               <el-icon class="el-input__icon">
                 <search />
@@ -66,16 +83,24 @@
           <div class="diners">
             <!-- 就餐类型 -->
             <el-button-group v-model="diners.sel" style="width: 100%; display: flex">
-              <el-button :class="{ active: index == diners.sel }" v-for="(item, index) in diners.list"
-                :disabled="dinerDisabled(item, index)" @click="changeDinersSel(index)" :key="index">
+              <el-button
+                :class="{ active: index == diners.sel }"
+                v-for="(item, index) in diners.list"
+                :disabled="dinerDisabled(item, index)"
+                @click="changeDinersSel(index)"
+                :key="index"
+              >
                 {{ item.label }}
               </el-button>
             </el-button-group>
           </div>
 
           <div class="u-flex u-font-14 clear u-m-t-10 perpoles">
-            <div @click="showDinerNumber" class="u-flex u-p-r-14 u-m-r-14"
-              style="border-right: 1px solid #ebebeb; line-height: 1">
+            <div
+              @click="showDinerNumber"
+              class="u-flex u-p-r-14 u-m-r-14"
+              style="border-right: 1px solid #ebebeb; line-height: 1"
+            >
               <span>就餐人数：{{ perpole || "-" }} 位</span>
               <el-icon>
                 <ArrowRight />
@@ -86,19 +111,39 @@
             </el-button>
           </div>
           <!-- 购物车 -->
-          <cartsList @editNote="showNote(true)" @createOrder="createOrder" @hideOrder="hideOrder"
-            @clearOldOrder="clearOldOrder" :showOrder="showOrder" :goodsList="carts.goods" :dinerType="diners.sel"
-            :perpole="perpole" :remark="remark" :table="carts.tableInfo" ref="refCart"></cartsList>
+          <cartsList
+            @editNote="showNote(true)"
+            @createOrder="createOrder"
+            @hideOrder="hideOrder"
+            @clearOldOrder="clearOldOrder"
+            :showOrder="showOrder"
+            :goodsList="carts.goods"
+            :dinerType="diners.sel"
+            :perpole="perpole"
+            :remark="remark"
+            :table="carts.tableInfo"
+            ref="refCart"
+          ></cartsList>
         </div>
         <div class="center">
           <!-- 购物车控制操作按钮 -->
-          <Controls @noteClick="showNote" @packClick="showPack" @changePriceClick="showChangePrice"
-            @return="refReturnCartShow" @rottable="rottableShow" @changeCartNumberShow="refChangeNumberShow" />
+          <Controls
+            @noteClick="showNote"
+            @packClick="showPack"
+            @changePriceClick="showChangePrice"
+            @return="refReturnCartShow"
+            @rottable="rottableShow"
+            @changeCartNumberShow="refChangeNumberShow"
+          />
         </div>
         <div class="right">
           <template v-if="!showOrder">
             <div class="flex categoty u-col-center">
-              <div class="show_more_btn" :class="{ showAll: category.showAll }" @click="toggleShowAll">
+              <div
+                class="show_more_btn"
+                :class="{ showAll: category.showAll }"
+                @click="toggleShowAll"
+              >
                 <div class="flex">
                   <div class="flex showmore">
                     <el-icon color="#fff">
@@ -109,8 +154,16 @@
                 </div>
               </div>
               <div class="flex categorys" :class="{ 'flex-wrap': category.showAll }">
-                <div v-for="(item, index) in category.list" :key="index" @click="changeCategoryId(item)">
-                  <el-tag size="large" :type="goods.query.categoryId === item.id ? 'primary' : 'info'" effect="dark">
+                <div
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                  @click="changeCategoryId(item)"
+                >
+                  <el-tag
+                    size="large"
+                    :type="goods.query.categoryId === item.id ? 'primary' : 'info'"
+                    effect="dark"
+                  >
                     {{ item.name }}
                   </el-tag>
                 </div>
@@ -124,13 +177,26 @@
                 </el-icon>
                 <div class="u-m-t-10">临时菜</div>
               </div>
-              <GoodsItem :item="item" @itemClick="goodsClick(item)" v-for="item in carts.goods" :key="item.id">
-              </GoodsItem>
+              <GoodsItem
+                :item="item"
+                @itemClick="goodsClick(item)"
+                v-for="item in carts.goods"
+                :key="item.id"
+              ></GoodsItem>
             </div>
           </template>
           <!-- 订单信息展示 -->
-          <Order ref="refOrder" :orderInfo="carts.oldOrder" @chooseUser="showChooseUser" @paysuccess="refresh"
-            :table="carts.tableInfo" :perpole="perpole" v-else :user="user" @create-order="createOrder"></Order>
+          <Order
+            ref="refOrder"
+            :orderInfo="carts.oldOrder"
+            @chooseUser="showChooseUser"
+            @paysuccess="refresh"
+            :table="carts.tableInfo"
+            :perpole="perpole"
+            v-else
+            :user="user"
+            @create-order="createOrder"
+          ></Order>
         </div>
       </div>
     </div>
@@ -145,7 +211,11 @@
     <!-- 临时菜 -->
     <addLingShiCai ref="refAddLingShiCai" @confirm="addLingShiCaiConfirm"></addLingShiCai>
     <!-- 改价 -->
-    <changePrice ref="refChangePrice" :useVipPrice="carts.useVipPrice" @confirm="changePriceConfirm"></changePrice>
+    <changePrice
+      ref="refChangePrice"
+      :useVipPrice="carts.useVipPrice"
+      @confirm="changePriceConfirm"
+    ></changePrice>
     <!-- 称重商品 -->
     <change-weight ref="refChangeWeight" @confirm="changeWeightConfirm"></change-weight>
     <!-- 可选套餐 -->
@@ -518,7 +588,7 @@ async function getTableDetail(params) {
   const res = await tableApi.get(params);
   return res;
 }
-function tablesearchInput() { }
+function tablesearchInput() {}
 //返回桌台状态颜色
 function returnTableColor(key) {
   const item = $status[key];
@@ -665,7 +735,7 @@ function getCategoryList() {
       size: 200,
     })
     .then((res) => {
-      localStorage.setItem('categorys', JSON.stringify(res))
+      localStorage.setItem("categorys", JSON.stringify(res));
       res.unshift({ name: "全部", id: "" });
       category.list = res;
     });
@@ -803,14 +873,14 @@ onMounted(async () => {
     //   : await orderApi.getHistoryList({
     //     tableCode,
     //   });
-    let res = ''
+    let res = "";
     if (id) {
       res = await orderApi.getHistoryList({
         orderId: id,
-      })
+      });
     } else {
       res = await orderApi.getHistoryList({
-        tableCode: carts.table_code,
+        tableCode: carts.table_code || tableCode,
       });
     }
 
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
index 67d4827..1ca9171 100644
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@@ -181,16 +181,16 @@
                   </el-button>
                 </template>
                 <template v-else-if="item.status != 'idle' && item.status != 'subscribe'">
-                  <template v-if="item.status == 'using'">
+                  <template v-if="item.status == 'unsettled'">
                     <el-button
-                      :disabled="!item.tableId || item.status === 'closed'"
+                      :disabled="!item.orderId || item.status === 'closed'"
                       @click="diancanShow(item, 'isAddGoods')"
                     >
                       加菜
                     </el-button>
                     <el-button
                       type="danger"
-                      :disabled="!item.tableId || item.status === 'closed'"
+                      :disabled="!item.orderId || item.status === 'closed'"
                       @click="diancanShow(item, 'isPayOrder')"
                     >
                       结账
@@ -539,7 +539,7 @@ onMounted(() => {});
     max-width: 210px;
     min-width: 190px;
 
-    &.using {
+    &.unsettled {
       background-color: rgb(250, 85, 85);
     }