Merge branch 'feature/steels/huanfuV1.0' into feature/steels/yangan

yangan

2024-03-05 f89ef4aabbd153c506d175543a5bc9416c9462f1

 pages.json

@@ -1,12 +1,23 @@
{
   "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
      {
         "path": "pages/login/login",
         "style": {
            "navigationBarTitleText": "登录",
            "enablePullDownRefresh": false
         }
      },
   {
      "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/index",
      //    "style":{
@@ -21,15 +32,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": "我的",
@@ -93,7 +96,7 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
         "style": {
            "navigationBarTitleText": "提煤单详情",
            "navigationBarTitleText": "通知单详情",
            "enablePullDownRefresh": false
         }
      },
@@ -138,7 +141,7 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
         "style": {
            "navigationBarTitleText": "提煤单",
            "navigationBarTitleText": "通知单",
            "enablePullDownRefresh": false
         }

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

      },
@@ -162,27 +165,49 @@
      {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock",
         "style": {
            "navigationBarTitleText": "矿场签到",
            "navigationBarTitleText": "仓库签到",
            "enablePullDownRefresh": false
         }
      },
      {
         "path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore",
         "style": {
            "navigationBarTitleText": "提煤单详情",
            "navigationBarTitleText": "通知单详情",
            "enablePullDownRefresh": false
         }

      }, {
         "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": "",
@@ -210,26 +235,29 @@
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
         "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
         }

      }, {
         "path": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
         "style": {
            "navigationBarTitleText": "",
            "enablePullDownRefresh": false
         }

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

      }
       ,{
            "path" : "pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
            
        }
        ,{
            "path" : "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan",
            "style" :                                                                                    
            {
                "navigationBarTitleText": "",
                "enablePullDownRefresh": false
            }
            
        }
    ],
   ],
   "subPackages": [{
         "root": "pages/register",
         "pages": [{
@@ -255,7 +283,7 @@
               "enablePullDownRefresh": true
            }

         }, {
         },{
            "path": "messageDetails/messageDetails",
            "style": {
               "navigationBarTitleText": "消息详情",
@@ -276,13 +304,32 @@
               "enablePullDownRefresh": false
            }

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

         },{
            "path": "aboutus/index",
            "style": {
               "navigationBarTitleText": "关于我们",
               "enablePullDownRefresh": false
            }
         },{
            "path": "dataStatistics/index",
            "style": {
               "navigationBarTitleText": "数据统计",
               "enablePullDownRefresh": false
            }
         }]
      }, {
         "root": "pages/driver-page/appointment",
         "pages": [{
            "path": "appointment",
            "style": {
               "navigationBarTitleText": "时段",
               "navigationBarTitleText": "预约时段",
               "enablePullDownRefresh": false
            }
         }]
@@ -370,6 +417,8 @@
            "pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
         },
         {
            "pagePath": "pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan"
         }, {
            "pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
            // "iconPath": "static/tabBar-icon/Gmine10.png",
            // "selectedIconPath": "static/tabBar-icon/Bmine57.png",