update: 更改样式

src/views/pop/form.vue

@@ -15,11 +15,11 @@
             <el-checkbox label="签到日历"></el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item prop="dateTime">
-          <el-tooltip slot="label" open-delay="200" content="计划时间不能和列表中已有计划重叠" placement="top">
-            <span class="tooltip-icon cursor">计划时间：</span>
-          </el-tooltip>
+        <el-form-item prop="dateTime" label="计划时间：">
           <el-date-picker v-model="group.dateTime" @change="filedAllPopDate" :disabled="!!group.id" :picker-options="pickerOptions" :default-time="['00:00:00', '23:59:59']" class="w400" type="datetimerange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-tooltip open-delay="200" content="计划时间不能和列表中已有计划重叠" placement="top">
+            <i class="iconfont icon-tishi" style="display:inline-block;color:#C0C4CC;margin-left:2px;font-size:14px;"></i>
+          </el-tooltip>
         </el-form-item>
         <p class="line"></p>
         <h2 style="font-size: 16px;font-weight: 600;color: #303133;line-height: 62px;margin:7px 0 0 10px;">弹窗</h2>
@@ -84,11 +84,11 @@
                 </template>
                 <el-button type="text" :disabled="pop.activeStatus == 2" @click="showPutonPage(pop, elIndex)">设置</el-button>
               </el-form-item>
-              <el-form-item :prop="`dateTime_${elIndex}`">
-                <el-tooltip slot="label" open-delay="200" content="投放时间不能超过本次计划时间" placement="top">
-                  <span class="tooltip-icon cursor">投放时间：</span>
-                </el-tooltip>
+              <el-form-item :prop="`dateTime_${elIndex}`" label="投放时间：">
                 <el-date-picker v-model="pop.dateTime" :picker-options="pickerOptions2" @focus="checkGroupDate" @blur="datePickerBulr(elIndex)" @change="time => changePoptime(time, elIndex)" :disabled="pop.activeStatus == 2" :default-time="['00:00:00', '23:59:59']" class="w400" type="datetimerange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-tooltip open-delay="200" content="投放时间不能超过本次计划时间" placement="top">
+                  <i class="iconfont icon-tishi" style="display:inline-block;color:#C0C4CC;margin-left:2px;font-size:14px;"></i>
+                </el-tooltip>
               </el-form-item>
               <el-form-item label="弹出频次：" :prop="`popupType_${elIndex}`">
                 <el-radio-group v-model="pop.popupType" :disabled="pop.activeStatus == 2" class="block_radio">
@@ -96,13 +96,8 @@
                   <el-radio :label="2">在用户未完全关闭小程序的情况下，用户每次进入都弹出</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item :prop="`autoCloseFlag_${elIndex}`">
-                <template slot="label">
-                  <el-tooltip class="item" effect="dark" content="自动关闭开启后，弹窗会在倒计时后自动关闭" placement="top">
-                    <span class="tooltip-icon cursor">自动关闭：</span>
-                  </el-tooltip>
-                </template>
-                <el-switch v-model="pop.autoCloseFlag" :active-value="1" :inactive-value="0"></el-switch>
+              <el-form-item :prop="`autoCloseFlag_${elIndex}`" label="自动关闭：">
+                <el-switch v-model="pop.autoCloseFlag" :active-value="1" :inactive-value="0"></el-switch><span style="font-size:12px;color:#909399;margin-left:8px;">（ 开启后，弹窗会在倒计时后自动关闭 ）</span>
                 <el-form-item v-if="pop.autoCloseFlag"> 设置<el-input-number v-model="pop.autoCloseDelay" @change="resetField(`autoCloseFlag_${elIndex}`)" controls-position="right" :min="1" :max="10" :disabled="pop.activeStatus == 2" style="width:90px;margin:0 10px 0 9px;"></el-input-number>秒 后自动关闭 </el-form-item>
               </el-form-item>
             </div>

src/views/pop/list.vue

@@ -63,10 +63,8 @@
         </el-table-column>
         <el-table-column align="left" label="状态" prop="status">
           <template slot-scope="scope">
-            <el-tooltip v-if="scope.row.manualEndFlag" slot="label" open-delay="200" :content="'手动结束时间：' + formatDateTimeByType(scope.row.manualEndTime, 'yyyy-MM-dd HH:mm')" placement="top">
-              <p><i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }}</p>
-            </el-tooltip>
-            <p v-else><i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }}</p>
+            <span><i class="dot" :style="'background:' + (scope.row.activeStatus === 1 ? '#FAAD14' : scope.row.activeStatus === 2 ? '#1890FF' : '#c0c4cc') + ';'"></i> {{ scope.row.activeStatus | statusFilter }}</span>
+            <el-tooltip v-if="scope.row.manualEndFlag" slot="label" open-delay="200" :content="'手动结束时间：' + formatDateTimeByType(scope.row.manualEndTime, 'yyyy-MM-dd HH:mm')" placement="top"> <i class="iconfont icon-tishi" style="color:#C0C4CC;margin-left:2px;font-size:14px;"></i></el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="left" width="170">