From 5c802188cf8bc8783cdcbff336b2fe29ec608b4e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 10:45:57 +0800
Subject: [PATCH] ll
---
h5/pages/wdata/detail.vue | 74 ++++++++++++++++++++++++++++++++++--
h5/utils/config.js | 4 +-
admin/src/views/meeting/bookings.vue | 13 +++---
h5/App.vue | 1
h5/pages/wdata/home.vue | 2
5 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index ec94c98..5d9ee9b 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -91,13 +91,14 @@
<span class="long-title-style">{{ row.roomName }}</span>
</template>
</el-table-column>
- <el-table-column prop="roomName" label="浼氳鐘舵��" align="center" min-width="120px" show-overflow-tooltip>
+ <el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
<template slot-scope="{ row }">
- <span v-if="row.meetingStatus == 1" class="long-title-style">鏈紑濮�</span>
- <span v-if="row.meetingStatus == 2" class="long-title-style">杩涜涓�</span>
- <span v-if="row.meetingStatus == 3" class="long-title-style">宸茬粨鏉�</span>
- <span v-if="row.meetingStatus == 4" class="long-title-style">鍗冲皢寮�濮�</span>
- <span v-if="row.meetingStatus == 5" class="long-title-style">宸叉挙閿�</span>
+ <span v-if="row.meetingStatus == 1">鏈紑濮�</span>
+ <span v-if="row.meetingStatus == 2">杩涜涓�</span>
+ <span v-if="row.meetingStatus == 3">宸茬粨鏉�</span>
+ <span v-if="row.meetingStatus == 4">鍗冲皢寮�濮�</span>
+ <span v-if="row.meetingStatus == 5">宸叉挙閿�</span>
+ <!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
</template>
</el-table-column>
<!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
diff --git a/h5/App.vue b/h5/App.vue
index 0bf9fc9..18a1815 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -15,6 +15,7 @@
window.location.href = 'https://atwl.ahzyssl.com/zhyq_h5/#/pages/waybill/home'
}
})
+ uni.setStorageSync('transportList', [])
console.log('onLaunch')
},
onShow: function () {
diff --git a/h5/pages/wdata/detail.vue b/h5/pages/wdata/detail.vue
index f831583..954b360 100644
--- a/h5/pages/wdata/detail.vue
+++ b/h5/pages/wdata/detail.vue
@@ -102,6 +102,14 @@
</view>
</view>
<view v-if="info.logisticsStatus == 0" @click="startTrans" class="start_btn">鍚繍</view>
+ <!-- -->
+ <view v-if="showTip" class="tip_wrap">
+ <view class="title">鎻愮ず</view>
+ <view class="text">杞﹁締鍒氬惎杩愶紝鏆傛棤娉曡繘琛屽埌</view>
+ <view class="text">璐ф搷浣滐紝璇�5鍒嗛挓鍚庡啀璇�</view>
+ <view class="btn" @click="showTip = false">鎴戠煡閬撲簡</view>
+ </view>
+ <view v-if="showTip" class="shade"></view>
</view>
</template>
@@ -110,7 +118,6 @@
putTaskDetail,
putDriverArrival,
putDriverStart,
-
} from '@/api'
export default {
data() {
@@ -118,7 +125,8 @@
info: {
productDetails: [],
transportStop: []
- }
+ },
+ showTip: false
};
},
onLoad(options) {
@@ -143,7 +151,10 @@
id: this.id,
optType: 0
}).then((ress) => {
- if (ress.code == 200) {
+ if (ress.code == 200) {
+ const transportList = uni.getStorageSync('transportList') || []
+ transportList.push({ id: this.id, time: new Date().getTime() })
+ uni.setStorageSync('transportList', transportList)
this.showToast('鍚繍鎴愬姛')
this.getDetail()
}
@@ -157,7 +168,16 @@
title: '鎻愮ず',
content: '纭鍒拌揣涔堬紵',
success: (res) => {
- if (res.confirm) {
+ if (res.confirm) {
+ const transportList = uni.getStorageSync('transportList') || []
+ const item = transportList.find(i => i.id == this.id)
+ if(item && item.id){
+ const timeN = new Date().getTime() - item.time
+ if(timeN < 5 * 60 * 1000){
+ this.showTip = true
+ return
+ }
+ }
putDriverArrival({
stopNumber,
optType: 1,
@@ -179,8 +199,52 @@
<style lang="scss">
page {
background-color: #f7f7f7;
+ }
+ .shade{
+ width: 100vw;
+ height: 100vh;
+ background: #000000;
+ opacity: 0.4;
+ position: fixed;
+ left: 0;
+ top: 0;
+ z-index: 99;
}
-
+ .tip_wrap{
+ position: fixed;
+ top: 0;
+ left: 0;
+ bottom: 0;
+ right: 0;
+ margin: auto;
+ width: 560rpx;
+ height: 328rpx;
+ background: #FFFFFF;
+ border-radius: 24rpx;
+ text-align: center;
+ z-index: 999;
+ .title{
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #111111;
+ margin: 40rpx 0 30rpx;
+ }
+ .text{
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #333333;
+ }
+ .btn{
+ margin-top: 32rpx;
+ height: 100rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-top: 1rpx solid #E5E5E5;
+ color: #279BAA;
+ font-size: 32rpx;
+ }
+ }
.head_bg {
width: 750rpx;
height: 240rpx;
diff --git a/h5/pages/wdata/home.vue b/h5/pages/wdata/home.vue
index b3dbfa1..ad1fc28 100644
--- a/h5/pages/wdata/home.vue
+++ b/h5/pages/wdata/home.vue
@@ -37,7 +37,7 @@
phone: ''
},
countDown: 0,
- code: '111'
+ code: ''
};
},
onShow() {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 08884a3..05ff784 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/#/'
--
Gitblit v1.9.3