diff --git a/app.js b/app.js
index 6a22e89..13dd162 100644
--- a/app.js
+++ b/app.js
@@ -184,6 +184,7 @@ App({
},
isMapFindState: false, // 地图找房入口
+ isShowVideo: true, // 是否显示视频
socketTask: null, // 全局的 socket 值
isHideState: true, // 判断是否 隐藏了 在 onshow 为 true 是代表小程序后台打开
diff --git a/pages/index/index.js b/pages/index/index.js
index fe07180..6e86327 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -16,7 +16,6 @@ Page({
banner: [],
service: '',
servicename: '',
- video: '',
screen_data: {},
advListHKhousing: {},
advListotherHousing: {},
@@ -208,16 +207,6 @@ Page({
const content = this.data.servicename;
miucms.copy(content).then((res) => {}).catch(err => {})
},
- play(e) {
- this.setData({
- video: e.detail.src
- })
- },
- closePage(e) {
- this.setData({
- video: ''
- })
- },
// 关闭广告
closeAd(e) {
let {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 033a78e..10e6d95 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -136,13 +136,6 @@
-
-
-
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index fba8a83..3f64723 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -54,30 +54,6 @@
border-radius: 10rpx;
}
-.video-box {
- width: 100vw;
- height: 100vh;
- z-index: 100000;
- background: rgba(0, 0, 0, 0.8);
- position: fixed;
- left: 0;
- top: 0;
-}
-
-.video-box .close {
- position: fixed;
- left: 20rpx;
- top: 20rpx;
- width: 50rpx;
- height: 50rpx;
- z-index: 1000000
-}
-
-.video-box video {
- width: 100vw;
- height: 100vh;
-}
-
.cover {
position: fixed;
left: 5px;
diff --git a/pages/irentDetail/irentDetail.js b/pages/irentDetail/irentDetail.js
index 958bdb7..e730498 100644
--- a/pages/irentDetail/irentDetail.js
+++ b/pages/irentDetail/irentDetail.js
@@ -64,7 +64,7 @@ Page({
bottomLift: 0,
operationsTop: false,
-
+ isShowVideo: true, // 是否显示 视频
},
timer: null,
@@ -137,6 +137,7 @@ Page({
listTab: app.globalData.listTab,
screen_data: app.globalData.screen_data,
bottomLift: app.globalData.screen_data.bottomLift,
+ isShowVideo: app.globalData.isShowVideo,
})
this.get_content();
@@ -207,6 +208,14 @@ Page({
} else {
data = data.data
let info = data.info
+ if (!this.data.isShowVideo) {
+ info.videos = []
+ const roomList = data.roomList || []
+ roomList.forEach(element =>{
+ element.videos = []
+ })
+ }
+
let coordinate = info.coordinate
this.data.coordinate = coordinate.split(',').map(item => {
return item * 1
@@ -586,12 +595,6 @@ Page({
sources: attachment,
current
})
-
- // return
- // wx.setStorageSync('attachment', attachment)
- // wx.navigateTo({
- // url: `/pages/video_show/video_show?frompage=apartment¤t=${current}`
- // });
},
// 公共跳转
diff --git a/pages/show/show.js b/pages/show/show.js
index 95eb5e5..a979d12 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -111,6 +111,8 @@ Page({
targetAcademyPitch: [], // 附近学校距离选中院校 数据
specialSchoolDistance: null, // 特殊的 用户带有school参数 则需要特殊显示 学校距离
+
+ isShowVideo: true, // 是否显示 视频
},
to_share() {
wx.navigateTo({
@@ -166,7 +168,8 @@ Page({
show_btn: options.show_btn ? options.show_btn : 'show',
options: options || {},
irentCouponBig: app.globalData.irentCouponBig,
- ['info.cityid']: options.cityid
+ ['info.cityid']: options.cityid,
+ isShowVideo: app.globalData.isShowVideo,
})
screenWidth = wx.getSystemInfoSync().screenWidth;
center_position = screenWidth / 2;
@@ -265,6 +268,10 @@ Page({
} else {
data = data.data
let info = data.info
+
+ if (!this.data.isShowVideo) info.video = null
+
+
let arr = ["wechat", "wechatdata", "whatsapp", "tel"]
let contactValue = []
let contactObj = this.data.contactObj
@@ -650,9 +657,15 @@ Page({
},
show_video: function (e) {
var src = e.currentTarget.dataset.src;
- wx.navigateTo({
- url: '../video_show/video_show?src=' + src
+ wx.previewMedia({
+ sources: [{
+ url: src,
+ type: "video",
+ }]
})
+ // wx.navigateTo({
+ // url: '../video_show/video_show?src=' + src
+ // })
},
showSchoolAlert(e) {
this.setData({
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index 7f089f8..fe991bb 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -327,6 +327,7 @@
{{ targetAcademyPitch.school }}
+ 本数据来自高德地图,仅供参考。