no message

pages/common/common.wxml

@@ -413,15 +413,40 @@
     <view class="succeed-box flexcenter">
       <image class="succeed-icom" src="/img/succeed-icon.png"></image>
       <view class="succeed-title">发布成功</view>
+      <block wx:if="{{ true }}">
+        <block wx:if="{{ false }}">
+          <view class="succeed-reminder">完成房源认证更快租出去</view>
 
-      <view class="succeed-reminder">激活专属认证标识</view>
+          <view class="succeed-hint">激活专属认证标识</view>
+          <view class="succeed-hint">不占用普通房源的发布条数</view>
 
-      <view class="succeed-hint">激活专属认证标识</view>
-      <view class="succeed-hint">不占用普通房源的发布条数</view>
+          <view class="succeed-btn flexcenter">前往认证<image class="succeed-btn-icom" mode="widthFix" src="/img/arrows-right-black.png"></image>
+          </view>
+          <view class="succeed-btn-no flexcenter">暂不认证</view>
+        </block>
+        <block wx:else>
+          <view class="succeed-reminder">完成中介认证更快租出去</view>
+
+          <view class="succeed-hint">激活专属认证标识</view>
+          <view class="succeed-hint">发布上限马上提升到 <text>20</text> 条</view>
+          <view class="succeed-hint">可以搜索、筛选求房源信息</view>
+
+          <view class="succeed-btn flexcenter">前往认证<image class="succeed-btn-icom" mode="widthFix" src="/img/arrows-right-black.png"></image>
+          </view>
+          <view class="succeed-btn-no flexcenter">暂不认证</view>
+
+
+        </block>
+
+
+
+      </block>
+      <block wx:else>
+        <view class="automatically-skip">
+          2秒后自动跳转页面
+        </view>
+      </block>
 
-      <view class="succeed-btn flexcenter">前往认证<image class="succeed-btn-icom" mode="widthFix" src="/img/arrows-right-black.png"></image>
-      </view>
-      <view class="succeed-btn-no flexcenter">暂不认证</view>
     </view>
   </view>
 

pages/common/common.wxss

@@ -524,6 +524,11 @@
     margin-bottom: 19.5rpx;
 }
 
+.succeed-box .succeed-hint text {
+    font-weight: 650;
+    color: #000000;
+}
+
 .succeed-box .succeed-btn {
     background-color: rgba(253, 223, 109, 1);
     font-size: 36rpx;
@@ -548,6 +553,13 @@
     margin-top: 84rpx;
 }
 
