diff --git a/img/camera.png b/img/camera.png
new file mode 100644
index 0000000..1e98f7f
Binary files /dev/null and b/img/camera.png differ
diff --git a/img/frontPlay.svg b/img/frontPlay.svg
new file mode 100644
index 0000000..020a3b7
--- /dev/null
+++ b/img/frontPlay.svg
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/pages/common/common.wxml b/pages/common/common.wxml
index 0b266b6..a20417f 100644
--- a/pages/common/common.wxml
+++ b/pages/common/common.wxml
@@ -23,7 +23,7 @@
{{ item.subject }}
-
+
{{ item.location }}
@@ -149,7 +149,7 @@
{{ item.subject }}
-
+
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index a62da4c..2d5a62c 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -401,7 +401,6 @@
-
{{ item.title || popUpTitle }}
@@ -626,6 +625,9 @@
微信
+
+ 填写微信号
+
diff --git a/pages/index/index.js b/pages/index/index.js
index ebbace8..23a8bcf 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -97,7 +97,6 @@ Page({
getNewInit() {
miucms.wxget(`${app.globalData.baseURL}/tenement/v2/api/home`).then(res => {
let data = res.data
- // console.log(data);
let {
recommendedTab
} = data
@@ -458,15 +457,12 @@ Page({
type: this.data.listType,
pagevalue: this.data.pagevalue || 0,
}).then(res => {
- // this.getListDataState = false
-
if (res.code != 200) return
let data = res.data.data
let pagevalue = res.data.pagevalue
let recommendedTab = this.data.recommendedTab
-
this.setData({
listPage: this.data.listPage + 1,
listData: data,
@@ -474,8 +470,13 @@ Page({
recommendedTab
})
- this.listDataIndex = 0
- this.calculateProcessingCenter()
+
+ this.calculationBefore(data)
+
+
+ // this.listDataIndex = 0
+ // this.listDataIndex = 9
+ // this.calculateProcessingCenter()
}).catch(() => {
this.getListDataState = false
@@ -484,10 +485,35 @@ Page({
})
},
+ calculationBefore(data = [...data]) {
+ let listDataLeft = this.data.listDataLeft
+ let listDataRight = this.data.listDataRight
+
+ data = data.slice(0, 10)
+
+ data.forEach((el, index) => {
+ if (index % 2 === 0) listDataLeft.push(el)
+ else listDataRight.push(el)
+ })
+
+ this.setData({
+ listDataLeft,
+ listDataRight,
+ })
+
+ this.top10State = true
+
+ return
+ this.pinterestImgLoadIndex = 0
+ this.listDataIndex = 9
+ this.calculateProcessingCenter()
+ },
+
listDataIndex: 0,
leftHeight: 0, // px 单位
rightHeight: 0,
ratio: 0,
+ pinterestImgLoadIndex: 0, // 加载了建施图
// 计算
calculateProcessingCenter() {
@@ -556,6 +582,25 @@ Page({
}
},
+ pinterestImgLoad(e) {
+ this.pinterestImgLoadIndex++
+
+ if (this.pinterestImgLoadIndex >= 10 && this.top10State) {
+ this.top10State = false
+ this.pinterestImgLoadIndex = 0
+ this.listDataIndex = 10
+ let query = wx.createSelectorQuery();
+ query.select("#pinterest-list-left").boundingClientRect()
+ query.select("#pinterest-list-right").boundingClientRect()
+ query.exec(rect => {
+ this.leftHeight = rect[0].height
+ this.rightHeight = rect[1].height
+ this.calculateProcessingCenter()
+ })
+
+ }
+ },
+
// 获取图片高度
getPictureHeight(src) {
return new Promise((resolve, reject) => {
@@ -580,6 +625,7 @@ Page({
// 上拉到底部
onReachBottom() {
+ // return
this.getListData()
},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f93900b..8714c28 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -127,7 +127,7 @@
当前共有 {{ combination[areaIndex] && combination[areaIndex].num }} 个房源
-
@@ -164,7 +164,11 @@
-
+
+
+
+
+
@@ -180,7 +184,7 @@
-
+
@@ -194,7 +198,7 @@
-
+
@@ -391,13 +395,13 @@
-
+
-
+
@@ -408,7 +412,7 @@
-
+
{{ item.title }}
{{ item.propaganda }}
@@ -425,18 +429,16 @@
更多
-
-
- {{ item.intermediarytext }}
-
+ {{ item.intermediarytext || '其他' }}
+
{{ item.gptype }}
{{ item.title }}
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 635c1e2..f60d48f 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -769,6 +769,22 @@ page {
width: 100%;
height: 93rpx;
border-radius: 6rpx;
+ position: relative;
+ overflow: hidden;
+}
+
+.apartment-block .apartment-list .apartment-image-item image {
+ width: 100%;
+ height: 100%;
+}
+
+.apartment-block .apartment-list .apartment-image-item .apartment-image-item-icon {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 69rpx;
+ height: 69rpx;
+ transform: translate(-50%, -50%);
}
.apartment-block .apartment-list .apartment-image-item:first-of-type {
@@ -835,6 +851,11 @@ page {
flex-wrap: wrap;
}
+.pinterest-list .pinterest-list-left,
+.pinterest-list .pinterest-list-right {
+ height: fit-content;
+}
+
.pinterest-list .pinterest-list-item {
width: 337.5rpx;
background-color: #fff;
@@ -906,7 +927,7 @@ page {
}
.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';
diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index 82f29f3..bba324f 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -64,8 +64,7 @@ Page({
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 a1a3cf4..f6767d7 100644
--- a/pages/irentList/irentList.wxml
+++ b/pages/irentList/irentList.wxml
@@ -31,7 +31,7 @@
-
+
diff --git a/pages/personList/areaSelect/ads/ads.wxml b/pages/personList/areaSelect/ads/ads.wxml
index aedc299..a35d60e 100644
--- a/pages/personList/areaSelect/ads/ads.wxml
+++ b/pages/personList/areaSelect/ads/ads.wxml
@@ -3,7 +3,7 @@
-
+
{{ item.subject }}
-
+
{{ item.subject }}
diff --git a/pages/personList/areaSelect/areaSelect.js b/pages/personList/areaSelect/areaSelect.js
index fd4411d..da26e28 100644
--- a/pages/personList/areaSelect/areaSelect.js
+++ b/pages/personList/areaSelect/areaSelect.js
@@ -42,6 +42,7 @@ Component({
"locationValue": function (e) {
// console.log('locationValue:', e)
+ console.log("e", e);
if (Array.isArray(e) && e.length > 0) {
if (e.length > 1) {
// 地区多选
@@ -70,6 +71,8 @@ Component({
name: this.properties.list[Math.floor(e[0])] + '/...'
})
}
+ console.log("selectarr", this.data.selectarr);
+
} else {
// 地区清空
@@ -79,6 +82,8 @@ Component({
})
}
+ console.log("selectarr", this.data.selectarr);
+
},
"schoolValue": function (e) {
// console.log('schoolValue:', e)
@@ -100,14 +105,12 @@ Component({
methods: {
catchmove() {},
attachedIn() {
- // console.log('attachedInattachedInattachedIn')
this.setList()
},
showAlert(e) {
this.setData({
show: e.currentTarget.dataset.show == 1 ? true : false
})
-
},
setList() {
if (this.data.arr1.length > 0) {
@@ -180,7 +183,7 @@ Component({
for (let i in this.data.selectarr) {
arr.push(i)
}
- } else if(this.data.value1 != "" && this.data.value1 != 0) {
+ } else if (this.data.value1 != "" && this.data.value1 != 0) {
arr = [this.data.value1]
}
this.triggerEvent('submit', {
diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 7903a1c..445de53 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -120,7 +120,11 @@ Page({
},
verifiedList: [],
listTab: {},
- initState: false
+ initState: false,
+
+
+ isNewVersions: false,
+
},
onPageScroll(e) {
if (e.scrollTop > 1000 && !this.data.showTOTOP) {
diff --git a/pages/personList/personList.wxml b/pages/personList/personList.wxml
index ea034d5..eacd89c 100644
--- a/pages/personList/personList.wxml
+++ b/pages/personList/personList.wxml
@@ -16,7 +16,7 @@
-
+
diff --git a/pages/personList/tab/tab.wxml b/pages/personList/tab/tab.wxml
index ee6a88c..6651019 100644
--- a/pages/personList/tab/tab.wxml
+++ b/pages/personList/tab/tab.wxml
@@ -1,5 +1,5 @@
- {{ item.name }}
+ {{ item.name }}
@@ -7,14 +7,14 @@
个人房源
-
+
{{ '中介房源' }}
-
+
学生公寓
diff --git a/pages/restOfWorld/restOfWorld.js b/pages/restOfWorld/restOfWorld.js
index 47f4051..f1cccad 100644
--- a/pages/restOfWorld/restOfWorld.js
+++ b/pages/restOfWorld/restOfWorld.js
@@ -4,470 +4,492 @@ var config = {};
var miucms = require('../../utils/miucms.js');
Page({
- /**
- * 页面的初始数据
- */
- data: {
- showTOTOP: false,
- loading: true,
- conditionFixed: false, //筛选条件一列是否固定在顶部
- attachment: [],
- groupSearch: [], //组合最热
- selectGroupIndex: null,
- orderby: {
- value: 'timestamp',
- list: [{
- name: "最新发布",
- value: 'timestamp'
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ showTOTOP: false,
+ loading: true,
+ conditionFixed: false, //筛选条件一列是否固定在顶部
+ attachment: [],
+ groupSearch: [], //组合最热
+ selectGroupIndex: null,
+ orderby: {
+ value: 'timestamp',
+ list: [{
+ name: "最新发布",
+ value: 'timestamp'
+ },
+ {
+ name: "热门",
+ value: 'hotnum'
+ },
+ {
+ name: "价格从低到高",
+ value: 'rentasc'
+ },
+ {
+ name: "价格从高到低",
+ value: 'rentdesc'
+ },
+ ]
},
- {
- name: "热门",
- value: 'hotnum'
+ list: [],
+ page: {
+ next_page: 1
},
- {
- name: "价格从低到高",
- value: 'rentasc'
+ location: {},
+ types: {
+ data: [],
+ value: ''
},
- {
- name: "价格从高到低",
- value: 'rentdesc'
+ property: {},
+ cityList: [],
+ moreCondition: {
+ show: false,
+ data: {
+ gender: "0",
+ leaseterm: "",
+ publish: "twomonth",
+ }
},
- ]
+ city: {
+ uniqid: "",
+ name: "",
+ alias: ''
+ },
+ hascondition: true,
+
+ langs: {}, // 语言包
+ isAuthorization: 0
},
- list: [],
- page: {
- next_page: 1
- },
- location: {},
- types: {
- data: [],
- value: ''
- },
- property: {},
- cityList: [],
- moreCondition: {
- show: false,
- data: {
- gender: "0",
- leaseterm: "",
- publish: "twomonth",
- }
- },
- city: {
- uniqid: "",
- name: "",
- alias: ''
- },
- hascondition: true,
-
- langs: {}, // 语言包
-
- },
- onPageScroll(e) {
- if (e.scrollTop > 1000 && !this.data.showTOTOP) {
- this.setData({
- showTOTOP: true
- })
- } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
- this.setData({
- showTOTOP: false
- })
- }
- },
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- console.log(options)
- this.setData({
- city: {
- uniqid: options.cityid || '',
- name: options.name || '',
- alias: options.alias || ''
- },
- })
- var that = this;
- wx.setStorage({
- key: 'selectcityData',
- data: that.data.city,
- })
- this.get_config()
- this.firstInpage = false;
-
- app.globalData['langs'] ? this.data.langs = app.globalData['langs'] : this.getDtailsLangs()
-
- },
- firstInpage: true,
- onShow() {
- var that = this;
- if (this.firstInpage) {
- return false
- }
- wx.getStorage({
- key: 'selectcityData',
- success: function (res) {
- if (res.data.uniqid == that.data.city.uniqid) {
- return false
- }
- that.setData({
- city: res.data,
- selectGroupIndex: null
- })
- if (res.data && res.data.uniqid && app.globalData.config.lists) {
- that.clear_data()
- }
-
- },
- })
- },
-
- onUnload() {
- wx.removeStorage({
- key: 'selectcityData',
- success: function (res) {},
- })
- wx.removeStorage({
- key: 'countryList',
- success: function (res) {},
- })
-
- },
- get_config() {
- var that = this;
- // console.log('get_configget_configget_configget_config');
-
- if (app.globalData.config.lists) {
-
- config = app.globalData.config;
-
- that.data.user = app.globalData.user;
- this.setData({
- screen_data: app.globalData.screen_data,
- leaseterm: that.data.leaseterm,
- status: app.globalData.status,
- StudentapartmentNew: app.globalData.StudentapartmentNew
- })
- this.getgroupSearch();
- this.get_list();
- this.getAd();
- this.getLocationList()
- } else {
- setTimeout(function () {
- that.get_config()
- }, 200)
- }
- },
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
- if (!app.globalData.config || !app.globalData.config.lists) {
- // console.log('还没拿到数据呢。。。。。。。。')
- wx.stopPullDownRefresh();
- return false
- }
-
- this.clear_data()
- this.getAd()
- this.getgroupSearch();
- wx.stopPullDownRefresh();
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
- if (!app.globalData.config || !app.globalData.config.lists || this.data.page.next_page < 2) {
- return false
- }
- this.get_list()
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
- let path = `/pages/restOfWorld/restOfWorld?name=${this.data.city.name}&cityid=${this.data.city.uniqid}&alias=${this.data.city.alias}`;
- // var title = '寄托港校租房';
- var title = app.globalData.topTitle;
- if (this.data.city.name) {
- // title = '寄托港校租房 - ' + this.data.city.name
- title = app.globalData.topTitle + ' - ' + this.data.city.name
- }
- return {
- path: path,
- title: title,
- success: function (res) {
- miucms.share(app, 'index')
- }
- }
- },
- // 拉去广告
- getAd() {
- let that = this;
- miucms.request(app.globalData.config.otherlist.banner, {}).then(data => {
- that.setData({
- attachment: data.data
- })
- wx.hideLoading()
-
- }).catch(res => {})
-
- },
- // 组合搜索
- getgroupSearch() {
- var that = this;
- miucms.request(app.globalData.config.otherlist.groupsearch, {}).then(data => {
- this.setData({
- groupSearch: data.data
- }, function () {
- that.calculateConditionPosition()
- })
- wx.hideLoading()
-
- }).catch(res => {})
- },
- // 拉取列表
- get_list() {
- var that = this;
- this.setData({
- loading: true
- })
- miucms.request(app.globalData.config.otherlist.init, Object.assign({}, this.data.moreCondition.data, {
- page: this.data.page.next_page,
- 'type': this.data.types.value * 1,
- orderby: this.data.orderby.value,
- cityid: this.data.city.uniqid
- })).then(data => {
- let list = data.data
-
- list.forEach(element => {
- if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
- })
-
- that.setData({
- list: that.data.list.concat(list),
- loading: false,
- page: data.page
- })
-
- that.handleDetailData()
-
- wx.hideLoading()
-
- }).catch(res => {})
- },
- // 获取地域列表
- getLocationList() {
- let that = this;
- miucms.request(app.globalData.config.otherlist.region, {}).then(data => {
- this.data.location.data = data.data.location;
- this.data.types.data = data.data['type'];
- that.setData({
- location: this.data.location,
- types: this.data.types,
- property: data.data.property,
- cityList: data.data.cityList
- })
- wx.setStorage({
- key: 'countryList',
- data: data.data.cityList,
- })
- wx.hideLoading()
-
- }).catch(res => {})
- },
- // 计算筛选条件位置
- calculateConditionPosition() {
- var that = this;
- wx.createIntersectionObserver().relativeToViewport({
- top: -20
- }).observe('.hot-text-box', res => {
- if (res.intersectionRatio > 0) {
- that.setData({
- conditionFixed: false
- })
- } else {
- that.setData({
- conditionFixed: true
- })
- }
- })
- },
- // 清空数组
- clear_data: function () {
- this.setData({
- page: {
- next_page: 1
- },
- list: []
- })
- this.get_list()
-
- },
-
- // 提交出租方式
- submittype(e) {
- console.log(e.detail)
- this.data.types.value = e.detail.data;
- this.setData({
- types: this.data.types,
- selectGroupIndex: null
- })
- this.clear_data()
- },
- // 提交排序
- submitOrderby(e) {
- console.log(e.detail)
- this.data.orderby.value = e.detail.value;
- this.setData({
- orderby: this.data.orderby
- })
- this.clear_data()
- },
- // 提交更多
- myEventSelectSubmit(e) {
- console.log(e.detail)
-
- this.setData({
- moreCondition: {
- show: false,
- data: e.detail
- },
- selectGroupIndex: null
- })
- this.hasMoreCondition()
- this.clear_data()
- },
- // 判断‘更多’是否加粗
- hasMoreCondition() {
- let hascondition = false;
- for (let i in this.data.moreCondition.data) {
- if (this.data.moreCondition.data[i] != 0) {
- // 存在一个就加粗
- hascondition = true;
- }
- }
- this.setData({
- hascondition,
- })
- },
- // 选择热词
- selectGroup(e) {
- let index = e.currentTarget.dataset.index;
- let obj = this.data.groupSearch[index].where;
- // this.data.location.value = [...obj.location];//区域
- this.data.types.value = obj['type']; //出租方式
- // this.data.money.rent_min = obj.rent_min;
- // this.data.money.rent_max = obj.rent_max;//租金
- this.data.orderby.value = obj.orderby; //排序
- var isNotID = true,
- city = {
- uniqid: obj.cityid,
- name: '',
- "alias": ""
- };
-
- this.data.cityList.every(item => {
- item.city.every(s => {
- if (s.cityid == obj.cityid) {
- isNotID = false;
- city.name = s.name;
- city.alias = item.alias;
- }
- return isNotID
- })
- return isNotID
- })
- this.data.city = city;
- this.data.moreCondition.data = {
- gender: obj.gender,
- leaseterm: obj.leaseterm,
- publish: obj.publish,
- }
- this.setData({
- selectGroupIndex: index,
- // location: this.data.location,
- types: this.data.types,
- // money: this.data.money,
- orderby: this.data.orderby,
- moreCondition: this.data.moreCondition,
- city
- })
- this.hasMoreCondition()
- this.clear_data()
- },
- // 点击广告
- clickAD(e) {
- miucms.clickAD(e.detail.id)
- },
- // 关闭广告
- closeAD(e) {
- let index = e.currentTarget.dataset.index;
- this.data.list.splice(index, 1)
- this.setData({
- list: this.data.list
- })
- miucms.closeAD(e.detail.id)
- },
-
- // 获取语言包 保存全局
- getDtailsLangs() {
- miucms.request(`${app.globalData.baseURL}/tenement/v2/api/details/langs`).then(res => {
- if (res.code != 200) return
- let data = res.data
- this.setData({
- langs: data
- })
- app.globalData['langs'] = data
- })
- },
-
- // 专门梳理v4出现的 语音包 及 不同房源值的处理
- handleDetailData() {
- let langs = this.data.langs || {}
- if (Object.keys(langs).length == 0) {
- setTimeout(() => {
- this.handleDetailData()
- }, 300)
- } else {
- let list = this.data.list
-
- list.forEach(element => {
- console.log(element.leaseterm, langs);
- let leasetermLangs = langs.leaseterm
- console.log(leasetermLangs);
- element.leaseterm = leasetermLangs[element.leaseterm || 1]
- let location = langs.location // 遍历替换区域的值 所有房源
- let pendingData = element['location']
- let locationList = []
- for (const key in location) {
- if (pendingData.indexOf(key) != -1 && Math.trunc(key) != key) {
- locationList.push({
- head: location[Math.trunc(key)],
- end: location[key],
+ onPageScroll(e) {
+ if (e.scrollTop > 1000 && !this.data.showTOTOP) {
+ this.setData({
+ showTOTOP: true
})
- }
+ } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
+ this.setData({
+ showTOTOP: false
+ })
+ }
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ console.log(options)
+ this.setData({
+ city: {
+ uniqid: options.cityid || '',
+ name: options.name || '',
+ alias: options.alias || ''
+ },
+ })
+ var that = this;
+ wx.setStorage({
+ key: 'selectcityData',
+ data: that.data.city,
+ })
+ this.get_config()
+ this.firstInpage = false;
+
+ app.globalData['langs'] ? this.data.langs = app.globalData['langs'] : this.getDtailsLangs()
+
+ },
+ firstInpage: true,
+ onShow() {
+ var that = this;
+ if (this.firstInpage) {
+ return false
+ }
+ wx.getStorage({
+ key: 'selectcityData',
+ success: function (res) {
+ if (res.data.uniqid == that.data.city.uniqid) {
+ return false
+ }
+ that.setData({
+ city: res.data,
+ selectGroupIndex: null
+ })
+ if (res.data && res.data.uniqid && app.globalData.config.lists) {
+ that.clear_data()
+ }
+
+ },
+ })
+ },
+
+ onUnload() {
+ wx.removeStorage({
+ key: 'selectcityData',
+ success: function (res) {},
+ })
+ wx.removeStorage({
+ key: 'countryList',
+ success: function (res) {},
+ })
+
+ },
+ get_config() {
+ var that = this;
+ // console.log('get_configget_configget_configget_config');
+
+ if (app.globalData.config.lists) {
+
+ config = app.globalData.config;
+
+ that.data.user = app.globalData.user;
+ this.setData({
+ screen_data: app.globalData.screen_data,
+ leaseterm: that.data.leaseterm,
+ status: app.globalData.status,
+ StudentapartmentNew: app.globalData.StudentapartmentNew
+ })
+ this.getgroupSearch();
+ this.get_list();
+ this.getAd();
+ this.getLocationList()
+ } else {
+ setTimeout(function () {
+ that.get_config()
+ }, 200)
+ }
+ },
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+ if (!app.globalData.config || !app.globalData.config.lists) {
+ // console.log('还没拿到数据呢。。。。。。。。')
+ wx.stopPullDownRefresh();
+ return false
}
- element['locationList'] = locationList
- })
+ this.clear_data()
+ this.getAd()
+ this.getgroupSearch();
+ wx.stopPullDownRefresh();
+ },
- this.setData({
- list
- })
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+ if (!app.globalData.config || !app.globalData.config.lists || this.data.page.next_page < 2) {
+ return false
+ }
+ this.get_list()
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+ let path = `/pages/restOfWorld/restOfWorld?name=${this.data.city.name}&cityid=${this.data.city.uniqid}&alias=${this.data.city.alias}`;
+ // var title = '寄托港校租房';
+ var title = app.globalData.topTitle;
+ if (this.data.city.name) {
+ // title = '寄托港校租房 - ' + this.data.city.name
+ title = app.globalData.topTitle + ' - ' + this.data.city.name
+ }
+ return {
+ path: path,
+ title: title,
+ success: function (res) {
+ miucms.share(app, 'index')
+ }
+ }
+ },
+ // 拉去广告
+ getAd() {
+ let that = this;
+ miucms.request(app.globalData.config.otherlist.banner, {}).then(data => {
+ that.setData({
+ attachment: data.data
+ })
+ wx.hideLoading()
+
+ }).catch(res => {})
+
+ },
+ // 组合搜索
+ getgroupSearch() {
+ var that = this;
+ miucms.request(app.globalData.config.otherlist.groupsearch, {}).then(data => {
+ this.setData({
+ groupSearch: data.data
+ }, function () {
+ that.calculateConditionPosition()
+ })
+ wx.hideLoading()
+
+ }).catch(res => {})
+ },
+ // 拉取列表
+ get_list() {
+ var that = this;
+ this.setData({
+ loading: true
+ })
+ miucms.request(app.globalData.config.otherlist.init, Object.assign({}, this.data.moreCondition.data, {
+ page: this.data.page.next_page,
+ 'type': this.data.types.value * 1,
+ orderby: this.data.orderby.value,
+ cityid: this.data.city.uniqid
+ })).then(data => {
+ let list = data.data
+
+ list.forEach(element => {
+ if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
+ })
+
+ that.setData({
+ list: that.data.list.concat(list),
+ loading: false,
+ page: data.page
+ })
+
+ that.handleDetailData()
+
+ wx.hideLoading()
+
+ }).catch(res => {})
+ },
+ // 获取地域列表
+ getLocationList() {
+ let that = this;
+ miucms.request(app.globalData.config.otherlist.region, {}).then(data => {
+ this.data.location.data = data.data.location;
+ this.data.types.data = data.data['type'];
+ that.setData({
+ location: this.data.location,
+ types: this.data.types,
+ property: data.data.property,
+ cityList: data.data.cityList
+ })
+ wx.setStorage({
+ key: 'countryList',
+ data: data.data.cityList,
+ })
+ wx.hideLoading()
+
+ }).catch(res => {})
+ },
+ // 计算筛选条件位置
+ calculateConditionPosition() {
+ var that = this;
+ wx.createIntersectionObserver().relativeToViewport({
+ top: -20
+ }).observe('.hot-text-box', res => {
+ if (res.intersectionRatio > 0) {
+ that.setData({
+ conditionFixed: false
+ })
+ } else {
+ that.setData({
+ conditionFixed: true
+ })
+ }
+ })
+ },
+ // 清空数组
+ clear_data: function () {
+ this.setData({
+ page: {
+ next_page: 1
+ },
+ list: []
+ })
+ this.get_list()
+
+ },
+
+ // 提交出租方式
+ submittype(e) {
+ console.log(e.detail)
+ this.data.types.value = e.detail.data;
+ this.setData({
+ types: this.data.types,
+ selectGroupIndex: null
+ })
+ this.clear_data()
+ },
+ // 提交排序
+ submitOrderby(e) {
+ console.log(e.detail)
+ this.data.orderby.value = e.detail.value;
+ this.setData({
+ orderby: this.data.orderby
+ })
+ this.clear_data()
+ },
+ // 提交更多
+ myEventSelectSubmit(e) {
+ console.log(e.detail)
+
+ this.setData({
+ moreCondition: {
+ show: false,
+ data: e.detail
+ },
+ selectGroupIndex: null
+ })
+ this.hasMoreCondition()
+ this.clear_data()
+ },
+ // 判断‘更多’是否加粗
+ hasMoreCondition() {
+ let hascondition = false;
+ for (let i in this.data.moreCondition.data) {
+ if (this.data.moreCondition.data[i] != 0) {
+ // 存在一个就加粗
+ hascondition = true;
+ }
+ }
+ this.setData({
+ hascondition,
+ })
+ },
+ // 选择热词
+ selectGroup(e) {
+ let index = e.currentTarget.dataset.index;
+ let obj = this.data.groupSearch[index].where;
+ // this.data.location.value = [...obj.location];//区域
+ this.data.types.value = obj['type']; //出租方式
+ // this.data.money.rent_min = obj.rent_min;
+ // this.data.money.rent_max = obj.rent_max;//租金
+ this.data.orderby.value = obj.orderby; //排序
+ var isNotID = true,
+ city = {
+ uniqid: obj.cityid,
+ name: '',
+ "alias": ""
+ };
+
+ this.data.cityList.every(item => {
+ item.city.every(s => {
+ if (s.cityid == obj.cityid) {
+ isNotID = false;
+ city.name = s.name;
+ city.alias = item.alias;
+ }
+ return isNotID
+ })
+ return isNotID
+ })
+ this.data.city = city;
+ this.data.moreCondition.data = {
+ gender: obj.gender,
+ leaseterm: obj.leaseterm,
+ publish: obj.publish,
+ }
+ this.setData({
+ selectGroupIndex: index,
+ // location: this.data.location,
+ types: this.data.types,
+ // money: this.data.money,
+ orderby: this.data.orderby,
+ moreCondition: this.data.moreCondition,
+ city
+ })
+ this.hasMoreCondition()
+ this.clear_data()
+ },
+ // 点击广告
+ clickAD(e) {
+ miucms.clickAD(e.detail.id)
+ },
+ // 关闭广告
+ closeAD(e) {
+ let index = e.currentTarget.dataset.index;
+ this.data.list.splice(index, 1)
+ this.setData({
+ list: this.data.list
+ })
+ miucms.closeAD(e.detail.id)
+ },
+
+ // 获取语言包 保存全局
+ getDtailsLangs() {
+ miucms.request(`${app.globalData.baseURL}/tenement/v2/api/details/langs`).then(res => {
+ if (res.code != 200) return
+ let data = res.data
+ this.setData({
+ langs: data
+ })
+ app.globalData['langs'] = data
+ })
+ },
+
+ // 专门梳理v4出现的 语音包 及 不同房源值的处理
+ handleDetailData() {
+ let langs = this.data.langs || {}
+ if (Object.keys(langs).length == 0) {
+ setTimeout(() => {
+ this.handleDetailData()
+ }, 300)
+ } else {
+ let list = this.data.list
+
+ list.forEach(element => {
+ console.log(element.leaseterm, langs);
+ let leasetermLangs = langs.leaseterm
+ console.log(leasetermLangs);
+ element.leaseterm = leasetermLangs[element.leaseterm || 1]
+ let location = langs.location // 遍历替换区域的值 所有房源
+ let pendingData = element['location']
+ let locationList = []
+ for (const key in location) {
+ if (pendingData.indexOf(key) != -1 && Math.trunc(key) != key) {
+ locationList.push({
+ head: location[Math.trunc(key)],
+ end: location[key],
+ })
+ }
+ }
+
+ element['locationList'] = locationList
+ })
+
+ this.setData({
+ list
+ })
- }
+ }
- },
+ },
- // 跳转求房源发布页面
- goAskHousing() {
- wx.navigateTo({
- url: '/pages/askHousing/askHousing',
- })
- },
+ // 跳转求房源发布页面
+ goAskHousing() {
+ let user = app.globalData['user']
+ let miniProgram = app.globalData['miniProgram']
+
+ if (user['uid']) {
+ if (!user['nickname']) {
+ wx.navigateTo({
+ url: '/pages/setAvatarNickname/setAvatarNickname',
+ })
+ return
+ }
+ if (miniProgram == 'gx') {
+ wx.navigateToMiniProgram({
+ appId: "wx9c68fbf7886ea9c4",
+ path: "/pages/askHousing/askHousing"
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/askHousing/askHousing',
+ })
+ }
+ } else {
+ this.setData({
+ isAuthorization: 1
+ })
+ }
+ },
})
\ No newline at end of file
diff --git a/pages/restOfWorld/restOfWorld.wxml b/pages/restOfWorld/restOfWorld.wxml
index 87d63eb..d000271 100644
--- a/pages/restOfWorld/restOfWorld.wxml
+++ b/pages/restOfWorld/restOfWorld.wxml
@@ -1,17 +1,17 @@
-
- 求房源
-
-
-
-
-
- {{ item['keyword'] }}
+
+ 求房源
+
+
+
+
+
+ {{ item['keyword'] }}
+
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
- 暂无数据
-
-
-
-
-
-
-
-
-
-
-
- 求房源
-
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
+ 求房源
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setAvatarNickname/setAvatarNickname.js b/pages/setAvatarNickname/setAvatarNickname.js
index b2b387c..4cd28fc 100644
--- a/pages/setAvatarNickname/setAvatarNickname.js
+++ b/pages/setAvatarNickname/setAvatarNickname.js
@@ -30,7 +30,7 @@ Page({
avatarUrl
})
- miucms.request("https://passport.gter.net/api/user/uploadAvatar", {
+ miucms.request(`${app.globalData.baseURL}/tenement/v2/api/user/uploadAvatar`, {
data: avatarUrl
}).then(res => {
let data = res.data
@@ -38,9 +38,13 @@ Page({
app.globalData['setSate'] = true
})
},
+
submitNickname() {
- miucms.request("https://passport.gter.net/api/user/updateNickname", {
- nickname: this.data.nickname
+ let nickname = this.data.nickname
+ nickname = nickname.replaceAll(" ", "")
+
+ miucms.request(`${app.globalData.baseURL}/tenement/v2/api/user/updateNickname`, {
+ nickname
}).then(res => {
if (res.code == 200) {
let data = res.data
@@ -67,7 +71,7 @@ Page({
delta: 1,
fail: function () {
wx.navigateTo({
- url: '/pages/more_offer/index/index',
+ url: '/pages/index/index',
})
}
})
@@ -82,6 +86,11 @@ Page({
})
},
+ nicknameinput1(e) {
+ console.log(e.detail.pass);
+ console.log("ff");
+ },
+
submit() {
},
@@ -129,10 +138,4 @@ Page({
},
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
})
\ No newline at end of file
diff --git a/pages/setAvatarNickname/setAvatarNickname.wxml b/pages/setAvatarNickname/setAvatarNickname.wxml
index 97dabc0..9bb78a0 100644
--- a/pages/setAvatarNickname/setAvatarNickname.wxml
+++ b/pages/setAvatarNickname/setAvatarNickname.wxml
@@ -13,7 +13,8 @@
昵称
-
+
+
diff --git a/pages/show/ads/ads.wxml b/pages/show/ads/ads.wxml
index d0b07d7..98633e1 100644
--- a/pages/show/ads/ads.wxml
+++ b/pages/show/ads/ads.wxml
@@ -6,7 +6,7 @@
-
+
{{ item.subject }}
@@ -20,7 +20,7 @@
-
+
{{ item.subject }}
diff --git a/pages/show/show.wxml b/pages/show/show.wxml
index 80b4d50..0d948d1 100644
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@@ -400,7 +400,7 @@
{{ info.subject }}
-
+
{{ info.author }}
diff --git a/pages/show/show.wxss b/pages/show/show.wxss
index 8b9aa93..db061d0 100644
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@@ -1834,5 +1834,6 @@ map .clickmap {
display: block;
width: calc(100vw - 60rpx);
margin: 60rpx auto 0;
+ padding-bottom: 60rpx;
border-radius: 10rpx;
}
\ No newline at end of file
diff --git a/pages/user/user.js b/pages/user/user.js
index 60c452b..76d26b3 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -7,863 +7,898 @@ var miucms = require('../../utils/miucms.js');
var WxParse = require('../../wxParse/wxParse.js');
Page({
- /**
- * 页面的初始数据
- */
- data: {
- loding: true,
- showTOTOP: false,
- fav_list: [],
- fav_page: {
- next_page: 1
- },
- publish_list: [],
- publish_page: {
- next_page: 1
- },
- user: {},
- tab: 'fav',
- fav_count: 0,
- publish_count: 0,
- loading: false,
- status: 0,
- q: '',
- orderby: {
- title: 'orderby',
- value: "new",
- name: '按最新消息排序',
- show: false,
- list: {
- "new": '按最新消息排序',
- "impression": '按印象排序'
- }
- },
- message_page: {
- next_page: 1
- },
- message_list: [],
- impression: {},
- impression_obj: {
- show: false,
- index: 1,
- impression: 0,
- uniqid: ''
- },
- del_obj: {
- show: false,
- index: 1,
- uniqid: ''
- },
- chage_status_obj: {
- show: false,
- uniqid: '',
- token: '',
- index: 0
- },
- options: {},
- isAuthorization: 0,
- raisePopupState: false,
- screen_data: {
- windowHeight: 0,
- totalTopHeight: 0,
- statusBarHeight: 0,
- titleBarHeight: 0,
- },
- raisePopupMessage: "", // 顶上去升起弹出框的文本
- initState: false,
- triggerRules: 0, // 触发规则状态 0 是未触发 1 是触发规则 1 2 是触发规则2
- topTitle: "",
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ loding: true,
+ showTOTOP: false,
+ fav_list: [],
+ fav_page: {
+ next_page: 1
+ },
+ publish_list: [],
+ publish_page: {
+ next_page: 1
+ },
+ user: {},
+ tab: 'fav',
+ fav_count: 0,
+ publish_count: 0,
+ loading: false,
+ status: 0,
+ q: '',
+ orderby: {
+ title: 'orderby',
+ value: "new",
+ name: '按最新消息排序',
+ show: false,
+ list: {
+ "new": '按最新消息排序',
+ "impression": '按印象排序'
+ }
+ },
+ message_page: {
+ next_page: 1
+ },
+ message_list: [],
+ impression: {},
+ impression_obj: {
+ show: false,
+ index: 1,
+ impression: 0,
+ uniqid: ''
+ },
+ del_obj: {
+ show: false,
+ index: 1,
+ uniqid: ''
+ },
+ chage_status_obj: {
+ show: false,
+ uniqid: '',
+ token: '',
+ index: 0
+ },
+ options: {},
+ isAuthorization: 0,
+ raisePopupState: false,
+ screen_data: {
+ windowHeight: 0,
+ totalTopHeight: 0,
+ statusBarHeight: 0,
+ titleBarHeight: 0,
+ },
+ raisePopupMessage: "", // 顶上去升起弹出框的文本
+ initState: false,
+ triggerRules: 0, // 触发规则状态 0 是未触发 1 是触发规则 1 2 是触发规则2
+ topTitle: "",
- },
- launchAppError(e) {
- console.log(e.detail.errMsg)
- },
- onPageScroll(e) {
- if (e.scrollTop > 1000 && !this.data.showTOTOP) {
- this.setData({
- showTOTOP: true
- })
- } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
- this.setData({
- showTOTOP: false
- })
- }
- },
- /**
- * 生命周期函数--监听页面加载
- */
- timer: null,
- onLoad: function (options) {
- let that = this
- this.setData({
- q: options.q ? options.q : '',
- tab: options.tab ? options.tab : 'fav',
- options: options || {},
- screen_data: app.globalData.screen_data,
- // topTitle: app.globalData.topTitle
- })
+ },
+ launchAppError(e) {
+ console.log(e.detail.errMsg)
+ },
+ onPageScroll(e) {
+ if (e.scrollTop > 1000 && !this.data.showTOTOP) {
+ this.setData({
+ showTOTOP: true
+ })
+ } else if (e.scrollTop < 1000 && this.data.showTOTOP) {
+ this.setData({
+ showTOTOP: false
+ })
+ }
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ timer: null,
+ onLoad: function (options) {
+ let that = this
+ this.setData({
+ q: options.q ? options.q : '',
+ tab: options.tab ? options.tab : 'fav',
+ options: options || {},
+ screen_data: app.globalData.screen_data,
+ // topTitle: app.globalData.topTitle
+ })
- this.getTopTitle()
+ this.getTopTitle()
- this.get_config();
- this.getNoticeNumber()
- },
+ this.get_config();
+ this.getNoticeNumber()
+ },
- getTopTitle() {
- miucms.getTopTitle(this, app)
- },
+ onShow: function () {
+ if (this.data.user) {
+ this.setData({
+ user: app.globalData.user
+ })
+ }
+ },
- // 获取系统通知数量
- getNoticeNumber() {
- if (app.globalData.unreadMessagesState) return
- miucms.count().then(res => {
- this.setData({
- unreadMessages: res.data.count
- })
- }).catch(() => {})
- },
+ getTopTitle() {
+ miucms.getTopTitle(this, app)
+ },
- // 如果用户已经同意授权。则开始获取数据
- islogin() {
- wx.showLoading({
- title: '加载中',
- })
- this.setData({
- initState: true
- })
- this.get_config();
- },
+ // 获取系统通知数量
+ getNoticeNumber() {
+ if (app.globalData.unreadMessagesState) return
+ miucms.count().then(res => {
+ this.setData({
+ unreadMessages: res.data.count
+ })
+ }).catch(() => {})
+ },
- get_config: function () {
- var that = this;
- if (app.globalData.config.lists) {
- config = app.globalData.config;
+ // 如果用户已经同意授权。则开始获取数据
+ islogin() {
+ wx.showLoading({
+ title: '加载中',
+ })
+ this.setData({
+ initState: true
+ })
+ this.get_config();
+ },
- this.setData({
- // user: app.globalData.user,
- status: app.globalData.status,
- bottomLift: app.globalData.screen_data.bottomLift
- })
+ get_config: function () {
+ var that = this;
+ if (app.globalData.config.lists) {
+ config = app.globalData.config;
- this.initData()
- // this['get_' + this.data.tab]()
- } else {
- setTimeout(function () {
- that.get_config()
- }, 200)
- }
- },
+ this.setData({
+ // user: app.globalData.user,
+ status: app.globalData.status,
+ bottomLift: app.globalData.screen_data.bottomLift
+ })
- initData() {
- miucms.request(`${app.globalData.baseURL}/tenement/my`).then(res => {
- if (res.code == 401) {
- this.setData({
- isAuthorization: 1,
- loding: false,
- })
- return false
- }
- if (res.code == 200) {
- let data = res.data
- if (this.data.tab == 'fav' && data.count.fav != 0) {
- this['get_' + this.data.tab]()
- } else if (this.data.tab == 'publish' && data.count.post != 0) {
- this['get_' + this.data.tab]()
- } else {
- wx.hideLoading()
- }
+ this.initData()
+ // this['get_' + this.data.tab]()
+ } else {
+ setTimeout(function () {
+ that.get_config()
+ }, 200)
+ }
+ },
- this.setData({
- landlordcertification: data.landlordcertification,
- user: data.user,
- initState: true,
- loding: false
- })
- } else {
- wx.hideLoading()
- wx.showModal({
- title: '提示',
- content: res.message
- })
- }
- }, err => {
- wx.hideLoading()
- })
- },
+ initData() {
+ miucms.request(`${app.globalData.baseURL}/tenement/my`).then(res => {
+ if (res.code == 401) {
+ this.setData({
+ isAuthorization: 1,
+ loding: false,
+ })
+ return false
+ }
+ if (res.code == 200) {
+ let data = res.data
+ if (this.data.tab == 'fav' && data.count.fav != 0) {
+ this['get_' + this.data.tab]()
+ } else if (this.data.tab == 'publish' && data.count.post != 0) {
+ this['get_' + this.data.tab]()
+ } else {
+ wx.hideLoading()
+ }
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
+ this.setData({
+ landlordcertification: data.landlordcertification,
+ user: data.user,
+ initState: true,
+ loding: false
+ })
+ } else {
+ wx.hideLoading()
+ wx.showModal({
+ title: '提示',
+ content: res.message
+ })
+ }
+ }, err => {
+ wx.hideLoading()
+ })
+ },
- },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
- first_in: true,
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
- let tab = this.data.tab;
- if (!app.globalData.config.lists) {
- wx.stopPullDownRefresh();
- return false
- }
+ },
- if (tab == 'fav') {
- this.setData({
- fav_page: {
- next_page: 1
- },
- fav_list: []
+ first_in: true,
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+ let tab = this.data.tab;
+ if (!app.globalData.config.lists) {
+ wx.stopPullDownRefresh();
+ return false
+ }
- })
- } else if (tab == 'message') {
- this.setData({
- message_page: {
- next_page: 1
- },
- message_list: [],
- })
- } else if (tab == 'publish') {
- this.setData({
- publish_page: {
- next_page: 1
- },
- publish_list: []
- })
- }
+ if (tab == 'fav') {
+ this.setData({
+ fav_page: {
+ next_page: 1
+ },
+ fav_list: []
- this['get_' + this.data.tab]();
- wx.stopPullDownRefresh();
- },
+ })
+ } else if (tab == 'message') {
+ this.setData({
+ message_page: {
+ next_page: 1
+ },
+ message_list: [],
+ })
+ } else if (tab == 'publish') {
+ this.setData({
+ publish_page: {
+ next_page: 1
+ },
+ publish_list: []
+ })
+ }
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
- if (!app.globalData.config.lists) {
- return false
- }
- if (this.data.tab == 'fav') {
- this.get_fav()
- } else if (this.data.tab == 'publish') {
- this.get_publish()
- } else {
- this.get_message();
- }
- },
+ this['get_' + this.data.tab]();
+ wx.stopPullDownRefresh();
+ },
- change_tab: function (e) {
- this.setData({
- tab: e.currentTarget.dataset.tab,
- })
- if (this.data[this.data.tab + '_list'].length == 0 && this.data[this.data.tab + '_page'].next_page == 1 && app.globalData.config.lists) {
- // 首次点击tab，加载数据
- this['get_' + this.data.tab]()
- }
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+ if (!app.globalData.config.lists) {
+ return false
+ }
+ if (this.data.tab == 'fav') {
+ this.get_fav()
+ } else if (this.data.tab == 'publish') {
+ this.get_publish()
+ } else {
+ this.get_message();
+ }
+ },
- },
- // 收藏列表
- get_fav: function () {
- var that = this;
- if (!app.globalData.config.lists) {
- return false
- }
- if (that.data.fav_page.next_page == 0) {
- return false
- }
- this.setData({
- loading: true
- })
- var sendData = Object.assign({}, this.data.options, {
- session: wx.getStorageSync('session'),
- page: that.data.fav_page.next_page,
- q: that.data.q
- })
- // miucms.request(app.globalData.config.collection.init, {
- miucms.request(`${app.globalData.baseURL}/tenement/my/favList`, {
- page: that.data.fav_page.next_page,
- }).then(data => {
- wx.hideLoading()
- if (data.code == 401) {
- that.setData({
- loding: false,
- isAuthorization: 1,
- })
- return false
- }
- if (data.code == 200) {
- data = data.data
+ change_tab: function (e) {
+ this.setData({
+ tab: e.currentTarget.dataset.tab,
+ })
+ if (this.data[this.data.tab + '_list'].length == 0 && this.data[this.data.tab + '_page'].next_page == 1 && app.globalData.config.lists) {
+ // 首次点击tab，加载数据
+ this['get_' + this.data.tab]()
+ }
- let list = data.data
- list.forEach(element => {
- if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
- })
+ },
+ // 收藏列表
+ get_fav: function () {
+ var that = this;
+ if (!app.globalData.config.lists) {
+ return false
+ }
+ if (that.data.fav_page.next_page == 0) {
+ return false
+ }
+ this.setData({
+ loading: true
+ })
+ var sendData = Object.assign({}, this.data.options, {
+ session: wx.getStorageSync('session'),
+ page: that.data.fav_page.next_page,
+ q: that.data.q
+ })
+ // miucms.request(app.globalData.config.collection.init, {
+ miucms.request(`${app.globalData.baseURL}/tenement/my/favList`, {
+ page: that.data.fav_page.next_page,
+ }).then(data => {
+ wx.hideLoading()
+ if (data.code == 401) {
+ that.setData({
+ loding: false,
+ isAuthorization: 1,
+ })
+ return false
+ }
+ if (data.code == 200) {
+ data = data.data
- console.log(data, "0");
+ let list = data.data
+ list.forEach(element => {
+ if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
+ })
- that.data.fav_list = that.data.fav_list.concat(list)
- if (that.data.fav_list.length >= data.count) this.data.fav_page.next_page = 0
- else this.data.fav_page.next_page += 1
+ console.log(data, "0");
- that.setData({
- fav_list: that.data.fav_list,
- fav_page: this.data.fav_page,
- fav_count: data.count,
- loading: false,
- })
+ that.data.fav_list = that.data.fav_list.concat(list)
+ if (that.data.fav_list.length >= data.count) this.data.fav_page.next_page = 0
+ else this.data.fav_page.next_page += 1
- } else {
- wx.showModal({
- title: '提示',
- content: data.message,
- })
- }
- }).catch(res => {})
- },
- // 发布列表
- get_publish: function () {
- if (!app.globalData.config.lists) {
- return false
- }
- var that = this;
- if (that.data.publish_page.next_page == 0) {
- return false
- }
- this.setData({
- loading: true
- })
+ that.setData({
+ fav_list: that.data.fav_list,
+ fav_page: this.data.fav_page,
+ fav_count: data.count,
+ loading: false,
+ })
- // miucms.request(app.globalData.config.post.init, {
- miucms.request(`${app.globalData.baseURL}/tenement/my/releaseList`, {
- page: this.data.publish_page.next_page
- }).then(data => {
- wx.hideLoading()
- if (data.code == 401) {
- that.setData({
- isAuthorization: 1,
- loding: false,
- })
- return false
- }
- if (!data.extraparam) {
- data = data.data
- let list = data.data
- list.forEach(element => {
- if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
- })
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message,
+ })
+ }
+ }).catch(res => {})
+ },
+ // 发布列表
+ get_publish: function () {
+ if (!app.globalData.config.lists) {
+ return false
+ }
+ var that = this;
+ if (that.data.publish_page.next_page == 0) {
+ return false
+ }
+ this.setData({
+ loading: true
+ })
- that.data.publish_list = that.data.publish_list.concat(list);
- if (that.data.publish_list.length != 0 && that.data.publish_list.length == data.count) {
- this.data.publish_page.next_page = 0;
- } else {
- this.data.publish_page.next_page += 1;
- }
+ // miucms.request(app.globalData.config.post.init, {
+ miucms.request(`${app.globalData.baseURL}/tenement/my/releaseList`, {
+ page: this.data.publish_page.next_page
+ }).then(data => {
+ wx.hideLoading()
+ if (data.code == 401) {
+ that.setData({
+ isAuthorization: 1,
+ loding: false,
+ })
+ return false
+ }
+ if (!data.extraparam) {
+ data = data.data
+ let list = data.data
+ list.forEach(element => {
+ if (Array.isArray(element.rent)) element.rent = element.rent.join(' ~ ')
+ })
- that.setData({
- publish_list: that.data.publish_list,
- publish_page: that.data.publish_page,
- publish_count: data.count,
- loading: false,
- })
- } else {
- wx.showModal({
- title: '提示',
- content: data.message,
- })
- }
- }).catch(res => {
- wx.showModal({
- title: '提示',
- content: res,
- })
- })
- },
- add_to_fav: function (e) {
- let that = this;
- let uniqid = e.currentTarget.dataset.uniqid;
- let token = e.currentTarget.dataset.token;
- let index = e.currentTarget.dataset.index;
- miucms.request(app.globalData.config.collection.operation, {
- token: token,
- uniqid: uniqid
- }).then(data => {
- that.data.fav_list.splice(index, 1);
- that.setData({
- fav_count: data.data.user_count,
- fav_list: that.data.fav_list
- })
- wx.showToast({
- title: data.message,
- })
- }).catch(res => {})
+ that.data.publish_list = that.data.publish_list.concat(list);
+ if (that.data.publish_list.length != 0 && that.data.publish_list.length == data.count) {
+ this.data.publish_page.next_page = 0;
+ } else {
+ this.data.publish_page.next_page += 1;
+ }
- },
- // 删除帖子
- del_item: function (e) {
- let uniqid = e.currentTarget.dataset.uniqid;
- let token = e.currentTarget.dataset.token;
- let index = e.currentTarget.dataset.index;
- let that = this;
- wx.showModal({
- title: '提示',
- content: '确定删除吗？',
- success: function (res) {
- if (res.confirm === true) {
- wx.showLoading({
- title: '正在提交...',
- })
- miucms.request(app.globalData.config.post.delete, {
- token: token,
- uniqid: uniqid
- }).then(data => {
- wx.hideLoading()
- if (data.extraparam.mode == 'right') {
- // 成功
- that.data.publish_list.splice(index, 1);
- that.data.publish_count--;
- that.setData({
- publish_list: that.data.publish_list,
- publish_count: that.data.publish_count
- })
- wx.showToast({
- title: data.message,
- })
- } else {
- wx.showModal({
- title: '提示',
- content: data.message,
- })
- }
- }).catch(res => {
- wx.hideLoading()
- })
- }
- }
- })
- },
+ that.setData({
+ publish_list: that.data.publish_list,
+ publish_page: that.data.publish_page,
+ publish_count: data.count,
+ loading: false,
+ })
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message,
+ })
+ }
+ }).catch(res => {
+ wx.showModal({
+ title: '提示',
+ content: res,
+ })
+ })
+ },
+ add_to_fav: function (e) {
+ let that = this;
+ let uniqid = e.currentTarget.dataset.uniqid;
+ let token = e.currentTarget.dataset.token;
+ let index = e.currentTarget.dataset.index;
+ miucms.request(app.globalData.config.collection.operation, {
+ token: token,
+ uniqid: uniqid
+ }).then(data => {
+ that.data.fav_list.splice(index, 1);
+ that.setData({
+ fav_count: data.data.user_count,
+ fav_list: that.data.fav_list
+ })
+ wx.showToast({
+ title: data.message,
+ })
+ }).catch(res => {})
- bindcontact: function (re) {
+ },
+ // 删除帖子
+ del_item: function (e) {
+ let uniqid = e.currentTarget.dataset.uniqid;
+ let token = e.currentTarget.dataset.token;
+ let index = e.currentTarget.dataset.index;
+ let that = this;
+ wx.showModal({
+ title: '提示',
+ content: '确定删除吗？',
+ success: function (res) {
+ if (res.confirm === true) {
+ wx.showLoading({
+ title: '正在提交...',
+ })
+ miucms.request(app.globalData.config.post.delete, {
+ token: token,
+ uniqid: uniqid
+ }).then(data => {
+ wx.hideLoading()
+ if (data.extraparam.mode == 'right') {
+ // 成功
+ that.data.publish_list.splice(index, 1);
+ that.data.publish_count--;
+ that.setData({
+ publish_list: that.data.publish_list,
+ publish_count: that.data.publish_count
+ })
+ wx.showToast({
+ title: data.message,
+ })
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message,
+ })
+ }
+ }).catch(res => {
+ wx.hideLoading()
+ })
+ }
+ }
+ })
+ },
- },
- show_select: function (e) {
- var title = e.currentTarget.dataset.title;
- this.data.orderby.show = true;
- this.setData({
- orderby: this.data.orderby
- })
- },
- select_value: function (e) {
- var that = this;
- let change = true;
- let title = e.currentTarget.dataset.title;
- let value = e.currentTarget.dataset.value;
- let name = e.currentTarget.dataset.name;
- if (that.data[title].value == value) {
- change = false
- } else {
- that.data[title].value = value;
- that.data[title].name = name;
- }
- that.data[title].show = false;
- this.setData({
- orderby: this.data.orderby
- })
- if (change) {
- this.clear_data()
- }
- },
- clear_data: function () {
- this.setData({
- message_page: {
- next_page: 1
- },
- message_list: []
- })
- this.get_message()
- },
- // 留言列表
- get_message: function () {
- var that = this;
- if (!app.globalData.config.lists) {
- return false
- }
- if (that.data.message_page.next_page == 0) {
- return false
- }
- this.setData({
- loading: true
- })
- var sendData = Object.assign({}, this.data.options, {
- session: wx.getStorageSync('session'),
- page: that.data.message_page.next_page,
- order: that.data.orderby.value,
- q: that.data.q
- })
- miucms.request(app.globalData.config.message.lists, sendData, ).then(data => {
- wx.hideLoading()
- if (!data.extraparam) {
- that.data.message_list = that.data.message_list.concat(data.data);
- // that.data.user.newpm = data.newpm;
- that.setData({
- message_list: that.data.message_list,
- message_page: data.page,
- impression: data.impression,
- user: that.data.user,
- loading: false
- })
- app.globalData.user.newpm = data.newpm;
+ bindcontact: function (re) {
- } else {
- wx.showModal({
- title: '提示',
- content: data.message,
- })
- }
- }).catch(res => {})
- },
- show_more_item: function (e) {
- let that = this;
- let index = e.currentTarget.dataset.index;
- let show = that.data.message_list[index]['show_more'] ? false : true;
- that.data.message_list[index]['show_more'] = show;
- that.setData({
- message_list: that.data.message_list
- })
- },
- // 设置印象
- set_impression: function (e) {
- let that = this;
- that.data.impression_obj.index = e.currentTarget.dataset.i;
- that.data.impression_obj.impression = e.currentTarget.dataset.impression;
- that.data.impression_obj.uniqid = e.currentTarget.dataset.uniqid;
- that.data.impression_obj.show = true;
- that.data.del_obj.index = e.currentTarget.dataset.i;
- that.data.del_obj.uniqid = e.currentTarget.dataset.uniqid;
- that.data.del_obj.token = e.currentTarget.dataset.token;
- that.setData({
- impression_obj: that.data.impression_obj,
- del_obj: that.data.del_obj
- })
- },
- check_item: function (e) {
- var that = this;
- var impression = e.currentTarget.dataset.impression;
- that.data.impression_obj.impression = impression;
- that.setData({
- impression_obj: that.data.impression_obj
- })
- wx.showLoading({
- title: '数据提交中',
- })
- miucms.request(app.globalData.config.message.setimpression, {
- uniqid: that.data.impression_obj.uniqid,
- impression: that.data.impression_obj.impression
- }).then(data => {
- if (data.extraparam.mode == 'right') {
- that.data.impression_obj.show = false;
- that.data.message_list[that.data.impression_obj.index]['impression'] = impression;
- that.setData({
- impression_obj: that.data.impression_obj,
- message_list: that.data.message_list
- })
- }
- }).catch(res => {})
- },
- close_alert: function (e) {
- let that = this;
- that.data.impression_obj.show = false;
- that.data.del_obj.show = false;
- that.data.orderby.show = false;
- this.data.chage_status_obj.show = false;
- that.setData({
- impression_obj: that.data.impression_obj,
- del_obj: that.data.del_obj,
- orderby: that.data.orderby,
- chage_status_obj: that.data.chage_status_obj
- })
- },
- del_contacts_item: function (e) {
- let that = this;
- that.data.del_obj.index = e.currentTarget.dataset.i;
- that.data.del_obj.uniqid = e.currentTarget.dataset.uniqid;
- that.data.del_obj.token = e.currentTarget.dataset.token;
- that.data.del_obj.show = true;
- that.setData({
- del_obj: that.data.del_obj
- })
- },
- del_contacts: function (e) {
- let that = this;
- wx.showLoading({
- title: '数据提交中',
- })
- miucms.request(app.globalData.config.message.delete, {
- uniqid: that.data.del_obj.uniqid,
- token: that.data.del_obj.token
- }).then(data => {
- if (data.extraparam.mode == 'right') {
- that.data.del_obj.show = false;
- that.data.impression_obj.show = false;
- that.data.message_list.splice([that.data.del_obj.index], 1);
- that.setData({
- del_obj: that.data.del_obj,
- impression_obj: that.data.impression_obj,
- message_list: that.data.message_list
- })
- wx.showToast({
- title: data.message,
- })
- } else {
- wx.showModal({
- title: '提示',
- content: data.message,
- })
- }
+ },
+ show_select: function (e) {
+ var title = e.currentTarget.dataset.title;
+ this.data.orderby.show = true;
+ this.setData({
+ orderby: this.data.orderby
+ })
+ },
+ select_value: function (e) {
+ var that = this;
+ let change = true;
+ let title = e.currentTarget.dataset.title;
+ let value = e.currentTarget.dataset.value;
+ let name = e.currentTarget.dataset.name;
+ if (that.data[title].value == value) {
+ change = false
+ } else {
+ that.data[title].value = value;
+ that.data[title].name = name;
+ }
+ that.data[title].show = false;
+ this.setData({
+ orderby: this.data.orderby
+ })
+ if (change) {
+ this.clear_data()
+ }
+ },
+ clear_data: function () {
+ this.setData({
+ message_page: {
+ next_page: 1
+ },
+ message_list: []
+ })
+ this.get_message()
+ },
+ // 留言列表
+ get_message: function () {
+ var that = this;
+ if (!app.globalData.config.lists) {
+ return false
+ }
+ if (that.data.message_page.next_page == 0) {
+ return false
+ }
+ this.setData({
+ loading: true
+ })
+ var sendData = Object.assign({}, this.data.options, {
+ session: wx.getStorageSync('session'),
+ page: that.data.message_page.next_page,
+ order: that.data.orderby.value,
+ q: that.data.q
+ })
+ miucms.request(app.globalData.config.message.lists, sendData, ).then(data => {
+ wx.hideLoading()
+ if (!data.extraparam) {
+ that.data.message_list = that.data.message_list.concat(data.data);
+ // that.data.user.newpm = data.newpm;
+ that.setData({
+ message_list: that.data.message_list,
+ message_page: data.page,
+ impression: data.impression,
+ user: that.data.user,
+ loading: false
+ })
+ app.globalData.user.newpm = data.newpm;
- }).catch(res => {})
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message,
+ })
+ }
+ }).catch(res => {})
+ },
+ show_more_item: function (e) {
+ let that = this;
+ let index = e.currentTarget.dataset.index;
+ let show = that.data.message_list[index]['show_more'] ? false : true;
+ that.data.message_list[index]['show_more'] = show;
+ that.setData({
+ message_list: that.data.message_list
+ })
+ },
+ // 设置印象
+ set_impression: function (e) {
+ let that = this;
+ that.data.impression_obj.index = e.currentTarget.dataset.i;
+ that.data.impression_obj.impression = e.currentTarget.dataset.impression;
+ that.data.impression_obj.uniqid = e.currentTarget.dataset.uniqid;
+ that.data.impression_obj.show = true;
+ that.data.del_obj.index = e.currentTarget.dataset.i;
+ that.data.del_obj.uniqid = e.currentTarget.dataset.uniqid;
+ that.data.del_obj.token = e.currentTarget.dataset.token;
+ that.setData({
+ impression_obj: that.data.impression_obj,
+ del_obj: that.data.del_obj
+ })
+ },
+ check_item: function (e) {
+ var that = this;
+ var impression = e.currentTarget.dataset.impression;
+ that.data.impression_obj.impression = impression;
+ that.setData({
+ impression_obj: that.data.impression_obj
+ })
+ wx.showLoading({
+ title: '数据提交中',
+ })
+ miucms.request(app.globalData.config.message.setimpression, {
+ uniqid: that.data.impression_obj.uniqid,
+ impression: that.data.impression_obj.impression
+ }).then(data => {
+ if (data.extraparam.mode == 'right') {
+ that.data.impression_obj.show = false;
+ that.data.message_list[that.data.impression_obj.index]['impression'] = impression;
+ that.setData({
+ impression_obj: that.data.impression_obj,
+ message_list: that.data.message_list
+ })
+ }
+ }).catch(res => {})
+ },
+ close_alert: function (e) {
+ let that = this;
+ that.data.impression_obj.show = false;
+ that.data.del_obj.show = false;
+ that.data.orderby.show = false;
+ this.data.chage_status_obj.show = false;
+ that.setData({
+ impression_obj: that.data.impression_obj,
+ del_obj: that.data.del_obj,
+ orderby: that.data.orderby,
+ chage_status_obj: that.data.chage_status_obj
+ })
+ },
+ del_contacts_item: function (e) {
+ let that = this;
+ that.data.del_obj.index = e.currentTarget.dataset.i;
+ that.data.del_obj.uniqid = e.currentTarget.dataset.uniqid;
+ that.data.del_obj.token = e.currentTarget.dataset.token;
+ that.data.del_obj.show = true;
+ that.setData({
+ del_obj: that.data.del_obj
+ })
+ },
+ del_contacts: function (e) {
+ let that = this;
+ wx.showLoading({
+ title: '数据提交中',
+ })
+ miucms.request(app.globalData.config.message.delete, {
+ uniqid: that.data.del_obj.uniqid,
+ token: that.data.del_obj.token
+ }).then(data => {
+ if (data.extraparam.mode == 'right') {
+ that.data.del_obj.show = false;
+ that.data.impression_obj.show = false;
+ that.data.message_list.splice([that.data.del_obj.index], 1);
+ that.setData({
+ del_obj: that.data.del_obj,
+ impression_obj: that.data.impression_obj,
+ message_list: that.data.message_list
+ })
+ wx.showToast({
+ title: data.message,
+ })
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message,
+ })
+ }
- },
- send_form_id: function (e) {
- return false;
- miucms.request(app.globalData.config.FormidInsert, {
- formid: e.detail.formId
- }).then(data => {}).catch(res => {})
- },
+ }).catch(res => {})
- wxParseTagATap: function (e) {
- var url = e.currentTarget.dataset.src;
- wx.navigateTo({
- url: url,
- })
- },
- change_item_status: function (e) {
- let uniqid = e.currentTarget.dataset.uniqid;
- let token = e.currentTarget.dataset.token;
- let index = e.currentTarget.dataset.index;
- let status = e.currentTarget.dataset.status;
- this.setData({
- chage_status_obj: {
- show: true,
- uniqid: uniqid,
- token: token,
- index: index,
- status: status
- }
- })
- },
- change_status: function () {
- var that = this;
- wx.showLoading({
- title: '提交中',
- })
- miucms.request(app.globalData.config.post.status, {
- token: that.data.chage_status_obj.token,
- uniqid: that.data.chage_status_obj.uniqid,
- status: that.data.chage_status_obj.status == 1 ? 2 : 1
- }).then(data => {
- // if (data.extraparam.mode == 'right') {
- if (data.code == 200) {
- // 成功
- that.data.publish_list[that.data.chage_status_obj.index].status = data.data.status;
- that.data.chage_status_obj.show = false;
- that.setData({
- publish_list: that.data.publish_list,
- chage_status_obj: that.data.chage_status_obj
- })
- wx.showToast({
- title: data.message,
- })
- } else {
- wx.hideLoading()
- if (data.data && data.data.message) {
- // 触发规则是 不需要wx.showModal 但是 接口有data.message ，所以排除掉
- } else {
- wx.showModal({
- title: '提示',
- content: data.message
- })
- }
+ },
+ send_form_id: function (e) {
+ return false;
+ miucms.request(app.globalData.config.FormidInsert, {
+ formid: e.detail.formId
+ }).then(data => {}).catch(res => {})
+ },
- if (data.data && data.data.rule) {
- this.setData({
- triggerRules: data.data.rule,
- appealtoken: data.data.appealtoken
- })
- }
+ wxParseTagATap: function (e) {
+ var url = e.currentTarget.dataset.src;
+ wx.navigateTo({
+ url: url,
+ })
+ },
+ change_item_status: function (e) {
+ let uniqid = e.currentTarget.dataset.uniqid;
+ let token = e.currentTarget.dataset.token;
+ let index = e.currentTarget.dataset.index;
+ let status = e.currentTarget.dataset.status;
+ this.setData({
+ chage_status_obj: {
+ show: true,
+ uniqid: uniqid,
+ token: token,
+ index: index,
+ status: status
+ }
+ })
+ },
+ change_status: function () {
+ var that = this;
+ wx.showLoading({
+ title: '提交中',
+ })
+ miucms.request(app.globalData.config.post.status, {
+ token: that.data.chage_status_obj.token,
+ uniqid: that.data.chage_status_obj.uniqid,
+ status: that.data.chage_status_obj.status == 1 ? 2 : 1
+ }).then(data => {
+ // if (data.extraparam.mode == 'right') {
+ if (data.code == 200) {
+ // 成功
+ that.data.publish_list[that.data.chage_status_obj.index].status = data.data.status;
+ that.data.chage_status_obj.show = false;
+ that.setData({
+ publish_list: that.data.publish_list,
+ chage_status_obj: that.data.chage_status_obj
+ })
+ wx.showToast({
+ title: data.message,
+ })
+ } else {
+ wx.hideLoading()
+ if (data.data && data.data.message) {
+ // 触发规则是 不需要wx.showModal 但是 接口有data.message ，所以排除掉
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: data.message
+ })
+ }
- this.close_alert()
- }
- }).catch(res => {})
- },
- // 已租出提示
- have_rent_info: function () {
- wx.showModal({
- title: '提示',
- content: '该房源信息已出租或已失效',
- })
- },
- // 点击顶上去
- bindtopUp(e) {
- let token = e.currentTarget.dataset.token
- let index = e.currentTarget.dataset.index
- let isding = e.currentTarget.dataset.isding
- if (isding == 1) {
- this.setData({
- raisePopupMessage: "今天已顶过啦，明天再来吧！",
- raisePopupState: true,
- isdingState: 1
- })
- setTimeout(() => {
- this.setData({
- raisePopupState: false,
- })
- setTimeout(() => {
- this.setData({
- isdingState: 0
- })
- }, 500)
- }, 1500)
+ if (data.data && data.data.rule) {
+ this.setData({
+ triggerRules: data.data.rule,
+ appealtoken: data.data.appealtoken
+ })
+ }
- return
- }
- miucms.request(app.globalData.baseURL + "/tenement/post/ding", {
- token
- }).then(res => {
- if (res.code == 200) {
- if (isding == 0) {
- this.data.publish_list[index].isding = 1
- } else {
- this.data.publish_list[index].isding = 0
- }
- this.setData({
- raisePopupMessage: res.message,
- raisePopupState: true,
- publish_list: this.data.publish_list
- })
- setTimeout(() => {
- this.setData({
- raisePopupState: false
- })
- }, 1500)
- return
- }
- this.setData({
- raisePopupMessage: res.message,
- raisePopupState: true,
- isdingState: 1
- })
- setTimeout(() => {
- this.setData({
- raisePopupState: false,
- })
- setTimeout(() => {
- this.setData({
- isdingState: 0
- })
- }, 500)
- }, 1500)
- })
- },
+ this.close_alert()
+ }
+ }).catch(res => {})
+ },
+ // 已租出提示
+ have_rent_info: function () {
+ wx.showModal({
+ title: '提示',
+ content: '该房源信息已出租或已失效',
+ })
+ },
+ // 点击顶上去
+ bindtopUp(e) {
+ let token = e.currentTarget.dataset.token
+ let index = e.currentTarget.dataset.index
+ let isding = e.currentTarget.dataset.isding
+ if (isding == 1) {
+ this.setData({
+ raisePopupMessage: "今天已顶过啦，明天再来吧！",
+ raisePopupState: true,
+ isdingState: 1
+ })
+ setTimeout(() => {
+ this.setData({
+ raisePopupState: false,
+ })
+ setTimeout(() => {
+ this.setData({
+ isdingState: 0
+ })
+ }, 500)
+ }, 1500)
- // 撤销审核
- cancelAudit(e) {
- let that = this
- let {
- token,
- index
- } = e.currentTarget.dataset
- wx.showModal({
- title: '提示',
- content: '确认撤销审核？',
- success(res) {
- if (res.confirm) {
- miucms.request(app.globalData.baseURL + '/tenement/appeal/revoke', {
- token
- }).then(res => {
- if (res.code == 200) {
- that.data.publish_list[index].status = 0
- that.setData({
- publish_list: that.data.publish_list
- })
- wx.showToast({
- title: res.message,
- })
- } else if (res.code == 201) {
- wx.showModal({
- title: '提示',
- content: res.message
- })
- }
- })
- }
- }
- })
- },
- unreadMessagesalter(e) {
- if (this.data.isAuthorization == 1) {
- wx.showModal({
- title: '提示',
- content: "权限受限,请先授权"
- })
- return
- }
- wx.navigateTo({
- url: '/pages/messageCenter/messageCenter',
- success: () => {
- if (this.data.unreadMessages > 0) {
- this.setData({
- unreadMessages: 0
- })
- }
- app.globalData.unreadMessages = 0
- }
- })
- },
+ return
+ }
+ miucms.request(app.globalData.baseURL + "/tenement/post/ding", {
+ token
+ }).then(res => {
+ if (res.code == 200) {
+ if (isding == 0) {
+ this.data.publish_list[index].isding = 1
+ } else {
+ this.data.publish_list[index].isding = 0
+ }
+ this.setData({
+ raisePopupMessage: res.message,
+ raisePopupState: true,
+ publish_list: this.data.publish_list
+ })
+ setTimeout(() => {
+ this.setData({
+ raisePopupState: false
+ })
+ }, 1500)
+ return
+ }
+ this.setData({
+ raisePopupMessage: res.message,
+ raisePopupState: true,
+ isdingState: 1
+ })
+ setTimeout(() => {
+ this.setData({
+ raisePopupState: false,
+ })
+ setTimeout(() => {
+ this.setData({
+ isdingState: 0
+ })
+ }, 500)
+ }, 1500)
+ })
+ },
- // 跳转我要申述
- goAppeal() {
- wx.navigateTo({
- url: '/pages/appeal/appeal?appealtoken=' + this.data.appealtoken,
- })
- },
+ // 撤销审核
+ cancelAudit(e) {
+ let that = this
+ let {
+ token,
+ index
+ } = e.currentTarget.dataset
+ wx.showModal({
+ title: '提示',
+ content: '确认撤销审核？',
+ success(res) {
+ if (res.confirm) {
+ miucms.request(app.globalData.baseURL + '/tenement/appeal/revoke', {
+ token
+ }).then(res => {
+ if (res.code == 200) {
+ that.data.publish_list[index].status = 0
+ that.setData({
+ publish_list: that.data.publish_list
+ })
+ wx.showToast({
+ title: res.message,
+ })
+ } else if (res.code == 201) {
+ wx.showModal({
+ title: '提示',
+ content: res.message
+ })
+ }
+ })
+ }
+ }
+ })
+ },
+ unreadMessagesalter(e) {
+ if (this.data.isAuthorization == 1) {
+ wx.showModal({
+ title: '提示',
+ content: "权限受限,请先授权"
+ })
+ return
+ }
+ wx.navigateTo({
+ url: '/pages/messageCenter/messageCenter',
+ success: () => {
+ if (this.data.unreadMessages > 0) {
+ this.setData({
+ unreadMessages: 0
+ })
+ }
+ app.globalData.unreadMessages = 0
+ }
+ })
+ },
- // 点击关闭
- triggerRulesClose() {
- this.setData({
- triggerRules: 0
- })
- },
+ // 跳转我要申述
+ goAppeal() {
+ wx.navigateTo({
+ url: '/pages/appeal/appeal?appealtoken=' + this.data.appealtoken,
+ })
+ },
- // 上架触发规则2 弹窗点击下架房源
- goUser() {
- this.triggerRulesClose()
- },
- // 上架触发规则3 点击右上角叉叉
- WechatIDClose() {
- this.triggerRulesClose()
- },
+ // 点击关闭
+ triggerRulesClose() {
+ this.setData({
+ triggerRules: 0
+ })
+ },
- // 上架触发规则3中的图片预览
- methodPreview() {
- wx.previewImage({
- urls: ["https://oss.gter.net/attachment/Zvt57TuJSUvkyhw-xG7Y2l-T_pIqc3nqqsgFptxhXa6RWi26P-BuTQdCF7eV7tkb8MVYZjQ0Mjk~"],
- current: "https://oss.gter.net/attachment/Zvt57TuJSUvkyhw-xG7Y2l-T_pIqc3nqqsgFptxhXa6RWi26P-BuTQdCF7eV7tkb8MVYZjQ0Mjk~"
- })
- },
+ // 上架触发规则2 弹窗点击下架房源
+ goUser() {
+ this.triggerRulesClose()
+ },
+ // 上架触发规则3 点击右上角叉叉
+ WechatIDClose() {
+ this.triggerRulesClose()
+ },
- // 授权成功后需要处理的事件
- authorizationSuccess() {
- this.setData({
- initState: false
- })
- },
+ // 上架触发规则3中的图片预览
+ methodPreview() {
+ wx.previewImage({
+ urls: ["https://oss.gter.net/attachment/Zvt57TuJSUvkyhw-xG7Y2l-T_pIqc3nqqsgFptxhXa6RWi26P-BuTQdCF7eV7tkb8MVYZjQ0Mjk~"],
+ current: "https://oss.gter.net/attachment/Zvt57TuJSUvkyhw-xG7Y2l-T_pIqc3nqqsgFptxhXa6RWi26P-BuTQdCF7eV7tkb8MVYZjQ0Mjk~"
+ })
+ },
- // 跳转到认证 介绍
- goApprove() {
- let url = this.data.landlordcertification
- wx.navigateTo({
- url: `/pages/webViewwebweb/index?url=${url}`,
- })
- }
+ // 授权成功后需要处理的事件
+ authorizationSuccess() {
+ this.setData({
+ initState: false
+ })
+ },
+
+ // 跳转到认证 介绍
+ goApprove() {
+ let url = this.data.landlordcertification
+ wx.navigateTo({
+ url: `/pages/webViewwebweb/index?url=${url}`,
+ })
+ },
+
+ // 跳转修改头像和昵称页面
+ goSetAvatarNickname() {
+ wx.navigateTo({
+ url: '/pages/setAvatarNickname/setAvatarNickname',
+ })
+ },
+
+ // 判断是否 需要 跳转另一个的编辑
+ judgeEditSkip(e) {
+ console.log(e);
+ let url = e.currentTarget.dataset.url
+ let user = app.globalData['user']
+ let miniProgram = app.globalData['miniProgram']
+
+ if (miniProgram == 'gx') {
+ wx.navigateToMiniProgram({
+ appId: "wx9c68fbf7886ea9c4",
+ path: url
+ })
+ } else {
+ wx.navigateTo({
+ url
+ })
+ }
+
+ },
})
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 33e24e8..b84c65b 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -1,325 +1,335 @@
-
-
- {{ topTitle }}
-
+
+
+ {{ topTitle }}
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
- 收藏
-
-
-
- 发布
-
-
+
+
+
+
+
+ 收藏
+
+
+
+ 发布
+
+
-
- 共收藏 8 个房源
-
-
-
-
-
-
+
+ 共收藏 8 个房源
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
- 收藏
-
-
-
-
-
-
- 发布
-
-
+
+
+
+
+
+
+
+ 收藏
+
+
+
+
+
+
+ 发布
+
+
-
-
-
-
-
-
+
+ 已出租
+
+
+ 取消收藏
+
+
+
+
-
- 到底了
-
-
-
- 暂无收藏
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
- 该信息尚未发布
-
+
+
+
+ 该信息尚未发布
+
-
-
-
-
-
+
+
+
-
-
-
- 超出发布期限，已自动下架
-
+
+
+
+ 超出发布期限，已自动下架
+
-
-
-
-
-
-
+
+
+
+
-
- 房源ID：{{ item.id }}
-
-
- 删除
+
+
+
+
+ 该信息尚未发布
+
+
+
+
+ 房源ID：{{ item.id }}
+
+
+ 删除
-
- 编辑
-
- 编辑
- 下架
- 上架
- 顶上去
- 已顶
-
-
- 撤销审核
-
-
+
+
+ 编辑
+
+ 编辑
+ 下架
+ 上架
+ 顶上去
+ 已顶
+
+
+ 撤销审核
+
+
-
-
-
- 到底了
-
-
-
- 暂无发布
-
+
+
+ 到底了
+
+
+
+ 暂无发布
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
- {{chage_status_obj.status==2 ? '确定要重新发布该房源信息吗？' :'请关闭已出租或已失效的房源信息'}}
-
- {{chage_status_obj.status==2 ?'确定' :'关闭房源'}}
- 取消
-
-
-
-
+
+
+
+
+ {{chage_status_obj.status==2 ? '确定要重新发布该房源信息吗？' :'请关闭已出租或已失效的房源信息'}}
+
+ {{chage_status_obj.status==2 ?'确定' :'关闭房源'}}
+ 取消
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/pages/user/user.wxss b/pages/user/user.wxss
index 5937c03..b2b92ed 100644
--- a/pages/user/user.wxss
+++ b/pages/user/user.wxss
@@ -2,971 +2,987 @@
@import '../common/common.wxss';
.container {
- padding-bottom: 150rpx;
- position: relative;
+ padding-bottom: 150rpx;
+ position: relative;
}
.header {
- text-align: center;
- font-size: 27rpx;
- padding-bottom: 18rpx;
+ text-align: center;
+ font-size: 27rpx;
+ padding-bottom: 18rpx;
}
.header .info {
- display: flex;
- align-items: center;
- margin-left: 32rpx;
+ display: flex;
+ align-items: center;
+ margin-left: 32rpx;
}
.header .user-box .info-avatar {
- width: 90rpx;
- height: 90rpx;
- border-radius: 50%;
- display: block;
- border: 1rpx solid #fff;
+ width: 90rpx;
+ height: 90rpx;
+ border-radius: 50%;
+ display: block;
+ border: 1rpx solid #fff;
+
+}
+
+.header .user-box .info-camera {
+ width: 33rpx;
+ height: 33rpx;
+ border-radius: 50%;
+ background-color: rgba(225, 224, 255, 1);
+ position: absolute;
+ bottom: 0;
+ right: 0;
+}
+
+.header .user-box .info-camera-icon {
+ width: 27rpx;
+ height: 21rpx;
}
.header .user-info {
- margin-left: 16rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: flex-start;
- height: 65rpx;
+ margin-left: 16rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+ height: 65rpx;
}
.header .user-info .nickname {
- display: flex;
- align-items: center;
- color: #000;
+ display: flex;
+ align-items: center;
+ color: #000;
}
.header .user-box {
- width: 750rpx;
- /* height: 177rpx; */
- display: flex;
- justify-content: space-between;
- align-items: flex-end;
- padding-top: 87rpx;
- padding-bottom: 63rpx;
+ width: 750rpx;
+ /* height: 177rpx; */
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
+ padding-top: 87rpx;
+ padding-bottom: 63rpx;
}
.header .user-uid {
- font-size: 21rpx;
- color: #7f7f7f;
- margin-top: 8rpx;
+ font-size: 21rpx;
+ color: #7f7f7f;
+ margin-top: 8rpx;
}
.header .approve {
- width: 687rpx;
- height: 75rpx;
- border-radius: 13.5rpx;
- /* margin-top: 63rpx; */
- margin-bottom: 21rpx;
+ width: 687rpx;
+ height: 75rpx;
+ border-radius: 13.5rpx;
+ /* margin-top: 63rpx; */
+ margin-bottom: 21rpx;
}
.tab-box {
- border-top: 1px solid #d7d7d7;
- border-bottom: 1px solid #d7d7d7;
- /* border-top: 1px solid #e8e8e8;
+ border-top: 1px solid #d7d7d7;
+ border-bottom: 1px solid #d7d7d7;
+ /* border-top: 1px solid #e8e8e8;
border-bottom: 1px solid #e8e8e8; */
- font-size: 0;
- text-align: center;
- color: #999;
- display: flex;
- width: 100%;
- background: #eeeff3;
+ font-size: 0;
+ text-align: center;
+ color: #999;
+ display: flex;
+ width: 100%;
+ background: #eeeff3;
}
.tab {
- display: inline-flex;
- flex-direction: column;
- flex: 1;
- justify-content: space-between;
- align-items: center;
- width: 33%;
- font-size: 22rpx;
- position: relative;
- height: 150rpx;
- padding: 28rpx 0 22rpx;
- box-sizing: border-box;
+ display: inline-flex;
+ flex-direction: column;
+ flex: 1;
+ justify-content: space-between;
+ align-items: center;
+ width: 33%;
+ font-size: 22rpx;
+ position: relative;
+ height: 150rpx;
+ padding: 28rpx 0 22rpx;
+ box-sizing: border-box;
}
.tab .box {
- overflow: hidden;
- width: 100%;
- height: 100%;
- padding: 28rpx 0 24rpx;
- display: block;
- position: relative;
+ overflow: hidden;
+ width: 100%;
+ height: 100%;
+ padding: 28rpx 0 24rpx;
+ display: block;
+ position: relative;
}
.tab:not(:last-child) {
- border-right: 1px solid #e8e8e8;
+ border-right: 1px solid #e8e8e8;
}
.tab.active {
- color: #333;
+ color: #333;
}
.tab.active:after {
- content: '';
- position: absolute;
- display: block;
- bottom: -13rpx;
- border: 1px solid #e8e8e8;
- background: #fff;
- width: 20rpx;
- height: 20rpx;
- transform: rotateZ(45deg);
- left: calc(50% - 10rpx);
- border-right-color: transparent;
- border-bottom-color: transparent;
- z-index: 998;
+ content: '';
+ position: absolute;
+ display: block;
+ bottom: -13rpx;
+ border: 1px solid #e8e8e8;
+ background: #fff;
+ width: 20rpx;
+ height: 20rpx;
+ transform: rotateZ(45deg);
+ left: calc(50% - 10rpx);
+ border-right-color: transparent;
+ border-bottom-color: transparent;
+ z-index: 998;
}
.tab .star {
- width: 56rpx;
- height: 50rpx;
- display: block;
- margin: 0 auto 11rpx;
+ width: 56rpx;
+ height: 50rpx;
+ display: block;
+ margin: 0 auto 11rpx;
}
.tab .message {
- width: 54rpx;
- height: 51rpx;
- display: block;
- margin: 0rpx auto 11rpx;
+ width: 54rpx;
+ height: 51rpx;
+ display: block;
+ margin: 0rpx auto 11rpx;
}
.tab .publish {
- width: 58rpx;
- height: 52rpx;
- display: block;
- margin: 0 auto 10rpx;
+ width: 58rpx;
+ height: 52rpx;
+ display: block;
+ margin: 0 auto 10rpx;
}
.tab .new {
- color: #fff;
- background: #bc312e;
- transform: rotateZ(45deg);
- top: 10rpx;
- right: -30rpx;
- position: absolute;
- font-size: 26rpx;
- line-height: 28rpx;
- height: 30rpx;
- width: 110rpx;
+ color: #fff;
+ background: #bc312e;
+ transform: rotateZ(45deg);
+ top: 10rpx;
+ right: -30rpx;
+ position: absolute;
+ font-size: 26rpx;
+ line-height: 28rpx;
+ height: 30rpx;
+ width: 110rpx;
}
.item {
- border-bottom: 20rpx solid rgba(238, 239, 243, 1);
+ border-bottom: 20rpx solid rgba(238, 239, 243, 1);
}
.item .pengrey {
- width: 28rpx;
- height: 28rpx;
- vertical-align: middle;
+ width: 28rpx;
+ height: 28rpx;
+ vertical-align: middle;
}
.item .del {
- width: 28rpx;
- height: 30rpx;
- vertical-align: middle;
+ width: 28rpx;
+ height: 30rpx;
+ vertical-align: middle;
}
.item .table {
- border-top: 1px solid #e8e8e8
+ border-top: 1px solid #e8e8e8
}
.table {
- display: table;
- color: #ccc;
- font-size: 30rpx;
- line-height: 92rpx;
- text-align: center;
- width: 100%
+ display: table;
+ color: #ccc;
+ font-size: 30rpx;
+ line-height: 92rpx;
+ text-align: center;
+ width: 100%
}
.table .cell {
- display: table-cell;
- width: 33%;
+ display: table-cell;
+ width: 33%;
}
.table .cell:not(:last-child) {
- border-right: 1px solid #e8e8e8;
+ border-right: 1px solid #e8e8e8;
}
.info-list {
- border-bottom: none;
+ border-bottom: none;
}
.info-list .submit-form {
- padding: 50rpx 40rpx 40rpx;
- display: block;
+ padding: 50rpx 40rpx 40rpx;
+ display: block;
}
.house-id {
- padding: 0rpx 40rpx 20rpx;
- color: #ccc;
- font-size: 24rpx;
+ padding: 0rpx 40rpx 20rpx;
+ color: #ccc;
+ font-size: 24rpx;
}
.nocontent {
- text-align: center;
- font-size: 28rpx;
- padding: 200rpx 0 0;
- color: #999
+ text-align: center;
+ font-size: 28rpx;
+ padding: 200rpx 0 0;
+ color: #999
}
.file {
- width: 40rpx;
- height: 46rpx;
- display: block;
- margin: 0 auto 20rpx;
+ width: 40rpx;
+ height: 46rpx;
+ display: block;
+ margin: 0 auto 20rpx;
}
.publish_tips {
- color: #999;
- display: flex;
- align-items: center;
+ color: #999;
+ display: flex;
+ align-items: center;
}
.publish_tips image {
- display: inline-flex;
- flex: 0 0 36rpx;
- width: 36rpx;
- height: 36rpx;
- vertical-align: middle;
- margin-right: 6rpx;
+ display: inline-flex;
+ flex: 0 0 36rpx;
+ width: 36rpx;
+ height: 36rpx;
+ vertical-align: middle;
+ margin-right: 6rpx;
}
.contact {
- background-color: #f2f2f2;
- height: 54rpx;
- line-height: 54rpx;
- border-radius: 50rpx 0 0 50rpx;
- border: none;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 0 10rpx 0 20rpx;
- font-size: 21rpx;
- color: #555;
- z-index: 100;
- margin: 0;
- margin-bottom: 18rpx;
+ background-color: #f2f2f2;
+ height: 54rpx;
+ line-height: 54rpx;
+ border-radius: 50rpx 0 0 50rpx;
+ border: none;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 0 10rpx 0 20rpx;
+ font-size: 21rpx;
+ color: #555;
+ z-index: 100;
+ margin: 0;
+ margin-bottom: 18rpx;
}
.contact::after {
- border: none;
+ border: none;
}
/* 认证房源 */
.header .authentication-icon {
- width: 125rpx;
- height: 30rpx;
- border-radius: unset;
- border: none;
- margin-left: 10rpx;
+ width: 125rpx;
+ height: 30rpx;
+ border-radius: unset;
+ border: none;
+ margin-left: 10rpx;
}
.contact .contact-icon {
- width: 24rpx;
- height: 24rpx;
- margin: 0;
- margin-right: 8rpx;
+ width: 24rpx;
+ height: 24rpx;
+ margin: 0;
+ margin-right: 8rpx;
}
/*messages */
.select-bar {
- text-align: center;
- color: #999;
- padding: 40rpx 0;
- border-bottom: 1px solid #e8e8e8;
+ text-align: center;
+ color: #999;
+ padding: 40rpx 0;
+ border-bottom: 1px solid #e8e8e8;
}
.select-bar .tobottom {
- margin-left: 10rpx;
- display: inline-block;
- vertical-align: middle;
+ margin-left: 10rpx;
+ display: inline-block;
+ vertical-align: middle;
}
.messages .item {
- border-bottom: 1px solid #e8e8e8;
- font-size: 0;
+ border-bottom: 1px solid #e8e8e8;
+ font-size: 0;
}
.messages .item .submit-form {
- padding: 40rpx 0 70rpx 26rpx;
+ padding: 40rpx 0 70rpx 26rpx;
}
.messages .item .l {
- display: inline-block;
- width: 108rpx;
- vertical-align: top;
- position: relative;
+ display: inline-block;
+ width: 108rpx;
+ vertical-align: top;
+ position: relative;
}
.messages .item .l .avatar {
- width: 80rpx;
- height: 80rpx;
- border-radius: 5px;
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 5px;
}
.messages .item .l .count {
- position: absolute;
- left: 62rpx;
- top: -18rpx;
- background: #bc312e;
- color: #fff;
- font-size: 26rpx;
- line-height: 36rpx;
- height: 36rpx;
- border-radius: 50%;
- min-width: 36rpx;
- text-align: center;
- padding: 0 8rpx;
+ position: absolute;
+ left: 62rpx;
+ top: -18rpx;
+ background: #bc312e;
+ color: #fff;
+ font-size: 26rpx;
+ line-height: 36rpx;
+ height: 36rpx;
+ border-radius: 50%;
+ min-width: 36rpx;
+ text-align: center;
+ padding: 0 8rpx;
}
.messages .item .r {
- display: inline-block;
- width: calc(100% - 108rpx);
- vertical-align: top;
- position: relative
+ display: inline-block;
+ width: calc(100% - 108rpx);
+ vertical-align: top;
+ position: relative
}
.messages .item .r .name {
- font-size: 30rpx;
- color: #333;
- margin-bottom: 10rpx
+ font-size: 30rpx;
+ color: #333;
+ margin-bottom: 10rpx
}
.messages .item .r .info {
- color: #ccc;
- font-size: 26rpx;
+ color: #ccc;
+ font-size: 26rpx;
}
.messages .item .r .right-box {
- position: absolute;
- right: 0;
- top: 0;
- z-index: 1000;
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 1000;
}
.messages .item .impression {
- width: 200rpx;
- height: 70rpx;
- position: relative;
- top: -8rpx;
- padding-top: 8rpx;
+ width: 200rpx;
+ height: 70rpx;
+ position: relative;
+ top: -8rpx;
+ padding-top: 8rpx;
}
.messages .item .impression .grey-inner {
- background: #fff;
- color: #999;
- font-size: 26rpx;
- width: 174rpx;
- height: 54rpx;
- line-height: 54rpx;
- background: #f2f2f2;
- border-radius: 5px;
- padding: 0 20rpx;
- position: relative;
+ background: #fff;
+ color: #999;
+ font-size: 26rpx;
+ width: 174rpx;
+ height: 54rpx;
+ line-height: 54rpx;
+ background: #f2f2f2;
+ border-radius: 5px;
+ padding: 0 20rpx;
+ position: relative;
}
.messages .item .impression .tobottom {
- position: absolute;
- right: 20rpx;
- top: 22rpx;
+ position: absolute;
+ right: 20rpx;
+ top: 22rpx;
}
.messages .item .play {
- min-height: 70rpx;
- min-width: 100rpx;
- padding-right: 26rpx;
- padding-top: 26rpx;
- position: relative;
- top: -26rpx;
+ min-height: 70rpx;
+ min-width: 100rpx;
+ padding-right: 26rpx;
+ padding-top: 26rpx;
+ position: relative;
+ top: -26rpx;
}
.moreplay {
- width: 32rpx;
- height: 10rpx;
- float: right;
+ width: 32rpx;
+ height: 10rpx;
+ float: right;
}
.content-list {
- padding: 30rpx 60rpx 0 0;
- font-size: 28rpx;
- color: #999;
+ padding: 30rpx 60rpx 0 0;
+ font-size: 28rpx;
+ color: #999;
}
.content-list .li {
- margin-bottom: 20rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
+ margin-bottom: 20rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.content-list .li .disc {
- cotent: '•';
- display: inline-block;
- margin-right: 10rpx;
+ cotent: '•';
+ display: inline-block;
+ margin-right: 10rpx;
}
.show_more {
- text-align: center;
- padding: 10rpx 0 10rpx;
+ text-align: center;
+ padding: 10rpx 0 10rpx;
}
.arr-bottom {
- width: 32rpx;
- height: 18rpx;
- position: relative;
- left: -40rpx;
+ width: 32rpx;
+ height: 18rpx;
+ position: relative;
+ left: -40rpx;
}
.arr-bottom.rollback {
- transform: rotateZ(180deg)
+ transform: rotateZ(180deg)
}
/*弹窗 */
.impression-box {
- position: fixed;
- left: 0;
- top: 0;
- width: 100vw;
- height: 100vh;
- z-index: 100000;
- background: rgba(0, 0, 0, 0.4);
- padding-bottom: 40rpx;
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ z-index: 100000;
+ background: rgba(0, 0, 0, 0.4);
+ padding-bottom: 40rpx;
}
.impression-box .black {
- height: 80vh;
+ height: 80vh;
}
.impression-box .box {
- background: #fff;
- text-align: center;
- font-size: 30rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100vw;
- padding-bottom: 40rpx;
+ background: #fff;
+ text-align: center;
+ font-size: 30rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100vw;
+ padding-bottom: 40rpx;
}
.impression-box .tips {
- line-height: 160rpx;
+ line-height: 160rpx;
}
.impression-box .label {
- width: 520rpx;
- height: 92rpx;
- line-height: 92rpx;
- border: 1px solid #e8e8e8;
- border-radius: 5px;
- position: relative;
- margin: 0 auto 20rpx;
+ width: 520rpx;
+ height: 92rpx;
+ line-height: 92rpx;
+ border: 1px solid #e8e8e8;
+ border-radius: 5px;
+ position: relative;
+ margin: 0 auto 20rpx;
}
.impression-box .label.active {
- background: #62B1FE;
- color: #fff;
- border-color: #62B1FE;
+ background: #62B1FE;
+ color: #fff;
+ border-color: #62B1FE;
}
.impression-box .label image {
- width: 36rpx;
- height: 36rpx;
- position: absolute;
- left: 26rpx;
- top: 28rpx;
+ width: 36rpx;
+ height: 36rpx;
+ position: absolute;
+ left: 26rpx;
+ top: 28rpx;
}
.impression-box .bottom {
- padding: 44rpx 0 80rpx;
- border-top: 1px solid #e8e8e8;
- margin-top: 30rpx;
+ padding: 44rpx 0 80rpx;
+ border-top: 1px solid #e8e8e8;
+ margin-top: 30rpx;
}
.impression-box .btn {
- background: #fff;
- color: #C63E3A;
- border: 1px solid #e8e8e8;
- border-radius: 5px;
- width: 520rpx;
- height: 92rpx;
- line-height: 92rpx;
- margin: 0 auto 40rpx;
+ background: #fff;
+ color: #C63E3A;
+ border: 1px solid #e8e8e8;
+ border-radius: 5px;
+ width: 520rpx;
+ height: 92rpx;
+ line-height: 92rpx;
+ margin: 0 auto 40rpx;
}
.impression-box .btn image {
- width: 32rpx;
- height: 34rpx;
- display: inline-block;
- margin-right: 6rpx;
- position: relative;
- top: 6rpx;
+ width: 32rpx;
+ height: 34rpx;
+ display: inline-block;
+ margin-right: 6rpx;
+ position: relative;
+ top: 6rpx;
}
.impression-box .btn-black {
- color: #333;
+ color: #333;
}
.divide {
- color: #e8e8e8;
- display: inline-block;
- margin: 0 20rpx;
- font-size: 26rpx;
+ color: #e8e8e8;
+ display: inline-block;
+ margin: 0 20rpx;
+ font-size: 26rpx;
}
.item {
- position: relative
+ position: relative
}
.is_rent_btn {
- position: absolute;
- right: 30rpx;
- bottom: 68rpx;
- color: #bc312e;
- border: 6rpx solid #bc312e;
- border-radius: 5px;
- line-height: 52rpx;
- height: 66rpx;
- width: 138rpx;
- font-weight: bold;
- font-size: 32rpx;
- text-align: center;
- transform: rotate(322deg);
- box-sizing: border-box;
+ position: absolute;
+ right: 30rpx;
+ bottom: 68rpx;
+ color: #bc312e;
+ border: 6rpx solid #bc312e;
+ border-radius: 5px;
+ line-height: 52rpx;
+ height: 66rpx;
+ width: 138rpx;
+ font-weight: bold;
+ font-size: 32rpx;
+ text-align: center;
+ transform: rotate(322deg);
+ box-sizing: border-box;
}
.eye-close {
- width: 32rpx;
- height: 24rpx;
- vertical-align: middle;
- position: relative;
- top: -2rpx;
+ width: 32rpx;
+ height: 24rpx;
+ vertical-align: middle;
+ position: relative;
+ top: -2rpx;
}
.eye-open {
- width: 32rpx;
- height: 20rpx;
- vertical-align: middle;
- position: relative;
- top: -4rpx;
+ width: 32rpx;
+ height: 20rpx;
+ vertical-align: middle;
+ position: relative;
+ top: -4rpx;
}
.chage-status-box {
- position: fixed;
- left: 0;
- top: 0;
- width: 100vw;
- height: 100vh;
- z-index: 100000;
- background: rgba(0, 0, 0, 0.4);
- padding-bottom: 40rpx;
- text-align: center;
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ z-index: 100000;
+ background: rgba(0, 0, 0, 0.4);
+ padding-bottom: 40rpx;
+ text-align: center;
}
.chage-status-box .black {
- height: 80vh;
+ height: 80vh;
}
.chage-status-box .box {
- background: #fff;
- text-align: center;
- font-size: 30rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100vw;
- padding: 80rpx 0 130rpx;
+ background: #fff;
+ text-align: center;
+ font-size: 30rpx;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100vw;
+ padding: 80rpx 0 130rpx;
}
.chage-status-box .box .btn-box {
- margin: 100rpx 60rpx 0;
- font-size: 0;
+ margin: 100rpx 60rpx 0;
+ font-size: 0;
}
.chage-status-box .box .btn-box view {
- display: inline-block;
- width: calc(50% - 15rpx);
- height: 92rpx;
- line-height: 88rpx;
- border-radius: 10rpx;
- background: #bc312e;
- border: 1px solid #bc312e;
- color: #fff;
- font-size: 30rpx;
- box-sizing: border-box;
+ display: inline-block;
+ width: calc(50% - 15rpx);
+ height: 92rpx;
+ line-height: 88rpx;
+ border-radius: 10rpx;
+ background: #bc312e;
+ border: 1px solid #bc312e;
+ color: #fff;
+ font-size: 30rpx;
+ box-sizing: border-box;
}
.chage-status-box .box .btn-box .cle {
- margin-left: 20rpx;
- border-color: #e8e8e8;
- color: #333;
- background: #fff;
+ margin-left: 20rpx;
+ border-color: #e8e8e8;
+ color: #333;
+ background: #fff;
}
.close-btn {
- display: inline-block;
- background: #333;
- color: #fff;
- padding: 4rpx 6rpx;
- font-size: 20rpx;
- border-radius: 6rpx;
- line-height: 20rpx;
+ display: inline-block;
+ background: #333;
+ color: #fff;
+ padding: 4rpx 6rpx;
+ font-size: 20rpx;
+ border-radius: 6rpx;
+ line-height: 20rpx;
}
.operation {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- padding: 20rpx 40rpx 50rpx;
- font-size: 24rpx;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ padding: 20rpx 40rpx 50rpx;
+ font-size: 24rpx;
}
.operation .operation-item:not(:first-child) {
- margin-left: 30rpx;
+ margin-left: 30rpx;
}
.operation .operation-item {
- border-radius: 10rpx;
- border: 2rpx solid #aaa;
- padding: 0 25rpx;
- height: 45rpx;
- line-height: 45rpx;
- color: #555;
+ border-radius: 10rpx;
+ border: 2rpx solid #aaa;
+ padding: 0 25rpx;
+ height: 45rpx;
+ line-height: 45rpx;
+ color: #555;
}
.operation .operation-item.blue {
- background-color: #62b1ff;
- color: #fff;
- border-color: #62b1ff;
- width: 130rpx;
- text-align: center;
+ background-color: #62b1ff;
+ color: #fff;
+ border-color: #62b1ff;
+ width: 130rpx;
+ text-align: center;
}
.operation .operation-item.thinblue {
- background-color: #62b1ff32;
- color: #4E90CC;
- border-color: #62b1ff32;
- width: 130rpx;
- text-align: center;
+ background-color: #62b1ff32;
+ color: #4E90CC;
+ border-color: #62b1ff32;
+ width: 130rpx;
+ text-align: center;
}
.caution {
- width: 30rpx;
- height: 30rpx;
- line-height: 30rpx;
- border-radius: 50rpx;
- background-color: #c54235;
- margin-right: 10rpx;
- display: flex;
- justify-content: center;
- align-items: center;
+ width: 30rpx;
+ height: 30rpx;
+ line-height: 30rpx;
+ border-radius: 50rpx;
+ background-color: #c54235;
+ margin-right: 10rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.caution .caution-baitiao {
- background-color: #fff;
- width: 16rpx;
- height: 4rpx;
+ background-color: #fff;
+ width: 16rpx;
+ height: 4rpx;
}
.raise-popup {
- height: 90rpx;
- line-height: 90rpx;
- padding: 0 30rpx;
- display: inline-table;
- align-items: center;
- box-shadow: 0px 0px 10px rgb(0 0 0 / 35%);
- background-color: #eff7ff;
- border-radius: 50rpx;
- position: fixed;
- bottom: -90rpx;
- left: 50%;
- transform: translate(-50%);
- /* transform: translateY(20px); */
- transition: all .5s linear;
+ height: 90rpx;
+ line-height: 90rpx;
+ padding: 0 30rpx;
+ display: inline-table;
+ align-items: center;
+ box-shadow: 0px 0px 10px rgb(0 0 0 / 35%);
+ background-color: #eff7ff;
+ border-radius: 50rpx;
+ position: fixed;
+ bottom: -90rpx;
+ left: 50%;
+ transform: translate(-50%);
+ /* transform: translateY(20px); */
+ transition: all .5s linear;
}
.raise-popup .raise-popup-icon {
- width: 30rpx;
- height: 30rpx;
- vertical-align: text-bottom;
- margin-right: 10rpx;
+ width: 30rpx;
+ height: 30rpx;
+ vertical-align: text-bottom;
+ margin-right: 10rpx;
}
.container .raisePopup {
- bottom: 200rpx;
+ bottom: 200rpx;
}
.NavBar {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- background: #fff;
- z-index: 1000;
- border-bottom: 1px solid #f2f2f2;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ background: #fff;
+ z-index: 1000;
+ border-bottom: 1px solid #f2f2f2;
}
.NavBar-statusBar {
- width: 100%;
+ width: 100%;
}
.NavBar-titlebar {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.NavBar-content {
- display: flex;
- flex: 1;
- margin: 0;
- overflow: hidden;
+ display: flex;
+ flex: 1;
+ margin: 0;
+ overflow: hidden;
}
.NavBar-left {
- width: 55px;
- height: 32px;
- border-radius: 32px;
- text-align: center;
- display: flex;
- align-items: center;
+ width: 55px;
+ height: 32px;
+ border-radius: 32px;
+ text-align: center;
+ display: flex;
+ align-items: center;
}
.NavBar-left-more {
- width: 87px;
- height: 32px;
- display: flex;
+ width: 87px;
+ height: 32px;
+ display: flex;
}
.capsule-holder {
- width: 100px;
- height: 100%;
+ width: 100px;
+ height: 100%;
}
.NavBar-content-title {
- font-size: 17px;
- font-weight: 600;
- flex: 1;
- text-align: center;
- line-height: 32px;
- height: 32px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- padding-left: 11px;
+ font-size: 17px;
+ font-weight: 600;
+ flex: 1;
+ text-align: center;
+ line-height: 32px;
+ height: 32px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ padding-left: 11px;
}
/* 到底了 */
.whether {
- font-size: 25rpx;
- color: #AAAAAA;
- text-align: center;
- padding-top: 20rpx;
- height: 70rpx;
- line-height: 70rpx;
- margin-bottom: 20rpx;
+ font-size: 25rpx;
+ color: #AAAAAA;
+ text-align: center;
+ padding-top: 20rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ margin-bottom: 20rpx;
}
.info-list .title {
- word-break: break-all;
+ word-break: break-all;
}
.authentication-icon {
- width: 125rpx;
- height: 28rpx;
+ width: 125rpx;
+ height: 28rpx;
}
.header-new {
- background: linear-gradient(21.8146326062447deg, rgba(224, 240, 255, 1) 21%, rgba(98, 177, 255, 1) 141%);
- padding-top: 253.5rpx;
- padding-bottom: 50rpx;
+ background: linear-gradient(21.8146326062447deg, rgba(224, 240, 255, 1) 21%, rgba(98, 177, 255, 1) 141%);
+ padding-top: 253.5rpx;
+ padding-bottom: 50rpx;
}
.header-new .header-message {
- justify-content: space-between;
+ justify-content: space-between;
}
.header-new .header-message .header-user-message {
- z-index: 2;
+ z-index: 2;
}
.header-new .header-message .header-user-info {
- color: #000000;
- flex-direction: column;
- margin-left: 18rpx;
+ color: #000000;
+ flex-direction: column;
+ margin-left: 18rpx;
}
.header-new .header-message .header-user-name {
- font-size: 30rpx;
- height: 48rpx;
+ font-size: 30rpx;
+ height: 48rpx;
}
.header-new .header-message .header-user-uid {
- font-size: 24rpx;
- height: 39rpx;
+ font-size: 24rpx;
+ height: 39rpx;
}
.header-new .header-user-avatar {
- width: 90rpx;
- height: 90rpx;
- margin-left: 33rpx;
+ width: 90rpx;
+ height: 90rpx;
+ margin-left: 33rpx;
}
.header-new .header-user-avatar .header-user-avatar-icon {
- border-radius: 50%;
- width: 100%;
- height: 100%;
+ border-radius: 50%;
+ width: 100%;
+ height: 100%;
}
.header-new .header-btn {
- width: 690rpx;
- height: 180rpx;
- margin: 63rpx auto 0;
- background-color: rgba(255, 255, 255, 0.3);
- border-radius: 20rpx;
+ width: 690rpx;
+ height: 180rpx;
+ margin: 63rpx auto 0;
+ background-color: rgba(255, 255, 255, 0.3);
+ border-radius: 20rpx;
}
.header-new .header-btn .header-btn-item {
- flex-direction: column;
+ flex-direction: column;
}
.header-new .header-btn .header-btn-item:first-of-type {
- border-right: 2rpx solid #cbe5ff;
+ border-right: 2rpx solid #cbe5ff;
}
.header-new .header-btn .message-reminding .header-btn-icon {
- width: 48rpx;
- height: 42rpx;
+ width: 48rpx;
+ height: 42rpx;
}
.header-new .header-btn .message-reminding {
- width: 60rpx;
- height: 60rpx;
- border-radius: 12rpx;
- background-color: rgba(80, 227, 194, 1);
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 12rpx;
+ background-color: rgba(80, 227, 194, 1);
}
.header-new .header-btn .header-btn-text {
- font-size: 24rpx;
- color: #555555;
- margin-top: 12rpx;
+ font-size: 24rpx;
+ color: #555555;
+ margin-top: 12rpx;
}
.header-new .header-btn .issue-housing {
- width: 60rpx;
- height: 60rpx;
- background-color: rgba(253, 223, 109, 1);
- border-radius: 50%;
+ width: 60rpx;
+ height: 60rpx;
+ background-color: rgba(253, 223, 109, 1);
+ border-radius: 50%;
}
.header-new .header-btn .issue-housing .header-btn-icon {
- width: 24rpx;
- height: 24rpx;
+ width: 24rpx;
+ height: 24rpx;
}
.round1 {
- width: 378rpx;
- height: 378rpx;
- background-color: rgba(255, 255, 255, 0.2);
- border-radius: 50%;
- position: absolute;
- top: -99rpx;
- left: -140rpx;
- z-index: 1;
+ width: 378rpx;
+ height: 378rpx;
+ background-color: rgba(255, 255, 255, 0.2);
+ border-radius: 50%;
+ position: absolute;
+ top: -99rpx;
+ left: -140rpx;
+ z-index: 1;
}
.round2 {
- width: 396rpx;
- height: 396rpx;
- background-color: rgba(255, 255, 255, 0.2);
- border-radius: 50%;
- position: absolute;
- right: -106rpx;
- top: -198rpx;
+ width: 396rpx;
+ height: 396rpx;
+ background-color: rgba(255, 255, 255, 0.2);
+ border-radius: 50%;
+ position: absolute;
+ right: -106rpx;
+ top: -198rpx;
}
.list-new {
- margin-top: -14rpx;
- position: relative;
- z-index: 11;
+ margin-top: -14rpx;
+ position: relative;
+ z-index: 11;
}
.list-new .list-new-top {
- height: 95rpx;
- font-size: 30rpx;
- font-weight: 650;
- color: #fff;
- position: relative;
- align-items: flex-end;
+ height: 95rpx;
+ font-size: 30rpx;
+ font-weight: 650;
+ color: #fff;
+ position: relative;
+ align-items: flex-end;
}
.list-new .list-new-top .list-new-top-bg {
- position: absolute;
- background-color: rgba(98, 177, 255, 1);
- bottom: 0;
- width: 100%;
- height: 111rpx;
- z-index: -1;
- border-radius: 20rpx 20rpx 0 0;
+ position: absolute;
+ background-color: rgba(98, 177, 255, 1);
+ bottom: 0;
+ width: 100%;
+ height: 111rpx;
+ z-index: -1;
+ border-radius: 20rpx 20rpx 0 0;
}
.list-new .list-new-top .list-new-top-item {
- width: 375rpx;
- height: 111rpx;
+ width: 375rpx;
+ height: 111rpx;
}
.list-new .list-new-top .list-new-top-item.selected {
- height: 125rpx;
- background-color: #f6f6f6;
- color: #000;
- border-radius: 0 25rpx 0 0;
+ height: 125rpx;
+ background-color: #f6f6f6;
+ color: #000;
+ border-radius: 0 25rpx 0 0;
}
.list-new .list-new-top .list-new-top-icon {
- width: 36rpx;
- height: 36rpx;
- margin-right: 6rpx;
+ width: 36rpx;
+ height: 36rpx;
+ margin-right: 6rpx;
}
.list-new .list-new-content {
- background-color: #f6f6f6;
- width: 100%;
- border-radius: 0 20rpx 0 0;
- padding-top: 35rpx;
+ background-color: #f6f6f6;
+ width: 100%;
+ border-radius: 0 20rpx 0 0;
+ padding-top: 35rpx;
}
.list-new .list-new-content .list-new-content-total {
- font-size: 23rpx;
- color: #555555;
- padding: 0 30rpx;
- margin-bottom: 30rpx;
+ font-size: 23rpx;
+ color: #555555;
+ padding: 0 30rpx;
+ margin-bottom: 30rpx;
}
.list-new .list-new-content .list-new-content-total .list-new-content-total-num {
- font-weight: 650;
- color: #000000;
- margin: 0 15rpx;
+ font-weight: 650;
+ color: #000000;
+ margin: 0 15rpx;
}
.list-new .list-new-content .list-new-content-item {
- margin-bottom: 24rpx;
+ margin-bottom: 24rpx;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index aee61c0..e6d171b 100644
--- a/project.config.json
+++ b/project.config.json
@@ -38,11 +38,12 @@
"showES6CompileOption": false,
"useCompilerPlugins": false,
"useStaticServer": true,
- "ignoreUploadUnusedFiles": true
+ "ignoreUploadUnusedFiles": true,
+ "condition": false
},
"compileType": "miniprogram",
- "libVersion": "2.31.1",
- "appid": "wxcf0a799771cf2ae6",
+ "libVersion": "2.32.0",
+ "appid": "wx9c68fbf7886ea9c4",
"projectname": "%E5%AF%84%E6%89%98%E7%A7%9F%E6%88%BF",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
diff --git a/template/fixFooter/fixFooter.js b/template/fixFooter/fixFooter.js
index a13e6c6..6ea428d 100644
--- a/template/fixFooter/fixFooter.js
+++ b/template/fixFooter/fixFooter.js
@@ -1,31 +1,61 @@
// template/fixFooter/fixFooter.js
let app = getApp()
Component({
- /**
- * 组件的属性列表
- */
- properties: {
- user: Number,
- unreadMessages: {
- type: Number,
- value:0
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ user: Number,
+ unreadMessages: {
+ type: Number,
+ value: 0
+ },
+ bottomLift: {
+ type: Number
+ }
},
- bottomLift: {
- type: Number
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ // unreadMessages: 0
+ isAuthorization: 0,
+ },
+
+ lifetimes: {},
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ // 处理发布房源
+ handleIssue() {
+ let user = app.globalData['user']
+ let miniProgram = app.globalData['miniProgram']
+
+ if (user['uid']) {
+ if (!user['nickname']) {
+ wx.navigateTo({
+ url: '/pages/setAvatarNickname/setAvatarNickname',
+ })
+ return
+ }
+ if (miniProgram == 'gx') {
+ wx.navigateToMiniProgram({
+ appId: "wx9c68fbf7886ea9c4",
+ path: "/pages/edit/edit"
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/edit/edit',
+ })
+ }
+ } else {
+ this.setData({
+ isAuthorization: 1
+ })
+ }
+ }
}
- },
-
- /**
- * 组件的初始数据
- */
- data: {
- // unreadMessages: 0
- },
-
- lifetimes: {},
-
- /**
- * 组件的方法列表
- */
- methods: {}
})
\ No newline at end of file
diff --git a/template/fixFooter/fixFooter.json b/template/fixFooter/fixFooter.json
index e8cfaaf..687d03f 100644
--- a/template/fixFooter/fixFooter.json
+++ b/template/fixFooter/fixFooter.json
@@ -1,4 +1,6 @@
{
- "component": true,
- "usingComponents": {}
+ "component": true,
+ "usingComponents": {
+ "go-login": "/template/goLogin/goLogin"
+ }
}
\ No newline at end of file
diff --git a/template/fixFooter/fixFooter.wxml b/template/fixFooter/fixFooter.wxml
index 39dc386..6204d72 100644
--- a/template/fixFooter/fixFooter.wxml
+++ b/template/fixFooter/fixFooter.wxml
@@ -1,55 +1,40 @@
-
-
-
-
-
-
-
-
-
- 发布房源
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/template/listOperations/listOperations.js b/template/listOperations/listOperations.js
index 8626704..fefd119 100644
--- a/template/listOperations/listOperations.js
+++ b/template/listOperations/listOperations.js
@@ -23,7 +23,31 @@ Component({
console.log("conditionObj", this.data.conditionObj);
}
},
- location: Object,
+ location: {
+ type: Object,
+ observer(res) {
+ let data = res.data
+ console.log(res, 0);
+
+ if (!data) return
+ let targetData = {}
+ for (let key in data) {
+ key = Number(key)
+ if (key % 1 === 0) {
+ targetData[key] = {}
+ targetData[key]['title'] = data[key]
+ } else {
+ if (!targetData[Math.trunc(key)]['data']) targetData[Math.trunc(key)]['data'] = {}
+ targetData[Math.trunc(key)]['data'][key] = data[key]
+ }
+ }
+ console.log("targetData", targetData);
+
+ this.setData({
+ areaData: targetData
+ })
+ }
+ },
},
@@ -87,7 +111,10 @@ Component({
rentValue: [40, 80],
- areaState: "area", // area school
+ areaState: "area", // area school 区域 弹窗的状态
+ areaData: {}, // 区域弹窗的数据
+ areaPitchValueOne: 0, // 区域选中 的 一级
+ areaPitchValueTwo: 0, // 区域选中 的 二级
},
/**
@@ -102,6 +129,8 @@ Component({
this.setData({
[key]: value
})
+
+ console.log(this.data.areaPitchValueOne);
},
changeItem(e) {
diff --git a/template/listOperations/listOperations.wxml b/template/listOperations/listOperations.wxml
index 301f676..67f6841 100644
--- a/template/listOperations/listOperations.wxml
+++ b/template/listOperations/listOperations.wxml
@@ -97,17 +97,23 @@
- 按区域
- 按学校
+ 按区域
+ 按学校
-
-
-
+
+
+
+ 不限
+
+
+ {{ item.title }}
- {{ item }}
-
- -1
+
+
+ 不限
+ {{ item }}
+
diff --git a/template/listOperations/listOperations.wxss b/template/listOperations/listOperations.wxss
index 78c2e24..2b83cd6 100644
--- a/template/listOperations/listOperations.wxss
+++ b/template/listOperations/listOperations.wxss
@@ -238,14 +238,56 @@
.area-box {}
.area-box .area-item {
- /* background-color: #50E3C2; */
height: 120rpx;
}
+.area-box .area-item.area-item-unlimited {
+ justify-content: space-between;
+}
+
+.area-box .area-item.area-item-unlimited .area-item-unlimited-icon {
+ width: 30rpx;
+ height: 30rpx;
+ padding-right: 30rpx;
+ display: none;
+}
+
.area-box .area-left {
background-color: rgba(215, 215, 215, 0.501960784313725);
}
+
+.area-box .area-centre {
+ background-color: rgba(246, 246, 246, 1);
+}
+
+
+.area-box .area-centre.selectUnlimited {
+ flex: 1;
+}
+
+.area-box .area-centre.selectUnlimited .area-item.area-item-unlimited {
+ width: 100%;
+ color: #50E3C2;
+}
+
+.area-box .area-centre.selectUnlimited .area-item.area-item-unlimited .area-item-unlimited-icon {
+ display: block;
+}
+
+.area-box .area-centre .pitch {
+ background-color: rgba(255, 255, 255, 1);
+}
+
+
+.area-box .area-right {
+ background-color: rgba(255, 255, 255, 1);
+}
+
+.area-box .area-right .area-item {
+ padding: 0 48rpx;
+}
+
.area-box .area-left .area-item.pitch {
background-color: rgba(246, 246, 246, 1);
}