Merge remote-tracking branch 'origin/master'

k94314517

2024-10-09 8f2ad5eb040a2f3f1cae62a9c099c8f5f66750e1

 h5_meeting/pages/index/index.vue

@@ -10,11 +10,16 @@
      </view>

      <view class="home_status">
         <text v-if="!info.meetingListResponseList || info.meetingListResponseList.length == 0">空闲中</text>
         <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 4">即将开始</text>
         <text class="orange" v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 2">会议中</text>
         <text v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 1">未开始</text>
         <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>
         <text

            v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 4">即将开始</text>

         <text class="orange"

            v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 2">会议中</text>

         <text

            v-if="info.meetingListResponseList && info.meetingListResponseList.length > 0 && info.meetingListResponseList[0].meetingStatus == 1">未开始</text>

         <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 v-if="meetingInfo.meetingName" class="meeting_name">{{meetingInfo.meetingName}}</view>

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

@@ -28,12 +33,14 @@
               <text>预约人：{{meetingInfo.bookingUser }}</text>

            </view>

         </view>
         <view v-if="meetingInfo.meetingTime" class="qrcode_wrap">
         <view v-if="showQrbg" class="qrcode_wrap">

            <canvas id="qrcode" canvas-id="qrcode" class="qrcode"></canvas>
         </view>

      </view>

      <view class="meeting_wrap">

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

         <view class="title">

            今日会议（{{ info.meetingListResponseList && info.meetingListResponseList.length > 0 ? info.meetingListResponseList.length : 0 }}）

         </view>

         <view class="list">

            <view class="item" v-for="item in info.meetingListResponseList">

               <view class="name">{{item.meetingName}}</view>

@@ -51,13 +58,16 @@
      </view>



      <!--  -->

      <swiper v-if="info.fileType == 0 && (info.meetingListResponseList == null || info.meetingListResponseList.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 && (info.meetingListResponseList == null || info.meetingListResponseList.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>

@@ -76,6 +86,7 @@
         return {

            time: '',

            date: '',

            showQrbg: false,

            timer: null,

            touchNum: 0,

            param: {},
@@ -100,10 +111,10 @@
         }

         this.getData()

      },
      onReady() {
      },

      onReady() {},

      methods: {

         getData() {

            this.showQrbg = false

            meetScreenData({

               roomId: this.param.code

            }).then(res => {
@@ -114,15 +125,21 @@
                     this.qrcodeCreate()
                     this.$forceUpdate()
                  })
               } else {

                  this.showQrbg = false

                  this.meetingInfo = {}

               }
            })

         },
         qrcodeCreate(){
            this.showQrbg = true

            this.$nextTick(() => {

             // 获取uQRCode实例
              var qr = new UQRCode();
              // 设置二维码内容
              // 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";
               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;
              // 调用制作二维码方法
@@ -133,6 +150,7 @@
              qr.canvasContext = canvasContext;
              // 调用绘制方法将二维码图案绘制到canvas上
              qr.drawCanvas();
            })

         },

         touchend() {

            this.touchNum++

@@ -165,9 +183,11 @@
</script>



<style lang="scss" scoped>
   page,body{
   page,

   body {

      overflow: hidden;
   }


   .swiper{
      position: fixed;
      top: 0;
@@ -175,12 +195,14 @@
      z-index: 999;
      width: 100%;
      height: 100vh;


      .swiper_item{
         background-color: #0095AC;
         width: 100%;
         height: 100vh;
      }
   }


   .app_video{
      width: 100%;
      height: 100vh;
@@ -189,10 +211,15 @@
      left: 0;
      z-index: 999;
   }



   .main_app {

      width: 100%;

      height: 100vh;

      position: relative;

      position: fixed;
      top: 0;
      left: 0;
      right: 0;
      bottom: 0;

      font-size: 28rpx;

      display: flex;

      flex-direction: column;

@@ -235,9 +262,11 @@
               border-radius: 7rpx;

               margin-right: 28rpx;

               position: relative;



               &:nth-of-type(1){
                  background: linear-gradient(90deg, #0095AC 0%, #00B5D1 100%);
               }



               .item_bg {

                  position: absolute;

                  width: 178rpx;

@@ -256,7 +285,8 @@
                  text-overflow: ellipsis;
                  display: -webkit-box;
                  -webkit-box-orient: vertical;
                  -webkit-line-clamp: 3; /* 超出几行省略 */

                  -webkit-line-clamp: 3;

                  /* 超出几行省略 */

               }



               .line {

@@ -292,6 +322,7 @@
               }

            }

         }



         .qrcode_wrap{
            width: 92px;
            height: 92px;
@@ -299,6 +330,7 @@
            align-items: center;
            justify-content: center;
            background-color: #fff;


            .qrcode {
               width: 84px;
               height: 84px;