Merge remote-tracking branch 'origin/dev_new' into dev_new

gaoluyang

昨天 1efd1857c521e55a1f7267a53fc2953d24886542

 src/pages.json

@@ -312,7 +312,7 @@
    {
      "path": "pages/cooperativeOffice/collaborativeApproval/index7",
      "style": {
        "navigationBarTitleText": "出库管理",
        "navigationBarTitleText": "发货审批",
        "navigationStyle": "custom"
      }
    },
@@ -671,7 +671,7 @@
    {
      "path": "pages/safeProduction/safeQualifications/index",
      "style": {
        "navigationBarTitleText": "规程资质",
        "navigationBarTitleText": "规程与资质",
        "navigationStyle": "custom"
      }
    },
@@ -707,6 +707,27 @@
      "path": "pages/safeProduction/hazardSourceLedger/view",
      "style": {
        "navigationBarTitleText": "危险源详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/index",
      "style": {
        "navigationBarTitleText": "事故报告记录",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/detail",
      "style": {
        "navigationBarTitleText": "事故报告详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/accidentReportingRecord/view",
      "style": {
        "navigationBarTitleText": "事故报告详情",
        "navigationStyle": "custom"
      }
    },
@@ -762,7 +783,7 @@
    {
      "path": "pages/safeProduction/hazardousMaterialsControl/index",
      "style": {
        "navigationBarTitleText": "危险物料",
        "navigationBarTitleText": "危险物料管控",
        "navigationStyle": "custom"
      }
    },
@@ -774,12 +795,102 @@
      }
    },
    {
      "path": "pages/safeProduction/hazardousMaterialsControl/view",
      "path": "pages/safeProduction/emergencyPlanReview/index",
      "style": {
        "navigationBarTitleText": "危险物料详情",
        "navigationBarTitleText": "应急预案审核",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/emergencyPlanReview/detail",
      "style": {
        "navigationBarTitleText": "应急预案详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/emergencyPlanReview/view",
      "style": {
        "navigationBarTitleText": "应急预案详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/index",
      "style": {
        "navigationBarTitleText": "安全培训考核",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/detail",
      "style": {
        "navigationBarTitleText": "培训详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/view",
      "style": {
        "navigationBarTitleText": "培训详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/fileList",
      "style": {
        "navigationBarTitleText": "培训附件",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/resultDetail",
      "style": {
        "navigationBarTitleText": "结果明细",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/safeProduction/safetyTrainingAssessment/record",
      "style": {
        "navigationBarTitleText": "培训记录",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/attendance/checkin",
      "style": {
        "navigationBarTitleText": "打卡签到",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/attendance/report",
      "style": {
        "navigationBarTitleText": "考勤日报",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/monthlyStatistics/index",
      "style": {
        "navigationBarTitleText": "薪资台账",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/humanResources/monthlyStatistics/detail",
      "style": {
        "navigationBarTitleText": "薪资台账详情",
        "navigationStyle": "custom"
      }
    },
    {
      "path": "pages/message",
      "style": {
        "navigationBarTitleText": "消息中心"
      }
    }
  ],
  "subPackages": [
    {
@@ -991,6 +1102,12 @@
        "text": "首页"
      },
      {
        "pagePath": "pages/message",
        "iconPath": "static/images/tabbar/work.png",
        "selectedIconPath": "static/images/tabbar/work_.png",
        "text": "消息"
      },
      {
        "pagePath": "pages/mine",
        "iconPath": "static/images/tabbar/mine.png",
        "selectedIconPath": "static/images/tabbar/mine_.png",