修改一些发现的问题，新增秒杀活动设置，优惠券动态时间 以及 精准发圈用户和小程序直播页面

manager/src/views/promotion/coupon/coupon.vue

@@ -4,21 +4,10 @@
       <Row>
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
           <Form-item label="活动名称" prop="couponName">
-            <Input
-              type="text"
-              v-model="searchForm.couponName"
-              placeholder="请输入活动名称"
-              clearable
-              style="width: 200px"
-            />
+            <Input type="text" v-model="searchForm.couponName" placeholder="请输入活动名称" clearable style="width: 200px" />
           </Form-item>
           <Form-item label="活动状态" prop="promotionStatus">
-            <Select
-              v-model="searchForm.promotionStatus"
-              placeholder="请选择"
-              clearable
-              style="width: 200px"
-            >
+            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
               <Option value="NEW">未开始</Option>
               <Option value="START">已开始/上架</Option>
               <Option value="END">已结束/下架</Option>
@@ -26,66 +15,30 @@
             </Select>
           </Form-item>
           <Form-item label="活动时间">
-            <DatePicker
-              v-model="selectDate"
-              type="daterange"
-              clearable
-              placeholder="选择起始时间"
-              style="width: 200px"
-            ></DatePicker>
+            <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px"></DatePicker>
           </Form-item>
           <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
         </Form>
       </Row>
       <Row class="operation padding-row">
-        <Button @click="add" type="primary">添加</Button>
+        <Button @click="add" type="primary">添加优惠券</Button>
+        <Button @click="()=>{$router.push({path:'/promotion/add-coupon-specify'})}">精准发劵</Button>
         <Button @click="delAll">批量下架</Button>
         <!-- <Button @click="upAll" >批量上架</Button> -->
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
-        <template slot-scope="{ row }" slot="action">
-          <Button
-            v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'"
-            type="primary"
-            size="small"
-            style="margin-right: 10px"
-            @click="edit(row)"
-          >编辑
-          </Button
-          >
-          <Button
-            v-if="row.promotionStatus === 'START' || row.promotionStatus === 'NEW'"
-            type="error"
-            size="small"
-            style="margin-right: 10px"
-            @click="remove(row)"
-          >下架
-          </Button
-          >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
+        <template slot-scope="{ row,index }" slot="action">
+          <Button v-if="!checked && row.promotionStatus === 'NEW' || row.promotionStatus === 'CLOSE'" type="primary" size="small" style="margin-right: 10px" @click="edit(row)">编辑
+          </Button>
+          <Button v-if="!checked && row.promotionStatus === 'START' || row.promotionStatus === 'NEW'" type="error" size="small" style="margin-right: 10px" @click="remove(row)">下架
+          </Button>
+          <Button v-if="checked" :type="row.___selected ?'primary': '' "   @click="check(row,index)">{{row.___selected ?'已':''}}选中
+          </Button>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page">
-        <Page
-          :current="searchForm.pageNumber + 1"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber + 1" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]"
+          size="small" show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
   </div>
@@ -94,7 +47,6 @@
 <script>
 import {
   getPlatformCouponList,
-  deletePlatformCoupon,
   updatePlatformCouponStatus,
 } from "@/api/promotion";
 
