diff --git a/img/all-apartments-icon.svg b/img/all-apartments-icon.svg new file mode 100644 index 0000000..f44be02 --- /dev/null +++ b/img/all-apartments-icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/apartment-facilities.svg b/img/apartment-facilities.svg new file mode 100644 index 0000000..b6c4666 --- /dev/null +++ b/img/apartment-facilities.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/blue-tick.svg b/img/blue-tick.svg new file mode 100644 index 0000000..08e691d --- /dev/null +++ b/img/blue-tick.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/brand-Introduction.png b/img/brand-Introduction.png new file mode 100644 index 0000000..77b4078 Binary files /dev/null and b/img/brand-Introduction.png differ diff --git a/img/listing-details.png b/img/listing-details.png new file mode 100644 index 0000000..d4569ba Binary files /dev/null and b/img/listing-details.png differ diff --git a/img/live.png b/img/live.png new file mode 100644 index 0000000..213eea5 Binary files /dev/null and b/img/live.png differ diff --git a/img/room-type.png b/img/room-type.png new file mode 100644 index 0000000..4f91885 Binary files /dev/null and b/img/room-type.png differ diff --git a/img/same-brand-recommendation.png b/img/same-brand-recommendation.png new file mode 100644 index 0000000..729de9f Binary files /dev/null and b/img/same-brand-recommendation.png differ diff --git a/img/special-offer.svg b/img/special-offer.svg new file mode 100644 index 0000000..97b886f --- /dev/null +++ b/img/special-offer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/traffic.svg b/img/traffic.svg new file mode 100644 index 0000000..83918ba --- /dev/null +++ b/img/traffic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pages/common/common.wxml b/pages/common/common.wxml index 04a7939..be2812f 100644 --- a/pages/common/common.wxml +++ b/pages/common/common.wxml @@ -571,4 +571,39 @@ + + + + \ No newline at end of file diff --git a/pages/common/common.wxss b/pages/common/common.wxss index 6ccc7ec..1c1d19f 100644 --- a/pages/common/common.wxss +++ b/pages/common/common.wxss @@ -998,4 +998,137 @@ -webkit-line-clamp: 3; overflow: hidden; text-overflow: ellipsis; +} + + + +.apartment-item { + width: 690rpx; + box-shadow: 0px 0px 12rpx rgba(0, 0, 0, 0.0784313725490196); + border-radius: 18rpx; +} + +.apartment-item:not(:last-of-type) { + margin-bottom: 36rpx; +} + +.apartment-item .apartment-top { + height: 459rpx; + width: 100%; + flex-direction: column; + align-items: center; + justify-content: center; + position: relative; +} + +.apartment-item .apartment-top .apartment-name { + height: 48rpx; + font-size: 30rpx; + font-weight: 650; + color: #000000; + padding: 0 25rpx; + border-radius: 25rpx; + background-color: rgba(255, 255, 255, 0.7); + z-index: 1; +} + +.apartment-item .apartment-top .apartment-icon { + width: 100%; + height: 100%; + border-radius: 18rpx; + position: absolute; +} + +.apartment-item .apartment-bottom { + position: relative; + margin-top: -109.5rpx; +} + +.apartment-item .apartment-introduce { + background-color: rgba(0, 0, 0, 0.63921568627451); + height: 48rpx; + width: 630rpx; + margin: -48rpx auto 0; + padding: 0 12rpx; + border-radius: 24rpx 24rpx 0 0; + color: #D7D7D7; + font-size: 21rpx; +} + +.apartment-item .apartment-bottom .apartment-tag { + padding: 0 15rpx; + border-radius: 12rpx; + height: 33rpx; + border: 1rpx solid rgba(121, 121, 121, 1); + margin-right: 15rpx; + color: #FDDA55; +} + +.apartment-item .apartment-bottom .apartment-content { + border-radius: 12rpx 12rpx 18rpx 18rpx; + background-color: #fff; + flex-direction: column; +} + +.apartment-item .apartment-bottom .apartment-content { + padding: 27rpx 24rpx; +} + +.apartment-item .apartment-bottom .apartment-quantity { + color: #7F7F7F; + font-size: 21rpx; +} + +.apartment-item .apartment-bottom .apartment-message { + justify-content: space-between; +} + +.apartment-item .apartment-bottom .apartment-place { + color: #555555; + font-size: 23rpx; +} + +.apartment-item .apartment-bottom .apartment-place-icon { + width: 27rpx; + height: 27rpx; + margin-right: 10rpx; +} + +.apartment-item .apartment-bottom .apartment-price { + padding: 0 14rpx; + background: rgba(246, 246, 246, 1); + border-radius: 18rpx; + margin-top: 24rpx; +} + +.apartment-item .apartment-bottom .apartment-price-item { + height: 81rpx; + justify-content: space-between; +} + +.apartment-item .apartment-bottom .apartment-price-item:not(:last-of-type) { + border-bottom: 1rpx solid #ebebeb; +} + +.apartment-item .apartment-bottom .apartment-price-name { + color: #000000; + font-size: 23rpx; +} + +.apartment-item .apartment-bottom .apartment-price-symbol { + font-weight: 900; + color: #000000; + font-size: 21rpx; +} + +.apartment-item .apartment-bottom .apartment-price-price { + color: #F95D5D; + font-size: 30rpx; + font-weight: 900; + margin: 0 10rpx; +} + +.apartment-item .apartment-bottom .apartment-price-unit { + color: #555555; + font-size: 21rpx; } \ No newline at end of file diff --git a/pages/irentDetail/irentDetail.js b/pages/irentDetail/irentDetail.js index 800cc3e..d1ee7dc 100644 --- a/pages/irentDetail/irentDetail.js +++ b/pages/irentDetail/irentDetail.js @@ -55,17 +55,11 @@ Page({ customerservice: null, serviceWindowState: false, serviceWindowList: [], // 客服弹出列表数据 - tips: "", //客服弹窗提示语 - - swiperCurrent: 0, - swiperHeightObj: {}, // 轮播图的高度 - showSwiperCurrent: 0, - showSwiperAmount: 0, - showSwiperTab: "live", // live video image - showSwiperTabList: { - live: "直播", - video: "视频", - image: "图片", + tips: "", //客服弹窗提示语 + facilitiesKeyValue: { + public: "公共", + kitchen: "餐厨", + lavatory: "洗手间", }, isNewVersions: true, @@ -196,33 +190,17 @@ Page({ }); let image = [...data.data.attachment] let attachment = []; - let showSwiperAmount = 0 - let showSwiperTab = "" - let showSwiperTabList = this.data.showSwiperTabList if (data.data.live && data.data.live.length > 0) { - showSwiperAmount = data.data.live.length - showSwiperTab = "live" data.data.live.map(item => { - item['type'] = "live" item['islive'] = 1; attachment.push(item) }) - } else { - delete showSwiperTabList['live'] } if (data.data.video && data.data.video.length > 0) { - if (showSwiperAmount == 0) { - showSwiperAmount = data.data.video.length - showSwiperTab = "video" - } - data.data.video.map(item => { - item['type'] = "video" item['isvideo'] = 1 attachment.push(item) }) - } else { - delete showSwiperTabList['video'] } data.data.attachment.map(item => { attachment.push({ @@ -232,9 +210,6 @@ Page({ }) that.setData({ - showSwiperAmount: showSwiperAmount == 0 ? image.length : showSwiperAmount, - showSwiperTab: !showSwiperTab ? "image" : showSwiperTab, - showSwiperTabList, irenCouponReceive: data.data.irenCouponReceive, companyid: data.data.companyid, uniqid: data.data.uniqid, @@ -536,90 +511,5 @@ Page({ return false }, - imageLoad(e) { - let index = e.target.dataset.index - let { - height, - width - } = e.detail - let swiperHeightObj = this.data.swiperHeightObj - let targetHeight = 0 - targetHeight = (height / width) * 690 - swiperHeightObj[index] = targetHeight - this.setData({ - swiperHeightObj - }) - }, - - bindchangeSwiper(e) { - // {{ showSwiperCurrent + 1 }}/ {{ showSwiperAmount }} - console.log(e); - let attachment = this.data.attachment - let video = (this.data.video && this.data.video.length) || 0 - let live = (this.data.live && this.data.live.length) || 0 - let image = (this.data.image && this.data.image.length) || 0 - - let swiperCurrent = e.detail.current; - let tab = e.currentTarget.dataset.tab - if (tab == "live") swiperCurrent = 0 - if (tab == "video") swiperCurrent = live - if (tab == "image") swiperCurrent = live + video - - let targetData - let showSwiperCurrent = 0 - let showSwiperAmount = 0 - let type = attachment[swiperCurrent]['type'] - - if (type == "live") { - targetData = live - showSwiperCurrent = swiperCurrent - } - if (type == "video") { - targetData = video - showSwiperCurrent = swiperCurrent - live - } - if (type == "image") { - targetData = image - showSwiperCurrent = swiperCurrent - live - video - } - - showSwiperAmount = targetData - - this.setData({ - swiperCurrent, - showSwiperCurrent, - showSwiperAmount, - showSwiperTab: type, - }) - }, - - play(e) { - wx.navigateTo({ - url: '/pages/video_show/video_show?src=' + e.currentTarget.dataset.video, - }) - }, - - send_form_id: function (e) { - let { - statid, - url, - type - } = e.currentTarget.dataset; - this.previewImg(e) - wx.request({ - url: app.globalData.config.FormidInsert, - data: { - session: wx.getStorageSync('session'), - formid: e.detail.formId, - statid - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: app.globalData.header, - success: function (res) { - var data = app.return_data(res); - } - }) - }, - }) \ No newline at end of file diff --git a/pages/irentDetail/irentDetail.wxml b/pages/irentDetail/irentDetail.wxml index 9fe8ad3..0220fd2 100644 --- a/pages/irentDetail/irentDetail.wxml +++ b/pages/irentDetail/irentDetail.wxml @@ -5,26 +5,139 @@ 公寓详情 - - - - - - - - - - {{ item }} + + + + + + + 城理浸公源房 + + + 「這裡」国际青年公寓 + 独栋式学生公寓，配备安保及管理员，24小时客服、每日清洁服务，到达城大、理大、浸会、公开仅需十几分钟，到达港大三十分钟，到达中大四十分钟。 + + + + 旗下所有公寓 + + 3 + + + + + + + + + 双人套间 + + 限女生 + + + + + + + + + + HK$6900 + /月 + HK$ 7600 / 月 + + 预登记 + + + + + + + + + 即日预定到8月28日： + + 送话费：预定送全年话费(HK$1056) + + 年付优惠：管理费5折+免1.5%跨境支付手续费+新生大礼包（洗衣套装、转换插头、智能水杯）+床上五件套（床单、被套、枕套、枕头、被子） + + 半年付优惠：免1.5%跨境支付手续费+新生大礼包（洗衣套装、转换插头、智能水杯） + + G/H房 仅限女生 + + 长租：10-11个月，2个月押金，租金4900hkd，6%管理费，包水费网费，电费按实际实用收取。 + + 优惠：一次性支付租金管理费5折优惠 + + + + + + + + + + 大埔中心 + + + + + + + + + + + {{ traffic }} + + + + + {{ message }} + + + + + + + + + + + + {{ life }} + + + + + + + {{ brand }} - {{ showSwiperCurrent + 1 }} / {{ showSwiperAmount }} + + + 温馨提示：房源信息均由公寓方/酒店提供并对其真实性、合法性等负责，平台不负责甄别和审核具体内容真实性和有效性等，请务必仔细核实相关信息，谨防上当受骗。 + 公寓/酒店/中介房源推广合作请联系：ad@gter.net + + + + + + + + + + + 学生公寓 + - + {{ data.title }} @@ -63,7 +176,6 @@ - @@ -296,4 +408,22 @@ - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/pages/irentDetail/irentDetail.wxss b/pages/irentDetail/irentDetail.wxss index d573295..6ad3921 100644 --- a/pages/irentDetail/irentDetail.wxss +++ b/pages/irentDetail/irentDetail.wxss @@ -1,4 +1,5 @@ /* pages/irentDetail/irentDetail.wxss */ +@import '../common/common.wxss'; .container { position: relative; background: #fff; @@ -793,7 +794,6 @@ map .clickmap { .container .content { width: 100vw; - height: 1000rpx; background-color: #f6f6f6; border-radius: 65rpx 0 0 0; margin-top: 70rpx; @@ -803,76 +803,358 @@ map .clickmap { } .media-module { - position: relative; - + margin-bottom: 48rpx; } -.swiper { - width: 100vw; +.tab-box { padding: 0 30rpx; - box-sizing: border-box; - height: 459rpx; + margin-bottom: 27rpx; } -.swiper .swiper-item { - position: relative; - box-sizing: border-box; +.tab-box .tab-item { + height: 36rpx; + padding: 0 20rpx; + color: #447eb3; + background: linear-gradient(-55.8297720355872deg, rgba(224, 240, 255, 1) 0%, rgba(98, 177, 255, 1) 297%); + border-radius: 12rpx; + font-size: 21rpx; + margin-right: 12rpx; } -.swiper .swiper-item .play-btn { - position: absolute; - top: 50%; - left: 50%; - width: 75rpx; - height: 75rpx; - transform: translate(-50%, -50%); +.apartment-title { + font-size: 42rpx; + line-height: 69rpx; + color: #000000; + margin-bottom: 24rpx; } -.media-item { - width: 690rpx; - height: 459rpx; - background-color: #62b1ff; - box-sizing: border-box; - border-radius: 40rpx; - box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); - +.apartment-introduce { + color: #7f7f7f; + line-height: 36rpx; + font-size: 25.5rpx; + padding: 0 30rpx; + margin-bottom: 37.5rpx; } -.media-module .media-text { - position: absolute; - bottom: 20rpx; - right: 40rpx; - color: #fff; - font-size: 22rpx; - background: rgba(0, 0, 0, 0.4); - border-radius: 20rpx; - height: 40rpx; - display: flex; - align-items: center; - justify-content: center; - padding: 0 14rpx; +.all-apartments { + color: rgb(51, 51, 51); + font-size: 24rpx; + line-height: 36rpx; + justify-content: space-between; + background-color: rgba(242, 242, 242, 1); + border: 1rpx solid rgba(235, 235, 235, 1); + border-radius: 24rpx; + height: 72rpx; + margin: 0 30rpx 75rpx; + padding: 0 18rpx; } -.media-module .media-indicator { +.all-apartments .all-apartments-amount { + width: 30rpx; + height: 30rpx; + border-radius: 50%; + background-color: #fdda55; + color: #000; + font-size: 21rpx; + margin-right: 18rpx; +} + +.all-apartments .all-apartments-icon { + width: 9rpx; + height: 15rpx; +} + +.apartment-block { + margin-bottom: 75rpx; +} + +.apartment-block .apartment-head { + color: #000000; + font-size: 27rpx; + padding: 0 30rpx; + margin-bottom: 31.5rpx; +} + +.apartment-block .apartment-head-icon { + margin-right: 12rpx; + width: 36rpx; + height: 36rpx; +} + +.room-type-box { + padding: 0 30rpx; +} + +.room-type-box .room-type-item { background-color: #fff; - border-radius: 54rpx; - color: #555555; - font-size: 23rpx; - position: absolute; - bottom:30rpx; - left: 50%; - transform: translateX(-50%); - height: 42rpx; + border-radius: 15rpx; + margin-bottom: 30rpx; + padding-top: 28rpx; + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); + border-top: 8rpx solid rgba(253, 223, 109, 1); } -.media-module .media-indicator .media-indicator-item { - width: 84rpx; +.room-type-box .room-type-tab { + padding: 0 24rpx; +} + +.room-type-box .room-type-title { + padding: 0 24rpx; + font-size: 36rpx; + color: #000000; + font-weight: 650; + margin-bottom: 16.5rpx; +} + +.room-type-box .room-type-tab { + margin-bottom: 31.5rpx; +} + +.room-type-box .room-type-tab-item { + color: #7F7F7F; + font-size: 23rpx; + border-radius: 6rpx; + height: 36rpx; + background-color: rgb(242, 242, 242); + padding: 0 10rpx; + margin-right: 12rpx; +} + +.room-type-box .room-type-tab-item.highlight { + color: #50e3c2; + background-color: #fff; + border: 1rpx solid rgba(80, 227, 194, 1); +} + + +.room-type-box .room-type-media { + padding: 0 24rpx; + margin-bottom: 30rpx; + overflow-x: auto; + width: 690rpx; + display: -webkit-box; +} + +.room-type-box .room-type-media-item { + width: 114rpx; + height: 120rpx; + border-radius: 20rpx; + margin-right: 15rpx; + background-color: #62b1fe; + position: relative; +} + +.room-type-box .room-type-media-image { + width: 100%; height: 100%; } -.media-module .media-indicator .media-indicator-item.pitch { - background-color: red; - border-radius: 54rpx; - color: #fff; +.room-type-box .room-type-videoplay { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 50rpx; + height: 50rpx; +} +.room-type-box .room-type-bottom { + justify-content: space-between; + height: 106.5rpx; + border-top: 1rpx solid #f2f2f2; + padding: 0 28rpx; +} + +.room-type-box .room-type-bottom-left { + color: #000000; + font-weight: 900; + font-family: Arial, Helvetica, sans-serif; + font-size: 24rpx +} + +.room-type-box .room-type-bottom .room-type-price { + color: #f95d5d; + font-size: 36rpx; + margin: 0 10rpx; +} + +.room-type-box .room-type-bottom .room-type-worn-price { + margin-left: 18rpx; + color: #aaaaaa; + font-size: 24rpx; + font-weight: 200; + text-decoration: line-through; +} + +.room-type-box .room-type-bottom .room-type-month { + color: #555555; + font-size: 23rpx; + font-weight: 400; +} + +.room-type-box .room-type-bottom .room-type-bottom-right { + width: 144rpx; + height: 60rpx; + border-radius: 54rpx; + background-color: rgba(98, 177, 255, 1); + font-size: 24rpx; + color: #fff; +} + +.room-type-box .room-type-bottom .room-type-bottom-right.already { + background-color: #fff; + border: 1rpx solid rgba(215, 215, 215, 1); + color: #aaaaaa; +} + +.apartment-block .apartment-block-text { + color: #555555; + line-height: 54rpx; + font-size: 24rpx; + background-color: #fff; + margin: 0 30rpx; + padding: 30rpx; + word-wrap: break-all; + white-space: pre-line; + border-radius: 30rpx; + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); + display: block; +} + +.apartment-map-box { + position: relative; + width: 690rpx; + height: 282rpx; + border-radius: 24rpx; + background-color: rgba(51, 51, 51, 0.298039215686275); + margin: 0 auto; + overflow: hidden; +} + +.apartment-map-box .apartment-map { + width: 100%; + height: 100%; + margin: 0; + padding: 0; +} + +.apartment-map-box .apartment-map-masking { + background-color: rgba(51, 51, 51, 0.298039215686275); + width: 100%; + height: 100%; +} + +.apartment-map-box .apartment-map-site { + background-color: rgba(51, 51, 51, 0.8); + border-radius: 15rpx; + padding: 18rpx 15rpx; +} + +.apartment-map-box .apartment-map-icon { + width: 33rpx; + height: 33rpx; +} + +.apartment-map-box .apartment-map-name { + font-size: 24rpx; + color: #fff; + font-weight: 400; + padding: 0 9rpx; + min-width: 189rpx; + max-width: 540rpx; +} + +.apartment-map-box .apartment-map-arrows { + width: 9rpx; + height: 18rpx; +} + +.apartment-facility { + width: 690rpx; + margin: 0 30rpx; + padding: 30rpx; + border-radius: 30rpx; + background-color: #fff; + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); +} + +.apartment-facility .apartment-facility-item { + justify-content: space-between; + align-items: flex-start; +} + +.apartment-facility .apartment-facility-item:not(:last-of-type) { + margin-bottom: 30rpx; +} + +.apartment-facility .apartment-facility-item:last-of-type .apartment-facility-box { + border: none; +} + +.apartment-facility .apartment-facility-item:last-of-type .apartment-facility-box .apartment-facility-box-item { + margin: 0; +} + +.apartment-facility .apartment-facility-title { + background-color: rgba(246, 246, 246, 1); + height: 39rpx; + border-radius: 12rpx; + color: #555555; + font-size: 24rpx; + padding: 0 9rpx; +} + +.apartment-facility .apartment-facility-box { + width: calc(100% - 122rpx); + border-bottom: 1rpx solid #f2f2f2; + flex-wrap: wrap; +} + +.apartment-facility .apartment-facility-box-item { + margin-bottom: 30rpx; + color: rgb(51, 51, 51); + font-size: 24rpx; + margin-right: 57rpx; +} + +.apartment-facility .apartment-facility-img { + width: 18rpx; + height: 13.5rpx; + margin-right: 15rpx; +} + +.apartment-block .apartment-block-introduce { + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); + margin: 0 30rpx; + padding: 30rpx; + word-wrap: break-all; + white-space: pre-line; + border-radius: 30rpx; + background-color: #fff; +} + +.apartment-block .apartment-block-introduce-text { + font-size: 24rpx; + color: #555555; + line-height: 54rpx; +} + +.apartment-tips { + color: #aaaaaa; + font-size: 22rpx; + line-height: 30rpx; + border: 1rpx solid rgba(235, 235, 235, 1); + border-radius: 30rpx; + padding: 39rpx 27rpx; + width: 690rpx; + margin: 0 30rpx 75rpx; +} + +.apartment-tips .apartment-tips-text:not(:last-of-type) { + margin-bottom: 30rpx; +} + +.apartment-list { + margin: 0 auto; + flex-direction: column; } \ No newline at end of file diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js index 0b082ad..7bae6ff 100644 --- a/pages/irentList/irentList.js +++ b/pages/irentList/irentList.js @@ -64,7 +64,7 @@ Page({ initState: false, topTitle: "", - isNewVersions: false, + isNewVersions: true, }, onPageScroll(e) { if (e.scrollTop > 1000 && !this.data.showTOTOP) { diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml index d0b1401..a86fbd5 100644 --- a/pages/irentList/irentList.wxml +++ b/pages/irentList/irentList.wxml @@ -75,45 +75,7 @@ - - - - {{ item.title }} - - - - - {{ item.brand }} - {{ item.propaganda }} - - - - - - 共 4 个房型 - - - - 油尖旺区吴松街 - - - - - - 单人套间 - - HK$ - 7800 - /月 - - - - - - - - - + diff --git a/pages/irentList/irentList.wxss b/pages/irentList/irentList.wxss index a59dcf2..cd8e301 100644 --- a/pages/irentList/irentList.wxss +++ b/pages/irentList/irentList.wxss @@ -1,6 +1,7 @@ /* list */ +@import '../common/common.wxss'; + .irent-list-box { - /* background: #f2f2f2; */ min-height: 100vh; padding-bottom: 80rpx; box-sizing: border-box; @@ -282,138 +283,6 @@ border-radius: 60rpx 60rpx 0 0; } -.apartment-list .apartment-item { - width: 690rpx; - box-shadow: 0px 0px 12rpx rgba(0, 0, 0, 0.0784313725490196); - border-radius: 18rpx; -} - -.apartment-list .apartment-item:not(:last-of-type) { - margin-bottom: 36rpx; -} - -.apartment-list .apartment-item .apartment-top { - height: 459rpx; - width: 100%; - flex-direction: column; - align-items: center; - justify-content: center; - position: relative; -} - -.apartment-list .apartment-item .apartment-top .apartment-name { - height: 48rpx; - font-size: 30rpx; - font-weight: 650; - color: #000000; - padding: 0 25rpx; - border-radius: 25rpx; - background-color: rgba(255, 255, 255, 0.7); - z-index: 1; -} - -.apartment-list .apartment-item .apartment-top .apartment-icon { - width: 100%; - height: 100%; - border-radius: 18rpx; - position: absolute; -} - -.apartment-list .apartment-item .apartment-bottom { - position: relative; - margin-top: -109.5rpx; -} - -.apartment-list .apartment-item .apartment-introduce { - background-color: rgba(0, 0, 0, 0.63921568627451); - height: 48rpx; - width: 630rpx; - margin: -48rpx auto 0; - padding: 0 12rpx; - border-radius: 24rpx 24rpx 0 0; - color: #D7D7D7; - font-size: 21rpx; - -} - -.apartment-list .apartment-item .apartment-bottom .apartment-tag { - padding: 0 15rpx; - border-radius: 12rpx; - height: 33rpx; - border: 1rpx solid rgba(121, 121, 121, 1); - margin-right: 15rpx; - color: #FDDA55; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-content { - border-radius: 12rpx 12rpx 18rpx 18rpx; - background-color: #fff; - flex-direction: column; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-content { - padding: 27rpx 24rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-quantity { - color: #7F7F7F; - font-size: 21rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-message { - justify-content: space-between; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-place { - color: #555555; - font-size: 23rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-place-icon { - width: 27rpx; - height: 27rpx; - margin-right: 10rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price { - padding: 0 14rpx; - background: rgba(246, 246, 246, 1); - border-radius: 18rpx; - margin-top: 24rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-item { - height: 81rpx; - justify-content: space-between; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-item:not(:last-of-type) { - border-bottom: 1rpx solid #ebebeb; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-name { - color: #000000; - font-size: 23rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-symbol { - font-weight: 900; - color: #000000; - font-size: 21rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-price { - color: #F95D5D; - font-size: 30rpx; - font-weight: 900; - margin: 0 10rpx; -} - -.apartment-list .apartment-item .apartment-bottom .apartment-price-unit { - color: #555555; - font-size: 21rpx; -} - .query-box { flex-direction: column; padding: 90rpx 0; @@ -474,4 +343,4 @@ background-color: rgb(231, 251, 247); border: none; color: rgb(80, 227, 194); -} +} \ No newline at end of file diff --git a/pages/personList/personList.js b/pages/personList/personList.js index 7044893..b00a0b7 100644 --- a/pages/personList/personList.js +++ b/pages/personList/personList.js @@ -122,8 +122,7 @@ Page({ operationsTop: false, // 操作栏 是否在顶部 - isNewVersions: true, - + isNewVersions: false, }, onPageScroll(e) { if (e.scrollTop > this.operationsHeight && !this.data.operationsTop) { diff --git a/pages/transfer/transfer.js b/pages/transfer/transfer.js index 2cd2124..1ed9e61 100644 --- a/pages/transfer/transfer.js +++ b/pages/transfer/transfer.js @@ -13,16 +13,22 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - return wx.showLoading({ title: '加载中...', }) + + setTimeout(() => { + wx.hideLoading() + }, 500); let miniProgram = app.globalData['miniProgram'] if (miniProgram == 'gx') { wx.navigateToMiniProgram({ appId: "wx9c68fbf7886ea9c4", path: "/pages/edit/edit", - fail: function () { + success: function () { + wx.hideLoading() + }, + fail: function (err) { wx.hideLoading() // wx.redirectTo({ // url: '/pages/index/index', diff --git a/template/choiceTypeRelease/choiceTypeRelease.wxml b/template/choiceTypeRelease/choiceTypeRelease.wxml index 904f397..e99e91a 100644 --- a/template/choiceTypeRelease/choiceTypeRelease.wxml +++ b/template/choiceTypeRelease/choiceTypeRelease.wxml @@ -2,7 +2,7 @@ - + 请选择 diff --git a/template/headSwiper/headSwiper.js b/template/headSwiper/headSwiper.js index 769deb5..3702960 100644 --- a/template/headSwiper/headSwiper.js +++ b/template/headSwiper/headSwiper.js @@ -40,7 +40,8 @@ Component({ videoIndex: 0, liveIndex: 0, video: '', - screen_data: {} + screen_data: {}, + swiperHeightObj: {}, }, lifetimes: { @@ -149,9 +150,26 @@ Component({ }) }, load(e) { - if (this.data.swiperHeight > 0) return false + // console.log(e); let index = e.currentTarget.dataset.index; + + let { + height, + width + } = e.detail + if (this.data.isNewVersions) { + + let swiperHeightObj = this.data.swiperHeightObj + let targetHeight = (height / width) * 690 + swiperHeightObj[index] = targetHeight + this.setData({ + swiperHeightObj + }) + } + + if (this.data.swiperHeight > 0) return false let swiperHeight = this.data.windowWidth * e.detail.height / e.detail.width + console.log(swiperHeight); this.setData({ swiperHeight }) @@ -165,6 +183,7 @@ Component({ // console.log(this.data.heightArr) }, send_form_id: function (e) { + console.log(e); let { statid, url, diff --git a/template/headSwiper/headSwiper.wxml b/template/headSwiper/headSwiper.wxml index 3bcfed3..d0aded2 100644 --- a/template/headSwiper/headSwiper.wxml +++ b/template/headSwiper/headSwiper.wxml @@ -1,58 +1,62 @@ - - - - -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
+ + + {{ (current - videoLength - liveLength) + 1 + '/' + imgLength }} + {{ (current - liveLength) + 1 + '/' + videoLength }} + {{ current + 1 + '/' + liveLength }} + + + + 直播 + + + + + 视频 + + + + + 图片 + + - - - - - - + + + + + - - - {{ (current - videoLength - liveLength) + 1 + '/' + imgLength }} - {{ (current - liveLength) + 1 + '/' + videoLength }} - {{ current + 1 + '/' + liveLength }} - - - - 直播 - - - - - 视频 - - - - - 图片 - - - - - - - - - \ No newline at end of file diff --git a/template/headSwiper/headSwiper.wxss b/template/headSwiper/headSwiper.wxss index e2f21c0..73b9913 100644 --- a/template/headSwiper/headSwiper.wxss +++ b/template/headSwiper/headSwiper.wxss @@ -1,153 +1,174 @@ -.container{ - position: relative; +.container { + position: relative; } -.swiper{ - width: 100vw; + +.swiper { + width: 100vw; } -.swiper image{ - width: 100vw; + +.swiper image { + width: 100vw; } -.indicatorDots{ - display: flex; - padding: 20rpx auto 0; - justify-content: center; - align-items: flex-end; - height: 40rpx; - z-index: 10; + +.indicatorDots { + display: flex; + padding: 20rpx auto 0; + justify-content: center; + align-items: flex-end; + height: 40rpx; + z-index: 10; } -.indicatorDots .inner{ - display: inline-flex; - height: 20rpx; - border-radius: 40rpx; - align-items: center; + +.indicatorDots .inner { + display: inline-flex; + height: 20rpx; + border-radius: 40rpx; + align-items: center; } + .indicatorDots .inner .i { - display: inline-flex; - margin-left: 12rpx; - width: 12rpx; - height: 12rpx; - background-color:#ccc; - border-radius: 50%; + display: inline-flex; + margin-left: 12rpx; + width: 12rpx; + height: 12rpx; + background-color: #ccc; + border-radius: 50%; } -.indicatorDots-inner{ - position: absolute; - right: 30rpx; - bottom: 10rpx; - -} -.indicatorDots-inner .inner{ - /* background: #A3A2A0; */ - padding:0; - /* height: 30rpx; */ -} - .indicatorDots-inner .inner .i{ - background: #cacaca; - } - .indicatorDots-inner2{ - position: absolute; - right: 30rpx; - bottom: 40rpx; - height: auto; - } - .indicatorDots-inner2 .inner{ +.indicatorDots-inner { + position: absolute; + right: 30rpx; + bottom: 10rpx; - height: auto; -} - .indicatorDots-inner2 .inner .i{ - background: #f1f1f1; - } - .indicatorDots .inner .active{ - background: #C63E3A; -} -.submit-form{ - display: block; - /* position: relative; */ -} -.info-list .submit-form{ - padding: 44rpx 30rpx; -} -.submit-form button{ - background: transparent; - border:none; - position: absolute; - width: 100%; - height: 100%; - left: 0; - top: 0; - z-index: 10; -} -.submit-form button::before,.submit-form button::after{ - border:none; -} -.text{ - position: absolute; - bottom: 20rpx; - right: 40rpx; - color: #fff; - font-size:22rpx; - background: rgba(0,0,0,0.4); - border-radius: 20rpx; - height: 40rpx; - display: flex; - align-items: center; - justify-content: center; - padding: 0 14rpx; } -.img-box .play{ - position: absolute; - width:100rpx; - height:100rpx; - left: 50%; - top: 50%; - border-radius: 50%; - transform: translate(-50%,-50%); - background:rgba(0,0,0,0.4) ; - display: flex; - align-items: center; - justify-content: center; - border:1px solid #fff; - z-index: 14; +.indicatorDots-inner .inner { + /* background: #A3A2A0; */ + padding: 0; + /* height: 30rpx; */ } -.img-box .play image{ - flex: 0 0 36rpx; - width: 36rpx; - height: 36rpx; - margin-left: 8rpx; + +.indicatorDots-inner .inner .i { + background: #cacaca; } -.tab{ - position: absolute; - bottom: 0; - left: 50%; - transform: translateX(-50%); - display: flex; - /* width: 200rpx; */ - height: 80rpx; - align-items: center; + +.indicatorDots-inner2 { + position: absolute; + right: 30rpx; + bottom: 40rpx; + height: auto; } -.tab .item{ - display: inline-flex; - flex: 1; - height: 100%; - align-items: center + +.indicatorDots-inner2 .inner { + + height: auto; } -.tab .item .inner{ - display: inline-flex; - /* flex: 1; */ - background: rgba(255,255,255,0.9); - height: 40rpx; - width: 70rpx; - font-size: 22rpx; - + +.indicatorDots-inner2 .inner .i { + background: #f1f1f1; +} + +.indicatorDots .inner .active { + background: #C63E3A; +} + +.submit-form { + display: block; + /* position: relative; */ +} + +.info-list .submit-form { + padding: 44rpx 30rpx; +} + +.submit-form button { + background: transparent; + border: none; + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 10; +} + +.submit-form button::before, +.submit-form button::after { + border: none; +} + +.text { + position: absolute; + bottom: 20rpx; + right: 40rpx; + color: #fff; + font-size: 22rpx; + background: rgba(0, 0, 0, 0.4); + border-radius: 20rpx; + height: 40rpx; + display: flex; + align-items: center; + justify-content: center; + padding: 0 14rpx; +} + +.img-box .play { + position: absolute; + width: 100rpx; + height: 100rpx; + left: 50%; + top: 50%; + border-radius: 50%; + transform: translate(-50%, -50%); + background: rgba(0, 0, 0, 0.4); + display: flex; + align-items: center; + justify-content: center; + border: 1px solid #fff; + z-index: 14; +} + +.container .img-box .play image { + flex: 0 0 36rpx; + width: 36rpx; + height: 36rpx; + margin-left: 8rpx; +} + +.tab { + position: absolute; + bottom: 0; + left: 50%; + transform: translateX(-50%); + display: flex; + /* width: 200rpx; */ + height: 80rpx; + align-items: center; +} + +.tab .item { + display: inline-flex; + flex: 1; + height: 100%; + align-items: center +} + +.tab .item .inner { + display: inline-flex; + /* flex: 1; */ + background: rgba(255, 255, 255, 0.9); + height: 42rpx; + width: 84rpx; + font-size: 22rpx; + } .tab .item:first-of-type .inner { - border-radius: 20rpx 0 0 20rpx; + border-radius: 20rpx 0 0 20rpx; } .tab .item:last-of-type .inner { - border-radius: 0 20rpx 20rpx 0; + border-radius: 0 20rpx 20rpx 0; } /* .tab .item:nth-child(1),.tab .item:nth-child(1) .inner{ @@ -162,55 +183,83 @@ .tab .item:nth-child(2) .inner{ border-radius: 0 20rpx 20rpx 0; } */ -.tab .item .texts{ - display: inline-flex; - flex: 1; - border-radius: 20rpx; - justify-content: center; - align-items: center; - +.tab .item .texts { + display: inline-flex; + flex: 1; + border-radius: 20rpx; + justify-content: center; + align-items: center; + color: #555555; } -.tab .item.active .texts{ - color: #fff; - background: #C63E3A; + +.tab .item.active .texts { + color: #fff; + /* background: #C63E3A; */ + background: rgba(249, 93, 93, 1); } -.video-box{ - width: 100vw; - height: 100vh; - z-index: 1000; - background: rgba(0,0,0,0.8); - position: fixed; - left: 0; - top:0; + +.video-box { + width: 100vw; + height: 100vh; + z-index: 1000; + 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: 1001 + +.video-box .close { + position: fixed; + left: 20rpx; + top: 20rpx; + width: 50rpx; + height: 50rpx; + z-index: 1001 } -.video-box video{ - /* margin: calc(50vh - 120px) auto; + +.video-box video { + /* margin: calc(50vh - 120px) auto; display: block; */ - width: 100vw; - height: 100vh; - z-index: 1001 + width: 100vw; + height: 100vh; + z-index: 1001 } -.cover{ - position: fixed; - left: 5px; - top: 0; - display: flex; - justify-content: center; - align-items: center; - box-sizing: border-box; - + +.cover { + position: fixed; + left: 5px; + top: 0; + display: flex; + justify-content: center; + align-items: center; + box-sizing: border-box; + } -.cover .image{ - width: 30rpx; - height: 30rpx; +.cover .image { + width: 30rpx; + height: 30rpx; +} + + + +.newcontainer { + padding: 0 30rpx; +} + +.newcontainer .swiper image { + width: 690rpx; + height: 459rpx; + border-radius: 40rpx; + box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0823529411764706); +} + +.newcontainer .swiper .play-btn { + position: absolute; + top: 50%; + left: 50%; + width: 75rpx; + height: 75rpx; + transform: translate(-50%, -50%); } \ No newline at end of file