From 89f92831637aff9713e430c8e8ff17af3dc516d6 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 25 Nov 2025 16:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E7=89=88=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=94=80=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/data_home_item5.png         | Bin 0 -> 3372 bytes
 src/assets/images/data_home_item6.png         | Bin 0 -> 3317 bytes
 src/views/data/index.vue                      | 197 +++++++++++++++---
 src/views/data/sales.vue                      |  43 +++-
 .../components/getDetailDialog.vue            |  14 +-
 src/views/shop/config/components/shopInfo.vue |  32 +--
 6 files changed, 241 insertions(+), 45 deletions(-)
 create mode 100644 src/assets/images/data_home_item5.png
 create mode 100644 src/assets/images/data_home_item6.png

diff --git a/src/assets/images/data_home_item5.png b/src/assets/images/data_home_item5.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc35367642ede4871853d3d87fd78ec862145278
GIT binary patch
literal 3372
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/data_home_item6.png b/src/assets/images/data_home_item6.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d26555337ee0372a7bb7f6170e02fd0d5ada9fc
GIT binary patch
literal 3317
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

literal 0
HcmV?d00001

diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index ffdaebf..dee11b1 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -57,15 +57,15 @@
             <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
           </el-select>
           <div class="time_wrap u-flex" style="flex-shrink: 0">
-            <el-radio-group v-model="timeValue" class="m-r-5" @change="timeChange">
-              <el-radio-button value="today">今天</el-radio-button>
-              <el-radio-button value="yesterday">昨天</el-radio-button>
-              <el-radio-button value="last_7_days">最近7天</el-radio-button>
-              <el-radio-button value="last_30_days">最近30天</el-radio-button>
-              <el-radio-button value="this_week">本周</el-radio-button>
-              <el-radio-button value="this_month">本月</el-radio-button>
-              <el-radio-button value="custom">自定义</el-radio-button>
-            </el-radio-group>
+            <div class="date_list">
+              <div class="item" :class="{ active: dataListActive == index }" v-for="(item, index) in dateList"
+                :key="item.value" @click="timeChange(item.value, index)">
+                <!-- 标签文本 -->
+                <span class="date-tab-item">{{ item.label }}</span>
+                <!-- 分隔符：非最后一项才显示 -->
+                <span class="separator" v-if="index < dateList.length - 1">|</span>
+              </div>
+            </div>
             <div class="u-flex">
               <el-date-picker v-if="timeValue == 'custom'" v-model="query.createdAt" type="daterange"
                 range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD"
@@ -129,7 +129,7 @@
                       <div class="item">
                         <div class="left">
                           <img class="icon" src="@/assets/images/data/cash.png" />
-                          <span>会员支付</span>
+                          <span>余额支付</span>
                         </div>
                         <span class="num">{{ trade.memberPayAmount || 0 }}</span>
                       </div>
@@ -241,16 +241,26 @@
         </div>
         <div class="btm">
           <div class="item item1">
-            <div class="title">客单价</div>
+            <div class="title">
+              客单价
+              <el-tooltip effect="dark" :content="`订单实付金额（${trade.payAmount}）/就餐人数（${trade.customerCount || 0}）`"
+                placement="top">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item1_icon.png" />
-              <div class="t">{{ formatDecimal(trade.avgPayAmount || 0) }}</div>
+              <div class="t" style="color: #0080FF;">{{ formatDecimal(trade.avgPayAmount || 0) }}</div>
             </div>
           </div>
           <div class="item item2">
             <div class="title">
               翻台率
-              <el-tooltip effect="dark" content="翻台率=（客单数-桌台数）/桌台数*100%" placement="top">
+              <el-tooltip effect="dark"
+                :content="`翻台率=（客单数（${trade.customerCount || 0}）-桌台数（${trade.tableCount || 0}））/桌台数*100%`"
+                placement="top">
                 <el-icon>
                   <QuestionFilled />
                 </el-icon>
@@ -258,51 +268,110 @@
             </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item2_icon.png" />
-              <div class="t">{{ trade.turnoverRate || 0 }}%</div>
+              <div class="t" style="color: #FFB200;">{{ trade.turnoverRate || 0 }}%</div>
             </div>
           </div>
           <div class="item item3">
