From e9b8a377bda61b6a31517599464f598f9b6691ae Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 26 Apr 2023 12:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/askHousing/askHousing.wxml        | 23 ++++++++++++++---------
 pages/askHousing/askHousing.wxss        |  2 +-
 template/aboutRelease/aboutRelease.wxml |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml
index 476e86e..2e5fc0a 100644
--- a/pages/askHousing/askHousing.wxml
+++ b/pages/askHousing/askHousing.wxml
@@ -115,7 +115,7 @@
                 <block wx:for="{{ fieldinfo.basic }}" wx:key="index"> {{ item.field }}
                     <template wx:if="{{ item.field == 'acreage' }}" is="pageInput" data="{{ item,index,it:'basic',newinfo,fieldinfo }}"></template>
                     <template wx:elif="{{ item.field == 'property' || item.field == 'floor' || item.field == 'sunshinearea' }}" is="clickInputUnderArrowMultiple" data="{{ item,index,it:'basic',newinfo,fieldinfo,propertyObj,floorObj,sunshineareaObj }}"></template>
-                    <template wx:else is="clickInputUnderArrow" data="{{ item,index,it:'basic',newinfo,fieldinfo }}"></template>
+                    <template wx:else is="clickInputUnderArrow" data="{{ item,index,it:'basic',newinfo,fieldinfo,fieldinfoNew }}"></template>
                     <!-- <template wx:if="{{ item.field == 'property' || item.field == 'floor' }}" is="clickInputUnderArrow" data="{{ item,index,it:'basic',newinfo,fieldinfo }}"></template> -->
                     <!-- <template wx:else is="clickInput" data="{{ item,index,it:'basic',newinfo,fieldinfoNew,leaseTimeValue }}"></template> -->
                 </block>
@@ -225,7 +225,7 @@
         </view>
     </view>
 
-    <view class="footer-btn"> {{ newtype }}
+    <view class="footer-btn">
         <block wx:if="{{newtype=='plus' || (newtype=='edit' &&  newStatus == 0 )}}">
             <view bindtap='NewRelease' data-status="0" class="submit save1">保存并退出</view>
             <view bindtap='NewRelease' data-status="1" class="submit">马上发布</view>
@@ -275,7 +275,11 @@
     <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" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}">
-            <input disabled type="{{ item.type }}" placeholder="请选择" value="{{newinfo[item.field]}}" />
+            <block wx:if="{{ item.field == 'rent' }}">
+                <input wx:if="{{ !newinfo[item.field][0] && newinfo[item.field][0] != 0 }}" disabled type="{{ item.type }}" placeholder="请选择" value="" />
+                <view wx:else>{{ newinfo[item.field][0] + '~' + newinfo[item.field][1] + '' + fieldinfoNew[item.field].unit + '/月' }}</view>
+            </block>
+            <input wx:else disabled type="{{ item.type }}" placeholder="请选择" value="{{newinfo[item.field]}}" />
             <view class="clickInputBottomArrow"></view>
         </view>
     </view>
@@ -285,15 +289,15 @@
 <template name="clickInputUnderArrowMultiple">
     <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" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}"> {{ item.field }}
-            <block wx:if="{{ item.field == 'property' && newinfo[item.field].length != 0 }}">
-                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ propertyObj[it] }}{{ index != newinfo[item.field].length - 1 ? '  /  ' : '' }}</block>
+        <view class="clickInput" bindtap="clickOption" data-field="{{ item.field }}" data-step="{{ index }}" data-it="{{ it }}">
+            <block wx:if="{{ item.field == 'property' && newinfo[item.field].length != 0 }}"> 
+                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ propertyObj[it] }}{{ index != newinfo[item.field].length - 1 ? ' / ' : '' }}</block>
             </block>
             <block wx:elif="{{ item.field == 'floor' && newinfo[item.field].length != 0 }}">
-                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ floorObj[it] }}{{ index != newinfo[item.field].length - 1 ? '  /  ' : '' }}</block>
+                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ floorObj[it] }}{{ index != newinfo[item.field].length - 1 ? ' / ' : '' }}</block>
             </block>
             <block wx:elif="{{ item.field == 'sunshinearea' && newinfo[item.field].length != 0 }}">
-                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ sunshineareaObj[it] }}{{ index != newinfo[item.field].length - 1 ? '  /  ' : '' }}</block>
+                <block wx:for="{{ newinfo[item.field] }}" wx:for-item="it">{{ sunshineareaObj[it] }}{{ index != newinfo[item.field].length - 1 ? ' / ' : '' }}</block>
             </block>
             <input wx:else disabled type="{{ item.type }}" placeholder="请选择" value="{{newinfo[item.field]}}" />
             <view class="clickInputBottomArrow"></view>
@@ -306,7 +310,8 @@
     <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="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}}" />
+            <input wx:if="{{ !newinfo[item.field][0] && newinfo[item.field][0] != 0 }}" type="{{item.type}}" placeholder="{{ item.placeholder }}" value="" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
+            <input wx:else type="{{item.type}}" placeholder="{{ item.placeholder }}" value="{{ newinfo[item.field][0] + '~' + newinfo[item.field][1] }}" disabled="{{fieldinfo[it][index].popupwindow == 1 ? true : false}}" />
             <text>{{ item.unit }}</text>
         </view>
     </view>
diff --git a/pages/askHousing/askHousing.wxss b/pages/askHousing/askHousing.wxss
index f1dfd2d..896c95d 100644
--- a/pages/askHousing/askHousing.wxss
+++ b/pages/askHousing/askHousing.wxss
@@ -330,7 +330,7 @@
     border: 2rpx solid #d7d7d7;
     padding: 0 30rpx;
     height: 100rpx;
-    line-height: 100rpx;
+    /* line-height: 100rpx; */
     border-radius: 10rpx;
     margin-top: 28rpx;
 }
diff --git a/template/aboutRelease/aboutRelease.wxml b/template/aboutRelease/aboutRelease.wxml
index 6bb9e60..21789ad 100644
--- a/template/aboutRelease/aboutRelease.wxml
+++ b/template/aboutRelease/aboutRelease.wxml
@@ -17,7 +17,7 @@
         </view>
 
         <!-- 操作 -->
-        <view class="operation flexcenter">
+        <view class="operation flexcenter" bindtap="closePop" data-key="popUpIs" >
             <view class="operation-item">关闭</view>
         </view>