Merge branch 'dev-yqLive-20200611' of...

Merge branch 'dev-yqLive-20200611' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-yqLive-20200611

src/components/yqrange/baseinfo.vue

@@ -2,7 +2,7 @@
   <el-form ref="formData" :model="formData" :rules="rules" label-width="150px" label-suffix="：" class="basic-form">
     <el-form-item label="圈子名称" prop="projectName">
       <el-col :span="13">
-        <el-input size="small" v-model="formData.projectName" placeholder="请输入圈子名称"  style="width:70%;"></el-input>
+        <el-input size="small" v-model="formData.projectName" placeholder="请输入圈子名称" style="width:70%;" @change="returnTypeData('projectName')"></el-input>
         <span class="word-num">{{(formData.projectName).replace(/\s+/g,"").length}}/24</span>
       </el-col>
     </el-form-item>
@@ -27,7 +27,7 @@
     </div>
     <div class="basic-item-icon">
       <el-form-item label="圈子封面" class="required-label">
-        <el-upload v-model="formData.imgUrl2" class="bg-uploader" action="#" :show-file-list="false"
+        <el-upload v-model="formData.imgUrl2" class="bg-uploader" @change="returnTypeData('imgUrl2')" action="#" :show-file-list="false"
           :before-upload="beforeUploadPic2">
           <img v-if="formData.imgUrl2" :src="formData.imgUrl2" @mouseover.stop="imgMouseOver2=true" class="bg-img" />
           <img v-if="!formData.imgUrl2" class="bg-img" src="../../assets/image/small.png" />
@@ -46,12 +46,14 @@
     </div>
     <el-form-item label="圈子介绍" prop="introduce">
       <el-col :span="13">
-        <el-input size="small" v-model="formData.introduce" placeholder="请输入圈子介绍" @change="returnTypeData('introduce')" style="width:70%;"></el-input>
+        <el-input size="small" v-model="formData.introduce" placeholder="请输入圈子介绍" @change="returnTypeData('introduce')"
+          style="width:70%;"></el-input>
         <span class="word-num">{{(formData.introduce).replace(/\s+/g,"").length}}/24</span>
       </el-col>
     </el-form-item>
     <el-form-item label="内容发布权限" prop="contentRole">
-      <el-select v-model="formData.contentRole" @change="returnTypeData('contentRole')" placeholder="请选择发布权限" size="small" clearable>
+      <el-select v-model="formData.contentRole" @change="returnTypeData('contentRole')" placeholder="请选择发布权限"
+        size="small" clearable>
         <el-option v-for="item in contentList" :key="item.value" :label="item.label" :value="item.label">
         </el-option>
       </el-select>
@@ -130,7 +132,8 @@
           name: name,
           val: this.formData[name]
 
-        })}
+        })
+      }
       ,
       //上传圈子头像
       beforeUploadPic1(file) {

src/views/yqrange/create-range.vue

@@ -5,9 +5,9 @@
       <el-row class="step-content">
         <el-col :span="14">
           <el-steps :active="active" simple class>
-            <span class="step-num" :class="{ 'on-step': stepData[0] }">1</span>
+            <span class="step-num" v-bind:class="{ 'on-step': stepData[0] }">1</span>
             <el-step title="基础信息"></el-step>
-            <span class="step-num" :class="{ 'on-step': stepData[1] }">2</span>
+            <span class="step-num" v-bind:class="{ 'on-step': stepData[1] }">2</span>
             <el-step title="选择成员">2</el-step>
           </el-steps>
         </el-col>
@@ -44,7 +44,7 @@
         curmbSecond: '新建小圈',
         active: 0,
         //页面展示位置
-        stepData: [true, false, false],
+        stepData: [true, false],
         showStorage: true,
         formData: {
           projectName: '',
@@ -70,6 +70,7 @@
         console.log("add");
       } else {
         console.log("edit");
+        this.stepData = [false, true, false];
       }
 
     },
@@ -86,6 +87,7 @@
           this.commitQuanziInfo();
         } else {
           console.log("edit");
+          this.stepData = [false, true];
         }
       },
       //完成

src/views/yqrange/yq-range.vue

@@ -153,13 +153,16 @@ export default {
     },
     //编辑
     editRange(row) {
-      let enterType = 2;//1:add 2 edit
+      // let enterType = 2;//1:add 2 edit
+      // this.$router.push({
+      //   path: `/create-range?enterType`,
+      //   query:{
+      //     id:row.id,
+      //     enterType:enterType
+      //   }
+      // })
       this.$router.push({
-        path: `/create-range?enterType`,
-        query:{
-          id:row.id,
-          enterType:enterType
-        }
+        path:'/edit-range'
       })
     },
     //解散圈子