Merge branch 'dev-yqLive-20200611' into dev-yLive-saas-all-0623

* dev-yqLive-20200611: (49 commits)
  修改新建直播
  修改编辑直播
  修改新建直播
  圈子列表状态更新和新建直播修改
  成员列表页去除测试数据
  修复选择全国等级bug
  修改圈子权限
  修改新建直播和圈子权限
  修改新建直播和编辑直播
  小圈创建时间修改
  引入权限api
  小圈权限展示
  直播列表刷新
  添加小圈权限校验
  成员权限变更后刷新页面
  成员权限
  新建直播和小圈上下线
  新建编辑直播修改
  修复新建直播id问题
  代码提交冲突
  ...

# Conflicts:
#	package.json
#	src/router/router.js
#	src/utils/fetch.js

src/App.vue

@@ -30,7 +30,7 @@ import VFooter from './views/layout/footer.vue'
 import { base64decode, isNotEmptyUtils, getUrlParamsMap } from "./utils/utils.js"
 import { mapActions, mapGetters } from 'vuex'
 import { getLoginUrl } from './utils/index.js'
-import { getRedNum } from './utils/patients/patientsapi'
+import { getRedNum, getCircleRole } from './utils/patients/patientsapi'
 let vm = null
 export default {
 	components:{
@@ -149,11 +149,32 @@ export default {
 					vm.portrait = res.data.imageUrl
 					vm.authList = res.data.auth
           vm.getUserName(vm.userName);
+					vm.getCircleRoleData();
 				} else {
 					vm.$message.info(res.message)
 				}
 			})
 		},
