diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js
index 1c803a7..09341d7 100644
--- a/pages/askHousing/askHousing.js
+++ b/pages/askHousing/askHousing.js
@@ -973,6 +973,8 @@ Page({
popUpSubtitle = value
popUpIs = this.data.popUpIs
+ if (field == "type" && choices.length > 4) popUpIs = "twoLines"
+
let popUpStepState = this.data.popUpStepState
if (field == "rentalduration") {
popUpIs = "leaseTime"
diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index 13c5748..99570d4 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -1868,8 +1868,8 @@ Page({
url: '/pages/user/user?tab=publish',
})
} else {
+ if (res.data['uniqid']) this.data.uniqid = res.data['uniqid']
let uniqid = this.data.uniqid
- this.data.uniqid = uniqid
let intermediary = app.globalData.user.intermediary
let popUpIs = ""
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index ec2651d..fe863bf 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -458,7 +458,7 @@
-
+
diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss
index 21e1ce3..9791676 100644
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@@ -746,6 +746,7 @@
border-radius: 10rpx;
margin: 0 30rpx 20rpx;
position: relative;
+ overflow: hidden;
}
.pop-up-homePhoto-image .pop-up-homePhoto-image-item {
diff --git a/pages/show/show.js b/pages/show/show.js
index 745eda0..5dc5215 100644
--- a/pages/show/show.js
+++ b/pages/show/show.js
@@ -282,8 +282,7 @@ Page({
})
let updatetime = data.info['updatetime']
- console.log("updatetime", updatetime);
-
+ data.info['updatetimeText'] = miucms.getTimeAgo(updatetime)
that.setData({
contactValue,
irentCouponBig: app.globalData.irentCouponBig || true,
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index 31490a8..1a3680a 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -27,13 +27,13 @@
-
+
{{ info.author }}
{{ info.intermediary_text }}
- {{ info.updatetime }}更新
+ {{ info.updatetimeText }}更新
|认证房源×{{ verifiedlistingcount }}
@@ -41,7 +41,6 @@
|房源×{{ intermediarylistingcount }}
-
@@ -103,7 +102,7 @@
-
+
{{ item.size }}
@@ -121,15 +120,15 @@
- 基本要求
+ 基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
{{ item.name }}
-
+
- {{ it }} |
+ {{ it }}
{{ item.value }}
@@ -142,7 +141,7 @@
-
+
目标区域
@@ -183,7 +182,7 @@
更多
-
+
@@ -222,7 +221,7 @@
房源联系人
-
+
{{ contacts.nickname }}
@@ -911,7 +910,7 @@
-
+
{{ info.address }}
@@ -922,7 +921,7 @@
-
+
{{ item.name }}
@@ -931,7 +930,7 @@
{{ it.title }}
- {{ it.distance }} km
+ {{ it.distance }} 公里
diff --git a/pages/show/show.wxss b/pages/show/show.wxss
index ef84c1f..55bfae1 100644
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@@ -928,7 +928,7 @@ map .clickmap {
display: inline-block;
height: 150rpx;
margin-right: 15rpx;
- border-radius: 15rpx;
+ /* border-radius: 15rpx; */
overflow: hidden;
}
@@ -943,7 +943,7 @@ map .clickmap {
height: 150rpx;
position: absolute;
background-color: rgba(51, 51, 51, 0.73333);
-
+ border-radius: 15rpx;
}
.certification .media-video .media-video-play .media-video-play-icon {
@@ -966,6 +966,7 @@ map .clickmap {
.certification .media-item image {
width: 204rpx;
height: 150rpx;
+ border-radius: 15rpx;
}
.certification .location-box {
@@ -1774,8 +1775,12 @@ map .clickmap {
}
.HResource-item-list.basic-list-twoLine .basic-Line-value .vertical {
- color: #D7D7D7;
+ /* color: #D7D7D7; */
margin: 0 10rpx;
+ width: 2rpx;
+ height: 27rpx;
+ display: flex;
+ background-color: #D7D7D7;
}
.basic-ask-for {}
diff --git a/utils/miucms.js b/utils/miucms.js
index 1575763..40e5cb6 100644
--- a/utils/miucms.js
+++ b/utils/miucms.js
@@ -374,6 +374,22 @@ function getTopTitle(that, app) {
}
+function getTimeAgo(time) {
+ const now = new Date();
+ time = new Date(time)
+ const diff = now - time;
+ const seconds = Math.floor(diff / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+ if (seconds < 60) return `${seconds}秒前`;
+ else if (minutes < 60) return `${minutes}分钟前`;
+ else if (hours < 24) return `${hours}小时前`;
+ else if (days < 7) return `${days}天前`;
+ else return time;
+
+}
+
module.exports = {
initial: initial,
share: share,
@@ -387,6 +403,7 @@ module.exports = {
clickAD,
count,
getTopTitle,
+ getTimeAgo,
https: function (url, data, success, fail) {
wx.request({
url: url,