提交促销以己部分页面商家端功能迁移，接口对接

manager/src/views/promotions/full-discount/full-discount-detail.vue

@@ -9,7 +9,7 @@
               <Input
                 type="text"
                 v-model="form.promotionName"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 placeholder="活动名称"
                 clearable
                 style="width: 260px"
@@ -19,7 +19,7 @@
               <DatePicker
                 type="datetimerange"
                 v-model="form.rangeTime"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择"
                 :options="options"
@@ -30,7 +30,7 @@
             <FormItem label="活动描述" prop="description">
               <Input
                 v-model="form.description"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 type="textarea"
                 :rows="4"
                 clearable
@@ -45,7 +45,7 @@
               <Input
                 type="text"
                 v-model="form.fullMoney"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 placeholder="优惠门槛"
                 clearable
                 style="width: 260px"
@@ -58,8 +58,8 @@
                 button-style="solid"
                 v-model="form.discountType"
               >
-                <Radio label="fullMinusFlag" disabled>减现金</Radio>
-                <Radio label="fullRateFlag" disabled>打折</Radio>
+                <Radio label="fullMinusFlag" :disabled="form.promotionStatus != 'NEW'">减现金</Radio>
+                <Radio label="fullRateFlag" :disabled="form.promotionStatus != 'NEW'">打折</Radio>
               </RadioGroup>
             </FormItem>
             <FormItem
@@ -69,7 +69,7 @@
             >
               <Input
                 type="text"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 v-model="form.fullMinus"
                 placeholder="优惠金额"
                 clearable
@@ -85,24 +85,24 @@
                 type="text"
                 v-model="form.fullRate"
                 placeholder="优惠折扣"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 clearable
                 style="width: 260px"
               />
               <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
             </FormItem>
             <FormItem label="额外赠送">
-              <Checkbox v-model="form.freeFreightFlag" disabled>免邮费</Checkbox
+              <Checkbox v-model="form.freeFreightFlag" :disabled="form.promotionStatus != 'NEW'">免邮费</Checkbox
               >&nbsp;
-              <Checkbox v-model="form.couponFlag" disabled>送优惠券</Checkbox
+              <Checkbox v-model="form.couponFlag" :disabled="form.promotionStatus != 'NEW'">送优惠券</Checkbox
               >&nbsp;
-              <Checkbox v-model="form.giftFlag" disabled>送赠品</Checkbox>&nbsp;
-              <Checkbox v-model="form.pointFlag" disabled>送积分</Checkbox>
+              <Checkbox v-model="form.giftFlag" :disabled="form.promotionStatus != 'NEW'">送赠品</Checkbox>&nbsp;
+              <Checkbox v-model="form.pointFlag" :disabled="form.promotionStatus != 'NEW'">送积分</Checkbox>
             </FormItem>
             <FormItem v-if="form.couponFlag" label="赠送优惠券" prop="couponId">
               <Select
                 v-model="form.couponId"
-                :disabled="form.promotionStatus != 'NEW'"
+                ::disabled="form.promotionStatus != 'NEW'"
                 filterable
                 :remote-method="getCouponList"
                 placeholder="输入优惠券名称搜索"
@@ -123,7 +123,7 @@
                 filterable
                 :remote-method="getGiftList"
                 placeholder="输入赠品名称搜索"
-                disabled
+                :disabled="form.promotionStatus != 'NEW'"
                 :loading="giftLoading"
                 style="width: 260px"
               >
@@ -136,10 +136,10 @@
               </Select>
             </FormItem>
             <FormItem v-if="form.pointFlag" label="赠积分" prop="point">
-              <Input
+              <InputNumber
                 v-model="form.point"
-                type="number"
-                disabled
+                :min="0"
+                :disabled="form.promotionStatus != 'NEW'"
                 style="width: 260px"
               />
             </FormItem>
@@ -149,8 +149,8 @@
                 button-style="solid"
                 v-model="form.scopeType"
               >
