Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev

src/components/brokerage/index.vue

@@ -83,13 +83,13 @@
           label: '顾问',
           value: '1',
           children: [{
-            label: '试听课来源-转年课业绩',
+            label: '试听课来源-转年课业绩提点配置',
             money: '业绩区间',
             scale: '提点比例',
             value: '1',
             data: []
           }, {
-            label: '月课、季课来源-转年课业绩',
+            label: '月课、季课来源-转年课业绩提点配置',
             money: '业绩区间',
             scale: '提点比例',
             value: '2',

src/components/callBack/index.vue

@@ -33,7 +33,7 @@
       <span style="font-size: 12px; color: #999999; white-space: nowrap">最后更新：{{callbackObj.detail.updated_at}}</span>
     </div>
 
-    <div class="callback-item" style="display: flex; margin-bottom: 15px; line-height: 32px;">
+    <div class="callback-item" style="display: flex; align-items: flex-start; margin-bottom: 15px; line-height: 32px;">
       标签：
       <span class="callback-tag-wrapper" v-if="tag.length">
         <el-tag :key="item.id" :type="item.type==1 ? 'info' : ''" v-for="item in tag">{{item.label_name}}</el-tag>

src/components/system/tag.vue

@@ -195,9 +195,12 @@
       },
       dialogReset(callback) {
         this.$nextTick(()=>{
-          this.conditions = arr;
-          this.tableData = [];
-          this.total = 0
+          this.$refs['dialogForm'].resetFields();
+            //this.$nextTick(()=>{
+              callback && callback();
+            //})
+          //this.dialog.form.id = '';
+          //this.dialog.form.pid = '';
         })
       },
       dialogSave() {
@@ -245,7 +248,7 @@
 
       getData() { // 获取标签
         getTagApi().then(res => {
-          this.treeDataOrigin = res;
+          this.treeDataOrigin = res || [];
           this.treeData = [{
             children: res,
             cover: '',

src/components/yunji/index.vue

@@ -283,7 +283,7 @@
         <el-form-item label-width="125px" required="" style="width: 400px" left label="详细地址">
           <el-input type="textarea" v-model="postOtherOrderData.receiver_address" ></el-input>
         </el-form-item>
-        <el-form-item label="带班类型" required="">
+        <el-form-item label="活动方案" required="">
         <el-select v-model="postOtherOrderData.class_source" placeholder="请选择" filterable>
           <el-option
             v-for="(data,index) in classSource"