+.succeed-pop .automatically-skip{
+    color: #555555;
+    font-size: 27rpx;
+    margin-top: 45rpx;
+    margin-bottom: 126rpx;
+}
+
 .fail-box {
     background-color: #fff;
     width: 750rpx;

pages/edit/edit.js

@@ -28,6 +28,14 @@ Page({
         latitude: '',
         longitude: '',
         info: {
+            intermediary: {
+                name: '发布者身份',
+                value: '',
+                data: [],
+                title: "intermediary",
+                need: true
+
+            },
             'type': {
                 name: '出租方式',
                 title: 'type',
@@ -97,14 +105,7 @@ Page({
                 numberType: true
 
             },
-            intermediary: {
-                name: '发布者身份',
-                value: '',
-                data: [],
-                title: "intermediary",
-                need: true
 
-            },
             subject: {
                 title: 'subject',
                 value: '',
@@ -367,12 +368,99 @@ Page({
         isPC: false, // 判断是否是PC端
         focusState: false,
         isAuthorization: 0,
+
+
+        change: false, // 当两个slider在最右端重合时，将change设置为true，从而隐藏slider2，才能继续操作slider1
+        max: 10000, // 两个slider所能达到的最大值
+        min: 0, // 两个slider所能取的最小值
+        rate: 100, // slider的最大最小值之差和100（或1000）之间的比率
+        scale: 1, // 比例系数。页面显示值的时候，需要将slider1Value(slider2Value)乘以比例系数scale
+        slider1Max: 10000, // slider1的最大取值
+        slider1Value: 0, // slider1的值
+        slider2Value: 10000, // slider2的值
+        slider2Min: 0, // slider2的最小取值
+        slider1W: 100, // slider1的宽度
+        slider2W: 0, // slider2的宽度
+        leftSliderPriceWidthX: '0%',
+        rightSliderPriceWidthX: '0%',
+
+
     },
 
+    // 开始滑动
+    changeStart: function (e) {
+        var idx = parseInt(e.currentTarget.dataset.idx)
+        if (idx === 1) {
+            // dW是当前操作的slider所能占据的最大宽度百分数
+            var dW = (this.data.slider2Value - this.data.min) / this.data.rate
+            this.setData({
+                slider1W: dW,
+                slider2W: 100 - dW,
+                slider1Max: this.data.slider2Value,
+                slider2Min: this.data.slider2Value,
+                change: false
+            })
+        } else if (idx === 2) {
+            var dw = (this.data.max - this.data.slider1Value) / this.data.rate
+            console.log(dw);
+            this.setData({
+                slider2W: dw,
+                slider1W: 100 - dw,
+                slider1Max: this.data.slider1Value,
+                slider2Min: this.data.slider1Value,
+                change: false
+            })
+        }
+    },
+
+    // 正在滑动
+    changing: function (e) {
+        var idx = parseInt(e.currentTarget.dataset.idx)
+        var value = e.detail.value
+        // let rightSliderPriceWidthX = (this.data.max - value) / 116 - 21
+        let rightSliderPriceWidthX = 100 - (value / this.data.max * 100)
+        let leftSliderPriceWidthX = value / this.data.max * 100
+
+        if (idx === 1) {
+            this.setData({
+                slider1Value: value,
+                leftSliderPriceWidthX: leftSliderPriceWidthX + '%'
+            })
+        } else if (idx === 2) {
+            this.setData({
+                slider2Value: value,
+                rightSliderPriceWidthX: rightSliderPriceWidthX + '%'
+            })
+        }
+    },
+    changed: function (e) {
+        if (this.data.slider1Value === this.data.slider2Value && this.data.slider2Value === this.data.max) {
+            this.setData({
+                change: true
+            })
+        }
+    },
+
+
+
+
+
+
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        let list = []
+        for (let i = 0; i < 24; i++) {
+            list.push(i + '点-' + (i + 1) + '点');
+        }
+        this.setData({
+            list: list
+        })
+
+
+
+
         this.calculateOfDate()
         wx.showLoading({
             title: '加载中',
@@ -735,7 +823,7 @@ Page({
     },
 
     firstStepPopover() {
-        return
+        // return
         let field = 'type'
         let step = 0
         let it = 'basic'

pages/edit/edit.wxml

@@ -32,6 +32,12 @@
     <!-- 发布失败 -->
     <!-- <template is="fail-pop"></template> -->
 
+    <!-- 租金预算 -->
+    <!-- <template is="rent-budget" data="{{ min,max,change,slider2W,slider1Max,slider2Min,slider1Value,slider2Value,rate,scale,slider1W,slider2W,leftSliderPriceWidthX,rightSliderPriceWidthX }}"></template> -->
+
+    <!-- 目标区域 -->
+    <!-- <template is="target-area"></template> -->
+
 
     <header-nav inner-text="Some text" bgcolor="rgba(246, 246, 246, 1)">{{ isInput? isInput :( types=='edit' ?'编辑房源信息' :'发布房源信息' ) }}</header-nav>
 
@@ -801,7 +807,6 @@
                 <view class="clickInputLeftArrow"></view>
             </view>
             <view class="pop-up-top" bindtap="closePopUp">
-                <!-- <view class="pop-up-arrow"></view> -->
                 <image class="pop-up-arrow" mode="widthFix" src="/img/back.png"></image>
             </view>
             <view class="pop-up-title">地址</view>
@@ -816,4 +821,60 @@
 
 <block wx:if="{{ isAuthorization==1 }}">
     <go-login bindislogin="islogin"></go-login>
-</block>
+</block>
+
+<!-- 租金预算 -->
+<template name="rent-budget">
+    <view class="rent-budget pop-up">
+        <view class="pop-up-box">
+            <view class="pop-up-top" bindtap="closePopUp">
+                <image class="pop-up-arrow" mode="widthFix" src="/img/back.png"></image>
+            </view>
+            <view class="pop-up-title">租金预算</view>
+            <view class="rent-budget-unit flexcenter">HK$/月</view>
+            <view class='sliderHCon'>
+                <view class='twoSlider'>
+                    <view class='select-construct'>
+                        <view class="select-value flexcenter" style="left: {{ leftSliderPriceWidthX }};right: {{ rightSliderPriceWidthX }};">{{ slider1Value }} ~ {{ slider2Value }}</view>
+                        <view class='select-area'>
+
+                            <view class='slider-container'>
+                                <slider style='width:{{slider1W+"%"}}' class='slider-left' min='{{min}}' max='{{slider1Max}}' color='#50e3c2' activeColor='#f2f2f2' bindchanging='changing' catchtouchstart='changeStart' block-size="14" block-color="#50e3c2" bindchange='changed' data-idx='1' value="{{ slider1Value }}"></slider>
+                                <slider wx:if='{{!change}}' style='width:{{slider2W+"%"}}' class='slider-right' min='{{slider2Min}}' max='{{max}}' color='#f2f2f2' activeColor='#50e3c2' bindchanging='changing' catchtouchstart='changeStart' block-size="14" block-color="#50e3c2" bindchange='changed' data-idx='2' value="{{ slider2Value }}"></slider>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <template is="pop-up-footer" data="{{ popUpStepState:1,field:item.field,newtype,newStatus }}"></template>
+        </view>
+    </view>
+
+</template>
+
+<!-- 目标区域 -->
+<template name="target-area">
+    <view class="target-area pop-up">
+        <view class="pop-up-box">
+            <view class="pop-up-top" bindtap="closePopUp">
+                <image class="pop-up-arrow" mode="widthFix" src="/img/back.png"></image>
+            </view>
+            <view class="pop-up-title">目标区域</view>
+            <text class="last-step-text">最多可选择6个目标区域</text>
+            <view class="area-list">
+                <view class="area-item">
+                    <view class="area-name">港岛</view>
+                    <view class="area-content flexflex">
+                        <view class="area-content-item" wx:for="{{ 10 }}" wx:key="index">不限</view>
+                    </view>
+                </view>
+
+            </view>
+
+
+            <template is="pop-up-footer" data="{{ popUpStepState:2,field:item.field,newtype,newStatus }}"></template>
+        </view>
+    </view>
+
+</template>

pages/edit/edit.wxss

@@ -489,7 +489,7 @@
 
 .pop-up-arrow {
     width: 30rpx;
-    /* height: 30rpx; */
+    height: 30rpx;
     transform: rotate(-90deg);
 
     /* width: 20rpx; */
@@ -1402,4 +1402,104 @@
     border: 1rpx solid rgba(215, 215, 215, 1);
     padding: 0 11rpx;
     border-radius: 53rpx;
+}
+
+.rent-budget {}
+
+.rent-budget .rent-budget-unit {
+    font-size: 24rpx;
+    color: #fff;
+    background-color: #000000;
+    width: 108rpx;
+    height: 36rpx;
+    border-radius: 8rpx;
+    margin-left: calc(100% - 180rpx);
+}
+
+
+
+/* 标记  */
+wx-slider .wx-slider-handle-wrapper {
+    height: 12rpx;
+}
+
+.rent-budget .sliderHCon {
+    height: 250rpx;
+    width: 100%;
+    margin: auto;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+}
+
+.rent-budget .twoSlider {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+}
+
+.rent-budget .select-area {
+    padding-top: 48rpx;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.rent-budget .slider-container {
+    width: calc(100% - 14px);
+    display: flex;
+    position: relative;
+}
+
+.rent-budget .slider-right {
+    padding-left: 11rpx;
+}
+
+.rent-budget .slider-left,
+.rent-budget .slider-right {
+    margin: 0;
+}
+
+.rent-budget .select-construct {
+    position: relative;
+    width: 600rpx;
+    margin: 0 auto;
+    padding-top: 48rpx;
+}
+
+.rent-budget .select-value {
+    position: absolute;
+    top: 0;
+    color: #50E3C2;
+    font-weight: 700;
+    font-size: 42rpx;
+    white-space: nowrap;
+}
+
+.target-area {
+    /* width: 100%; */
+}
+
+.target-area .area-list {
+    width: 100%;
+    border-top: 1rpx solid #ebebeb;
+}
+
+.target-area .area-name {
+    color: #000;
+    font-size: 30rpx;
+    font-weight: 650;
+}
+
+.target-area .area-name::after {
+    contain: "";
+    top: 50%;
+    
+    tran
 }