推荐直播间，修改部分代码，新增劵活动一些部分

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

@@ -6,12 +6,11 @@
           <h4>活动信息</h4>
           <div class="form-item-view">
             <FormItem label="活动名称" prop="promotionName">
-              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px"/>
+              <Input type="text" v-model="form.promotionName" placeholder="活动名称" clearable style="width: 260px" />
             </FormItem>
 
             <FormItem label="活动时间">
-              <DatePicker type="datetimerange" v-model="rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择"
-                          :options="options" style="width: 260px">
+              <DatePicker type="datetimerange" v-model="rangeTime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择" :options="options" style="width: 260px">
               </DatePicker>
             </FormItem>
 
@@ -27,15 +26,16 @@
                 <Radio label="DESIGNATED">指定会员</Radio>
               </RadioGroup>
             </FormItem>
-            <FormItem label="选择会员" prop="scopeType"
-                      v-if="form.couponActivityType==='SPECIFY' && form.activityScope==='DESIGNATED'">
+            <FormItem label="选择会员" prop="scopeType" v-if="form.couponActivityType==='SPECIFY' && form.activityScope==='DESIGNATED'">
               <Button type="primary" icon="ios-add" @click="addVip" ghost>选择会员</Button>
+              <div style="margin-top:24px;" v-if="form.activityScope == 'DESIGNATED'">
+                <Table border :columns="userColumns" :data="this.selectedMember">
+                </Table>
+              </div>
             </FormItem>
-            {{ selectedMember }}
 
             <FormItem label="活动描述" prop="activityScopeInfo">
-              <Input v-model="form.activityScopeInfo" type="textarea" :rows="4" maxlength="50" show-word-limit clearable
-                     style="width: 260px"/>
+              <Input v-model="form.activityScopeInfo" type="textarea" :rows="4" maxlength="50" show-word-limit clearable style="width: 260px" />
             </FormItem>
           </div>
           <h4>配置优惠券</h4>
@@ -47,8 +47,8 @@
 
               <Table border :columns="columns" :data="this.selectCouponList">
                 <template slot="sendNum" slot-scope="scope">
-                  <Input type="text" v-model="form.couponActivityItems[scope.index].num" placeholder="赠送数量"/>
-                  <Input type="text" v-model="form.couponActivityItems[scope.index].couponId" v-show="false"/>
+                  <Input type="text" v-model="form.couponActivityItems[scope.index].num" placeholder="赠送数量" />
+                  <Input type="text" v-model="form.couponActivityItems[scope.index].couponId" v-show="false" />
                 </template>
               </Table>
             </FormItem>
@@ -61,12 +61,12 @@
         </div>
       </Form>
     </Card>
-    <Modal v-model="showCouponSelect" width="80%">
-      <couponTemplate :checked="true" :selectList="selectCouponList" getType="ACTIVITY" @selected="selectedCoupon"/>
+    <Modal @on-ok="()=>{this.showCouponSelect = false}" @on-cancel="()=>{this.showCouponSelect = false}" v-model="showCouponSelect" width="80%">
+      <couponTemplate :checked="true" v-if="showCouponSelect" :selectedList="selectCouponList" getType="ACTIVITY" @selected="selectedCoupon" />
     </Modal>
 
     <Modal width="1200" v-model="checkUserList">
-      <userList @callback="callbackSelectUser" ref="memberLayout"/>
+      <userList v-if="checkUserList" @callback="callbackSelectUser" :selectedList="selectedMember" ref="memberLayout" />
     </Modal>
   </div>
 </template>
@@ -76,10 +76,7 @@ import couponTemplate from "@/views/promotion/coupon/coupon";
 
 import userList from "@/views/member/list/index";
 
