udpate: dist

src/assets/style/base/reset.scss

@@ -117,6 +117,15 @@ a:hover {
 .ml0{
   margin-left: 0px!important;
 }
+.ml10{
+  margin-left: 10px!important;
+}
+.ml16{
+  margin-left: 16px!important;
+}
+.ml20{
+  margin-left: 20px!important;
+}
 .ml25{
   margin-left: 25px!important;
 }
@@ -576,5 +585,4 @@ img::after {
   font-weight: 400;
   color: #909399;
   line-height: 17px;
-  margin-left: 20px;
 }
\ No newline at end of file

src/views/ai/task/components/birthActiveTime.vue

@@ -22,7 +22,7 @@
     <el-form-item label="外呼时段" required>
       <el-radio v-model="form.callFlag" :label="0">默认时段</el-radio>
       <el-radio v-model="form.callFlag" :label="1">自定义时段</el-radio>
-      <div v-show="form.callFlag == 0" style="line-height: 20px;">
+      <div v-show="form.callFlag == 0" style="line-height: 20px;margin-top:10px;">
         每天 09:00-20:00
       </div>
       <defineTime v-show="form.callFlag == 1" ref="defineTime" :data="form.callTime" />

src/views/ai/task/components/defineTime.vue

@@ -28,7 +28,7 @@
           >
           </el-time-select>
         </el-form-item>
-        <div class="delIcon" style="margin: 10px 0 0 16px" type="text" @click="delTimeRange(i)">
+        <div class="delIcon" style="margin: 10px 0 0 16px" v-show="form.timeRangeList.length > 1" type="text" @click="delTimeRange(i)">
           <i class="iconfont icon-Delete"></i>
         </div>
       </div>
@@ -64,19 +64,6 @@ export default {
       }
     }
   },
-  computed: {
-    // pickerOptions() {
-    //   console.log(this.form.timeRangeList);
-    //   let endTime = this.form.timeRangeList.reduce((p, v) => (p.endTime < v.endTime ? v : p)).endTime;
-    //   let obj = {
-    //     start: '09:00',
-    //     step: '00:30',
-    //     end: '20:00'
-    //   };
-    //   endTime ? (obj.start = endTime) : '';
-    //   return obj;
-    // }
-  },
   methods: {
     validateTime(i) {
       return (rule, value, callback) => {
@@ -91,7 +78,7 @@ export default {
           end.push(item.endTime ? item.endTime : '');
         });
         for (let i = 1; i < start.length; i++) {
-          if (end[i - 1] && start[i] < end[i - 1]) {
+          if (end[i - 1] && start[i] && start[i] < end[i - 1]) {
             callback(new Error('区间有交叉'));
             return;
           }
@@ -185,9 +172,11 @@ export default {
   border-radius: 4px;
   padding: 16px;
   box-sizing: border-box;
+  margin-top: 10px;
   .flex {
     display: flex;
     align-items: center;
+    margin-bottom: 5px;
   }
   /deep/ .el-date-editor.el-input {
     width: 140px;

src/views/ai/task/tag-value-item.vue

@@ -5,7 +5,7 @@
       <i v-if="currentLength < 50" class="iconfont plus icon margin icon-PlusOutlined" @click="add" />
       <i v-else class="icon margin" />
     </template>
-    <i v-if="currentLength > 1" class="iconfont delete icon icon-delete" @click="del" />
+    <i v-if="currentLength > 1" class="iconfont delete icon icon-Delete" @click="del" />
   </div>
 </template>
 

src/views/ai/task/tagPop.vue

@@ -15,7 +15,7 @@
                   <el-radio v-for="value in item.itemList" :key="value.tagItemId" :label="value" v-model="selectedTag">{{ value.tagItemName }}</el-radio>
                 </div>
               </div>
-              <el-pagination class="fr" layout="prev, pager, next" v-if="totalCount" :total="totalCount" :page-size="pageSize" :current-page.sync="currentPage" @current-change="getGroupList"> </el-pagination>
+              <dm-pagination class="fr" layout="prev, pager, next" v-if="totalCount" :total="totalCount" :page-size="pageSize" :current-page.sync="currentPage" @current-change="getPageMemberTagDetail"> </dm-pagination>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -89,8 +89,8 @@ export default {
     onTabsClick(val) {
       const { name } = val;
       console.log(name);
-      this.getPageMemberTagDetail();
       this.currentPage = 1;
+      this.getPageMemberTagDetail();
     },
     close() {
       this.selectedTag = '';
@@ -119,7 +119,6 @@ export default {
       }
       if (this.tabList.length) {
         this.activeName = this.tabList[0].id;
-        this.currentPage = 1;
         this.getPageMemberTagDetail();
       }
     }