整理pages模块的页面--->pagesA模块

components/foot-tabs/foot-tab-one.vue

@@ -122,7 +122,7 @@
 						// 已授权
 						switch (index){
 							case 1:
-							uni.reLaunch({url:'/pages/project/projectList'})
+							uni.reLaunch({url:'/pagesA/project/projectList'})
 								break;
 							case 2:
 							// #ifdef APP-PLUS, MP-WEIXIN
@@ -141,7 +141,7 @@
 							// #endif
 								break;
 							case 3:
-							uni.reLaunch({url:'/pages/feedback/feedback'})
+							uni.reLaunch({url:'/pagesA/feedback/feedback'})
 								break;
 							case 4:
 							uni.reLaunch({url:'/pages/tabbar/my/my'})

pages.json

@@ -41,19 +41,6 @@
             "style": {
                 "navigationBarTitleText": ""
             }
-        }, {
-            "path": "pages/tabbar/project-list/project-list",
-            "style": {
-                "navigationBarTitleText": "项目列表",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/tabbar/feedback/feedback",
-            "style": {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false
-            }
         }, {
             "path": "pages/register/register",
             "style": {
@@ -68,29 +55,6 @@
                 }
             }
 
-        }, {
-
-            "path": "pages/repairsPage/repairsPage",
-            "style": {
-                "navigationBarTitleText": "添加报修",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/project/projectList",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-                "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
-            }
-
-        }, {
-            "path": "pages/project/details",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
-            }
-
         },
         {
             "path": "pages/forget/forget",
@@ -100,170 +64,165 @@
             }
 
         }
