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

yangan

2024-06-28 3fef62b03c16aa69c109c355150cdb698b777feb

 pages.json

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

   },
		
      // {
      //    "path":"pages/login/index",
      //    "style":{