diff --git a/app.json b/app.json
index 56a5626..ef59db1 100644
--- a/app.json
+++ b/app.json
@@ -14,7 +14,6 @@
"pages/ad/ad",
"pages/irentDetail/irentDetail",
"pages/show/show",
- "pages/video_show/video_show",
"pages/share/share",
"pages/messageCenter/messageCenter",
"pages/webViewwebweb/index",
diff --git a/pages/index/index.js b/pages/index/index.js
index 6e86327..90714bb 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -47,6 +47,7 @@ Page({
isMapFindState: false,
updateLoading: false,
isAllLoaded: false,
+
},
/**
@@ -87,7 +88,7 @@ Page({
// this.get_list();
this.getNewInit()
this.setData({
- initState: true
+ initState: true,
})
this.getTopTitle()
diff --git a/pages/intermediaryList/intermediaryList.js b/pages/intermediaryList/intermediaryList.js
index 8b0ffff..62ef7c9 100644
--- a/pages/intermediaryList/intermediaryList.js
+++ b/pages/intermediaryList/intermediaryList.js
@@ -130,6 +130,8 @@ Page({
isMapFindState: false,
morePage: 1, // 更多的页数
moreList: [], // 更多的数据
+
+ isShowVideo: true, // 是否显示 视频
},
headerSearchTopHeight: 10,
@@ -252,6 +254,7 @@ Page({
initState: true,
isloding: false,
langs: app.globalData.langs,
+ isShowVideo: app.globalData.isShowVideo,
})
app.globalData['langs'] ? '' : this.getDtailsLangs()
diff --git a/pages/intermediaryList/intermediaryList.wxml b/pages/intermediaryList/intermediaryList.wxml
index 3f9432f..65422aa 100644
--- a/pages/intermediaryList/intermediaryList.wxml
+++ b/pages/intermediaryList/intermediaryList.wxml
@@ -32,10 +32,10 @@
- 共 {{ totalSum }} 条中介房源 -
-
+
没有找到更多房源，为您推荐其他附近房源
-
+
到底了
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 1632fa1..a073dcf 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -137,6 +137,8 @@ Page({
isMapFindState: false,
morePage: 1, // 更多的页数
moreList: [], // 更多的数据
+
+ isShowVideo: true, // 是否显示 视频
},
headerSearchTopHeight: 10,
@@ -274,6 +276,7 @@ Page({
initState: true,
isloding: false,
langs: app.globalData.langs,
+ isShowVideo: app.globalData.isShowVideo,
})
app.globalData['langs'] ? '' : this.getDtailsLangs()
diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml
index 9bacc4a..8666db6 100644
--- a/pages/personList/personList.wxml
+++ b/pages/personList/personList.wxml
@@ -30,9 +30,9 @@
- 共 {{ totalSum }} 条{{ intermediaryObj[intermediary] }}房源 -
-
+
没有找到更多房源，为您推荐其他附近房源
-
+
到底了
diff --git a/pages/show/show.js b/pages/show/show.js
index a979d12..7517711 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -1296,7 +1296,6 @@ Page({
if (minutes != 0) text += minutes + 'min'
if (remainingSeconds != 0 && minutes == 0) text += remainingSeconds + 's'
}
-
return text
},
// 转换 米数
@@ -1305,5 +1304,5 @@ Page({
if (input >= 1000) text = (input / 1000).toFixed(1) + (type == 'chinese' ? '公里' : 'km')
else text = input + (type == 'chinese' ? '米' : 'm');
return text;
- }
+ },
})
\ No newline at end of file
diff --git a/pages/show/show.less b/pages/show/show.less
new file mode 100644
index 0000000..706d028
--- /dev/null
+++ b/pages/show/show.less
@@ -0,0 +1,3 @@
+.school-new {
+
+}
\ No newline at end of file
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index fe991bb..94c59f4 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -46,113 +46,116 @@
-
-
-
-
-
- 认证中介
-
+
+
+
+
+
+
+ 认证中介
+
-
-
- {{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}
-
- {{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}
-
-
- {{ info.subject }}
-
-
-
- 预算
- {{ info.currency || "HK$"}}
- {{ info.rent }}
- /{{ info.rentalperiod }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ info.video.length }}
-
-
-
- {{ info.picturegroup.length }}
-
-
-
-
-
-
-
-
-
- {{ item.size }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
-
-
-
-
- {{ item.name }}
-
-
- {{ it }}
-
-
- {{ item.value }}
-
-
-
-
-
-
-
-
-
-
- 目标区域
-
-
-
- {{ item.head }}
-
-
- {{ item.end }}
+
+
+ {{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}
+
+ {{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}
-
+ {{ info.subject }}
+
+
+
+ 预算
+ {{ info.currency || "HK$"}}
+ {{ info.rent }}
+ /{{ info.rentalperiod }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ info.video.length }}
+
+
+
+ {{ info.picturegroup.length }}
+
+
+
+
+
+
+
+
+
+ {{ item.size }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
+
+
+
+
+ {{ item.name }}
+
+
+ {{ it }}
+
+
+ {{ item.value }}
+
+
+
+
+
+
+
+
+
+
+ 目标区域
+
+
+
+ {{ item.head }}
+
+
+ {{ item.end }}
+
+
+
+
+
-
-
- {{ item.alias }}
- {{ item.distanceText }}
-
-
-
+
+ {{ item.alias }}
+ {{ item.distanceText }}
+
更多
+
+
+
+ 城大
+ 2.2km
+
+ 2.2km
+
+
@@ -227,7 +231,6 @@
-
diff --git a/pages/show/show.wxss b/pages/show/show.wxss
index 00d2e76..812e479 100644
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@@ -2454,11 +2454,9 @@ map .clickmap {
margin-bottom: 39rpx;
}
-/* .journey-item:not(:last-of-type)::after { */
.academy-school-item-journey::after {
content: "";
position: absolute;
- /* top: calc((100% - 39rpx) / 2 + 6.75rpx); */
top: 0;
left: 39.25rpx;
width: 1rpx;
@@ -2541,4 +2539,6 @@ map .clickmap {
color: #a09e9e;
font-size: 22.5rpx;
margin-bottom: 30rpx;
-}
\ No newline at end of file
+}
+
+
diff --git a/pages/user/user.js b/pages/user/user.js
index 33c5a40..89733ce 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -138,6 +138,8 @@ Page({
authenticatePopupStatus: false, // 认证弹窗状态 intermediary-succeed-pop
authenticatePopupState: null, // 认证弹窗状态 intermediary-succeed-pop
+ isShowVideo: true, // 是否显示 视频
+
},
launchAppError(e) {
console.log(e.detail.errMsg)
@@ -241,10 +243,9 @@ Page({
status: app.globalData.status,
wechat: app.globalData.wechat,
bottomLift: app.globalData.screen_data.bottomLift,
+ isShowVideo: app.globalData.isShowVideo,
})
this.getUserInit()
-
- // this['get_' + this.data.tab]()
} else {
setTimeout(function () {
that.get_config()
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index b9e9336..7cb0331 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -75,7 +75,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
diff --git a/pages/video_show/video_show.js b/pages/video_show/video_show.js
deleted file mode 100644
index 38b69eb..0000000
--- a/pages/video_show/video_show.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/video_show/video_show.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/pages/video_show/video_show.wxml b/pages/video_show/video_show.wxml
deleted file mode 100644
index d71b6dc..0000000
--- a/pages/video_show/video_show.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pages/video_show/video_show.wxml
\ No newline at end of file
diff --git a/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js b/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
index a260e3d..96c2d7e 100644
--- a/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
+++ b/pagesLoginRequired/pages/setAvatarNickname/setAvatarNickname.js
@@ -31,9 +31,14 @@ Page({
miucms.request(`${app.globalData.baseURL}/tenement/v2/api/user/uploadAvatar`, {
data: avatarUrl
}).then(res => {
- let data = res.data
- // app.globalData.user = data.user
- app.globalData.user = Object.assign({}, app.globalData.user, data.user)
+ if (res.code != 200) {
+ wx.showToast({
+ icon: "none",
+ title: res.message || '上传失败，稍候试试。',
+ })
+ return
+ }
+ let data = res.data = app.globalData.user = Object.assign({}, app.globalData.user, data.user)
app.globalData['setSate'] = true
})
},
diff --git a/template/commonList/commonList.js b/template/commonList/commonList.js
index d0f8e59..5714472 100644
--- a/template/commonList/commonList.js
+++ b/template/commonList/commonList.js
@@ -17,6 +17,7 @@ Component({
observer: function (res) {}
},
school: String, // 筛选的 学校值
+ isShowVideo: Boolean,
},
/**
diff --git a/template/commonList/commonList.wxml b/template/commonList/commonList.wxml
index 285d4fd..bfb1a26 100644
--- a/template/commonList/commonList.wxml
+++ b/template/commonList/commonList.wxml
@@ -60,7 +60,7 @@
-
+
diff --git a/utils/miucms.js b/utils/miucms.js
index effe320..f6481fa 100644
--- a/utils/miucms.js
+++ b/utils/miucms.js
@@ -56,6 +56,7 @@ function sendData(code) {
app.globalData.wechat = data.wechat;
app.globalData.isMapFindState = data.isMapFindState;
app.globalData.isShowVideo = data.reviewmode == 1 ? false : true;
+ // app.globalData.isShowVideo = false
app.globalData.header = {
'content-type': 'application/json',