From e1b5700bd541dc950322227e01d7ebd17eaa7510 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 21 Feb 2023 17:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/order/order/order.vue | 3 + order/order/orderInfo/orderInfo.vue | 3 + order/order/orderList/orderList.vue | 3 + packageA/pages/generalList/generalList.vue | 3 + .../pages/generalPatrol/generalPatrol.vue | 3 + packageA/pages/generalPatrol/viewPatrol.vue | 3 + packageB/pages/dailyInfo/dailyInfo.vue | 3 + .../pages/dailyInspection/dailyInspection.vue | 3 + packageB/pages/dailyList/dailyList.vue | 3 + pages.json | 198 ++++++++++++++++-- raininspection/plan/plan.vue | 3 + .../raininspection/raininspection.vue | 3 + .../raininspectioninfo/raininspectionInfo.vue | 3 + .../raininspectionlist/raininspectionList.vue | 3 + rainmaintain/plan/plan.vue | 3 + rainmaintain/rainmaintain/rainmaintain.vue | 3 + .../rainmaintaininfo/rainmaintainInfo.vue | 3 + .../rainmaintainlist/rainmaintainList.vue | 3 + road/road/road.vue | 3 + 19 files changed, 234 insertions(+), 18 deletions(-) diff --git a/order/order/order/order.vue b/order/order/order/order.vue index 2482cfe..9933e87 100644 --- a/order/order/order/order.vue +++ b/order/order/order/order.vue @@ -186,6 +186,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { loadDep() { diff --git a/order/order/orderInfo/orderInfo.vue b/order/order/orderInfo/orderInfo.vue index 5b5bfdc..33673d2 100644 --- a/order/order/orderInfo/orderInfo.vue +++ b/order/order/orderInfo/orderInfo.vue @@ -296,6 +296,9 @@ if(options.id){ this.loadInfo(options.id) } + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { imgListPreview(item){ diff --git a/order/order/orderList/orderList.vue b/order/order/orderList/orderList.vue index 9d9cf5a..2cb5007 100644 --- a/order/order/orderList/orderList.vue +++ b/order/order/orderList/orderList.vue @@ -188,6 +188,9 @@ }, onLoad(options) { this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { diff --git a/packageA/pages/generalList/generalList.vue b/packageA/pages/generalList/generalList.vue index 724a260..03f671a 100644 --- a/packageA/pages/generalList/generalList.vue +++ b/packageA/pages/generalList/generalList.vue @@ -169,6 +169,9 @@ } that.askTypeArr = arr; }); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { loadType(data, call) { diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue index b8bebee..e4fcd17 100644 --- a/packageA/pages/generalPatrol/generalPatrol.vue +++ b/packageA/pages/generalPatrol/generalPatrol.vue @@ -148,6 +148,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { onprogress(res){ diff --git a/packageA/pages/generalPatrol/viewPatrol.vue b/packageA/pages/generalPatrol/viewPatrol.vue index ff0e2b7..63a0359 100644 --- a/packageA/pages/generalPatrol/viewPatrol.vue +++ b/packageA/pages/generalPatrol/viewPatrol.vue @@ -87,6 +87,9 @@ if(options.id){ this.loadInfo(options.id) } + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { imgListPreview(item){ diff --git a/packageB/pages/dailyInfo/dailyInfo.vue b/packageB/pages/dailyInfo/dailyInfo.vue index aa41b3f..435afd9 100644 --- a/packageB/pages/dailyInfo/dailyInfo.vue +++ b/packageB/pages/dailyInfo/dailyInfo.vue @@ -97,6 +97,9 @@ if(options.id){ this.loadInfo(options.id) } + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { imgListPreview(item){ diff --git a/packageB/pages/dailyInspection/dailyInspection.vue b/packageB/pages/dailyInspection/dailyInspection.vue index 24c1426..29ceafa 100644 --- a/packageB/pages/dailyInspection/dailyInspection.vue +++ b/packageB/pages/dailyInspection/dailyInspection.vue @@ -167,6 +167,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { toremove(index, lists, name, whatfile) { diff --git a/packageB/pages/dailyList/dailyList.vue b/packageB/pages/dailyList/dailyList.vue index 9ee2605..9f48a34 100644 --- a/packageB/pages/dailyList/dailyList.vue +++ b/packageB/pages/dailyList/dailyList.vue @@ -161,6 +161,9 @@ onLoad(options) { this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { openmask(){ diff --git a/pages.json b/pages.json index 03c6b27..16b2c11 100644 --- a/pages.json +++ b/pages.json @@ -47,7 +47,16 @@ "path": "road/road/road", "style": { "navigationBarTitleText": "选择道路", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } } @@ -59,21 +68,48 @@ "path": "generalPatrol/generalPatrol", "style": { "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "generalList/generalList", "style": { "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "generalPatrol/viewPatrol", "style": { "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } @@ -84,20 +120,47 @@ "path": "dailyInspection/dailyInspection", "style": { "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "dailyList/dailyList", "style": { "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "dailyInfo/dailyInfo", "style": { "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }] @@ -107,20 +170,47 @@ "path": "rainmaintain/rainmaintain", "style": { "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "rainmaintainlist/rainmaintainList", "style": { "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } }, { "path": "rainmaintaininfo/rainmaintainInfo", "style": { "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } @@ -128,7 +218,16 @@ "path": "plan/plan", "style": { "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } @@ -139,20 +238,47 @@ "path": "raininspection/raininspection", "style": { "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "raininspectionlist/raininspectionList", "style": { "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } }, { "path": "raininspectioninfo/raininspectionInfo", "style": { "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } @@ -160,7 +286,16 @@ "path": "plan/plan", "style": { "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } @@ -171,21 +306,48 @@ "path": "order/order", "style": { "navigationBarTitleText": "我的工单", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } } }, { "path": "orderList/orderList", "style": { "navigationBarTitleText": "我的工单", - "enablePullDownRefresh": true + "enablePullDownRefresh": true, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } }, { "path": "orderInfo/orderInfo", "style": { "navigationBarTitleText": "我的工单", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "right", + "type": "home" + }] + } + } // "disableScroll": true } diff --git a/raininspection/plan/plan.vue b/raininspection/plan/plan.vue index 40068c4..0f84ae0 100644 --- a/raininspection/plan/plan.vue +++ b/raininspection/plan/plan.vue @@ -112,6 +112,9 @@ }, onLoad(options) { this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { toInspection(road_id, road_name) { diff --git a/raininspection/raininspection/raininspection.vue b/raininspection/raininspection/raininspection.vue index efab040..6268776 100644 --- a/raininspection/raininspection/raininspection.vue +++ b/raininspection/raininspection/raininspection.vue @@ -399,6 +399,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { selectBuildList() { diff --git a/raininspection/raininspectioninfo/raininspectionInfo.vue b/raininspection/raininspectioninfo/raininspectionInfo.vue index 84709f3..72a6188 100644 --- a/raininspection/raininspectioninfo/raininspectionInfo.vue +++ b/raininspection/raininspectioninfo/raininspectionInfo.vue @@ -277,6 +277,9 @@ if(options.id){ this.loadInfo(options.id) } + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { imgListPreview(item){ diff --git a/raininspection/raininspectionlist/raininspectionList.vue b/raininspection/raininspectionlist/raininspectionList.vue index 730718b..b2811a7 100644 --- a/raininspection/raininspectionlist/raininspectionList.vue +++ b/raininspection/raininspectionlist/raininspectionList.vue @@ -169,6 +169,9 @@ }, onLoad(options) { this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { openmask(){ diff --git a/rainmaintain/plan/plan.vue b/rainmaintain/plan/plan.vue index 9339d09..25626d7 100644 --- a/rainmaintain/plan/plan.vue +++ b/rainmaintain/plan/plan.vue @@ -153,6 +153,9 @@ onLoad(options) { this.serachEntity.date = this.$moment().format("YYYY-MM"); this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { toReturnType(type) { diff --git a/rainmaintain/rainmaintain/rainmaintain.vue b/rainmaintain/rainmaintain/rainmaintain.vue index c793311..9b3eb90 100644 --- a/rainmaintain/rainmaintain/rainmaintain.vue +++ b/rainmaintain/rainmaintain/rainmaintain.vue @@ -314,6 +314,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { confirmType(val) { diff --git a/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue b/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue index a0351f5..e2320b4 100644 --- a/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue +++ b/rainmaintain/rainmaintaininfo/rainmaintainInfo.vue @@ -165,6 +165,9 @@ if (options.id) { this.loadInfo(options.id) } + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { imgListPreview(item) { diff --git a/rainmaintain/rainmaintainlist/rainmaintainList.vue b/rainmaintain/rainmaintainlist/rainmaintainList.vue index 138c11b..81e81e3 100644 --- a/rainmaintain/rainmaintainlist/rainmaintainList.vue +++ b/rainmaintain/rainmaintainlist/rainmaintainList.vue @@ -183,6 +183,9 @@ }, onLoad(options) { this.loadPage(1); + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { openmask() { diff --git a/road/road/road.vue b/road/road/road.vue index 01034d6..29bbe7e 100644 --- a/road/road/road.vue +++ b/road/road/road.vue @@ -105,6 +105,9 @@ } }) + }, + onNavigationBarButtonTap(val) { + window.android.finish(); }, methods: { towhichtype() {