Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/utils/filter.js

@@ -492,9 +492,9 @@ const vueFilter = {
         }else if (value == 20) {
             return ''
         }else if (value == 30) {
-          return '上线'
+          return '已上线'
         } else if (value == 40) {
-          return '下线'
+          return '已下线'
         }else if (value == 50) {
           return '已解散'
         }else {

src/views/education/edit-custom.vue

@@ -75,13 +75,14 @@
               size="small"
               v-model="formCircle.microecologyId"
               placeholder="请选择关联小圈"
-              :disabled="status4Flag == 1"
+              :disabled="status4Flag == 1 || isPreview == 1"
             >
               <el-option
                 v-for="item in circleList"
                 :key="item.id"
                 :label="`${item.id}-${item.name}`"
                 :value="item.id"
+                :disabled="isPreview == 1"
               ></el-option>
             </el-select>
           </el-form-item>

src/views/education/edit-manager.vue

@@ -3354,6 +3354,11 @@ export default {
             type: "info",
             message: "请选择关联小圈"
           });
+        } else {
+          vm.$message({
+            type: "info",
+            message: "成功"
+          });
         }
         return;
       }
@@ -3371,10 +3376,10 @@ export default {
             this.active++;
             this.stepData = [false, false, true];
             this.tagDrop();
-          } else if (type == 'storage') {
+          } else {
             vm.$message({
-              type: "success",
-              message: "暂存成功"
+              type: "info",
+              message: "成功"
             });
           }
         }