|
|
@@ -13,11 +13,6 @@
|
|
|
{
|
|
|
"path": "pages/index/index",
|
|
|
"style": {
|
|
|
-<<<<<<< HEAD
|
|
|
- "navigationBarTitleText": "我的",
|
|
|
- "navigationBarBackgroundColor": "#FFFFFF",
|
|
|
- "enablePullDownRefresh": true
|
|
|
-=======
|
|
|
"navigationBarTitleText": "任务",
|
|
|
"navigationBarBackgroundColor": "#fff",
|
|
|
"enablePullDownRefresh": true,
|
|
|
@@ -29,22 +24,14 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
}
|
|
|
}, {
|
|
|
"path": "pages/response/index",
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "应答中心",
|
|
|
-<<<<<<< HEAD
|
|
|
"navigationBarBackgroundColor": "#f7f7f7",
|
|
|
-=======
|
|
|
-<<<<<<< HEAD
|
|
|
- "navigationBarBackgroundColor": "#f7f7f7"
|
|
|
-=======
|
|
|
- "navigationBarBackgroundColor":"#f7f7f7",
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
+
|
|
|
"enablePullDownRefresh": true
|
|
|
->>>>>>> 1109b35e1af43843203fb52a720d61490fc14249
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -62,25 +49,19 @@
|
|
|
"path": "pages/response/details",
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "应答中心详情",
|
|
|
-<<<<<<< HEAD
|
|
|
"navigationBarBackgroundColor": "#f7f7f7",
|
|
|
"enablePullDownRefresh": false,
|
|
|
"disableSwipeBack": true
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- {
|
|
|
-=======
|
|
|
-<<<<<<< HEAD
|
|
|
- "navigationBarBackgroundColor": "#f7f7f7"
|
|
|
-=======
|
|
|
- "navigationBarBackgroundColor":"#f7f7f7",
|
|
|
- "enablePullDownRefresh": false
|
|
|
->>>>>>> 1109b35e1af43843203fb52a720d61490fc14249
|
|
|
- }
|
|
|
+ // {
|
|
|
+ // "navigationBarBackgroundColor": "#f7f7f7",
|
|
|
+ // "enablePullDownRefresh": false
|
|
|
+ // }
|
|
|
|
|
|
- }, {
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
+ // },
|
|
|
+ {
|
|
|
"path": "pages/my/index",
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "",
|
|
|
@@ -90,11 +71,7 @@
|
|
|
}, {
|
|
|
"path": "pages/supervise/index",
|
|
|
"style": {
|
|
|
-<<<<<<< HEAD
|
|
|
- "navigationBarTitleText": "",
|
|
|
-=======
|
|
|
"navigationBarTitleText": "监督",
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
"navigationBarBackgroundColor": "#FFFFFF"
|
|
|
}
|
|
|
|
|
|
@@ -103,6 +80,7 @@
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "个人中心",
|
|
|
"enablePullDownRefresh": false,
|
|
|
+ "disableSwipeBack": true,
|
|
|
"navigationBarBackgroundColor": "#FFFFFF"
|
|
|
}
|
|
|
|
|
|
@@ -117,11 +95,7 @@
|
|
|
"path": "pages/my/monitorlog",
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "监测日志",
|
|
|
-<<<<<<< HEAD
|
|
|
"enablePullDownRefresh": false
|
|
|
-=======
|
|
|
- "enablePullDownRefresh": true
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
}
|
|
|
|
|
|
}, {
|
|
|
@@ -141,9 +115,6 @@
|
|
|
}, {
|
|
|
"path": "pages/my/mymonit",
|
|
|
"style": {
|
|
|
-<<<<<<< HEAD
|
|
|
- "navigationBarTitleText": "",
|
|
|
-=======
|
|
|
"navigationBarTitleText": "监督记录",
|
|
|
"enablePullDownRefresh": true
|
|
|
}
|
|
|
@@ -166,14 +137,10 @@
|
|
|
"path": "pages/index/harmfultask",
|
|
|
"style": {
|
|
|
"navigationBarTitleText": "生物监测任务",
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
"enablePullDownRefresh": false
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
- ],
|
|
|
-=======
|
|
|
,{
|
|
|
"path" : "pages/supervise/supetask",
|
|
|
"style" :
|
|
|
@@ -193,7 +160,6 @@
|
|
|
|
|
|
}
|
|
|
],
|
|
|
->>>>>>> 572abbf598e8ac2bae512a9beb0e222f06475b4c
|
|
|
"globalStyle": {
|
|
|
"navigationBarTextStyle": "black",
|
|
|
"navigationBarTitleText": "",
|
