From de22230d44c4630c9d240699bcac8346e7b3fba2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 15:31:32 +0800
Subject: [PATCH] ll
---
h5/pages.json | 2 +-
h5/pages/notice/notice.vue | 10 +---------
h5/utils/config.js | 4 ++--
h5/pages/login/login.vue | 2 +-
h5/pages/staff/index.vue | 2 +-
h5/pages/driver/notice.vue | 2 +-
screen/src/views/EnergyConsum.vue | 2 +-
7 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/h5/pages.json b/h5/pages.json
index 0089265..d3c0636 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -359,7 +359,7 @@
{
"path": "pages/driver/reservedDetail",
"style": {
- "navigationBarTitleText": "璁垮瀹℃壒",
+ "navigationBarTitleText": "鍏ュ洯瀹℃壒",
"enablePullDownRefresh": false
}
},
diff --git a/h5/pages/driver/notice.vue b/h5/pages/driver/notice.vue
index c9efbcc..27be0c1 100644
--- a/h5/pages/driver/notice.vue
+++ b/h5/pages/driver/notice.vue
@@ -93,7 +93,7 @@
margin-bottom: 10rpx;
}
.content {
- height: calc(100% - 170rpx);
+ height: calc(100% - 130rpx);
.title {
color: #333333;
font-weight: 600;
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index 9ab5fd0..533f122 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: ''
+ code: '111'
}
},
onLoad(option) {
diff --git a/h5/pages/notice/notice.vue b/h5/pages/notice/notice.vue
index 741f158..fcbd3ee 100644
--- a/h5/pages/notice/notice.vue
+++ b/h5/pages/notice/notice.vue
@@ -1,8 +1,5 @@
<template>
<view class="container">
- <!-- <video
- src="https://vdept3.bdstatic.com/mda-nj7gwfue9kdnbtsh/sc/cae_h264/1665488517815949255/mda-nj7gwfue9kdnbtsh.mp4?v_from_s=hkapp-haokan-hbe&auth_key=1715141591-0-0-6dfdf4d4c3d94b60b9adeb53368a72f3&bcevod_channel=searchbox_feed&pd=1&cr=2&cd=0&pt=3&logid=0791905773&vid=13790089500387859718&klogid=0791905773&abtest="
- ></video> -->
<scroll-view scroll-y class="content">
<view>
<view v-html="content"></view>
@@ -102,13 +99,8 @@
box-sizing: border-box;
display: flex;
flex-direction: column;
- video {
- width: 690rpx;
- height: 388rpx;
- margin-bottom: 10rpx;
- }
.content {
- height: calc(100% - 170rpx);
+ height: calc(100% - 130rpx);
.title {
color: #333333;
font-weight: 600;
diff --git a/h5/pages/staff/index.vue b/h5/pages/staff/index.vue
index 196c350..489dbec 100644
--- a/h5/pages/staff/index.vue
+++ b/h5/pages/staff/index.vue
@@ -144,7 +144,7 @@
} else if (yw == 7) {
this.jump('/pages/staff/task/driver?id=' + ywinfo.ywid)
} else if (yw == 5) {
- this.jump('/pages/staff/vehicle/index')
+ this.jump('/pages/staff/vehicle/sendACarDetail')
}
}, 100)
}
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 05ff784..08884a3 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'zhyq_interface/'
+export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index a2f532f..846561a 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -999,7 +999,7 @@
font-weight: 500;
margin-right: 6px;
font-size: 13px;
- width: 64px;
+ width: 68px;
}
.num {
--
Gitblit v1.9.3