@@ -121,7 +73,7 @@ export default {
       // 表单验证规则
       formValidate: {
         promotionName: [
-          {required: true, message: "不能为空", trigger: "blur"},
+          { required: true, message: "不能为空", trigger: "blur" },
         ],
       },
       submitLoading: false, // 添加或编辑提交状态
@@ -138,15 +90,16 @@ export default {
         {
           title: "活动名称",
           key: "promotionName",
-          minWidth: 120,
+
           fixed: "left",
         },
         {
           title: "优惠券名称",
           key: "couponName",
-          minWidth: 120,
-          tooltip: true
-        }, {
+
+          tooltip: true,
+        },
+        {
           title: "面额/折扣",
           key: "price",
           width: 120,
@@ -165,10 +118,13 @@ export default {
         {
           title: "领取数量/总数量",
           key: "publishNum",
+          width: 150,
           render: (h, params) => {
             return h(
-              "div", params.row.receivedNum + "/" + params.row.publishNum)
-          }
+              "div",
+              params.row.receivedNum + "/" + params.row.publishNum
+            );
+          },
         },
         {
           title: "优惠券类型",
@@ -204,20 +160,23 @@ export default {
         },
         {
           title: "活动时间",
+          width: 120,
           render: (h, params) => {
             return h("div", {
-              domProps:
-                {innerHTML: params.row.startTime + "<br/>" + params.row.endTime}
+              domProps: {
+                innerHTML: params.row.startTime + "<br/>" + params.row.endTime,
+              },
             });
           },
         },
         {
           title: "状态",
+          width: 100,
           key: "promotionStatus",
           fixed: "right",
           render: (h, params) => {
             let text = "未知",
-              color = "";
+              color = "red";
             if (params.row.promotionStatus == "NEW") {
               text = "未开始";
               color = "default";
@@ -249,13 +208,20 @@ export default {
           slot: "action",
           align: "center",
           fixed: "right",
-          width: 80
+          width: 100,
         },
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
     };
   },
+  props: {
+    // 是否为选中模式
+    checked: {
+      type: Boolean,
+      default: false,
+    },
+  },
   watch: {
     $route(to, from) {
       if (to.fullPath == "/promotion/manager-coupon") {
@@ -264,18 +230,25 @@ export default {
     },
   },
   methods: {
+    // 选中优惠券 父级传值
+    check(val,index) {
+
+      this.data[index].___selected = !this.data[index].___selected
+
+      this.$emit("selected", val);
+    },
     init() {
       this.getDataList();
     },
     add() {
-      this.$router.push({name: "add-platform-coupon"});
+      this.$router.push({ name: "add-platform-coupon" });
     },
     /** 跳转至领取详情页面 */
     receiveInfo(v) {
-      this.$router.push({name: "member-receive-coupon", query: {id: v.id}});
+      this.$router.push({ name: "member-receive-coupon", query: { id: v.id } });
     },
     info(v) {
-      this.$router.push({name: "platform-coupon-info", query: {id: v.id}});
+      this.$router.push({ name: "platform-coupon-info", query: { id: v.id } });
     },
     changePage(v) {
       this.searchForm.pageNumber = v - 1;
@@ -319,6 +292,9 @@ export default {
       getPlatformCouponList(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success) {
+          res.result.records.forEach(item=>{
+            item.___selected = false
+          })
           this.data = res.result.records;
           this.total = res.result.total;
         }
@@ -360,7 +336,7 @@ export default {
       });
     },
     edit(v) {
-      this.$router.push({name: "edit-platform-coupon", query: {id: v.id}});
+      this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } });
     },
     remove(v) {
       this.$Modal.confirm({
@@ -370,7 +346,10 @@ export default {
         loading: true,
         onOk: () => {
           // 删除
-          updatePlatformCouponStatus({couponIds: v.id, promotionStatus: "CLOSE"})
+          updatePlatformCouponStatus({
+            couponIds: v.id,
+            promotionStatus: "CLOSE",
+          })
             .then((res) => {
               this.$Modal.remove();
               if (res.success) {

manager/src/views/promotion/coupon/couponPublish.vue

@@ -50,16 +50,27 @@
               <Input v-model="form.couponLimitNum" placeholder="领取限制" clearable style="width: 260px" />
             </FormItem>
             <FormItem label="有效期" prop="rangeTime">
-              <DatePicker
-                type="datetimerange"
-                v-model="form.rangeTime"
-                format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择"
-                :options="options"
-                style="width: 260px"
-              >
-              </DatePicker>
+              <div v-if="form.getType == 'ACTIVITY'">
+                <RadioGroup v-model="rangeTimeType">
+
+                  <Radio :label="1">
+                    起止时间
+                  </Radio>
+                  <Radio :label="0">固定时间</Radio>
+
+                </RadioGroup>
+              </div>
+              <div v-if="rangeTimeType == 1">
+                <DatePicker type="datetimerange" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
+                </DatePicker>
+              </div>
+              <div class="effectiveDays" v-if="rangeTimeType == 0">
+                领取当天开始
+                <InputNumber v-model="form.effectiveDays" :min="1" style="width:100px;" :max="365" />
+                天内有效(1-365间的整数)
+              </div>
             </FormItem>
+
             <FormItem label="使用范围" prop="scopeType">
               <RadioGroup type="button" button-style="solid" v-model="form.scopeType">
                 <Radio label="ALL">全品类</Radio>
@@ -116,6 +127,16 @@ export default {
   components: {
     skuSelect,
   },
+  watch: {
+    "form.getType": {
+      handler(val) {
+        if (val == "FREE") {
+          this.rangeTimeType = 1;
+        }
+      },
+      deep: true,
+    },
+  },
   data() {
     const checkPrice = (rule, value, callback) => {
       if (!value && value !== 0) {
@@ -140,6 +161,7 @@ export default {
       }
     };
     return {
+      rangeTimeType: 1,
       modalType: 0, // 是否编辑
       form: {
         /** 店铺承担比例 */
@@ -154,9 +176,11 @@ export default {
         couponType: "PRICE",
         /** 优惠券名称 */
         couponName: "",
+        promotionName: "",
         getType: "FREE",
         promotionGoodsList: [],
         scopeIdGoods: [],
+        rangeDayType: "",
       },
       id: this.$route.query.id, // 优惠券id
       submitLoading: false, // 添加或编辑提交状态
@@ -314,13 +338,24 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(this.form));
-          params.startTime = this.$options.filters.unixToDate(
-            this.form.rangeTime[0] / 1000
-          );
-          params.endTime = this.$options.filters.unixToDate(
-            this.form.rangeTime[1] / 1000
-          );
-          delete params.rangeTime
+           // 判断当前活动类型
+          params.getType != "ACTIVITY" ? delete params.effectiveDays : "";
+
+          //判断当前时间类型
+          if (this.rangeTimeType == 1) {
+            params.rangeDayType = "FIXEDTIME";
+            params.startTime = this.$options.filters.unixToDate(
+              this.form.rangeTime[0] / 1000
+            );
+            params.endTime = this.$options.filters.unixToDate(
+              this.form.rangeTime[1] / 1000
+            );
+            delete params.effectiveDays;
+          } else {
+            params.rangeDayType = "DYNAMICTIME";
+            delete params.rangeTime;
+          }
+
           let scopeId = [];
 
           if (
@@ -392,12 +427,13 @@ export default {
       );
       this.$router.go(-1);
     },
-    openSkuList() { // 显示商品选择器
+    openSkuList() {
+      // 显示商品选择器
       this.$refs.skuSelect.open("goods");
-      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList))
-      data.forEach(e => {
-        e.id = e.skuId
-      })
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+      data.forEach((e) => {
+        e.id = e.skuId;
+      });
       this.$refs.skuSelect.goodsData = data;
     },
     changeSelect(e) {
@@ -434,15 +470,15 @@ export default {
       // 回显已选商品
       let list = [];
       item.forEach((e) => {
-          list.push({
-            goodsName: e.goodsName,
-            price: e.price,
-            originalPrice: e.price,
-            quantity: e.quantity,
-            storeId: e.storeId,
-            storeName: e.storeName,
-            skuId: e.id,
-          });
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+        });
       });
       this.form.promotionGoodsList = list;
     },
@@ -527,5 +563,12 @@ h4 {
   margin-left: 10px;
   color: #999;
 }
+.effectiveDays {
+  font-size: 12px;
+  color: #999;
+  > * {
+    margin: 0 4px;
+  }
+}
 </style>
 

manager/src/views/promotion/coupon/couponSpecify.vue

@@ -0,0 +1,172 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120">
+        <div class="base-info-item">
+          <h4>优惠券将在指定发放时间发放到用户账号中</h4>
+          <div class="form-item-view">
+            <FormItem label="活动名称" prop="promotionName">
+              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
+            </FormItem>
+            <FormItem label="目标客户" prop="vipType">
+              <RadioGroup v-model="vipType">
+                <Radio :label="0">全平台客户</Radio>
+                <Radio :label="1">指定客户</Radio>
+              </RadioGroup>
+              <Button type="primary" v-if="vipType==1" icon="ios-add" @click="addVip" ghost>添加客户</Button>
+            </FormItem>
+            <FormItem label="发放时间" prop="couponDiscount">
+              <DatePicker type="datetime" v-model="form.rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
+              </DatePicker>
+            </FormItem>
+            <FormItem label="选择优惠券" prop="couponType">
+              <Button type="primary" icon="ios-add" @click="checkCoupon=!checkCoupon" ghost>选择优惠券</Button>
+              <Table class="table" :columns="couponColumns" :data="couponData"></Table>
+            </FormItem>
+          </div>
+
+          <div style="margin-left:100px">
+            <Button type="text" @click="closeCurrentPage">返回</Button>
+            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+          </div>
+
+        </div>
+      </Form>
+      <Modal width="1200" v-model="checkCoupon">
+        <couponList checked @selected="callbackSelectCoupon" />
+      </Modal>
+      <Modal width="1200" v-model="checkUserList">
+        <userList @selected="callbackSelectUser" ref="memberLayout" />
+      </Modal>
+    </Card>
+
+  </div>
+</template>
+
+<script>
+import { addCouponActivity } from "@/api/promotion";
+
+import couponList from "./coupon";
+import userList from "@/views/member/list/index";
+// import userList from ''
+export default {
+  components: {
+    couponList,
+    userList,
+  },
+
+  data() {
+    return {
+      // 选择优惠券
+      checkCoupon: false,
+      // 选择用户
+      checkUserList: false,
+      // 优惠券表格title
+      couponColumns: [
+        {
+          title: "优惠券名称",
+          key: "name",
+        },
+        {
+          title: "有效期",
+          key: "age",
+        },
+        {
+          title: "优惠券数量",
+          key: "address",
+        },
+        {
+          title: "操作",
+          key: "action",
+        },
+      ],
+      // datpicker时间设置
+      options: {
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+
+      //
+      vipType: 0, //客户会员类型  0全平台客户 1指定客户
+      form: {},
+      formRule: {},
+      id: this.$route.query.id, // 优惠券id
+
+      callbackCoupon: [],
+    };
+  },
+  mounted() {},
+  methods: {
+
+    // 添加指定用户
+    addVip() {
+      this.checkUserList = true;
+      this.$nextTick(() => {
+        this.$refs.memberLayout.selectedMember = true;
+      });
+    },
+    // 返回已选择的用户
+    callbackSelectUser(val){
+      console.log(val)
+    },
+
+    // 返回已选择的优惠券
+    callbackSelectCoupon(val) {
+      if (val.___selected) {
+        this.callbackCoupon.forEach((item, index) => {
+          if (item.id == val.id) this.callbackCoupon.splice(index, 1);
+        });
+      } else {
+        this.callbackCoupon.push(val);
+      }
+    },
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "add-coupon-specify");
+      localStorage.pageOpenedList = JSON.stringify(
+        this.$store.state.app.pageOpenedList
+      );
+      this.$router.go(-1);
+    },
+
+    async handleSubmit() {
+      let res = await addCouponActivity();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scpoed>
+.table {
+  width: 800px;
+  margin: 20px 0;
+}
+h4 {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  font-weight: bold;
+  color: #333;
+  font-size: 14px;
+  line-height: 40px;
+  text-align: left;
+}
+.form-item-view {
+  margin: 20px 0;
+}
+.describe {
+  font-size: 12px;
+  margin-left: 10px;
+  color: #999;
+}
+.effectiveDays {
+  font-size: 12px;
+  color: #999;
+  > * {
+    margin: 0 4px;
+  }
+}
+</style>
+