代码合并

.env.development

@@ -10,6 +10,8 @@ VITE_APP_BASE_API=/dev-api
 # VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式
  VITE_APP_API_URL=http://192.168.1.42/ # 本地
  VITE_APP_API_PHP_URL=http://192.168.1.42:8000  #php抖音美团测试环境
+ VITE_APP_API_PHP_IMPORT_URL=http://192.168.1.42:8789  #本地php批量导入
+#  VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com  #本地线上php批量导入
 
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws

.env.production

@@ -12,6 +12,9 @@ VITE_APP_BASE_API = https://cashier.sxczgkj.com/
 VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn  #php抖音美团正式环境
 
 
+ VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com  #线上php批量导入
+
+
 
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws

package.json

@@ -115,6 +115,7 @@
     "vite-plugin-mock-dev-server": "^1.8.3",
     "vite-plugin-strip-code": "^1.1.0",
     "vite-plugin-svg-icons": "^2.0.1",
+    "vite-plugin-vue-devtools": "^8.1.0",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.2.0"
   },

src/api/order/order.ts

@@ -72,6 +72,23 @@ const OrderApi = {
       data
     });
   },
+  // 查询财务报表
+  financeSts(params: any) {
+    return request<any>({
+      url: `${Order_BaseUrl}/admin/finance/sts`,
+      method: "get",
+      params
+    });
+  },
+  // 导出财务报表
+  financeExport(params: any) {
+    return request<any>({
+      url: `${Order_BaseUrl}/admin/finance/export`,
+      method: "get",
+      params,
+      responseType: 'blob'
+    });
+  },
 };
 
 export default OrderApi;

src/api/system/index.js

@@ -0,0 +1,15 @@
+import request from "@/utils/request";
+import {
+  Account_BaseUrl,
+  Product_BaseUrl,
+  Market_BaseUrl,
+  System_BaseUrl
+} from "@/api/config";
+
+// 帮助中心 
+export function getHelp() {
+  return request({
+    url: `${System_BaseUrl + "/user/getHelp"}`,
+    method: 'get'
+  });
+}

src/components/CURD/PageContent.vue

@@ -3,68 +3,49 @@
     <!-- 表格工具栏 -->
     <div class="flex-x-between mb-[10px]">
       <!-- 左侧工具栏 -->
-      <div>
+      <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>
         </template>
+        <!-- 插槽 -->
+        <slot name="custom" />
       </div>
       <!-- 右侧工具栏 -->
       <div>
@@ -89,68 +70,36 @@
             </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">
@@ -159,24 +108,15 @@
               <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>
@@ -198,30 +138,20 @@
             <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>
             <!-- 格式化为价格 -->
@@ -253,7 +183,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                        .value
+                      .value
                     : ""
                 }}
               </template>
@@ -264,21 +194,15 @@
                 <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>
@@ -286,63 +210,43 @@
                 <!-- 其他 -->
                 <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>
@@ -364,33 +268,18 @@
     <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>
@@ -400,16 +289,10 @@
           <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">
@@ -430,35 +313,17 @@
       </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>
@@ -467,13 +332,8 @@
               <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>
@@ -485,11 +345,7 @@
       <!-- 弹窗底部操作按钮 -->
       <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>
@@ -1005,10 +861,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) => {
@@ -1073,7 +929,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[]>([]);
 // 设置默认选择
@@ -1115,17 +971,21 @@ defineExpose({
 :deep(.el-table .el-table__cell) {
   z-index: inherit;
 }
+
 .el-card {
   overflow: visible;
 }
+
 :deep(.el-table) {
   overflow: visible;
+
   .el-table__header-wrapper {
     position: sticky;
     z-index: calc(var(--el-table-index) + 2);
     top: 0;
   }
 }
+
 :deep(.el-table td.el-table__cell div) {
   vertical-align: middle;
 }

src/components/Upload/FileUpload.vue

@@ -1,44 +1,42 @@
 <!-- 文件上传组件 -->
 <template>
   <div>
-    <el-upload
-      v-model:file-list="fileList"
-      :style="props.style"
-      :before-upload="handleBeforeUpload"
-      :http-request="handleUpload"
-      :on-progress="handleProgress"
-      :on-success="handleSuccess"
-      :on-error="handleError"
-      :accept="props.accept"
-      :limit="props.limit"
-      multiple
-    >
-      <!-- 上传文件按钮 -->
-      <el-button type="primary" :disabled="fileList.length >= props.limit">
-        {{ props.uploadBtnText }}
-      </el-button>
-
+    <el-upload v-model:file-list="fileList" :style="props.style" :before-upload="handleBeforeUpload"
+      :http-request="handleUpload" :on-progress="handleProgress" :on-success="handleSuccess" :on-error="handleError"
+      :accept="props.accept" :limit="props.limit" multiple drag :tip="'支持多个文件上传，单个文件不超过 ' + props.maxFileSize + 'MB'">
+      <!-- 拖拽上传区域 -->
+      <div>
+        <el-icon class="el-icon--upload">
+          <UploadFilled />
+        </el-icon>
+        <div class="el-upload__text">
+          将文件拖到此处，或 <em>点击上传</em>
+          <br />
+          <small>支持格式：{{ props.accept }}</small>
+        </div>
+      </div>
       <!-- 文件列表 -->
       <template #file="{ file }">
         <div class="el-upload-list__item-info">
           <a class="el-upload-list__item-name" @click="handleDownload(file)">
-            <el-icon><Document /></el-icon>
+            <el-icon>
+              <Document />
+            </el-icon>
             <span class="el-upload-list__item-file-name">{{ file.name }}</span>
-            <span class="el-icon--close" @click="handleRemove(file.url!)">
-              <el-icon><Close /></el-icon>
+            <span class="el-icon--close" @click="handleRemove(file.url)">
+              <el-icon>
+                <Close />
+              </el-icon>
             </span>
           </a>
         </div>
       </template>
     </el-upload>
-
-    <el-progress
-      :style="{
-        display: showProgress ? 'inline-flex' : 'none',
-        width: '100%',
-      }"
-      :percentage="progressPercent"
-    />
+    <el-progress :style="{
+      display: showProgress ? 'inline-flex' : 'none',
+      width: '100%',
+      marginTop: '10px',
+    }" :percentage="progressPercent" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -48,9 +46,14 @@ import {
   UploadProgressEvent,
   UploadRequestOptions,
 } from "element-plus";
+import { Upload, Document, Close } from "@element-plus/icons-vue";
 
 import CommonApi, { FileInfo, uploadResponse } from "@/api/account/common";
 
