ll

liukangdong

2025-03-12 5c802188cf8bc8783cdcbff336b2fe29ec608b4e

ll

 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> -->

 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 () {

 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;


 h5/pages/wdata/home.vue

@@ -37,7 +37,7 @@
                    phone: ''

                },

                countDown: 0,

                code: '111'

                code: ''

            };

        },

        onShow() {


 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/#/'