diff --git a/img/index-3.png b/img/index-3.png index 3747a25..4aec4ab 100644 Binary files a/img/index-3.png and b/img/index-3.png differ diff --git a/img/index-c.svg b/img/index-c.svg new file mode 100644 index 0000000..179d092 --- /dev/null +++ b/img/index-c.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/img/user-3.png b/img/user-3.png deleted file mode 100644 index 7130d6d..0000000 Binary files a/img/user-3.png and /dev/null differ diff --git a/img/user-3.svg b/img/user-3.svg new file mode 100644 index 0000000..48d901f --- /dev/null +++ b/img/user-3.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/img/user-c.png b/img/user-c.png deleted file mode 100644 index 646792b..0000000 Binary files a/img/user-c.png and /dev/null differ diff --git a/img/user-c.svg b/img/user-c.svg new file mode 100644 index 0000000..241dda8 --- /dev/null +++ b/img/user-c.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 4282331..6a22685 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -74,7 +74,7 @@ Page({ }) // if (app.globalData.code) { if (app.globalData.config && app.globalData.config.lists) { - this.get_list(); + // this.get_list(); this.getNewInit() this.setData({ initState: true @@ -106,9 +106,11 @@ Page({ recommendedTab.forEach(el => { if (el['select']) listType = el['type'] }) + this.setData({ ...data, - listType + listType, + loding: false }) this.getListData() }) @@ -116,6 +118,7 @@ Page({ }, get_list() { + return var that = this; miucms.request('https://app.gter.net/tenement/home', {}).then(data => { let advListHKhousing = {}, @@ -137,6 +140,11 @@ Page({ if (Array.isArray(element['rent'])) element['rent'] = `${element['rent'][0]} ~ ${ element['rent'][1] }` }) + // data.data.banner[0] + data.data.banner[0]['finderUserName'] = "sphnKNr2yUjovYn" + data.data.banner[0]['feedId'] = "export/UzFfAgtgekIEAQAAAAAA2WM6nDqilAAAAAstQy6ubaLX4KHWvLEZgBPEnIFMGRgfQe-HzNPgMJovs0j3nb0lBUSqGdvZ_3I-" + console.log(data.data.banner[0]); + that.setData({ HKapartment: data.data.HKapartment, otherHousing: data.data.otherHousing, @@ -235,7 +243,9 @@ Page({ let { appid, url, - statid + statid, + finderusername, + feedid } = e.currentTarget.dataset // miucms.request(app.globalData.config.FormidInsert, { @@ -243,6 +253,15 @@ Page({ statid }).then(res => {}) + // 跳转视频号 + if (finderusername) { + wx.openChannelsActivity({ + finderUserName: finderusername, + feedId: feedid + }) + return false + } + // 判断跳转小程序 if (appid) { wx.navigateToMiniProgram({ @@ -425,6 +444,7 @@ Page({ if (res.code != 200) return let data = res.data.data + this.setData({ listPage: this.data.listPage + 1, listData: data, @@ -434,6 +454,7 @@ Page({ this.listDataIndex = 0 this.calculateProcessingCenter() }).finally(() => { + this.getListDataState = false wx.hideLoading() }) }, @@ -459,7 +480,7 @@ Page({ } else { let altitude = 0 // rpx if (type == 'apartment') { - altitude = 105 + altitude = 205 if (targetData['specifications'].length > 2) altitude += 100 else altitude += 64 * targetData['specifications'].length } else altitude = 141 @@ -470,7 +491,7 @@ Page({ targetData }) - altitude += (150 / 180 * 337 * ratio) + altitude += (150 / 180 * 337.5 * ratio) let select = type == 'apartment' ? '#apartment' : '#general' @@ -479,10 +500,8 @@ Page({ let height = rect.height; altitude += height this.whichSide(altitude, targetData) - return }).exec(); - // }) } }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 82170bc..8ae749a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,10 +1,10 @@ - + - {{ targetData['title'] }} - {{ targetData['propaganda'] }} + {{ targetData['title'] }} + {{ targetData['propaganda'] }} {{ targetData['title'] }} @@ -29,7 +29,7 @@ - + @@ -408,14 +408,14 @@ - - {{ item.title }} - {{ item.propaganda }} + + {{ item.title }} + {{ item.propaganda }} {{ it.title }} - + HK$ {{ it.value }} /月 @@ -423,7 +423,7 @@ - 更多 + 更多 @@ -436,7 +436,7 @@ {{ item.intermediarytext }} - + {{ item.gptype }} {{ item.title }} diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 1ea0d65..735e5aa 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -393,9 +393,11 @@ page { .area-selection .head .head-item-pitch-left .head-item-bj { right: 0; } + .area-selection .head .head-item-pitch-right .head-item-bj { left: 0; } + .area-selection .head .head-item-pitch .semicircle { position: absolute; z-index: 11; @@ -501,6 +503,7 @@ page { .area-selection .area-amount { font-weight: 900; margin: 0 15rpx; + color: #000; } .area-selection .area-icon { @@ -761,7 +764,7 @@ page { .apartment-block .apartment-list .apartment-image-item { width: 126rpx; height: 82.5rpx; - border-radius: 15rpx; + border-radius: 6rpx; } .tab-list { @@ -834,7 +837,7 @@ page { } .pinterest-list .pinterest-list-item.apartment { - padding-bottom: 36rpx; + padding-bottom: 19.5rpx; } .pinterest-list .pinterest-list-item.apartment .apartment-top { @@ -856,7 +859,8 @@ page { .pinterest-list .pinterest-list-item.apartment .apartment-img { width: 337.5rpx; - height: 125rpx; + /* height: 125rpx; */ + height: 281.24rpx; } .pinterest-list .pinterest-list-item.apartment .apartment-name { @@ -874,7 +878,7 @@ page { .pinterest-list .pinterest-list-item.apartment .apartment-price { margin-top: 6rpx; - margin-bottom: 18rpx; + /* margin-bottom: 18rpx; */ } .pinterest-list .pinterest-list-item.apartment .apartment-price-item { @@ -890,21 +894,22 @@ page { .pinterest-list .pinterest-list-item.apartment .apartment-price-name { color: #000000; font-size: 22.5rpx; - width: 120rpx; + /* width: 120rpx; */ } .pinterest-list .pinterest-list-item.apartment .apartment-price-cost { - font-size: 21rpx; + font-size: 21rpx; color: #555555; justify-content: flex-end; font-family: 'Arial-Black'; - /* white-space: nowrap; */ + white-space: nowrap; + margin-left: 22rpx; } .pinterest-list .pinterest-list-item.apartment .apartment-price-unit { font-weight: 900; font-family: 'Arial-Black', 'Arial Black', sans-serif; - + color: #000; } .pinterest-list .pinterest-list-item.apartment .apartment-price-number { @@ -923,6 +928,13 @@ page { border-radius: 30rpx; width: 84rpx; height: 36rpx; + margin-top: 18rpx; + margin-bottom: 16.5rpx; +} + +#apartment, +#general { + width: 337.5rpx; } .pinterest-list .pinterest-list-item.general { @@ -943,7 +955,8 @@ page { .pinterest-list .pinterest-list-item.general .general-img { width: 337.5rpx; - height: 253.5rpx; + /* height: 253.5rpx; */ + height: 281.24rpx; border-radius: 24rpx 24rpx 0 0; } diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js index 369ca8d..1210f7e 100644 --- a/pages/irentList/irentList.js +++ b/pages/irentList/irentList.js @@ -63,7 +63,7 @@ Page({ hideCoupon: false, initState: false, topTitle: "", - isNewVersions: true, + isNewVersions: false, }, onPageScroll(e) { if (e.scrollTop > 1000 && !this.data.showTOTOP) { diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml index 44abe81..bc707fa 100644 --- a/pages/irentList/irentList.wxml +++ b/pages/irentList/irentList.wxml @@ -113,7 +113,7 @@ - + 有疑问？来找寄托方同学！ 复制微信号 @@ -154,7 +154,7 @@ --> - + @@ -180,7 +180,8 @@ - + 品牌 + \ No newline at end of file diff --git a/pages/irentList/irentList.wxss b/pages/irentList/irentList.wxss index e50366d..851ae5a 100644 --- a/pages/irentList/irentList.wxss +++ b/pages/irentList/irentList.wxss @@ -531,4 +531,11 @@ .page-container .page-action-bar .page-action-circle .page-action-circle-icon { width: 12rpx; height: 12rpx; +} + +.page-container .page-title { + font-size: 36rpx; + line-height: 36rpx; + color: #000; + font-weight: 650; } \ No newline at end of file diff --git a/template/fixFooter/fixFooter.wxml b/template/fixFooter/fixFooter.wxml index eb48548..39dc386 100644 --- a/template/fixFooter/fixFooter.wxml +++ b/template/fixFooter/fixFooter.wxml @@ -1,32 +1,52 @@
- + + 首页 +
- - - - - - - - - + + + + + + + + - - - - 发布房源 + 发布房源 + + + + + + + + + + + 发布房源 + + 我的 {{ unreadMessages }} diff --git a/template/fixFooter/fixFooter.wxss b/template/fixFooter/fixFooter.wxss index 57859a8..d89ff18 100644 --- a/template/fixFooter/fixFooter.wxss +++ b/template/fixFooter/fixFooter.wxss @@ -30,8 +30,8 @@ } .fixfooter .index image { - width: 44rpx; - height: 42rpx; + width: 51rpx; + height: 51rpx; display: block; margin: 0 auto; } @@ -53,12 +53,17 @@ } .fixfooter .user image { - width: 42rpx; - height: 42rpx; + width: 48rpx; + height: 48rpx; display: block; margin: 0 auto; } +.fixfooter .user image.hotbtn1 { + width: 36rpx; + height: 45rpx; +} + .fixfooter .plus { position: relative; @@ -77,11 +82,11 @@ width: 100rpx; height: 100rpx; border-radius: 50rpx 50rpx 0 0; - border-top: 1px solid #e8e8e8; + /* border-top: 1px solid #e8e8e8; */ top: -40rpx; - background: #fff; + /* background: #fff; */ left: calc(50% - 50rpx); - box-shadow: 0 -2px 5px 0 #ccc; + /* box-shadow: 0 -2px 5px 0 #ccc; */ } .fixfooter .plus .c { @@ -94,6 +99,13 @@ z-index: 100; color: #E4C762; + font-size: 21rpx; + + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + } .fixfooter .plus .c .round { @@ -190,7 +202,7 @@ .selected-point { top: 100px; left: 200px; - position: relative; + /* position: relative; */ top: 0; left: 50%; transform: translateX(-50%); @@ -204,7 +216,6 @@ animation-delay: 0.5s; animation-iteration-count: infinite; animation-direction: normal; - } .selected-point-mid { @@ -243,7 +254,6 @@ 0% { box-shadow: 0 0 0 0 rgba(255, 215, 74, 0.99); background: rgba(255, 215, 74, 0.90); - } 100% { @@ -273,4 +283,73 @@ transform: translate(-50%, -50%); border-radius: 50%; z-index: 111111; +} + +.issue-btn { + height: 100%; + width: 100%; + /* background-color: aquamarine; */ + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: center; + position: relative; +} + +.issue-btn .issue-text { + color: #E4C762; + font-size: 22.5rpx; + margin-bottom: 10rpx; +} + +.issue-btn .issue-circle { + width: 60rpx; + height: 60rpx; + background-color: #fdda58; + border-radius: 50%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.issue-btn .issue-circle1 { + width: 60rpx; + height: 60rpx; + background-color: #fdda58; + border-radius: 50%; + position: absolute; + top: -50rpx; + transform: translateY(50%); +} + +.issue-btn .issue-circle1::after, +.issue-btn .issue-circle1::before { + content: ""; + position: absolute; + top: 50%; + left: 50%; + width: 100%; + height: 100%; + border-radius: 50%; + transform: translate(-50%, -50%); + animation-duration: 2s; + animation-delay: 0.5s; + animation-iteration-count: infinite; + animation-direction: normal; + +} + +.issue-btn .issue-circle1::after { + animation-name: sploosh; +} + +.issue-btn .issue-circle1::after::after { + animation-name: sploosh2; + animation-timing-function: ease-in; +} + +.issue-btn .issue-circle1::before { + animation-name: sploosh1; + animation-timing-function: ease-in; } \ No newline at end of file diff --git a/template/headSwiper/headSwiper.js b/template/headSwiper/headSwiper.js index 55593e3..798cb27 100644 --- a/template/headSwiper/headSwiper.js +++ b/template/headSwiper/headSwiper.js @@ -80,6 +80,19 @@ Component({ let that = this; let url = e.currentTarget.dataset.url; let appid = e.currentTarget.dataset.appid; + let finderusername = e.currentTarget.dataset.finderusername; + let feedid = e.currentTarget.dataset.feedid; + + + // 跳转视频号 + if (finderusername) { + wx.openChannelsActivity({ + finderUserName: finderusername, + feedId: feedid + }) + return false + } + // 判断跳转小程序 if (appid) { wx.navigateToMiniProgram({ @@ -142,8 +155,6 @@ Component({ // console.log(this.data.heightArr) }, send_form_id: function (e) { - // console.log('formId', e.detail.formId) - let { statid, url @@ -161,7 +172,6 @@ Component({ header: app.globalData.header, success: function (res) { var data = app.return_data(res); - } }) }, diff --git a/template/headSwiper/headSwiper.wxml b/template/headSwiper/headSwiper.wxml index 56382d6..59e1b25 100644 --- a/template/headSwiper/headSwiper.wxml +++ b/template/headSwiper/headSwiper.wxml @@ -2,7 +2,7 @@ -
+