Merge remote-tracking branch 'origin/master'

jiangping

2024-09-23 ce4a7783e6def97a27b7535483f3cb96a8d07e48

Merge remote-tracking branch 'origin/master'

 h5_meeting/api/index.js

@@ -5,7 +5,7 @@
//  
export const meetScreenData = (data) => {
  return http({
    url: '/meetingAdmin/cloudService/web/meeting/meetScreenData',
    url: 'meetingAdmin/cloudService/web/meeting/meetScreenData',
    method: 'get',
    data
  })

 h5_meeting/manifest.json

@@ -17,7 +17,9 @@
            "delay" : 0
        },
        /* 模块配置 */
        "modules" : {},
        "modules" : {
            "VideoPlayer" : {}
        },
        /* 应用发布信息 */
        "distribute" : {
            /* android打包配置 */
@@ -46,7 +48,8 @@
            },
            /* SDK配置 */
            "sdkConfigs" : {
                "ad" : {}
                "ad" : {},
                "oauth" : {}
            },
            "icons" : {
                "android" : {
@@ -82,6 +85,31 @@
            }
        }
    },
    "h5" : {
        "router" : {
            "mode" : "hash",
            "base" : "./"
        },
        // "base" : "/h5/"
        "devServer" : {
            "port" : 8090,
            "historyApiFallback" : true,
            "disableHostCheck" : true,
            "proxy" : {
                "/gateway_interface" : {
                    // 这个字段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                    // "target": "http://192.168.137.1:10010", // 代理服务器域名或IP地址
                    // "target" : "http://192.168.31.42:10010", // 代理服务器域名或IP地址
                    "target" : "http://10.50.250.178:8088", // 代理服务器域名或IP地址
                    "changeOrigin" : true, // 允许跨域 
                    "pathRewrite" : {
                        "^/gateway_interface" : ""
                    }
                }
            },
            "https" : false
        }
    },
    /* 快应用特有相关 */
    "quickapp" : {},
    /* 小程序特有相关 */

 h5_meeting/pages/index/config.vue

@@ -11,7 +11,7 @@
            <view class="item">
                <view class="title">接口地址</view>
                <view class="line">
                    <input type="text" placeholder="http://10.50.250.178:8088/gateway_interface" v-model="param.baseUrl" />
                    <input type="text" placeholder="http://10.50.250.178:8088/gateway_interface/" v-model="param.baseUrl" />
                    <image src="../../static/icon/right.svg" class="icon"></image>
                </view>
            </view>

 h5_meeting/pages/index/index.vue

@@ -16,8 +16,8 @@
            <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 3">已结束</text>
            <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 5">已撤销</text>
        </view>

        <view class="meeting_name">{{meetingInfo.meetingName}}</view>

        <view class="meeting_con">

        <view v-if="meetingInfo.meetingName" class="meeting_name">{{meetingInfo.meetingName}}</view>

        <view v-if="meetingInfo.meetingTime && meetingInfo.bookingUser" class="meeting_con">

            <view class="content">

                <view class="line">

                    <image src="@/static/ic_time@2x.png"></image>

@@ -28,8 +28,9 @@
                    <text>预约人：{{meetingInfo.bookingUser }}</text>

                </view>

            </view>
            <view v-if="meetingInfo.meetingTime" class="qrcode_wrap">
            <canvas id="qrcode" canvas-id="qrcode" class="qrcode"></canvas>
            <!-- <vueQr v-if="meetingInfo.id" :text="meetingInfo.id" class="qrcode" /> -->

            </view>

        </view>

        <view class="meeting_wrap">

            <view class="title">今日会议（{{ info.meetingListResponseList && info.meetingListResponseList.length > 0 ? info.meetingListResponseList.length : 0 }}）</view>

@@ -50,13 +51,13 @@
        </view>



        <!--  -->

        <swiper v-if="info.fileType == 0 && info.multifileList && info.multifileList.length > 0" class="swiper" circular autoplay indicator-dots>

        <swiper v-if="info.fileType == 0 && (info.meetingListResponseList == null || info.meetingListResponseList.length == 0)" class="swiper" circular autoplay indicator-dots>

            <swiper-item v-for="item in info.multifileList">

                <image class="swiper_item" :src="item.fileurlFull" mode="aspectFill"></image>

            </swiper-item>

        </swiper>
        <!--  -->
        <template v-if="info.fileType == 1 && info.multifileList && info.multifileList.length > 0">
        <template v-if="info.fileType == 1 && info.multifileList && info.multifileList.length > 0 && (info.meetingListResponseList == null || info.meetingListResponseList.length == 0)">
            <video  :src="info.multifileList[0].fileurlFull" class="app_video" :autoplay="true" loop :controls="false"></video>
        </template>

    </view>

@@ -109,7 +110,10 @@
                    this.info = res.data
                    if(this.info.meetingListResponseList && this.info.meetingListResponseList.length > 0){
                        this.meetingInfo = this.info.meetingListResponseList[0]
                        this.$nextTick(() => {
                        this.qrcodeCreate()
                            this.$forceUpdate()
                        })
                    }
                })

            },
@@ -117,7 +121,8 @@
                 // 获取uQRCode实例
                  var qr = new UQRCode();
                  // 设置二维码内容
                  qr.data = "https://uqrcode.cn/doc";
                  // qr.data = "https://uqrcode.cn/doc";
                  qr.data = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxac2a80c2144c4ee0&redirect_uri=http://192.168.0.109:8080/redirect.html&response_type=code&scope=snsapi_base&state=1#wechat_redirect";
                  // 设置二维码大小，必须与canvas设置的宽高一致
                  qr.size = 83;
                  // 调用制作二维码方法
@@ -160,6 +165,9 @@
</script>



<style lang="scss" scoped>
    page,body{
        overflow: hidden;
    }
    .swiper{
        position: fixed;
        top: 0;
@@ -243,6 +251,12 @@
                        flex: 1;

                        font-weight: bold;

                        font-size: 39rpx;

                        width: 100%;
                        word-break: break-all;
                        text-overflow: ellipsis;
                        display: -webkit-box;
                        -webkit-box-orient: vertical;
                        -webkit-line-clamp: 3; /* 超出几行省略 */

                    }



                    .line {

@@ -252,7 +266,7 @@
                }



                .empty {

                    background: rgba(255, 255, 255, 0.11);

                    background: rgba(255, 255, 255, 0.11) !important;

                }

            }

        }

@@ -278,13 +292,21 @@
                    }

                }

            }



            .qrcode_wrap{
                width: 92px;
                height: 92px;
                display: flex;
                align-items: center;
                justify-content: center;
                background-color: #fff;
            .qrcode {

                width: 83px;

                height: 83px;

                    width: 84px;
                    height: 84px;
            }

        }



        }



        .meeting_name {

            margin-bottom: 12rpx;

            font-weight: bold;


 h5_meeting/utils/config.js

@@ -1,8 +1,6 @@

// export const baseUrl = 'meetingAdmin/'
export const baseUrl = 'http://10.50.250.178:8088/gateway_interface/'
export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`
// export const baseUrl = 'gateway_interface/'
export const baseUrl = 'http://192.168.5.13/gateway_interface/'

export const statusMap = {
    0: '待确认',

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1036,7 +1036,7 @@
        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "非你的预约记录,无法进行该操作");
        }
        if (System.currentTimeMillis() < bookings.getStartTime().getTime()) {
        if (System.currentTimeMillis() < bookings.getStartTimeReal().getTime()) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "会议未开始,无法进行结束，如需该操作请使用取消功能");
        }
        if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {