diff --git a/App.vue b/App.vue
index c6ba855..56576cd 100644
--- a/App.vue
+++ b/App.vue
@@ -9,7 +9,8 @@ export default {
"pages/login/login",
"pages/register/index",
"pages/register/registerSuccess",
- "pages/login/authInfo"
+ "pages/login/authInfo",
+ "pages/login/forgotPassword"
];
const value = uni.getStorageSync("token");
@@ -52,9 +53,9 @@ export default {
"addressLon": 120.4732160947301,
"addressLat": 36.17767397801995
}
- this.$u.api.updatePosition(query).then(res => {
+ // this.$u.api.updatePosition(query).then(res => {
- })
+ // })
// },
// fail: (err) => {
// this.error = err;
diff --git a/manifest.json b/manifest.json
index 4252cc6..d131740 100644
--- a/manifest.json
+++ b/manifest.json
@@ -112,7 +112,12 @@
"mp-weixin" : {
"appid" : "wx81368cd255de5182",
"setting" : {
- "urlCheck" : true
+ "urlCheck" : true,
+ "minified" : true
+ },
+ "lazyCodeLoading" : "requiredComponents",
+ "optimization" : {
+ "subPackages" : true
},
"permission" : {}
},
diff --git a/pages.json b/pages.json
index 9929350..389da3a 100644
--- a/pages.json
+++ b/pages.json
@@ -148,36 +148,10 @@
{
"path": "pages/inspection/quest",
"style": {
- "navigationStyle": "custom",
+ "navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
},
-
- {
- "path": "pages/inspection/questDetails",
- "style": {
- "navigationBarTitleText": "巡检任务单",
- "enablePullDownRefresh": false,
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#F8F8F8",
- "app-plus": {
- "titleNView": {}
- }
- }
- },
-
- {
- "path": "pages/inspection/questOrder",
- "style": {
- "navigationBarTitleText": "巡检任务单",
- "enablePullDownRefresh": false,
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#F8F8F8",
- "app-plus": {
- "titleNView": {}
- }
- }
- },
{
"path": "pages/inspection/plan",
"style": {
@@ -190,18 +164,60 @@
}
}
},
-
{
- "path": "pages/inspection/planDetails",
- "style": {
- "navigationBarTitleText": "巡检计划详情",
- "enablePullDownRefresh": false,
- "navigationBarTextStyle": "black",
- "navigationBarBackgroundColor": "#F8F8F8",
- "app-plus": {
- "titleNView": {}
+ "root": "pages",
+ "pages": [
+ {
+ "path": "pages/inspection/questOrder",
+ "style": {
+ "navigationBarTitleText": "巡检任务单",
+ "enablePullDownRefresh": false,
+ "navigationBarTextStyle": "black",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "app-plus": {
+ "titleNView": {}
+ }
+ }
}
- }
+ ]
+ }
+ ],
+ "subPackages": [
+ {
+ "root": "pages",
+ "pages": [
+ {
+ "path": "inspection/planDetails",
+ "style": {
+ "navigationBarTitleText": "巡检计划详情",
+ "enablePullDownRefresh": false,
+ "navigationBarTextStyle": "black",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "app-plus": {
+ "titleNView": {}
+ }
+ }
+ },
+ {
+ "path": "inspection/questDetails",
+ "style": {
+ "navigationBarTitleText": "巡检任务单",
+ "enablePullDownRefresh": false,
+ "navigationBarTextStyle": "black",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "app-plus": {
+ "titleNView": {}
+ }
+ }
+ },
+ {
+ "path": "login/forgotPassword",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/pages/inspection/planDetails.vue b/pages/inspection/planDetails.vue
index 6707642..7044d72 100644
--- a/pages/inspection/planDetails.vue
+++ b/pages/inspection/planDetails.vue
@@ -62,8 +62,7 @@
+
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1178355..109171c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,10 +3,12 @@
科研医疗建筑运维平台
-
+
+
记住密码
@@ -15,7 +17,7 @@
@@ -159,6 +161,11 @@ export default {
url: "/pages/register/index",
});
},
+ forgotPassword(){
+ uni.navigateTo({
+ url: "/pages/login/forgotPassword",
+ });
+ },
},
};
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 51cfb61..72a099b 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -53,9 +53,6 @@