From e48a1c0389f8a5ee753a2550fc62a324a72b12f8 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 23 九月 2024 09:03:25 +0800
Subject: [PATCH] ll
---
h5_meeting/pages/index/index.vue | 50 ++++++++++++++++++-------
h5_meeting/api/index.js | 2
h5_meeting/utils/config.js | 6 +--
h5_meeting/manifest.json | 32 +++++++++++++++-
h5_meeting/pages/index/config.vue | 2
5 files changed, 70 insertions(+), 22 deletions(-)
diff --git a/h5_meeting/api/index.js b/h5_meeting/api/index.js
index 455b1d6..cca86ca 100644
--- a/h5_meeting/api/index.js
+++ b/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
})
diff --git a/h5_meeting/manifest.json b/h5_meeting/manifest.json
index 56005ca..df57eb9 100644
--- a/h5_meeting/manifest.json
+++ b/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" : {
+ // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/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" : {},
/* 灏忕▼搴忕壒鏈夌浉鍏� */
diff --git a/h5_meeting/pages/index/config.vue b/h5_meeting/pages/index/config.vue
index f75c39c..b2578aa 100644
--- a/h5_meeting/pages/index/config.vue
+++ b/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>
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 {
diff --git a/h5_meeting/utils/config.js b/h5_meeting/utils/config.js
index ce04ab2..ec0d297 100644
--- a/h5_meeting/utils/config.js
+++ b/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: '寰呯‘璁�',
--
Gitblit v1.9.3