-import {
-  saveActivityCoupon,
-  updateCouponActivity,
-} from "@/api/promotion";
+import { saveActivityCoupon, updateCouponActivity } from "@/api/promotion";
 
 export default {
   name: "addCouponActivity",
@@ -89,30 +86,72 @@ export default {
   },
   data() {
     return {
-      showCouponSelect: false,//显示优惠券选择框
+      showCouponSelect: false, //显示优惠券选择框
       modalType: 0, // 是否编辑
-      rangeTime: '',//时间区间
-      checkUserList: false,//会员选择器
-      selectedMember: [],//选择的会员
+      rangeTime: "", //时间区间
+      checkUserList: false, //会员选择器
+      selectedMember: [], //选择的会员
       form: {
-        promotionName: '', //活动名称
-        activityScope: 'ALL',  //活动范围
-        couponActivityType: 'REGISTERED', //触发活动方式
-        activityScopeInfo: '', //活动描述
-        startTime: '', //开始时间
-        endTime: '', //结束时间
-        couponActivityItems: []
-
+        promotionName: "", //活动名称
+        activityScope: "ALL", //活动范围
+        couponActivityType: "REGISTERED", //触发活动方式
+        activityScopeInfo: "", //活动描述
+        startTime: "", //开始时间
+        endTime: "", //结束时间
+        couponActivityItems: [],
       }, // 表单
       id: this.$route.query.id, // 优惠券活动id
       submitLoading: false, // 添加或编辑提交状态
-      selectCouponList: [],//选择的优惠券列表
+      selectCouponList: [], //选择的优惠券列表
       formRule: {
-        promotionName: [{required: true, message: "活动名称不能为空"}],
-        rangeTime: [{required: true, message: "请选择活动有效期"}],
-        description: [{required: true, message: "请输入范围描述"}],
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        rangeTime: [{ required: true, message: "请选择活动有效期" }],
+        description: [{ required: true, message: "请输入范围描述" }],
       },
-      //优惠券表哥
+      // 用户表格
+      userColumns: [
+        {
+          title: "用户名称",
+          key: "nickName",
+          minWidth: 120,
+        },
+        {
+          title: "手机号",
+          key: "mobile",
+          render: (h, params) => {
+            return h("div", params.row.mobile || "暂未填写");
+          },
+        },
+        {
+          title: "最后登录时间",
+          key: "lastLoginDate",
+        },
+        {
+          title: "操作",
+          key: "action",
+          minWidth: 50,
+          align: "center",
+          render: (h, params) => {
+            return h(
+              "Button",
+              {
+                props: {
+                  size: "small",
+                  type: "error",
+                  ghost: true,
+                },
+                on: {
+                  click: () => {
+                    this.delUser(params.index);
+                  },
+                },
+              },
+              "删除"
+            );
+          },
+        },
+      ],
+      //优惠券表格
       columns: [
         {
           title: "优惠券名称",
@@ -175,7 +214,7 @@ export default {
                 },
                 on: {
                   click: () => {
-                    // this.delGoods(params.index);
+                    this.delCoupon(params.index);
                   },
                 },
               },
@@ -194,14 +233,32 @@ export default {
     }
   },
   methods: {
+    // 删除选择的优惠券
+    delUser(index) {
+      this.selectedMember.splice(index, 1);
+    },
+    // 删除选择的优惠券
+    delCoupon(index) {
+      this.selectCouponList.splice(index, 1);
+    },
 
     // 返回已选择的用户
     callbackSelectUser(val) {
-      let index = this.selectedMember.indexOf(val)
-      if (index > 0) {
-        this.selectedMember.remove(val);
+      // 每次将返回的数据回调判断
+      let findUser = this.selectedMember.find((item) => {
+        return item.id == val.id;
+      });
+      // 如果没有则添加
+      if (!findUser) {
+        this.selectedMember.push(val);
+      } else {
+        // 有重复数据就删除
+        this.selectedMember.map((item, index) => {
+          if (item.id == findUser.id) {
+            this.selectedMember.splice(index, 1);
+          }
+        });
       }
-      this.selectedMember.push(val);
     },
 
     // 添加指定用户
@@ -218,17 +275,16 @@ export default {
     /**
      * 返回优惠券*/
     selectedCoupon(val) {
-      this.selectCouponList = val
+      this.selectCouponList = val;
       //清空原有数据
       this.form.couponActivityItems = [];
       val.forEach((item, index) => {
-
         this.form.couponActivityItems.push({
           num: 0,
-          couponId: item.id
-        })
-      })
-      console.log(val)
+          couponId: item.id,
+        });
+      });
+      console.log(val);
     },
 
     getCoupon() {
@@ -276,7 +332,6 @@ export default {
     },
     /** 保存平台优惠券 */
     handleSubmit() {
-
       this.form.startTime = this.$options.filters.unixToDate(
         this.rangeTime[0] / 1000
       );
@@ -287,7 +342,7 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(this.form));
-          console.log(params)
+          console.log(params);
           this.submitLoading = true;
           if (this.modalType === 0) {
             // 添加 避免编辑后传入id等数据 记得删除
@@ -318,7 +373,7 @@ export default {
         this.$store.state.app.pageOpenedList
       );
       this.$router.go(-1);
-    }
+    },
   },
 };
 </script>