diff --git a/src/views/common/common.vue b/src/views/common/common.vue
index 33fc406..d919d02 100644
--- a/src/views/common/common.vue
+++ b/src/views/common/common.vue
@@ -6,8 +6,32 @@ const baseUrl = "http://192.168.110.100:9200/pb"; //张川川后端
 // function commonFun() {
 //     console.log("公共方法")
 // }
+const rangList =[       
+        {
+          value: 0,
+          label: "无限制"
+        },
+        {
+          value: 1,
+          label: "课程券"
+        },
+        {
+          value: 2,
+          label: "课程品类券"
+        } 
+        ];
+const TypeList =[
+        {
+          value: "0",
+          label: "现金"
+        },
+        {
+          value: "1",
+          label: "折扣"
+        }
+        ]
 export default {
-  baseUrl
+  baseUrl,rangList,TypeList
   //commonFun
 };
 </script>
diff --git a/src/views/modules/coupon/coupon-add-or-update.vue b/src/views/modules/coupon/coupon-add-or-update.vue
index cf89a00..e1bf771 100644
--- a/src/views/modules/coupon/coupon-add-or-update.vue
+++ b/src/views/modules/coupon/coupon-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" width="900px">
+  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" width="900px" @close="closeDia">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
       label-width="100px">
       <el-row :gutter="10">
@@ -22,11 +22,11 @@
         </el-input>
         
       </el-form-item></el-col>
-    <el-col :span="8"><el-form-item label="商品类型" prop="couponProType">
+    <el-col :span="8"><el-form-item label="优惠卷范围" prop="couponRange">
         <!-- <el-input v-model="dataForm.type" placeholder="优惠卷类型"></el-input> -->
-        <el-select v-model="dataForm.couponProType" placeholder="请选择">
+        <el-select v-model="dataForm.couponRange" placeholder="请选择">
           <el-option
-      v-for="item in options2"
+      v-for="item in rangList"
       :key="item.value"
       :label="item.label"
       :value="item.value">
@@ -58,29 +58,32 @@
       <el-row ::gutter="10">
       </el-row>
       <el-row ::gutter="10">
-        <el-col :span="8">
-          <el-form-item label="开始时间" prop="takeEffectType">
-            <el-radio-group v-model="dataForm.takeEffectType">
-            <el-radio :label="0">领取日</el-radio>
-            <el-radio :label="1">设置日期</el-radio>
+        <el-col :span="24">
+          <el-form-item label="生效方式" prop="effectType">
+            <el-radio-group v-model="dataForm.effectType">
+            <el-radio :label="0">长期有效</el-radio>
+            <el-radio :label="1">领取生效</el-radio>
+            <el-radio :label="2">自定义</el-radio>
           </el-radio-group>
           </el-form-item>
-          <el-form-item label="开始时间" prop="takeEffectDate" v-if="dataForm.takeEffectType == '1'">
+          <el-form-item label="开始时间" prop="effectTime" v-if="dataForm.effectType == '2'">
           <el-date-picker 
-      v-model="dataForm.takeEffectDate" @change="datePicked"
-      type="datetime" value-format="timestamp" 
-      placeholder="选择日期时间"
-      default-time="12:00:00">
-    </el-date-picker>            
+              v-model="dataForm.effectTime" @change="datePicked"
+              type="datetime" value-format="timestamp" 
+              placeholder="选择日期时间"
+              default-time="12:00:00">
+            </el-date-picker>            
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-show="dataForm.effectType == '1'">
           <el-form-item label="时效" prop="validity">
             <el-input placeholder="" v-model="dataForm.validity" oninput="value=value.replace(/[^\d.]/g,'')">
               <template slot="append">天</template>
             </el-input>
           </el-form-item>
-        </el-col>
+        </el-col>        
+      </el-row>
+      <el-row ::gutter="10">
         <el-col :span="8">
           <el-form-item label="总发行量" prop="totalCirculation">
             <el-input v-model="dataForm.totalCirculation"  placeholder="发行数量" oninput="value=value.replace(/[^\d.]/g,'')">
