11.6

fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue

@@ -95,8 +95,8 @@
       </el-table-column>
       <el-table-column label="优惠券状态" align="center" prop="status" >
       <template slot-scope="scope">
-        <div v-if="scope.row.status == 0">启用</div>
+        <div v-if="scope.row.status == 0"> <el-tag>启用</el-tag> </div>
-        <div v-if="scope.row.status == 1">禁用</div>
+        <div v-if="scope.row.status == 1"> <el-tag type="danger">禁用</el-tag> </div>
       </template>
       </el-table-column>
 
@@ -156,14 +156,11 @@
             <el-radio label="1">折扣券</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="可用油品" prop="satisfiedAmount">
+        <el-form-item label="可用油品" prop="oilType">
           <el-checkbox-group v-model="form.oilType">
-
             <el-checkbox v-for="city in oillist" :label="city" :key="city">{{city}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-
-
         <el-form-item label="满足金额" prop="satisfiedAmount">
           <el-input v-model="form.satisfiedAmount" placeholder="请输入满足金额" />
         </el-form-item>
@@ -195,7 +192,7 @@
 
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="生效时间" v-if="form.effectiveTime == 1" prop="effectiveTime">
+        <el-form-item label="生效时间" v-if="form.effectiveTime == 1" prop="effectiveDateStart">
           <el-time-picker
             arrow-control
             v-model="form.effectiveDateStart"
@@ -320,6 +317,13 @@
         </el-table-column>
         <el-table-column property="exchangeFrom" label="描述信息"></el-table-column>
       </el-table>
+        <pagination
+          v-show="tongji.total>0"
+          :total="tongji.total"
+          :page.sync="tongji.pageNum"
+          :limit.sync="tongji.pageSize"
+          @pagination="gettongji"
+        />
       </div>
     </el-drawer>
 
@@ -411,6 +415,7 @@ export default {
           id:'',
           pageNum: 1,
           pageSize: 10,
+          total:0
       },
       // 表单参数
       form: {availablePeriod:[]},
@@ -449,19 +454,19 @@ export default {
         specialDiscount: [
           { required: true, message: '不能为空', trigger: 'change' }
         ],
-        discountOffset: [
-          { required: true, message: '不能为空', trigger: 'change' }
-        ],
-        validity: [
-          { required: true, message: '不能为空', trigger: 'change' }
-        ],
-        effectiveDate: [
-          { required: true, message: '不能为空', trigger: 'change' }
-        ],
         effectiveTime: [
           { required: true, message: '不能为空', trigger: 'change' }
         ],
-        availablePeriod: [
+        checkTime: [
+          { required: true, message: '不能为空', trigger: 'change' }
+        ],
+        exclusiveFunction: [
+          { required: true, message: '不能为空', trigger: 'change' }
+        ],
+        claimRule: [
+          { required: true, message: '不能为空', trigger: 'change' }
+        ],
+        count: [
           { required: true, message: '不能为空', trigger: 'change' }
         ],
         status: [
@@ -479,8 +484,8 @@ export default {
   methods: {
     gettongji(){
       let data = {
-        pageNum: 1,
+        pageNum:this.tongji.pageNum,
-        pageSize: 10,
+        pageSize:this.tongji.pageSize,
         status:this.tongji.status,
         mobile:this.tongji.mobile,
         id:this.tongji.id
@@ -488,6 +493,7 @@ export default {
       getcountList(data).then(res=>{
         if(res.code == 200){
           this.gridData = res.data.records
+          this.tongji.total = res.data.total
         }
 
       })
@@ -597,9 +603,14 @@ export default {
       getcount(row.id).then(res =>{
         this.fourdata = res.data
       })
-
+        let data = {
-      getcountList(row.id).then(res=>{
+          pageNum:this.tongji.pageNum,
+          pageSize:this.tongji.pageSize,
+          id:row.id
+        }
+      getcountList(data).then(res=>{
         this.gridData = res.data.records
+        this.tongji.total = res.data.total
       })
 
     },