-            <div class="title">优惠金额</div>
+            <div class="title">
+              优惠金额
+              <el-tooltip popper-class="popper" effect="light" placement="bottom">
+                <template #content>
+                  <div class="tips_row">
+                    <div class="item">
+                      <div class="left">
+                        <span>优惠类目</span>
+                      </div>
+                      <span class="num">优惠金额</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>新客立减</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.newCustomerDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>满减活动</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.fullDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>优惠券抵扣</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.couponDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>积分抵扣</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.pointDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>霸王餐</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.backDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>会员折扣</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.memberDiscountAmount || 0) }}</span>
+                    </div>
+                    <div class="item">
+                      <div class="left">
+                        <span>订单改价</span>
+                      </div>
+                      <span class="num">{{ multiplyAndFormat(trade.orderPriceDiscountAmount || 0) }}</span>
+                    </div>
+                  </div>
+                </template>
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item3_icon.png" />
-              <div class="t">{{ formatDecimal(trade.discountAmount || 0) }}</div>
+              <div class="t" style="color: #FF8000;">{{ formatDecimal(trade.discountAmount || 0) }}</div>
             </div>
           </div>
           <div class="item item4">
             <div class="title">优惠笔数</div>
             <div class="icon_wrap">
               <img class="img" src="@/assets/images/data_home_item4_icon.png" />
-              <div class="t">{{ trade.discountCount || 0 }}</div>
+              <div class="t" style="color: #00CB71;">{{ trade.discountCount || 0 }}</div>
             </div>
           </div>
-          <div class="item item1">
+          <div class="item item5">
             <div class="row_wrap">
               <div class="row">
                 <div class="title">毛利润</div>
                 <div class="icon_wrap">
-                  <div class="t">{{ trade.profitAmount || 0 }}</div>
+                  <div class="t" style="color: #0000C2;">{{ trade.profitAmount || 0 }}</div>
                 </div>
               </div>
               <div class="row">
                 <div class="title">毛利率</div>
                 <div class="icon_wrap">
-                  <div class="t">{{ trade.profitRate || 0 }}%</div>
+                  <div class="t" style="color: #0000C2;">{{ trade.profitRate || 0 }}%</div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="item item4">
+          <div class="item item6">
             <div class="row_wrap">
               <div class="row">
                 <div class="title">净利润</div>
                 <div class="icon_wrap">
-                  <div class="t">{{ trade.netProfitAmount || 0 }}</div>
+                  <div class="t" style="color: #E30675;">{{ trade.netProfitAmount || 0 }}</div>
                 </div>
               </div>
               <div class="row">
                 <div class="title">净利率</div>
                 <div class="icon_wrap">
-                  <div class="t">{{ trade.netProfitRate || 0 }}%</div>
+                  <div class="t" style="color: #E30675;">{{ trade.netProfitRate || 0 }}%</div>
                 </div>
               </div>
             </div>
@@ -397,10 +466,43 @@ import dayjs from "dayjs";
 import * as echarts from "echarts";
 import { debounce, formatDecimal } from "@/utils/tools";
 import { formatDateRange } from './utils/index.js'
