From 3363af77fa23bdc599c3f746ba9802b799c780eb Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 28 三月 2025 09:28:40 +0800
Subject: [PATCH] 解决h5访客申请bug
---
admin/src/views/task/driverDetail.vue | 6 +-
h5/pages/driver/taskDetail.vue | 4 +-
h5/pages/appointmentDetails/appointmentDetails.vue | 44 +++++++++++++--------
h5/pages/staff/task/driver.vue | 6 +-
h5/api/visitor.js | 7 +++
h5/pages/driver/reservedRecord.vue | 2
h5/pages/driver/reservedDetail.vue | 6 +-
admin/.env.production | 2
h5/pages/driver/taskConfirm.vue | 4 +-
screen/src/views/TaskEfficiency.vue | 12 +++---
10 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/admin/.env.production b/admin/.env.production
index 7406b0f..5a7a449 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,4 +1,4 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_API_URL = 'http://10.50.250.178:8088/gateway_interface'
+VUE_APP_API_URL = 'http://10.50.250.178:8088/gateway_interface'
diff --git a/admin/src/views/task/driverDetail.vue b/admin/src/views/task/driverDetail.vue
index e7f6cad..d62bf96 100644
--- a/admin/src/views/task/driverDetail.vue
+++ b/admin/src/views/task/driverDetail.vue
@@ -29,7 +29,7 @@
<div class="value">鍓� {{ info.carCodeFront }}锛屽悗 {{ info.carCodeBack }}</div>
</div>
<div class="item">
- <div class="label">鍚堝悓缂栧彿</div>
+ <div class="label">鍚堝悓/鍗曟嵁缂栧彿</div>
<div class="value">{{ info.contractNum }}</div>
</div>
<div class="item">
@@ -37,7 +37,7 @@
<div class="value">{{ info.arriveDate }}</div>
</div>
<div class="item">
- <div class="label">鍏ュ簱绫诲瀷</div>
+ <div class="label">浣滀笟绫诲瀷</div>
<div class="value">{{ info.inType == 0 ? '鏁存墭鐩�' : '浠剁儫' }}</div>
</div>
<div class="item">
@@ -45,7 +45,7 @@
<div class="value">{{ info.totalNum || info.ioQty }}涓囨敮</div>
</div>
<div class="item">
- <div class="label">鍑嗚繍璇佺収鐗�</div>
+ <div class="label">鍑嗚繍璇�/杩愬崟鐓х墖</div>
<div v-if="info.transportImg" class="value">
<el-image style="width: 100px" :preview-src-list="[info.prefixUrl + info.transportImg]"
:src="info.prefixUrl + info.transportImg" alt="" />
diff --git a/h5/api/visitor.js b/h5/api/visitor.js
index 38f55fa..dfc7f13 100644
--- a/h5/api/visitor.js
+++ b/h5/api/visitor.js
@@ -87,6 +87,13 @@
method: 'get'
})
}
+// 鍙栨秷棰勭害--璁垮
+export const visitsSelfCancel = (visitId, memberId) => {
+ return http({
+ url: `visitsAdmin/cloudService/web/visitor/visitsSelfCancel?visitId=${visitId}&memberId=${memberId}`,
+ method: 'get'
+ })
+}
// 鏉ヨ浜嬬敱
export const getVisitReason = (data) => {
return http({
diff --git a/h5/pages/appointmentDetails/appointmentDetails.vue b/h5/pages/appointmentDetails/appointmentDetails.vue
index 35c0d1c..181a827 100644
--- a/h5/pages/appointmentDetails/appointmentDetails.vue
+++ b/h5/pages/appointmentDetails/appointmentDetails.vue
@@ -85,12 +85,8 @@
<view class="box_list_item_val">{{ info.carNos }}</view>
</view>
</view>
- <view class="footer">
- <u-button
- text="鍙栨秷棰勭害"
- size="mini"
- v-if="[0,1,2,5].includes(info.status)"
- @click="cancelShow = true" />
+ <view class="padding_wrap">
+ <view class="btn" v-if="[0,1,2,5].includes(info.status)" @click="cancelShow = true">鍙栨秷棰勭害</view>
</view>
<u-popup :show="show" mode="center" @close="close">
<view class="qrocde">
@@ -110,7 +106,7 @@
<script>
import wxcode from 'uniapp-qrcode'
-import { getVisitedDetail } from '@/api'
+import { getVisitedDetail, visitsSelfCancel } from '@/api'
export default {
data() {
@@ -156,7 +152,9 @@
methods: {
// 鍙栨秷棰勭害
cancel() {
- visitsCancel(this.id).then(res => {
+ const member = uni.getStorageSync('member');
+ visitsSelfCancel(this.id, member.id).then(res => {
+ this.cancelShow = false
this.getDetail(this.id)
})
},
@@ -194,15 +192,27 @@
<style lang="scss" scoped>
.box {
width: 100%;
- .footer {
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- height: 100rpx;
- text-align: right;
- background-color: #ffffff;
- padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
+ .padding_wrap {
+ position: fixed;
+ z-index: 999;
+ padding: 0 30rpx 64rpx;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+
+ .btn {
+ height: 96rpx;
+ line-height: 96rpx;
+ text-align: center;
+ width: 100%;
+ font-size: 36rpx;
+ color: #333333;
+ background: #ffffff;
+ border-radius: 48rpx;
+ border: 1rpx solid #999999;
+ }
}
.qrocde {
width: 300rpx;
diff --git a/h5/pages/driver/reservedDetail.vue b/h5/pages/driver/reservedDetail.vue
index f918538..a279e90 100644
--- a/h5/pages/driver/reservedDetail.vue
+++ b/h5/pages/driver/reservedDetail.vue
@@ -15,7 +15,7 @@
<view class="value">{{info.inReason}}</view>
</view>
<view class="item">
- <view class="label">鍚堝悓缂栧彿</view>
+ <view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
<view class="value">{{info.contractNum}}</view>
</view>
<view class="item">
@@ -23,7 +23,7 @@
<view class="value" v-if="info.arriveDate">{{info.arriveDate.slice(0,16)}}</view>
</view>
<view class="item">
- <view class="label">鍑嗚繍璇佺収鐗�</view>
+ <view class="label">鍑嗚繍璇�/杩愬崟鐓х墖</view>
<view class="value">
<image
v-if="info.transportImg"
@@ -34,7 +34,7 @@
</view>
</view>
<view class="item">
- <view class="label">鍏ュ簱绫诲瀷</view>
+ <view class="label">浣滀笟绫诲瀷</view>
<view class="value">{{info.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'}}</view>
</view>
<view class="item">
diff --git a/h5/pages/driver/reservedRecord.vue b/h5/pages/driver/reservedRecord.vue
index cf93368..ce2881d 100644
--- a/h5/pages/driver/reservedRecord.vue
+++ b/h5/pages/driver/reservedRecord.vue
@@ -9,7 +9,7 @@
</view>
<view class="box_list_item_nr">
<view class="box_list_item_nr_item">
- <text>鍚堝悓缂栧彿锛�</text>
+ <text>鍚堝悓/鍗曟嵁缂栧彿锛�</text>
<text>{{item.contractNum}}</text>
</view>
<view class="box_list_item_nr_item">
diff --git a/h5/pages/driver/taskConfirm.vue b/h5/pages/driver/taskConfirm.vue
index 966c2c5..a93b824 100644
--- a/h5/pages/driver/taskConfirm.vue
+++ b/h5/pages/driver/taskConfirm.vue
@@ -24,7 +24,7 @@
</view>
</view>
<view class="line" v-else>
- <view class="label">鍚堝悓缂栧彿</view>
+ <view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
<view class="value">{{param.contractNum}}</view>
</view>
<view class="line" v-if="type != 4">
@@ -35,7 +35,7 @@
<view class="value" v-if="param.type == 3">澶栧崗杞﹁璐�</view>
</view>
<view class="line" v-if="type == 4">
- <view class="label">鍏ュ簱绫诲瀷</view>
+ <view class="label">浣滀笟绫诲瀷</view>
<view class="value" v-if="param.inType == 0">鏁存墭鐩�</view>
<view class="value" v-if="param.inType == 1">浠剁儫</view>
</view>
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index 4dbeaae..1fec4d2 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -41,11 +41,11 @@
</template>
<template v-else>
<view class="line">
- <view class="label">鍚堝悓缂栧彿</view>
+ <view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
<view class="value">{{param.contractNum}}</view>
</view>
<view class="line">
- <view class="label">鍏ュ簱绫诲瀷</view>
+ <view class="label">浣滀笟绫诲瀷</view>
<view class="value">{{param.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'}}</view>
</view>
<view class="line">
diff --git a/h5/pages/staff/task/driver.vue b/h5/pages/staff/task/driver.vue
index fdfe0fc..a30079b 100644
--- a/h5/pages/staff/task/driver.vue
+++ b/h5/pages/staff/task/driver.vue
@@ -18,7 +18,7 @@
<view class="value">{{info.inReason}}</view>
</view>
<view class="item">
- <view class="label">鍚堝悓缂栧彿</view>
+ <view class="label">鍚堝悓/鍗曟嵁缂栧彿</view>
<view class="value">{{info.contractNum}}</view>
</view>
<view class="item">
@@ -26,7 +26,7 @@
<view v-if="info.arriveDate" class="value">{{info.arriveDate.slice(0,16)}}</view>
</view>
<view class="item">
- <view class="label">鍑嗚繍璇佺収鐗�</view>
+ <view class="label">鍑嗚繍璇�/杩愬崟鐓х墖</view>
<view class="value">
<image
@click="priviewImage(info.prefixUrl + info.transportImg)"
@@ -37,7 +37,7 @@
</view>
</view>
<view class="item">
- <view class="label">鍏ュ簱绫诲瀷</view>
+ <view class="label">浣滀笟绫诲瀷</view>
<view class="value">{{info.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'}}</view>
</view>
<view class="item">
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 61ef984..e78f9de 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -499,7 +499,7 @@
{
name: '鍒嗘椂浣滀笟閲�',
type: 'bar',
- barWidth: 15,
+ barWidth: 10,
label: {
show: false,
position: 'top',
@@ -509,11 +509,11 @@
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: '#63d6fa'
+ color: 'rgba(0, 208, 221, 1)'
},
{
offset: 1,
- color: '#32718d'
+ color: 'rgba(0, 194, 255, 0.20)'
}
], false),
lineStyle: {
@@ -527,7 +527,7 @@
{
name: '绱浣滀笟閲�',
type: 'bar',
- barWidth: 15,
+ barWidth: 10,
label: {
show: false,
position: 'top',
@@ -537,11 +537,11 @@
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: '#63d6fa'
+ color: 'rgba(0, 86, 255, 1)'
},
{
offset: 1,
- color: '#32718d'
+ color: 'rgba(0, 86, 255, 0.20)'
}
], false),
lineStyle: {
--
Gitblit v1.9.3