-                <Radio label="ALL" disabled>全品类</Radio>
-                <Radio label="PORTION_GOODS" disabled>指定商品</Radio>
+                <Radio label="ALL" :disabled="form.promotionStatus != 'NEW'">全品类</Radio>
+                <Radio label="PORTION_GOODS" :disabled="form.promotionStatus != 'NEW'">指定商品</Radio>
               </RadioGroup>
             </FormItem>
 
@@ -185,25 +185,32 @@
                     </Poptip>
                   </div>
                 </template>
+                
               </Table>
             </FormItem>
 
-            <div>
-              <Button
-                @click="$router.push({ name: 'promotions/full-discount' })"
-                >返回</Button
-              >
-            </div>
+           
           </div>
         </div>
+        <FormItem label="操作" >
+          <div>
+            <Button
+              @click="$router.push({ name: 'promotions/full-discount' })"
+              >返回</Button
+            >
+            <Button type="primary" class="ml_10" :disabled="form.promotionStatus != 'NEW' && !!id" :loading="submitLoading"
+              @click="handleSubmit">提交</Button>
+          </div>
+        </FormItem>
       </Form>
     </Card>
   </div>
 </template>
 
 <script>
-import { getPlatformCouponList, getFullDiscountById } from "@/api/promotion";
+import { getPlatformCouponList, getFullDiscountById, newFullDiscount, editFullDiscount,} from "@/api/promotion";
 import { getGoodsSkuData } from "@/api/goods";
