Merge remote-tracking branch 'origin/master'

k94314517

2025-03-07 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3

 h5/App.vue

@@ -4,8 +4,15 @@
  onLaunch: function () {
    window.addEventListener("popstate", (event) => {
         const path = this.$route.fullPath
         // console.log('path', path);
       if(path == '/pages/login/login' || path == '/'){
            window.location.href = app_url
         }
         if(path == '/pages/wdata/home'){
            window.location.href = 'https://atwl.ahzyssl.com/zhyq_h5/#/pages/wdata/home'
         }
         if(path == '/pages/waybill/home'){
            window.location.href = 'https://atwl.ahzyssl.com/zhyq_h5/#/pages/waybill/home'
         }
    })
      console.log('onLaunch')
@@ -204,7 +211,7 @@
}

.main_app {
  padding: 10rpx 30rpx 30rpx;
  padding: 10rpx 30rpx 0rpx;
  font-size: 28rpx;
  color: #333333;
}