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

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 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":{
@@ -113,7 +109,7 @@
      //       "navigationBarTitleText": "转发",
      //       "enablePullDownRefresh": false
      //    }
      // }, 
      // },
      // {
      //    "path": "pages/driver-page/appointment/appointment",
      //    "style": {
@@ -121,7 +117,7 @@
      //       "enablePullDownRefresh": false
      //    }

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