+const emit = defineEmits<{
+  "upload-success": [fileInfo: string];
+}>();
+
 const props = defineProps({
   /**
    * 请求携带的额外参数
@@ -96,7 +99,6 @@ const props = defineProps({
     type: String,
     default: "上传文件",
   },
-
   /**
    * 样式
    */
@@ -104,7 +106,7 @@ const props = defineProps({
     type: Object,
     default: () => {
       return {
-        width: "300px",
+        width: "100%",
       };
     },
   },
@@ -147,6 +149,7 @@ function handleBeforeUpload(file: UploadRawFile) {
     ElMessage.warning("上传图片不能大于" + props.maxFileSize + "M");
     return false;
   }
+  showProgress.value = true;
   return true;
 }
 
@@ -190,10 +193,13 @@ const handleProgress = (event: UploadProgressEvent) => {
 const handleSuccess = (fileInfo: string) => {
   ElMessage.success("上传成功");
   modelValue.value = [...modelValue.value, fileInfo];
+  emit("upload-success", fileInfo);
+  showProgress.value = false;
 };
 
 const handleError = (error: any) => {
   ElMessage.error("上传失败");
+  showProgress.value = false;
 };
 
 /**

src/components/Upload/GfileUpload.vue

@@ -0,0 +1,242 @@
+<!-- 文件上传组件 -->
+<template>
+  <div>
+    <el-upload v-model:file-list="fileList" :style="props.style" :before-upload="handleBeforeUpload"
+      :on-change="handleChange" :accept="accept" multiple drag :tip="'支持多个文件上传，单个文件不超过 ' + props.maxFileSize + 'MB'"
+      :auto-upload="false">
+      <!-- 拖拽上传区域 -->
+      <div>
+        <el-icon class="el-icon--upload">
+          <UploadFilled />
+        </el-icon>
+        <div class="el-upload__text">
+          将文件拖到此处，或 <em>点击上传</em>
+          <br />
+          <small>支持格式：{{ accept }}</small>
+        </div>
+      </div>
+      <!-- 文件列表 -->
+      <template #file="{ file }">
+        <div class="el-upload-list__item-info">
+          <a class="el-upload-list__item-name" @click="handleDownload(file)">
+            <el-icon>
+              <Document />
+            </el-icon>
+            <span class="el-upload-list__item-file-name">{{ file.name }}</span>
+            <span class="el-icon--close" @click="handleRemove(file.url)">
+              <el-icon>
+                <Close />
+              </el-icon>
+            </span>
+          </a>
+        </div>
+      </template>
+    </el-upload>
+  </div>
+</template>
+<script setup>
+import { UploadFilled, Document, Close } from "@element-plus/icons-vue";
+
+const emit = defineEmits({
+  "file-selected": null,
+});
+
+const props = defineProps({
+  /**
+   * 文件上传数量限制
+   */
+  limit: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   * 单个文件上传大小限制(单位MB)
+   */
+  maxFileSize: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   * 上传文件类型
+   */
+  accept: {
+    type: String,
+    default: "*",
+  },
+  /**
+   * 选择文件成功的回调函数
+   */
+  successCallback: {
+    type: Function,
+    default: null,
+  },
+  /**
+   * 样式
+   */
+  style: {
+    type: Object,
+    default: () => {
+      return {
+        width: "100%",
+      };
+    },
+  },
+});
+
+const fileList = defineModel({
+  type: Array,
+  default: () => [],
+});
+
+/**
+ * 文件选择变化
+ */
+function handleChange(file, fileList) {
+  if (file.status === 'ready') {
+    // 如果限制为1个文件，移除之前的文件，只保留当前新文件
+    if (props.limit === 1 && fileList.length > 1) {
+      fileList.splice(0, fileList.length - 1);
+    }
+    const rawFile = file.raw;
+    // 限制文件类型
+    if (props.accept !== "*") {
+      const acceptedTypes = props.accept.split(',').map(type => type.trim());
+      const isAccepted = acceptedTypes.some(type => {
+        let checkType = type;
+        if (!type.startsWith('.') && !type.includes('/')) {
+          checkType = '.' + type;
+        }
+        if (checkType.startsWith('.')) {
+          return rawFile.name.toLowerCase().endsWith(checkType.toLowerCase());
+        } else if (checkType.includes('*')) {
+          const [main] = checkType.split('/');
+          return rawFile.type.startsWith(main + '/');
+        } else {
+          return rawFile.type === checkType;
+        }
+      });
+      if (!isAccepted) {
+        ElMessage.warning("文件类型不符合要求");
+        // 从 fileList 中移除不符合的文件
+        fileList.splice(fileList.indexOf(file), 1);
+        return;
+      }
+    }
+    if (props.successCallback) {
+      props.successCallback(rawFile);
+    } else {
+      emit("file-selected", rawFile);
+    }
+  }
+}
+
+/**
+ * 上传前校验
+ */
+function handleBeforeUpload(file) {
+  // 限制文件大小
+  if (file.size > props.maxFileSize * 1024 * 1024) {
+    ElMessage.warning("上传文件不能大于" + props.maxFileSize + "M");
+    return false;
+  }
+  // 限制文件类型
+  if (props.accept !== "*") {
+    const acceptedTypes = props.accept.split(',').map(type => type.trim());
+    const isAccepted = acceptedTypes.some(type => {
+      if (type.startsWith('.')) {
+        return file.name.toLowerCase().endsWith(type.toLowerCase());
+      } else {
+        return file.type === type;
+      }
+    });
+    if (!isAccepted) {
+      ElMessage.warning("文件类型不符合要求");
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * 删除文件
+ */
+function handleRemove(fileUrl) {
+  // 从 fileList 中移除
+  fileList.value = fileList.value.filter(f => f.url !== fileUrl);
+}
+
+/**
+ * 下载文件
+ */
+function handleDownload(file) {
+  // 本地文件，不支持下载
+}
+</script>
+<style lang="scss" scoped>
+.el-upload-list__item .el-icon--close {
+  position: absolute;
+  top: 50%;
+  right: 5px;
+  color: var(--el-text-color-regular);
+  cursor: pointer;
+  opacity: 0.75;
+  transition: opacity var(--el-transition-duration);
+  transform: translateY(-50%);
+
+  &:hover {
+    opacity: 1;
+    color: var(--el-color-danger);
+  }
+}
+
+:deep(.el-upload-list) {
+  margin: 10px 0 0 0;
+}
+
+:deep(.el-upload-list__item) {
+  margin: 5px 0;
+  background: #f5f5f5;
+  border: 1px solid #e0e0e0;
+  border-radius: 4px;
+  padding: 8px 12px;
+  display: flex;
+  align-items: center;
+  transition: all 0.3s ease;
+
+  &:hover {
+    background: #f0f0f0;
+    border-color: var(--el-color-primary-light-3);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  }
+
+  .el-upload-list__item-info {
+    flex: 1;
+
+    a {
+      display: flex;
+      align-items: center;
+      text-decoration: none;
+      color: var(--el-text-color-primary);
+
+      &:hover {
+        color: var(--el-color-primary);
+      }
+
+      .el-icon {
+        margin-right: 8px;
+        color: var(--el-color-primary);
+      }
+
+      .el-upload-list__item-file-name {
+        flex: 1;
+        font-size: 14px;
+        font-weight: 500;
+      }
+
+      .el-icon--close {
+        margin-left: 8px;
+      }
+    }
+  }
+}
+</style>

src/components/importData/index.vue

@@ -0,0 +1,258 @@
+<!-- 批量导入数据dialog -->
+<template>
+  <div>
+    <div class="btn_row">
+      <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';
+
+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'])
+
+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>

src/importDataApi/index.js

@@ -0,0 +1,57 @@
+import request from "@/utils/request-import-php";
+
+/**
+ * 平台列表
+ * @param {*} data 
+ * @returns 
+ */
+export function getplatlist(data) {
+  return request({
+    url: "plat/getplatlist",
+    method: "post",
+    data
+  });
+}
+
+/**
+ * 导入
+ * @param {*} data 
+ * @returns 
+ */
+export function uploadFile(data) {
+  return request({
+    url: "upload",
+    method: "post",
+    headers: {
+      'Content-Type': 'multipart/form-data',
+    },
+    data
+  });
+}
+
+/**
+ * 导入记录
+ * @param {*} data 
+ * @returns 
+ */
+export function importlist(data) {
+  return request({
+    url: "plat/importlist",
+    method: "post",
+    data
+  });
+}
+
+/**
+ * 下载模板
+ * @param {*} data 
+ * @returns 
+ */
+export function downloadTemp(data) {
+  return request({
+    url: "plat/downloadTemp",
+    method: "post",
+    data
+  });
+}
+

src/layout/components/NavBar/components/HellpCenter.vue

@@ -0,0 +1,212 @@
+<template>
+  <div>
+    <el-text size="large" style="margin: 0 14px;" @click="visible = true">帮助中心</el-text>
+    <el-dialog title="帮助中心" width="1000px" v-model="visible" append-to-body>
+      <div class="help_container">
+        <div class="header">关注官方公众号，查看详细教程视频，快速掌握使用方法</div>
+        <div class="wrap">
+          <div class="item">
+            <div class="title">联系方式</div>
+            <div class="row">
+              <div class="left">
+                <div class="icon">
+                  <el-icon color="#fff">
+                    <PhoneFilled />
+                  </el-icon>
+                </div>
+                <el-text>客服电话</el-text>
+              </div>
+              <div class="right hover" @click="copyHandle(helpInfo.service_phone)">
+                <el-text type="primary">{{ helpInfo.service_phone }}</el-text>
+                <el-icon color="#666">
+                  <CopyDocument />
+                </el-icon>
+              </div>
+            </div>
+            <div class="row">
+              <div class="left">
+                <div class="icon">
+                  <el-icon color="#fff">
+                    <UserFilled />
+                  </el-icon>
+                </div>
+                <el-text>QQ告前咨询</el-text>
+              </div>
+              <div class="right hover" @click="copyHandle(helpInfo.qq_consult)">
+                <el-text type="primary">{{ helpInfo.qq_consult }}</el-text>
+                <el-icon color="#666">
+                  <CopyDocument />
+                </el-icon>
+              </div>
+            </div>
+            <div class="row" style="margin-top: 4px;">
+              <div class="left">
+                <div class="icon" style="background-color: #fff;">
+                </div>
+                <el-text>QQ投诉通道</el-text>
+              </div>
+              <div class="right hover" @click="copyHandle(helpInfo.qq_complaint)">
+                <el-text type="primary">{{ helpInfo.qq_complaint }}</el-text>
+                <el-icon color="#666">
+                  <CopyDocument />
+                </el-icon>
+              </div>
+            </div>
+            <div class="row">
+              <div class="left">
+                <div class="icon">
+                  <el-icon color="#fff">
+                    <Check />
+                  </el-icon>
+                </div>
+                <el-text>上班时间</el-text>
+              </div>
+              <div class="right">
+                <el-text type="primary">{{ helpInfo.work_time }}</el-text>
+              </div>
+            </div>
+          </div>
+          <div class="item">
+            <div class="title">官方公众号</div>
+            <div class="intro">
+              <el-text type="info">关注后即可查看所有操作教程视频</el-text>
+            </div>
+            <div class="ewm_wrap">
+              <el-image :src="helpInfo.help_ac_qrcode" style="width: 145px;height:145px;"></el-image>
+              <el-text type="danger">关注后即可查看所有操作教程视频</el-text>
+              <el-text type="info">微信扫描识别二维码关注，获取更多服务</el-text>
+            </div>
+            <div class="step_wrap" v-if="helpInfo.official_account">
+              <div class="row" v-for="(item, index) in helpInfo.official_account.split(';')" :key="index">
+                <div class="left">
+                  <div class="icon">
+                    <span class="t">{{ index + 1 }}</span>
+                  </div>
+                  <el-text>{{ item }}</el-text>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import useClipboard from "vue-clipboard3";
+import { getHelp } from '@/api/system'
+const { toClipboard } = useClipboard();
+
+const visible = ref(false);
+
+// 复制
+async function copyHandle(text) {
+  try {
+    await toClipboard(text);
+    ElNotification({
+      title: "成功",
+      message: `复制成功`,
+      type: "success",
+    });
+    console.log("Copied to clipboard");
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+// 获取帮助中心信息
+const helpInfo = ref({});
+async function getHelpAjax() {
+  try {
+    const res = await getHelp();
+    helpInfo.value = res;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+onMounted(() => {
+  getHelpAjax()
+}); 
+</script>
+
+<style lang="scss" scoped>
+.header {
+  font-size: 16px;
+  color: #333;
+}
+
+.wrap {
+  display: flex;
+  margin-top: 37px;
+  padding: 0 28px;
+
+  .item {
+    flex: 1;
+
+    &:first-child {
+      border-right: 2px solid #EDEDED;
+      padding-right: 38px;
+    }
+
+    &:last-child {
+      padding-left: 38px;
+    }
+
+    .title {
+      font-size: 16px;
+      color: #333;
+      font-weight: bold;
+    }
+
+    .row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-top: 16px;
+
+      .left {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+
+        .icon {
+          width: 22px;
+          height: 22px;
+          border-radius: 50%;
+          background-color: var(--el-color-primary);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          flex-shrink: 0;
+
+          .t {
+            font-size: 12px;
+            color: #fff;
+          }
+        }
+      }
+
+      .right {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+
+        &.hover {
+          cursor: pointer;
+        }
+      }
+    }
+
+    .ewm_wrap {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-top: 16px;
+      gap: 16px;
+    }
+  }
+}
+</style>

src/layout/components/NavBar/components/NavbarRight.vue

@@ -2,6 +2,8 @@
   <div class="navbar__right">
     <!-- 非手机设备（窄屏）才显示 -->
     <template v-if="!isMobile">
+      <!-- 帮助中心 -->
+      <HellpCenter />
       <!-- 搜索 -->
       <MenuSearch />
 
@@ -35,6 +37,7 @@ import { useAppStore, useSettingsStore } from "@/store";
 
 import UserProfile from "./UserProfile.vue";
 import Notification from "./Notification.vue";
+import HellpCenter from "./HellpCenter.vue";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
@@ -48,7 +51,7 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
   align-items: center;
   justify-content: center;
 
-  & > * {
+  &>* {
     display: inline-block;
     min-width: 40px;
     height: $navbar-height;
@@ -67,12 +70,12 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
   margin: 10px 0;
 }
 
-.dark .navbar__right > *:hover {
+.dark .navbar__right>*:hover {
   background: rgb(255 255 255 / 20%);
 }
 
-.layout-top .navbar__right > *,
-.layout-mix .navbar__right > * {
+.layout-top .navbar__right>*,
+.layout-mix .navbar__right>* {
   color: #333;
 }
 </style>

src/router/index.ts

@@ -63,6 +63,14 @@ export const constantRoutes: RouteRecordRaw[] = [
           keepAlive: true,
         },
       },
+      {
+        path: "finance",
+        name: "",
+        component: () => import("@/views/data/finance.vue"),
+        meta: {
+          title: "财务报表"
+        },
+      },
       {
         path: "work",
         name: "workStatistics",

src/store/modules/carts.ts

@@ -688,11 +688,13 @@ export const useCartsStore = defineStore("carts", () => {
   }
 
   function rotTable(newVal: string | number, cart_id = []) {
-    sendMessage('rottable', {
-      new_table_code: newVal,
-      table_code: table_code.value,
-      cart_id
-    });
+    if (cart_id.length) {
+      sendMessage('rottable', {
+        new_table_code: newVal,
+        table_code: table_code.value,
+        cart_id
+      });
+    }
   }
 
   function del(data: any) {
@@ -851,8 +853,9 @@ export const useCartsStore = defineStore("carts", () => {
   }
 
   // 初始话订单信息/补全历史订单信息
-  async function setOldOrder(data: any) {
-    console.log('补全订单信息', data);
+  async function setOldOrder(data: any, t: number) {
+    console.log('补全历史订单信息来源', t);
+    // console.log('补全订单信息', data);
     oldOrder.value = {
       ...data,
       detailMap: returnDetailMap(data.detailMap)
@@ -867,10 +870,17 @@ export const useCartsStore = defineStore("carts", () => {
 
   let $initParams = {} as ApifoxModel;
 
-  async function init(initParams: ApifoxModel, $oldOrder: any | undefined) {
-    await getGoods({});
-    if ($oldOrder) setOldOrder($oldOrder);
-    else oldOrder.value = { detailMap: [] };
+
+  // 标志位，表示是否正在清空历史订单
+  const isClearingOldOrder = ref(false);
+
+
+  async function init(initParams: ApifoxModel | undefined, $oldOrder: any | undefined) {
+    console.log('cart.init.initParams', initParams);
+    console.log('cart.init.$oldOrder', $oldOrder);
+
+
+
 
     if (initParams) {
       initParams.table_code = initParams.table_code || '';
@@ -878,6 +888,16 @@ export const useCartsStore = defineStore("carts", () => {
       $initParams = initParams;
     }
 
+    await getGoods({});
+
+    if ($oldOrder) {
+      await setOldOrder($oldOrder);
+    } else if (table_code.value) {
+      await getOldOrder(table_code.value);
+    } else {
+      oldOrder.value = { detailMap: [] };
+    }
+
     concocatSocket($initParams);
   }
 
@@ -995,8 +1015,15 @@ export const useCartsStore = defineStore("carts", () => {
         concocatSocket({ ...$initParams, table_code: table_code.value });
       }
 
+      // WebSocket 监听 product_update 消息
       if (msg.operate_type === "product_update") {
-        init($initParams, oldOrder.value);
+        if (isClearingOldOrder.value) {
+          console.log("忽略 product_update 消息，因为正在清空历史订单");
+          isClearingOldOrder.value = false; // 重置标志位
+          return;
+        }
+        console.log("处理 product_update 消息");
+        init($initParams, oldOrder.value); // 重新初始化
       }
 
       if (msg.type === "bc") {
@@ -1041,6 +1068,8 @@ export const useCartsStore = defineStore("carts", () => {
     newUserDiscount.value = {}
   }
 
+
+
   return {
     disconnect,
     dinnerType,
@@ -1102,7 +1131,7 @@ export const useCartsStore = defineStore("carts", () => {
     getAllGoodsList,
     vipUser,
     changeTableInfo,
-    tableInfo,
+    tableInfo, isClearingOldOrder,
     clearHistory
   };
 });

src/utils/request-import-php.js

@@ -0,0 +1,131 @@
+import axios from "axios";
+import router from "@/router";
+import { getDouyinToken, getToken } from "@/utils/auth";
+
+// 创建axios实例
+const service = axios.create({
+  baseURL: import.meta.env.VITE_APP_API_PHP_IMPORT_URL, // api 的 base_url
+  // baseURL: "/import_api", // api 的 base_url
+  timeout: 1000 * 20, // 请求超时时间
+});
+
+// request拦截器
+service.interceptors.request.use(
+  (config) => {
+    if (getToken()) {
+      config.headers["token"] = getToken();
+    }
+    if (!config.headers["Content-Type"]) {
+      config.headers["Content-Type"] = "application/json";
+    }
+    return config;
+  },
+  (error) => {
+    // 确保错误回调返回Promise，避免状态异常
+    return Promise.reject(error);
+  }
+);
+
+// response 拦截器
+service.interceptors.response.use(
+  (response) => {
+    const data = response.data;
+    console.log(data);
+    if (data.code == 0) {
+      ElNotification.error({
+        title: data.msg,
+        duration: 5000,
+      });
+      return;
+    }
+    if (data.code == 439 || data.code == 303) {
+      ElNotification.error({
+        title: "请登录",
+        duration: 5000,
+      });
+      return;
+    }
+    if (data.code == 4399) {
+      ElNotification.error({
+        title: data.msg,
+        duration: 5000,
+      });
+      return data;
+    }
+    // if (data.code == 1 && !data.data) {
+    //   ElNotification.success({
+    //     title: data.msg,
+    //     duration: 5000
+    //   })
+    //   return true;
+    // }
+    return data.data;
+  },
+  (error) => {
+    console.log(error);
+    if (axios.isCancel(error)) {
+      console.log("请求已取消");
+      ElNotification.error({
+        title: "请求已取消",
+        duration: 5000,
+      });
+      return Promise.reject("请求已取消");
+    }
+
+    // 兼容blob下载出错json提示
+    if (
+      error.response.data instanceof Blob &&
+      error.response.data.type.toLowerCase().indexOf("json") !== -1
+    ) {
+      const reader = new FileReader();
+      reader.readAsText(error.response.data, "utf-8");
+      reader.onload = function (e) {
+        const errorMsg = JSON.parse(reader.result).message;
+        ElNotification.error({
+          title: errorMsg,
+          duration: 5000,
+        });
+      };
+    } else {
+      let code = 0;
+      try {
+        code = error.response.data.status;
+      } catch (e) {
+        if (error.toString().indexOf("Error: timeout") !== -1) {
+          ElNotification.error({
+            title: "网络请求超时",
+            duration: 5000,
+          });
+          return Promise.reject(error);
+        }
+      }
+      console.log(code);
+      if (code) {
+        if (code === 401) {
+          // store.dispatch("LogOut").then(() => {
+          //   // 用户登录界面提示
+          //   Cookies.set("point", 401);
+          //   location.reload();
+          // });
+        } else if (code === 403) {
+          router.push({ path: "/401" });
+        } else {
+          const errorMsg = error.response.data.message;
+          if (errorMsg !== undefined) {
+            ElNotification.error({
+              title: errorMsg,
+              duration: 5000,
+            });
+          }
+        }
+      } else {
+        ElNotification.error({
+          title: "接口请求失败",
+          duration: 5000,
+        });
+      }
+    }
+    return Promise.reject(error);
+  }
+);
+export default service;

src/utils/websocket.ts

@@ -3,6 +3,7 @@ import { useUserStoreHook } from "@/store";
 import { ElMessage, ElMessageBox } from "element-plus";
 
 const user = useUserStoreHook();
+let isTips = false
 
 export interface ApifoxModel {
   account: string;
@@ -143,6 +144,7 @@ class WebSocketManager {
       this.autoConnect = false;
     }
   }
+
   // 自动重连机制
   private reconnect() {
     if (!this.autoConnect) {
@@ -156,19 +158,24 @@ class WebSocketManager {
       }, this.reconnectDelay);
     } else {
       clearTimeout(this.reconnectTimer);
-      console.error("达到最大重连次数，停止重连");
-      ElMessageBox.confirm('达到最大重连次数' + this.maxReconnectAttempts + '次，已停止重连,是否立即重连？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      // window.location.reload();
+      // console.error("达到最大重连次数，停止重连");
+      if (!isTips) {
+        ElMessageBox.confirm('达到最大重连次数' + this.maxReconnectAttempts + '次，已停止重连,是否立即重连？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
 
-        callback: (action: string) => {
-          console.log(action);
-          if (action == 'confirm') {
-            this.setupWebSocket();
-            this.reconnectAttempts = 0;
+          callback: (action: string) => {
+            console.log(action);
+            if (action == 'confirm') {
+              isTips = false
+              this.setupWebSocket();
+              this.reconnectAttempts = 0;
+            }
           }
-        }
-      });
+        });
+      }
+      isTips = true
     }
   }
 

src/views/application/list/index.vue

@@ -23,8 +23,8 @@ import call from "@/assets/images/application/call.png";
 
 const list = ref([
   { name: "存酒", icon: bear, path: "storingWine", desc: "用户未喝完的酒可暂存在店里" },
-  { name: "点歌", icon: song, path: "song", desc: "用户可以付费点歌" },
-  { name: "广告", icon: ad, path: "advertisement", desc: "添加弹窗广告" },
+  // { name: "点歌", icon: song, path: "song", desc: "用户可以付费点歌" },
+  // { name: "广告", icon: ad, path: "advertisement", desc: "添加弹窗广告" },
   { name: "叫号", icon: call, path: "lineUplist", desc: "" },
 ]);
 

src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/Content.vue

@@ -60,7 +60,8 @@
     <myDialog ref="myDialogRefqs" title="记录" @confirm="confirmqs" width="30%">
       <el-form-item label="选择用户">
         <el-select v-model="datas.DialogForm.userId" filterable placeholder="请选择选择用户" style="width: 240px">
-          <el-option v-for="item in datas.options" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          <el-option v-for="item in datas.options" :key="item.userId" :label="`${item.nickName}/${item.phone}`"
+            :value="item.userId" />
         </el-select>
       </el-form-item>
       <el-form-item label="数量">
@@ -128,7 +129,7 @@ function myDialogRefqsevent(item) {
   myDialogRefqs.value.open()
 }
 async function getshopUser(params) {
-  const res = await API.getshopUser({})
+  const res = await API.getshopUser({ page: 1, size: 999, ...params })
   datas.options = res.records
 }
 async function getList(data = {}) {

src/views/application/list/storingWine/storingWineconfig/Storingwineconfig/api.ts

@@ -19,10 +19,11 @@ const AuthAPI = {
     });
   },
   // 获取用户店铺列表
-  getshopUser() {
+  getshopUser(params: any) {
     return request<any, Responseres>({
       url: `/account/admin/shopUser`,
       method: "get",
+      params,
     });
   },
   // 新增

src/views/application/list/storingWine/storingWineconfig/Winerecordconfig/Content.vue

@@ -12,7 +12,8 @@
       <el-form ref="ruleFormRef" :rules="datas.rules" :model="datas.DialogForm" label-width="80px">
         <el-form-item label="选择用户">
           <el-select v-model="datas.DialogForm.userId" filterable placeholder="请选择选择用户" style="width: 240px">
-            <el-option v-for="item in datas.options" :key="item.userId" :label="item.nickName" :value="item.userId" />
+            <el-option v-for="item in datas.options" :key="item.userId" :label="`${item.nickName}/${item.phone}`"
+              :value="item.userId" />
           </el-select>
         </el-form-item>
         <el-form-item label="选择酒品">
@@ -107,7 +108,7 @@ async function getList(data = {}) {
   datas.pagingConfig.pageNumber = res.pageNumber
 }
 async function getshopUser(params) {
-  const res = await API.getshopUser({})
+  const res = await API.getshopUser({ page: 1, size: 999, ...params })
   datas.options = res.records
 }
 async function getstorageGood() {

src/views/application/list/storingWine/storingWineconfig/Winerecordconfig/api.ts

@@ -18,10 +18,11 @@ const AuthAPI = {
     });
   },
   // 获取用户店铺列表
-  getshopUser() {
+  getshopUser(params: any) {
     return request<any, Responseres>({
       url: `/account/admin/shopUser`,
       method: "get",
+      params,
     });
   },
   // 获取酒品列表

src/views/data/finance.vue

@@ -0,0 +1,699 @@
+<template>
+  <div class="gyq_container">
+    <div class="row">
+      <div class="between">
+        <el-form :model="queryForm" inline>
+          <el-form-item>
+            <el-date-picker v-model="queryForm.queryDate" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" :disabled-date="disabledFutureDate" clearable />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" :loading="loading" @click="handleQuery">查询</el-button>
+            <el-button @click="handleReset" icon="Refresh" :loading="loading">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-form inline>
+          <el-form-item>
+            <el-select v-model="queryForm.platform" placeholder="选择平台" clearable style="width: 150px;">
+              <el-option v-for="item in platformList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="handleExport" icon="Download">导出</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div class="row" v-loading="loading">
+      <div class="warp" style="width: 400px;">
+        <div class="card">
+          <div class="header_title">营业额</div>
+          <div class="num" style="color: var(--el-color-primary);">
+            <span class="i">￥</span>
+            {{ multiplyAndFormat(tableData.turnover.turnover || 0) }}
+          </div>
+          <div class="intro">营业额</div>
+          <div class="pay_wrap">
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.wechat || 0) }}
+              </div>
+              <span class="t">微信支付金额</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.alipay || 0) }}
+              </div>
+              <span class="t">支付宝支付金额</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.selfScan || 0) }}
+              </div>
+              <span class="t">二维码收款</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.barScan || 0) }}
+              </div>
+              <span class="t">扫码收款</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.cash || 0) }}
+              </div>
+              <span class="t">现金收款</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.recharge || 0) }}
+              </div>
+              <span class="t">充值</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.owed || 0) }}
+              </div>
+              <span class="t">挂账</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.turnover.balance || 0) }}
+              </div>
+              <span class="t">余额支付</span>
+            </div>
+          </div>
+          <!-- <div class="order_info">
+            <div class="order_title">
+              <span class="dot"></span>
+              <span class="t">订单</span>
+            </div>
+            <div class="order_lits">
+              <div class="item">
+                <span class="t">订单金额</span>
+                <span class="n">{{ tableData.order.orderAmount || 0 }}</span>
+              </div>
+              <span class="line">|</span>
+              <div class="item">
+                <span class="t">订单总数</span>
+                <span class="n">{{ tableData.order.orderCount || 0 }}</span>
+              </div>
+            </div>
+          </div> -->
+        </div>
+        <div class="card">
+          <div class="header_title">数据统计</div>
+          <div class="pay_wrap">
+            <div class="item">
+              <span class="n">{{ tableData.sts.customerCount || 0 }}</span>
+              <span class="t">就餐人数</span>
+            </div>
+            <div class="item">
+              <span class="n">{{ tableData.sts.orderCount || 0 }}</span>
+              <span class="t">订单数</span>
+            </div>
+            <div class="item">
+              <span class="n">{{ tableData.sts.tableCount || 0 }}</span>
+              <span class="t">桌台数</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.sts.avgPayAmount || 0) }}
+              </div>
+              <div class="t">客单价
+                <el-tooltip class="box-item" effect="dark" content="实付金额(包含现金支付 包含会员支付 包含挂账)/就餐人数没有具体人数时，默认一桌按照1人计算"
+                  placement="top">
+                  <el-icon color="#666">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </div>
+            <div class="item">
+              <span class="n">{{ tableData.sts.turnoverRate || 0 }}%</span>
+              <div class="t">翻台率
+                <el-tooltip class="box-item" effect="dark" content="（订单数-桌台数）/桌台数*100%" placement="top">
+                  <el-icon color="#666">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.sts.profitAmount || 0) }}
+              </div>
+              <div class="t">毛利润
+                <el-tooltip class="box-item" effect="dark" content="（订单实付金额-商品成本）" placement="top">
+                  <el-icon color="#666">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.sts.productCostAmount || 0) }}
+              </div>
+              <span class="t">商品成本</span>
+            </div>
+            <div class="item">
+              <span class="n">{{ tableData.sts.profitRate || 0 }}%</span>
+              <div class="t">毛利率
+                <el-tooltip class="box-item" effect="dark" content="（订单实付金额-商品成本）/订单实付金额*100%" placement="top">
+                  <el-icon color="#666">
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </div>
+            <!-- <div class="item">
+              <span class="n">{{ tableData.sts.netProfitAmount || 0 }}%</span>
+              <span class="t">净利率</span>
+            </div>
+            <div class="item">
+              <div class="n">
+                <span class="i">￥</span>
+                {{ multiplyAndFormat(tableData.sts.netProfitRate || 0) }}
+              </div>
+              <span class="t">净利润</span>
+            </div> -->
+          </div>
+        </div>
+      </div>
+      <div class="card" style="flex: 1;">
+        <div class="header_title">商家经营数据</div>
+        <div class="content">
+          <div class="card" style="flex: 1;">
+            <div class="num" style="color: var(--el-color-success);">
+              <span class="i">￥</span>
+              {{ multiplyAndFormat(tableData.discount.discountAmount || 0) }}
+            </div>
+            <div class="intro">优惠金额</div>
+            <div class="item_list">
+              <div class="item">
+                <div class="n">
+                  {{ tableData.discount.discountCount || 0 }}
+                </div>
+                <div class="label">
+                  优惠笔数
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.newConsumerDiscount || 0) }}
+                </div>
+                <div class="label">
+                  新客立减
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.freeCashAmount || 0) }}
+                </div>
+                <div class="label">
+                  霸王餐
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.fullMinusAmount || 0) }}
+                </div>
+                <div class="label">
+                  满减活动
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.couponAmount || 0) }}
+                </div>
+                <div class="label">
+                  优惠券
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.memberDiscount || 0) }}
+                </div>
+                <div class="label">
+                  会员折扣
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.pointsDiscountAmount || 0) }}
+                </div>
+                <div class="label">
+                  积分抵扣金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.discount.orderDiscount || 0) }}
+                </div>
+                <div class="label">
+                  订单改价
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="card" style="flex: 1;">
+            <div class="num" style="color: var(--el-color-danger);">
+              <span class="i">￥</span>
+              {{ multiplyAndFormat(tableData.refund.refundAmount || 0) }}
+            </div>
+            <div class="intro">退款金额</div>
+            <div class="item_list">
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.onlineRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  线上退款金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.cashRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  现金退款金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.memberRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  余额退款金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.onlineRechargeRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  线上充值退款金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.cashRechargeRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  现金充值退款金额
+                </div>
+              </div>
+              <div class="item">
+                <div class="n">
+                  <span class="i">￥</span>
+                  {{ multiplyAndFormat(tableData.refund.creditRefundAmount || 0) }}
+                </div>
+                <div class="label">
+                  挂账退款金额
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="card" style="flex: 1;">
+            <div class="num" style="color: var(--el-color-warning);">
+              <span class="i">￥</span>
+              {{ multiplyAndFormat(tableData.order.orderAmount || 0) }}
+            </div>
+            <div class="intro">订单金额</div>
+            <div class="item_list">
+              <div class="item">
+                <div class="n">
+                  {{ tableData.order.orderCount || 0 }}
+                </div>
+                <div class="label">
+                  订单总数
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import dayjs from "dayjs";
+import { ref, onMounted } from "vue";
+import OrderApi from "@/api/order/order";
+import { downloadFile, multiplyAndFormat } from '@/utils'
+
+const queryForm = ref({
+  queryDate: dayjs().format('YYYY-MM-DD'), // 查询日期 yyyy-MM-dd
+  platform: 'czg',
+  shopId: localStorage.getItem('shopId') || '',
+  mainShopId: ''
+});
+
+const platformList = ref([
+  { value: 'czg', label: '银收客' },
+  { value: 'MTuan', label: '美团' },
+  { value: 'CMeMe', label: '菜么么' },
+  { value: 'KRuYun', label: '客如云' },
+])
+
+// 禁用今天以后的日期
+const disabledFutureDate = (time) => {
+  return dayjs(time).isAfter(dayjs().startOf('day'))
+}
+
+// 查询
+function handleQuery() {
+  getData()
+}
+
+// 重置
+function handleReset() {
+  queryForm.value.queryDate = dayjs().format('YYYY-MM-DD')
+  queryForm.value.platform = 'czg'
+  getData()
+}
+
+// 导出
+async function handleExport() {
+  try {
+    if (!queryForm.value.platform) {
+      ElMessage.error('请选择导出平台')
+      return
+    }
+    const res = await OrderApi.financeExport(queryForm.value)
+    downloadFile(res, '财务报表', 'xlsx')
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+const loading = ref(false);
+const tableData = ref({
+  turnover: {},
+  order: {},
+  discount: {},
+  refund: {},
+  sts: {}
+});
+
+// 查询财务报表
+async function getData() {
+  try {
+    loading.value = true
+    const res = await OrderApi.financeSts(queryForm.value)
+    tableData.value = res
+    console.log('tableData.value', tableData.value);
+  } catch (error) {
+    console.log(error);
+  }
+  setTimeout(() => {
+    loading.value = false
+  }, 500);
+}
+
+onMounted(() => {
+  getData()
+})
+</script>
+
+<style scoped lang="scss">
+.gyq_container {
+  padding: 14px;
+
+  .gyq_content {
+    padding: 14px;
+    background-color: #fff;
+    border-radius: 8px;
+  }
+}
+
+.between {
+  flex: 1;
+  display: flex;
+  justify-content: space-between;
+}
+
+.row {
+  display: flex;
+  gap: 14px;
+
+  &.mt14 {
+    margin-top: 14px;
+  }
+}
+
+.warp {
+  display: flex;
+  flex-direction: column;
+  gap: 14px;
+}
+
+.card {
+  border-radius: 12px;
+  background-color: #fff;
+  padding: 20px;
+
+  .header_title {
+    font-size: 16px;
+    color: 333;
+    font-weight: bold;
+  }
+
+  .content {
+    background-color: #F8F8F8;
+    border-radius: 8px;
+    margin-top: 20px;
+    padding: 14px;
+    display: flex;
+    gap: 14px;
+
+    .item_list {
+      margin-top: 14px;
+
+      .title {
+        font-size: 14px;
+        color: #666;
+      }
+
+      .item {
+        height: 50px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 0 14px;
+
+        &:nth-child(odd) {
+          background-color: #F3F7FA;
+        }
+
+        .n {
+          font-size: 16px;
+          color: #333;
+          font-weight: bold;
+          display: flex;
+          align-items: center;
+
+          .i {
+            font-size: 10px;
+            position: relative;
+            top: 1px;
+          }
+        }
+
+        .label {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+  }
+
+  .num {
+    font-size: 24px;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+
+    .i {
+      font-size: 12px;
+      position: relative;
+      top: 3px;
+    }
+  }
+
+  .intro {
+    font-size: 14px;
+    color: #999;
+  }
+
+  .pay_wrap {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-column-gap: 0px;
+    grid-row-gap: 14px;
+    background-color: #F8F8F8;
+    padding: 14px;
+    margin-top: 14px;
+    border-radius: 8px;
+
+    .item {
+      display: flex;
+      flex-direction: column;
+
+      .n {
+        font-size: 20px;
+        font-weight: bold;
+        color: #333;
+        display: flex;
+        align-items: center;
+
+        .i {
+          font-size: 12px;
+          position: relative;
+          top: 3px;
+        }
+      }
+
+      .t {
+        font-size: 14px;
+        color: #666;
+        display: flex;
+        align-items: center;
+        gap: 4px;
+      }
+    }
+  }
+
+  .order_info {
+    border-top: 1px solid #ececec;
+    padding-top: 14px;
+
+    .order_title {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+
+      .dot {
+        --size: 12px;
+        width: var(--size);
+        height: var(--size);
+        border-radius: 50%;
+        background-color: var(--el-color-danger);
+      }
+
+      .t {
+        font-size: 16px;
+        color: #333;
+        font-weight: bold;
+      }
+    }
+
+    .order_lits {
+      display: flex;
+      gap: 14px;
+      margin-top: 4px;
+
+      .line {
+        color: #ececec;
+      }
+
+      .item {
+        display: flex;
+        align-items: center;
+        gap: 14px;
+
+        .t {
+          font-size: 14px;
+          color: #666;
+        }
+
+        .n {
+          font-size: 16px;
+          color: #333;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+}
+
+.waterfall {
+  /* 核心属性1：定义瀑布流列数（关键） */
+  column-count: 3;
+  /* 核心属性2：列之间的间距（替代margin，避免卡片间距错乱） */
+  column-gap: 14px;
+  /* 可选：防止卡片内容被列分割（关键！避免卡片跨列断裂） */
+  break-inside: avoid;
+
+  .waterfall-card {
+    /* 必须：适配多列布局，避免卡片宽度溢出 */
+    width: 100%;
+    /* 卡片间距：仅需设置底部外边距（上下间距），左右间距由column-gap控制 */
+    margin-bottom: 14px;
+    padding: 24px;
+    background-color: #fff;
+    border-radius: 12px;
+    /* 配合break-inside: avoid，强化卡片不可分割 */
+    page-break-inside: avoid;
+
+    .header-title {
+      display: flex;
+      gap: 14px;
+      align-items: center;
+      padding-bottom: 10px;
+
+      .dot {
+        --size: 10px;
+        width: var(--size);
+        height: var(--size);
+        border-radius: 50%;
+      }
+
+      .t {
+        font-size: 24px;
+        color: #000;
+        font-weight: bold;
+      }
+    }
+
+    p {
+      margin-top: 10px;
+      font-size: 14px;
+      color: #666;
+      padding-left: 24px;
+    }
+  }
+}
+
+.tips {
+  margin-top: 6px;
+  font-size: 14px;
+  color: #999;
+  padding-left: 24px;
+}
+</style>

src/views/data/index.vue

@@ -52,6 +52,7 @@
           <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" />
@@ -101,7 +102,14 @@
                       <div class="item">
                         <div class="left">
                           <img class="icon" src="@/assets/images/data/scan.png" />
-                          <span>主扫收款</span>
+                          <span>二维码收款</span>
+                        </div>
+                        <span class="num">{{ trade.mainScanPayAmount || 0 }}</span>
+                      </div>
+                      <div class="item">
+                        <div class="left">
+                          <img class="icon" src="@/assets/images/data/scan.png" />
+                          <span>扫码收款</span>
                         </div>
                         <span class="num">{{ trade.backScanPayAmount || 0 }}</span>
                       </div>
@@ -180,7 +188,7 @@
                   <div class="gropress l" :style="{
                     width: `${trade.rechargeAmount
                       ? (trade.rechargeAmount /
-                        (trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
+                        (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
                       100
                       : 0
                       }%`,
@@ -188,7 +196,7 @@
                   <div class="gropress r" :style="{
                     width: `${trade.rechargeRefundAmount
                       ? (trade.rechargeRefundAmount /
-                        (trade.memberPayAmount + trade.rechargeRefundAmount * 1)) *
+                        (trade.rechargeAmount * 1 + trade.rechargeRefundAmount * 1)) *
                       100
                       : 0
                       }%`,
@@ -495,6 +503,7 @@
 </template>
 
 <script>
+import importData from "@/components/importData/index.vue";
 import dataSummaryApi from "@/api/order/data-summary";
 import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
@@ -504,6 +513,7 @@ import { formatDateRange } from './utils/index.js'
 import { multiplyAndFormat } from '@/utils/index.js'
 export default {
   name: "home",
+  components: { importData },
   data() {
     return {
       multiplyAndFormat,
@@ -704,6 +714,15 @@ export default {
     // this.initCardUserChart();
   },
   methods: {
+    importDataClose() {
+      // this.summaryGet();
+      this.dateAmount();
+      this.dateProduct();
+      // this.summaryDateGet();
+      this.timeChange(this.timeValue);
+      this.profitRateBarChart()
+      this.costLineChart()
+    },
     /**
      * 获取分店列表
      */

src/views/data/sales.vue

@@ -44,6 +44,7 @@
             <span v-if="!downloadLoading">导出Excel</span>
             <span v-else>下载中...</span>
           </el-button>
+          <importData :type="7" @close="getTableData" />
         </el-form-item>
       </el-form>
     </div>
@@ -189,6 +190,7 @@
 
 <script>
 import _ from 'lodash'
+import importData from "@/components/importData/index.vue";
 import saleSummaryApi from "@/api/order/sale-summary";
 import categoryApi from "@/api/product/productclassification";
 import ShopApi from "@/api/account/shop";
@@ -197,6 +199,7 @@ import { downloadFile, multiplyAndFormat } from "@/utils/index";
 import { formatDateRange } from './utils/index.js'
 
 export default {
+  components: { importData },
   data() {
     return {
       multiplyAndFormat,

src/views/data/table.vue

@@ -27,13 +27,14 @@
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
             </el-select>
           </div>
-          <div>
+          <div style="display: flex;">
             <el-button type="primary" @click="getTableData">查询</el-button>
             <el-button @click="resetHandle">重置</el-button>
             <el-button icon="download" v-loading="downloadLoading" @click="downloadHandle">
               <span v-if="!downloadLoading">导出Excel</span>
               <span v-else>下载中...</span>
             </el-button>
+            <importData :type="8" @close="getTableData" />
           </div>
         </div>
       </el-form>
@@ -90,16 +91,17 @@
         </el-table-column>
       </el-table> -->
     </div>
-    <!-- <div class="head-container">
-      <el-pagination  :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+    <div class="head-container">
+      <el-pagination :total="tableData.total" :current-page="tableData.page" :page-size="tableData.size"
         @current-change="paginationChange" @size-change="sizeChange"
         layout="total, sizes, prev, pager, next, jumper"></el-pagination>
-    </div> -->
+    </div>
   </div>
 </template>
 
 <script>
 import _ from "lodash";
+import importData from "@/components/importData/index.vue";
 import tableSummaryApi from "@/api/order/table-summary";
 import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
@@ -107,6 +109,7 @@ import { downloadFile } from "@/utils/index";
 import { formatDateRange } from './utils/index.js'
 
 export default {
+  components: { importData },
   data() {
     return {
       timeValue: "today",
@@ -199,13 +202,14 @@ export default {
     },
     // 重置查询
     resetHandle() {
-      this.timeValue = "";
+      this.timeValue = "today";
       this.query = { ...this.resetQuery };
       this.page = 1;
       this.getTableData();
     },
     // 分页大小改变
     sizeChange(e) {
+      this.tableData.page = 1
       this.tableData.size = e;
       this.getTableData();
     },
@@ -225,8 +229,11 @@ export default {
           // page: this.tableData.page,
           // size: this.tableData.size,
           rangeType: this.timeValue,
+          // rangeType: 'custom',
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
+          // beginDate: '2026-01-26',
+          // endDate: '2026-01-26',
           shopId: this.shopId
         });
         this.tableData.loading = false;

src/views/marketing_center/components/tabHeader.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, nextTick } from 'vue'
+import { ref, onMounted, nextTick, watch } from 'vue'
 
 const props = defineProps({
   // {label: '设置',value: 1}
@@ -29,10 +29,8 @@ const modelValue = defineModel('modelValue', {
   required: true
 })
 
-// 改变索引
-function changeHandle(index) {
-  modelValue.value = index
-
+// 更新active_wrap位置
+function updateActivePosition(index) {
   let left = 0
   itemsWidth.value.forEach((val, i) => {
     if (i < index) {
@@ -40,7 +38,12 @@ function changeHandle(index) {
     }
   })
   leftValue.value = left + gap.value * index
+}
 
+// 改变索引
+function changeHandle(index) {
+  modelValue.value = index
+  updateActivePosition(index)
   emits('change', index)
 }
 
@@ -57,10 +60,14 @@ onMounted(() => {
     console.log('itemRefs===', itemRefs.value);
     console.log('itemsWidth===', itemsWidth.value);
 
-
-    changeHandle(modelValue.value)
+    updateActivePosition(modelValue.value)
   })
 })
+
+// 监听modelValue变化，更新位置
+watch(modelValue, (newVal) => {
+  updateActivePosition(newVal)
+})
 </script>
 
 <style scoped lang="scss">

src/views/marketing_center/distribution_page/components/setting.vue

@@ -18,7 +18,7 @@
         <el-form-item label="获得佣金条件" prop="inviteCount">
           <div class="column">
             <el-input v-model="form.inviteCount" placeholder="请输入" :maxlength="8" style="width: 300px;"
-              @input="e => form.inviteCount = filterNumberInput(e, 1)">
+              @input="e => form.inviteCount = filterNumberInput(e, 0)">
               <template #append>人</template>
             </el-input>
             <div class="tips">邀请达到指定人数才可赚取佣金</div>
@@ -202,7 +202,7 @@ const formRef = ref(null)
 const formLoading = ref(false)
 const levelConfigListObj = ref({
   name: '', // 名称
-  inviteCount: '', // 有效人数
+  inviteCount: 0, // 有效人数
   costAmount: '', // 消费金额
   commission: '', // 一级分销比例
   levelTwoCommission: '', // 二级分销比例
@@ -210,7 +210,7 @@ const levelConfigListObj = ref({
 const form = ref({
   id: '',
   openType: 'pay', // pay购买开通 auto自动开通 manual手动开通
-  inviteCount: '', // 邀请条件人数
+  inviteCount: 0, // 邀请条件人数
   inviteConsume: 0, // 被邀请人消费有效 0 1
   payAmount: '', // 购买开通金额
   rewardCount: '', // 每人奖励次数

src/views/product/index.vue

@@ -15,6 +15,9 @@
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
           </el-tag>
         </template> -->
+      <template #custom>
+        <importData :type="3" @close="newHandleQueryClick" />
+      </template>
       <template #type="scope">
         {{ typeFilter(scope.row[scope.prop]) }}
       </template>
@@ -170,6 +173,7 @@
 </template>
 
 <script setup lang="ts">
+import importData from "@/components/importData/index.vue";
 import UserAPI from "@/api/product/index";
 import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
@@ -184,6 +188,8 @@ import searchConfig from "./indexconfig/search";
 import MyDialog from "@/components/mycomponents/myDialog.vue";
 import Statistics from "./indexconfig/statistics.vue";
 
+const importDataRef = ref(null);
+
 const {
   searchRef,
   contentRef,
@@ -302,6 +308,11 @@ function getTongji(params: IObject | undefined) {
   });
 }
 
+// 显示批量导入
+function handleUploadClick() {
+  importDataRef.value.show()
+}
+
 // 导出商品
 async function handleExportClick() {
   try {
@@ -386,6 +397,9 @@ async function handleToolbarClick(name: string) {
     let res = await UserAPI.sync();
     ElMessage.success("操作成功，数据正在后台同步中...");
   }
+  if (name === "upload") {
+    importDataRef.value.show()
+  }
 }
 async function confirm() {
   let res = await UserAPI.stockWarning(form.warnLine);

src/views/product/indexconfig/content.ts

@@ -85,7 +85,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       type: "",
       name: "export",
       auth: "import",
-    },
+    }
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },

src/views/shop/list/components/addShop.vue

@@ -110,11 +110,21 @@
               />
             </div>
           </el-form-item>
-          <el-form-item label="试用/正式">
+          <el-form-item label="商户版本">
             <el-radio-group v-model="state.form.profiles">
               <el-radio-button value="probation">试用</el-radio-button>
               <el-radio-button value="release">正式</el-radio-button>
             </el-radio-group>
+            <div class="tips">
+              <el-alert
+                title="请谨慎修改"
+                type="warning"
+                size="7"
+                effect="dark"
+                show-icon
+                :closable="false"
+              />
+            </div>
           </el-form-item>
           <el-form-item label="激活码">
             <el-input v-model="state.form.activateCode" placeholder="请输入激活码"></el-input>

src/views/shop/list/index.vue

@@ -3,19 +3,50 @@
     <div class="head-container">
       <el-row :gutter="20">
         <el-col :span="3">
-          <el-input v-model="state.query.name" clearable placeholder="请输入店铺名称" style="width: 100%" class="filter-item"
-            @keyup.enter="getTableData" />
+          <el-input
+            v-model="state.query.name"
+            clearable
+            placeholder="请输入店铺名称"
+            style="width: 100%"
+            class="filter-item"
+            @keyup.enter="getTableData"
+          />
         </el-col>
         <el-col :span="3">
-          <el-input v-model="state.query.account" clearable placeholder="请输入商户号" style="width: 100%" class="filter-item"
-            @keyup.enter="getTableData" />
+          <el-input
+            v-model="state.query.phone"
+            clearable
+            placeholder="请输入手机号"
+            style="width: 100%"
+            class="filter-item"
+            @keyup.enter="getTableData"
+          />
         </el-col>
         <el-col :span="3">
           <el-select v-model="state.query.status" placeholder="请选择店铺状态" style="width: 100%">
-            <el-option v-for="item in state.status" :key="item.type" :label="item.label" :value="item.type" />
+            <el-option
+              v-for="item in state.status"
+              :key="item.type"
+              :label="item.label"
+              :value="item.type"
+            />
           </el-select>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="3">
+          <el-select
+            v-model="state.query.profiles"
+            placeholder="请选择商户版本"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in state.profiles"
+              :key="item.type"
+              :label="item.label"
+              :value="item.type"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3">
           <el-button type="primary" @click="getTableData">查询</el-button>
           <el-button @click="resetHandle">重置</el-button>
         </el-col>
@@ -29,8 +60,10 @@
         <el-table-column label="店铺信息" width="200">
           <template v-slot="scope">
             <div class="shop_info">
-              <el-image :src="scope.row.logo"
-                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef">
+              <el-image
+                :src="scope.row.logo"
+                style="width: 50px; height: 50px; border-radius: 4px; background-color: #efefef"
+              >
                 <template #error>
                   <div class="img_error">
                     <i class="icon el-icon-document-delete" />
@@ -57,7 +90,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="登录账号" prop="phone"></el-table-column>
+        <el-table-column label="手机号" prop="phone"></el-table-column>
         <el-table-column prop="registerType" label="经营模式">
           <template v-slot="scope">
             <span v-if="scope.row.registerType == 'before'">快餐版</span>
@@ -70,7 +103,8 @@
               <span v-if="scope.row.shopType == 'only'">单店</span>
               <span v-if="scope.row.shopType == 'chain'">连锁店</span>
               <span v-if="scope.row.shopType == 'join'">加盟店</span>
-              <div v-if="scope.row.shopType != 'only' && scope.row.isHeadShop == 0">(主店：{{ scope.row.headShopName }})
+              <div v-if="scope.row.shopType != 'only' && scope.row.isHeadShop == 0">
+                (主店：{{ scope.row.headShopName }})
               </div>
             </div>
           </template>
@@ -113,7 +147,9 @@
 
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item v-if="scope.row.isHeadShop == 1" :command="0">添加分店</el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.isHeadShop == 1" :command="0">
+                    添加分店
+                  </el-dropdown-item>
                   <el-dropdown-item :command="{ row: scope.row, command: 1 }">
                     支付配置
                   </el-dropdown-item>
@@ -129,9 +165,14 @@
       </el-table>
     </div>
     <div class="head-container">
-      <el-pagination v-model:current-page="state.tableData.page" v-model:page-size="state.tableData.size"
-        :total="state.tableData.total" :page-sizes="[10, 20, 30, 50, 100]"
-        layout="total, sizes , prev, pager ,next, jumper " @current-change="paginationChange" />
+      <el-pagination
+        v-model:current-page="state.tableData.page"
+        v-model:page-size="state.tableData.size"
+        :total="state.tableData.total"
+        :page-sizes="[10, 20, 30, 50, 100]"
+        layout="total, sizes , prev, pager ,next, jumper "
+        @current-change="paginationChange"
+      />
     </div>
     <addShop ref="refAddShop" @success="getTableData" />
     <!-- <detailModal ref="refDetailModal" /> -->
@@ -149,7 +190,7 @@ import addShop from "./components/addShop.vue";
 import detailModal from "./components/detailModal.vue";
 import { useRouter } from "vue-router";
 
-const router = useRouter()
+const router = useRouter();
 
 const refActivateCode = ref(null);
 function activateCodeShow(row) {
@@ -162,8 +203,9 @@ function addShopShow(row) {
 const state = reactive({
   query: {
     name: "",
-    account: "",
+    phone: "",
     status: "",
+    profiles: "",
   },
   status: [
     {
@@ -175,6 +217,16 @@ const state = reactive({
       label: "关闭",
     },
   ],
+  profiles: [
+    {
+      type: "probation",
+      label: "试用版",
+    },
+    {
+      type: "release",
+      label: "正式版",
+    },
+  ],
   tableData: {
     list: [],
     page: 1,
@@ -192,24 +244,24 @@ function dropdownClick(e, row) {
   console.log(e);
   console.log(row);
   if (e == 0) {
-    refAddShop.value.show({ mainId: row.id, shopType: row.shopType, isHeadShop: 0 }, 'addBranch');
+    refAddShop.value.show({ mainId: row.id, shopType: row.shopType, isHeadShop: 0 }, "addBranch");
 
     return;
   }
   if (e.command == 1) {
-    console.log('row===', row);
+    console.log("row===", row);
 
     // refDetailModal.value.show(e.row);
     router.push({
-      name: 'pay_setting',
+      name: "pay_setting",
       query: {
         shopId: row.id,
         shopType: row.shopType,
         isHeadShop: row.isHeadShop,
         mainId: row.mainId,
-        shopName: row.shopName
-      }
-    })
+        shopName: row.shopName,
+      },
+    });
     return;
   }
   if (e == 5) {
@@ -226,15 +278,16 @@ function dropdownClick(e, row) {
         });
         getTableData();
       })
-      .catch(() => { });
+      .catch(() => {});
     return;
   }
 }
 // 重置查询
 function resetHandle() {
   state.query.name = "";
-  state.query.account = "";
+  state.query.phone = "";
   state.query.status = "";
+  state.query.profiles = "";
   getTableData();
 }
 // 分页回调
@@ -250,8 +303,9 @@ async function getTableData() {
       page: state.tableData.page,
       size: state.tableData.size,
       shopName: state.query.name,
-      account: state.query.account,
+      phone: state.query.phone,
       status: state.query.status,
+      profiles: state.query.profiles,
     });
     state.tableData.loading = false;
     state.tableData.list = res.records;

src/views/tool/Instead/components/carts/list.vue

@@ -4,38 +4,22 @@
       <template v-if="carts.list && carts.list.length >= 1">
         <!-- 当前购物车 -->
         <div v-for="(item, index) in carts.list" :key="index">
-          <carts-item
-            :item="item"
-            :useVipPrice="carts.useVipPrice"
-            @changeNumber="changeNumber"
-            :selCart="carts.selCart"
-            @itemClick="itemClick(item)"
-            @editNote="editNote"
-          ></carts-item>
+          <carts-item :item="item" :useVipPrice="carts.useVipPrice" @changeNumber="changeNumber"
+            :selCart="carts.selCart" @itemClick="itemClick(item)" @editNote="editNote"></carts-item>
         </div>
       </template>
 
       <!-- 赠菜 -->
       <div class="cart-title" v-if="carts.giftList.length > 0"><span>以下是优惠菜品</span></div>
       <div v-for="(item, index) in carts.giftList" :key="index">
-        <carts-item
-          :item="item"
-          @changeNumber="changeNumber"
-          :useVipPrice="carts.useVipPrice"
-          :selCart="carts.selCart"
-          @itemClick="itemClick(item)"
-          @editNote="editNote"
-        ></carts-item>
+        <carts-item :item="item" @changeNumber="changeNumber" :useVipPrice="carts.useVipPrice" :selCart="carts.selCart"
+          @itemClick="itemClick(item)" @editNote="editNote"></carts-item>
       </div>
       <el-empty :image-size="60" v-if="carts.isEmpty" description="点餐列表为空" />
       <!-- 打包费 -->
       <template v-if="carts.packNum > 0">
         <div class="cart-title"><span>打包费</span></div>
-        <extra-fee
-          name="打包费"
-          :number="carts.packNum"
-          :price="carts.orderCostSummary.packFee"
-        ></extra-fee>
+        <extra-fee name="打包费" :number="carts.packNum" :price="carts.orderCostSummary.packFee"></extra-fee>
       </template>
       <!-- 餐位费 -->
       <template v-if="perpole >= 1 && carts.dinnerType == 'dine-in'">
@@ -43,7 +27,7 @@
         <extra-fee name="餐位费" :number="perpole" :price="canWeiFee"></extra-fee>
       </template>
       <!-- 历史订单 -->
-      <div class="u-flex u-row-between u-m-b-10" v-if="carts.oldOrder.id">
+      <div class="u-flex u-row-between u-m-b-10" v-if="carts.oldOrder.id && !isEmptyObject(carts.oldOrder.detailMap)">
         <span class="u-font-14">历史订单</span>
         <el-button link size="small" type="danger" @click="clearOldOrder()">清空</el-button>
       </div>
@@ -56,17 +40,9 @@
         </div>
 
         <div v-for="(detaiItem, index) in item" :key="index">
-          <carts-item
-            :useVipPrice="carts.useVipPrice"
-            :canChangeNumber="false"
-            isOld
-            :dinerType="dinerType"
-            :item="detaiItem"
-            @changeNumber="changeNumber"
-            :selCart="carts.selCart"
-            @itemClick="itemClick(detaiItem)"
-            @editNote="editNote"
-          ></carts-item>
+          <carts-item :useVipPrice="carts.useVipPrice" :canChangeNumber="false" isOld :dinerType="dinerType"
+            :item="detaiItem" @changeNumber="changeNumber" :selCart="carts.selCart" @itemClick="itemClick(detaiItem)"
+            @editNote="editNote"></carts-item>
         </div>
       </template>
 
@@ -74,14 +50,9 @@
     </div>
     <div class="bottom">
       <div class="u-flex u-row-right">
-        <el-tooltip
-          placement="top"
-          effect="light"
-          popper-class="youhui-tips"
-          :popper-options="{
-            'background-color': '#fff',
-          }"
-        >
+        <el-tooltip placement="top" effect="light" popper-class="youhui-tips" :popper-options="{
+          'background-color': '#fff',
+        }">
           <template #content>
             <div class="u-flex color-000 u-font-14 u-row-between">
               <span class="font-bold">会员优惠</span>
@@ -111,28 +82,13 @@
         </div>
       </div>
       <div class="btn-group" v-if="isXianFuKuan">
-        <el-button
-          type="primary"
-          size="large"
-          :disabled="!disabledMorePay"
-          @click="createOrder('wx-aiplay')"
-        >
+        <el-button type="primary" size="large" :disabled="!disabledMorePay" @click="createOrder('wx-aiplay')">
           微信/支付宝
         </el-button>
-        <el-button
-          type="primary"
-          size="large"
-          :disabled="!disabledMorePay"
-          @click="createOrder('cash')"
-        >
+        <el-button type="primary" size="large" :disabled="!disabledMorePay" @click="createOrder('cash')">
           现金
         </el-button>
-        <el-button
-          type="primary"
-          size="large"
-          :disabled="!disabledMorePay"
-          @click="createOrder('more-pay')"
-        >
+        <el-button type="primary" size="large" :disabled="!disabledMorePay" @click="createOrder('more-pay')">
           更多支付
         </el-button>
       </div>
@@ -145,33 +101,20 @@
           <el-button type="primary" size="large" :disabled="disabledMorePay" @click="createOrder('to-pay')">
             去结账
           </el-button> -->
-          <el-button
-            type="primary"
-            size="large"
-            :disabled="carts.list.length == 0 || carts.oldOrder.detailMap.length == 0"
-            @click="createOrder('only-create')"
-          >
+          <el-button type="primary" size="large" :disabled="carts.list.length == 0" @click="createOrder('only-create')">
             仅下单
           </el-button>
-          <el-button
-            type="primary"
-            size="large"
+          <el-button type="primary" size="large"
             :disabled="carts.list.length == 0 && isEmptyObject(carts.oldOrder.detailMap)"
-            @click="createOrder('to-pay')"
-          >
+            @click="createOrder('to-pay')">
             去结账
           </el-button>
         </template>
         <template v-else>
-          <el-button type="default" size="large" @click="hideOrder()">加菜/返回</el-button>
-          <el-button
-            type="primary"
-            size="large"
-            :disabled="!carts.isLinkFinshed"
-            @click="createOrder('to-pay')"
-          >
+          <el-button type="warning" size="large" @click="hideOrder()">加菜/返回</el-button>
+          <!-- <el-button type="primary" size="large" :disabled="!carts.isLinkFinshed" @click="createOrder('to-pay')">
             立即支付
-          </el-button>
+          </el-button> -->
         </template>
       </div>
     </div>
@@ -188,11 +131,11 @@ import { useUserStore } from "@/store/modules/user";
 function isEmptyObject(obj) {
   // 步骤1：排除null和非对象类型
   if (obj === null || typeof obj !== "object") {
-    return false;
+    return true;
   }
   // 步骤2：排除数组（数组也是对象，需单独判断）
   if (Array.isArray(obj)) {
-    return false;
+    return true;
   }
   // 步骤3：判断自身可枚举属性是否为空
   return Object.keys(obj).length === 0;

src/views/tool/Instead/components/choose-user.vue

@@ -4,7 +4,7 @@
       <div class="head-container">
         <el-form :model="query" inline>
           <el-form-item label="">
-            <el-input v-model="query.name" placeholder="请输入昵称或手机号"></el-input>
+            <el-input v-model="query.key" placeholder="请输入昵称或手机号"></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -22,7 +22,10 @@
           <el-table-column label="用户" prop="headImg" width="200px">
             <template v-slot="scope">
               <div class="user_info">
-                <el-image :src="scope.row.headImg" style="width: 40px; height: 40px; flex-shrink: 0">
+                <el-image
+                  :src="scope.row.headImg"
+                  style="width: 40px; height: 40px; flex-shrink: 0"
+                >
                   <template #error>
                     <div class="image-slot">
                       <i class="el-icon-user"></i>
@@ -30,7 +33,14 @@
                   </template>
                 </el-image>
                 <span class="name">{{ scope.row.nickName }}</span>
-                <el-tag disable-transitions type="primary" style="margin-left: 10px;" v-if="scope.row.new">新</el-tag>
+                <el-tag
+                  disable-transitions
+                  type="primary"
+                  style="margin-left: 10px"
+                  v-if="scope.row.new"
+                >
+                  新
+                </el-tag>
               </div>
             </template>
           </el-table-column>
@@ -38,7 +48,9 @@
 
           <el-table-column label="会员" prop="isVip" width="140">
             <template v-slot="scope">
-              <el-tag type="warning" v-if="scope.row.isVip">会员等级{{ scope.row.memberLevelName }}</el-tag>
+              <el-tag type="warning" v-if="scope.row.isVip">
+                会员等级{{ scope.row.memberLevelName }}
+              </el-tag>
               <span v-else>否</span>
             </template>
           </el-table-column>
@@ -60,9 +72,14 @@
         </el-table>
       </div>
       <div class="head-container">
-        <el-pagination :total="tableData.total" :current-page="tableData.page" :page-size="tableData.size"
-          @size-change="sizeChange" @current-change="paginationChange"
-          layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <el-pagination
+          :total="tableData.total"
+          :current-page="tableData.page"
+          :page-size="tableData.size"
+          @size-change="sizeChange"
+          @current-change="paginationChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
       </div>
     </div>
   </el-dialog>
@@ -71,13 +88,13 @@
 <script setup>
 import shopUserApi from "@/api/account/shopUser";
 import dayjs from "dayjs";
-import { multiplyAndFormat } from '@/utils'
+import { multiplyAndFormat } from "@/utils";
 let cacheData = {};
 
 const state = reactive({
   show: false,
   query: {
-    name: "",
+    key: "",
     // isVip: 1,
   },
   tableData: {
@@ -242,4 +259,4 @@ defineExpose({
 .gap-20 {
   gap: 20px;
 }
-</style>
+</style>

src/views/tool/Instead/components/order.vue

@@ -591,7 +591,7 @@ function pointsToMoney(val) {
   carts.orderCostSummary.pointDeductionAmount = finalMoney;
 }
 
-const emits = defineEmits(["chooseUser", "paysuccess"]);
+const emits = defineEmits(["chooseUser", "paysuccess", 'createOrder']);
 function chooseUser() {
   emits("chooseUser");
 }
@@ -672,6 +672,7 @@ function returnPayParams() {
       newCustomerDiscountAmount:
         carts.newUserDiscount !== null ? carts.newUserDiscount.amount : 0, // 新客立减金额
       vipDiscountAmount: carts.orderCostSummary.vipDiscountAmount, // 超级会员折扣
+      remark: cashRemark.value, // 现金支付备注
     },
   };
 }
@@ -700,29 +701,39 @@ async function getPaytype() {
     payTypes.sel = payTypes.list.findIndex((v) => v.payType == "cash");
   }
 }
-function nowPayClick(payType) {
-  payType = payType || payTypes.list[payTypes.sel].payType;
-  if (payType === "cash") {
-    ElMessageBox.confirm("是否确认已现金收款：" + currentpayMoney.value + "元", "快捷支付", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
-    })
-      .then(() => {
-        payOrder("cash");
-      })
-      .catch(() => { });
-    return;
-  }
-  if (payType == "member-account") {
-    if (!carts.vipUser.id) {
-      return ElMessage.error("请先选择会员");
-    }
-    payOrder(payType);
-    return;
+
+const cashRemark = ref("");
+async function nowPayClick(payType) {
+  if (carts.list.length) {
+    await emits('createOrder', 'only-create')
   }
 
-  refScanPayOpen(payType);
+  setTimeout(() => {
+    payType = payType || payTypes.list[payTypes.sel].payType;
+    if (payType === "cash") {
+      ElMessageBox.prompt("是否确认已现金收款：" + currentpayMoney.value + "元", "快捷支付", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        inputPlaceholder: '请输入现金支付备注（选填）',
+      })
+        .then(({ value }) => {
+          cashRemark.value = value || "";
+          payOrder("cash");
+        })
+        .catch(() => { });
+      return;
+    }
+    if (payType == "member-account") {
+      if (!carts.vipUser.id) {
+        return ElMessage.error("请先选择会员");
+      }
+      payOrder(payType);
+      return;
+    }
+
+    refScanPayOpen(payType);
+  }, 500);
 }
 
 let authCode = "";

src/views/tool/Instead/components/popup-rottable.vue

@@ -3,12 +3,7 @@
     <el-form :rules="rules" ref="refForm" :model="form">
       <el-form-item label="转桌到" prop="targetTableCode">
         <el-select v-model="form.targetTableCode" placeholder="请选择转桌到" style="width: 200px">
-          <el-option
-            v-for="item in tableList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.tableCode"
-          ></el-option>
+          <el-option v-for="item in tableList" :key="item.id" :label="item.name" :value="item.tableCode"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="转入类型">
@@ -59,6 +54,7 @@ const basicForm = {
   targetOrderId: "",
   targetTableCode: "",
   detailIds: [],
+  allMerge: 0 // 是否全部转台
 };
 const form = reactive({
   ...basicForm,
@@ -120,6 +116,17 @@ function confirm() {
           type: "error",
         });
       }
+
+      if (rottableType.value == 1) {
+        form.allMerge = 1;
+      } else {
+        console.log('oldCartGoods.value===', oldCartGoods.value);
+        const orderCount = Object.values(oldCartGoods.value).reduce((sum, arr) => {
+          return sum + arr.length
+        }, 0)
+        form.allMerge = orderCount == detailIds.length ? 1 : 0
+      }
+
       emits(
         "confirm",
         {

src/views/tool/Instead/components/scan-pay.vue

@@ -84,10 +84,10 @@ export default {
         "https://zhyx.eingdong.com/qrcode/api.php?url=https%3A%2F%2Fzhyx.eingdong.com%2Fcopyright%2F%23%2Fpay%3Fid%3D139451580",
       pays: [
         {
-          text: "主扫",
+          text: "扫码收款",
         },
         {
-          text: "被扫",
+          text: "二维码收款",
         },
       ],
       number: "0",

src/views/tool/Instead/index.vue

@@ -17,7 +17,9 @@
                 <div>
                   <div class="u-flex">
                     <div class="ft-13 color-000 no-wrap">{{ carts.vipUser.nickName }}</div>
-                    <div class="vip" v-if="carts.vipUser.isVip">{{ carts.vipUser.memberLevelName }}</div>
+                    <div class="vip" v-if="carts.vipUser.isVip">
+                      {{ carts.vipUser.memberLevelName }}
+                    </div>
                   </div>
                   <div style="margin-top: 2px" class="no-wrap color-666 ft-12">
                     余额：{{ carts.vipUser.amount }}
@@ -41,7 +43,9 @@
                 </div>
               </div>
               <template #reference>
-                <el-button>{{ carts.tableInfo.name ? "桌台号：" + carts.tableInfo.name : "选择桌号" }}</el-button>
+                <el-button>
+                  {{ carts.tableInfo.name ? "桌台号：" + carts.tableInfo.name : "选择桌号" }}
+                </el-button>
               </template>
             </el-popover>
             <el-button type="warning" @click="refQuanHexiaoOpen">扫码验券</el-button>
@@ -126,7 +130,7 @@
           </template>
           <!-- 订单信息展示 -->
           <Order ref="refOrder" :orderInfo="carts.oldOrder" @chooseUser="showChooseUser" @paysuccess="refresh"
-            :table="carts.tableInfo" :perpole="perpole" v-else :user="user"></Order>
+            :table="carts.tableInfo" :perpole="perpole" v-else :user="user" @create-order="createOrder"></Order>
         </div>
       </div>
     </div>
@@ -214,7 +218,9 @@ function rottableShow() {
 }
 async function rottableConfirm(form, cart_id) {
   carts.rotTable(form.targetTableCode, cart_id);
-  const res = await orderApi.mergeOrder(form);
+  if (form.detailIds.length) {
+    await orderApi.mergeOrder(form);
+  }
   ElNotification({
     title: "成功",
     message: "合并成功",
@@ -246,7 +252,8 @@ async function refReturnCartConfirm(e) {
   if (res) {
     // 获取历史订单数据
     const res1 = await orderApi.getHistoryList({
-      orderId: carts.oldOrder.id,
+      // orderId: carts.oldOrder.id,
+      tableCode: carts.table_code,
     });
     if (res1) {
       carts.setOldOrder(res1);
@@ -354,7 +361,7 @@ async function createOrder(key) {
       placeNum: carts.oldOrder.placeNum * 1 + 1,
       waitCall: false,
       vipPrice: user.value.id && user.value.isVip,
-      limitRate: carts.limitDiscountRes
+      limitRate: carts.limitDiscountRes,
     });
     clearTimeout(loadingTimer);
     loading.close();
@@ -370,7 +377,8 @@ async function createOrder(key) {
       if (res.id) {
         // 获取历史订单数据
         const res1 = await orderApi.getHistoryList({
-          orderId: res.id,
+          // orderId: carts.oldOrder.id,
+          tableCode: carts.table_code,
         });
         if (res1) {
           carts.setOldOrder(res1);
@@ -403,7 +411,8 @@ async function clearOldOrderCallback() {
   try {
     // 获取历史订单数据
     const res = await orderApi.getHistoryList({
-      orderId: carts.oldOrder.id,
+      // orderId: carts.oldOrder.id,
+      tableCode: carts.table_code,
     });
     const noPayStatus = {
       cancelled: "订单已取消",
@@ -415,16 +424,34 @@ async function clearOldOrderCallback() {
       showOrder.value = false;
       return;
     }
-    if (res) {
+    console.log("清空历史订单回调", res);
+
+    if (res.data !== null) {
+      console.log("还有历史订单数据");
       carts.setOldOrder(res);
+    } else {
+      console.log("历史订单没数据了");
+      carts.oldOrder = {
+        detailMap: [],
+        originAmount: 0,
+      };
+      carts.setOldOrder({
+        detailMap: [],
+        originAmount: 0,
+      });
+      // carts.clearHistory();
+      // resetOldOrder();
     }
+    carts.clearOldOrderCallback = false;
   } catch (error) {
     console.log(error);
+    carts.clearOldOrderCallback = false;
   }
 }
 // 取消历史订单
 async function clearOldOrder(params) {
   try {
+    carts.isClearingOldOrder = true;
     const res1 = params.placeNum
       ? await orderApi.rmPlaceOrder(params)
       : await orderApi.cancelOrder(params);
@@ -510,7 +537,7 @@ async function tableClick(item) {
     carts.setOldOrder(res);
   }
   table.value = item;
-  carts.changeTableInfo(item)
+  carts.changeTableInfo(item);
   carts.changeTable(item.tableCode);
   refTable.value.hide();
 }
@@ -730,12 +757,20 @@ function clearCarts() {
   });
 }
 function addCarts(item, isWeight = false) {
-  console.log('index.addCarts===', item);
+  console.log("index.addCarts===", item);
   if (isWeight) {
-    carts.add({ pack_number: diners.sel ? 1 : 0, ...item, is_time_discount: item.isLimitDiscount ? 1 : 0 });
+    carts.add({
+      pack_number: diners.sel ? 1 : 0,
+      ...item,
+      is_time_discount: item.isLimitDiscount ? 1 : 0,
+    });
     return;
   }
-  carts.add({ pack_number: diners.sel ? item.number : 0, ...item, is_time_discount: item.isLimitDiscount ? 1 : 0 });
+  carts.add({
+    pack_number: diners.sel ? item.number : 0,
+    ...item,
+    is_time_discount: item.isLimitDiscount ? 1 : 0,
+  });
 }
 
 watch(
@@ -748,7 +783,7 @@ function init() {
   getTableList();
   getCategoryList();
   changeCartsDinerType();
-  carts.init({ table_code: carts.tableInfo.tableCode }, carts.oldOrder);
+  carts.init({ table_code: carts.tableInfo.tableCode });
 }
 
 onBeforeRouteLeave(() => {
@@ -760,13 +795,24 @@ onMounted(async () => {
   const { id, tableCode, key } = route.query;
   if (id || tableCode) {
     // 获取历史订单数据
-    const res = id
-      ? await orderApi.getHistoryList({
+    // const res = id
+    //   ? await orderApi.getHistoryList({
+    //     orderId: id,
+    //   })
+    //   : await orderApi.getHistoryList({
+    //     tableCode,
+    //   });
+    let res = ''
+    if (id) {
+      res = await orderApi.getHistoryList({
         orderId: id,
       })
-      : await orderApi.getHistoryList({
-        tableCode,
+    } else {
+      res = await orderApi.getHistoryList({
+        tableCode: carts.table_code,
       });
+    }
+
     const noPayStatus = {
       cancelled: "订单已取消",
       done: "订单已关闭",
@@ -783,7 +829,7 @@ onMounted(async () => {
     }
     if (res.tableCode) {
       table.value = { tableCode: res.tableCode };
-      carts.changeTableInfo(res)
+      carts.changeTableInfo(res);
     }
     if (res.userId) {
       const userRes = await shopUserApi.get({ userId: res.userId });
@@ -795,10 +841,12 @@ onMounted(async () => {
       const tableRes = await tableApi.get({ tableCode: res.tableCode });
       if (tableRes.tableCode) {
         table.value = tableRes || {};
-        carts.changeTableInfo(tableRes)
+        carts.changeTableInfo(tableRes);
       }
     }
     if (res) {
+      console.log("res31231231331-=====--", res);
+
       carts.setOldOrder(res);
       showOrder.value = key == "isPayOrder" ? true : false;
       perpole.value = res.seatNum || 0;
@@ -808,7 +856,7 @@ onMounted(async () => {
     const tableRes = await tableApi.get({ tableCode: tableCode });
     if (tableRes.tableCode) {
       table.value = tableRes || {};
-      carts.changeTableInfo(tableRes)
+      carts.changeTableInfo(tableRes);
     }
   }
   console.log(table.value);
@@ -857,7 +905,7 @@ function refresh() {
   showOrder.value = false;
   user.value = {};
   table.value = {};
-  carts.changeTableInfo({})
+  carts.changeTableInfo({});
   router.replace(route.path);
   carts.dataReset();
   carts.init();
@@ -1116,4 +1164,4 @@ $pl: 30px;
   margin-left: 10px;
   font-size: 10px;
 }
-</style>
+</style>

src/views/tool/table/index.vue

@@ -252,6 +252,7 @@
 </template>
 
 <script setup>
+import importData from "@/components/importData/index.vue";
 import status from "./status.js";
 import { useUserStore } from "@/store/modules/user";
 const shopUser = useUserStore();

src/views/user/list/index.vue

@@ -29,8 +29,11 @@
 		</div>
 		<!-- 列表 -->
 		<page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-			@edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
+			@edit-click="handleEditClick" @export-click="handleExportClick" @upload-click="" @search-click="handleSearchClick"
 			@toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
+			<template #custom>
+				<importData ref="importDataRef" :type="6" @close="searchQueryClick" />
+			</template>
 			<template #status="scope">
 				<el-link :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
 					{{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -146,6 +149,7 @@
 </template>
 
 <script setup>
+import importData from "@/components/importData/index.vue";
 import UserCouponDialog from "./components/user-coupon-dialog.vue";
 import GiveCoupon from "./components/give-coupon.vue";
 import usePage from "@/components/CURD/usePage";
@@ -159,6 +163,7 @@ import shopUserApi from "@/api/account/shopUser";
 import { useRoute } from 'vue-router'
 import { ElNotification } from 'element-plus'
 import { downloadFile } from "@/utils/index";
+
 const editMoneyModalRef = ref(null);
 const userCouponDialogRef = ref(null);
 const GiveCouponRef = ref(null);
@@ -250,6 +255,8 @@ function handleToolbarClick(name) {
 	console.log(name);
 	if (name === "custom1") {
 		ElMessage.success("点击了自定义1按钮");
+	} else if (name === "upload") {
+		importDataRef.value.show()
 	}
 }
 

vite.config.ts

@@ -15,6 +15,9 @@ import { name, version, engines, dependencies, devDependencies } from "./package
 
 import stripCode from 'vite-plugin-strip-code'; // 导入插件
 
+
+import vueDevTools from 'vite-plugin-vue-devtools'
+
 // 平台的名称、版本、运行所需的 node 版本、依赖、构建时间的类型提示
 const __APP_INFO__ = {
   pkg: { name, version, engines, dependencies, devDependencies },
@@ -54,6 +57,13 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
           target: env.VITE_APP_API_URL,
           rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
         },
+        // 代理 /dev-api 的请求
+        '/import_api': {
+          changeOrigin: true,
+          // 代理目标地址：https://api.youlai.tech
+          target: env.VITE_APP_API_PHP_IMPORT_URL,
+          rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_API_PHP_IMPORT_URL), ""),
+        },
       },
     },
     plugins: [
@@ -107,7 +117,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         // 注意：标记可以自定义，只要前后一致即可
         start_comment: 'DEV-START', // 开始标记（自定义）
         end_comment: 'DEV-END'     // 结束标记（自定义）
-      })
+      }),
+      // vueDevTools()
     ],
     // 预加载项目必需的组件
     optimizeDeps: {