+    setStoreData(value) {
+      if (value){
+        return 1;
+      }else {
+        return 0;
+      }
+    },
+    getCircleRoleData() {
+      getCircleRole({}).then((res) => {
+        if(res.code == '000000') {
+          //mainManager主管理员，manager管理员，ordinary普通人
+          const { mainManager, manager, ordinary} = res.data;
+          localStorage.setItem('mainManager', vm.setStoreData(mainManager))
+          localStorage.setItem('manager', vm.setStoreData(manager))
+          localStorage.setItem('ordinary', vm.setStoreData(ordinary))
+        } else {
+          vm.$message.info(res.message)
+        }
+      })
+    },
     getRedData() {
       getRedNum({
         openTime: (new Date()).getTime()

src/components/yqrange/baseinfo.vue

+<template>
+  <el-form ref="formData" :model="formData" :rules="rules" label-width="150px" label-suffix="：" class="basic-form">
+    <el-form-item label="圈子名称" prop="name">
+      <el-col :span="13">
+        <el-input size="small" v-model="formData.name" placeholder="请输入圈子名称" style="width:70%;"
+          @change="returnTypeData('name')"></el-input>
+        <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/14</span>
+      </el-col>
+    </el-form-item>
+    <div class="basic-item-icon">
+      <el-form-item label="圈子头像" class="required-label">
+        <el-upload v-model="formData.headUrl" class="bg-uploader" action="#" :show-file-list="false"
+          :before-upload="beforeUploadPic1">
+          <img v-if="formData.headUrl" :src="formData.headUrl" @mouseover.stop="imgMouseOver1=true" class="bg-img" />
+          <img v-if="!formData.headUrl" class="bg-img" src="../../assets/image/small.png" />
+          <div class="img-delete" v-show="imgMouseOver1" @click.stop="deleteImg(1)"
+            @mouseout.stop="imgMouseOver1=false">
+            <i class="el-icon-delete"></i>
+          </div>
+          <div class="limit-text">
+            <p></p>
+            <p>分辨率160*160</p>
+            <p>支持.jpeg,.png格式</p>
+          </div>
+        </el-upload>
+      </el-form-item>
+      <p class="upload-message" v-if="uploadImgMessage1">请选择圈子头像</p>
+    </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>
+        <span class="word-num">{{(formData.introduce).replace(/\s+/g,"").length}}/40</span>
+      </el-col>
+    </el-form-item>
+    <el-form-item label="内容发布权限" prop="dynamicFlag">
+      <el-select v-model="formData.dynamicFlag" @change="returnTypeData('dynamicFlag')" placeholder="请选择发布权限"
+        size="small" clearable>
+        <el-option v-for="(item,index) in contentList" :key="index" :label="item.label" :value="item.value">
+        </el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+  let vm = null;
+  import { openLoading, closeLoading } from "../../utils/utils";
+  import { doUpload, getFilePath } from "../../utils/qiniu-util";
+  export default {
+    name: "baseinfo",
+    props: {
+      formData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    created() {
+      vm = this;
+    },
+    data() {
+      let checkProjectStr = (rule, value, callback) => {
+        if (value.indexOf("\\") != -1) {
+          //存在
+          callback(new Error("请勿输入字符“ \\ ”"));
+        } else if (value.indexOf(".") != -1) {
+          callback(new Error("请勿输入字符“ . ”"));
+        } else {
+          callback();
+        }
+      };
+      return {
+        rules: {
+          name: [
+            { required: true, message: "请输入圈子名称", trigger: "blur" },
+            {
+              min: 2,
+              max: 14,
+              message: "输入长度为2-14的内容，可包含中英文、数字及特殊符号",
+              trigger: "blur"
+            }, 
+            { validator: checkProjectStr, trigger: "blur" }
+          ],
+          introduce: [
+            { required: true, message: "请输入圈子介绍", trigger: "blur" },
+            {
+              min: 2,
+              max: 40,
+              message: "输入长度为2-40的内容，可包含中英文、数字及特殊符号",
+              trigger: "blur"
+            },
+            { validator: checkProjectStr, trigger: "blur" }
+          ],
+          headUrl: [
+            { required: true, message: "请选择圈子头像", trigger: "blur" }
+          ],
+          dynamicFlag: [
+            { required: true, message: "请选择内容发布权限", trigger: "blur" },
+          ]
+        },
+        imgMouseOver1: false,
+        uploadImgMessage1: false,//未上传图片，校验提示语
+        contentList: [
+          {
+            value: 1,
+            label: '所有人可发布'
+          }, {
+            value: 2,
+            label: '管理员可发布'
+          },
+        ],
+      }
+    },
+
+    methods: {
+      returnTypeData(name) {
+        this.$emit('returnTypeData', {
+          name: name,
+          val: this.formData[name]
+
+        })
+      },
+      //表单校验
+      submitForm() {
+        let formName = "formData";
+        let flag = null;
+        if (!this.formData.headUrl){
+          this.uploadImgMessage1 = true;
+        }
+        this.$refs[formName].validate(valid => {
+          if (valid&&this.formData.headUrl!="") {
+            flag = true;
+          } else {
+            console.log("error submit!!");
+            flag = false;
+          }
+        });
+        this.$emit('returnIsNext', flag);
+      },
+      //上传圈子头像
+      beforeUploadPic1(file) {
+        let fileLimit = {
+          width: 48,
+          height: 48,
+          size: 0.5,
+          sizeText: "500K",
+          key: "headUrl",
+          more: "imgUrl1More",
+          show: "uploadImgMessage1"
+        };
+        this.beforeUpload(file, fileLimit);
+      },
+      //上传图片
+      beforeUpload(file, fileLimit) {
+        let vm = this;
+        const isJPG = file.type === "image/jpeg";
+        const isPNG = file.type === "image/png";
+        const isLt2M = file.size / 1024 / 1024 < fileLimit.size;
+        if (!isJPG && !isPNG) {
+          vm.$message.error("图片格式不符合规范，请根据规范上传图片");
+          // return;
+        }
+        if (!isLt2M) {
+          vm.$message.error("图片大小不符合规范，请根据规范上传图片 ");
+          // return;
+        }
+        let _img = new FileReader();
+        _img.readAsDataURL(file);
+        _img.onload = function (theFile) {
+          let image = new Image();
+          image.src = theFile.target.result;
+          image.onload = function () {
+            let _this = this;
+            // if (_this.width != fileLimit.width || _this.height != fileLimit.height) {
+            //   // if (false) {
+            //   vm.$message.error("图片尺寸不符合规范，请根据规范上传图片");
+            // } else {
+              openLoading(vm);
+              doUpload(vm, file, getFilePath(file, null), "preview4", "progress1", 1).then(function (path) {
+                closeLoading(vm);
+                console.log('上传成功后路径', path);
+                if (fileLimit.show == "uploadImgMessage1") {
+                  vm.uploadImgMessage1 = false;
+                } else if (fileLimit.show == "uploadImgMessage2") {
+                  vm.uploadImgMessage2 = false;
+                }
+                vm.formData[fileLimit.key] = path.fullPath;
+                vm.formData[fileLimit.more] = {
+                  attachmentName: path.name,
+                  attachmentExt: path.ext,
+                  attachmentSize: path.size
+                };
+                vm.$message.success("上传成功");
+              });
+            // }
+          };
+        };
+        return isJPG && isLt2M;
+      },
+      //删除图片
+      deleteImg(type) {
+        if (type == 1) {
+          vm.formData.headUrl = "";
+          vm.imgMouseOver1 = false;
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  .first-step {
+    margin-top: 20px;
+
+    .p-title {
+      padding-left: 10px;
+      margin-bottom: 15px;
+    }
+
+    .basic-item-icon {
+      position: relative;
+
+      .require {
+        position: absolute;
+        left: 67px;
+        top: 11px;
+        color: #f56c6c;
+      }
+
+      .upload-message {
+        position: absolute;
+        left: 160px;
+        top: 105px;
+        font-size: 12px;
+        color: #f56c6c;
+      }
+
+      .img-delete {
+        position: absolute;
+        left: 0px;
+        top: 0px;
+        width: 84px;
+        height: 100px;
+        background: #000;
+        opacity: 0.7;
+        z-index: 999;
+
+        i {
+          color: #fff;
+          margin-top: 39px;
+          margin-left: 0px;
+        }
+      }
+    }
+
+    .word-num {
+      font-size: 12px;
+      color: #999;
+      padding-top: 5px;
+    }
+
+    .line {
+      margin-left: 10px;
+      width: 20px;
+    }
+
+    .bg-uploader {
+      .bg-img {
+        float: left;
+        width: 84px;
+        height: 100px;
+      }
+
+      .limit-text {
+        float: left;
+        margin-left: 10px;
+        margin-top: -10px;
+
+        p {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+    }
+
+    .el-upload__tip {
+      position: absolute;
+      top: -6px;
+      left: 130px;
+    }
+  }
+
+  .required-label .el-form-item__label::before {
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+  }
+</style>
\ No newline at end of file

src/router/range.js

+<!-- 圈子router -->
\ No newline at end of file

src/router/router.js

@@ -51,6 +51,13 @@ const auditCustomCourse = r => require.ensure([], () => r(require('../views/educ
 
 const noticeEditor = r => require.ensure([], () => r(require('../views/education/notice-editor.vue')), 'notice-editor')
 
+const yqRange = r => require.ensure([], () => r(require('../views/yqrange/yq-range.vue')), 'yq-range')
+const liveManage = r => require.ensure([], () => r(require('../views/yqrange/live-manage.vue')), 'live-manage')
+const roleManage = r => require.ensure([], () => r(require('../views/yqrange/role-manage.vue')), 'role-manage')
+const createRange = r => require.ensure([], () => r(require('../views/yqrange/create-range.vue')), 'create-range')
+const editRange = r => require.ensure([], () => r(require('../views/yqrange/edit-range.vue')), 'edit-range')
+const createLive = r => require.ensure([], () => r(require('../views/yqrange/create-live.vue')), 'create-live')
+
 export default [{
     path: '/',
     component: App,
@@ -190,7 +197,7 @@ export default [{
         {
             path: '/edu-role',
             component: eduRole
-        },        
+        },
         {
             path: '/notice-editor',
             component: noticeEditor
@@ -202,6 +209,28 @@ export default [{
         {
             path: '/audit-custom-course',
             component: auditCustomCourse,
+            path: '/yq-range',
+            component: yqRange
+        },
+        {
+            path: '/live-manage',
+            component: liveManage
+        },
+        {
+            path: '/role-manage',
+            component: roleManage
+        },
+        {
+            path: '/create-range',
+            component: createRange
+        },
+        {
+            path: '/create-live',
+            component: createLive
+        },
+        {
+            path:'/edit-range',
+            component: editRange
         },
       // {
       //   path: '/followup',

src/utils/fetch.js

@@ -52,9 +52,10 @@ service.interceptors.request.use(config => {
     if( config.headers['sysCode']==undefined) {
       config.headers['sysCode'] = 12
     }
-    if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
+    if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       config.headers['token'] = '3F5F01DF814C46E59FF09F3E63A55D18';
+      // config.headers['token'] = 'B27DC440F5A04807AEA8E31B2B58EDF8';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/utils/filter.js

 const vueFilter = {
     liveDateFilter: (value) => {
         if (!value) return '';
+        // var date = new Date(value);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        // var year = date.getFullYear(),
+        // month = ("0" + (date.getMonth() + 1)).slice(-2),
+        // sdate = ("0" + date.getDate()).slice(-2),
+        // hour = ("0" + date.getHours()).slice(-2),
+        // minute = ("0" + date.getMinutes()).slice(-2),
+        // second = ("0" + date.getSeconds()).slice(-2);
+        // // 拼接
+        // var result = year + "-"+ month +"-"+ sdate +" "+ hour +":"+ minute +":" + second;
+        // var result = `${month}-${sdate} ${hour}:${minute}`;
+        // 返回
+       // return result;
         return new Date(value).format("yyyy-MM-dd hh:mm:ss");
+        // return new Date(value.replace(/\s/, 'T')).format("yyyy-MM-dd hh:mm:ss");
     },
     liveFilter: (value) => {
         if (value.liveStatus == 1) {
@@ -446,5 +459,44 @@ const vueFilter = {
             return value
         }
     },
+    // 云鹊小圈 内容发布权限
+    dynamicFlagStatus: (value) => {
+      if (value == 1) {
+        return '所有人可发布'
+      }else if (value == 2) {
+        return '管理员可发布'
+      }else {
+        return '-'
+      }
+    },
+    // 圈子状态 0:暂存 10:待发布（已保存） 20:已发布（已提交待审核、审核被拒绝） 30:已上架（审核通过）40：下架 50：解散
+    rangeStatus: (value) => {
+        if (value == 0) {
+            return '暂存'
+        }else if (value == 10) {
+            return '下线'
+        }else if (value == 20) {
+            return ''
+        }else if (value == 30) {
+          return '上线'
+        } else if (value == 40) {
+          return '下线'
+        }else if (value == 50) {
+          return '已解散'
+        }else {
+            return '-'
+        }
+    },
+    liveStatusFilter: (value) => {
+        if (value == 1) {
+            return '预告'
+        }else if (value == 2) {
+            return '直播中'
+        }else if (value == 3) {
+            return '已结束'
+        }else {
+            return '-'
+        }
+    },
 }
-export default vueFilter
+export default vueFilter
\ No newline at end of file

src/utils/patients/patientsapi.js

@@ -499,3 +499,18 @@ export const postTrace = (actionName, viewPath) => {
     description: '手动添加埋点',
   })
 }
+
+export const getCircleRole = (params) => {
+  // return utils.checkAuth(()=>{
+  return fetch({
+    headers: {
+      token: localStorage.getItem('storageToken')
+    },
+    url: getBaseUrl(`circle/circle/user/auth`),
+    method: 'get',
+    params: params,
+    description: '获取圈子展示权限',
+  })
+  // })
+
+};

src/utils/yqrange/rangeApi.js

+import fetch from '../fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+let headers = {
+'Content-Type': 'application/json;charset=UTF-8',
+token: localStorage.getItem('storageToken'),
+};
+
+export const getCircleInfoReq = (id) => {
+return fetch({
+headers,
+url: getBaseUrl(`circle/circle/${id}/info`),
+method: 'get',
+description: '获取圈子详情',
+})
+};
+export const getCircleProvincesReq = (idType) => {
+return fetch({
+headers,
+url: getBaseUrl(`circle/memberSelect/provinces/idType/${idType}`),
+method: 'get',
+description: '根据用户ID 获取选人时省市',
+})
+};
+export const getMemberSelectOrgReq = (data) => {
+return fetch({
+headers,
+url: getBaseUrl(`circle/memberSelect/org/search`),
+method: 'post',
+data: data,
+description: '圈子设置查询机构列表',
+})
+};
+export const getMemberSelectOrgOptionReq = (data) => {
+  return fetch({
+  headers,
+  url: getBaseUrl(`circle/memberSelect/org/option`),
+  method: 'post',
+  data: data,
+  description: '圈子设置勾选操作',
+  })
+  };
+  export const getMemberSelectOrgSaveReq = (data) => {
+    return fetch({
+    headers,
+    url: getBaseUrl(`circle/memberSelect/org/save`),
+    method: 'post',
+    data: data,
+    description: ' 圈子设置选择机构保存',
+    })
+    };
+ 
+ 
+
+

src/utils/yqrange/yqrangeApi.js

+import fetch from '../fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+let headers = {
+  'Content-Type': 'application/json;charset=UTF-8',
+  token: localStorage.getItem('storageToken'),
+};
+
+
+export const getAuth = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/circle/user/auth`),
+    method: 'get',
+    description: '查看外部用户权限接口',
+  })
+};
+
+export const getRangeList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/circle/list`),
+    method: 'post',
+    data: params,
+    description: '查看圈子列表',
+  })
+};
+
+export const updateRangeStatus = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/circle/change/${params.id}/status/to/${params.status}`),
+    method: 'get',
+    // params: params,
+    description: '查询单个直播',
+  })
+};
+
+export const getRtcInfo = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`rtc/liveAdmin/${params.rtcId}`),
+    method: 'get',
+    // params: params,
+    description: '查询单个直播',
+  })
+};
+
+
+

src/views/layout/slidebar.vue

@@ -311,10 +311,25 @@
           checkAuth: true,
         }
 
+        const yqRange = {
+          title: '云鹊小圈',
+          icon: 'el-icon-setting',
+          index: 'yq-range'
+        };
+
         vm.items[1].title = '教育培训';
         vm.items.push(followSider);
         vm.items.push(patients);
         vm.items.push(message);
+        let mainManager = localStorage.getItem('mainManager')
+        let manager = localStorage.getItem('manager')
+        let ordinary = localStorage.getItem('ordinary')
+        console.log('zhu',mainManager)
+        console.log('guan',manager)
+        console.log('pu',ordinary)
+        if (mainManager == 1 || manager == 1) {
+          vm.items.push(yqRange);
+        }
       },
 
       setEntrySide() {
@@ -372,12 +387,18 @@
             },
           ]
         }
+          const yqRange = {
+            title: '云鹊小圈',
+            icon: 'el-icon-setting',
+            index: 'yq-range'
+          };
         
         vm.items[1].subs.push(itemComponent);
         vm.items[1].subs.push(templateManager);
         vm.items[1].subs.push(followSider);
         vm.items.push(eduRole);
         vm.items.push(cme);
+        vm.items.push(yqRange);
       },
 
       goToMessageSendPage(checkAuth) {

src/views/yqrange/create-range.vue

+<template>
+  <div class="yqrange-index-wrapper">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
+    <div class="yqrange-index-content screenSet" id="screenSet">
+      <el-row class="step-content">
+        <el-col :span="14">
+          <el-steps :active="active" simple class>
+            <span class="step-num" v-bind:class="{ 'on-step': stepData[0] }">1</span>
+            <el-step title="基础信息"></el-step>
+            <span class="step-num" v-bind:class="{ 'on-step': stepData[1] }">2</span>
+            <el-step title="选择成员">2</el-step>
+          </el-steps>
+        </el-col>
+        <el-col :span="5" :offset="5">
+          <el-button v-if="active<1" size="small" type="primary" @click="nextStep">下一步</el-button>
+          <el-button v-if="active>=1" size="small" type="primary" @click="complete">完成</el-button>
+        </el-col>
+      </el-row>
+      <div class="first-step" v-if="active === 0">
+        <p class="p-title">基础信息</p>
+        <base-info :formData="formData" @returnTypeData="returnTypeData" @returnIsNext="returnIsNext" ref="child">
+        </base-info>
+      </div>
+      <div class="second-step" v-else-if="active === 1">
+        <organzation :formData="formData"></organzation>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  let vm = null;
+  import BreadCrumb from "@/components/breadcrumb.vue";
+  import { openLoading, closeLoading } from "../../utils/utils";
+  import BaseInfo from '@/components/yqrange/baseinfo.vue';
+  import Organzation from '@/components/yqrange/organzation.vue';
+  import { getCircleInfoReq, getMemberSelectOrgSaveReq } from '@/utils/yqrange/rangeApi';
+  export default {
+    name: "create-range",
+    components: {
+      BreadCrumb,
+      BaseInfo,
+      Organzation
+    },
+    data() {
+      return {
+        id: null,
+        enterType: 1,//1.creat 2.edit
+        curmbFirst: '云鹊小圈',
+        curmbSecond: '新建小圈',
+        active: 0,
+        //页面展示位置
+        stepData: [true, false],
+        formData: {
+          id: null,
+          name: '',
+          headUrl: '',
+          imgUrl1More: {},
+          imgUrl2More: {},
+          introduce: '',
+          dynamicFlag: '',
+          idType: localStorage.getItem("storageIdType")
+        }
+      }
+    },
+    created() {
+      vm = this;
+      // 根据ID是否有值判断编辑还是create
+      // debugger
+      const { enterType, id } = this.$route.query;
+      this.id = id;
+      this.enterType = enterType;
+
+      //edit
+      if (this.enterType == 2 && this.id != null) {
+        this.getCircleInfo();
+      }
+
+    },
+    methods: {
+      //下一步
+      nextStep() {
+        // debugger
+        this.$refs.child.submitForm();
+      },
+
+      //完成
+      complete() {
+        console.log(this.formData.id);
+        let req = {
+          circleId: this.formData.id,
+        };
+        openLoading(vm);
+        getMemberSelectOrgSaveReq(req).then(res => {
+          closeLoading(vm);
+          if (res.code == "000000") {
+            this.$message.success('操作成功');
+            const _this = this;
+            setTimeout(function () {
+              _this.$router.go(-1)
+            }, 2000);
+            // vm.$router.push({ path: "yq-range" });
+          } else {
+            this.$message(res.message);
+          }
+        }).catch(err => {
+          this.$message.error('请求失败');
+        });
+
+      },
+      //  修改编辑基础信息
+      returnIsNext(flag) {
+        if (flag == true) {
+          this.commitQuanziInfo();
+        }
+      },
+      returnTypeData(item) {
+        this.formData[item.name] = item.val
+      },
+      //获取圈子详情
+      getCircleInfo() {
+        getCircleInfoReq(this.id).then(res => {
+          // closeLoading(this);
+          if (res.code == "000000") {
+            this.formData = { ...this.formData, ...res.data };
+          } else {
+            this.$message(res.message);
+          }
+        }).catch(err => {
+          this.$message.error('请求失败');
+        });
+      },
+      commitQuanziInfo() {
+        let req = this.formData;
+        console.log("commitQuanziInfo() : name = " + req.name + ", headUrl = " + req.headUrl
+          + ", coverUrl = " + req.coverUrl + ", introduce = " + req.introduce + ", dynamicFlag = " + req.dynamicFlag)
+        vm.POST("circle/circle/save", req).then(res => {
+          if (res.code == "000000") {
+            // console.log(res);
+            console.log(this.$refs);
+            vm.formData.id = res.data;
+            this.active = 1;
+            this.stepData = [false, true];
+         
+          
+          } else {
+            //
+          }
+        });
+      },
+    }
+  }
+</script>
+<style lang="scss">
+  .yqrange-index-wrapper {
+    .yqrange-index-content {
+      background: #fff;
+      padding: 10px;
+
+      .step-content {
+        overflow: hidden;
+        height: 60px;
+        padding: 15px 0 50px 0;
+        border-bottom: 1px solid #efefef;
+
+        .is-text {
+          display: none;
+        }
+
+        .el-steps--simple {
+          background: #fff;
+          padding: 10px 8%;
+        }
+
+        .step-num {
+          display: block;
+          margin-top: 1.5px;
+          font-size: 12px;
+          border: 1px solid #999 !important;
+          border-radius: 50%;
+          width: 25px;
+          height: 18px;
+          line-height: 15px;
+          text-align: center;
+          color: #999;
+        }
+
+        .el-step__title.is-wait {
+          color: #999;
+        }
+
+        .el-step__title.is-process {
+          color: #449284;
+        }
+
+        .is-finish {
+          color: #999 !important;
+        }
+
+        .on-step {
+          color: #449284;
+          border: 1px solid #449284 !important;
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file