From cfed2474aefa2a01ed237e698d8e296fa4d32a15 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 10 Sep 2024 10:33:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageSalesSummary/index.vue                | 22 +++++++++
 jeepay-ui-uapp-merchant/pages.json            | 48 +++++++++++--------
 jeepay-ui-uapp-merchant/pages/index/index.vue | 13 +++--
 .../static/indexImg/PAGE_SALES_SUMMARY.svg    |  1 +
 4 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 jeepay-ui-uapp-merchant/pageSalesSummary/index.vue
 create mode 100644 jeepay-ui-uapp-merchant/static/indexImg/PAGE_SALES_SUMMARY.svg

diff --git a/jeepay-ui-uapp-merchant/pageSalesSummary/index.vue b/jeepay-ui-uapp-merchant/pageSalesSummary/index.vue
new file mode 100644
index 0000000..1d5cc61
--- /dev/null
+++ b/jeepay-ui-uapp-merchant/pageSalesSummary/index.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		123
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/jeepay-ui-uapp-merchant/pages.json b/jeepay-ui-uapp-merchant/pages.json
index be5161d..5d90f77 100644
--- a/jeepay-ui-uapp-merchant/pages.json
+++ b/jeepay-ui-uapp-merchant/pages.json
@@ -1002,10 +1002,9 @@
 				},
 				{
 					"pageId": "PAGES_CRESATE_ORDER_PAY",
-					"path" : "pay-order/pay-order",
-					"style" : 
-					{
-						"navigationBarTitleText" : "结账"
+					"path": "pay-order/pay-order",
+					"style": {
+						"navigationBarTitleText": "结账"
 					}
 				}
 
@@ -1214,26 +1213,35 @@
 					"navigationBarTitleText": "添加折扣券"
 				}
 			}]
-		},{
+		},
+		{
+			"root": "pageSalesSummary",
+			"pages": [{
+				"pageId": "PAGES_SALES_SUMMARY",
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "销售汇总"
+				}
+			}]
+		},
+		{
 			"root": "pagePrinter",
 			"pages": [{
-				"pageId": "PAGES_PRINTER_INDEX",
-				"path" : "index/index",
-				"style" : 
+					"pageId": "PAGES_PRINTER_INDEX",
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "打印机"
+					}
+				},
 				{
-					"navigationBarTitleText" : "打印机"
+					"pageId": "PAGES_PRINTER_ADD",
+					"path": "add-printer/add-printer",
+					"style": {
+						// "navigationBarTitleText" : "添加/编辑云打印机"
+						"navigationBarTitleText": ""
+					}
 				}
-			},
-			{
-				"pageId": "PAGES_PRINTER_ADD",
-				"path" : "add-printer/add-printer",
-				"style" : 
-				{
-					// "navigationBarTitleText" : "添加/编辑云打印机"
-					"navigationBarTitleText" : ""
-				}
-			}
-				
+
 			]
 		}
 	],
diff --git a/jeepay-ui-uapp-merchant/pages/index/index.vue b/jeepay-ui-uapp-merchant/pages/index/index.vue
index c8fd3df..27e6064 100644
--- a/jeepay-ui-uapp-merchant/pages/index/index.vue
+++ b/jeepay-ui-uapp-merchant/pages/index/index.vue
@@ -189,12 +189,17 @@
 			icon: '/static/indexImg/red-envelope.svg',
 			pageUrl: 'PAGES_INVOICE'
 		},
+		// {
+		// 	title: '优惠券',
+		// 	icon: '/static/indexImg/red-envelope.svg',
+		// 	pageUrl: 'PAGES_COUPON_INDEX'
+		// },
 		{
-			title: '优惠券',
-			icon: '/static/indexImg/red-envelope.svg',
-			pageUrl: 'PAGES_COUPON_INDEX'
+			title: '销售汇总',
+			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			pageUrl: 'PAGES_SALES_SUMMARY'
 		}
-		
+
 	];
 	// 如果不是超管 删除 刷脸广告菜单
 	if (storageManage.userInfo().userType != 1) {
diff --git a/jeepay-ui-uapp-merchant/static/indexImg/PAGE_SALES_SUMMARY.svg b/jeepay-ui-uapp-merchant/static/indexImg/PAGE_SALES_SUMMARY.svg
new file mode 100644
index 0000000..a53761d
--- /dev/null
+++ b/jeepay-ui-uapp-merchant/static/indexImg/PAGE_SALES_SUMMARY.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><defs><style>.a{fill:#80bcff;}.b{clip-path:url(#a);}.c{fill:#4c99fe;}.d{fill:#fff;}.e{fill:#197dff;}</style><clipPath id="a"><rect class="a" width="32" height="32" transform="translate(76 613)"/></clipPath></defs><g class="b" transform="translate(-76 -613)"><g transform="translate(-0.51 -0.558)"><path class="c" d="M202.8,232.594H226.9a1.794,1.794,0,0,1,1.723,1.856v22.427a3.582,3.582,0,0,1-3.441,3.707H204.526a3.582,3.582,0,0,1-3.441-3.707V234.45A1.794,1.794,0,0,1,202.8,232.594Z" transform="translate(-122.041 384.039)"/><path class="c" d="M282.743,187.085H299.43a2.35,2.35,0,1,1,0,4.621H282.743a2.35,2.35,0,1,1,0-4.621Z" transform="translate(-197.833 427.409)"/><path class="d" d="M.117,13.411a.876.876,0,0,1,0-.874.845.845,0,0,1,.753-.423H13.726a.845.845,0,0,1,.753.423.876.876,0,0,1,0,.874.848.848,0,0,1-.733.424H.849A.846.846,0,0,1,.117,13.411ZM1.343,9.225a.829.829,0,0,1-.594-.253.87.87,0,0,1,0-1.217L5.292,3.14a.837.837,0,0,1,1.2,0l.017.018L8.694,5.324l3.342-3.4-.06-.06A.819.819,0,0,1,12.35.5L14.22.024a.8.8,0,0,1,.974.595.844.844,0,0,1,0,.4l-.469,1.9a.8.8,0,0,1-.974.595.78.78,0,0,1-.373-.216l-.144-.146L9.339,7.106A.841.841,0,0,1,8.7,7.4l0,0a.822.822,0,0,1-.488-.156h0L8.2,7.226l0,0-.012-.009,0,0L8.167,7.2l-.006,0-.01-.008-.006-.005-.009-.009-.006-.005-.01-.009,0,0,0,0L5.9,4.958,1.947,8.97a.837.837,0,0,1-.6.255Z" transform="translate(85.644 625.069)"/><path class="e" d="M2.781,2.482A2.579,2.579,0,0,1,0,.172Q0,.085.008,0H22.242q.008.085.008.172a2.579,2.579,0,0,1-2.781,2.31Z" transform="translate(82.129 616.633)"/></g></g></svg>
\ No newline at end of file