+import { multiplyAndFormat } from '@/utils/index.js'
 export default {
   name: "home",
   data() {
     return {
+      multiplyAndFormat,
+      dataListActive: 0,
+      dateList: [
+        {
+          label: "今天",
+          value: "today",
+        },
+        {
+          label: "昨天",
+          value: "yesterday",
+        },
+        {
+          label: "最近7天",
+          value: "last_7_days",
+        },
+        {
+          label: "最近30天",
+          value: "last_30_days",
+        },
+        {
+          label: "本周",
+          value: "this_week",
+        },
+        {
+          label: "本月",
+          value: "this_month",
+        },
+        {
+          label: "自定义",
+          value: "custom",
+        },
+      ],
       payCount: [
         {
           icon: "https://cashier-oss.oss-cn-beijing.aliyuncs.com/static/wx.png",
@@ -557,7 +659,9 @@ export default {
       this.dateProduct()
     },
     // 切换时间
-    timeChange(e) {
+    timeChange(e, index = 0) {
+      this.dataListActive = index;
+      this.timeValue = e;
       this.query.createdAt = formatDateRange(e)
       if (e != "custom") {
         this.summarytrade();
@@ -1376,6 +1480,14 @@ export default {
           background-image: url("../../assets/images/data_home_item4.png");
         }
 
+        &.item5 {
+          background-image: url("../../assets/images/data_home_item5.png");
+        }
+
+        &.item6 {
+          background-image: url("../../assets/images/data_home_item6.png");
+        }
+
         .row_wrap {
           display: flex;
           width: 100%;
@@ -1398,6 +1510,7 @@ export default {
           align-items: center;
           color: #333;
           font-size: 14px;
+          gap: 8px;
 
           .icon {
             font-size: 12px;
@@ -1419,6 +1532,7 @@ export default {
           .t {
             font-size: 24px;
             margin-left: 10px;
+            font-weight: bold;
           }
         }
       }
@@ -1586,7 +1700,8 @@ export default {
 
     .num {
       font-size: 32px;
-      color: #3F9EFF;
+      color: var(--el-color-primary);
+      font-weight: bold;
     }
 
     .tips {
@@ -1595,4 +1710,36 @@ export default {
     }
   }
 }
+
+.date_list {
+  display: flex;
+  margin-right: 10px;
+
+  .item {
+    font-size: 14px;
+    color: #999999;
+    display: flex;
+    align-items: center;
+
+    &.active {
+      .date-tab-item {
+        color: var(--el-color-primary);
+      }
+    }
+
+    .date-tab-item {
+      cursor: pointer;
+
+      &:hover {
+        color: var(--el-color-primary-light-3);
+      }
+    }
+
+    .separator {
+      margin: 0 6px;
+      position: relative;
+      top: -1px;
+    }
+  }
+}
 </style>
diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index b36c63d..d88f082 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -94,6 +94,28 @@
             <div class="t">退单量</div>
           </div>
         </div>
+        <div class="item">
+          <div class="icon_wrap" style="--bg-color: #c978ee">
+            <el-icon color="#fff">
+              <ShoppingCart />
+            </el-icon>
+          </div>
+          <div class="info">
+            <div class="m">{{ payCount.totalAmount - payCount.refundAmount || 0 }}</div>
+            <div class="t">实际销售额总和</div>
+          </div>
+        </div>
+        <div class="item">
+          <div class="icon_wrap" style="--bg-color: #c978ee">
+            <el-icon color="#fff">
+              <ShoppingCart />
+            </el-icon>
+          </div>
+          <div class="info">
+            <div class="m">{{ payCount.saleCount - payCount.refundCount || 0 }}</div>
+            <div class="t">实际销量总和</div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="head-container">
@@ -122,7 +144,6 @@
         <el-table-column label="会员支付" prop="cash">
           <template v-slot="scope">￥{{ scope.row.deposit }}</template>
         </el-table-column>
-
         <!-- <el-table-column label="充值金额" prop="cash">
           <template v-slot="scope">
             ￥{{ scope.row.recharge }}
@@ -131,6 +152,12 @@
         <el-table-column label="退款金额" prop="cash">
           <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>
+        </el-table-column>
+        <el-table-column label="实际销售额" prop="refundCount">
+          <template v-slot="scope"> ￥{{ 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">
         <!-- <el-table-column label="商品分类" prop="cateName"></el-table-column>
@@ -145,6 +172,12 @@
         <el-table-column label="退款金额" prop="refundAmount">
           <template v-slot="scope">￥{{ scope.row.refundAmount }}</template>
         </el-table-column>
+        <el-table-column label="实际销量" prop="refundCount">
+          <template v-slot="scope"> {{ 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>
+        </el-table-column>
       </el-table>
     </div>
     <div class="head-container">
@@ -346,6 +379,14 @@ export default {
     background-image: url(../../assets/images/home/data_forms1.png);
   }
 
+  .item:nth-child(5) {
+    background-image: url(../../assets/images/home/data_forms2.png);
+  }
+
+  .item:nth-child(6) {
+    background-image: url(../../assets/images/home/data_forms1.png);
+  }
+
   .item {
     background-size: 100% 100%;
     width: 255px;
diff --git a/src/views/marketing_center/components/getDetailDialog.vue b/src/views/marketing_center/components/getDetailDialog.vue
index 6028e71..d95dd24 100644
--- a/src/views/marketing_center/components/getDetailDialog.vue
+++ b/src/views/marketing_center/components/getDetailDialog.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog title="已领取详情" v-model="dialogVisible" width="80%" top="5vh">
+		<el-dialog title="已领取详情" v-model="dialogVisible" width="860px" top="5vh">
 			<div>
 				<el-form :model="querForm" inline>
 					<el-form-item label="搜索">
@@ -21,8 +21,8 @@
 							@change="datePickerChange" />
 					</el-form-item>
 					<el-form-item label-width="0">
-						<el-button type="primary" @click="searchHandle">搜索</el-button>
-						<el-button @click="resetHandle">重置</el-button>
+						<el-button type="primary" icon="Search" :loading="tableData.loading" @click="searchHandle">搜索</el-button>
+						<el-button icon="Refresh" :loading="tableData.loading" @click="resetHandle">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -57,7 +57,7 @@
 				</div>
 			</div>
 			<div>
-				<el-table :data="tableData.list" border stripe v-loading="tableData.loading" height="64vh">
+				<el-table :data="tableData.list" border stripe v-loading="tableData.loading" height="54vh">
 					<el-table-column label="用户ID" prop="userId" width="80"></el-table-column>
 					<el-table-column label="用户名称" prop="name" width="200">
 						<template #default="scope">
@@ -80,7 +80,7 @@
 							</el-tag>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作">
+					<el-table-column label="操作" width="100">
 						<template #default="scope">
 							<template v-if="scope.row.status == 0">
 								<el-popconfirm title="确认要失效吗？" @confirm="deleteHandle(scope.row)">
@@ -229,7 +229,9 @@ async function couponRecordAjax() {
 	} catch (error) {
 		console.log(error);
 	}
-	tableData.loading = false;
+	setTimeout(() => {
+		tableData.loading = false;
+	}, 500);
 }
 
 // 删除用户优惠券
diff --git a/src/views/shop/config/components/shopInfo.vue b/src/views/shop/config/components/shopInfo.vue
index 1c234d4..dc81dfa 100644
--- a/src/views/shop/config/components/shopInfo.vue
+++ b/src/views/shop/config/components/shopInfo.vue
@@ -160,9 +160,10 @@
               <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">
+            <div class="center" v-if="form.isOrderFence == 1">
               <el-input v-model="form.orderFenceDistance" placeholder="请输入"
-                @input="e => form.orderFenceDistance = filterNumberInput(e)" style="width: 250px;" :cus>
+                @input="e => form.orderFenceDistance = filterNumberInput(e)" style="width: 250px;"
+                input-style="text-align: center;">
                 <template #prepend>限制：</template>
                 <template #append>公里</template>
               </el-input>
@@ -260,7 +261,7 @@ export default {
             trigger: "blur",
             validator: (rule, value, callback) => {
               if (this.form.isOrderFence === 1 && (!this.form.orderFenceDistance || this.form.orderFenceDistance <= 0)) {
-                callback(new Error("请输入限制米数"));
+                callback(new Error("请输入限制公里数"));
               } else {
                 callback();
               }
@@ -391,29 +392,34 @@ export default {
     // 保存
     submitHandle() {
       this.$refs.form.validate(async (valid) => {
-        console.log(valid);
         if (valid) {
-          this.formLoading = true;
           try {
+            this.formLoading = true;
             if (this.startTime && this.endTime) {
               this.form.businessTime = `${this.startTime}-${this.endTime}`;
             }
+
+            const data = { ...this.form }
+
             if (this.form.isOrderFence == 1) {
-              this.form.orderFenceDistance = this.form.orderFenceDistance * 1000
+              data.orderFenceDistance = this.form.orderFenceDistance * 1000
             }
-            const res = await ShopApi.edit({
-              ...this.form,
+
+            await ShopApi.edit({
+              ...data,
               eatModel: this.form.eatModel.join(","),
             });
+
             ElMessage.success({
               title: "成功",
               message: "提交成功",
             });
-            setTimeout(() => {
-              // location.reload();
-            }, 1000);
-          } catch (error) { }
-          this.formLoading = false;
+          } catch (error) {
+            console.log(error);
+          }
+          setTimeout(() => {
+            this.formLoading = false;
+          }, 500);
         }
       });
     },