Merge branch 'feature/steels/yangan' into steels

yangan

2024-07-01 dd38c0cb8c39305c1d89646082ad640363c55cef

 pages.json

@@ -1,23 +1,28 @@
{
   "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/tabbar-page/index-tabbar/index-tabbar",
         "style": {
            "navigationBarTitleText": "首页",
            "enablePullDownRefresh": true,
            "navigationStyle": "custom"
         }

   },
		
      },
      // {
      //    "path":"pages/login/index",
      //    "style":{
@@ -72,6 +77,13 @@
         }

      }, {
         "path": "pages/customer-page/zhijian-bangfang/zhijian-bangfang",
         "style": {
            "navigationBarTitleText": "磅房",
            "enablePullDownRefresh": true
         }

      },{
         "path": "pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my",
         "style": {
            "navigationBarTitleText": "我的",
@@ -113,7 +125,7 @@
      //       "navigationBarTitleText": "转发",
      //       "enablePullDownRefresh": false
      //    }
      // }, 
      // },
      // {
      //    "path": "pages/driver-page/appointment/appointment",
      //    "style": {
@@ -121,7 +133,7 @@
      //       "enablePullDownRefresh": false
      //    }

      // }, 
      // },
      {
         "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails",
         "style": {
@@ -447,4 +459,4 @@
         "query": "" //启动参数，在页面的onLoad函数里面得到
      }]
   }
}
}