From 26efe6cea6f57166697d0ac26d0adc7ef0cd8438 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 九月 2024 09:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5_meeting/pages/index/index.vue | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/h5_meeting/pages/index/index.vue b/h5_meeting/pages/index/index.vue
index b93eb84..44a7607 100644
--- a/h5_meeting/pages/index/index.vue
+++ b/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>
- <canvas id="qrcode" canvas-id="qrcode" class="qrcode"></canvas>
- <!-- <vueQr v-if="meetingInfo.id" :text="meetingInfo.id" class="qrcode" /> -->
+ <view v-if="meetingInfo.meetingTime" 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>
@@ -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.qrcodeCreate()
+ 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";
// 璁剧疆浜岀淮鐮佸ぇ灏忥紝蹇呴』涓巆anvas璁剧疆鐨勫楂樹竴鑷�
qr.size = 83;
// 璋冪敤鍒朵綔浜岀淮鐮佹柟娉�
@@ -160,6 +165,9 @@
</script>
<style lang="scss" scoped>
+ page,body{
+ overflow: hidden;
+ }
.swiper{
position: fixed;
top: 0;
@@ -242,7 +250,13 @@
.name {
flex: 1;
font-weight: bold;
- font-size: 39rpx;
+ 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,11 +292,19 @@
}
}
}
-
- .qrcode {
- width: 83px;
- height: 83px;
+ .qrcode_wrap{
+ width: 92px;
+ height: 92px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #fff;
+ .qrcode {
+ width: 84px;
+ height: 84px;
+ }
}
+
}
.meeting_name {
--
Gitblit v1.9.3