Merge branch 'steels' into feature/steels/yangan

yangan

2024-06-28 b4adf52de27081af626be4fb88c6a11ccdcd7eea

 pages.json

@@ -7,6 +7,13 @@
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/login/resetPassword/resetPassword",
         "style": {
            "navigationBarTitleText": "修改密码",
            "enablePullDownRefresh": false
         }
      },
      // {
      //    "path":"pages/login/index",
      //    "style":{
@@ -93,7 +100,7 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
         "style": {
            "navigationBarTitleText": "提煤单详情",
            "navigationBarTitleText": "通知单详情",
            "enablePullDownRefresh": false
         }
      },
@@ -118,7 +125,7 @@
      //       "navigationBarTitleText": "转发",
      //       "enablePullDownRefresh": false
      //    }
      // }, 
      // },
      // {
      //    "path": "pages/driver-page/appointment/appointment",
      //    "style": {
@@ -126,7 +133,7 @@
      //       "enablePullDownRefresh": false
      //    }

      // }, 
      // },
      {
         "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
         "style": {
@@ -138,7 +145,7 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
         "style": {
            "navigationBarTitleText": "提煤单",
            "navigationBarTitleText": "通知单",
            "enablePullDownRefresh": false
         }

@@ -147,7 +154,7 @@
         "path": "pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice",
         "style": {
            "navigationBarTitleText": "称重",
            "enablePullDownRefresh": false
            "enablePullDownRefresh": true
         }

      },
@@ -162,21 +169,21 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
         "style": {
            "navigationBarTitleText": "矿场签到",
            "navigationBarTitleText": "仓库签到",
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore",
         "style": {
            "navigationBarTitleText": "提煤单详情",
            "navigationBarTitleText": "通知单详情",
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics",
         "style": {
            "navigationBarTitleText": "",
            "navigationBarTitleText": "发运统计",
            "enablePullDownRefresh": false,
            "navigationStyle": "custom"

@@ -210,6 +217,27 @@
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
         "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
         "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/login/PrivacyAgreementText/PrivacyAgreementText",
         "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
         }

      }
   ],
   "subPackages": [{
@@ -237,7 +265,7 @@
               "enablePullDownRefresh": true
            }

         }, {
         },{
            "path": "messageDetails/messageDetails",
            "style": {
               "navigationBarTitleText": "消息详情",
@@ -258,13 +286,20 @@
               "enablePullDownRefresh": false
            }

         }, {
            "path": "selectSpecifications/selectSpecifications",
            "style": {
               "navigationBarTitleText": "",
               "enablePullDownRefresh": false
            }

         }]
      }, {
         "root": "pages/driver-page/appointment",
         "pages": [{
            "path": "appointment",
            "style": {
               "navigationBarTitleText": "时段",
               "navigationBarTitleText": "预约时段",
               "enablePullDownRefresh": false
            }
         }]
@@ -352,6 +387,8 @@
            "pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
         },
         {
            "pagePath": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan"
         }, {
            "pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
            // "iconPath": "static/tabBar-icon/Gmine10.png",
            // "selectedIconPath": "static/tabBar-icon/Bmine57.png",
@@ -374,4 +411,4 @@
         "query": "" //启动参数，在页面的onLoad函数里面得到
      }]
   }
}
}