修复营销活动

src/views/bxg/shop/set/seckill.vue

@@ -19,7 +19,12 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="ID" />
-      <el-table-column prop="map.time" label="开启时间(整数小时)" />
+            <el-table-column prop="map.time" label="开启时间">
+              <template slot-scope="scope">
+                {{scope.row.map.time>9?scope.row.map.time+':00':'0'+scope.row.map.time+':00'}}
+              </template>
+            </el-table-column>
+<!--      <el-table-column prop="map.time" label="开启时间(整数小时)" />-->
       <el-table-column prop="map.continued" label="持续时间(整数小时)" />
       <el-table-column prop="map.status" label="状态">
         <template slot-scope="scope">
@@ -112,7 +117,7 @@ export default {
       _this.form = {
         id: data.id,
         groupName: data.groupName,
-        time: data.map.time,
+        time: data.map.time>9?data.map.time+':00':'0'+data.map.time+':00',
         continued: data.map.continued,
         status:data.map.status
       }

src/views/bxg/shop/set/seckillform.vue

@@ -3,7 +3,16 @@
              :title="isAdd ? '新增' : '编辑'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
       <el-form-item label="开启时间(整数小时)">
-        <el-input v-model="form.time" style="width: 270px;"/>
+<!--        <el-input v-model="form.time" style="width: 270px;"/>-->
+        <el-time-select
+          v-model="form.time"
+          :picker-options="{
+           start: '00:00',
+            step: '00:60',
+             end: '24:00'
+           }"
+          placeholder="选择时间">
+        </el-time-select>
       </el-form-item>
       <el-form-item label="持续时间(整数小时)">
         <el-input v-model="form.continued" style="width: 270px;"/>
@@ -41,7 +50,7 @@ export default {
       form: {
         id: '',
         groupName: 'yshop_seckill_time',
-        time: 5,
+        time: '08:00',
         status:2, //默认关闭
         continued: 2
       },
@@ -62,7 +71,14 @@ export default {
       } else this.doEdit()
     },
     doAdd() {
+      // console.log('this.form',Number(this.form.time.slice(0,2)))
+      this.form.time=Number(this.form.time.slice(0,2))
       add(this.form).then(res => {
+        if (res.status==500){
+          this.$message.error(res.msg)
+          this.loading = false
+          return
+        }
         this.resetForm()
         this.$notify({
           title: '添加成功',
@@ -78,6 +94,11 @@ export default {
     },
     doEdit() {
       edit(this.form).then(res => {
+        if (res.status==500){
+          this.$message.error(res.msg)
+          this.loading = false
+          return
+        }
         this.resetForm()
         this.$notify({
           title: '修改成功',
@@ -97,7 +118,7 @@ export default {
       this.form = {
         id: '',
         groupName: 'yshop_seckill_time',
-        time: 5,
+        time: '08:00',
         continued: 2,
         status:2 //默认关闭
       }

src/views/bxg/shop/userlevel/form.vue

@@ -27,7 +27,10 @@
         <el-radio v-model="form.isShow" :label="1">是</el-radio>
         <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
       </el-form-item>
-      <el-form-item label="说明">
+      <el-form-item label="权益说明">
+        <el-input v-model="form.benefit" rows="3" type="textarea" />
+      </el-form-item>
+      <el-form-item label="规则说明">
         <el-input v-model="form.explain" rows="3" type="textarea" />
       </el-form-item>
     </el-form>

src/views/bxg/shop/userlevel/index.vue

@@ -138,6 +138,7 @@ export default {
         imageArr: data.image ? data.image.split(',') : [],
         iconArr: data.icon ? data.icon.split(',') : [],
         explain: data.explain,
+        benefit:data.benefit,
         addTime: data.addTime,
         isDel: data.isDel
       }