From 6feeaf919ed84f90de1e0b6ef3c16eeed510a057 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 28 Sep 2024 15:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E5=BC=80=E5=8F=91=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=8C=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json             | 11 ++++-
 pageLineUp/callRecord.vue | 12 +++---
 pages.json                | 89 ++++++++++++++++++++++++---------------
 pages/index/index.vue     | 15 +++++--
 pages/login/index.vue     |  8 +++-
 开发文档.md               |  6 ++-
 6 files changed, 96 insertions(+), 45 deletions(-)

diff --git a/manifest.json b/manifest.json
index eec5382..23d533f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -223,7 +223,16 @@
                     "pathRewrite" : {
                         "/ysk" : ""
                     }
-                }
+                },
+				"/ww" : {
+				    // 需要被代理的后台地址
+				    "target" : "http://192.168.1.15:8000",
+				    "changeOrigin" : true,
+				    "secure" : false,
+				    "pathRewrite" : {
+				        "/ww" : ""
+				    }
+				}
             }
         }
     },
diff --git a/pageLineUp/callRecord.vue b/pageLineUp/callRecord.vue
index 9a7b52a..69f899e 100644
--- a/pageLineUp/callRecord.vue
+++ b/pageLineUp/callRecord.vue
@@ -77,12 +77,12 @@
 </script>
 
 <style scoped lang="less">
-	* {
-		padding: 0;
-		margin: 0;
-		text-decoration: none;
-		outline: none;
-	}
+	// * {
+	// 	padding: 0;
+	// 	margin: 0;
+	// 	text-decoration: none;
+	// 	outline: none;
+	// }
 
 	ul,
 	li {
diff --git a/pages.json b/pages.json
index 088c488..041cb1c 100644
--- a/pages.json
+++ b/pages.json
@@ -127,7 +127,7 @@
 				"navigationBarTitleText": "选择门店"
 			}
 		},
-		
+
 		{
 			"pageId": "PAGES_USER_SETUP",
 			"path": "pages/userSetUp/userSetUp",
@@ -994,7 +994,8 @@
 					"pageId": "PAGES_CREATE_ORDER",
 					"path": "index/index",
 					"style": {
-						"navigationBarTitleText": "代客下单"
+						// "navigationBarTitleText": "代客下单"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1233,38 +1234,35 @@
 		{
 			"root": "pagesOrder",
 			"pages": [{
-				"pageId": "PAGES_ORDER_INDEX",
-				"path" : "index/index",
-				"style" : 
+					"pageId": "PAGES_ORDER_INDEX",
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "订单管理",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
-					"navigationBarTitleText" : "订单管理"
-				}
-			},
-			{
-				"pageId": "PAGES_ORDER_DETAIL",
-				"path" : "detail/detail",
-				"style" : 
+					"pageId": "PAGES_ORDER_DETAIL",
+					"path": "detail/detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
 				{
-					"navigationBarTitleText" : "订单详情"
-				}
-			},
-			{
-				"pageId": "PAGES_ORDER_PAY",
-				"path" : "pay-order/pay-order",
-				"style" : 
+					"pageId": "PAGES_ORDER_PAY",
+					"path": "pay-order/pay-order",
+					"style": {
+						"navigationBarTitleText": "结账"
+					}
+				},
 				{
-					"navigationBarTitleText" : "结账"
+					"pageId": "PAGES_ORDER_TUIKUAN",
+					"path": "tuikuan/tuikuan",
+					"style": {
+						"navigationBarTitleText": "退款"
+					}
 				}
-			},
-			{
-				"pageId": "PAGES_ORDER_TUIKUAN",
-				"path" : "tuikuan/tuikuan",
-				"style" : 
-				{
-					"navigationBarTitleText" : "退款"
-				}
-			}
-				
+
 			]
 		},
 		{
@@ -1309,14 +1307,13 @@
 				"style": {
 					"navigationBarTitleText": "排队"
 				}
-			},{
+			}, {
 				"pageId": "PAGES_CALLRE_CORD",
 				"path": "callRecord",
 				"style": {
 					"navigationBarTitleText": "叫号记录"
 				}
-			}		
-			]
+			}]
 		},
 
 		{
@@ -1374,6 +1371,32 @@
 				}
 
 			]
