Merge branch '0601Action' into test

src/views/2021memeberActionManager/index.vue

@@ -39,7 +39,7 @@
           >
         </el-form-item>
         <el-form-item>
-          <auth auths='export/countCloudTeacherActive'>
+          <auth auths="export/countCloudTeacherActive">
             <el-button type="primary" @click="onExport">导出</el-button>
           </auth>
         </el-form-item>
@@ -88,11 +88,12 @@
             order: 'descending',
           }"
         >
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="targetNum"
             label="排名"
-          ></el-table-column>
+          ></el-table-column> -->
+          <el-table-column   align="center" label="排名" type="index" width="50"> </el-table-column>
           <el-table-column
             align="center"
             prop="organName"

src/views/couponManager/couponUpdate.vue

@@ -136,7 +136,7 @@
             :rules="[{ required: true, message: '请选择有效期天数' }]"
           >
             <span style="color: #606266"
-              >有效期天数
+              ><span style="color:#F56C6C">*</span>有效期天数
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">自领取之日起多少天有效</div>
                 <i
@@ -155,7 +155,7 @@
             :rules="[{ required: true, message: '请选择有效期' }]"
           >
             <span style="color: #606266"
-              >有效期
+              ><span style="color:#F56C6C">*</span>有效期
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">优惠券可使用时间段</div>
                 <i
@@ -206,7 +206,8 @@
             :rules="[{ required: true, message: '请输入领取上限' }]"
           >
             <span style="color: #606266"
-              >领取上限
+              >
+              <span style="color:#F56C6C">*</span> 领取上限
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">用户可领取最大张数</div>
                 <i
@@ -226,7 +227,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col style="width: 395px">
-          <el-form-item label="领取时间" prop="getTime">
+          <el-form-item label="领取时间" prop="getTime"  :rules="[{ required: true, message: '请输入领取时间' }]">
             <el-date-picker
               style="width: 100%"
               v-model="form.getTime"