-
-        , {
-            "path": "pages/feedback/feedback",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/workOrder",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom", //禁用原
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/workorderTwo",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/workOrderLlsit",
-            "style": {
-                "navigationBarTitleText": "",
-                "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/workOrderThree",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/details",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/workOrder/payReturnVisit",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/peopleManagement/peopleManagement",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/mountingsList/mountingsList",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/appreciationServe/appreciationServe",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/dataQuery/dataQuery",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }, {
-            "path": "pages/dataQuery/client",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        },
-        {
-            "path" : "pages/dataQuery/details",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-        
-        },
- 
-        {
-            "path": "pages/workOrder/pay-return-visit",
-            "style": {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-
-        }
-        ,{
-            "path" : "pages/dataQuery/projectQuery",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataQuery/projectDetails",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/dataQuery/queryFunction",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
-				"navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/faultStatistics/faultStatistics",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/faultStatistics/projectOverview",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
     "subPackages": [{ //A包
             "root": "pagesA",
-            "pages": [{
+            "pages": [
-                "path": "test/test",
+				{
-                "style": {
+				    "path": "workOrder/workOrder",
-                    "navigationBarTitleText": "",
+				    "style": {
-                    "enablePullDownRefresh": false
+				        "navigationBarTitleText": "",
-                }
+				        "navigationStyle": "custom", //禁用原
-            }]
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+				    "path": "workOrder/workorderTwo",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+				    "path": "workOrder/workOrderLlsit",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+				    "path": "workOrder/workOrderThree",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+				    "path": "workOrder/details",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+				    "path": "workOrder/payReturnVisit",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}, 
+				{
+					"path": "appreciationServe/appreciationServe",
+					"style": {
+						"navigationBarTitleText": "增值服务",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "faultStatistics/faultStatistics",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "维保统计",
+						"enablePullDownRefresh": false
+					}
+				}
+				,{
+					"path" : "faultStatistics/projectOverview",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "数据看板",
+						"enablePullDownRefresh": false
+					}
+				}
+				, {
+				    "path": "peopleManagement/peopleManagement",
+				    "style": {
+				        "navigationBarTitleText": "人员状态",
+				        "enablePullDownRefresh": false
+				    }
+				}
+				, {
+				    "path": "dataQuery/dataQuery",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}, {
+				    "path": "dataQuery/client",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				},
+				{
+				    "path" : "dataQuery/details",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}
+				,{
+				    "path" : "dataQuery/projectQuery",
+				    "style" : {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}
+				,{
+				    "path" : "dataQuery/projectDetails",
+				    "style" : {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false
+				    }
+				}
+				,{
+				    "path" : "dataQuery/queryFunction",
+				    "style" : {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false,
+						"navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
+						"navigationBarTextStyle": "white"
+				    }
+				}
+				, {
+				    "path": "project/projectList",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "enablePullDownRefresh": false,
+				        "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
+				    }
+				}, {
+				    "path": "project/details",
+				    "style": {
+				        "navigationBarTitleText": "",
+				        "navigationStyle": "custom" //禁用原生导航栏，微信小程序可用
+				    }
+				}, 
+				{
+					"path": "repairsPage/repairsPage",
+					"style": {
+						"navigationBarTitleText": "添加报修",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "mountingsList/mountingsList",
+					"style": {
+						"navigationBarTitleText": "配件列表",
+						"enablePullDownRefresh": false
+					}
+				}
+				, {
+				    "path": "feedback/feedback",
+				    "style": {
+				        "navigationBarTitleText": "意见反馈",
+				        "navigationStyle": "custom", //禁用原生导航栏，微信小程序可用
+				        "enablePullDownRefresh": false
+				    }
+				}
+			]
         },
         { //B包
             "root": "pagesB",
@@ -306,52 +265,42 @@
                     "navigationBarTitleText": "设置",
                     "enablePullDownRefresh": false
                 }
-
+            },
-            }    ,{
+			{
-                    "path" : "new-product/new-product",
+				"path" : "new-product/new-product",
-                    "style" :                                                                                    
+				"style" : {
-                {
+					"navigationBarTitleText": "",
-                    "navigationBarTitleText": "",
+					"enablePullDownRefresh": false
-                    "enablePullDownRefresh": false
+				}
-                }
+			},
-                
+			{
-                }
+				"path" : "plan-fault/plan-fault",
-                ,{
+				"style" : {
-                    "path" : "plan-fault/plan-fault",
+					"navigationBarTitleText": "",
-                    "style" :                                                                                    
+					"enablePullDownRefresh": false
-                {
+				}
-                    "navigationBarTitleText": "",
+			}
-                    "enablePullDownRefresh": false
+			,{
-                }
+				"path" : "plan-fault-product-detail/detail",
-                
+				"style" : {
-                }
+					"navigationBarTitleText": "",
-                ,{
+					"enablePullDownRefresh": false
-                    "path" : "plan-fault-product-detail/detail",
+				}
-                    "style" :                                                                                    
+			}
-                {
+			,{
-                    "navigationBarTitleText": "",
+				"path" : "message-center/message-center",
-                    "enablePullDownRefresh": false
+				"style" : {
-                }
+					"navigationBarTitleText": "",
-                
+					"enablePullDownRefresh": false
-                }
+				}
-                ,{
+			}
-                    "path" : "message-center/message-center",
+			,{
-                    "style" :                                                                                    
+				"path" : "map/map",
-                {
+					"style" : {
-                    "navigationBarTitleText": "",
+					"navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
+					"enablePullDownRefresh": false
-                }
+				}
-                
+			}
-                }
-                ,{
-                    "path" : "map/map",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
             ]
         }
     ],

pages/tabbar/feedback/feedback.vue

@@ -1,28 +0,0 @@
-<template>
-	<view>
-		<!-- 底部tab -->
-		<foot-tab :current="3"></foot-tab> 
-	</view>
-</template>
-
-<script>
-	// 底部组件
-	import footTabOne from '@/components/foot-tabs/foot-tab-one.vue';
-	export default {
-		components:{
-			'foot-tab' :footTabOne
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/tabbar/my/my.vue

@@ -243,7 +243,7 @@
                     '/pagesB/personal-information/personal-information',
                     '/pagesB/electronic-certificate/electronic-certificate',
                     '/pagesB/service-range/service-range',
-                    '/pages/workOrder/workOrderLlsit?status=已完成&statusId=8',
+                    '/pagesA/workOrder/workOrderLlsit?status=已完成&statusId=8',
                     '/pagesB/my-account/my-account?index=0',
                     '/pagesB/set-up/set-up',
                 ];

pages/tabbar/pagehome/pagehome.vue

@@ -365,7 +365,7 @@
 			// 前往增值服务页面
 			goIncrement(index) {
 				uni.navigateTo({
-					url:`/pages/appreciationServe/appreciationServe?index=${index}`
+					url:`/pagesA/appreciationServe/appreciationServe?index=${index}`
 				})
 			},
 			// 待办事件
@@ -374,7 +374,7 @@
 				if(title=='佣金') {
 					url = `/pagesB/my-account/my-account?index=1`
 				} else {
-					url = `/pages/workOrder/workOrderLlsit?status=${title}&statusId=${statusId}`
+					url = `/pagesA/workOrder/workOrderLlsit?status=${title}&statusId=${statusId}`
 				}
 				uni.navigateTo({
 					url:url
@@ -392,15 +392,15 @@
 			// 数据查询事件
 			dataQueryEv(index){
 				uni.navigateTo({
-					url:`/pages/dataQuery/queryFunction?index=${index}`
+					url:`/pagesA/dataQuery/queryFunction?index=${index}`
 				})
 			},
 			// 故障报修分类下的点击事件
 			goFaultRepair(index){
 				if(index!=2) {
 					let faultRepairUrls = [
-						'/pages/repairsPage/repairsPage',
+						'/pagesA/repairsPage/repairsPage',
-						'/pages/workOrder/workOrderLlsit',
+						'/pagesA/workOrder/workOrderLlsit',
 					];
 					uni.navigateTo({
 						url:faultRepairUrls[index]
@@ -462,8 +462,8 @@
 			// 其他分类下的点击事件
 			otherEv(index) {
 				let otherUrls = [
-					'/pages/faultStatistics/faultStatistics',
+					'/pagesA/faultStatistics/faultStatistics',
-					'/pages/faultStatistics/projectOverview',
+					'/pagesA/faultStatistics/projectOverview',
 					'/pagesB/new-product/new-product',
 				];
 				uni.navigateTo({

pages/tabbar/project-list/project-list.vue

@@ -1,28 +0,0 @@
-<template>
-	<view>
-		<!-- 底部tab -->
-		<foot-tab :current="1"></foot-tab> 
-	</view>
-</template>
-
-<script>
-	// 底部组件
-	import footTabOne from '@/components/foot-tabs/foot-tab-one.vue';
-	export default {
-		components:{
-			'foot-tab' :footTabOne
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pages/workOrder/pay-return-visit.vue

@@ -1,32 +0,0 @@
-<template>
-    <view>
-        <view class="hint">
-            客户服务，重在回访仔细倾听，以服务质量求发展
-        
-    
-        </view>
-        <view class="123123">
-            12312313
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                
-            }
-        },
-        methods: {
-            
-        }
-    }
-</script>
-
-<style>
-.hint{
-    color: #358ff0;
-    padding:30rpx;
-}
-</style>

pagesA/dataQuery/client.vue

@@ -15,7 +15,7 @@
 						<view class="icon">{{item.num}}</view>
 					</view>
 					<view class="address">
-						<image class="img" src="../../static/iocn/dizi.png" mode=""></image>
+						<image class="img flexs" src="../../static/iocn/dizi.png" mode=""></image>
 						<view class="text">{{item.address}}</view>
 					</view>
 				</view>
@@ -71,7 +71,7 @@
 			// 前往客户详情
 			goDetail(id){
 				uni.navigateTo({
-					url:`/pages/dataQuery/details?id=${id}`
+					url:`/pagesA/dataQuery/details?id=${id}`
 				})
 			},
 			// 查询客户列表事件

pagesA/dataQuery/projectQuery.vue

@@ -94,7 +94,7 @@
         methods: {
             projectDetailsFun(id){
                 uni.navigateTo({
-                    url:`/pages/dataQuery/projectDetails?id=${id}`
+                    url:`/pagesA/dataQuery/projectDetails?id=${id}`
                 })
             },
             // 查询(项目)列表事件

pagesA/dataQuery/queryFunction.vue

@@ -186,9 +186,9 @@
             // 查询事件
             checkEv(index) {
                 let urls = [
-                    '/pages/dataQuery/client',
+                    '/pagesA/dataQuery/client',
-                    '/pages/dataQuery/projectQuery',
+                    '/pagesA/dataQuery/projectQuery',
-                    '/pages/dataQuery/dataQuery'
+                    '/pagesA/dataQuery/dataQuery'
                 ]
                 uni.navigateTo({
                     url: `${urls[index]}?key_word=${this.key_word}`
@@ -198,15 +198,15 @@
             goDetail() {
                 if (this.dataIndex == 1) {
                     uni.navigateTo({
-                        url: "/pages/project/details"
+                        url: "/pagesA/project/details"
                     })
                 } else if (this.dataIndex == 0) {
                     uni.navigateTo({
-                        url: '/pages/dataQuery/details'
+                        url: '/pagesA/dataQuery/details'
                     })
                 } else {
                  uni.navigateTo({
-                     url: '/pages/dataQuery/dataQuery'
+                     url: '/pagesA/dataQuery/dataQuery'
                  })
                 }
             },

pagesA/project/projectList.vue

@@ -142,7 +142,7 @@
             },
             projectDetailsFun(id) {
                 uni.navigateTo({
-                    url: `/pages/project/details?id=${id}`
+                    url: `/pagesA/project/details?id=${id}`
                 })
             },
 			// 查询产品类型

pagesA/test/test.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

pagesA/workOrder/workOrder.vue

@@ -391,7 +391,7 @@
 						handleWorkOrderSubmit(params).then(res=>{
 							if(res.code) {
 								uni.navigateTo({
-								    url: `/pages/workOrder/workorderTwo?id=${this.orderId}`
+								    url: `/pagesA/workOrder/workorderTwo?id=${this.orderId}`
 								})
 							}
 							this.flag = true;

pagesA/workOrder/workOrderLlsit.vue

@@ -185,7 +185,7 @@
 										this.$toolAll.tools.showToast('接单成功');
 										setTimeout(()=>{
 											uni.navigateTo({
-												url: `/pages/workOrder/workOrder?id=${id}`
+												url: `/pagesA/workOrder/workOrder?id=${id}`
 											})
 										},1000)
 									}
@@ -196,7 +196,7 @@
 				} else {
 					// 客户、客服、业务员、工程师点击查看详情
 					uni.navigateTo({
-						url: `/pages/workOrder/details?orderId=${id}&status=${status}&statusText=${statusText}&statusColor=${statusColor}`
+						url: `/pagesA/workOrder/details?orderId=${id}&status=${status}&statusText=${statusText}&statusColor=${statusColor}`
 					})
 				}
 			},

pagesA/workOrder/workOrderThree.vue

@@ -306,7 +306,7 @@
 						handleWorkOrderSubmit(params).then(res=>{
 							if(res.code) {
 								uni.navigateTo({
-								    url: `/pages/workOrder/workorderTwo?id=${this.orderId}`
+								    url: `/pagesA/workOrder/workorderTwo?id=${this.orderId}`
 								})
 							} else {
 								this.$toolAll.tools.showToast(res.msg);

pagesA/workOrder/workorderTwo.vue

@@ -270,7 +270,7 @@
 					handleWorkOrderSubmit(params).then(res=>{
 						if(res.code) {
 							uni.navigateTo({
-								url: `/pages/workOrder/workOrderThree?id=${this.orderId}`
+								url: `/pagesA/workOrder/workOrderThree?id=${this.orderId}`
 							}) 
 						}
 					})
@@ -297,7 +297,7 @@
 			},
             addMountingsList() {
                 uni.navigateTo({
-                    url: "/pages/mountingsList/mountingsList"
+                    url: "/pagesA/mountingsList/mountingsList"
                 })
 
             },

pagesB/my-account/my-account.vue

@@ -125,7 +125,7 @@
 			// 去结算事件
 			goSettlementEv(id) {
 				uni.navigateTo({
-					url:`/pages/workOrder/workOrderThree?id=${id}`
+					url:`/pagesA/workOrder/workOrderThree?id=${id}`
 				})
 			},
 			// 切换状态