This commit is contained in:
A1300399510 2023-06-25 19:11:53 +08:00
parent e76394a833
commit 2f289bc779
8 changed files with 103 additions and 42 deletions

View File

@ -461,8 +461,8 @@
<!-- <view class="fail-btn flexcenter">房源管理<image class="fail-btn-icom" mode="widthFix" src="/img/arrows-right-white.png"></image> -->
<!-- </view> -->
<navigator class="fail-btn flexcenter" hover-class="none" open-type="redirect" url="/pages/user/user?tab=publish">
<view class="fail-btn flexcenter" wx:if="{{ state == 'user' }}" catchtap="setValue" data-key="failPopState" data-value="{{ false }}">关闭</view>
<navigator wx:else class="fail-btn flexcenter" hover-class="none" open-type="redirect" url="/pages/user/user?tab=publish">
房源管理<image class="fail-btn-icom" mode="widthFix" src="/img/arrows-right-white.png"></image>
</navigator>
</view>

View File

@ -511,6 +511,7 @@ Page({
},
// 新的获取发布数据
typetouList: [],
newPublish() {
wx.showLoading({
title: '加载中',
@ -572,6 +573,7 @@ Page({
field: newfield,
choices: []
}
this.typetouList.push(el.value)
} else {
choicesnew[Math.trunc(el.key) - 1]['choices'].push({
value: el.value,
@ -735,6 +737,7 @@ Page({
})
});
}
console.log("fieldinfoNew", fieldinfoNew);
if (data.info.floor != null) data.info.floor = data.info.floor != 0 ? data.info.floor + '楼' : null
@ -836,11 +839,15 @@ Page({
that.data.newinfo.longitude = location.longitude
that.data.newinfo.address = location.name
that.setData({
newinfo: that.data.newinfo
newinfo: that.data.newinfo,
popUpIs: ""
})
if (that.data.popUpIs == "") {
that.popUpNextStep()
}
that.getPlaceAround()
// if (that.data.popUpIs == "") {
// that.popUpNextStep()
// }
}
@ -1367,7 +1374,6 @@ Page({
},
})
} else {
// 选择出租方式后需要 >> 显示
if (this.data.fieldinfo[this.data.popUpit][this.data.step].field == 'type') {
this.setData({
@ -1375,7 +1381,6 @@ Page({
popUpdate: this.data.fieldinfo[this.data.popUpit][this.data.step + 1],
[`newinfo.${this.data.fieldinfo[this.data.popUpit][this.data.step].field}`]: popUpSubtitle1 + '>>' + value
})
} else if (this.data.fieldinfo[this.data.popUpit][this.data.step].field == 'leasetime' && value != '随时') {
this.setData({
step: this.data.step + 1,
@ -1390,16 +1395,46 @@ Page({
}
// 标记一下
this.data.aa.forEach(element => {
console.log("popUpIs", popUpIs);
console.log("step", this.data.step, "");
if (value == element.name) {
console.log("element", element);
popUpStepState = element.popUpStepState
popUpIs = element.popUpIs
popUpTitle = this.data.fieldinfo[element.it][this.data.step].title
}
});
// this.data.aa.forEach(element => {
// if (value == element.name) {
// console.log("field", field);
// return
// if (this.data.fieldinfo[this.data.popUpit][this.data.step]['field'] == 'type') {
// if (this.data.step == 0 && this.data.popUpit == "basic") {
// console.log("step", this.data.step, "popUpit", this.data.popUpit);
// console.log("element", element);
// console.log("000", this.data.fieldinfo[this.data.popUpit][this.data.step]['field'] == 'type');
// popUpStepState = element.popUpStepState
// popUpIs = element.popUpIs
// console.log("this.data.step", this.data.step);
// popUpTitle = this.data.fieldinfo[element.it][this.data.step].title
// console.log("this.data.fieldinfo", this.data.fieldinfo);
// console.log("element", element);
// console.log("popUpdate", this.data.popUpdate, "popUpIs", popUpIs);
// }
// });
// console.log(this.typetouList, "typetouList");
if (field == "type" && this.typetouList.includes(value)) {
popUpTitle = this.data.info['type']['name']
if (this.data.popUpdate['choices'].length >= 5) popUpIs = "twoLines"
else popUpIs = "AListOF"
popUpStepState = 1
}
if (field == 'rentalduration' && value == this.data.fieldinfo[this.data.popUpit][this.data.step]['placeholder']) {
popUpTitle = this.data.info['rentalduration']['name']
popUpIs = "leaseTime"
popUpStepState = 2
}
if (field == 'leasetime' && value != "随时") {
popUpTitle = this.data.info['leasetime']['name']
popUpIs = "ofDate"
popUpStepState = 1
}
if (popUpIs == "") {
if (this.data.fieldinfo[this.data.popUpit].length == this.data.step && this.data.popUpOrder.indexOf(this.data.popUpit) != -1) {
@ -2051,6 +2086,7 @@ Page({
// 上传二维码
UploadQRCodeSend(imgUrl) {
let that = this
console.log("imgUrl",imgUrl);
const uploadTask = wx.uploadFile({
// url: `${app.globalData.baseURL}/tenement/publish/uploadweixinqrcode`,
url: `${app.globalData.baseURL}/tenement/v2/api/publish/uploadweixinqrcode`,

View File

@ -264,7 +264,7 @@
<!-- 禁用的输入框款-箭头下 -->
<template name="clickInputUnderArrow">
<view class="clickInput-box {{'clickInput' + item.field }}">
<view class="clickInput-title">{{ item.title }}<text style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="clickInput-title">{{ item.title }}<text wx:if="{{ item['required'] == 1 }}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="clickInput" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}">
<input disabled type="{{ item.type }}" placeholder="请选择" value="{{newinfo[item.field]}}" />
<view class="clickInputBottomArrow"></view>
@ -275,7 +275,7 @@
<!-- 当前页页面直接操作的输入框 -- 例如 面积 月租 -->
<template name="pageInput">
<view class="pageInput-box {{'clickInput' + item.field }}">
<view class="clpageInputickInput-title">{{ item.title }}<text wx:if="{{ item.required == 1}}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="clpageInputickInput-title">{{ item.title }}<text wx:if="{{ item.required == 1 }}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="pageInput" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}">
<input type="{{item.type}}" placeholder="{{ item.placeholder }}" value="{{ newinfo[item.field] }}" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
<text>{{ item.unit }}</text>
@ -760,7 +760,7 @@
<!-- 当前页面的标题 -->
<template name="pageTextarea">
<view class="pageTextarea-box {{'clickInput' + item.field }}" bindtap="clickOption" data-it="{{ it }}" data-step="{{ index }}" data-field="{{ item.field }}">
<view class="pageTextarea-title">{{ item.title }} <text wx:if="{{ item.required == 1}}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="pageTextarea-title">{{ item.title }} <text wx:if="{{ item.required == 1 }}" style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="pageTextarea" wx:if="{{ item.type == 'textarea' }}">
<textarea placeholder="{{ item.placeholder }}" maxlength="80" data-field="{{ item.field }}" cursor-spacing="20" bindinput="popUpInput" value="{{ newinfo[item.field] }}" disable-default-padding="{{ true }}">
<keyboard-accessory>
@ -871,7 +871,7 @@
<!-- 特殊处理所属小区-箭头下 -->
<template name="residentialAreaUnderArrow">
<view class="clickInput-box {{'clickInput' + item.field }}">
<view class="clickInput-title">{{ item.title }}<text style="color:#C54235;margin-left: 10rpx;">*</text></view>
<view class="clickInput-title">{{ item.title }}</view>
<view class="clickInput" wx:if="{{ newinfo['communityid'] }}" bindtap="getPlaceAround">
<input disabled type="{{ item.type }}" placeholder="请选择" value="{{newinfo['communityname']}}" />
<view wx:if="{{ newinfo['communityid'] }}" class="clickInputBottomArrow"></view>

View File

@ -60,7 +60,7 @@ Page({
let data = res.data
data.data && data.data.forEach(element => {
element.message = element.message.trim()
if (element.message.length >= 40) element['littleMessage'] = element.message.slice(0, 42) + '...'
// if (element.message.length >= 40) element['littleMessage'] = element.message.slice(0, 42) + '...'
});
for (let i = 0; i < data.data.length; i++) {
@ -133,6 +133,13 @@ Page({
})
},
// 跳转我的-发布
jumpUserPost(){
wx.navigateTo({
url: `/pages/user/user?tab=publish`,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -41,18 +41,19 @@
<image wx:if="{{ item.isread == 0 }}" mode="widthFix" src="../../img/u20.png"></image>
</view>
<view code="true" class="information-title">
<view class="information-message" style="display: inline; word-break: break-all;">{{ item.littleMessage || item.message }}</view>
<view class="information-message" style="display: inline; word-break: break-all;">{{ item.message }}</view>
<!-- <view class="information-message" style="display: inline; word-break: break-all;">{{ item.littleMessage || item.message }}</view>
<view wx:if="{{ item.reportshowState == 0 &&( item.data.reportnummessage && item.data.reportnummessage.length != 0) || item.littleMessage }}" class="name-tips-close-btn" bindtap="cutUnfoldState" data-index="{{ index }}">
<image src="/img/u124.svg"></image>
</view>
</view> -->
</view>
<view class="information-cause-box" wx:if="{{ item.reportshowState != 0 }}">
<view class="information-cause-item" wx:for="{{ item.data.reportnummessage}}" wx:for-item="it" wx:key="it">- {{ it }}</view>
</view>
<view class="resource-information">
<image wx:if="{{ item.data.status != 1}}" class="resource-information-top-icon" src="/img/u75.png" mode="widthFix"></image>
<view class="resource-title" bindtap="{{ item.data.status == 1 ? 'jumpDetails' : ''}}" data-uniqid="{{ item.data.uniqid }}" data-tenementcertifiedstatus="{{ item.data.tenementcertifiedstatus }}"><text>{{ item.data.subject }}</text>
<image class="pic" wx:if="{{ item.data.isimage == 1}}" src="/img/pics.jpg" mode="widthFix"></image>
<view class="resource-title" bindtap="{{ item.data.status == 1 ? 'jumpDetails' : 'jumpUserPost' }}" data-uniqid="{{ item.data.uniqid }}" data-tenementcertifiedstatus="{{ item.data.tenementcertifiedstatus }}"><text>{{ item.data.subject }}</text>
<image class="pic" wx:if="{{ item.data.isimage == 1 }}" src="/img/pics.jpg" mode="widthFix"></image>
</view>
<view class="resource-id">房源ID{{ item.data.id }}</view>
</view>

View File

@ -329,7 +329,6 @@ Page({
this.handleDetailData()
// 判断是否需要获取附近房源
console.log("intermediary", data.info.intermediary);
if (data.info.latitude && data.info.verified == 0 && data.info.intermediary != 6 && data.isintermediary != 1) this.getNearbListings()
else this.nearbListingsState = true // 阻止上拉底部加载的
@ -431,7 +430,6 @@ Page({
})
}
console.log("info", info);
this.setData({
info,
basicRequirementsObj: obj

View File

@ -131,6 +131,9 @@ Page({
identityList: [],
newmessagenum: 0,
validityidentity: "",
failPopState: false, // 提交失败的弹窗状态
isNewVersions: true,
@ -610,12 +613,16 @@ Page({
})
}
if (data.data && data.data.rule) {
this.setData({
triggerRules: data.data.rule,
appealtoken: data.data.appealtoken
})
}
this.setData({
failPopState: true,
})
// if (data.data && data.data.rule) {
// this.setData({
// triggerRules: data.data.rule,
// appealtoken: data.data.appealtoken
// })
// }
this.close_alert()
}
}).catch(res => {})
@ -1037,8 +1044,15 @@ Page({
},
setValue(e) {
let key = e.detail.key
let value = e.detail.value
let key,
value
if (e.currentTarget.dataset['key']) {
key = e.currentTarget.dataset['key']
value = e.currentTarget.dataset['value']
} else {
key = e.detail.key
value = e.detail.value
}
this.setData({
[key]: value
})

View File

@ -91,6 +91,11 @@
</view>
</block>
<template wx:else is="empty-icon" data="{{ hint: '暂无内容' }}"></template>
<!-- 疑问 -->
<view class="query-box flexcenter" wx:if="{{ data.length != 0 }}">
<view class="query-text flexacenter">有疑问?来找<image class="query-img" mode="widthFix" src="/img/smiling-face.png"></image>{{ contact.nickname }}</view>
<view class="query-btn flexcenter" bindtap="copyWechat">复制微信号</view>
</view>
</view>
</view>
</block>
@ -348,13 +353,13 @@
<!-- 触发规则1时 重复发布 -->
<template wx:if="{{ triggerRules == 1 }}" is="repeatedRelease" data="{{ pages:'user' }}"></template>
<!-- <template wx:if="{{ triggerRules == 1 }}" is="repeatedRelease" data="{{ pages:'user' }}"></template> -->
<!-- 触发规则2时 提交失败 -->
<template wx:elif="{{ triggerRules == 2 }}" is="submitFailuretwo" data="{{ isnodraft:true}}"></template>
<!-- <template wx:elif="{{ triggerRules == 2 }}" is="submitFailuretwo" data="{{ isnodraft:true}}"></template> -->
<!-- 触发规则3时 提交失败 -->
<template wx:elif="{{ triggerRules == 3 }}" is="submitFailurethree" data="{{ isnodraft:true}}"></template>
<!-- 触发规则4时 你的微信号有误 -->
<template wx:elif="{{ triggerRules == 4 }}" is="wrong-micro-signal"></template>
<!-- <template wx:elif="{{ triggerRules == 3 }}" is="submitFailurethree" data="{{ isnodraft:true}}"></template> -->
<template wx:if="{{ failPopState }}" is="fail-pop" data="{{ state: 'user' }}"></template>
<fix-footer isNewVersions="{{ isNewVersions }}" user="1" unreadMessages="{{ unreadMessages }}" bottomLift="{{ bottomLift }}"></fix-footer>