From 15dbd79c7d4ea9d34b6b705763f7a9ae54f9dae6 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 23 Dec 2025 13:49:39 +0800
Subject: [PATCH 01/16] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/points.ts                      | 12 +++++++++---
 src/views/inventory/supplier/config/content.ts |  6 ++++--
 src/views/tool/Instead/components/order.vue    | 12 ++++++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/api/account/points.ts b/src/api/account/points.ts
index f7c5cac..29a5ae1 100644
--- a/src/api/account/points.ts
+++ b/src/api/account/points.ts
@@ -1,12 +1,18 @@
 import request from "@/utils/request";
-import { Account_BaseUrl } from "@/api/config";
+import { Account_BaseUrl, Market_BaseUrl } from "@/api/config";
 const baseURL = Account_BaseUrl + "/admin/points";
 const Api = {
   // 002-获取订单可用积分及抵扣金额（支付页面使用）
-
+  // calcOrderUsablePoints(params: any) {
+  //   return request<any>({
+  //     url: `${baseURL}/memberPoints/calcUsablePoints`,
+  //     method: "get",
+  //     params
+  //   });
+  // },
   calcOrderUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/memberPoints/calcUsablePoints`,
+      url: `${Market_BaseUrl}/admin/points/userPoints`,
       method: "get",
       params
     });
diff --git a/src/views/inventory/supplier/config/content.ts b/src/views/inventory/supplier/config/content.ts
index f2c3d1d..a866a44 100644
--- a/src/views/inventory/supplier/config/content.ts
+++ b/src/views/inventory/supplier/config/content.ts
@@ -14,7 +14,9 @@ const contentConfig: IContentConfig = {
     pageSizes: [10, 20, 30, 50],
   },
   indexAction: function (params) {
-    return Api.getList({});
+    return Api.getList({
+      ...params,
+    });
   },
   deleteAction: function (id) {
     return Api.delete(id);
@@ -79,7 +81,7 @@ const contentConfig: IContentConfig = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: [{ text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
+      operat: [{ text: "编辑", icon: 'edit', name: "edit" }, { text: "删除", icon: 'delete', type: 'danger', name: "delete" }],
     },
   ],
 };
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index c786a31..5b03107 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -421,10 +421,14 @@ async function pointsInit() {
   if (!carts.vipUser.id) {
     return;
   }
-  const res = await PointsApi.calcOrderUsablePoints({
+  const { pointsConfig, pointsUser } = await PointsApi.calcOrderUsablePoints({
     shopUserId: carts.vipUser.id,
-    orderAmount: scoreMaxMoney.value,
+    // orderAmount: scoreMaxMoney.value,
   });
+
+  const res = pointsConfig
+  carts.vipUser.accountPoints = pointsUser.id ? pointsUser.pointBalance : 0;
+
   pointsRes.value = res;
   carts.pointDeductionRule.pointsPerYuan = res.equivalentPoints;
   if (score.sel == -1) {
@@ -693,6 +697,10 @@ watch(
 onMounted(() => {
   carts.payParamsInit();
   getPaytype();
+
+  if (carts.vipUser.id) {
+    pointsInit();
+  }
 });
 defineExpose({
   nowPayClick,

From 1d7ba844f6df899572bf7e80e015b971e6541b76 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 23 Dec 2025 14:48:13 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=9A=84=E7=BC=96=E8=BE=91/=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group_booking/components/groupOrder.vue              | 3 ++-
 src/views/marketing_center/group_booking/index.vue       | 2 +-
 .../package_popularize/components/groupPage.vue          | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/marketing_center/group_booking/components/groupOrder.vue b/src/views/marketing_center/group_booking/components/groupOrder.vue
index 6ef7723..2f6c300 100644
--- a/src/views/marketing_center/group_booking/components/groupOrder.vue
+++ b/src/views/marketing_center/group_booking/components/groupOrder.vue
@@ -336,7 +336,8 @@ async function confirmRefundHandle(form) {
   } catch (error) {
     console.log(error);
   }
-  tableData.loading = false
+  getTableData()
+  wareCountAjax()
 }
 
 // 审核退款操作
diff --git a/src/views/marketing_center/group_booking/index.vue b/src/views/marketing_center/group_booking/index.vue
index b27fca3..d0ad3cf 100644
--- a/src/views/marketing_center/group_booking/index.vue
+++ b/src/views/marketing_center/group_booking/index.vue
@@ -42,7 +42,7 @@ const form = ref({
 watch(() => form.value.isEnable, (newValue, OldValue) => {
   if (loading.value == false) {
     if (newValue == 0) {
-      ElMessageBox.confirm('关闭商品拼团所有未支付的订单都将自动取消，是否确定关闭？', '注意', {
+      ElMessageBox.confirm('关闭商品拼团所有未成团的订单都将自动取消，是否确定关闭？', '注意', {
         confirmButtonText: '确认关闭',
         type: 'danger'
       }).then(() => {
diff --git a/src/views/marketing_center/package_popularize/components/groupPage.vue b/src/views/marketing_center/package_popularize/components/groupPage.vue
index 598b950..bac7640 100644
--- a/src/views/marketing_center/package_popularize/components/groupPage.vue
+++ b/src/views/marketing_center/package_popularize/components/groupPage.vue
@@ -56,8 +56,13 @@
         <el-table-column label="操作" width="150">
           <template v-slot="scope">
             <template v-if="scope.row.shopId === shopInfo.id">
-              <el-button link type="primary" @click="addGroupGoodsRef.show(scope.row)">编辑</el-button>
-              <el-button type="danger" link @click="delHandle(scope.row)">删除</el-button>
+              <template v-if="scope.row.onlineStatus">
+                <el-button link type="primary" disabled>（下架后编辑/删除）</el-button>
+              </template>
+              <template v-else>
+                <el-button link type="primary" @click="addGroupGoodsRef.show(scope.row)">编辑</el-button>
+                <el-button link type="danger" @click="delHandle(scope.row)">删除</el-button>
+              </template>
             </template>
             <template v-else>
               <el-button link type="primary" disabled>无权操作</el-button>

From bf35a1b35b1637e0bedb24892decaa2dc57ca3bf Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 24 Dec 2025 16:13:43 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=95=86=E5=93=81=E9=9D=99=E6=80=81=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selecProductDialog.vue         |   1 +
 src/views/product/indexconfig/addgoods.vue    | 143 +++++++++++++++++-
 src/views/tool/Instead/components/order.vue   | 136 +++++++++++++++--
 3 files changed, 265 insertions(+), 15 deletions(-)

diff --git a/src/views/marketing_center/group_booking/components/selecProductDialog.vue b/src/views/marketing_center/group_booking/components/selecProductDialog.vue
index d82c6cd..ac34172 100644
--- a/src/views/marketing_center/group_booking/components/selecProductDialog.vue
+++ b/src/views/marketing_center/group_booking/components/selecProductDialog.vue
@@ -34,6 +34,7 @@ function returnPrice(skuList) {
 const emits = defineEmits(['success'])
 function selectItem(item) {
   emits('success', {
+    id: item.id,
     coverImg: item.coverImg,
     name: item.name,
     price: returnPrice(item.skuList)
diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index d89ed47..fc95190 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -222,7 +222,6 @@
       <el-form-item label="库存数量">
         <el-input-number v-model="ruleForm.stockNumber" :min="0" />
       </el-form-item>
-
       <el-form-item label="打包费" prop="delivery">
         <div style="display: block;">
           <el-input-number v-model="ruleForm.packFee" controls-position="right"
@@ -230,6 +229,41 @@
           <div style="color: #999;">单份商品打包费。注：店铺开启外卖模式下该数据才生效</div>
         </div>
       </el-form-item>
+      <el-form-item label="关联推荐商品">
+        <div class="column">
+          <div class="row">
+            <div class="center">
+              <el-button type="primary" @click="selecProductDialogRef?.show()"
+                :disabled="goodsList.length >= goodsListMax">添加商品</el-button>
+              <div class="tips">设置商品后，用户可以在商品详情页中看到推荐商品可拖动调整顺序，最多设置{{ goodsListMax }}个商品</div>
+            </div>
+          </div>
+          <div class="row">
+            <div id="goods_table_drag">
+              <el-table :data="goodsList" border stripe style="width: 500px;" row-key="id">
+                <!-- 拖拽列 -->
+                <el-table-column label="排序" width="60">
+                  <template v-slot="scope">
+                    <div class="drag-handle">☰</div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="商品图片" prop="coverImg" width="90">
+                  <template v-slot="scope">
+                    <el-image :src="scope.row.coverImg" style="width: 50px;height: 50px;border-radius: 4px;"
+                      fit="cover"></el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column label="商品名称" prop="name"></el-table-column>
+                <el-table-column label="操作" width="100">
+                  <template v-slot="scope">
+                    <el-button link type="danger" @click="goodsList.splice(scope.$index, 1)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </div>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm(ruleFormRef)">确定</el-button>
         <el-button @click="resetForm(ruleFormRef)">取消</el-button>
@@ -256,11 +290,13 @@
         </span>
       </template>
     </el-dialog>
+    <!-- 选择商品弹窗 -->
+    <selecProductDialog ref="selecProductDialogRef" @success="selecProductSuccess" />
   </div>
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from "vue";
+import { reactive, ref, onMounted, nextTick } from "vue";
 import type { FormInstance, FormRules } from "element-plus";
 // 规格属性
 import SpecificationAttribute from "./SpecificationAttribute.vue";
@@ -272,7 +308,65 @@ import UserAPI4 from "@/api/product/specificationsconfig";
 import shopList from "@/components/mycomponents/shopList.vue";
 import AddImg from "@/components/mycomponents/addImg.vue";
 import { useRouter } from "vue-router";
+import Sortable from "sortablejs";
 import { useTagsViewStore } from "@/store";
+import selecProductDialog from "@/views/marketing_center/group_booking/components/selecProductDialog.vue";
+
+const selecProductDialogRef = ref(null)
+const goodsListMax = ref(9)
+const goodsList = ref<any[]>([]);
+
+onMounted(() => {
+  // Sortable 需要在 el-table 渲染 tbody 后初始化，尝试多次以确保 DOM 可用
+  const initSortable = async () => {
+    await nextTick();
+    let attempts = 0;
+    const maxAttempts = 8;
+    const tryInit = () => {
+      const el = document.querySelector("#goods_table_drag .el-table__body-wrapper tbody");
+      if (!el) {
+        attempts++;
+        if (attempts < maxAttempts) {
+          setTimeout(tryInit, 80);
+        }
+        return;
+      }
+
+      // 已找到表体，初始化 Sortable
+      new Sortable(el as HTMLElement, {
+        animation: 150,
+        handle: ".drag-handle",
+        ghostClass: "sortable-ghost",
+        chosenClass: "sortable-chosen",
+        onEnd: (e) => {
+          if (e.oldIndex == null || e.newIndex == null) return;
+          if (e.oldIndex === e.newIndex) return;
+          const from = e.oldIndex;
+          const to = e.newIndex;
+          const item = goodsList.value.splice(from, 1)[0];
+          goodsList.value.splice(to, 0, item);
+          // 触发响应式更新
+          goodsList.value = goodsList.value.slice();
+          console.log("排序后的数据", goodsList.value);
+        },
+      });
+    };
+    tryInit();
+  };
+
+  initSortable();
+});
+
+// 已选择的商品
+function selecProductSuccess(res: any) {
+  let obj = goodsList.value.find((item) => item.id == res.id);
+  if (obj && obj.id) {
+    ElMessage.error("该商品已选择");
+    return;
+  }
+  goodsList.value.push({ ...res });
+}
+
 const tagsViewStore = useTagsViewStore();
 const router = useRouter();
 let list = ref<any[]>([
@@ -915,6 +1009,27 @@ const resetForm = (formEl: FormInstance | undefined) => {
   margin-bottom: 20px;
 }
 
+.drag-handle {
+  cursor: move;
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 4px;
+  background: #f0f0f0;
+}
+
+/* SortableJS classes */
+.sortable-ghost {
+  opacity: 0.6;
+}
+
+.sortable-chosen {
+  background: #f5f7ff !important;
+}
+
+.el-table__body-wrapper tbody tr {
+  transition: transform 150ms ease, background-color 150ms ease;
+}
+
 .showStyle:hover>.buttonstyle {
   display: block;
 }
@@ -942,4 +1057,26 @@ const resetForm = (formEl: FormInstance | undefined) => {
   top: -10px;
   z-index: 10;
 }
-</style>
+
+.column {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+
+  .row {
+    flex: 1;
+    margin-bottom: 10px;
+  }
+}
+
+.center {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+
+  .tips {
+    color: #999;
+    font-size: 14px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 5b03107..8aca734 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -13,7 +13,7 @@
             </p>
             <p class="u-font-14 color-666 u-m-t-10">
               <span class="money">余额：{{ carts.vipUser.amount }}</span>
-              <span class="score u-m-l-10">积分：{{ carts.vipUser.accountPoints }}</span>
+              <span class="score u-m-l-10">积分：{{ carts.vipUser.pointBalance }}</span>
             </p>
           </div>
         </div>
@@ -46,7 +46,8 @@
               </el-radio-group>
               <el-input-number class="u-m-l-10" v-if="score.sel != -1" v-model="usePointsNumber" step-strictly
                 :step="pointsRes.equivalentPoints" placeholder="请输入积分抵扣数量" :min="pointsRes.minDeductionPoints"
-                :max="pointsRes.maxUsablePoints" @change="pointsToMoney"></el-input-number>
+                :max="pointsRes.maxUsablePoints" :disabled="!pointsRes.usable"
+                @change="pointsToMoney"></el-input-number>
             </div>
             <p class="u-font-14 color-666 u-m-t-10" v-if="pointsRes.unusableReason && !pointsRes.usable">
               <span class="color-red">*</span>
@@ -398,8 +399,16 @@ watch(
 );
 
 //002-获取订单可用积分及抵扣金额（支付页面使用）
-const pointsRes = ref({ usable: true, maxUsablePoints: 0, minDeductionPoints: 0 });
-const usePointsNumber = ref(0);
+const pointsRes = ref({
+  usable: false,
+  equivalentPoints: 0, // 积分换算比例 eg: 20 积分 = 1 元
+  maxDeductionRatio: 0, // 下单最高抵扣比例（小数）
+  minPaymentAmount: 0, // 下单实付抵扣门槛（元）
+  maxUsablePoints: 0,
+  minDeductionPoints: 0,
+  unusableReason: "",
+});
+const usePointsNumber = ref(0); // 输入的积分数量（用户填写）
 //积分可抵扣最大金额
 const scoreMaxMoney = computed(() => {
   return (
@@ -423,24 +432,127 @@ async function pointsInit() {
   }
   const { pointsConfig, pointsUser } = await PointsApi.calcOrderUsablePoints({
     shopUserId: carts.vipUser.id,
-    // orderAmount: scoreMaxMoney.value,
   });
 
-  const res = pointsConfig
-  carts.vipUser.accountPoints = pointsUser.id ? pointsUser.pointBalance : 0;
+  // 不修改 accountPoints（为余额），将积分保存到 pointBalance 字段
+  carts.vipUser.pointBalance = pointsUser && pointsUser.id ? pointsUser.pointBalance : 0;
+
+  // 保险取值
+  const eq = pointsConfig?.equivalentPoints || 0;
+  const maxRatio = pointsConfig?.maxDeductionRatio || 0;
+  const minPay = pointsConfig?.minPaymentAmount || 0;
+
+  // 计算当前订单可抵扣金额上限（元）
+  let finalPay = Number(carts.orderCostSummary.finalPayAmount) || 0;
+
+  const res = {
+    usable: true,
+    equivalentPoints: eq,
+    maxDeductionRatio: maxRatio,
+    minPaymentAmount: minPay,
+    maxUsablePoints: 0,
+    minDeductionPoints: pointsConfig?.minDeductionPoints || eq,
+    unusableReason: "",
+  };
+
+  // 如果订单实付低于最小使用门槛，则不可用
+  if (finalPay <= 0 || (minPay > 0 && finalPay < minPay)) {
+    res.usable = false;
+    res.unusableReason = `订单实付金额低于 ${minPay} 元，无法使用积分抵扣`;
+  } else if (eq <= 0) {
+    res.usable = false;
+    res.unusableReason = `积分换算比例配置错误，无法使用积分抵扣`;
+  } else {
+    // 计算基于比例限制的最大抵扣金额（元）
+    let maxByRatio = finalPay * maxRatio;
+    // 保证抵扣后剩余金额 >= minPaymentAmount
+    if (minPay > 0) {
+      const allowed = finalPay - minPay;
+      if (allowed <= 0) {
+        res.usable = false;
+        res.unusableReason = `抵扣后实付金额必须大于等于 ${minPay} 元，当前不可使用积分`;
+      } else {
+        maxByRatio = Math.min(maxByRatio, allowed);
+      }
+    }
+
+    if (res.usable) {
+      // 可用积分上限（向下取整为 eq 的倍数）
+      const maxByMoney = Math.floor(maxByRatio * eq);
+      const userPoints = carts.vipUser.pointBalance || 0;
+      res.maxUsablePoints = Math.min(userPoints, maxByMoney);
+      // 最小抵扣积分为配置值或等于换算比
+      res.minDeductionPoints = pointsConfig?.minDeductionPoints || eq;
+      if (res.maxUsablePoints < res.minDeductionPoints) {
+        res.usable = false;
+        res.unusableReason = `可用积分不足，至少需要 ${res.minDeductionPoints} 积分才可抵扣`;
+      }
+    }
+  }
 
   pointsRes.value = res;
   carts.pointDeductionRule.pointsPerYuan = res.equivalentPoints;
+
   if (score.sel == -1) {
+    // 未选择使用积分
+    return res;
+  }
+
+  // 如果可用则默认填充可用最大值，否则清零
+  usePointsNumber.value = res.usable ? res.maxUsablePoints : 0;
+  if (!res.usable) score.sel = -1;
+
+  return res;
+}
+
+// 将输入的积分数转换为抵扣金额并写回 carts.orderCostSummary
+function pointsToMoney(val) {
+  const cfg = pointsRes.value;
+  if (!cfg.usable || cfg.equivalentPoints <= 0) {
+    usePointsNumber.value = 0;
+    carts.orderCostSummary.pointUsed = 0;
+    carts.orderCostSummary.pointDeductionAmount = 0;
     return;
   }
 
-  usePointsNumber.value = res.usable ? res.maxUsablePoints : 0;
-  if (res.usable) {
-  } else {
-    score.sel = -1;
+  // 确保为整数积分
+  let pts = parseInt(usePointsNumber.value || 0, 10);
+  if (isNaN(pts) || pts <= 0) {
+    pts = 0;
   }
-  return res;
+
+  // 限制最大值
+  if (cfg.maxUsablePoints && pts > cfg.maxUsablePoints) {
+    pts = cfg.maxUsablePoints;
+  }
+
+  // 计算抵扣金额（元），向下保留两位
+  const money = new BigNumber(pts).div(cfg.equivalentPoints).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+
+  // 再次校验不超过允许的最大抵扣金额（基于比例或门槛）
+  let finalPay = Number(carts.orderCostSummary.finalPayAmount) || 0;
+  let maxByRatio = finalPay * cfg.maxDeductionRatio;
+  if (cfg.minPaymentAmount > 0) {
+    const allowed = finalPay - cfg.minPaymentAmount;
+    if (allowed <= 0) {
+      usePointsNumber.value = 0;
+      carts.orderCostSummary.pointUsed = 0;
+      carts.orderCostSummary.pointDeductionAmount = 0;
+      return;
+    }
+    maxByRatio = Math.min(maxByRatio, allowed);
+  }
+  const maxAllowedMoney = new BigNumber(maxByRatio).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+  if (money > maxAllowedMoney) {
+    // 调整积分到允许的最大金额对应的积分
+    const allowedPts = Math.floor(maxAllowedMoney * cfg.equivalentPoints);
+    pts = Math.min(allowedPts, cfg.maxUsablePoints);
+  }
+
+  usePointsNumber.value = pts;
+  const finalMoney = new BigNumber(pts).div(cfg.equivalentPoints).decimalPlaces(2, BigNumber.ROUND_DOWN).toNumber();
+  carts.orderCostSummary.pointUsed = pts;
+  carts.orderCostSummary.pointDeductionAmount = finalMoney;
 }
 
 const emits = defineEmits(["chooseUser", "paysuccess"]);

From 936832f7ba3fbcc8bdd2aee6d63502a1c09893ae Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 15:38:30 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/indexconfig/addgoods.vue | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index fc95190..05d6b2b 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -234,13 +234,13 @@
           <div class="row">
             <div class="center">
               <el-button type="primary" @click="selecProductDialogRef?.show()"
-                :disabled="goodsList.length >= goodsListMax">添加商品</el-button>
+                :disabled="ruleForm.relatedRecommendJson.length >= goodsListMax">添加商品</el-button>
               <div class="tips">设置商品后，用户可以在商品详情页中看到推荐商品可拖动调整顺序，最多设置{{ goodsListMax }}个商品</div>
             </div>
           </div>
           <div class="row">
             <div id="goods_table_drag">
-              <el-table :data="goodsList" border stripe style="width: 500px;" row-key="id">
+              <el-table :data="ruleForm.relatedRecommendJson" border stripe style="width: 500px;" row-key="id">
                 <!-- 拖拽列 -->
                 <el-table-column label="排序" width="60">
                   <template v-slot="scope">
@@ -256,7 +256,8 @@
                 <el-table-column label="商品名称" prop="name"></el-table-column>
                 <el-table-column label="操作" width="100">
                   <template v-slot="scope">
-                    <el-button link type="danger" @click="goodsList.splice(scope.$index, 1)">删除</el-button>
+                    <el-button link type="danger"
+                      @click="ruleForm.relatedRecommendJson.splice(scope.$index, 1)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -314,7 +315,6 @@ import selecProductDialog from "@/views/marketing_center/group_booking/component
 
 const selecProductDialogRef = ref(null)
 const goodsListMax = ref(9)
-const goodsList = ref<any[]>([]);
 
 onMounted(() => {
   // Sortable 需要在 el-table 渲染 tbody 后初始化，尝试多次以确保 DOM 可用
@@ -343,11 +343,11 @@ onMounted(() => {
           if (e.oldIndex === e.newIndex) return;
           const from = e.oldIndex;
           const to = e.newIndex;
-          const item = goodsList.value.splice(from, 1)[0];
-          goodsList.value.splice(to, 0, item);
+          const item = ruleForm.relatedRecommendJson.splice(from, 1)[0];
+          ruleForm.relatedRecommendJson.splice(to, 0, item);
           // 触发响应式更新
-          goodsList.value = goodsList.value.slice();
-          console.log("排序后的数据", goodsList.value);
+          ruleForm.relatedRecommendJson = ruleForm.relatedRecommendJson.slice();
+          console.log("排序后的数据", ruleForm.relatedRecommendJson);
         },
       });
     };
@@ -359,12 +359,17 @@ onMounted(() => {
 
 // 已选择的商品
 function selecProductSuccess(res: any) {
-  let obj = goodsList.value.find((item) => item.id == res.id);
+  if (res.id == ruleForm.id) {
+    ElMessage.error("不能选择当前商品");
+    return;
+  }
+
+  let obj = ruleForm.relatedRecommendJson.find((item) => item.id == res.id);
   if (obj && obj.id) {
     ElMessage.error("该商品已选择");
     return;
   }
-  goodsList.value.push({ ...res });
+  ruleForm.relatedRecommendJson.push({ ...res });
 }
 
 const tagsViewStore = useTagsViewStore();
@@ -432,6 +437,7 @@ interface datasForm {
   addGroupIndex: any;
 }
 interface RuleForm {
+  id: number | string;
   name: string;
   shortTitle: string;
   unitId: string;
@@ -456,9 +462,11 @@ interface RuleForm {
   sort: Number;
   proGroupVo: any[];
   selectSpecInfo: any;
+  relatedRecommendJson: any[];
 }
 const ruleFormRef = ref<FormInstance>();
 const ruleForm = reactive<RuleForm>({
+  id: '',
   //商品名称
   name: "",
   //商品介绍
@@ -512,6 +520,7 @@ const ruleForm = reactive<RuleForm>({
   // 排序值
   sort: 1,
   selectSpecInfo: {},
+  relatedRecommendJson: [] // 关联推荐商品
 });
 const rules = reactive<FormRules<RuleForm>>({
   name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],

From 7527a55066074c939603a9f7843864c418fa4053 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 16:09:05 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E4=BB=B7=E6=A0=BC=E8=87=AA=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B9=B6=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumables/components/add-haocai.vue     | 43 ++++++++-
 src/views/product/index.vue                   | 88 +++++--------------
 2 files changed, 62 insertions(+), 69 deletions(-)

diff --git a/src/views/inventory/consumables/components/add-haocai.vue b/src/views/inventory/consumables/components/add-haocai.vue
index b94d078..fc216b2 100644
--- a/src/views/inventory/consumables/components/add-haocai.vue
+++ b/src/views/inventory/consumables/components/add-haocai.vue
@@ -12,7 +12,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="耗材价格" prop="price">
-        <el-input-number v-model="form.price" placeholder="请输入耗材价格"></el-input-number>
+        <div class="center">
+          <el-input-number v-model="form.price" placeholder="请输入"></el-input-number>
+          <div class="ipt">
+            第二单位价格：
+            <el-input-number v-model="twoPrice" placeholder="请输入"></el-input-number>
+          </div>
+        </div>
       </el-form-item>
       <!-- <el-form-item label="库存">
         <el-input-number v-model="form.stockNumber" placeholder="请输入库存值"></el-input-number>
@@ -23,7 +29,7 @@
       <el-form-item label="单位" prop="conUnit">
         <el-input v-model="form.conUnit" placeholder="请输入单位"></el-input>
       </el-form-item>
-      <el-alert class="u-m-t-10 u-m-b-10" title="提示" description="换算值为第二单位*第二单位转换数量=第一单位" type="warning" show-icon
+      <el-alert class="u-m-t-10 u-m-b-10" title="提示" description="换算值为第一单位*第二单位转换数量=第二单位" type="warning" show-icon
         :closable="false"></el-alert>
       <el-form-item label="预警值">
         <el-input-number v-model="form.conWarning" placeholder="请输入耗材预警值"></el-input-number>
@@ -50,9 +56,11 @@
 
 
 <script setup>
+import { ref, reactive, computed } from "vue";
 import consApi from "@/api/product/cons";
 import consGroupApi from "@/api/product/cons-group";
 import { ElMessage } from "element-plus";
+
 const consGroups = ref([]);
 const rules = {
   conName: [{ required: true, message: "请输入耗材名称", trigger: "blur" }],
@@ -94,6 +102,21 @@ const form = reactive({
   ...basicForm,
 });
 
+// 第二单位价格为计算字段：第一单位价格 * 第二单位转换数量
+const twoPrice = computed({
+  get() {
+    const p = Number(form.price || 0);
+    const c = Number(form.conUnitTwoConvert || 0);
+    return c ? Number((p * c).toFixed(2)) : 0;
+  },
+  set(val) {
+    const c = Number(form.conUnitTwoConvert || 0);
+    if (!c) return;
+    // 修改第二单位价格时，反算第一单位价格并保留两位小数
+    form.price = Number((Number(val) / c).toFixed(2));
+  },
+});
+
 const show = ref(false);
 let dialogtitle = ref("");
 function open(item) {
@@ -171,4 +194,18 @@ defineExpose({
   open,
   close,
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped lang="scss">
+.center {
+  display: flex;
+  align-items: center;
+
+  .ipt {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    margin-left: 28px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 2d2b7b3..4876d02 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -2,26 +2,14 @@
   <div class="app-container">
     <!-- 列表 -->
     <!-- 搜索 -->
-    <page-search
-      ref="searchRef"
-      :search-config="searchConfig"
-      @query-click="newHandleQueryClick"
-      @reset-click="handleResetClick2"
-    />
+    <page-search ref="searchRef" :search-config="searchConfig" @query-click="newHandleQueryClick"
+      @reset-click="handleResetClick2" />
     <!-- 顶部数据 -->
     <Statistics :data="gongjiData"></Statistics>
     <!-- 列表 -->
-    <page-content
-      ref="contentRef"
-      :content-config="contentConfig"
-      @add-click="handleAddClick"
-      @edit-click="handleEditClick"
-      @export-click="handleExportClick"
-      @search-click="handleSearchClick"
-      @toolbar-click="handleToolbarClick"
-      @operat-click="handleOperatClick"
-      @filter-change="handleFilterChange"
-    >
+    <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
+      @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
       <!-- <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
@@ -34,20 +22,11 @@
         <DictLabel v-model="scope.row[scope.prop]" code="gender" />
       </template>
       <template #shangjia="scope">
-        <el-switch
-          v-model="scope.row[scope.prop]"
-          :active-value="1"
-          :inactive-value="0"
-          @click="handleSwitchChange(scope.row)"
-        ></el-switch>
+        <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchChange(scope.row)"></el-switch>
       </template>
       <template #isStock="scope">
-        <el-switch
-          disabled
-          v-model="scope.row[scope.prop]"
-          :active-value="1"
-          :inactive-value="0"
-        ></el-switch>
+        <el-switch disabled v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"></el-switch>
       </template>
 
       <template #kucunedit="scope">
@@ -60,29 +39,16 @@
       </template>
 
       <template #tuikuantuihui="scope">
-        <el-switch
-          v-if="!scope.row.productId"
-          v-model="scope.row[scope.prop]"
-          :active-value="1"
-          :inactive-value="0"
-          @click="handleSwitchhaocai(scope.row)"
-        ></el-switch>
+        <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchhaocai(scope.row)"></el-switch>
       </template>
       <template #sellOut="scope">
-        <el-switch
-          v-model="scope.row[scope.prop]"
-          :active-value="1"
-          :inactive-value="0"
-          @click="handleSwitchChangeTwo(scope.row)"
-        ></el-switch>
+        <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchChangeTwo(scope.row)"></el-switch>
       </template>
       <template #mobile="scope">
         <el-text>{{ scope.row[scope.prop] }}</el-text>
-        <copy-button
-          v-if="scope.row[scope.prop]"
-          :text="scope.row[scope.prop]"
-          style="margin-left: 2px"
-        />
+        <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
       </template>
       <template #consumables="scope">
         <template v-if="scope.row.type != null">
@@ -105,11 +71,7 @@
     </page-modal>
 
     <!-- 编辑 -->
-    <page-modal
-      ref="editModalRef"
-      :modal-config="editModalConfig"
-      @submit-click="handleSubmitClick"
-    >
+    <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
       <template #gender="scope">
         <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
       </template>
@@ -156,7 +118,7 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="耗材名称" prop="consInfoId">
           <template v-slot="scope">
-            <el-select
+            <!-- <el-select
               v-model="scope.row.consInfoId"
               reserve-keyword
               placeholder="请输入关键词"
@@ -168,20 +130,21 @@
                 :label="item.conName"
                 :value="item.id"
               ></el-option>
-            </el-select>
+            </el-select> -->
             <!-- <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div> -->
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="conUnit">
           <template v-slot="scope">
-            <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
+            <el-input v-model="scope.row.conUnit" readonly disabled></el-input>
+            <!-- <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
               <el-option
                 v-for="item in returnConUnits(scope.row.consInfoId)"
                 :key="item"
                 :label="item"
                 :value="item"
               ></el-option>
-            </el-select>
+            </el-select> -->
           </template>
         </el-table-column>
         <el-table-column label="使用数量" prop="surplusStock" min-width="150px">
@@ -192,20 +155,13 @@
         <el-table-column label="操作" width="100">
           <template v-slot="scope">
             <div class="table_btn_wrap">
-              <div
-                class="btn sub"
-                v-if="haocaiData.consList.length > 1"
-                @click="haocaiData.consList.splice(scope.$index, 1)"
-              >
+              <div class="btn sub" v-if="haocaiData.consList.length > 1"
+                @click="haocaiData.consList.splice(scope.$index, 1)">
                 <el-icon>
                   <RemoveFilled />
                 </el-icon>
               </div>
-              <div
-                class="btn add"
-                v-if="scope.$index == haocaiData.consList.length - 1"
-                @click="createItem(scope.row)"
-              >
+              <div class="btn add" v-if="scope.$index == haocaiData.consList.length - 1" @click="createItem(scope.row)">
                 <el-icon>
                   <CirclePlusFilled />
                 </el-icon>

From 469a5a99ca803a1b16bd2ccbaa8dde9faf2f4039 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 16:15:38 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E8=AE=A9=E8=80=97=E6=9D=90=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=94=AF=E6=8C=81=E5=B0=8F=E6=95=B0=E5=9B=9B=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consumables/components/add-haocai.vue     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/inventory/consumables/components/add-haocai.vue b/src/views/inventory/consumables/components/add-haocai.vue
index fc216b2..05c469e 100644
--- a/src/views/inventory/consumables/components/add-haocai.vue
+++ b/src/views/inventory/consumables/components/add-haocai.vue
@@ -13,10 +13,10 @@
       </el-form-item>
       <el-form-item label="耗材价格" prop="price">
         <div class="center">
-          <el-input-number v-model="form.price" placeholder="请输入"></el-input-number>
+          <el-input-number v-model="form.price" placeholder="请输入" @change="onPriceChange"></el-input-number>
           <div class="ipt">
             第二单位价格：
-            <el-input-number v-model="twoPrice" placeholder="请输入"></el-input-number>
+            <el-input-number v-model="twoPrice" placeholder="请输入" @change="onTwoPriceChange"></el-input-number>
           </div>
         </div>
       </el-form-item>
@@ -107,16 +107,29 @@ const twoPrice = computed({
   get() {
     const p = Number(form.price || 0);
     const c = Number(form.conUnitTwoConvert || 0);
-    return c ? Number((p * c).toFixed(2)) : 0;
+    const val = c ? p * c : 0;
+    return parseFloat(val.toFixed(4));
   },
   set(val) {
     const c = Number(form.conUnitTwoConvert || 0);
-    if (!c) return;
-    // 修改第二单位价格时，反算第一单位价格并保留两位小数
-    form.price = Number((Number(val) / c).toFixed(2));
+    if (!c || !isFinite(Number(val))) return;
+    // 修改第二单位价格时，反算第一单位价格并保留四位小数
+    form.price = parseFloat((Number(val) / c).toFixed(4));
   },
 });
 
+function onPriceChange(val) {
+  if (!isFinite(Number(val))) return;
+  form.price = parseFloat(Number(val).toFixed(4));
+}
+
+function onTwoPriceChange(val) {
+  if (!isFinite(Number(val))) return;
+  const c = Number(form.conUnitTwoConvert || 0);
+  if (!c) return;
+  form.price = parseFloat((Number(val) / c).toFixed(4));
+}
+
 const show = ref(false);
 let dialogtitle = ref("");
 function open(item) {

From 9b73715c5ae8d7b8e7a86215c433660384896755 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 16:52:42 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E7=AD=BE=E5=AD=97=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/config/components/shopInfo.vue | 166 ++++--------------
 1 file changed, 38 insertions(+), 128 deletions(-)

diff --git a/src/views/shop/config/components/shopInfo.vue b/src/views/shop/config/components/shopInfo.vue
index 3268e20..5f0a243 100644
--- a/src/views/shop/config/components/shopInfo.vue
+++ b/src/views/shop/config/components/shopInfo.vue
@@ -3,25 +3,14 @@
     <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="160px" label-position="left">
         <el-form-item label="门店名称" prop="shopName">
-          <el-input
-            v-model.trim="form.shopName"
-            placeholder="请输入门店名称"
-            style="width: 500px"
-          ></el-input>
+          <el-input v-model.trim="form.shopName" placeholder="请输入门店名称" style="width: 500px"></el-input>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
-          <el-input
-            v-model.trim="form.chainName"
-            placeholder="请输入连锁店扩展店名"
-            style="width: 500px"
-          ></el-input>
+          <el-input v-model.trim="form.chainName" placeholder="请输入连锁店扩展店名" style="width: 500px"></el-input>
         </el-form-item>
         <el-form-item label="门店logo">
           <div class="img_box">
-            <single-image-upload
-              style="width: 80px; height: 80px"
-              v-model="form.logo"
-            ></single-image-upload>
+            <single-image-upload style="width: 80px; height: 80px" v-model="form.logo"></single-image-upload>
           </div>
         </el-form-item>
         <!-- <el-form-item label="门店照片">
@@ -38,22 +27,14 @@
         <el-form-item label="门店收款码">
           <div class="img_box">
             <canvas ref="canvas" id="QRCode_header" style="width: 80px; height: 80px"></canvas>
-            <el-button
-              size="small"
-              plain
-              v-if="form.paymentQrcode"
-              @click="downloadCanvas(form.paymentQrcode)"
-            >
+            <el-button size="small" plain v-if="form.paymentQrcode" @click="downloadCanvas(form.paymentQrcode)">
               下载
             </el-button>
           </div>
         </el-form-item>
         <el-form-item label="微信二维码">
           <div class="img_box">
-            <single-image-upload
-              style="width: 80px; height: 80px"
-              v-model="form.shopQrcode"
-            ></single-image-upload>
+            <single-image-upload style="width: 80px; height: 80px" v-model="form.shopQrcode"></single-image-upload>
           </div>
         </el-form-item>
         <!-- <el-form-item label="店铺小程序码">
@@ -84,11 +65,7 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item label="联系电话" prop="phone">
-          <el-input
-            v-model.trim="form.phone"
-            placeholder="请输入联系电话"
-            style="width: 500px"
-          ></el-input>
+          <el-input v-model.trim="form.phone" placeholder="请输入联系电话" style="width: 500px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="外卖起送金额">
                     <el-input-number v-model="form.takeaway_money" placeholder="0.00" controls-position="right"
@@ -114,62 +91,30 @@
           <div style="color: #999">注：准确的定位便于用户导航到店铺</div>
         </el-form-item>
         <el-form-item label="门店详细地址">
-          <el-input
-            type="textarea"
-            v-model.trim="form.address"
-            placeholder="请输入门店详细地址"
-            style="width: 500px"
-          ></el-input>
+          <el-input type="textarea" v-model.trim="form.address" placeholder="请输入门店详细地址" style="width: 500px"></el-input>
         </el-form-item>
         <el-form-item label="营业时间">
           <div class="u-flex gap-2" style="width: 50%">
             <el-select v-model="form.businessStartDay" placeholder="周几开始">
-              <el-option
-                :value="item.label"
-                :label="item.label"
-                v-for="item in weeks"
-                :key="item.value"
-              ></el-option>
+              <el-option :value="item.label" :label="item.label" v-for="item in weeks" :key="item.value"></el-option>
             </el-select>
             <el-select v-model="form.businessEndDay" placeholder="周几结束">
-              <el-option
-                :value="item.label"
-                :label="item.label"
-                v-for="item in weeks"
-                :key="item.value"
-              ></el-option>
+              <el-option :value="item.label" :label="item.label" v-for="item in weeks" :key="item.value"></el-option>
             </el-select>
-            <el-time-picker
-              placeholder="起始时间"
-              v-model="startTime"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-                format: 'HH:mm',
-              }"
-              format="HH:mm"
-              value-format="HH:mm"
-            ></el-time-picker>
-            <el-time-picker
-              placeholder="结束时间"
-              v-model="endTime"
-              :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-              format="HH:mm"
-              value-format="HH:mm"
-            ></el-time-picker>
+            <el-time-picker placeholder="起始时间" v-model="startTime" :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59',
+              format: 'HH:mm',
+            }" format="HH:mm" value-format="HH:mm"></el-time-picker>
+            <el-time-picker placeholder="结束时间" v-model="endTime" :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59',
+            }" format="HH:mm" value-format="HH:mm"></el-time-picker>
           </div>
         </el-form-item>
         <el-form-item label="桌位费/位/元">
           <el-input-number :disabled="!!form.isTableFee" v-model="form.tableFee" :min="0" />
           <!-- <el-checkbox v-model="form.isTableFee" :label="1">免餐位费</el-checkbox> -->
-          <el-switch
-            class="u-m-l-10"
-            v-model.trim="form.isTableFee"
-            :active-value="1"
-            :inactive-value="0"
-            active-text="免餐位费"
-          ></el-switch>
+          <el-switch class="u-m-l-10" v-model.trim="form.isTableFee" :active-value="1" :inactive-value="0"
+            active-text="免餐位费"></el-switch>
         </el-form-item>
         <!-- <el-form-item label="是否开启8折活动">
           <el-switch v-model.trim="form.isOpenYhq" active-value="true" inactive-value="false"></el-switch>
@@ -203,41 +148,24 @@
           </el-time-picker>
         </el-form-item> -->
         <el-form-item label="店铺简介">
-          <el-input
-            type="textarea"
-            v-model.trim="form.detail"
-            placeholder="请输入店铺简介"
-            style="width: 500px"
-          ></el-input>
+          <el-input type="textarea" v-model.trim="form.detail" placeholder="请输入店铺简介" style="width: 500px"></el-input>
         </el-form-item>
         <el-form-item label="台桌预订短信">
-          <el-input
-            type="textarea"
-            v-model.trim="form.bookingSms"
-            placeholder="请输入台桌预订短信"
-            style="width: 500px"
-          ></el-input>
+          <el-input type="textarea" v-model.trim="form.bookingSms" placeholder="请输入台桌预订短信"
+            style="width: 500px"></el-input>
         </el-form-item>
         <el-form-item label="电子围栏" prop="isOrderFence">
           <div class="column">
             <div class="center" style="display: flex; align-items: center; gap: 14px">
-              <el-switch
-                v-model="form.isOrderFence"
-                :active-value="1"
-                :inactive-value="0"
-              ></el-switch>
+              <el-switch v-model="form.isOrderFence" :active-value="1" :inactive-value="0"></el-switch>
               <div class="tips" style="font-size: 14px; color: #999">
                 开启后，用户只能在店铺附近xx公里内点餐
               </div>
             </div>
             <div class="center" v-if="form.isOrderFence == 1">
-              <el-input
-                v-model="form.orderFenceDistance"
-                placeholder="请输入"
-                @input="(e) => (form.orderFenceDistance = filterNumberInput(e))"
-                style="width: 250px"
-                input-style="text-align: center;"
-              >
+              <el-input v-model="form.orderFenceDistance" placeholder="请输入"
+                @input="(e) => (form.orderFenceDistance = filterNumberInput(e))" style="width: 250px"
+                input-style="text-align: center;">
                 <template #prepend>限制：</template>
                 <template #append>公里</template>
               </el-input>
@@ -247,29 +175,24 @@
         <el-form-item label="上菜时间（分钟）" prop="isServeTimeControl">
           <div class="column">
             <div class="center" style="display: flex; align-items: center; gap: 14px">
-              <el-switch
-                v-model="form.isServeTimeControl"
-                :active-value="1"
-                :inactive-value="0"
-              ></el-switch>
+              <el-switch v-model="form.isServeTimeControl" :active-value="1" :inactive-value="0"></el-switch>
               <div class="tips" style="font-size: 14px; color: #999">
                 起菜到上菜的时间间隔，开启后会有超时提示
               </div>
             </div>
             <div class="center" v-if="form.isServeTimeControl == 1">
-              <el-input
-                v-model="form.serveTime"
-                placeholder="请输入"
-                @input="(e) => (form.serveTime = filterNumberInput(e))"
-                style="width: 250px"
-                input-style="text-align: center;"
-              >
+              <el-input v-model="form.serveTime" placeholder="请输入"
+                @input="(e) => (form.serveTime = filterNumberInput(e))" style="width: 250px"
+                input-style="text-align: center;">
                 <template #prepend>限制：</template>
                 <template #append>分钟</template>
               </el-input>
             </div>
           </div>
         </el-form-item>
+        <el-form-item label="数签子功能">
+          <el-switch v-model="form.isCountStick" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
             <el-radio :value="1">营业中</el-radio>
@@ -285,24 +208,11 @@
       </el-form>
     </div>
     <ChooseAddress ref="refChooseAddress" @choose="chooseAddressConfirm"></ChooseAddress>
-    <el-dialog
-      v-model="showUpload"
-      :close-on-click-modal="false"
-      append-to-body
-      width="500px"
-      @close="showUpload = false"
-    >
-      <el-upload
-        :before-remove="handleBeforeRemove"
-        :on-success="handleSuccess"
-        :on-error="handleError"
-        :file-list="fileList"
-        :headers="headers"
-        :action="qiNiuUploadApi"
-        :limit="1"
-        list-type="picture"
-        class="upload-demo"
-      >
+    <el-dialog v-model="showUpload" :close-on-click-modal="false" append-to-body width="500px"
+      @close="showUpload = false">
+      <el-upload :before-remove="handleBeforeRemove" :on-success="handleSuccess" :on-error="handleError"
+        :file-list="fileList" :headers="headers" :action="qiNiuUploadApi" :limit="1" list-type="picture"
+        class="upload-demo">
         <el-button size="small" type="primary">点击上传</el-button>
         <template #tip>
           <div style="display: block" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
@@ -549,7 +459,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          crudQiNiu.del([this.files[i].id]).then((res) => {});
+          crudQiNiu.del([this.files[i].id]).then((res) => { });
           return true;
         }
       }

From 6151fbf2ee5c5c6d12a15e0935266bbf304a9dfd Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 25 Dec 2025 17:41:47 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=80=97=E6=9D=90=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=80=97=E6=9D=90=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 4876d02..79e7768 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -118,25 +118,16 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="耗材名称" prop="consInfoId">
           <template v-slot="scope">
-            <!-- <el-select
-              v-model="scope.row.consInfoId"
-              reserve-keyword
-              placeholder="请输入关键词"
-              @change="selectionChange($event, scope.row)"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.id"
-                :label="item.conName"
-                :value="item.id"
-              ></el-option>
-            </el-select> -->
+            <el-select v-model="scope.row.consInfoId" reserve-keyword placeholder="请输入关键词"
+              @change="selectionChange($event, scope.row)">
+              <el-option v-for="item in options" :key="item.id" :label="item.conName" :value="item.id"></el-option>
+            </el-select>
             <!-- <div class="tips" v-if="scope.row.stockNumber">库存：{{ scope.row.stockNumber }}</div> -->
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="conUnit">
           <template v-slot="scope">
-            <el-input v-model="scope.row.conUnit" readonly disabled></el-input>
+            <el-input v-model="scope.row.conUnit" readonly disabled placeholder="请选择耗材"></el-input>
             <!-- <el-select v-model="scope.row.conUnit" reserve-keyword placeholder="请输入关键词">
               <el-option
                 v-for="item in returnConUnits(scope.row.consInfoId)"

From 98bccfd2ac99fa56b6dc62957b89f2333f3f92fe Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 26 Dec 2025 15:06:33 +0800
Subject: [PATCH 09/16] 1

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 63fc79f..9a1e42c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-// test
+// test 11
 import { useAppStore, useSettingsStore } from "@/store";
 import defaultSettings from "@/settings";
 import { ThemeEnum } from "@/enums/ThemeEnum";

From bee51d6d1a2ae450fa79accd05d68d6f3e56a8e2 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 26 Dec 2025 16:55:36 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/consumables/components/add-haocai.vue | 2 ++
 src/views/inventory/operation_in/index.vue                | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/inventory/consumables/components/add-haocai.vue b/src/views/inventory/consumables/components/add-haocai.vue
index 05c469e..2135ff1 100644
--- a/src/views/inventory/consumables/components/add-haocai.vue
+++ b/src/views/inventory/consumables/components/add-haocai.vue
@@ -14,9 +14,11 @@
       <el-form-item label="耗材价格" prop="price">
         <div class="center">
           <el-input-number v-model="form.price" placeholder="请输入" @change="onPriceChange"></el-input-number>
+          <span>{{ form.conUnit }}</span>
           <div class="ipt">
             第二单位价格：
             <el-input-number v-model="twoPrice" placeholder="请输入" @change="onTwoPriceChange"></el-input-number>
+            <span>{{ form.conUnitTwo }}</span>
           </div>
         </div>
       </el-form-item>
diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue
index a39f2cd..d939b9e 100644
--- a/src/views/inventory/operation_in/index.vue
+++ b/src/views/inventory/operation_in/index.vue
@@ -280,9 +280,9 @@ export default {
         return price;
       }
       if (row.conUnitTwo && row.unit == row.conUnitTwo) {
-        console.log(price / row.conUnitTwoConvert);
-        console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert)));
-        return new Decimal(price).div(new Decimal(row.conUnitTwoConvert));
+        // console.log(price / row.conUnitTwoConvert);
+        // console.log(new Decimal(price).div(new Decimal(row.conUnitTwoConvert)));
+        return new Decimal(price).mul(new Decimal(row.conUnitTwoConvert));
       }
       return price;
     },
@@ -294,7 +294,7 @@ export default {
         return number;
       }
       if (row.conUnitTwo && row.unit == row.conUnitTwo) {
-        return number * row.conUnitTwoConvert;
+        return number / row.conUnitTwoConvert;
       }
       return number;
     },

From 2325b8909326108b6c024a117684897e313a4151 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 29 Dec 2025 16:09:41 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=AE=A2=E6=9C=8D=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/config/components/contactSetting.vue | 113 ++++++++++++++++++
 src/views/shop/config/index.vue               |   3 +
 2 files changed, 116 insertions(+)
 create mode 100644 src/views/shop/config/components/contactSetting.vue

diff --git a/src/views/shop/config/components/contactSetting.vue b/src/views/shop/config/components/contactSetting.vue
new file mode 100644
index 0000000..270dbb6
--- /dev/null
+++ b/src/views/shop/config/components/contactSetting.vue
@@ -0,0 +1,113 @@
+<!-- 客服设置 -->
+<template>
+  <div>
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100" label-position="right">
+      <el-form-item label="企业ID" prop="weworkId">
+        <el-input v-model="form.weworkId" placeholder="请输入企业ID" style="width: 400px;"></el-input>
+      </el-form-item>
+      <el-form-item label="接入链接" prop="weworkUrl">
+        <el-input v-model="form.weworkUrl" placeholder="请输入接入链接" style="width: 400px;"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <div class="detail">
+          <h3>如何获取企业</h3>
+          <p>1.登录【企业微信管理后台】(<el-link type="primary" target="_blank"
+              href="https://work.weixin.qq.com">work.weixin.qq.com</el-link>)</p>
+          <p>2.获取企业ID：登录后，进入【我的企业>>企业信息>>企业ID】</p>
+          <el-image :src="imgs[0]" style="width: 600px;height: auto;" :preview-src-list="imgs"
+            :initial-index="0"></el-image>
+          <h3>如何获取接入链接</h3>
+          <p>1. 登录【企业微信管理后台】(<el-link type="primary" target="_blank"
+              href="https://work.weixin.qq.com">work.weixin.qq.com</el-link>)。
+          </p>
+          <p>2.找到《微信客服》应用，路径：【应用管理>> 应用管理>>应用>>微信客服】</p>
+          <el-image :src="imgs[1]" style="width: 600px;height: auto;" :preview-src-list="imgs"
+            :initial-index="1"></el-image>
+          <p>3.进入《微信客服》，找到《创建账号》按钮，点击后进入页面完成创建。（具体的接待时间、接待人员等商家可自行配置）</p>
+          <el-image :src="imgs[2]" style="width: 600px;height: auto;" :preview-src-list="imgs"
+            :initial-index="2"></el-image>
+          <p>4.创建成功后，再次点击刚刚创建的账号，进入后复制《接入链接》粘贴过来即可；特别说明，账号可选用已创建的账号；</p>
+        </div>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :loading="loading" @click="submitHandle">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import ShopApi from "@/api/account/shop";
+
+const imgs = [
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/06f236d656be479284833a166a5b98c1.png",
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/96f3c5c4c1f940c390eef901bcd11a14.png",
+  "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/1/5dbbd3a7d31c4bef8af57c6679421dd5.png",
+];
+
+const formRef = ref();
+const loading = ref(false);
+const form = ref({
+  id: '',
+  weworkId: "",
+  weworkUrl: "",
+});
+
+const rules = {
+  weworkId: [{ required: true, message: "请输入企业ID", trigger: "blur" }],
+  weworkUrl: [{ required: true, message: "请输入接入链接", trigger: "blur" }],
+};
+
+// 提交表单
+function submitHandle() {
+  formRef.value.validate(async (valid) => {
+    if (valid) {
+      try {
+        loading.value = true;
+        await ShopApi.edit(form.value);
+        ElNotification({
+          title: "成功",
+          message: "保存成功",
+          type: "success",
+        });
+      } catch (error) {
+        console.log(error);
+      }
+      loading.value = false;
+    } else {
+      return false;
+    }
+  });
+}
+
+
+// 获取店铺信息
+async function getShopInfo() {
+  try {
+    const res = await ShopApi.get()
+    form.value.id = res.id;
+    form.value.weworkId = res.weworkId;
+    form.value.weworkUrl = res.weworkUrl;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+onMounted(() => {
+  getShopInfo();
+})
+</script>
+
+<style scoped lang="scss">
+.detail {
+  p {
+    margin-bottom: 10px;
+  }
+
+  .img {
+    width: 600px;
+    border-radius: 4px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/shop/config/index.vue b/src/views/shop/config/index.vue
index 57388b0..11213f2 100644
--- a/src/views/shop/config/index.vue
+++ b/src/views/shop/config/index.vue
@@ -6,11 +6,13 @@
         <el-tab-pane label="安全设置" name="4"></el-tab-pane>
         <el-tab-pane label="跳转小程序" name="6" v-if="shopId == 1"></el-tab-pane>
         <el-tab-pane label="通知中心" name="7"></el-tab-pane>
+        <el-tab-pane label="客服设置" name="8"></el-tab-pane>
       </el-tabs>
       <shopInfo v-if="activeName == 1" />
       <safe v-if="activeName == 4" />
       <notifications v-if="activeName == 7" />
       <!-- <goxcx v-if="activeName == 6" />-->
+      <contactSetting v-if="activeName == 8" />
     </div>
   </div>
 </template>
@@ -19,6 +21,7 @@
 import shopInfo from "./components/shopInfo.vue";
 import safe from "./components/safe.vue";
 import notifications from "./components/notifications.vue";
+import contactSetting from "./components/contactSetting.vue";
 
 const state = reactive({
   activeName: "1",

From d96009bf6fa3253b9431394f37cf0f6c7eab50ea Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 29 Dec 2025 17:35:29 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index/config/content.ts | 21 ++++++++++++++++++---
 src/views/order/index/index.vue         |  7 +++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/order/index/config/content.ts b/src/views/order/index/config/content.ts
index 2410d28..503e60a 100644
--- a/src/views/order/index/config/content.ts
+++ b/src/views/order/index/config/content.ts
@@ -14,14 +14,22 @@ const contentConfig: IContentConfig = {
     pageSize: 10,
     pageSizes: [10, 20, 30, 50],
   },
-  indexAction: function (params) {
+  async indexAction(params) {
     console.log(params);
     if (params.createAt) {
       params.startTime = params.createAt[0];
       params.endTime = params.createAt[1];
       delete params.createAt;
     }
-    return OrderApi.getList(params);
+
+    const res = await OrderApi.getList(params)
+    console.log('OrderApi.getList', res);
+
+    res.records.map(item => {
+      item.payLoading = false
+      item.printStatus = JSON.parse(item.printStatus || '[]')
+    })
+    return res;
   },
   indexActionData: {},
   // deleteAction: OrderApi.delete,
@@ -93,7 +101,14 @@ const contentConfig: IContentConfig = {
       templet: "custom",
       slotName: "options",
     },
-
+    {
+      label: "打印状态",
+      align: "center",
+      prop: "printStatus",
+      width: 120,
+      templet: "custom",
+      slotName: "printStatus",
+    },
     {
       label: "状态",
       align: "center",
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index ea01ec5..c4e8a8e 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -51,6 +51,13 @@
         </div>
       </template>
 
+      <!-- 打印状态 -->
+      <template #printStatus="scope">
+        <span v-if="scope.row.printStatus.length > 0" style="color: var(--el-color-danger)">
+          打印失败（{{scope.row.printStatus.map(item => item.name).join('、')}}）
+        </span>
+      </template>
+
       <template #options="scope">
         {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
       </template>

From a9751fa565bc39807e98e3650f37a6d5724521ed Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 29 Dec 2025 18:29:33 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/quick.ts                      |  37 ++++
 src/assets/images/close.png                   | Bin 0 -> 7364 bytes
 src/assets/images/plus.png                    | Bin 0 -> 7131 bytes
 src/components/FastMenuConfig/dialog-add.vue  | 178 ++++++++++++++++++
 src/components/FastMenuConfig/index.vue       | 159 ++++++++++++++++
 src/layout/components/FastMenu/index.vue      |  62 ++++++
 src/layout/index.vue                          |  14 +-
 src/store/modules/permission.ts               |   2 -
 .../admin/system/commonlyUsedMenu/index.vue   |   5 +
 .../tool/Instead/components/carts/list.vue    | 100 +++++++---
 10 files changed, 529 insertions(+), 28 deletions(-)
 create mode 100644 src/api/account/quick.ts
 create mode 100644 src/assets/images/close.png
 create mode 100644 src/assets/images/plus.png
 create mode 100644 src/components/FastMenuConfig/dialog-add.vue
 create mode 100644 src/components/FastMenuConfig/index.vue
 create mode 100644 src/layout/components/FastMenu/index.vue
 create mode 100644 src/views/admin/system/commonlyUsedMenu/index.vue

diff --git a/src/api/account/quick.ts b/src/api/account/quick.ts
new file mode 100644
index 0000000..5e1b161
--- /dev/null
+++ b/src/api/account/quick.ts
@@ -0,0 +1,37 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/quick";
+const API = {
+  getList(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  add(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  delete(ids: [string | number]) {
+    return request({
+      url: `${baseURL}`,
+      method: "delete",
+      data: ids,
+    });
+  },
+  edit(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+}
+export default API;
+
+
+
diff --git a/src/assets/images/close.png b/src/assets/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..70a30a64a5e9eaf4109bee7390643b4de346d94b
GIT binary patch
literal 7364
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%0D()&Pd9h-b^+}NQeoQZ@TOj$^5<WmUwYZKrw#o}F
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/plus.png b/src/assets/images/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fae75f7459f2df9af3acec453ca09bd575b9b87
GIT binary patch
literal 7131
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
R6#oDK002ovPDHLkV1gJMz3c!0

literal 0
HcmV?d00001

diff --git a/src/components/FastMenuConfig/dialog-add.vue b/src/components/FastMenuConfig/dialog-add.vue
new file mode 100644
index 0000000..e7128b3
--- /dev/null
+++ b/src/components/FastMenuConfig/dialog-add.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '添加'" width="400px" v-model="visible" @closed="resetForm">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" label-position="left">
+      <el-form-item label="菜单" prop="menuId">
+        <el-tree-select
+          :check-strictly="true"
+          v-model="form.menuId"
+          :data="menus"
+          :render-after-expand="false"
+          style="width: 240px"
+        ></el-tree-select>
+      </el-form-item>
+
+      <el-form-item label="排序值">
+        <el-input-number v-model="form.sort" :step="1" step-strictly />
+      </el-form-item>
+      <el-form-item label="启用状态">
+        <el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog_footer">
+        <div class="btn">
+          <el-button size="large" style="width: 100%" @click="visible = false">取 消</el-button>
+        </div>
+        <div class="btn">
+          <el-button
+            size="large"
+            type="primary"
+            :loading="loading"
+            style="width: 100%"
+            @click="submitHandle"
+          >
+            确 定
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import { filterNumberInput } from "@/utils";
+import { roleTemplateAdd } from "@/api/account/roleTemplate";
+import MenuAPI from "@/api/account/menu";
+import quickApi from "@/api/account/quick";
+
+const props = defineProps({
+  isGetMenu: {
+    type: Boolean,
+    required: false,
+  },
+  parMenus: {
+    type: Array,
+    required: false,
+  },
+  item: {
+    type: Object,
+    required: false,
+  },
+});
+watch(
+  () => props.item,
+  (newval) => {
+    if (newval) {
+      form.value = newval;
+    }
+  },
+  { deep: true }
+);
+const menus = ref([]);
+onMounted(async () => {
+  if (!props.isGetMenu) {
+    return;
+  }
+  const res = await MenuAPI.getRoutes();
+  console.log("getRoutes", res);
+  menus.value = returnMenu(res);
+  console.log(menus.value);
+});
+
+watch(
+  () => props.parMenus.length,
+  (newval) => {
+    menus.value = returnMenu(props.parMenus);
+  }
+);
+
+function returnMenu(arr) {
+  let result = [];
+  for (let menu of arr) {
+    menu.label = menu.title;
+    menu.value = menu.menuId;
+    result.push({
+      ...menu,
+      label: menu.title,
+      value: menu.menuId,
+      children: menu.children ? returnMenu(menu.children) : [],
+    });
+  }
+  return result;
+}
+
+const visible = defineModel({
+  type: Boolean,
+  required: false,
+});
+const formRef = ref(null);
+const loading = ref(false);
+const form = ref({
+  menuId: "",
+  sort: 0,
+  url: "",
+  status: 1,
+});
+const rules = ref({
+  menuId: [
+    {
+      required: true,
+      message: "请选择菜单",
+      triiger: "blur",
+    },
+  ],
+});
+
+function resetForm() {
+  form.value = {
+    menuId: "",
+    sort: 0,
+    url: "",
+    status: 1,
+  };
+  formRef.value.resetFields();
+}
+
+// 提交
+const emits = defineEmits(["success"]);
+function submitHandle() {
+  formRef.value.validate(async (vaild) => {
+    try {
+      if (vaild) {
+        loading.value = true;
+        if (form.value.sort === "") {
+          form.value.sort = 0;
+        }
+        await quickApi.add(form.value);
+
+        ElNotification({
+          title: "注意",
+          message: "添加成功",
+          type: "success",
+        });
+
+        emits("success");
+
+        visible.value = false;
+      }
+    } catch (error) {
+      console.log(error);
+    }
+    setTimeout(() => {
+      loading.value = false;
+    }, 500);
+  });
+}
+</script>
+
+<style scoped lang="scss">
+.dialog_footer {
+  display: flex;
+  gap: 14px;
+
+  .btn {
+    flex: 1;
+  }
+}
+</style>
diff --git a/src/components/FastMenuConfig/index.vue b/src/components/FastMenuConfig/index.vue
new file mode 100644
index 0000000..9067a52
--- /dev/null
+++ b/src/components/FastMenuConfig/index.vue
@@ -0,0 +1,159 @@
+<template>
+  <div class="container">
+    <div class="table-box">
+      <div class="row mb-sm">
+        <el-button type="primary" @click="showAdd = true">添加</el-button>
+      </div>
+      <el-table
+        :data="tableData.list"
+        v-loading="tableData.loading"
+        stripe
+        border
+        row-key="id"
+        :tree-props="{ children: 'children' }"
+        default-expand-all
+        style="width: 100%"
+      >
+        <el-table-column label="ID" prop="id"></el-table-column>
+        <el-table-column label="菜单名称" prop="isEnable">
+          <template #default="scope">
+            {{ returnMenuName(scope.row) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="启用状态" prop="isEnable">
+          <template #default="scope">
+            <el-switch
+              v-model="scope.row.status"
+              :active-value="1"
+              :inactive-value="0"
+              @change="isEnableChange($event, scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序值" prop="sort"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime"></el-table-column>
+        <el-table-column label="操作" width="250">
+          <template #default="scope">
+            <el-button link type="primary" @click="editMenu(scope.row)">编辑</el-button>
+            <el-popconfirm title="确认要删除吗？" @confirm="deleteHandle(scope.row)">
+              <template #reference>
+                <el-button type="danger" link>删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <dialogAdd
+      v-model="showAdd"
+      :parMenus="menus"
+      @success="Refresh()"
+      :item="nowEditMenu"
+    ></dialogAdd>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from "vue";
+import MenuAPI from "@/api/account/menu";
+
+import quickApi from "@/api/account/quick";
+
+import dialogAdd from "./dialog-add.vue";
+
+const showAdd = ref(false);
+
+const nowEditMenu = ref({});
+function editMenu(item) {
+  nowEditMenu.value = item;
+  showAdd.value = true;
+}
+const tableData = reactive({
+  loading: false,
+  page: 1,
+  size: 10,
+  total: 0,
+  list: [],
+});
+
+function Refresh() {
+  getList();
+}
+function getList() {
+  tableData.loading = true;
+  quickApi
+    .getList({
+      page: tableData.page,
+      size: tableData.size,
+      isEdit: true,
+    })
+    .then((res) => {
+      tableData.list = res;
+      tableData.total = res.length;
+    })
+    .finally(() => {
+      tableData.loading = false;
+    });
+}
+
+const menus = ref([]);
+async function getMenus() {
+  const res = await MenuAPI.getRoutes();
+  menus.value = res;
+}
+const menusIdMap = computed(() => {
+  const map = getMenuMao();
+  return map;
+});
+function returnMenuName(item) {
+  const menu = menusIdMap.value.get(`${item.menuId}`);
+  return menu.title;
+}
+function getMenuMao() {
+  const map = new Map();
+  for (const menu of menus.value) {
+    map.set(menu.menuId, menu);
+    if (menu.children && menu.children.length > 0) {
+      for (const child of menu.children) {
+        map.set(child.menuId, child);
+      }
+    }
+  }
+  return map;
+}
+function isEnableChange(value, item) {
+  quickApi
+    .edit({
+      ...item,
+      status: value,
+    })
+    .then((res) => {
+      ElMessage({
+        message: "修改成功",
+        type: "success",
+      });
+      Refresh();
+    });
+}
+function deleteHandle(item) {
+  quickApi.delete([item.id]).then(() => {
+    Refresh();
+  });
+}
+onMounted(async () => {
+  await getMenus();
+  getList();
+});
+</script>
+<style lang="scss" scoped>
+.container {
+  padding: 14px;
+  width: 100%;
+  .table-box {
+    border-radius: 8px;
+    background-color: #fff;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/layout/components/FastMenu/index.vue b/src/layout/components/FastMenu/index.vue
new file mode 100644
index 0000000..d706a3c
--- /dev/null
+++ b/src/layout/components/FastMenu/index.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="fast-menu">
+    <el-dropdown
+      trigger="click"
+      placement="top-end"
+      @visible-change="handleVisibleChange"
+      append-to-body="true"
+    >
+      <img class="img" :src="imgsrc" alt="" />
+      <!-- <el-icon color="#fff" size="24px">
+        <Plus v-if="!showMenu" />
+        <Close v-else />
+      </el-icon> -->
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item v-for="(item, index) in list" :key="index">
+            Action {{ index + 1 }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+  </div>
+</template>
+<script lang="ts" setup>
+import { ref } from "vue";
+const list = ref(new Array(10).fill(1));
+
+const imgsrc = computed(() => {
+  return showMenu.value
+    ? new URL("/src/assets/images/close.png", import.meta.url).href
+    : new URL("/src/assets/images/plus.png", import.meta.url).href;
+});
+const showMenu = ref(false);
+function handleVisibleChange(visible: boolean) {
+  showMenu.value = visible;
+}
+</script>
+<style lang="scss" scoped>
+.fast-menu {
+  position: fixed;
+  $size: 40px;
+  right: 40px;
+  bottom: 40px;
+  width: $size;
+  height: $size;
+  .img {
+    width: $size;
+    height: $size;
+  }
+  // box-shadow: 0 0 10px rgba(0, 0, 0, 0.4);
+  // background: linear-gradient(135deg, #409eff, #3a84ff);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 10;
+  .svg-icon {
+    margin-right: 0;
+    color: #fff;
+  }
+}
+</style>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b75e210..51d4a0a 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -27,10 +27,11 @@
         <TagsView v-if="showTagsView" />
         <AppMain />
         <Settings v-if="defaultSettings.showSettings" />
+
         <!-- 返回顶部 -->
-        <el-backtop target=".app-main">
+        <!-- <el-backtop target=".app-main">
           <svg-icon icon-class="backtop" size="24px" />
-        </el-backtop>
+        </el-backtop> -->
       </div>
     </div>
 
@@ -42,11 +43,15 @@
       </div>
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
+
       <!-- 返回顶部 -->
-      <el-backtop target=".app-main">
+      <!-- <el-backtop target=".app-main">
         <svg-icon icon-class="backtop" size="24px" />
-      </el-backtop>
+      </el-backtop> -->
     </div>
+
+    <!-- 悬浮球 -->
+    <FastMenu></FastMenu>
   </div>
 </template>
 
@@ -105,6 +110,7 @@ function handleOutsideClick() {
 function toggleSidebar() {
   appStore.toggleSidebar();
 }
+function showFastMenu() {}
 
 const route = useRoute();
 watch(route, () => {
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index b90fc9f..7fae218 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -33,8 +33,6 @@ export const usePermissionStore = defineStore("permission", () => {
         .then((data) => {
           if (!isTest) {
             const dynamicRoutes = parseDynamicRoutes(data.filter(v => v.type == 0));
-            console.log('dynamicRoutes')
-            console.log(dynamicRoutes)
             dynamicRoutes.forEach((route) => {
               //过滤出可见子节点
               let onlyOneChild = null
diff --git a/src/views/admin/system/commonlyUsedMenu/index.vue b/src/views/admin/system/commonlyUsedMenu/index.vue
new file mode 100644
index 0000000..63a05ba
--- /dev/null
+++ b/src/views/admin/system/commonlyUsedMenu/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <FastMenuConfig></FastMenuConfig>
+  </div>
+</template>
diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index 84fdc76..2a61a85 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -4,22 +4,38 @@
       <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'">
@@ -40,9 +56,17 @@
         </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>
 
@@ -50,9 +74,14 @@
     </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>
@@ -74,20 +103,36 @@
       </div>
 
       <div class="u-flex u-row-between">
-        <el-link type="primary">打印制作单</el-link>
+        <!-- <el-link type="primary">打印制作单</el-link> -->
+        <div></div>
         <div>
           <span class="totalNumber">共{{ customTruncateToTwoDecimals(carts.totalNumber) }}件</span>
           <span class="totalPrice">￥{{ customTruncateToTwoDecimals(carts.payMoney) }}</span>
         </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>
@@ -100,20 +145,31 @@
           <el-button type="primary" size="large" :disabled="disabledMorePay" @click="createOrder('to-pay')">
             去结账
           </el-button> -->
-          <el-button type="primary" size="large"
+          <el-button
+            type="primary"
+            size="large"
             :disabled="carts.list.length == 0 || carts.oldOrder.detailMap.length == 0"
-            @click="createOrder('only-create')">
+            @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="primary"
+            size="large"
+            :disabled="!carts.isLinkFinshed"
+            @click="createOrder('to-pay')"
+          >
             立即支付
           </el-button>
         </template>
@@ -131,7 +187,7 @@ import { useUserStore } from "@/store/modules/user";
 
 function isEmptyObject(obj) {
   // 步骤1：排除null和非对象类型
-  if (obj === null || typeof obj !== 'object') {
+  if (obj === null || typeof obj !== "object") {
     return false;
   }
   // 步骤2：排除数组（数组也是对象，需单独判断）
@@ -313,4 +369,4 @@ defineExpose({
     margin-left: 10px;
   }
 }
-</style>
\ No newline at end of file
+</style>

From 01c2cbcfb43e1fbc603915ee8a225b5fe39178d7 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 30 Dec 2025 14:25:37 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/order.ts                  |  8 ++++++++
 src/views/order/index/config/content.ts |  2 +-
 src/views/order/index/index.vue         | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/api/order/order.ts b/src/api/order/order.ts
index 5ea0153..5e7cb54 100644
--- a/src/api/order/order.ts
+++ b/src/api/order/order.ts
@@ -64,6 +64,14 @@ const OrderApi = {
       data
     });
   },
+  // 订单打印
+  printOrder(data: any) {
+    return request<any>({
+      url: `${baseURL}/print`,
+      method: "post",
+      data
+    });
+  },
 };
 
 export default OrderApi;
diff --git a/src/views/order/index/config/content.ts b/src/views/order/index/config/content.ts
index 503e60a..b7f8d99 100644
--- a/src/views/order/index/config/content.ts
+++ b/src/views/order/index/config/content.ts
@@ -131,7 +131,7 @@ const contentConfig: IContentConfig = {
       label: "操作",
       align: "center",
       fixed: "right",
-      width: 150,
+      width: 180,
       templet: "custom",
       slotName: "operate",
     },
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index c4e8a8e..5595ec1 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -72,6 +72,7 @@
       </template>
       <template #operate="scope">
         <div>
+          <el-button link @click="printOrderHandle(scope.row)">打印</el-button>
           <el-button link @click="showdetail(scope.row)">详情</el-button>
           <el-button v-if="scope.row.status == 'done'" link>开票</el-button>
           <el-button v-if="scope.row.status == 'unpaid'" type="primary" @click="toPayOrder(scope.row)">
@@ -155,6 +156,19 @@ onMounted(() => {
   }
 });
 
+// 打印订单
+async function printOrderHandle(order: getListResponse) {
+  try {
+    await orderApi.printOrder({
+      id: order.id,
+      type: 0
+    });
+    ElMessage.success("打印成功");
+  } catch (error) {
+    ElMessage.error("打印失败，请稍后重试");
+  }
+}
+
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();

From cc44bdc9b11a326b0e64116a4cc3d17b35f54634 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 31 Dec 2025 11:47:15 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/quick.ts                     |  33 ++-
 src/components/FastMenuConfig/dialog-add.vue | 208 +++++++++++++------
 src/components/FastMenuConfig/index.vue      |  50 +++--
 src/layout/components/FastMenu/index.vue     |  41 +++-
 src/store/index.ts                           |   1 +
 src/store/modules/permission.ts              |  54 +++++
 src/store/modules/quick.ts                   |  37 ++++
 src/views/shop/commonlyUsedMenu/index.vue    |   5 +
 8 files changed, 351 insertions(+), 78 deletions(-)
 create mode 100644 src/store/modules/quick.ts
 create mode 100644 src/views/shop/commonlyUsedMenu/index.vue

diff --git a/src/api/account/quick.ts b/src/api/account/quick.ts
index 5e1b161..76fb99c 100644
--- a/src/api/account/quick.ts
+++ b/src/api/account/quick.ts
@@ -3,7 +3,7 @@ import { Account_BaseUrl } from "@/api/config";
 const baseURL = Account_BaseUrl + "/admin/quick";
 const API = {
   getList(data: any) {
-    return request<any>({
+    return request<any, QuickMenu[]>({
       url: `${baseURL}`,
       method: "get",
       params: data
@@ -35,3 +35,34 @@ export default API;
 
 
 
+/**
+ * 悬浮窗配置 实体类。
+ *
+ * QuickMenu
+ */
+export interface QuickMenu {
+  createTime?: string;
+  id?: number;
+  /**
+   * 菜单Id
+   */
+  menuId: number;
+  /**
+   * 店铺Id
+   */
+  shopId?: number;
+  /**
+   * 排序
+   */
+  sort?: number;
+  /**
+   * 状态 1-启用 0-禁用
+   */
+  status?: number;
+  updateTime?: string;
+  /**
+   * 菜单图标
+   */
+  url?: string;
+  [property: string]: any;
+}
diff --git a/src/components/FastMenuConfig/dialog-add.vue b/src/components/FastMenuConfig/dialog-add.vue
index e7128b3..1e71b00 100644
--- a/src/components/FastMenuConfig/dialog-add.vue
+++ b/src/components/FastMenuConfig/dialog-add.vue
@@ -8,6 +8,8 @@
           :data="menus"
           :render-after-expand="false"
           style="width: 240px"
+          node-key="menuId"
+          :disabled-key="disabled"
         ></el-tree-select>
       </el-form-item>
 
@@ -40,7 +42,9 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from "vue";
+// 补充缺失的导入
+import { ref, onMounted, watch } from "vue";
+import { ElNotification, ElMessage } from "element-plus"; // 导入提示组件
 import { filterNumberInput } from "@/utils";
 import { roleTemplateAdd } from "@/api/account/roleTemplate";
 import MenuAPI from "@/api/account/menu";
@@ -50,80 +54,147 @@ const props = defineProps({
   isGetMenu: {
     type: Boolean,
     required: false,
+    default: false, // 补充默认值
   },
   parMenus: {
     type: Array,
     required: false,
+    default: () => [], // 补充默认值
   },
   item: {
     type: Object,
     required: false,
+    default: () => null,
   },
 });
-watch(
-  () => props.item,
-  (newval) => {
-    if (newval) {
-      form.value = newval;
-    }
-  },
-  { deep: true }
-);
+
 const menus = ref([]);
-onMounted(async () => {
-  if (!props.isGetMenu) {
-    return;
-  }
-  const res = await MenuAPI.getRoutes();
-  console.log("getRoutes", res);
-  menus.value = returnMenu(res);
-  console.log(menus.value);
-});
-
-watch(
-  () => props.parMenus.length,
-  (newval) => {
-    menus.value = returnMenu(props.parMenus);
-  }
-);
 
+/**
+ * 格式化菜单数据：核心逻辑 - 禁用有子菜单的父节点，仅允许选叶子节点
+ * @param arr 原始菜单数组
+ * @returns 格式化后带禁用标记的菜单数组
+ */
 function returnMenu(arr) {
   let result = [];
   for (let menu of arr) {
-    menu.label = menu.title;
-    menu.value = menu.menuId;
-    result.push({
+    // 过滤掉"默认接口目录"
+    if (menu.title === "默认接口目录") continue;
+
+    // 筛选有效子菜单：非隐藏 + 类型为0
+    const children = menu.children ? menu.children.filter((v) => !v.hidden && v.type === 0) : [];
+    // 递归处理子菜单
+    const formattedChildren = returnMenu(children);
+
+    // 核心：判断是否为叶子节点（无有效子菜单）
+    const isLeaf = formattedChildren.length === 0;
+
+    // 组装节点：有子菜单则禁用（disabled: true），无则允许选择
+    const menuNode = {
       ...menu,
       label: menu.title,
       value: menu.menuId,
-      children: menu.children ? returnMenu(menu.children) : [],
-    });
+      menuId: menu.menuId, // 保持node-key一致
+      disabled: !isLeaf, // 有子菜单 → 禁用，无 → 启用
+      children: formattedChildren,
+    };
+
+    // 特殊处理：如果子菜单只有1个，直接扁平化（保持原有逻辑）
+    if (formattedChildren.length === 1) {
+      result.push({
+        ...formattedChildren[0],
+        disabled: formattedChildren[0].children.length > 0, // 子节点仍判断是否有后代
+      });
+    } else {
+      result.push(menuNode);
+    }
   }
   return result;
 }
 
+onMounted(async () => {
+  if (!props.isGetMenu) return;
+  try {
+    const res = await MenuAPI.getRoutes();
+    menus.value = returnMenu(res);
+  } catch (error) {
+    ElMessage.error("菜单数据加载失败");
+    console.error("getRoutes error:", error);
+  }
+});
+
+// 监听父组件传入的菜单变化
+watch(
+  () => props.parMenus,
+  (newVal) => {
+    if (newVal.length) {
+      menus.value = returnMenu(newVal);
+    }
+  },
+  { deep: true } // 监听数组内部变化
+);
+
+// 对话框显隐绑定
 const visible = defineModel({
   type: Boolean,
   required: false,
+  default: false,
 });
+
 const formRef = ref(null);
 const loading = ref(false);
+// 表单初始化
 const form = ref({
   menuId: "",
   sort: 0,
   url: "",
   status: 1,
 });
+
+/**
+ * 自定义校验规则：确保选中的是叶子节点（兜底验证）
+ * @param rule 校验规则
+ * @param value 选中的menuId
+ * @param callback 回调函数
+ */
+function validateLeafMenu(rule, value, callback) {
+  if (!value) {
+    return callback(new Error("请选择菜单"));
+  }
+  // 递归查找节点，判断是否为叶子节点
+  const findNode = (nodes, menuId) => {
+    for (let node of nodes) {
+      if (node.menuId === menuId) return node;
+      if (node.children) {
+        const res = findNode(node.children, menuId);
+        if (res) return res;
+      }
+    }
+    return null;
+  };
+  const selectedNode = findNode(menus.value, value);
+
+  if (!selectedNode) {
+    callback(new Error("选择的菜单不存在"));
+  } else if (selectedNode.disabled) {
+    callback(new Error("有子菜单的父节点不可选，请选择子菜单"));
+  } else {
+    callback(); // 校验通过
+  }
+}
+
+// 表单校验规则：修复拼写错误 + 新增自定义叶子节点校验
 const rules = ref({
   menuId: [
     {
       required: true,
-      message: "请选择菜单",
-      triiger: "blur",
+      validator: validateLeafMenu, // 替换原有规则为自定义校验
+      trigger: "change", // 选择变化时校验（原triiger拼写错误）
     },
   ],
 });
 
+// 重置表单
 function resetForm() {
   form.value = {
     menuId: "",
@@ -131,48 +202,65 @@ function resetForm() {
     url: "",
     status: 1,
   };
-  formRef.value.resetFields();
+  if (formRef.value) {
+    formRef.value.resetFields(); // 避免null调用
+  }
 }
 
-// 提交
+// 提交事件
 const emits = defineEmits(["success"]);
-function submitHandle() {
-  formRef.value.validate(async (vaild) => {
-    try {
-      if (vaild) {
-        loading.value = true;
-        if (form.value.sort === "") {
-          form.value.sort = 0;
-        }
-        await quickApi.add(form.value);
+async function submitHandle() {
+  try {
+    // 修复vaild拼写错误
+    const valid = await formRef.value.validate();
+    if (!valid) return;
 
-        ElNotification({
-          title: "注意",
-          message: "添加成功",
-          type: "success",
-        });
+    loading.value = true;
+    // 排序值兜底
+    form.value.sort = form.value.sort === "" ? 0 : form.value.sort;
 
-        emits("success");
-
-        visible.value = false;
-      }
-    } catch (error) {
-      console.log(error);
+    // 区分新增/编辑
+    if (form.value.id) {
+      await quickApi.edit(form.value);
+      ElNotification({ title: "成功", message: "编辑成功", type: "success" });
+    } else {
+      await quickApi.add(form.value);
+      ElNotification({ title: "成功", message: "添加成功", type: "success" });
     }
-    setTimeout(() => {
-      loading.value = false;
-    }, 500);
-  });
+
+    emits("success");
+    visible.value = false;
+  } catch (error) {
+    ElMessage.error(form.value.id ? "编辑失败" : "添加失败");
+    console.error("submit error:", error);
+  } finally {
+    loading.value = false; // 无论成败都关闭loading
+  }
 }
+
+// 监听props.item初始化表单
+watch(
+  () => props.item,
+  (newval) => {
+    if (newval) {
+      form.value = { ...newval }; // 深拷贝，避免修改原对象
+    }
+  },
+  { deep: true, immediate: true } // 初始化触发
+);
 </script>
 
 <style scoped lang="scss">
 .dialog_footer {
   display: flex;
   gap: 14px;
-
   .btn {
     flex: 1;
   }
 }
+// 可选：美化禁用节点的样式
+.el-select-dropdown__item.is-disabled {
+  color: var(--el-text-color-regular);
+  cursor: pointer;
+}
 </style>
diff --git a/src/components/FastMenuConfig/index.vue b/src/components/FastMenuConfig/index.vue
index 9067a52..dbec7fa 100644
--- a/src/components/FastMenuConfig/index.vue
+++ b/src/components/FastMenuConfig/index.vue
@@ -55,7 +55,10 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from "vue";
+import { useQuickStore, usePermissionStore } from "@/store";
+const quickStore = useQuickStore();
+
+import { ref, reactive, onMounted, toRaw } from "vue";
 import MenuAPI from "@/api/account/menu";
 
 import quickApi from "@/api/account/quick";
@@ -64,9 +67,9 @@ import dialogAdd from "./dialog-add.vue";
 
 const showAdd = ref(false);
 
-const nowEditMenu = ref({});
+const nowEditMenu = ref(null);
 function editMenu(item) {
-  nowEditMenu.value = item;
+  nowEditMenu.value = { ...item };
   showAdd.value = true;
 }
 const tableData = reactive({
@@ -78,6 +81,7 @@ const tableData = reactive({
 });
 
 function Refresh() {
+  quickStore.getQuickMenus();
   getList();
 }
 function getList() {
@@ -86,7 +90,7 @@ function getList() {
     .getList({
       page: tableData.page,
       size: tableData.size,
-      isEdit: true,
+      isEdit: 1,
     })
     .then((res) => {
       tableData.list = res;
@@ -101,25 +105,45 @@ const menus = ref([]);
 async function getMenus() {
   const res = await MenuAPI.getRoutes();
   menus.value = res;
+  console.log("menus", res);
 }
 const menusIdMap = computed(() => {
-  const map = getMenuMao();
+  const map = getMenuMap();
+  console.log("map", map);
+
   return map;
 });
 function returnMenuName(item) {
   const menu = menusIdMap.value.get(`${item.menuId}`);
-  return menu.title;
+  console.log("menuId", item.menuId);
+  console.log("menu", menu);
+
+  return menu ? menu.title : "";
 }
-function getMenuMao() {
+function getMenuMap() {
+  // 初始化Map
   const map = new Map();
-  for (const menu of menus.value) {
-    map.set(menu.menuId, menu);
-    if (menu.children && menu.children.length > 0) {
-      for (const child of menu.children) {
-        map.set(child.menuId, child);
-      }
+
+  // 定义递归函数处理菜单节点
+  function processMenuNode(menuNode) {
+    // 将当前节点存入Map
+    map.set(menuNode.menuId, menuNode);
+
+    // 如果有子节点且子节点数组不为空，则递归处理每个子节点
+    if (menuNode.children && Array.isArray(menuNode.children) && menuNode.children.length > 0) {
+      menuNode.children.forEach((childNode) => {
+        processMenuNode(childNode);
+      });
     }
   }
+
+  // 遍历根级菜单，逐个处理
+  if (menus.value && Array.isArray(menus.value)) {
+    menus.value.forEach((rootMenu) => {
+      processMenuNode(rootMenu);
+    });
+  }
+
   return map;
 }
 function isEnableChange(value, item) {
diff --git a/src/layout/components/FastMenu/index.vue b/src/layout/components/FastMenu/index.vue
index d706a3c..992a7a0 100644
--- a/src/layout/components/FastMenu/index.vue
+++ b/src/layout/components/FastMenu/index.vue
@@ -2,6 +2,7 @@
   <div class="fast-menu">
     <el-dropdown
       trigger="click"
+      @command="menuClick"
       placement="top-end"
       @visible-change="handleVisibleChange"
       append-to-body="true"
@@ -13,8 +14,18 @@
       </el-icon> -->
       <template #dropdown>
         <el-dropdown-menu>
-          <el-dropdown-item v-for="(item, index) in list" :key="index">
-            Action {{ index + 1 }}
+          <el-dropdown-item
+            v-for="(item, index) in quickStore.quickMenus"
+            :key="index"
+            :command="item.menuId"
+          >
+            {{ returnMenuName(item.menuId) }}
+          </el-dropdown-item>
+          <el-dropdown-item :command="-1">
+            <el-icon>
+              <Edit color="#4080FF" />
+            </el-icon>
+            <span style="color: #4080ff">编辑</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </template>
@@ -22,8 +33,30 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref } from "vue";
-const list = ref(new Array(10).fill(1));
+import { ref, computed } from "vue";
+import { useQuickStore, usePermissionStore, useUserStore } from "@/store";
+import router from "@/router";
+
+const userStore = useUserStore();
+const quickStore = useQuickStore();
+const permissionStore = usePermissionStore();
+console.log("permissionStore", permissionStore.menus);
+
+function menuClick(menuId: number) {
+  console.log("menuId", menuId);
+  if (menuId == -1) {
+    if (userStore.userInfo.id == 1) {
+      return router.push("/system/commonlyUsedMenu");
+    } else {
+      return router.push("/commonlyUsedMenu");
+    }
+  }
+  permissionStore.menuJump(menuId);
+}
+
+function returnMenuName(menuId: number) {
+  return permissionStore.returnMenuName(menuId);
+}
 
 const imgsrc = computed(() => {
   return showMenu.value
diff --git a/src/store/index.ts b/src/store/index.ts
index a36e43d..a2020d9 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -14,5 +14,6 @@ export * from "./modules/settings";
 export * from "./modules/tags-view";
 export * from "./modules/user";
 export * from "./modules/dict";
+export * from "./modules/quick";
 
 export { store };
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 7fae218..3f22d9a 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -16,6 +16,7 @@ export const usePermissionStore = defineStore("permission", () => {
   // 路由是否加载完成
   const isRoutesLoaded = ref(false);
 
+  const menus = ref<RouteVO[]>([])
 
 
   /**
@@ -31,6 +32,7 @@ export const usePermissionStore = defineStore("permission", () => {
       }
       MenuAPI.getRoutes()
         .then((data) => {
+          menus.value = data
           if (!isTest) {
             const dynamicRoutes = parseDynamicRoutes(data.filter(v => v.type == 0));
             dynamicRoutes.forEach((route) => {
@@ -93,8 +95,60 @@ export const usePermissionStore = defineStore("permission", () => {
     });
     isRoutesLoaded.value = false;
   };
+  function getMenuMap() {
+    // 初始化Map
+    const map = new Map();
+
+    // 定义递归函数处理菜单节点
+    function processMenuNode(menuNode) {
+      // 将当前节点存入Map
+      map.set(menuNode.menuId, menuNode);
+
+      // 如果有子节点且子节点数组不为空，则递归处理每个子节点
+      if (menuNode.children && Array.isArray(menuNode.children) && menuNode.children.length > 0) {
+        menuNode.children.forEach((childNode) => {
+          processMenuNode(childNode);
+        });
+      }
+    }
+
+    // 遍历根级菜单，逐个处理
+    if (menus.value && Array.isArray(menus.value)) {
+      menus.value.forEach((rootMenu) => {
+        processMenuNode(rootMenu);
+      });
+    }
+
+    return map;
+  }
+
+  function returnMenuName(menuId: number | string) {
+    const menu = menusIdMap.value.get(`${menuId}`);
+    return menu ? menu.title : '';
+  }
+  const menusIdMap = computed(() => {
+    const map = getMenuMap();
+    return map;
+  });
+
+  function menuJump(menuId: number | string) {
+    const menu = menusIdMap.value.get(`${menuId}`);
+    console.log('menu', menu);
+    if (menu) {
+      if (menu.name) {
+        router.push({ name: menu.name as string })
+
+      } else {
+        router.push({ path: menu.path as string })
+
+      }
+    }
+  }
 
   return {
+    menuJump,
+    returnMenuName,
+    menus,
     routes,
     mixedLayoutLeftRoutes,
     isRoutesLoaded,
diff --git a/src/store/modules/quick.ts b/src/store/modules/quick.ts
new file mode 100644
index 0000000..e08f465
--- /dev/null
+++ b/src/store/modules/quick.ts
@@ -0,0 +1,37 @@
+
+import { store } from "@/store";
+import quickApi, { type QuickMenu } from "@/api/account/quick";
+import { usePermissionStoreHook } from "@/store/modules/permission";
+
+
+export const useQuickStore = defineStore("quick", () => {
+  const quickMenus = ref<QuickMenu[]>([]);
+
+  async function getQuickMenus() {
+    const res = await quickApi.getList({ isEdit: 0 });
+    const obj: any = {}
+    let arr = []
+    for (let menu of res) {
+      if (obj.hasOwnProperty(menu.menuId) || menu.status != 1 || !usePermissionStoreHook().returnMenuName(menu.menuId)) {
+        continue;
+      } else {
+        obj[menu.menuId] = true;
+        arr.push(menu)
+      }
+    }
+    quickMenus.value = arr;
+  }
+  getQuickMenus()
+  return {
+    quickMenus, getQuickMenus
+  };
+});
+
+/**
+ * 用于在组件外部（如在Pinia Store 中）使用 Pinia 提供的 store 实例。
+ * 官方文档解释了如何在组件外部使用 Pinia Store：
+ * https://pinia.vuejs.org/core-concepts/outside-component-usage.html#using-a-store-outside-of-a-component
+ */
+export function useQuickStoreHook() {
+  return useQuickStore(store);
+}
diff --git a/src/views/shop/commonlyUsedMenu/index.vue b/src/views/shop/commonlyUsedMenu/index.vue
new file mode 100644
index 0000000..63a05ba
--- /dev/null
+++ b/src/views/shop/commonlyUsedMenu/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <FastMenuConfig></FastMenuConfig>
+  </div>
+</template>

From fb13b0a502cf13f41d85e8b69dec8f0065edf1fd Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 5 Jan 2026 13:36:24 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/sales.vue | 26 ++++++++++++++------------
 src/views/data/table.vue |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index d840b63..d894063 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -56,7 +56,7 @@
             </el-icon>
           </div>
           <div class="info">
-            <div class="m">￥{{ payCount.totalAmount || 0 }}</div>
+            <div class="m">￥{{ multiplyAndFormat(payCount.totalAmount || 0) }}</div>
             <div class="t">总金额</div>
           </div>
         </div>
@@ -67,7 +67,7 @@
             </el-icon>
           </div>
           <div class="info">
-            <div class="m">￥{{ payCount.refundAmount || 0 }}</div>
+            <div class="m">￥{{ multiplyAndFormat(payCount.refundAmount || 0) }}</div>
             <div class="t">退款金额</div>
           </div>
         </div>
@@ -100,7 +100,7 @@
             </el-icon>
           </div>
           <div class="info">
-            <div class="m">{{ payCount.totalAmount - payCount.refundAmount || 0 }}</div>
+            <div class="m">{{ multiplyAndFormat((payCount.totalAmount - payCount.refundAmount) || 0) }}</div>
             <div class="t">实际销售额总和</div>
           </div>
         </div>
@@ -111,7 +111,7 @@
             </el-icon>
           </div>
           <div class="info">
-            <div class="m">{{ payCount.saleCount - payCount.refundCount || 0 }}</div>
+            <div class="m">{{ multiplyAndFormat((payCount.saleCount - payCount.refundCount) || 0) }}</div>
             <div class="t">实际销量总和</div>
           </div>
         </div>
@@ -152,10 +152,10 @@
           <template v-slot="scope">￥{{ scope.row.refund }}</template>
         </el-table-column>
         <el-table-column label="实际销量" prop="refundCount">
-          <template v-slot="scope"> {{ scope.row.saleCount - scope.row.refundCount }} </template>
+          <template v-slot="scope"> {{ multiplyAndFormat(scope.row.saleCount - scope.row.refundCount) }} </template>
         </el-table-column>
         <el-table-column label="实际销售额" prop="refundCount">
-          <template v-slot="scope"> ￥{{ scope.row.saleAmount - scope.row.refundAmount }} </template>
+          <template v-slot="scope"> ￥{{ multiplyAndFormat(scope.row.saleAmount - scope.row.refundAmount) }} </template>
         </el-table-column>
       </el-table>
       <el-table :data="tableData.data" v-loading="tableData.loading" v-if="orderType == 2">
@@ -165,17 +165,17 @@
         <el-table-column label="商品名称" prop="productName"></el-table-column>
         <el-table-column label="销量" prop="saleCount" sortable></el-table-column>
         <el-table-column label="销售金额" prop="saleAmount" sortable>
-          <template v-slot="scope">￥{{ scope.row.saleAmount }}</template>
+          <template v-slot="scope">￥{{ multiplyAndFormat(scope.row.saleAmount) }}</template>
         </el-table-column>
         <el-table-column label="退单量" prop="refundCount" sortable></el-table-column>
         <el-table-column label="退款金额" prop="refundAmount" sortable>
-          <template v-slot="scope">￥{{ scope.row.refundAmount }}</template>
+          <template v-slot="scope">￥{{ multiplyAndFormat(scope.row.refundAmount) }}</template>
         </el-table-column>
         <el-table-column label="实际销量" prop="refundCount" sortable>
-          <template v-slot="scope"> {{ scope.row.saleCount - scope.row.refundCount }} </template>
+          <template v-slot="scope"> {{ multiplyAndFormat(scope.row.saleCount - scope.row.refundCount) }} </template>
         </el-table-column>
         <el-table-column label="实际销售额" prop="refundCount" sortable>
-          <template v-slot="scope"> ￥{{ scope.row.saleAmount - scope.row.refundAmount }} </template>
+          <template v-slot="scope"> ￥{{ multiplyAndFormat(scope.row.saleAmount - scope.row.refundAmount) }} </template>
         </el-table-column>
       </el-table>
     </div>
@@ -193,12 +193,13 @@ import saleSummaryApi from "@/api/order/sale-summary";
 import categoryApi from "@/api/product/productclassification";
 import ShopApi from "@/api/account/shop";
 import dayjs from "dayjs";
-import { downloadFile } from "@/utils/index";
+import { downloadFile, multiplyAndFormat } from "@/utils/index";
 import { formatDateRange } from './utils/index.js'
 
 export default {
   data() {
     return {
+      multiplyAndFormat,
       timeValue: "today",
       resetQuery: null,
       orderType: "2",
@@ -314,7 +315,8 @@ export default {
           endDate: this.query.createdAt[1],
           categoryId: this.query.prodCategoryId,
           productName: this.query.productName,
-          shopId: this.shopId
+          shopId: this.shopId,
+          rangeType: this.timeValue,
         });
         downloadFile(file, "数据", "xlsx");
       } catch (error) {
diff --git a/src/views/data/table.vue b/src/views/data/table.vue
index 4af4868..634406c 100644
--- a/src/views/data/table.vue
+++ b/src/views/data/table.vue
@@ -187,7 +187,8 @@ export default {
         const file = await tableSummaryApi.export({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
-          shopId: this.shopId
+          shopId: this.shopId,
+          rangeType: this.timeValue,
         });
         downloadFile(file, "数据", "xlsx");
         this.downloadLoading = false;