+import { regular } from "@/utils";
 import vueQr from "vue-qr";
 export default {
   name: "add-full-discount",
@@ -211,15 +218,66 @@ export default {
     "vue-qr": vueQr,
   },
   data() {
+    const checkPrice = (rule, value, callback) => {
+      if (!value && value !== 0) {
+        return callback(new Error("面额不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("面额设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
+    const checkWeight = (rule, value, callback) => {
+      if (!value && typeof value !== "number") {
+        callback(new Error("优惠门槛不能为空"));
+      } else if (!regular.money.test(value)) {
+        callback(new Error("请输入正整数或者两位小数"));
+      } else if (parseFloat(value) > 99999999) {
+        callback(new Error("优惠门槛设置超过上限值"));
+      } else {
+        callback();
+      }
+    };
     return {
       form: {
         // 表单
         discountType: "fullMinusFlag",
         scopeType: "ALL",
         promotionGoodsList: [],
+        promotionStatus: "NEW",
       },
       id: this.$route.query.id, // 活动id
-      couponList: [], // 优惠券列表
+      selectedGoods: [], // 已选商品列表，便于删除
+      submitLoading: false, // 添加或编辑提交状态
+      formRule: {
+        // 验证规则
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        rangeTime: [{ required: true, message: "请选择活动时间" }],
+        description: [{ required: true, message: "请填写活动描述" }],
+        price: [
+          { required: true, message: "请输入面额" },
+          { validator: checkPrice },
+        ],
+        consumptionLimit: [{ required: true, validator: checkWeight }],
+        fullMoney: [{ required: true, validator: checkWeight }],
+        fullMinus: [
+          { required: true, message: "请填写优惠金额" },
+          { pattern: regular.money, message: "请输入正确金额" },
+        ],
+        fullRate: [
+          { required: true, message: "请填写优惠折扣" },
+          {
+            pattern: regular.discount,
+            message: "请输入0-10的数字,可有一位小数",
+          },
+        ],
+        couponId: [{ required: true, message: "请选择优惠券" }],
+        giftId: [{ required: true, message: "请选择赠品" }],
+        point: [{ required: true, message: "请填写积分" }],
+      },
+      couponList: [], // 优惠券列表 
       giftList: [], // 赠品列表
       giftLoading: false, // 赠品加载状态
       columns: [
@@ -257,6 +315,8 @@ export default {
   async mounted() {
     if (this.id) {
       this.getDetail();
+      this.columns.shift()
+      this.columns.pop()
     }
     this.getCouponList();
     this.getGiftList();
@@ -318,6 +378,122 @@ export default {
         }
       });
     },
+
+
+    /** 保存 */
+    handleSubmit () {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const params = JSON.parse(JSON.stringify(this.form));
+          const strat = this.$options.filters.unixToDate(
+            this.form.rangeTime[0] / 1000
+          );
+          const end = this.$options.filters.unixToDate(
+            this.form.rangeTime[1] / 1000
+          );
+          params.startTime = strat;
+          params.endTime = end;
+
+          if (
+            params.scopeType == "PORTION_GOODS" &&
+            (!params.promotionGoodsList ||
+              params.promotionGoodsList.length == 0)
+          ) {
+            this.$Modal.warning({ title: "提示", content: "请选择指定商品" });
+            return;
+          }
+          if (params.scopeType == "ALL") {
+            delete params.promotionGoodsList;
+            params.number = -1;
+          } else {
+            let scopeId = [];
+            params.number = 1;
+            params.promotionGoodsList.forEach((e) => {
+              e.startTime = params.startTime;
+              e.endTime = params.endTime;
+              scopeId.push(e.skuId);
+            });
+            params.scopeId = scopeId.toString();
+          }
+          if (params.discountType == "fullMinusFlag") {
+            params.fullMinusFlag = true;
+          } else {
+            params.fullRateFlag = true;
+          }
+          delete params.rangeTime;
+          // this.submitLoading = true;
+          if (!this.id) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+            newFullDiscount(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("添加活动成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            delete params.updateTime;
+
+            editFullDiscount(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("编辑活动成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    changeSelect (e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+
+    delSelectGoods () {
+      // 多选删除商品
+      if (this.selectedGoods.length <= 0) {
+        this.$Message.warning("您还未选择要删除的数据");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "确认删除",
+        content: "您确认要删除所选商品吗?",
+        onOk: () => {
+          let ids = [];
+          this.selectedGoods.forEach(function (e) {
+            ids.push(e.id);
+          });
+          this.form.promotionGoodsList = this.form.promotionGoodsList.filter(
+            (item) => {
+              return !ids.includes(item.id);
+            }
+          );
+        },
+      });
+    },
+    delGoods (index) {
+      // 删除商品
+      this.form.promotionGoodsList.splice(index, 1);
+    },
+    selectedGoodsData (item) {
+      // 回显已选商品
+      let list = [];
+      item.forEach((e) => {
+        list.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          quantity: e.quantity,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          thumbnail: e.thumbnail,
+          skuId: e.id,
+        });
+      });
+      this.form.promotionGoodsList = list;
+    },
   },
 };
 </script>

manager/src/views/promotions/full-discount/full-discount.vue

@@ -50,6 +50,9 @@
           >
         </Form>
       </Row>
+      <div class="mt_10">
+        <Button type="primary" @click="view">添加活动</Button>
+      </div>
       <Table
         :loading="loading"
         border
@@ -162,6 +165,7 @@ export default {
     };
   },
   methods: {
+   
     // 初始化数据
     init() {
       this.getDataList();
@@ -227,7 +231,14 @@ export default {
     },
     view(row) {
       // 查看
-      this.$router.push({ name: "full-discount-detail", query: { id: row.id } });
+      let data = { name: "full-discount-detail" }
+      if(row){
+        data = {
+          name: "full-discount-detail", 
+          query: { id: row.id }
+        }
+      }
+      this.$router.push(data);
     },
   },
   mounted() {

manager/src/views/promotions/pintuan/pintuan-create.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="new-pintuan">
+    <Card>
+      <Form ref="form" :model="form" :label-width="130" :rules="formValidate">
+        <FormItem label="活动名称" prop="promotionName" :label-width="130">
+          <Input v-model="form.promotionName" clearable style="width: 260px" maxlength="25" />
+          <div style="color: #cccccc">
+            活动名称将显示在对人拼团活动列表中，方便商家管理使用，最多输入25个字符
+          </div>
+        </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>
+        </FormItem>
+
+        <FormItem label="参团人数" prop="requiredNum" :label-width="130">
+          <Input v-model="form.requiredNum" style="width: 260px" max="8">
+          <span slot="append">人</span>
+          </Input>
+          <span style="color: #cccccc">参团人数不少于2人，不得超过10人。</span>
+        </FormItem>
+        <FormItem label="限购数量" prop="limitNum" :label-width="130">
+          <Input v-model="form.limitNum" type="number" style="width: 260px">
+          <span slot="append">件/人</span>
+          </Input>
+          <span style="color: #cccccc">如果设置为0则视为不限制购买数量</span>
+        </FormItem>
+        <FormItem label="虚拟成团" prop="fictitious">
+          <RadioGroup type="button" button-style="solid" v-model="form.fictitious">
+            <Radio title="开启" :label="1">
+              <span>开启</span>
+            </Radio>
+            <Radio title="关闭" :label="0">
+              <span>关闭</span>
+            </Radio>
+          </RadioGroup>
+          <br />
+          <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高成团率</span>
+        </FormItem>
+        <FormItem label="拼团规则" prop="pintuanRule">
+          <Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" />
+          <br />
+          <span style="color: #cccccc">拼团规则描述不能为空且不能大于255个字，会在WAP拼团详情页面显示</span>
+        </FormItem>
+        <FormItem label="操作" >
+          <div>
+            <Button type="text" @click="closeCurrentPage">返回</Button>
+            <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+          </div>
+        </FormItem>
+      </Form>
+      
+    </Card>
+  </div>
+</template>
+<script>
+import { savePintuan, editPintuan, getPintuanDetail } from "@/api/promotion";
+export default {
+  data() {
+    return {
+      id: this.$route.query.id, // 拼团id
+      form: {
+        // 添加或编辑表单对象初始化数据
+        promotionName: "",
+        promotionTitle: "",
+        pintuanRule: "",
+        requiredNum: "",
+        fictitious: 0,
+        limitNum: "",
+        startTime: "",
+        endTime: "",
+      },
+      // 表单验证规则
+      formValidate: {
+        promotionName: [{ required: true, message: "活动名称不能为空" }],
+        requiredNum: [
+          { required: true, message: "参团人数不能为空" },
+          {
+            pattern: /^([2-9]|10)?$/,
+            message: "参团人数不合法",
+          },
+        ],
+        limitNum: [
+          { required: true, message: "限购数不能为空" },
+          {
+            pattern: /^(0|[1-9]\d?|100)$/,
+            message: "限购数不合法",
+          },
+        ],
+        rangeTime: [{ required: true, message: "请选择活动时间" }],
+      },
+      submitLoading: false, // 添加或编辑提交状态
+      options: {
+        // 不可选取时间
+        disabledDate(date) {
+          return date && date.valueOf() < Date.now() - 86400000;
+        },
+      },
+    };
+  },
+  mounted() {
+    if (this.id) {
+      this.getDetail();
+    }
+  },
+
+  methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "new-pintuan");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    // 提交活动
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          let params = JSON.parse(JSON.stringify(this.form));
+          params.fictitious
+            ? (params.fictitious = true)
+            : (params.fictitious = false);
+          params.startTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[0] / 1000
+          );
+
+          params.endTime = this.$options.filters.unixToDate(
+            this.form.rangeTime[1] / 1000
+          );
+          if (params.startTime === "" || params.endTime === "") {
+            this.$Message.error("活动时间不能为空");
+            this.submitLoading = false;
+            return;
+          }
+          if (params.startTime < new Date()) {
+            this.$Message.error("拼团活动开始时间不能小于当前时间");
+            this.submitLoading = false;
+            return;
+          }
+
+          delete params.rangeTime;
+          if (!this.id) {
+            // 添加 避免编辑后传入id等数据 记得删除
+            delete params.id;
+            savePintuan(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("拼团活动发布成功");
+                this.closeCurrentPage();
+              }
+            });
+          } else {
+            // 编辑
+            if (params.promotionGoodsList == "")
+              delete params.promotionGoodsList;
+            editPintuan(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("操作成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        }
+      });
+    },
+    // 获取详情
+    getDetail() {
+      getPintuanDetail(this.id).then((res) => {
+        if (res.success) {
+          const data = res.result;
+          data.rangeTime = [];
+          data.rangeTime.push(new Date(data.startTime), new Date(data.endTime));
+          this.form = data;
+          // 此处将值转换为 1 true ，0 false 不然ivew radio组件会报错
+          this.form.fictitious ? this.$set(this.form, "fictitious", 1)  : this.$set(this.form, "fictitious", 0);
+
+       }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+/deep/ .ivu-form-item {
+  padding: 18px 10px !important;
+}
+</style>

manager/src/views/promotions/pintuan/pintuan.vue

@@ -41,6 +41,9 @@
         </Form-item>
         <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
       </Form>
+      <div class="mt_10">
+        <Button type="primary" @click="add()">添加活动</Button>
+      </div>
       <Table
         :loading="loading"
         border
@@ -184,6 +187,9 @@ export default {
         }
       });
     },
+    add(){
+      this.$router.push({ name: 'pintuan-create'})
+    },
     // 查看拼团商品
     view(v) {
       this.$router.push({ name: "pintuan-goods", query: { id: v.id } });

manager/src/views/promotions/seckill/seckill-goods.vue

@@ -9,90 +9,155 @@
           <Tag v-for="item in unixHours(row.hours)" :key="item">{{ item }}</Tag>
         </template>
       </Table>
-      <Table
-        :loading="loading"
-        border
-        class="operation"
-        :columns="goodsColumns"
-        :data="goodsList"
-        ref="table"
-      >
-        <template slot-scope="{ row }" slot="originalPrice">
-          <div>
-            <priceColorScheme :value="row.originalPrice" :color="$mainColor"></priceColorScheme>
-          </div>
-        </template>
 
-        <template slot-scope="{ row }" slot="quantity">
-          <div>{{ row.quantity }}</div>
+      <Row class="operation">
+        <template v-if="promotionStatus == 'NEW'">
+          <Button type="primary" @click="openSkuList">选择商品</Button>
+          <!-- <Button @click="delAll">批量删除</Button> -->
         </template>
+      </Row>
+      <Row class="operation">
+        <Tabs type="card" v-model="tabCurrent">
+          <TabPane
+            v-for="(tab, tabIndex) in goodsList"
+            :key="tabIndex"
+            :label="tab.hour"
+            :name="tabIndex + ''"
+          >
+            <Table
+              :loading="loading"
+              border
+              :columns="goodsColumns"
+              v-if="tabIndex == tabCurrent"
+              :data="tab.list"
+              :ref="'table' + tabIndex"
+              @on-selection-change="changeSelect"
+            >
+              <template slot-scope="{ row }" slot="originalPrice">
+                <div>{{ row.originalPrice | unitPrice("￥") }}</div>
+              </template>
 
-        <template slot-scope="{ row }" slot="price">
-          <div>
-            <priceColorScheme :value="row.price" :color="$mainColor"></priceColorScheme>
-          </div>
-        </template>
+              <template slot-scope="{ row, index }" slot="quantity">
+                <InputNumber
+                  :min="0"
+                  v-model="row.quantity"
+                  :disabled="row.promotionApplyStatus == 'PASS'"
+                  @input="goodsList[tabIndex].list[index].quantity = row.quantity"
+                />
+              </template>
 
-        <template slot-scope="{ row }" slot="time">
-          <Tag>{{ row.timeLine + ":00" }}</Tag>
-        </template>
-        <template slot-scope="{ row }" slot="QRCode">
-          <img
-            v-if="row.QRCode"
-            :src="row.QRCode || '../../../assets/lili.png'"
-            width="50px"
-            height="50px"
-            alt=""
-          />
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <Button type="error" size="small" @click="delGoods(index, row)">删除 </Button>
-        </template>
-      </Table>
-      <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="searchForm.pageNumber"
-          :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>
+              <template slot-scope="{ row, index }" slot="price">
+                <InputNumber
+                  :min="0"
+                  style="width: 100%"
+                  v-model="row.price"
+                  :disabled="row.promotionApplyStatus == 'PASS'"
+                  @input="goodsList[tabIndex].list[index].price = row.price"
+                />
+              </template>
+
+              <template slot-scope="{ row }" slot="promotionApplyStatus">
+                <Badge
+                  status="success"
+                  v-if="row.promotionApplyStatus == 'PASS'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <Badge
+                  status="blue"
+                  v-if="row.promotionApplyStatus == 'APPLY'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <Badge
+                  status="error"
+                  v-if="row.promotionApplyStatus == 'REFUSE'"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+                <span
+                  v-if="row.promotionApplyStatus == 'REFUSE'"
+                  @click="showReason(row.failReason)"
+                  class="reason"
+                  >（拒绝原因）</span
+                >
+                <Badge
+                  status="error"
+                  v-if="row.promotionApplyStatus == ''"
+                  :text="promotionApplyStatus(row.promotionApplyStatus)"
+                />
+              </template>
+
+              <template slot-scope="{ row }" slot="QRCode">
+                <img
+                  v-if="row.QRCode"
+                  :src="row.QRCode || '../../../assets/lili.png'"
+                  width="50px"
+                  height="50px"
+                  alt=""
+                />
+              </template>
+              <template slot-scope="{ row, index }" slot="action">
+                <Button
+                  type="error"
+                  v-if="promotionStatus === 'NEW'"
+                  size="small"
+                  ghost
+                  @click="delGoods(index, row)"
+                  >删除
+                </Button>
+              </template>
+            </Table>
+          </TabPane>
+        </Tabs>
+      </Row>
+
+      <Row class="operation">
+        <Button @click="closeCurrentPage">返回</Button>
+        <Button
+          type="primary"
+          :loading="submitLoading"
+          v-if="promotionStatus === 'NEW'"
+          @click="save"
+          >提交
+        </Button>
       </Row>
     </Card>
+
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
   </div>
 </template>
 <script>
 import {
   seckillGoodsList,
   seckillDetail,
-  auditApplySeckill,
+  setSeckillGoods,
   delSeckillGoods,
 } from "@/api/promotion.js";
+import skuSelect from "@/components/lili-dialog";
 
 export default {
+  components: {
+    skuSelect,
+  },
+  watch: {
+    tabCurrent(val) {
+      this.tabIndex = val;
+    },
+  },
   data() {
     return {
+      tabCurrent: 0,
       promotionStatus: "", // 活动状态
-      showModal: false, // modal显隐
-      openTip: true, // 显示提示
       loading: false, // 表单加载状态
-      submitLoading: false, // 加载状态
       searchForm: {
         // 搜索框初始化对象
-        pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageNumber: 0, // 当前页数
+        pageSize: 1000, // 页面大小
       },
-      total: 0, // 总数
+      tabIndex: 0, // 选择商品的下标
+      submitLoading: false, // 添加或编辑提交状态
       selectList: [], // 多选数据
       selectCount: 0, // 多选计数
-      data: [], // 表单数据
+      data: [{}], // 表单数据
       columns: [
-        // 表头
         {
           title: "活动名称",
           key: "promotionName",
@@ -110,144 +175,121 @@ export default {
           title: "时间场次",
           slot: "hours",
         },
-        {
-          title: "活动状态",
-          key: "promotionStatus",
-          minWidth: 80,
-          sortable: false,
-          render: (h, params) => {
-            if (params.row.promotionStatus == "NEW") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "新建",
-                  },
-                }),
-              ]);
-            } else if (params.row.promotionStatus == "START") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "success",
-                    text: "开始",
-                  },
-                }),
-              ]);
-            } else if (params.row.promotionStatus == "END") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "结束",
-                  },
-                }),
-              ]);
-            } else if (params.row.promotionStatus == "CLOSE") {
-              return h("div", [
-                h("Badge", {
-                  props: {
-                    status: "error",
-                    text: "废弃",
-                  },
-                }),
-              ]);
-            }
-          },
-        },
       ],
       goodsColumns: [
-        // 商品表单
         {
           title: "商品名称",
           key: "goodsName",
           minWidth: 120,
-          tooltip: true,
         },
         {
           title: "商品价格",
           slot: "originalPrice",
-          width: 110,
+          minWidth: 50,
         },
         {
           title: "库存",
           slot: "quantity",
-          minWidth: 30,
-          width: 90,
+          minWidth: 40,
         },
         {
           title: "活动价格",
           slot: "price",
-          width: 100,
+          minWidth: 50,
         },
         {
-          title: "商家名称",
-          key: "storeName",
-          minWidth: 100,
-          tooltip: true,
+          title: "状态",
+          slot: "promotionApplyStatus",
+          minWidth: 30,
         },
-        {
-          title: "活动场次",
-          width: 100,
-          slot: "time",
-        },
-        // {
-        //   title: "状态",
-        //   slot: "promotionApplyStatus",
-        //   width: 90,
-        // },
         {
           title: "操作",
           slot: "action",
-          width: 150,
-          align: "center",
+          minWidth: 50,
         },
       ],
       goodsList: [], // 商品列表