+		},
+		{
+			"root": "pageGoodsGroup",
+			"pages": [{
+					"pageId": "PAGES_GOODS_GROUP",
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "分组管理"
+					}
+				},
+				{
+					"pageId": "PAGES_GOODS_GROUP_EDIT",
+					"path": "edit-group/edit-group",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"pageId": "PAGES_GOODS_GROUP_EDIT_GOODS",
+					"path" : "edit-group-goods/edit-group-goods",
+					"style" : 
+					{
+						"navigationBarTitleText" : "管理商品"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 590e0f0..919f04a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -44,8 +44,7 @@
 		$adList
 	} from '@/http/apiManager.js';
 	uni.hideTabBar()
-	onLoad((options) => {
-	});
+	onLoad((options) => {});
 	// 导航列表
 	const navList = [{
 			title: '收银',
@@ -62,6 +61,11 @@
 			icon: '/static/indexImg/icon-product-control.svg',
 			pageUrl: 'PAGES_PRODUCT',
 		},
+		{
+			title: '分组管理',
+			icon: '/static/indexImg/goods-group.svg',
+			pageUrl: 'PAGES_GOODS_GROUP',
+		},
 		{
 			title: '分类管理',
 			icon: '/static/indexImg/icon-category.svg',
@@ -76,7 +80,7 @@
 			title: '桌台',
 			icon: '/static/indexImg/icon-table.svg',
 			pageUrl: 'PAGES_TABLE'
-		},{
+		}, {
 			title: '排队',
 			icon: '/static/indexImg/icon-table.svg',
 			pageUrl: 'PAGES_LINE_UP'
@@ -204,6 +208,11 @@
 			title: '耗材管理',
 			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
 			pageUrl: 'PAGES_SALES_CONSUMABLES'
+		},
+		{
+			title: '退出登录',
+			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			pageUrl: 'PAGES_LOGIN'
 		}
 
 	];
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7558b1b..2dfbfe3 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -212,9 +212,15 @@
 		},
 
 	})
-
+	// #ifdef H5
 	vdata.formData.username = '19502966242'
 	vdata.formData.pwd = '11280923'
+	// #endif
+	// #ifdef MP-WEIXIN
+	vdata.formData.username = '15699991111'
+	vdata.formData.pwd = 'qwer1234'
+	// #endif
+	
 
 	const getCode = () => {
 		getCodeImg().then(res => {
diff --git a/开发文档.md b/开发文档.md
index b44ed46..4cca566 100644
--- a/开发文档.md
+++ b/开发文档.md
@@ -19,8 +19,12 @@ H5, 不影响。
 
 * uni-drawer 组件使用的 px :style="{width:drawerWidth+'px'}" 单位 使用时 请将组件内 改为rpx 		``<view class="uni-drawer__content" :class="{'uni-drawer--right': rightMode,'uni-drawer--left': !rightMode, 'uni-drawer__content--visible': showDrawer}" :style="{width:drawerWidth+'rpx'}">``
 由于是动态传参 所以无法样式复写
- 
+
+### 微信小程序兼容行考虑
+* 分包内组件路径为 /分包目录/*/组件名称; 使用@/分包目录/*/组件名称会报错。
+* 分包只能使用分包内的图路径或者static目录下 分包使用别的分包下图片会导致图片未找到
 * uni tabBar 配置项 请参考 [tabBar配置网址]<https://uniapp.dcloud.net.cn/collocation/pages.html#tabbar> 
+* 
 ### 打包注意事项
 
 * 准备资料：