diff --git a/components/foot-tabs/foot-tab-one.vue b/components/foot-tabs/foot-tab-one.vue index 33613eb..f409427 100644 --- a/components/foot-tabs/foot-tab-one.vue +++ b/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'}) diff --git a/pages.json b/pages.json index 2f2910a..6c3261b 100644 --- a/pages.json +++ b/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": [{ - "path": "test/test", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }] + "pages": [ + { + "path": "workOrder/workOrder", + "style": { + "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", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "plan-fault/plan-fault", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "plan-fault-product-detail/detail", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "message-center/message-center", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "map/map", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } + }, + { + "path" : "new-product/new-product", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path" : "plan-fault/plan-fault", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "plan-fault-product-detail/detail", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "message-center/message-center", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ,{ + "path" : "map/map", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } ] } ], diff --git a/pages/tabbar/feedback/feedback.vue b/pages/tabbar/feedback/feedback.vue deleted file mode 100644 index fb333a1..0000000 --- a/pages/tabbar/feedback/feedback.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/pages/tabbar/my/my.vue b/pages/tabbar/my/my.vue index 429edeb..5e641c9 100644 --- a/pages/tabbar/my/my.vue +++ b/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', ]; diff --git a/pages/tabbar/pagehome/pagehome.vue b/pages/tabbar/pagehome/pagehome.vue index 4b6fe2c..9f91770 100644 --- a/pages/tabbar/pagehome/pagehome.vue +++ b/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', - '/pages/workOrder/workOrderLlsit', + '/pagesA/repairsPage/repairsPage', + '/pagesA/workOrder/workOrderLlsit', ]; uni.navigateTo({ url:faultRepairUrls[index] @@ -462,8 +462,8 @@ // 其他分类下的点击事件 otherEv(index) { let otherUrls = [ - '/pages/faultStatistics/faultStatistics', - '/pages/faultStatistics/projectOverview', + '/pagesA/faultStatistics/faultStatistics', + '/pagesA/faultStatistics/projectOverview', '/pagesB/new-product/new-product', ]; uni.navigateTo({ diff --git a/pages/tabbar/project-list/project-list.vue b/pages/tabbar/project-list/project-list.vue deleted file mode 100644 index b693514..0000000 --- a/pages/tabbar/project-list/project-list.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/pages/workOrder/pay-return-visit.vue b/pages/workOrder/pay-return-visit.vue deleted file mode 100644 index c817afc..0000000 --- a/pages/workOrder/pay-return-visit.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/pages/appreciationServe/appreciationServe.vue b/pagesA/appreciationServe/appreciationServe.vue similarity index 100% rename from pages/appreciationServe/appreciationServe.vue rename to pagesA/appreciationServe/appreciationServe.vue diff --git a/pages/dataQuery/client.vue b/pagesA/dataQuery/client.vue similarity index 97% rename from pages/dataQuery/client.vue rename to pagesA/dataQuery/client.vue index 78f43fc..2fe8525 100644 --- a/pages/dataQuery/client.vue +++ b/pagesA/dataQuery/client.vue @@ -15,7 +15,7 @@ {{item.num}} - + {{item.address}} @@ -71,7 +71,7 @@ // 前往客户详情 goDetail(id){ uni.navigateTo({ - url:`/pages/dataQuery/details?id=${id}` + url:`/pagesA/dataQuery/details?id=${id}` }) }, // 查询客户列表事件 diff --git a/pages/dataQuery/dataQuery.vue b/pagesA/dataQuery/dataQuery.vue similarity index 100% rename from pages/dataQuery/dataQuery.vue rename to pagesA/dataQuery/dataQuery.vue diff --git a/pages/dataQuery/details.vue b/pagesA/dataQuery/details.vue similarity index 100% rename from pages/dataQuery/details.vue rename to pagesA/dataQuery/details.vue diff --git a/pages/dataQuery/projectDetails.vue b/pagesA/dataQuery/projectDetails.vue similarity index 100% rename from pages/dataQuery/projectDetails.vue rename to pagesA/dataQuery/projectDetails.vue diff --git a/pages/dataQuery/projectQuery.vue b/pagesA/dataQuery/projectQuery.vue similarity index 99% rename from pages/dataQuery/projectQuery.vue rename to pagesA/dataQuery/projectQuery.vue index 3425ce2..aa9126d 100644 --- a/pages/dataQuery/projectQuery.vue +++ b/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}` }) }, // 查询(项目)列表事件 diff --git a/pages/dataQuery/queryFunction.vue b/pagesA/dataQuery/queryFunction.vue similarity index 98% rename from pages/dataQuery/queryFunction.vue rename to pagesA/dataQuery/queryFunction.vue index 0bcb990..a94dc99 100644 --- a/pages/dataQuery/queryFunction.vue +++ b/pagesA/dataQuery/queryFunction.vue @@ -186,9 +186,9 @@ // 查询事件 checkEv(index) { let urls = [ - '/pages/dataQuery/client', - '/pages/dataQuery/projectQuery', - '/pages/dataQuery/dataQuery' + '/pagesA/dataQuery/client', + '/pagesA/dataQuery/projectQuery', + '/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' }) } }, diff --git a/pages/faultStatistics/faultStatistics.vue b/pagesA/faultStatistics/faultStatistics.vue similarity index 100% rename from pages/faultStatistics/faultStatistics.vue rename to pagesA/faultStatistics/faultStatistics.vue diff --git a/pages/faultStatistics/projectOverview.vue b/pagesA/faultStatistics/projectOverview.vue similarity index 100% rename from pages/faultStatistics/projectOverview.vue rename to pagesA/faultStatistics/projectOverview.vue diff --git a/pages/feedback/feedback.vue b/pagesA/feedback/feedback.vue similarity index 100% rename from pages/feedback/feedback.vue rename to pagesA/feedback/feedback.vue diff --git a/pages/mountingsList/mountingsList.vue b/pagesA/mountingsList/mountingsList.vue similarity index 100% rename from pages/mountingsList/mountingsList.vue rename to pagesA/mountingsList/mountingsList.vue diff --git a/pages/peopleManagement/peopleManagement.vue b/pagesA/peopleManagement/peopleManagement.vue similarity index 100% rename from pages/peopleManagement/peopleManagement.vue rename to pagesA/peopleManagement/peopleManagement.vue diff --git a/pages/project/details.vue b/pagesA/project/details.vue similarity index 100% rename from pages/project/details.vue rename to pagesA/project/details.vue diff --git a/pages/project/projectList.vue b/pagesA/project/projectList.vue similarity index 99% rename from pages/project/projectList.vue rename to pagesA/project/projectList.vue index 0ac6b7d..4c89d25 100644 --- a/pages/project/projectList.vue +++ b/pagesA/project/projectList.vue @@ -142,7 +142,7 @@ }, projectDetailsFun(id) { uni.navigateTo({ - url: `/pages/project/details?id=${id}` + url: `/pagesA/project/details?id=${id}` }) }, // 查询产品类型 diff --git a/pages/repairsPage/repairsPage.vue b/pagesA/repairsPage/repairsPage.vue similarity index 100% rename from pages/repairsPage/repairsPage.vue rename to pagesA/repairsPage/repairsPage.vue diff --git a/pagesA/test/test.vue b/pagesA/test/test.vue deleted file mode 100644 index 8183fd0..0000000 --- a/pagesA/test/test.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/pages/workOrder/details.vue b/pagesA/workOrder/details.vue similarity index 100% rename from pages/workOrder/details.vue rename to pagesA/workOrder/details.vue diff --git a/pages/workOrder/payReturnVisit.vue b/pagesA/workOrder/payReturnVisit.vue similarity index 100% rename from pages/workOrder/payReturnVisit.vue rename to pagesA/workOrder/payReturnVisit.vue diff --git a/pages/workOrder/workOrder.vue b/pagesA/workOrder/workOrder.vue similarity index 99% rename from pages/workOrder/workOrder.vue rename to pagesA/workOrder/workOrder.vue index 85f5592..3f4bb71 100644 --- a/pages/workOrder/workOrder.vue +++ b/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; diff --git a/pages/workOrder/workOrderLlsit.vue b/pagesA/workOrder/workOrderLlsit.vue similarity index 98% rename from pages/workOrder/workOrderLlsit.vue rename to pagesA/workOrder/workOrderLlsit.vue index 8849fc4..e9e6deb 100644 --- a/pages/workOrder/workOrderLlsit.vue +++ b/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}` }) } }, diff --git a/pages/workOrder/workOrderThree.vue b/pagesA/workOrder/workOrderThree.vue similarity index 99% rename from pages/workOrder/workOrderThree.vue rename to pagesA/workOrder/workOrderThree.vue index fe3ed68..1b8d3f4 100644 --- a/pages/workOrder/workOrderThree.vue +++ b/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); diff --git a/pages/workOrder/workorderTwo.vue b/pagesA/workOrder/workorderTwo.vue similarity index 99% rename from pages/workOrder/workorderTwo.vue rename to pagesA/workOrder/workorderTwo.vue index 5e0393a..8777462 100644 --- a/pages/workOrder/workorderTwo.vue +++ b/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" }) }, diff --git a/pagesB/my-account/my-account.vue b/pagesB/my-account/my-account.vue index ca1dcd8..3f3ef08 100644 --- a/pagesB/my-account/my-account.vue +++ b/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}` }) }, // 切换状态