Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/views/coupon_manage/add_coupon.vue

@@ -40,11 +40,19 @@
             @change="validityChange"
           />
         </el-form-item>
+        <el-form-item label="有效期（天）" prop="validDays">
+          <el-input v-model="form.validDays" placeholder="" style="width: 200px;">
+            <template slot="append">天</template>
+          </el-input>
+        </el-form-item>
         <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
           <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
             <template slot="prepend">隔</template>
             <template slot="append">天生效</template>
           </el-input>
+          <el-tooltip class="item" effect="dark" content="领取后0天后0点0分" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
         </el-form-item> -->
         <el-form-item label="可用周期" prop="userDays">
           <el-checkbox-group v-model="form.userDays">
@@ -72,6 +80,9 @@
         </el-form-item>
         <el-form-item label="发放数量" prop="number">
           <el-input v-model="form.number" type="number" placeholder="" style="width: 200px;" />
+          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -85,8 +96,13 @@
         <el-form-item label="商品券券名" prop="title">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
+        <el-form-item />
+        <el-form-item />
         <el-form-item label="发放数量" prop="number">
           <el-input v-model="form.number" type="number" placeholder="" style="width: 289px;" />
+          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
         </el-form-item>
         <el-form-item label="使用门槛">
           全额满<el-input v-model="form.fullAmount" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
@@ -155,6 +171,7 @@ export default {
         validStartTime: '',
         validEndTime: '',
         userDays: [],
+        validDays: '',
         useTimeType: 'all',
         useStartTime: '',
         useEndTime: '',
@@ -169,6 +186,20 @@ export default {
             trigger: 'blur'
           }
         ],
+        number: [
+          {
+            required: true,
+            message: '填写发放数量',
+            trigger: 'blur'
+          }
+        ],
+        validDays: [
+          {
+            required: true,
+            message: '填写有效天数',
+            trigger: 'blur'
+          }
+        ],
         daysToTakeEffect: [
           {
             required: true,
@@ -203,13 +234,6 @@ export default {
             validator: validateProduct,
             trigger: 'change'
           }
-        ],
-        number: [
-          {
-            required: true,
-            message: '填写发放数量',
-            trigger: 'blur'
-          }
         ]
       },
       resetForm: ''
@@ -228,7 +252,8 @@ export default {
      * @param item
      */
     tabClick(item) {
-      console.log(item)
+      console.log(this.form)
+      this.form.number = ''
       this.form.type = item.type
       this.$refs.form.resetFields()
     },