yshop3.0-RC2版本

src/views/activity/coupon/form.vue

@@ -1,6 +1,15 @@
 <template>
-  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
-    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="130px">
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="800px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="140px">
+      <el-form-item label="优惠券类型">
+        <el-radio-group v-model="form.type" @change="couponsType">
+          <el-radio :label=0>通用券</el-radio>
+          <el-radio :label=1>商品券</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="选择商品" v-if="form.type == 1">
+        <cgood v-model="form.product" @selectGoods="getGoods"></cgood>
+      </el-form-item>
       <el-form-item label="优惠券名称">
         <el-input v-model="form.title" style="width: 300px;" />
       </el-form-item>
@@ -30,7 +39,9 @@
 
 <script>
 import { add, edit } from '@/api/yxStoreCoupon'
+import cgood from '@/views/components/goods'
 export default {
+  components: { cgood },
   props: {
     isAdd: {
       type: Boolean,
@@ -49,14 +60,25 @@ export default {
         couponTime: 1,
         sort: 0,
         status: 1,
-        addTime: ''
-        // isDel: 0
+        type: 0,
+        productId: '',
+        product: []
       },
       rules: {
       }
     }
   },
   methods: {
+    getGoods(p) {
+      var ids = []
+      p.forEach((item,index) => {
+        ids.push(item.id)
+      })
+      this.form.productId = ids.join(",")
+    },
+    couponsType() {
+      //alert(this.form.type)
+    },
     cancel() {
       this.resetForm()
     },
@@ -108,7 +130,9 @@ export default {
         couponTime: 1,
         sort: 0,
         status: 1,
-        addTime: ''
+        type: 0,
+        productId: '',
+        product: []
       }
     }
   }

src/views/activity/coupon/index.vue

@@ -21,6 +21,14 @@
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <!--<el-table-column prop="id" label="ID"/>-->
       <el-table-column prop="title" label="优惠券名称" />
+      <el-table-column prop="type" label="优惠券类型">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.type === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-else :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="couponPrice" label="优惠券面值" />
       <el-table-column prop="useMinPrice" label="优惠券最低消费" />
       <el-table-column label="优惠券有效期限">
@@ -37,7 +45,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="addTime" label="创建时间">
+      <el-table-column prop="createTime" label="创建时间" width="140">
         <template slot-scope="scope">
           <span>{{ scope.row.createTime }}</span>
         </template>
@@ -159,8 +167,9 @@ export default {
         couponTime: data.couponTime,
         sort: data.sort,
         status: data.status,
-        addTime: data.addTime,
-        isDel: data.isDel
+        type: data.type,
+        productId: data.productId,
+        product: data.product
       }
       _this.dialog = true
     },
@@ -170,6 +179,7 @@ export default {
       _this.form = {
         cid: data.id,
         cname: data.title,
+        ctype: data.type,
         isPermanent: 0,
         status: 1,
         totalCount: 0,

src/views/activity/couponissue/form.vue

@@ -3,6 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
       <el-form-item label="优惠券ID">
         <el-input v-model="form.cid" style="width: 300px;" :disabled="true" />
+        <el-input v-model="form.ctype" type="hidden" />
       </el-form-item>
       <el-form-item label="优惠券名称">
         <el-input v-model="form.cname" style="width: 300px;" :disabled="true" />
@@ -60,6 +61,7 @@ export default {
         id: '',
         cid: '',
         cname: '',
+        ctype: 0,
         startTimeDate: '',
         endTimeDate: '',
         totalCount: 0,

src/views/activity/couponissue/index.vue

@@ -16,20 +16,28 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="id" />
+      <el-table-column prop="ctype" label="优惠券类型">
+        <template slot-scope="scope">
+          <div>
+            <el-tag v-if="scope.row.ctype === 1" style="cursor: pointer" :type="''">商品券</el-tag>
+            <el-tag v-else :type=" 'info' ">普通券</el-tag>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="cname" label="优惠券名称" />
-      <el-table-column label="领取日期">
+      <el-table-column label="领取日期" prop="startTime">
         <template slot-scope="scope">
           <p>{{ formatTimeTwo(scope.row.startTime) }}</p>
           <p>{{ formatTimeTwo(scope.row.endTime) }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="发布数量">
+      <el-table-column label="发布数量" prop="totalCount">
         <template slot-scope="scope">
           <p>发布:{{ scope.row.totalCount }}</p>
-          <o>剩余:{{ scope.row.remainCount }}</o>
+          <p>剩余:{{ scope.row.remainCount }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center">
+      <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <div>
             <el-tag v-if="scope.row.status === 1" style="cursor: pointer" :type="''">开启</el-tag>