@@ -103,10 +106,17 @@
           </el-dialog>
         </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="dataForm.remark" placeholder="备注" type="textarea" rows="2" autosize>
+            </el-input>
+
+         </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
+      <el-button @click="closeDia">取消</el-button>
       <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
@@ -119,7 +129,7 @@ export default {
   data() {
     return {
       baseUrl:global.baseUrl,
-      visible: false,
+      visible: true,
       options2: [{
         value: 0,
         label: '商品'
@@ -135,12 +145,13 @@ export default {
         value: 1,
         label: '折扣券'
       }],      
-      
+      rangList: global.rangList,
+      TypeList: global.TypeList,
       dialogVisible:false,      
       fileList: [], // 封面图
       dataForm: {
         couponType:null,
-        couponProType:null,  // 使用商品类型
+        couponRange:null,  // 使用商品类型
         useLevel:null, // 使用门槛
         id: 0,
         couponName:'',
@@ -148,8 +159,8 @@ export default {
         couponUrl:'',
         limitedCollar:null,
         validity:'',
-        takeEffectType: null,       // 生效方式
-        takeEffectDate:null,
+        effectType: null,       // 生效方式
+        effectTime:null,
         totalCirculation:null,
         remark:''
         
@@ -164,13 +175,13 @@ export default {
         couponAmount: [
           { required: true, message: '优惠券面额不能为空', trigger: 'blur' }
         ],
-        takeEffectType: [
+        effectType: [
           { required: true, message: '生效方式不能为空', trigger: 'blur' }
         ],
-        validity: [
-          { required: true, message: '时效不能为空', trigger: 'blur' }
-        ],
-        couponProType: [
+        // validity: [
+        //   { required: true, message: '时效不能为空', trigger: 'blur' }
+        // ],
+        couponRange: [
           { required: true, message: '商品类型不能为空', trigger: 'blur' }
         ],
         useLevel: [
@@ -217,26 +228,18 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.$http({
-            url: this.$http.adornUrl(`/book/coupon/info/${this.dataForm.id}`),
-            method: 'get',
-            params: this.$http.adornParams()
+            url: this.$http.adornUrl(`/common/coupon/getCouponInfo`),
+            method: 'post',
+            data: this.$http.adornData(
+              { id: this.dataForm.id}
+            )
           }).then(({ data }) => {
+            if(data.code !==0) return this.$message.error(data.msg)
             if (data && data.code === 0) {
-              this.dataForm.id = data.coupon.id
-              this.dataForm.couponType = data.coupon.couponType
-              this.dataForm.couponName = data.coupon.couponName
-              this.dataForm.couponAmount = data.coupon.couponAmount              
-              this.dataForm.limitedCollar = data.coupon.limitedCollar
-              this.dataForm.validity = data.coupon.validity
-              this.dataForm.takeEffectType = data.coupon.takeEffectType
-              this.dataForm.takeEffectDate = data.coupon.takeEffectDate
-              this.dataForm.totalCirculation = data.coupon.totalCirculation
-              this.dataForm.remark = data.coupon.remark
-              this.dataForm.useLevel = data.coupon.useLevel,
-              this.dataForm.couponProType = data.coupon.couponProType              
+              this.dataForm = data.couponEntity                
               // this.dataForm.couponUrl = {name:'', url:}
-              if (data.coupon.couponUrl != "") {
-                var img = { name: '', url: data.coupon.couponUrl }
+              if (data.couponEntity.couponUrl != "") {
+                var img = { name: '', url: data.ouponEntity.couponUrl }
                 var attr = []
                 attr.push(img)
                 this.fileList = attr
@@ -264,12 +267,35 @@ export default {
     datePicked(){
       console.log(this.dataForm.startTime)
     },
+    closeDia(){
+      this.visible = false
+      this.dataForm.couponUrl = '';
+      this.$refs.dataForm.resetFields()
+      this.dataForm ={
+        couponType:null,
+        couponRange:null,  // 使用商品类型
+        useLevel:null, // 使用门槛
+        id: 0,
+        couponName:'',
+        couponAmount:null,
+        couponUrl:'',
+        limitedCollar:null,
+        validity:'',
+        effectType: null,       // 生效方式
+        effectTime:null,
+        totalCirculation:null,
+        remark:''
+        
+      }
+    },
+
     // 表单提交
     dataFormSubmit() {
       this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
+        if (valid) {         
+
           this.$http({
-            url: this.$http.adornUrl(`/book/coupon/${!this.dataForm.id ? 'save' : 'update'}`),
+            url: this.$http.adornUrl(`/common/coupon/${!this.dataForm.id ? 'addCoupon' : 'updateCoupon'}`),
             method: 'post',
             data: this.$http.adornData({
               'id': this.dataForm.id || undefined,
@@ -279,29 +305,33 @@ export default {
        'couponUrl': this.dataForm.couponUrl,
        'limitedCollar' :this.dataForm.limitedCollar,
        'validity' :this.dataForm.validity,
-       'takeEffectType' :this.dataForm.takeEffectType,
-       'takeEffectDate' :this.dataForm.takeEffectDate,
+       'effectType' :this.dataForm.effectType,
+       'effectTime' :this.dataForm.effectTime,
        'totalCirculation' :this.dataForm.totalCirculation,
         'remark':this.dataForm.remark ,
         'useLevel' : this.dataForm.useLevel,
-        'couponProType' : this.dataForm.couponProType,
+        'couponRange' : this.dataForm.couponRange,
         'currentState' : '1',
         'delFlag':0
             })
           }).then(({ data }) => {
+            if(data.code!==0) return this.$message.error(data.msg)
+
             if (data && data.code === 0) {
+
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
                 onClose: () => {
-                  this.visible = false
+                  this.dataForm.couponUrl = ''
+                 this.closeDia()
                   this.$emit('refreshDataList')
                 }
               })
-            } else {
-              this.$message.error(data.msg)
             }
+          }).catch((err) => {
+            this.$message.error(err.msg)
           })
         }
       })
diff --git a/src/views/modules/coupon/coupon.vue b/src/views/modules/coupon/coupon.vue
index 736ad3c..78ceab5 100644
--- a/src/views/modules/coupon/coupon.vue
+++ b/src/views/modules/coupon/coupon.vue
@@ -1,17 +1,38 @@
 <template>
   <div class="mod-config">
-  <el-radio-group size="mini" v-model="couponActiveName" style="margin-bottom: 15px;" @tab-click="handleClick">
-    <el-radio-button label="0">全部</el-radio-button>
-    <el-radio-button label="1">生效中</el-radio-button>
-    <el-radio-button label="2">已过期</el-radio-button>
+  <el-radio-group v-model="currentState" style="margin-bottom: 15px;" @tab-click="handleClick">
+    <el-radio-button label="0">生效中</el-radio-button>
+    <el-radio-button label="1">已过期</el-radio-button>    
   </el-radio-group>
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input size="mini" v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+        <el-input  v-model="dataForm.couponName" placeholder="参数名" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="优惠卷范围">
+        <el-select v-model="dataForm.couponRange" placeholder="请选择" @change="pageIndex = 1; getDataList()">
+          <el-option
+            v-for="item in rangList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="优惠券类型">
+        <el-select v-model="dataForm.TypeList" placeholder="请选择" @change="pageIndex = 1; getDataList()">
+          <el-option
+            v-for="item in TypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button size="mini" @click="getDataList()">查询</el-button>
-        <el-button size="mini" v-if="isAuth('book:coupon:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button v-if="isAuth('book:coupon:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
         <!-- <el-button v-if="isAuth('book:coupon:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> -->
       </el-form-item>
     </el-form>
@@ -43,29 +64,41 @@
         prop="couponType"
         header-align="center"
         align="center"
-        label="优惠卷类型">
-        <template slot-scope="scope">
-          <span v-if="scope.row.couponProType == 0">商品用券</span>
-          <span v-if="scope.row.couponProType == 1">电子书用券</span>
-        </template>
+        label="优惠卷类型" width="100px">        
       </el-table-column>     
       <el-table-column
         prop="couponAmount"
         header-align="center"
         align="center"
-        label="面值">
-      </el-table-column>      
+        label="面值" width="90px">
+      </el-table-column> 
       <el-table-column
         prop="expirationDate"
         header-align="center"
         align="center"
-        label="结束使用时间">
+        label="时间">
+        <template slot-scope="scope">
+          <span v-if="scope.row.createTime">创建时间：{{scope.row.createTime}}</span>
+          <span v-if="scope.row.effectTime"><br/>生效时间：{{scope.row.effectTime}}</span>
+          <span v-if="scope.row.expireTime"><br/>结束时间：{{scope.row.expireTime}}</span>
+          
+
+        </template>
+      </el-table-column>       
+      <el-table-column
+        prop="couponRange"
+        header-align="center"
+        align="center"
+        label="优惠券范围">
+        <template slot-scope="scope">
+          {{scope.row.couponRange | getRange}}
+        </template>
       </el-table-column>      
       <el-table-column
         prop="totalCirculation"
         header-align="center"
         align="center"
-        label="发行数量">
+        label="发行数量" width="90px">
       </el-table-column>
       <!-- <el-table-column
         prop="useCount"
@@ -106,15 +139,22 @@
 </template>
 
 <script>
+import global from "@/views/common/common.vue"; //引入共用组间
+
   import AddOrUpdate from './coupon-add-or-update'
+import commentsListVue from '../book/commentsList.vue'
   export default {
     data () {
       return {
         dataForm: {
-          key: ''
+          couponName: '',
+          couponRange: '',
+          couponType:''
         },
-        couponActiveName:'0',
+        currentState:'0',   // "currentState":""//当前状态 0 发放中 1结束
         dataList: [],
+        rangList: global.rangList,
+        TypeList: global.TypeList,
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
@@ -123,6 +163,25 @@
         addOrUpdateVisible: false
       }
     },
+    filters: {
+      // 格式化时间
+      getRange (value) {
+        // if (value && value != 0) {
+          // console.log('555555555',value)
+          switch (value) {
+            case 0:
+              
+              return '无限制'
+            case 1:
+              return '课程券'
+            case 2:
+              return '课程品类券'           
+          }
+        // } else {
+        //   return ''
+        // }
+      }
+    },
     components: {
       AddOrUpdate
     },
@@ -131,24 +190,30 @@
     },
     methods: {
       handleClick(){
-        console.log(this.couponActiveName)        
+        console.log(this.currentState) 
+        this.pageIndex = 1       
+        this.getDataList()
+
       },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/book/coupon/list'),
-          method: 'get',
-          params: this.$http.adornParams({
+          url: this.$http.adornUrl('/common/coupon/getCouponList'),
+          method: 'post',
+          data: this.$http.adornData({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'key': this.dataForm.key,
-            'currentState': this.couponActiveName
+            'couponName': this.dataForm.couponName,
+            'currentState': this.currentState, //当前状态 0 发放中 1结束
+            "couponType": this.dataForm.couponType,//优惠券类型  0现金 1折扣
+            "couponRange":this.dataForm.couponRange,//优惠卷范围 0无限制 1课程卷 2课程品类卷
           })
         }).then(({data}) => {
+          if(data.code !==0) return this.$message.error(data.msg)
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.couponPage.records
+            this.totalPage = data.couponPage.total
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -209,7 +274,7 @@
         })
       }
     },watch:{
-      couponActiveName: {
+      currentState: {
       handler(val, oldVal) {        
            this.getDataList()
       },