Merge branch 'steels' into feature/steels/yangan

yangan

2024-06-28 b4adf52de27081af626be4fb88c6a11ccdcd7eea

 pages.json

@@ -1,23 +1,19 @@
{
   "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
   {
      "path": "pages/login/login",
      "style": {
         "navigationBarTitleText": "登录",
         "enablePullDownRefresh": false
      }
   },
	
   {
      "path": "pages/tabbar-page/index-tabbar/index-tabbar",
      "style": {
         "navigationBarTitleText": "首页",
         "enablePullDownRefresh": true,
         "navigationStyle": "custom"
      }

   },
		
      {
         "path": "pages/login/login",
         "style": {
            "navigationBarTitleText": "登录",
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/login/resetPassword/resetPassword",
         "style": {
            "navigationBarTitleText": "修改密码",
            "enablePullDownRefresh": false
         }
      },
      // {
      //    "path":"pages/login/index",
      //    "style":{
@@ -32,7 +28,15 @@
      //       "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": "我的",
@@ -121,7 +125,7 @@
      //       "navigationBarTitleText": "转发",
      //       "enablePullDownRefresh": false
      //    }
      // }, 
      // },
      // {
      //    "path": "pages/driver-page/appointment/appointment",
      //    "style": {
@@ -129,7 +133,7 @@
      //       "enablePullDownRefresh": false
      //    }

      // }, 
      // },
      {
         "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
         "style": {
@@ -185,29 +189,7 @@

         }

      }, 
      {
         "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": "",
@@ -311,18 +293,6 @@
               "enablePullDownRefresh": false
            }

         },{
            "path": "aboutus/index",
            "style": {
               "navigationBarTitleText": "关于我们",
               "enablePullDownRefresh": false
            }
         },{
            "path": "dataStatistics/index",
            "style": {
               "navigationBarTitleText": "数据统计",
               "enablePullDownRefresh": false
            }
         }]
      }, {
         "root": "pages/driver-page/appointment",
@@ -441,4 +411,4 @@
         "query": "" //启动参数，在页面的onLoad函数里面得到
      }]
   }
}
}