t

src/pagesMore/center/uploadRoom2.jsx

@@ -88,7 +88,7 @@ class Index extends Component {
               is_dec: cObj.is_dec || '',
               is_elevator: cObj.is_elevator || '',
               owner: cObj.owner || '',
-              custom_tag: cObj.custom_tag || '',
+              custom_tag: cObj.custom_tag && cObj.custom_tag !== '洪楼房源' ? cObj.custom_tag : '',
               owner_phone: cObj.owner_phone || '',
               introduce: cObj.introduce || '',
               remarked: cObj.remarked || '',
@@ -151,7 +151,17 @@ class Index extends Component {
     let stairs_rate = ''
     if (sRate1 && sRate2) {
       stairs_rate = `${sRate1}-${sRate1}`
+    } else {
+      Taro.$msg('请输入梯户比')
+      return
+    }
+
+    if (!formObj.custom_tag) {
+      Taro.$msgConfirm('请输入自定义标签，多个逗号隔开，如：视野好，楼层佳，楼王，急售')
+      return
     }
+
+    
     
     // console.log(formObj.estate_id, formObj.title, formObj.pri_image)
     let apiStr = 'apieshouseadd'
@@ -171,7 +181,7 @@ class Index extends Component {
       is_dec: formObj.is_dec,
       is_elevator: formObj.is_elevator,
       owner: formObj.owner,
-      custom_tag: formObj.custom_tag ? formObj.custom_tag.replace(/，|、|\/|\\/g, ',') : '洪楼房源',
+      custom_tag: formObj.custom_tag ? formObj.custom_tag.replace(/，|、|\/|\\/g, ',') : '',
       owner_phone: formObj.owner_phone,
       introduce: formObj.introduce,
       remarked: formObj.remarked,
@@ -840,8 +850,8 @@ class Index extends Component {
           <LFormGroup
             val={formObj.custom_tag}
             valStr="custom_tag"
-            keyStr="定义标签"
-            keyStr2="请输入"
+            keyStr="标签(必填)"
+            keyStr2="例如：视野好，楼层佳，楼王，急售"
             bc={this.baseFormChange.bind(this)}
           />
         </View>

src/pagesRoom/dtl.jsx

@@ -284,6 +284,18 @@ class Index extends Component {
     const stairsRateArr = curObj.stairs_rate ? curObj.stairs_rate.split('-') : []
 
     const appUserInfo = Taro.getStorageSync('APP_userInfo')
+
+    const schoolList = curObj.school_list && curObj.school_list.duikou ? curObj.school_list.duikou : []
+    
+    // <View className="t t1">{arrToObj(dictData.school_attrib)[item.school_attrib]}</View>
+    //           <View className="t t4">{arrToObj(dictData.school_type)[item.school_type]}</View>
+    const schoolViews = schoolList.map((item) => {
+      return (
+        <View className="v-sub-op" key={item.id}>{`${item.school_name}[${arrToObj(dictData.school_attrib)[item.school_attrib]}][${arrToObj(dictData.school_type)[item.school_type]}]`}</View>
+      ) 
+      
+    })
+    // console.log(schoolStrList)
     return (
       <View className="scoped-main">
         {/* {this.renderQrcode()} */}
@@ -321,6 +333,15 @@ class Index extends Component {
             <View className="k">单价</View>
             <View className="v">{parseInt(curObj.price * 10000 / curObj.area)}元/㎡</View>
           </View>
+          <View className="op full">
+            <View className="k">学区</View>
+            <View className="v">
+              <View className="v-sub">
+                {schoolViews}
+                {/* <View className="v-sub-op"></View> */}
+              </View>
+            </View>
+          </View>
           <View className="op">
             <View className="k">楼层</View>
             <View className="v">{FHstr}/{curObj.storeys}层</View>
@@ -331,7 +352,7 @@ class Index extends Component {
           </View>
           <View className="op">
             <View className="k">满几</View>
-            <View className="v">{hryObj[curObj.full_year]}</View>
+            <View className="v">{hryObj[curObj.full_year] || '未知'}</View>
           </View>
           <View className="op">
             <View className="k">装修</View>
@@ -888,6 +909,59 @@ class Index extends Component {
   }
 
 
+
+
+
+
+
+
+
+
+  renderOptionsDkSchool () {
+    const { curObj } = this.state
+    return (
+      <View className="dtl-options scoped-school">
+        <View className="do-title">
+          <View className="t">对口学校</View>
+          <View className="r2">注:目前该楼盘在此学区中</View>
+        </View>
+        {this.renderDkSchool()}
+      </View>
+    )
+  }
+  renderDkSchool () {
+    const { curObj } = this.state
+    const dictData = Taro.getStorageSync('dictData')
+    const arr = curObj.school_list && curObj.school_list.duikou || []
+    const curItems = arr.map((item, index) => {
+      return (
+        <Navigator url={'/pagesSchool/indexDtl?id=' + item.id} className="lb-item" key={index}>
+          <View className="lb-img">
+            <Image className="img" src={item.pri_image + '_xs'} />
+          </View>
+          <View className="lb-info">
+            <View className="lb-p1">{item.school_name}</View>
+            <View className="lb-p2">{item.address}</View>
+            <View className="lb-tag">
+              <View className="t t1">{arrToObj(dictData.school_attrib)[item.school_attrib]}</View>
+              <View className="t t4">{arrToObj(dictData.school_type)[item.school_type]}</View>
+            </View>
+          </View>
+        </Navigator>
+      )
+    })
+    return (
+      <View className="l-list-box t2">
+        {curItems}
+      </View>
+    )
+  }
+
+
+
+
+
+
   render () {
     const userInfo = Taro.getStorageSync('APP_userInfo') || {}
     const { curObj } = this.state
@@ -898,6 +972,7 @@ class Index extends Component {
         {this.renderMain()}
         {this.renderImg()}
         {this.renderAround()}
+        {this.renderOptionsDkSchool()}
         {(curObj.es_house_list && curObj.es_house_list.length > 0) && this.renderOther()}
         {this.renderSale()}
         {this.renderPopup()}

src/pagesRoom/dtl.scss

@@ -189,6 +189,9 @@ page {
       &.full {
         width: 100%;
       }
+      .v-sub-op {
+        color: #000;
+      }
       .m {
         color: $mainColor;
       }