From d0e44848d4e0d92f8b77c4f2bdeba4f587f92d23 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Tue, 22 Oct 2024 18:09:23 +0800
Subject: [PATCH] 111

---
 pages.json                                    | 91 ++++++++++---------
 pages_admin/admin_worke.vue                   |  6 +-
 .../worke => pages_adminSet}/CarModel.vue     |  4 +-
 .../ChargingDetail.vue                        |  0
 .../ChargingTemplate.vue                      |  4 +-
 .../worke => pages_adminSet}/modelMt.vue      |  0
 .../worke => pages_adminSet}/sysSet.vue       |  0
 7 files changed, 53 insertions(+), 52 deletions(-)
 rename {pages_admin/worke => pages_adminSet}/CarModel.vue (98%)
 rename {pages_admin/worke => pages_adminSet}/ChargingDetail.vue (100%)
 rename {pages_admin/worke => pages_adminSet}/ChargingTemplate.vue (98%)
 rename {pages_admin/worke => pages_adminSet}/modelMt.vue (100%)
 rename {pages_admin/worke => pages_adminSet}/sysSet.vue (100%)

diff --git a/pages.json b/pages.json
index 4644a67..04d7eb8 100644
--- a/pages.json
+++ b/pages.json
@@ -185,54 +185,10 @@
 							"navigationStyle": "custom",
 						"enablePullDownRefresh" : false
 					}
-				},
-				{
-					"path" : "worke/CarModel",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-							"navigationStyle": "custom",
-						"enablePullDownRefresh" : false
-					}
-				},
-				{
-					"path" : "worke/modelMt",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-							"navigationStyle": "custom",
-						"enablePullDownRefresh" : false
-					}
-				},
-				{
-					"path" : "worke/ChargingTemplate",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-							"navigationStyle": "custom",
-						"enablePullDownRefresh" : false
-					}
-				},
-				{
-					"path" : "worke/ChargingDetail",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-							"navigationStyle": "custom",
-						"enablePullDownRefresh" : false
-					}
-				},
-				{
-					"path" : "worke/sysSet",
-					"style" : 
-					{
-						"navigationBarTitleText" : "",
-						"navigationStyle": "custom",
-						"enablePullDownRefresh" : false
-					}
 				}
 				
 				
+				
 
 				// ... 分包A的其他页面  
 			]
@@ -366,6 +322,51 @@
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "CarModel",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+							"navigationStyle": "custom",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
+					"path" : "modelMt",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+							"navigationStyle": "custom",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
+					"path" : "ChargingTemplate",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+							"navigationStyle": "custom",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
+					"path" : "ChargingDetail",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+							"navigationStyle": "custom",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
+					"path" : "sysSet",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh" : false
+					}
 				}
 			
 				
diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue
index 4c1291a..0d62c8f 100644
--- a/pages_admin/admin_worke.vue
+++ b/pages_admin/admin_worke.vue
@@ -274,15 +274,15 @@
 					})
 				}else if(num==9){
 					uni.navigateTo({
-						url:'/pages_admin/worke/CarModel'
+						url:'/pages_adminSet/CarModel'
 					})
 				}else if(num==10){
 					uni.navigateTo({
-						url:'/pages_admin/worke/ChargingTemplate'
+						url:'/pages_adminSet/ChargingTemplate'
 					})
 				}else if(num==11){
 					uni.navigateTo({
-						url:'/pages_admin/worke/sysSet'
+						url:'/pages_adminSet/sysSet'
 					})
 				}
 				
diff --git a/pages_admin/worke/CarModel.vue b/pages_adminSet/CarModel.vue
similarity index 98%
rename from pages_admin/worke/CarModel.vue
rename to pages_adminSet/CarModel.vue
index 718ab00..2e4ba5a 100644
--- a/pages_admin/worke/CarModel.vue
+++ b/pages_adminSet/CarModel.vue
@@ -74,7 +74,7 @@
 		methods: {
 			addmodel(){
 				uni.navigateTo({
-					url:'/pages_admin/worke/modelMt'
+					url:'/pages_adminSet/modelMt'
 				})
 			},
 			del(item){
@@ -111,7 +111,7 @@
 			},
 			todetail(item){
 				uni.navigateTo({
-					url:'/pages_admin/worke/modelMt?modelId='+item.modelId
+					url:'/pages_adminSet/modelMt?modelId='+item.modelId
 				})
 			},
 			getModelList(){
diff --git a/pages_admin/worke/ChargingDetail.vue b/pages_adminSet/ChargingDetail.vue
similarity index 100%
rename from pages_admin/worke/ChargingDetail.vue
rename to pages_adminSet/ChargingDetail.vue
diff --git a/pages_admin/worke/ChargingTemplate.vue b/pages_adminSet/ChargingTemplate.vue
similarity index 98%
rename from pages_admin/worke/ChargingTemplate.vue
rename to pages_adminSet/ChargingTemplate.vue
index 4cbe8d1..07adfca 100644
--- a/pages_admin/worke/ChargingTemplate.vue
+++ b/pages_adminSet/ChargingTemplate.vue
@@ -178,7 +178,7 @@
 			},
 			addmodel() {
 				uni.navigateTo({
-					url: '/pages_admin/worke/ChargingDetail'
+					url: '/pages_adminSet/ChargingDetail'
 				})
 			},
 			del(item) {
@@ -215,7 +215,7 @@
 			},
 			todetail(item) {
 				uni.navigateTo({
-					url: '/pages_admin/worke/ChargingDetail?ruleId=' + item.ruleId
+					url: '/pages_adminSet/ChargingDetail?ruleId=' + item.ruleId
 				})
 			},
 			getModelList() {
diff --git a/pages_admin/worke/modelMt.vue b/pages_adminSet/modelMt.vue
similarity index 100%
rename from pages_admin/worke/modelMt.vue
rename to pages_adminSet/modelMt.vue
diff --git a/pages_admin/worke/sysSet.vue b/pages_adminSet/sysSet.vue
similarity index 100%
rename from pages_admin/worke/sysSet.vue
rename to pages_adminSet/sysSet.vue