diff --git a/app.wxss b/app.wxss index 5484b8c..1f7181f 100644 --- a/app.wxss +++ b/app.wxss @@ -32,6 +32,13 @@ view { padding: 0; } +.authentication { + margin-right: 10rpx; + height: 28rpx; + width: 150rpx; + vertical-align: middle; +} + .newbtn { width: 57rpx; height: 19rpx; @@ -1022,4 +1029,8 @@ view { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} + +.bold { + font-weight: bold; } \ No newline at end of file diff --git a/img/authentication.jpg b/img/authentication.jpg new file mode 100644 index 0000000..7d62f2b Binary files /dev/null and b/img/authentication.jpg differ diff --git a/pages/common/common.wxml b/pages/common/common.wxml index 1cf521f..0b266b6 100644 --- a/pages/common/common.wxml +++ b/pages/common/common.wxml @@ -17,6 +17,7 @@
+ @@ -144,6 +145,7 @@ + {{ item.subject }} diff --git a/pages/index/index.js b/pages/index/index.js index cb96d14..1727073 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -104,8 +104,8 @@ Page({ let listType = "" recommendedTab.forEach(el => { - // if (el.type == 'recommend') el.select = false - // if (el.type == 'wholelease') el.select = true + // if (el.type == 'recommend') el.select = false + // if (el.type == 'wholelease') el.select = true if (el['select']) listType = el['type'] }) @@ -248,11 +248,14 @@ Page({ statid, finderusername, feedid, - type + type, + advertisingtype } = e.currentTarget.dataset // miucms.request(app.globalData.config.FormidInsert, { - miucms.request(app.globalData.baseURL + '/tenement/v2/api/ad/click', { + let requestUrl = advertisingtype == 'slideshow' ? `${app.globalData.baseURL}/tenement/v2/api/ad/click` : app.globalData.config.FormidInsert + // miucms.request(app.globalData.baseURL + '/tenement/v2/api/ad/click', { + miucms.request(requestUrl, { statid }).then(res => {}) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 99b8d67..8e01e09 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -397,7 +397,7 @@ diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js index 2fcf9e2..3d4df0c 100644 --- a/pages/irentList/irentList.js +++ b/pages/irentList/irentList.js @@ -63,13 +63,7 @@ Page({ hideCoupon: false, initState: false, topTitle: "", - conditionState: "type", // brand rent house type - conditionObj: { - brand: "品牌", - rent: "租金", - house: "房型", - type: "楼型", - }, + isNewVersions: false, }, onPageScroll(e) { @@ -220,7 +214,6 @@ Page({ } let that = this; let path = `/pages/irentList/irentList?school=${this.data.school}&brands=${this.data.brands.value}&roomtype=${this.data.roomtype.value}&roomlistings=${this.data.roomlistings.value}&money=${this.data.money.rent_min}~${this.data.money.rent_max}`; - // let title = this.data.school ? `寄托港校租房-${this.data.schoolObj[this.data.school]}附近公寓` : that.data.info.subject; let title = this.data.school ? `${ this.data.topTitle }-${this.data.schoolObj[this.data.school]}附近公寓` : that.data.info.subject; return { title, @@ -386,7 +379,9 @@ Page({ }, // 选择房型 submitRoomtype(e) { - this.data.roomtype.value = e.detail.value; + this.data.roomtype.value = e.detail.value || e.currentTarget.dataset.value; + console.log("0", this.data.roomtype); + this.setData({ roomtype: this.data.roomtype }) @@ -394,7 +389,8 @@ Page({ }, // 选择楼型 submitRoomlistings(e) { - this.data.roomlistings.value = e.detail.value; + this.data.roomlistings.value = e.detail.value || e.currentTarget.dataset.value + console.log("0", this.data.roomlistings); this.setData({ roomlistings: this.data.roomlistings }) @@ -460,13 +456,28 @@ Page({ irentCouponBig: !this.data.irentCouponBig, hideCoupon: false }) - if (!this.data.irentCouponBig) { - app.globalData.irentCouponBig = false; - } + if (!this.data.irentCouponBig) app.globalData.irentCouponBig = false; + }, // 点击复制列表的 疑问微信号 copyWechat() { miucms.copy('发发发') }, + + // 处理 列表 事件 + submitOperations(e) { + console.log("e", e); + let type = e.detail.type + console.log(type, "type"); + if (type == 'brand') this.submitBrands(e) + if (type == 'rent') this.submitMoney(e) + if (type == 'house') this.submitRoomtype(e) + if (type == 'floor') this.submitRoomlistings(e) + + + }, + + + }) \ No newline at end of file diff --git a/pages/irentList/irentList.json b/pages/irentList/irentList.json index 55d002a..c6ecb0f 100644 --- a/pages/irentList/irentList.json +++ b/pages/irentList/irentList.json @@ -10,7 +10,8 @@ "select-single": "../../template/selectSingle/selectSingle", "range-box": "../../template/rangeBox/rangeBox", "list-item": "./listItem/listItem", - "announcement-popup": "../../template/announcementPopup/announcementPopup" + "announcement-popup": "../../template/announcementPopup/announcementPopup", + "list-operations": "/template/listOperations/listOperations" }, "enablePullDownRefresh": false } \ No newline at end of file diff --git a/pages/irentList/irentList.wxml b/pages/irentList/irentList.wxml index a5e342c..18bd420 100644 --- a/pages/irentList/irentList.wxml +++ b/pages/irentList/irentList.wxml @@ -31,6 +31,10 @@ + + + + @@ -154,54 +158,5 @@ --> - - - - - - - - 品牌公寓 - - - - - - - - 品牌 - - - - - - - - - - - - {{ conditionObj[conditionState] }} - - - - {{ item.name }} - - - - - - {{ item.name }} - - - - - {{ item.name }} - - - - - - \ No newline at end of file diff --git a/pages/irentList/irentList.wxss b/pages/irentList/irentList.wxss index 7473af5..a59dcf2 100644 --- a/pages/irentList/irentList.wxss +++ b/pages/irentList/irentList.wxss @@ -475,126 +475,3 @@ border: none; color: rgb(80, 227, 194); } - -.page-container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: flex-start -} - -.page-container .page-header { - font-size: 32rpx; - flex-direction: column; - color: #000000; - font-weight: 650; -} - -.page-container .page-header .page-header-back { - width: 12px; - height: 18px; -} - -.page-container .page-header .page-statusBar { - background-color: #fff; - width: 100%; -} - -.page-container .page-header .page-titlebar { - width: 100%; -} - -.page-container .page-header .page-header-side { - padding-left: 32rpx; -} - -.page-container .page-action-bar { - color: rgb(127, 127, 127); - font-size: 24rpx; - height: 96rpx; - border-bottom: 1rpx solid #ebebeb; - position: relative; -} - -.page-container .page-action-bar .page-action-circle.pitch { - background-color: #000; - transform: rotate(180deg); -} - -.page-container .page-action-bar .page-action-triangle { - content: ""; - position: absolute; - bottom: 0; - left: 93.75rpx; - width: 0; - height: 0; - border-left: 13.5rpx solid transparent; - border-right: 13.5rpx solid transparent; - border-bottom: 12rpx solid #fdda55; -} - -.page-container .page-action-bar .page-action-circle { - background-color: #ebebeb; - width: 24rpx; - height: 24rpx; - border-radius: 50%; - margin-left: 15rpx; -} - -.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; - padding: 61.5rpx 0; -} - -.page-container .two-rows-list { - flex-wrap: wrap; - padding: 0 30rpx 25.5rpx; - justify-content: space-between; -} - -.page-container .two-rows-item { - width: 330rpx; -} - -.page-container .page-list .page-list-item.pitch { - border: 1rpx solid rgba(80, 227, 194, 1); - background-color: #fff; - color: #50E3C2; -} - -.page-container .three-rows-list { - flex-wrap: wrap; - padding: 0 30rpx 25.5rpx; - justify-content: space-between; -} - -.page-container .three-rows-item { - width: 210rpx; -} - -.page-container .page-list .page-list-item { - height: 72rpx; - border-radius: 12rpx; - margin-bottom: 30rpx; - background-color: rgba(246, 246, 246, 1); - font-size: 24rpx; - color: #555555; - position: relative; -} - -.page-container .page-list { - position: relative; -} - -.page-container .page-list.three-rows-list::after { - content: ""; - width: 210rpx; -} \ No newline at end of file diff --git a/pages/show/show.js b/pages/show/show.js index 033070a..548a7a3 100644 --- a/pages/show/show.js +++ b/pages/show/show.js @@ -243,6 +243,7 @@ Page({ data = data.data let info = data.info + // data.info['verified'] = 1 that.setData({ irentCouponBig: app.globalData.irentCouponBig || true, diff --git a/pages/show/show.wxml b/pages/show/show.wxml index 7583a3f..80b4d50 100644 --- a/pages/show/show.wxml +++ b/pages/show/show.wxml @@ -42,6 +42,7 @@ + {{ info.subject }} @@ -53,7 +54,10 @@ 已出租 - {{ info.subject }} + + + {{ info.subject }} + @@ -174,6 +178,7 @@ + {{ info.subject }} @@ -184,7 +189,10 @@ 已出租 - {{ info.subject }} + + + {{ info.subject }} + diff --git a/pages/show/show.wxss b/pages/show/show.wxss index 6ba834a..8b9aa93 100644 --- a/pages/show/show.wxss +++ b/pages/show/show.wxss @@ -28,7 +28,8 @@ canvas { width: 100vw; box-sizing: border-box; overflow: hidden; - padding-bottom: 240rpx; + /* padding-bottom: 240rpx; */ + padding-bottom: 120rpx; } .toptips { @@ -657,7 +658,7 @@ map .clickmap { } .certification { - /* background-color: rgba(238, 239, 242, 1); */ + background-color: rgba(238, 239, 242, 1); min-height: 100vh; /* margin-bottom: 240rpx; */ } diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 600a408..33e24e8 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -127,6 +127,8 @@ + + {{ item.subject @@ -189,6 +191,8 @@ + + {{ item.subject }} @@ -203,6 +207,8 @@ + + {{ item.subject }} @@ -218,6 +224,8 @@ + + {{ item.subject }} @@ -237,6 +245,8 @@ + + {{ item.subject }} @@ -258,6 +268,7 @@ + 已下架 {{ item.subject }} diff --git a/project.config.json b/project.config.json index aee61c0..9661965 100644 --- a/project.config.json +++ b/project.config.json @@ -42,7 +42,7 @@ }, "compileType": "miniprogram", "libVersion": "2.31.1", - "appid": "wxcf0a799771cf2ae6", + "appid": "wx9c68fbf7886ea9c4", "projectname": "%E5%AF%84%E6%89%98%E7%A7%9F%E6%88%BF", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, diff --git a/template/listOperations/listOperations.js b/template/listOperations/listOperations.js new file mode 100644 index 0000000..2b9eea5 --- /dev/null +++ b/template/listOperations/listOperations.js @@ -0,0 +1,70 @@ +// template/listOperations/listOperations.js + +Component({ + /** + * 组件的属性列表 + */ + properties: { + roomtype: Object, + roomlistings: Object, + brands: Object, + screen_data: Object, + + }, + + /** + * 组件的初始数据 + */ + data: { + conditionState: "rent", // brand rent house floor + conditionObj: { + brand: { + name: "品牌", + valueText: "brands" + }, + rent: { + name: "租金", + }, + house: { + name: "房型", + valueText: "roomtype" + }, + floor: { + name: "楼型", + valueText: "roomlistings" + }, + }, + }, + + /** + * 组件的方法列表 + */ + methods: { + setValue(e) { + let { + key, + value + } = e.currentTarget.dataset + this.setData({ + [key]: value + }) + }, + + changeItem(e) { + let conditionState = this.data.conditionState + console.log(e, conditionState); + let { + value, + } = e.currentTarget.dataset + + this.triggerEvent('submit', { + type: conditionState, + value + }) + + this.setData({ + conditionState: "" + }) + }, + } +}) \ No newline at end of file diff --git a/template/listOperations/listOperations.json b/template/listOperations/listOperations.json new file mode 100644 index 0000000..7e37c03 --- /dev/null +++ b/template/listOperations/listOperations.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml new file mode 100644 index 0000000..ed5b4dc --- /dev/null +++ b/template/listOperations/listOperations.wxml @@ -0,0 +1,87 @@ + + + + {{ brands.obj[brands.value] }} + {{ brands.obj[brands.value] }} + {{ roomtype.obj[roomtype.value] }} + {{ roomlistings.obj[roomlistings.value] }} + {{ item.name }} + + + + + + + + + + + + + + + + + 品牌公寓 + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + {{ conditionObj[conditionState].name }} + + + + {{ item.name }} + + + + + + + + {{ it }} + + + ~ + + + {{ it }} + + + + + 不限 + 确定 + + + + + + + {{ item.name }} + + + + + {{ item.name }} + + + + \ No newline at end of file diff --git a/template/listOperations/listOperations.wxss b/template/listOperations/listOperations.wxss new file mode 100644 index 0000000..3bc8abf --- /dev/null +++ b/template/listOperations/listOperations.wxss @@ -0,0 +1,191 @@ +@import '/app.wxss'; + +.page-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start +} + +.page-container .page-header { + font-size: 32rpx; + flex-direction: column; + color: #000000; + font-weight: 650; +} + +.page-container .page-header .page-header-back { + width: 12px; + height: 18px; +} + +.page-container .page-header .page-statusBar { + background-color: #fff; + width: 100%; +} + +.page-container .page-header .page-titlebar { + width: 100%; +} + +.page-container .page-header .page-header-side { + padding-left: 32rpx; +} + +.page-action-bar { + color: rgb(127, 127, 127); + font-size: 24rpx; + height: 96rpx; + border-bottom: 1rpx solid #ebebeb; + position: relative; +} + +.page-action-bar .page-action-item { + height: 100%; + position: relative; +} + +.page-action-bar .page-action-item .unselected { + font-weight: normal; +} + +.page-action-bar .page-action-circle.pitch { + background-color: #000; + transform: rotate(180deg); +} + +.page-action-bar .page-action-triangle { + position: absolute; + bottom: 0; + left: 93.75rpx; + width: 0; + height: 0; + border-left: 13.5rpx solid transparent; + border-right: 13.5rpx solid transparent; + border-bottom: 12rpx solid #fdda55; +} + +.page-action-bar .page-action-circle { + background-color: #ebebeb; + width: 24rpx; + height: 24rpx; + border-radius: 50%; + margin-left: 15rpx; +} + +.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; + padding: 61.5rpx 0; +} + +.page-container .two-rows-list { + flex-wrap: wrap; + padding: 0 30rpx 25.5rpx; + justify-content: space-between; +} + +.page-container .two-rows-item { + width: 330rpx; +} + +.page-container .page-list .page-list-item.pitch { + border: 1rpx solid rgba(80, 227, 194, 1); + background-color: #fff; + color: #50E3C2; +} + +.page-container .three-rows-list { + flex-wrap: wrap; + padding: 0 30rpx 25.5rpx; + justify-content: space-between; +} + +.page-container .three-rows-item { + width: 210rpx; +} + +.page-container .page-list .page-list-item { + height: 72rpx; + border-radius: 12rpx; + margin-bottom: 30rpx; + background-color: rgba(246, 246, 246, 1); + font-size: 24rpx; + color: #555555; + position: relative; +} + +.page-container .page-list { + position: relative; +} + +.page-container .page-list.three-rows-list::after { + content: ""; + width: 210rpx; +} + +.rent-budget-picker { + height: 130rpx; + line-height: 130rpx; + background-color: rgba(98, 177, 255, 0.145098039215686); + width: 100%; + display: inline-flex; + justify-content: center; + align-items: center; + border: none; + color: #c40000; +} + +.rent-budget-picker { + position: relative; +} + +.rent-budget-picker::after, +.rent-budget-picker::before { + content: ""; + height: 1px; + width: 100%; + position: absolute; + top: -1000px; + left: 0; +} + + +.picker-view-column { + text-align: center; + margin: 0 75rpx 200rpx; + margin: 0 auto; +} + +.picker-view-column view { + line-height: 50px; +} + +.pickerpitch { + font-weight: bolder; + font-size: 30rpx; +} + +.rent-budget-tilde view { + line-height: 50px; + background-color: rgba(98, 177, 255, 0.145098039215686); +} + +.rent-budget-bottom { + justify-content: space-between +} + +.rent-budget-bottom .rent-budget-bottom-item { + /* background-color: ; */ + width: 330rpx; + height: 96rpx; + border-radius: 82.5rpx; + +} \ No newline at end of file