-      params: {
-        // 请求参数
-        seckillId: this.$route.query.id,
-        applyStatus: "PASS",
-        failReason: "",
-        ids: "",
-      },
-      rules: {
-        // 验证规则
-        failReason: [{ required: true, message: "请输入拒绝原因" }],
-      },
+      defaultGoodsList: [], //默认查询秒杀的商品
     };
   },
   methods: {
+    // 关闭当前页面
+    closeCurrentPage() {
+      this.$store.commit("removeTag", "seckill-goods");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
+    // 提交秒杀商品
+    save() {
+      let list = JSON.parse(JSON.stringify(this.goodsList));
+      let params = {
+        seckillId: this.$route.query.id,
+        applyVos: [],
+      };
+
+      list.forEach((e, index) => {
+        e.list.forEach((i) => {
+          // if(e.id) delete e.id
+          params.applyVos.push(i);
+        });
+      });
+      this.submitLoading = true;
+
+      console.log(list);
+
+      setSeckillGoods(params).then((res) => {
+        this.submitLoading = false;
+        if (res && res.success) {
+          this.$Message.success("提交活动商品成功");
+          this.closeCurrentPage();
+        }
+      });
+    },
     // 初始化数据
     init() {
       this.getSeckillMsg();
     },
-    // 分页 改变页码
-    changePage(v) {
-      this.searchForm.pageNumber = v;
-      this.getDataList();
-      this.clearSelectAll();
-    },
-    // 分页 改变页数
-    changePageSize(v) {
-      this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = v;
-      this.getDataList();
-    },
     // 清除选中状态
     clearSelectAll() {
       this.$refs.table.selectAll(false);
     },
+    // 获取选择数据
+    changeSelect(e) {
+      this.selectList = e;
+      this.selectCount = e.length;
+    },
 
     getDataList() {
       // 获取商品详情
       this.loading = true;
       this.searchForm.seckillId = this.$route.query.id;
+      // 处理过的时间 为‘1:00’
+      let hours = this.unixHours(this.data[0].hours);
+      hours.forEach((e) => {
+        this.goodsList.push({
+          hour: e,
+          list: [],
+        });
+      });
       seckillGoodsList(this.searchForm).then((res) => {
         this.loading = false;
         if (res.success && res.result) {
-          this.goodsList = res.result.records;
-          this.total = res.result.total;
+          let data = res.result.records;
+          // 未处理时间 为'1'
+          let noFilterhours = this.data[0].hours.split(",");
+          if (data.length) {
+            noFilterhours.forEach((e, index) => {
+              data.forEach((i) => {
+                if (i.timeLine == e) {
+                  this.goodsList[index].list.push(i);
+                }
+              });
+            });
+
+            this.defaultGoodsList = this.goodsList[this.tabIndex].list;
+          }
         }
       });
     },
@@ -265,39 +307,105 @@ export default {
     },
     delGoods(index, row) {
       // 删除商品
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除该商品吗?删除后不可恢复",
-        onOk: () => {
-          const params = {
-            seckillId: row.seckillId,
-            id: row.id,
-          };
-          delSeckillGoods(params).then((res) => {
-            if (res.success) {
-              this.goodsList.splice(index, 1);
-              this.$Message.success("删除成功！");
-            }
-          });
-        },
+      if (row.promotionApplyStatus === "PASS") {
+        const params = {
+          seckillId: row.seckillId,
+          id: row.id,
+        };
+        delSeckillGoods(params).then((res) => {
+          if (res.success) {
+            this.goodsList[this.tabIndex].list.splice(index, 1);
+            this.$Message.success("删除成功！");
+          }
+        });
+      } else {
+        this.goodsList[this.tabIndex].list.splice(index, 1);
+        this.$Message.success("删除成功！");
+      }
+    },
+    selectedGoodsData(callback) {
+      let way = [];
+      let data = JSON.parse(JSON.stringify(callback));
+
+      data.forEach((e) => {
+        way.push({
+          goodsName: e.goodsName,
+          price: e.price,
+          originalPrice: e.price,
+          promotionApplyStatus: e.promotionApplyStatus || "",
+          quantity: e.quantity,
+          seckillId: this.$route.query.id,
+          storeId: e.storeId,
+          storeName: e.storeName,
+          skuId: e.id,
+          timeLine: this.data[0].hours.split(",")[this.tabIndex],
+        });
       });
+
+      this.$set(this.goodsList[this.tabIndex], "list", [
+        ...way,
+        // ...this.defaultGoodsList,
+      ]);
+      // this.$nextTick(() => {
+      //   this.$forceUpdate();
+      // });
+    },
+    openSkuList() {
+      // 显示商品选择器
+
+      this.$refs.skuSelect.open("goods");
+      let data = this.goodsList[this.tabIndex].list;
+      data.forEach((e) => {
+        e.id = e.skuId;
+      });
+      this.$refs.skuSelect.goodsData = data;
     },
     unixDate(time) {
       // 处理报名截止时间
       return this.$options.filters.unixToDate(new Date(time) / 1000);
     },
     unixHours(item) {
-      // 处理小时场次
-      let hourArr = item.split(",");
-      for (let i = 0; i < hourArr.length; i++) {
-        hourArr[i] += ":00";
+      if (item) {
+        // 处理小时场次
+        let hourArr = item.split(",");
+        for (let i = 0; i < hourArr.length; i++) {
+          hourArr[i] += ":00";
+        }
+        return hourArr;
       }
-      return hourArr;
+      return [];
+    },
+    // 格式化申请状态
+    promotionApplyStatus(key) {
+      switch (key) {
+        case "APPLY":
+          return "申请";
+        case "PASS":
+          return "通过";
+        case "REFUSE":
+          return "拒绝";
+        default:
+          return "未申请";
+      }
+    },
+    // 展示审核拒绝原因
+    showReason(reason) {
+      this.$Modal.info({
+        title: "拒绝原因",
+        content: reason,
+      });
     },
   },
   mounted() {
     this.init();
   },
+  // 如果是从详情页返回列表页，修改列表页keepAlive为true，确保不刷新页面
+  beforeRouteLeave(to, from, next) {
+    if (to.name === "seckill") {
+      to.meta.keepAlive = true;
+    }
+    next();
+  },
 };
 </script>
 <style lang="scss" scoped>