diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js
index 2dd8ffab..8823d99a 100644
--- a/manager/src/api/promotion.js
+++ b/manager/src/api/promotion.js
@@ -14,7 +14,7 @@ export const getPromotionSeckill = params => {
 
 // 是否推荐直播间
 export const whetherStar = params => {
-  return putRequest(`/broadcast/studio/recommend/${params.id}`,params);
+  return putRequest(`/broadcast/studio/recommend/${params.id}`, params);
 };
 
 // 添加优惠券活动
@@ -64,6 +64,33 @@ export const closePintuan = pintuanId => {
   return putRequest(`/promotion/pintuan/close/${pintuanId}`);
 };
 
+// 修改砍价活动商品
+export const saveKanJiaActivityGoods = params => {
+  return postRequest("/promotion/kan-jia-goods", params, {
+    "Content-type": "application/json"
+  });
+};
+// 修改砍价活动商品
+export const editKanJiaActivityGoods = params => {
+  return putRequest("/promotion/kan-jia-goods", params, {
+    "Content-type": "application/json"
+  });
+};
+// 获取砍价活动商品
+export const getKanJiaGoodsList = params => {
+  return getRequest(`/promotion/kan-jia-goods`, params);
+};
+
+//删除砍价活动商品
+export const delKanJiaGoods = ids => {
+  return deleteRequest(`/promotion/kan-jia-goods/${ids}`);
+};
+
+// 砍价活动商品详情
+export const getKanJiaActivityGoodsById = id => {
+  return getRequest(`/promotion/kan-jia-goods/${id}`);
+};
+
 // 保存平台优惠券
 export const savePlatformCoupon = params => {
   return postRequest("/promotion/coupon", params, {
diff --git a/manager/src/router/router.js b/manager/src/router/router.js
index 0f86c1c9..548235a5 100644
--- a/manager/src/router/router.js
+++ b/manager/src/router/router.js
@@ -174,6 +174,18 @@ export const otherRouter = {
       component: () =>
         import("@/views/promotion/pointsGoodsCategory/pointsGoodsCategory.vue")
     },
+    {
+      path: "promotion/add-kanJia-activity-goods",
+      title: "添加砍价活动",
+      name: "add-kanJia-activity-goods",
+      component: () => import("@/views/promotion/kanjia/kanjiaActivityAddGoods.vue")
+    },
+    {
+      path: "promotion/edit-kanJia-activity-goods",
+      title: "修改砍价活动",
+      name: "edit-kanJia-activity-goods",
+      component: () => import("@/views/promotion/kanjia/kanjiaActivityEditGoods.vue")
+    },
     {
       path: "promotion/manager-coupon",
       title: "平台优惠券",
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
new file mode 100644
index 00000000..4e37f672
--- /dev/null
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
@@ -0,0 +1,415 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <div class="form-item-view">
+            <h4>商品信息</h4>
+
+            <FormItem label="选择商品" prop="scopeType">
+              <Button type="primary" @click="openSkuList">选择商品</Button>
+              <Button
+                type="error"
+                ghost
+                style="margin-left: 10px"
+                @click="delSelectGoods"
+              >批量删除
+              </Button
+              >
+            </FormItem>
+
+            <FormItem astyle="width: 100%">
+              <Table
+                border
+                :columns="columns"
+                :data="form.promotionGoodsList"
+                @on-selection-change="changeSelect"
+              >
+                <template slot-scope="{ row }" slot="skuId">
+                  <div>{{ row.skuId }}</div>
+                </template>
+
+                <template slot-scope="{ index }" slot="settlementPrice">
+                  <Input
+                    type="number"
+                    v-model="form.promotionGoodsList[index].settlementPrice"
+                  />
+                </template>
+                <template slot-scope="{ index }" slot="lowestPrice">
+                  <Input
+                    type="number"
+                    v-model="form.promotionGoodsList[index].lowestPrice"
+                  />
+                </template>
+                <template slot-scope="{ index }" slot="highestPrice">
+                  <Input
+                    type="number"
+                    v-model="form.promotionGoodsList[index].highestPrice"
+                  />
+                </template>
+                <template slot-scope="{ index }" slot="purchasePrice">
+                  <Input
+                    type="number"
+                    v-model="form.promotionGoodsList[index].purchasePrice"
+                  />
+                </template>
+
+                <template slot-scope="{ index }" slot="stock">
+                  <Input
+                    type="number"
+                    v-model="form.promotionGoodsList[index].stock"
+                  />
+                </template>
+              </Table>
+            </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>
+            <div>
+              <Button type="text" @click="closeCurrentPage">返回</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+
+<script>
+  import {
+    saveKanJiaActivityGoods,
+    editKanJiaActivityGoods
+  } from "@/api/promotion";
+  import {regular} from "@/utils";
+  import skuSelect from "@/views/lili-dialog";
+
+  export default {
+    name: "addKanJiaActivityGoods",
+    components: {
+      skuSelect,
+    },
+    watch: {},
+    data() {
+      return {
+        modalType: 0, // 是否编辑
+        form: {
+          promotionGoodsList: [], // 活动商品列表
+        },
+        id: this.$route.query.id, // 砍价活动id
+        submitLoading: false, // 添加或编辑提交状态
+        selectedGoods: [], // 已选商品列表，便于删除
+        promotionGoodsList: [], // 活动商品列表
+        formRule: {
+          rangeTime: [{required: true, message: "请选择活动时间"}],
+        },
+        columns: [
+          {
+            type: "selection",
+            width: 60,
+            align: "center",
+          },
+          {
+            title: "商品名称",
+            key: "goodsName",
+            tooltip: true,
+            minWidth: 100,
+          },
+          {
+            title: "商品价格",
+            key: "price",
+            width: 120,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.price, "￥")
+              );
+            },
+          },
+          {
+            title: "库存",
+            key: "quantity",
+            width: 100,
+          },
+          {
+            title: "结算价格",
+            slot: "settlementPrice",
+            width: 110,
+          },
+          {
+            title: "最低砍",
+            slot: "lowestPrice",
+            width: 110,
+          },
+          {
+            title: "最高砍",
+            slot: "highestPrice",
+            width: 110,
+          },
+
+          {
+            title: "最低购买金额",
+            slot: "purchasePrice",
+            width: 110,
+          },
+          {
+            title: "活动库存",
+            slot: "stock",
+            width: 110,
+          },
+          {
+            title: "操作",
+            key: "action",
+            align: "center",
+            width: 100,
+            render: (h, params) => {
+              return h(
+                "Button",
+                {
+                  props: {
+                    size: "small",
+                    type: "error",
+                    ghost: true,
+                  },
+                  on: {
+                    click: () => {
+                      this.delGoods(params.index);
+                    },
+                  },
+                },
+                "删除"
+              );
+            },
+          },
+        ],
+        options: {
+          disabledDate(date) {
+            return date && date.valueOf() < Date.now() - 86400000;
+          },
+        },
+      };
+    },
+    async mounted() {
+      // 如果id不为空则查询信息
+      if (this.id) {
+        this.getCoupon();
+        this.modalType = 1;
+      }
+    },
+    methods: {
+
+      openSkuList() { // 显示商品选择器
+        this.$refs.skuSelect.open("goods");
+        let data = JSON.parse(JSON.stringify(this.promotionGoodsList))
+        data.forEach(e => {
+          e.id = e.skuId
+        })
+        this.$refs.skuSelect.goodsData = data;
+      },
+
+      /** 保存砍价活动 */
+      handleSubmit() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const params = JSON.parse(JSON.stringify(this.form));
+            if (this.form.rangeTime[0] === '' || this.form.rangeTime[0] === '') {
+              this.$Message.error("请选择活动时间");
+              return
+            }
+            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
+            let checkResult = true
+            //如果添加活动的时候选择了商品 则对选择的商品参数做一些校验
+            if (this.form.promotionGoodsList.length > 0) {
+              this.form.promotionGoodsList.forEach((res) => {
+                //校验库存参数
+                if (res.stock <= 0 || res.stock > res.quantity) {
+                  checkResult = false
+                  this.$Message.error("活动库存不能为0且不能超过商品库存");
+                  return
+                }
+                // 最低购买金额格式校验
+                if (!regular.money.test(res.purchasePrice)) {
+                  checkResult = false
+                  this.$Message.error("最低购买金额格式不正确");
+                }
+                // 结算价格金额格式校验
+                if (!regular.money.test(res.settlementPrice)) {
+                  checkResult = false
+                  this.$Message.error("结算价格金额格式不正确");
+                  return
+                }
+                // 结算价格金额格式校验
+                if (res.settlementPrice < 0 || res.settlementPrice > res.price) {
+                  checkResult = false
+                  this.$Message.error("结算价格金额不能为0且不能超过商品价格");
+                  return
+                }
+                //最高砍价校验
+                if (!regular.money.test(res.highestPrice)) {
+                  checkResult = false
+                  this.$Message.error("最高可砍金额格式错误");
+                  return
+                }
+                if (res.highestPrice <= 0 || res.highestPrice > res.price) {
+                  checkResult = false
+                  this.$Message.error("最高可砍金额不能为0且不能超过商品价格");
+                  return
+                }
+                //最低砍价校验
+                if (!regular.money.test(res.lowestPrice)) {
+                  checkResult = false
+                  this.$Message.error("最低可砍金额格式错误");
+                  return
+                }
+                if (res.lowestPrice <= 0 || res.lowestPrice > res.price) {
+                  checkResult = false
+                  this.$Message.error("最低可砍金额不能为0");
+                  return
+                }
+                //校验最高最低砍价金额
+                if (res.lowestPrice > res.highestPrice) {
+                  checkResult = false
+                  this.$Message.error("最低砍价金额不能大于最高砍价金额");
+                  return
+                }
+              });
+            }
+            if (!checkResult) {
+              return;
+            }
+            this.submitLoading = true;
+            saveKanJiaActivityGoods(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("砍价活动修改成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        });
+      },
+      // 关闭当前页面
+      closeCurrentPage() {
+        this.$store.commit("removeTag", "add-kan-jia-goods");
+        localStorage.pageOpenedList = JSON.stringify(
+          this.$store.state.app.pageOpenedList
+        );
+        this.$router.go(-1);
+      },
+      openSkuList() {
+        // 显示商品选择器
+        this.$refs.skuSelect.open("goods");
+        let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+        data.forEach((e) => {
+          e.id = e.skuId;
+        });
+        this.$refs.skuSelect.goodsData = data;
+      },
+      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({
+            settlementPrice: e.settlementPrice || 0,
+            purchasePrice: e.purchasePrice || 0,
+            lowestPrice: e.lowestPrice || 0,
+            highestPrice: e.highestPrice || 0,
+            stock: e.stock || 0,
+            goodsName: e.goodsName,
+            price: e.price,
+            originalPrice: e.price,
+            quantity: e.quantity,
+            storeId: e.storeId,
+            storeName: e.storeName,
+            skuId: e.id,
+          });
+        });
+        console.warn(list)
+        this.form.promotionGoodsList = list;
+      },
+    },
+  };
+</script>
+
+<style lang="scss" scpoed>
+  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;
+  }
+
+  .describe {
+    font-size: 12px;
+    margin-left: 10px;
+    color: #999;
+  }
+
+  .effectiveDays {
+    font-size: 12px;
+    color: #999;
+
+    > * {
+      margin: 0 4px;
+    }
+  }
+
+  .tips {
+    font-size: 12px;
+    color: #999;
+  }
+</style>
+
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue
new file mode 100644
index 00000000..2444c560
--- /dev/null
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue
@@ -0,0 +1,325 @@
+<template>
+  <div>
+    <Card>
+      <Form ref="form" :model="form" :label-width="120" :rules="formRule">
+        <div class="base-info-item">
+          <div class="form-item-view">
+            <h4>商品信息</h4>
+            <FormItem label="商品名称">
+              <div>{{ form.goodsName }}</div>
+            </FormItem>
+            <FormItem label="SKU编码">
+              <div>{{ form.skuId }}</div>
+            </FormItem>
+            <FormItem label="店铺名称">
+              <div>{{ form.goodsSku.storeName }}</div>
+            </FormItem>
+            <FormItem label="商品价格">
+              <div>{{ form.goodsSku.price | unitPrice('￥') }}</div>
+            </FormItem>
+            <FormItem label="商品库存">
+              <div>{{ form.goodsSku.quantity }}</div>
+            </FormItem>
+            <FormItem label="结算价格" prop="settlementPrice">
+              <Input
+                type="number"
+                v-model="form.settlementPrice"
+                placeholder="请填写结算价格"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="最低购买金额" prop="purchasePrice">
+              <Input
+                type="number"
+                v-model="form.purchasePrice"
+                placeholder="请填写最低购买金额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="最低可砍" prop="lowestPrice">
+              <Input
+                type="number"
+                v-model="form.lowestPrice"
+                placeholder="请填写最低可砍金额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+            <FormItem label="最高可砍" prop="highestPrice">
+              <Input
+                type="number"
+                v-model="form.highestPrice"
+                placeholder="请填写最高可砍金额"
+                clearable
+                style="width: 260px"
+              />
+            </FormItem>
+
+            <FormItem label="活动库存" prop="stock">
+              <Input
+                type="number"
+                v-model="form.stock"
+                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>
+            </FormItem>
+            <div>
+              <Button type="text" @click="closeCurrentPage">返回</Button>
+              <Button type="primary" :loading="submitLoading" @click="handleSubmit">提交</Button>
+            </div>
+          </div>
+        </div>
+      </Form>
+    </Card>
+    <sku-select
+      ref="skuSelect"
+      @selectedGoodsData="selectedGoodsData"
+    ></sku-select>
+  </div>
+</template>
+
+<script>
+  import {
+    getKanJiaActivityGoodsById,
+    editKanJiaActivityGoods,
+  } from "@/api/promotion";
+  import {regular} from "@/utils";
+  import skuSelect from "@/views/lili-dialog";
+
+  export default {
+    name: "editKanjiaActivityGoods",
+    components: {
+      skuSelect,
+    },
+    watch: {},
+    data() {
+      const checkSettlementPrice = (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 checkPurchasePrice = (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 checkLowestPrice = (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 checkHighestPrice = (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();
+        }
+      };
+      return {
+        modalType: 0, // 是否编辑
+        form: {
+          goodsSku: {},
+        },
+        id: this.$route.query.id, // 砍价活动id
+        submitLoading: false, // 添加或编辑提交状态
+        formRule: {
+          settlementPrice: [
+            {required: true, message: "请输入结算金额"},
+            {validator: checkSettlementPrice},
+          ],
+          purchasePrice: [
+            {required: true, message: "请输入最低购买金额"},
+            {validator: checkPurchasePrice},
+          ],
+          lowestPrice: [
+            {required: true, message: "请输入最低可砍金额"},
+            {validator: checkLowestPrice},
+          ],
+          highestPrice: [
+            {required: true, message: "请输入最高可砍金额"},
+            {validator: checkHighestPrice},
+          ],
+          rangeTime: [{required: true, message: "请选择活动时间"}],
+          stock: [{required: true, message: "请输入活动库存"}],
+        },
+        options: {
+          disabledDate(date) {
+            return date && date.valueOf() < Date.now() - 86400000;
+          },
+        },
+      };
+    },
+    async mounted() {
+      // 如果id不为空则查询信息
+      if (this.id) {
+        this.getKanJiaActivityGoods();
+        this.modalType = 1;
+      }
+    },
+    methods: {
+      getKanJiaActivityGoods() {
+        getKanJiaActivityGoodsById(this.id).then((res) => {
+          this.form = res.result;
+          this.form.rangeTime = [];
+          this.form.rangeTime.push(new Date(this.form.startTime), new Date(this.form.endTime));
+        });
+      },
+
+      /** 保存砍价活动 */
+      handleSubmit() {
+
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const params = JSON.parse(JSON.stringify(this.form));
+            if (this.form.rangeTime[0] === '' || this.form.rangeTime[0] === '') {
+              this.$Message.error("请选择活动时间");
+              return
+            }
+            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
+            console.warn(params)
+            //校验库存参数
+            if (params.stock <= 0 || params.stock > params.goodsSku.quantity) {
+              this.$Message.error("活动库存不能为0且不能超过商品库存");
+              return
+            }
+            // 最低购买金额格式校验
+            if (!regular.money.test(params.purchasePrice)) {
+              this.$Message.error("最低购买金额格式不正确");
+            }
+            // 结算价格金额格式校验
+            if (!regular.money.test(params.settlementPrice)) {
+              this.$Message.error("结算价格金额格式不正确");
+              return
+            }
+            // 结算价格金额格式校验
+            if (params.settlementPrice < 0 || params.settlementPrice > params.price) {
+              this.$Message.error("结算价格金额不能为0且不能超过商品价格");
+              return
+            }
+            //最高砍价校验
+            if (!regular.money.test(params.highestPrice)) {
+              this.$Message.error("最高可砍金额格式错误");
+              return
+            }
+            if (params.highestPrice <= 0 || params.highestPrice > params.price) {
+              this.$Message.error("最高可砍金额不能为0且不能超过商品价格");
+              return
+            }
+
+            //最低砍价校验
+            if (!regular.money.test(params.lowestPrice)) {
+              this.$Message.error("最低可砍金额格式错误");
+              return
+            }
+            if (params.lowestPrice <= 0 || params.lowestPrice > params.price) {
+              this.$Message.error("最低可砍金额不能为0");
+              return
+            }
+            //校验最高最低砍价金额
+            if (params.lowestPrice > params.highestPrice) {
+              this.$Message.error("最低砍价金额不能大于最高砍价金额");
+              return
+            }
+
+            this.submitLoading = true;
+            // 添加 避免编辑后传入id等数据 记得删除
+            editKanJiaActivityGoods(params).then((res) => {
+              this.submitLoading = false;
+              if (res.success) {
+                this.$Message.success("砍价活动修改成功");
+                this.closeCurrentPage();
+              }
+            });
+          }
+        });
+      },
+      // 关闭当前页面
+      closeCurrentPage() {
+        this.$store.commit("removeTag", "add-kan-jia-goods");
+        localStorage.pageOpenedList = JSON.stringify(
+          this.$store.state.app.pageOpenedList
+        );
+        this.$router.go(-1);
+      },
+
+    },
+  };
+</script>
+
+<style lang="scss" scpoed>
+  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;
+  }
+
+  .describe {
+    font-size: 12px;
+    margin-left: 10px;
+    color: #999;
+  }
+
+  .effectiveDays {
+    font-size: 12px;
+    color: #999;
+
+    > * {
+      margin: 0 4px;
+    }
+  }
+
+  .tips {
+    font-size: 12px;
+    color: #999;
+  }
+</style>
+
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityGoods.vue
new file mode 100644
index 00000000..a2c2db2e
--- /dev/null
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityGoods.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row>
+        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="商品名称" prop="goodsName">
+            <Input type="text" v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable style="width: 200px"/>
+          </Form-item>
+          <Form-item label="活动状态" prop="promotionStatus">
+            <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
+              <Option value="NEW">未开始</Option>
+              <Option value="START">已开始/上架</Option>
+              <Option value="END">已结束/下架</Option>
+              <Option value="CLOSE">紧急关闭/作废</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="活动时间">
+            <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>
+      </Row>
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+             @on-sort-change="changeSort">
+        <template slot-scope="{ row }" slot="goodsName">
+          <div>
+            <a class="mr_10" @click="linkTo(row.goodsSku.goodsId,row.skuId)">{{row.goodsName}}</a>
+            <Poptip trigger="hover" title="扫码在手机中查看" transfer>
+              <div slot="content">
+
+                <vue-qr :text="wapLinkTo(row.goodsSku.goodsId,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
+                        :size="150"></vue-qr>
+              </div>
+              <img src="../../../assets/qrcode.svg" style="vertical-align:middle;" class="hover-pointer" width="20"
+                   height="20" alt="">
+            </Poptip>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="startTime">
+          <div>{{ row.startTime }}</div>
+          <div>{{ row.endTime }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="quantity">
+          <div>{{ row.goodsSku.quantity }}</div>
+        </template>
+        <template slot-scope="{ row,index }" slot="action">
+          <Button v-if="row.promotionStatus === 'NEW'" type="info"
+                  size="small" style="margin-right: 10px" @click="edit(row)">编辑
+          </Button>
+          <Button v-if="row.promotionStatus === 'NEW' || row.promotionStatus === 'END'" type="error"
+                  size="small" style="margin-right: 10px" @click="delAll(row)">删除
+          </Button>
+        </template>
+      </Table>
+      <Row type="flex" justify="end" class="page">
+        <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>
+      </Row>
+    </Card>
+  </div>
+</template>
+
+<script>
+  import {
+    getKanJiaGoodsList,
+    delKanJiaGoods,
+  } from "@/api/promotion";
+
+  export default {
+    name: "coupon",
+    components: {},
+
+    data() {
+      return {
+        loading: true, // 表单加载状态
+        modalType: 0, // 添加或编辑标识
+        modalVisible: false, // 添加或编辑显示
+        modalTitle: "", // 添加或编辑标题
+        searchForm: {
+          // 搜索框初始化对象
+          pageNumber: 1, // 当前页数
+          pageSize: 10, // 页面大小
+          sort: "startTime", // 默认排序字段
+          order: "desc", // 默认排序方式
+          goodsName: ""
+        },
+        form: {
+          // 添加或编辑表单对象初始化数据
+        },
+        // 表单验证规则
+        formValidate: {},
+        submitLoading: false, // 添加或编辑提交状态
+        selectList: [], // 多选数据
+        selectCount: 0, // 多选计数
+        columns: [
+          {
+            title: "商品名称",
+            slot: "goodsName",
+            minWidth: 150,
+            tooltip: true,
+          },
+          {
+            title: "库存数量",
+            slot: "quantity",
+            width: 100,
+          },
+          {
+            title: "剩余活动库存",
+            key: "stock",
+            width: 110,
+          },
+          {
+            title: "最低购买金额",
+            key: "lowestPrice",
+            minWidth: 110,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.lowestPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "每人最低砍",
+            key: "lowestPrice",
+            minWidth: 100,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.lowestPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "每人最高砍",
+            key: "highestPrice",
+            minWidth: 100,
+            tooltip: true,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.highestPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "结算价格",
+            key: "settlementPrice",
+            minWidth: 100,
+            render: (h, params) => {
+              return h(
+                "div",
+                this.$options.filters.unitPrice(params.row.settlementPrice, "￥")
+              );
+            },
+          },
+          {
+            title: "活动开始时间",
+            slot: "startTime",
+            minWidth: 150,
+          },
+          {
+            title: "状态",
+            key: "promotionStatus",
+            render: (h, params) => {
+              let text = "未知",
+                color = "red";
+              if (params.row.promotionStatus == "NEW") {
+                text = "未开始";
+                color = "geekblue";
+              } else if (params.row.promotionStatus == "START") {
+                text = "已开始";
+                color = "green";
+              } else if (params.row.promotionStatus == "END") {
+                text = "已结束";
+                color = "red";
+              } else if (params.row.promotionStatus == "CLOSE") {
+                text = "已关闭";
+                color = "red";
+              }
+              return h("div", [
+                h(
+                  "Tag",
+                  {
+                    props: {
+                      color: color,
+                    },
+                  },
+                  text
+                ),
+              ]);
+            },
+            width: 100,
+          },
+          {
+            title: "操作",
+            slot: "action",
+            align: "center",
+            fixed: "right",
+            width: 150,
+          },
+        ],
+        data: [], // 表单数据
+        total: 0, // 表单数据总数
+        selectCoupon: [], //本级选中的优惠券
+      };
+    },
+    props: {},
+    watch: {
+      $route(to, from) {
+        if (to.fullPath == "/promotion/manager-coupon") {
+          this.init();
+        }
+      },
+    },
+    methods: {
+      // 选中优惠券 父级传值
+      selectedList: {
+        handler(val) {
+          // 判断是否是父级回调给自己已选择优惠券
+          if (val.length != 0) {
+            this.selectCoupon = val;
+          }
+        },
+        deep: true,
+        immediate: true,
+      },
+      check() {
+        // this.selectCoupon.push(this.selectList)
+        this.$emit("selected", this.selectCoupon);
+      },
+      init() {
+        this.getDataList();
+      },
+      // 添加砍价活动跳转
+      add() {
+        this.$router.push({name: "add-kanJia-activity-goods"});
+      },
+
+      info(v) {
+        this.$router.push({name: "platform-coupon-info", query: {id: v.id}});
+      },
+      changePage(v) {
+        this.searchForm.pageNumber = v;
+        this.getDataList();
+        // this.clearSelectAll();
+      },
+      changePageSize(v) {
+        this.searchForm.pageSize = v;
+        this.getDataList();
+      },
+      handleSearch() {
+        this.searchForm.pageNumber = 0;
+        this.searchForm.pageSize = 10;
+        this.getDataList();
+      },
+      changeSort(e) {
+        this.searchForm.sort = e.key;
+        this.searchForm.order = e.order;
+        if (e.order === "normal") {
+          this.searchForm.order = "";
+        }
+        this.getDataList();
+      },
+      clearSelectAll() {
+        this.$refs.table.selectAll(false);
+      },
+
+      getDataList() {
+        this.loading = true;
+        if (this.selectDate && this.selectDate[0] && this.selectDate[1]) {
+          this.searchForm.startTime = this.selectDate[0].getTime();
+          this.searchForm.endTime = this.selectDate[1].getTime();
+        } else {
+          this.searchForm.startTime = null;
+          this.searchForm.endTime = null;
+        }
+        // 带多条件搜索参数获取表单数据 请自行修改接口
+        getKanJiaGoodsList(this.searchForm).then((res) => {
+          this.loading = false;
+          if (res.success) {
+            this.data = res.result.records;
+            this.total = res.result.total;
+          }
+        });
+        this.total = this.data.length;
+        this.loading = false;
+      },
+      edit(v) {
+        this.$router.push({name: "edit-kanJia-activity-goods", query: {id: v.id}});
+      },
+      delAll(row) {
+        this.$Modal.confirm({
+          title: "确认删除",
+          content: "确认需要删除此砍价商品",
+          loading: true,
+          onOk: () => {
+            let ids = [];
+            this.selectList.forEach(function (e) {
+              ids.push(e.id);
+            });
+            // 批量删除
+            delKanJiaGoods(row.id).then((res) => {
+              this.$Modal.remove();
+              if (res.success) {
+                this.$Message.success("删除成功");
+                this.getDataList();
+              }
+            });
+          },
+        });
+      },
+    },
+    mounted() {
+      this.init();
+    },
+  };
+</script>
+<style lang="scss">
+  @import "@/styles/table-common.scss";
+</style>