Merge remote-tracking branch 'origin/master'

zengh

2021-07-04 d07eafd530ea2aa85260d7dd5ba70f4c57188553

 pages.json

@@ -28,7 +28,7 @@
         "style": {
            "navigationBarTitleText": "",
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -37,7 +37,7 @@
         "style": {
            "navigationBarTitleText": "关于我们",
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -46,7 +46,7 @@
         "style": {
            "navigationBarTitleText": "系统设置",
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -63,15 +63,15 @@
         "style": {
            "navigationBarTitleText": "隐私政策",
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarTextStyle": "white"
         }
      },
      {
         "path": "pages/business/business",
         "style": {
            "navigationBarTitleText": "工作台",
            "navigationBarBackgroundColor":"#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -119,8 +119,8 @@
         "name": "reported",
         "style": {
            "navigationBarTitleText": "我要报",
            "app-plus":{
               "titleNView":false
            "app-plus": {
               "titleNView": false
            }
         }
      },
@@ -134,17 +134,17 @@
         }
      },
      {
          "path" : "components/submit/submit",
          "style" : {}
         "path": "components/submit/submit",
         "style": {}
      },
      {
         "path": "pages/groupChat/chating",
         "name": "chating",
         "style": {
            "navigationBarTitleText": "聊天室2",
            "navigationStyle":"custom",
            "app-plus":{
               "titleNView":false
            "navigationStyle": "custom",
            "app-plus": {
               "titleNView": false
            }
         }
      },
@@ -153,9 +153,9 @@
         "name": "chatingQZ",
         "style": {
            "navigationBarTitleText": "聊天室2",
            "navigationStyle":"custom",
            "app-plus":{
               "titleNView":false
            "navigationStyle": "custom",
            "app-plus": {
               "titleNView": false
            }
         }
      },
@@ -198,8 +198,8 @@
         "path": "pages/article/article",
         "style": {
            "navigationBarTitleText": "资讯",
            "navigationBarBackgroundColor":"#0BB9C8",
            "navigationBarTextStyle":"white"
            "navigationBarBackgroundColor": "#0BB9C8",
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -228,8 +228,8 @@
         "name": "workbench",
         "style": {
            "navigationBarTitleText": "我要巡",
            "app-plus":{
               "titleNView":false
            "app-plus": {
               "titleNView": false
            }
         }
      },
@@ -245,7 +245,7 @@
         "style": {
            "navigationBarTitleText": "群防任务",
            "navigationBarBackgroundColor": "#0cd7e5",
            "navigationBarTextStyle":"white"
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -268,8 +268,8 @@
         "style": {
            "navigationBarTitleText": "打卡签到",
            "navigationBarBackgroundColor": "#25262E",
            "app-plus":{
               "titleNView":false
            "app-plus": {
               "titleNView": false
            }
         }
      },
@@ -285,7 +285,17 @@
         "name": "mapJQtijiao",
         "style": {
            "navigationBarTitleText": "处理结果",
            "navigationBarBackgroundColor": "#0cd7e5"
            "navigationBarBackgroundColor": "#0cd7e5",
            "navigationBarTextStyle": "white"
         }
      },
      {
         "path": "pages/poput/alarmOver/alarmOver",
         "name": "alarmOver",
         "style": {
            "navigationBarTitleText": "任务详情",
            "navigationBarBackgroundColor": "#0cd7e5",
            "navigationBarTextStyle": "white"
         }
      },
      {
@@ -307,7 +317,7 @@
         }
      }
   ],
   "globalStyle": {//将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
   "globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
      "autoscan": true
   },
   "tabBar": {
@@ -319,7 +329,7 @@
            "text": "首页",
            "iconPath": "static/tabbar/index01.png",
            "selectedIconPath": "static/tabbar/index02.png"
         },{
         }, {
            "pagePath": "pages/article/article",
            "text": "资讯",
            "iconPath": "static/tabbar/article.png",
@@ -341,14 +351,14 @@
      ]
   },
   "globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏，否则聊天页面的头部栏会不显示，在pages中设置titleNView为false就可以隐藏头部导航栏了
           "navigationBarTextStyle": "black",
           "navigationBarTitleText": "hello",
           "navigationBarBackgroundColor": "#fff",
           "backgroundColor": "#f7f7f7",
           "backgroundTextStyle":"light",
           "pageOrientation":"portrait", //横屏配置，屏幕旋转设置
           "app-plus": {
               "bounce": "none"
           }
       }
      "navigationBarTextStyle": "black",
      "navigationBarTitleText": "hello",
      "navigationBarBackgroundColor": "#fff",
      "backgroundColor": "#f7f7f7",
      "backgroundTextStyle": "light",
      "pageOrientation": "portrait", //横屏配置，屏幕旋转设置
      "app-plus": {
         "bounce": "none"
      }
   }
}