Merge branch 'develop/steels' into feature/steels/yangan

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 pages.json

@@ -7,6 +7,13 @@
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/login/resetPassword/resetPassword",
         "style": {
            "navigationBarTitleText": "修改密码",
            "enablePullDownRefresh": false
         }
      },
      // {
      //    "path":"pages/login/index",
      //    "style":{
@@ -21,15 +28,7 @@
      //       "enablePullDownRefresh": false
      //    }
      // },
      {
         "path": "pages/tabbar-page/index-tabbar/index-tabbar",
         "style": {
            "navigationBarTitleText": "首页",
            "enablePullDownRefresh": true,
            "navigationStyle": "custom"
         }

      }, {
       {
         "path": "pages/tabbar-page/myPage-tabbar/myPage-tabbar",
         "style": {
            "navigationBarTitleText": "我的",
@@ -53,15 +52,7 @@
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/driver-page/driver-index/driver-index",
         "style": {
            "navigationBarTitleText": "首页",
            "enablePullDownRefresh": true,
            "navigationStyle": "custom"
         }

      }, {
      },  {
         "path": "pages/driver-page/drvier-my/drvier-my",
         "style": {
            "navigationBarTitleText": "我的",
@@ -118,7 +109,7 @@
      //       "navigationBarTitleText": "转发",
      //       "enablePullDownRefresh": false
      //    }
      // }, 
      // },
      // {
      //    "path": "pages/driver-page/appointment/appointment",
      //    "style": {
@@ -126,7 +117,7 @@
      //       "enablePullDownRefresh": false
      //    }

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

      },
@@ -162,7 +153,7 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
         "style": {
            "navigationBarTitleText": "矿场签到",
            "navigationBarTitleText": "仓库签到",
            "enablePullDownRefresh": false
         }
      },
@@ -176,13 +167,35 @@
      }, {
         "path": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics",
         "style": {
            "navigationBarTitleText": "",
            "navigationBarTitleText": "发运统计",
            "enablePullDownRefresh": false,
            "navigationStyle": "custom"

         }

      }, {
      }, 
      // {
      //    "path": "pages/driver-page/driver-index/bill-of-lading-details/historicalOrders/index",
      //    "style": {
      //       "navigationBarTitleText": "历史订单",
      //       "enablePullDownRefresh": false
      //    }
      // },
      // {
      //    "path": "pages/driver-page/driver-index/bill-of-lading-details/cooperationBase/index",
      //    "style": {
      //       "navigationBarTitleText": "合作基地",
      //       "enablePullDownRefresh": false
      //    }
      // },
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/BaseMapDetail/index",
         "style": {
            "navigationBarTitleText": "合作基地详情",
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/customer-page/customer-my/userMange/userMange",
         "style": {
            "navigationBarTitleText": "",
@@ -224,6 +237,13 @@
            "enablePullDownRefresh": false
         }

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

      }
   ],
   "subPackages": [{
@@ -251,7 +271,7 @@
               "enablePullDownRefresh": true
            }

         }, {
         },{
            "path": "messageDetails/messageDetails",
            "style": {
               "navigationBarTitleText": "消息详情",
@@ -272,7 +292,40 @@
               "enablePullDownRefresh": false
            }

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

         },{
            "path": "aboutus/index",
            "style": {
               "navigationBarTitleText": "关于我们",
               "enablePullDownRefresh": false
            }
         },{
            "path": "dataStatistics/index",
            "style": {
               "navigationBarTitleText": "数据统计",
               "enablePullDownRefresh": false
            }
         },
      {
         "path": "cooperationBase/index",
            "style": {
               "navigationBarTitleText": "合作基地",
               "enablePullDownRefresh": false
            }
      },
   {
      "path": "historicalOrders/index",
            "style": {
               "navigationBarTitleText": "历史订单",
               "enablePullDownRefresh": false
            }
   }]
      }, {
         "root": "pages/driver-page/appointment",
         "pages": [{
@@ -390,4 +443,4 @@
         "query": "" //启动参数，在页面的onLoad函数里面得到
      }]
   }
}
}