update

src/views/activity/edit.vue

@@ -30,9 +30,6 @@
         placeholder="选择日期">
       </el-date-picker>
     </el-form-item>
-    <el-form-item label="报名最多人数">
-      <el-input v-model="activity.maxNum"></el-input>
-    </el-form-item>
     <el-form-item label="报名开始时间">
       <el-date-picker
         v-model="activity.beginDate"
@@ -47,6 +44,9 @@
         placeholder="选择日期">
       </el-date-picker>
     </el-form-item>
+    <el-form-item label="报名最多人数">
+      <el-input v-model="activity.maxNum"></el-input>
+    </el-form-item>
     <el-form-item label="内容">
       <div id="websiteEditorElem" style="height: 400px"></div>
     </el-form-item>

src/views/building/edit.vue

@@ -48,6 +48,9 @@
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
         </el-form-item>
+        <el-form-item label="项目备注">
+          <div id="websiteEditorElem" style="height: 400px"></div>
+        </el-form-item>
         <el-form-item label="项目地址">
           <el-input v-model="building.address"></el-input>
         </el-form-item>
@@ -72,11 +75,11 @@
         </el-form-item>
       </el-form>
     </el-tab-pane>
-    <el-tab-pane label="户型设置" name="apartment" v-if="detail.buildingId">
+    <el-tab-pane label="图片设置" name="apartment" v-if="detail.buildingId">
       <div class="system-table-search">
         <div class="flex-h">
           <div class="flex-item flex-h">
-            <el-button size="mini" type="success" @click='addHx'>新增户型</el-button>
+            <el-button size="mini" type="success" @click='addHx'>新增图片库</el-button>
           </div>
         </div>
       </div>
@@ -85,9 +88,17 @@
         style="width: 100%">
         <el-table-column
           prop="apartmentName"
-          label="户型名称"
+          label="名称"
         >
         </el-table-column>
+        <el-table-column
+          prop="apartmentType"
+          label="类型"
+        >
+          <template slot-scope="scope">
+            <span>{{scope.row.apartmentType == 'apart'?'户型':'相册'}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="marketStatus"
           label="销售状态"
@@ -116,17 +127,23 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="户型信息" :visible.sync="showHx">
+      <el-dialog title="图片信息" :visible.sync="showHx">
         <el-form ref="form" :model="aparmentInfo" label-width="160px">
-          <el-form-item label="户型名称">
+          <el-form-item label="名称">
             <el-input v-model="aparmentInfo.apartmentName"></el-input>
           </el-form-item>
+          <el-form-item label="类型">
+            <el-select v-model="aparmentInfo.apartmentType" placeholder="请选择">
+              <el-option label="户型" value="apart"></el-option>
+              <el-option label="相册" value="photo"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="销售状态">
             <el-select v-model="aparmentInfo.marketStatus" placeholder="请选择">
               <el-option v-for="(type,i) in saleType" :key="i" :label="type.name" :value="type.id"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="户型图">
+          <el-form-item label="图片">
             <el-upload
               :action="upFileUrl"
               name='uploadFiles'
@@ -162,6 +179,8 @@ import apis from '../../config/api'
 const { mapState: mapBuildingState, mapActions: mapBuildingActions, mapMutations: mapBuildingMutations } = createNamespacedHelpers('building')
 import { mapState } from 'vuex'
 const { mapActions: mapApartmentActions } = createNamespacedHelpers('apartment')
+import E from 'wangeditor'
+const { mapActions: mapImgActions } = createNamespacedHelpers('img')
 
 export default {
   data () {
@@ -233,6 +252,9 @@ export default {
       'editApartment',
       'deleteApartment'
     ]),
+    ...mapImgActions([
+      'uploadImg'
+    ]),
     getSaleTypeName (id) {
       return ((this.dicts || []).filter(x => x.type === 'saleType' && x.id == id) [0] || {}).name
     },
@@ -387,11 +409,39 @@ export default {
       })
     }
   },
-  created () {
+  mounted () {
+    const _that = this
+    const phoneEditor = new E('#websiteEditorElem')
+    phoneEditor.customConfig.onchange = function (html) {
+      _that.building = {..._that.building, remark: html}
+    }
+    phoneEditor.customConfig.customUploadImg = function (files, insert) {
+      _that.uploadImg({
+        uploadFiles: files[0]
+      }).then(data => {
+        insert(data[0])
+      })
+    }
+    phoneEditor.customConfig.menus = [
+      'head',  // 标题
+      'bold',  // 粗体
+      'fontSize',  // 字号
+      'fontName',  // 字体
+      'italic',  // 斜体
+      'underline',  // 下划线
+      'strikeThrough',  // 删除线
+      'foreColor',  // 文字颜色
+      'backColor',  // 背景颜色
+      'justify',  // 对齐方式
+      'image',  // 插入图片
+    ]
+    phoneEditor.create()
+
     if ((this.$route.query.id || '') !== '') {
       this.getAparmentList()
       this.getDetail({id: this.$route.query.id}).then(data => {
         this.buildingProperty = data.propertyType.split(',')
+        phoneEditor.txt.html(data.remark)
         this.imgList = data.buildingImg.map(x => {
           return {
             name: x.imgId,
@@ -399,6 +449,8 @@ export default {
           }
         })
       })
+    } else {
+      phoneEditor.txt.html('')
     }
   }
 }