Merge branch '0601Action' into test

src/views/couponManager/couponUpdate.vue

@@ -133,7 +133,7 @@
         <el-col style="width: 395px" v-if="form.effectiveType == 'DAYS'">
           <el-form-item
             prop="deadline"
-            :rules="[{ required: true, message: '请选择有效期天数' }]"
+            :rules="[{ required: true, message: '请输入有效期天数' }]"
           >
             <span style="color: #606266"
               ><span style="color:#F56C6C">*</span>有效期天数
@@ -305,7 +305,8 @@ export default {
     changeEffectiveType() {
       // this.form.effectiveTime = [];
       this.$set(this.form,'effectiveTime',[])
-      this.form.deadline = "";
+      this.$set(this.form,'deadline',null)
+      // this.form.deadline = "";
     },
     onCancel() {
       this.$router.push("/couponManager");