temp save

src/views/house/components/popup/IndexEdit.vue

@@ -16,12 +16,17 @@
           <div class="sp-item" v-for="(product, one) in productData" :key="one">
             <div class="sp-title">{{product.product_type_name}}</div>
             <div class="sp-content">
-              <el-form-item label="产品最低单价">
-                <el-input v-model="product.price_min" placeholder="请输入产品类型最低单价"></el-input>
-              </el-form-item>
-              <el-form-item label="产品最高单价">
-                <el-input v-model="product.price_max" placeholder="请输入产品类型最高单价"></el-input>
-              </el-form-item>
+              <div class="sc-input">
+                <el-form-item label="产品最低单价">
+                  <el-input v-model="product.price_min" placeholder="请输入最低单价"></el-input>
+                </el-form-item>
+                <el-form-item label="产品最高单价">
+                  <el-input v-model="product.price_max" placeholder="请输入最高单价"></el-input>
+                </el-form-item>
+                <el-form-item label="梯户比">
+                  <el-input v-model="product.stairs_rate" placeholder="如:2梯4户"></el-input>
+                </el-form-item>
+              </div>
               <el-form-item label="户型">
                 <el-select v-model="product.house_type_list_val" placeholder="请选择" :multiple="true" @change="houseTypeChange(one)">
                   <el-option
@@ -273,7 +278,7 @@ export default {
         { label: '楼栋数', key: 'seat_sum', class: 'c-3', type: 'inputFont', appendFont: '栋' },
         { label: '产权年限', key: 'ownership', class: 'c-3' },
         { label: '初次交付时间', key: 'deliver_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
-        { label: '户型单价区间', key: 'price_range', class: 'c-3', type: 'inputFont', appendFont: '/㎡', rules: 1 },
+        { label: '楼盘单价', key: 'price_range', class: 'c-3', type: 'inputFont', appendFont: '/㎡', rules: 1 },
         { label: '户型面积区间', key: 'built_area', class: 'c-3', type: 'inputFont', appendFont: '㎡' },
         { label: '产品类型', key: 'product_type', type: 'select', options: this.$dictData.product_type, multiple: true, changeHandle: this.productTypeChange},
         // { label: '房型', key: 'house_type', type: 'select', options: this.$dictData.house_type, multiple: true},
@@ -286,7 +291,7 @@ export default {
         },
         { label: '楼盘地址', key: 'address', rules: 1 },
         { label: '是否新房', key: 'is_new', type: 'select', class: 'c-3', options: this.$dictData.sys_yesno, rules: 1 },
-        { label: '梯户比', label2: '如:2梯4户', key: 'stairs_rate', class: 'c-3' },
+        // { label: '梯户比', label2: '如:2梯4户', key: 'stairs_rate', class: 'c-3' },
         { label: '不利因素', key: 'minus_points' },
         { label: '楼盘图', key: 'pri_image', class: 'c-3', type: 'upload', rules: 1 },
         { label: '简评', key: 'remarked', class: 'c-3s', type: 'textarea' },
@@ -317,13 +322,14 @@ export default {
             if (newForm.metro_line) newForm.metro_line = newForm.metro_line.join(',')
             if (newForm.metro_type) newForm.metro_type = newForm.metro_type.join(',')
             newForm.custom_tag = newForm.custom_tag.replace('，', ',')
-            newForm.stairs_rate = newForm.stairs_rate.replace('，', ',')
+            // newForm.stairs_rate = newForm.stairs_rate.replace('，', ',')
             let productData = this.productData || []
             let pFlag = false
             productData.forEach(pOne => {
               if (!pOne.price_min || !pOne.price_max || !pOne.house_type_list_val) {
                 pFlag = true
               }
+              if (!pOne.stairs_rate) pOne.stairs_rate = ''
             })
             if (pFlag) {
               this.$msg('请输入完整的产品最高单价、最低单价、户型图！')
@@ -421,6 +427,9 @@ export default {
   .sp-content {
     padding: 10px 10px 0;
   }
+  .sc-input {
+    display: flex;
+  }
 }
 
 .room-box {

src/views/news/components/popup/IndexEdit.vue

@@ -96,6 +96,7 @@ export default {
               newForm.estate_id_list = ''
             }
             let apiStr = 'adminformationadd'
+            newForm.news_type = 'gzh'
             if (newForm.id) apiStr = 'adminformationedit'
             this.$api.house[apiStr](newForm).then(data => {
               this.$msgs(newForm.id ? '编辑成功' : '新增成功')

src/views/news/components/popup/IndexEditSelf.vue

@@ -12,15 +12,15 @@
       direction="rtl"
     >
       <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
-        <div slot="footer" style="padding-top: 20px;">
-          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
-          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
-        </div>
         <div class="scoped-textarea" slot="otherItem">
           <div class="st-text">房票科技</div>
           <tinymce v-model="content" :height="500" />
         </div>
       </base-form>
+      <div class="xl-form scoped-bottom">
+        <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+        <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+      </div>
     </el-drawer>
   </div>
 </template>
@@ -108,6 +108,7 @@ export default {
               this.$msg('请输入资讯文章内容')
               return
             }
+            newForm.news_type = 'adminadd'
             this.$api.house[apiStr](newForm).then(data => {
               this.$msgs(newForm.id ? '编辑成功' : '新增成功')
               this.$emit('close', newForm)
@@ -146,7 +147,7 @@ export default {
     right: 14px;
     background: #fff;
     font-size: 12px;
-    z-index: 999999;
+    z-index: 9;
     height: 30px;
     line-height: 32px;
     padding-left: 10px;
@@ -155,4 +156,22 @@ export default {
     user-select: none;
   }
 }
+
+.scoped-bottom {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  background: #fff;
+  width: 960px;
+  box-sizing: border-box;
+  padding-left: 380px;
+  padding-bottom: 20px;
+  padding-top: 20px;
+  border-top: 1px solid #dcdcdc;
+  z-index: 10;
+}
+
+::v-deep .el-drawer__body {
+  padding-bottom: 30px;
+}
 </style>

src/views/news/components/searchForm/Index.vue

@@ -20,6 +20,7 @@ export default {
         { label: '标题', key: 'title' },
         { label: '分类', key: 'information_category', type: 'select', options: this.$dictData.information_category},
         { label: '状态', key: 'hide_status', type: 'select', class: 'c-3', options: this.$dictData.hide_status },
+        { label: '文章类型', key: 'news_type', type: 'select', class: 'c-3', options: this.$dictData.news_type },
       ]
     }
   },

src/views/news/index.vue

@@ -114,21 +114,21 @@ export default {
       }, null, true)
     },
     openPopup(row) {
-      if (row.link) {
+      if (row.news_type === 'adminadd') {
+        this.openIESPopup(row)
+      } else {
         if (row && row.id) {
           this.curObj = row
         } else {
           this.curObj = {}
         }
         this.isDtlShow = true
-        } else {
-        this.openIESPopup(row)
       }
     },
     closePopup(obj) {
       this.isDtlShow = false
       if (obj) {
-        this.fetchData() 
+        this.fetchData()
       }
     },
     openIESPopup(row) {