Merge branch 'dev' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin into dev

src/api/active/active_hot.js

@@ -0,0 +1,73 @@
+import request from '@/utils/request'
+
+// 查询爆品列表
+export function getHotGoodsList(data) {
+  return request({
+    url: '/explosive-products/getExplosiveProductsAll',
+    method: 'post',
+    data
+  })
+}
+
+// 添加爆品
+export function addHotGoods(data) {
+  return request({
+    url: '/explosive-products/addExplosiveProducts',
+    method: 'POST',
+    data
+  })
+}
+
+// 删除爆品
+export function deleteHotGoods(params) {
+  return request({
+    url: '/explosive-products/deleteExplosiveProducts',
+    method: 'POST',
+    params
+  })
+}
+
+// 编辑爆品
+export function editHotGoods(data) {
+  return request({
+    url: '/explosive-products/updateExplosiveProducts',
+    method: 'POST',
+    data
+  })
+}
+
+// 爆品上下架
+export function upDownExplosiveProducts(params) {
+  return request({
+    url: '/explosive-products/upDownExplosiveProducts',
+    method: 'POST',
+    params
+  })
+}
+
+// 添加配销产品
+export function addExplosiveProductsSubsidiary(data) {
+  return request({
+    url: '/explosive-products/addExplosiveProductsSubsidiary',
+    method: 'POST',
+    data
+  })
+}
+
+// 编辑配销产品
+export function editExplosiveProductsSubsidiary(data) {
+  return request({
+    url: '/explosive-products/updateExplosiveProductsSubsidiary',
+    method: 'POST',
+    data
+  })
+}
+
+// 删除配销产品
+export function deleteExplosiveProductsSubsidiary(params) {
+  return request({
+    url: '/explosive-products/deleteExplosiveProductsSubsidiary',
+    method: 'POST',
+    params
+  })
+}

src/views/active/hot/AddExplosiveProductsSubsidiary.vue

@@ -0,0 +1,171 @@
+<template>
+  <el-dialog append-to-body :title="dialogTitle" :visible.sync="addExplosiveProductsSubsidiaryVisible" width="30%" :before-close="handleBeforeClose">
+    <div class="add-explosive-productsSubsidiary-container">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="配销商品" prop="subsidiaryProductId">
+          <el-select
+            @change="handleSelectGoods"
+            style="width: 100%"
+            v-model="form.subsidiaryProductId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入商品ID"
+            :remote-method="handleSearchGoods"
+            :loading="searchGoodsLoading"
+          >
+            <el-option v-for="item in goodsList" :key="item.productId" :label="item.productName" :value="item.productId">
+              <div class="name">{{ item.productName }} - {{ item.sectionPrice }}</div>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="配销商品名称" prop="subsidiaryName">
+          <el-input v-model="form.subsidiaryName" placeholder="请填写配销商品名称"></el-input>
+        </el-form-item>
+        <el-form-item label="配销商品价格" prop="subsidiaryPrice">
+          <el-input v-model="form.subsidiaryPrice" prefix="¥" placeholder="请填写配销商品价格"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button
+        @click="
+          reset()
+          close()
+        "
+      >
+        取 消
+      </el-button>
+      <el-button type="primary" :loading="isLoading" @click="handleConfirm">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getClassifyGetAll } from '@/api/commodity'
+import { addExplosiveProductsSubsidiary, editExplosiveProductsSubsidiary } from '@/api/active/active_hot'
+
+export default {
+  data() {
+    return {
+      isLoading: false,
+      dialogTitle: '添加配销产品',
+      addExplosiveProductsSubsidiaryVisible: false,
+      form: {
+        id: void 0,
+        explosiveId: void 0,
+        subsidiaryName: '',
+        subsidiaryPrice: '',
+        subsidiaryProductId: ''
+      },
+      goodsList: [],
+      searchGoodsLoading: false,
+      rules: {
+        subsidiaryProductId: [{ required: true, message: '请选择商品', trigger: 'blur' }],
+        subsidiaryName: [{ required: true, message: '请输入配销产品名称', trigger: 'blur' }],
+        subsidiaryPrice: [
+          { required: true, message: '请输入配销产品价格', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              const priceRegex = /^\d+(\.\d{1,2})?$/
+              if (!value) {
+                callback(new Error('请输入配销产品价格'))
+              } else if (!priceRegex.test(value) || parseFloat(value) <= 0) {
+                callback(new Error('请输入有效的价格（正数，最多两位小数）'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+
+  methods: {
+    handleBeforeClose(done) {
+      this.reset()
+      done()
+    },
+
+    async open({ pid, item }) {
+      if (item && typeof item === 'object') {
+        this.form.id = item.id
+        this.form.subsidiaryPrice = Number(item.subsidiaryPrice) || 0
+        this.form.subsidiaryProductId = Number(item.subsidiaryProductId)
+        this.form.subsidiaryName = item.subsidiaryName
+        this.handleSearchGoods(item.subsidiaryProductId)
+        this.dialogTitle = '编辑配销产品'
+      }
+      this.form.explosiveId = pid
+      this.addExplosiveProductsSubsidiaryVisible = true
+    },
+
+    // 选择商品
+    handleSelectGoods(productId) {
+      const currentGoods = this.goodsList.find((item) => item.productId === productId)
+      if (currentGoods) {
+        this.form.subsidiaryName = currentGoods.productName
+        this.form.subsidiaryPrice = Number(currentGoods.price) || 0
+      }
+    },
+
+    // 远程搜索
+    async handleSearchGoods(query) {
+      if (query !== '') {
+        this.searchGoodsLoading = true
+        try {
+          const queryData = { productId: query, page: 1, pageSize: 100 }
+          const res = await getClassifyGetAll(queryData)
+          this.goodsList = res.data.list
+        } catch (error) {
+          this.goodsList = []
+        } finally {
+          this.searchGoodsLoading = false
+        }
+      } else {
+        this.goodsList = []
+      }
+    },
+
+    // 添加
+    async handleConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.formRef.validate()
+        const api = this.form.id ? editExplosiveProductsSubsidiary : addExplosiveProductsSubsidiary
+        const res = await api(this.form)
+        if (res.code === '200') {
+          this.$message({
+            message: this.form.id ? '编辑成功' : '添加成功',
+            type: 'success'
+          })
+          this.reset()
+          this.$emit('refresh')
+          this.close()
+        }
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    reset() {
+      this.form = {
+        explosiveId: void 0,
+        subsidiaryName: '',
+        subsidiaryPrice: '',
+        subsidiaryProductId: ''
+      }
+      this.goodsList = []
+    },
+
+    close() {
+      this.addExplosiveProductsSubsidiaryVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/active/hot/ExplosiveProductsSubsidiary.vue

@@ -0,0 +1,111 @@
+<template>
+  <el-dialog title="配销产品" :visible.sync="explosiveProductsSubsidiaryVisible" width="30%" :before-close="handleBeforeClose">
+    <div class="explosive-productsSubsidiary-container">
+      <div class="header" style="display: flex; align-items: center; justify-content: space-between; margin-bottom: 10px">
+        <h4 style="font-size: 18px; font-weight: bold">配销产品列表</h4>
+        <el-button size="mini" @click="handleAdd()" type="primary">新增配销产品 +</el-button>
+      </div>
+
+      <el-table v-loading="refreshLoading" border :data="hotGoodsDetail.subsidiaryList" :style="{ width: '100%' }">
+        <el-table-column align="center" prop="subsidiaryName" label="配销产品名称" />
+        <el-table-column align="center" prop="subsidiaryPrice" label="配销产品价格" />
+        <el-table-column align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="handleAdd(scope.row)">编辑</el-button>
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 添加单个配销产品 -->
+    <AddExplosiveProductsSubsidiary @refresh="handleRefresh" ref="addExplosiveProductsSubsidiaryRef"></AddExplosiveProductsSubsidiary>
+  </el-dialog>
+</template>
+
+<script>
+import AddExplosiveProductsSubsidiary from './AddExplosiveProductsSubsidiary.vue'
+import { getHotGoodsList, deleteExplosiveProductsSubsidiary } from '@/api/active/active_hot'
+
+export default {
+  components: { AddExplosiveProductsSubsidiary },
+  data() {
+    return {
+      explosiveProductsSubsidiaryVisible: false,
+      explosiveProductsSubsidiaryData: [],
+      hotGoodsDetail: {},
+      refreshLoading: false,
+      pQueryInfo: {},
+      isRefreshTable: false // 是否需要刷新外部表格
+    }
+  },
+
+  watch: {
+    explosiveProductsSubsidiaryVisible(value) {
+      if (!value) {
+        this.$emit('refresh')
+      }
+    }
+  },
+
+  methods: {
+    handleBeforeClose(done) {
+      done()
+    },
+
+    open(row, pQueryInfo) {
+      if (!row.id) {
+        return this.$message.warning('爆品ID为空')
+      }
+      this.pQueryInfo = pQueryInfo
+      this.hotGoodsDetail = row
+      this.explosiveProductsSubsidiaryVisible = true
+    },
+
+    // 添加配销产品
+    handleAdd(item = null) {
+      this.$refs.addExplosiveProductsSubsidiaryRef.open({
+        pid: this.hotGoodsDetail.id,
+        item
+      })
+    },
+
+    // 刷新列表
+    async handleRefresh() {
+      this.refreshLoading = true
+      this.isRefreshTable = true // 标记需要刷新外部表格
+      try {
+        const res = await getHotGoodsList(this.pQueryInfo)
+        if (res.code === '200') {
+          const list = res.data.list
+          const currentData = list.find((item) => item.id === this.hotGoodsDetail.id)
+          if (currentData) {
+            this.hotGoodsDetail = currentData
+          }
+        }
+      } finally {
+        this.refreshLoading = false
+      }
+    },
+
+    // 删除
+    handleDelete(row) {
+      this.$confirm(`是否删除【${row.subsidiaryName}】这件配销产品?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteExplosiveProductsSubsidiary({ subsidiaryId: row.id })
+          if (res.code == '200') {
+            this.$message.success('删除成功')
+            this.handleRefresh()
+          }
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/active/hot/HotGoodsAdd.vue

@@ -0,0 +1,187 @@
+<template>
+  <el-dialog :title="dialogTitle" :visible.sync="hotGoodsAddVisible" width="30%" :before-close="handleBeforeClose">
+    <el-form :model="form" :rules="rules" ref="formRef" label-width="120px">
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          @change="handleSelectGoods"
+          style="width: 100%"
+          v-model="form.productId"
+          filterable
+          remote
+          reserve-keyword
+          placeholder="请输入商品ID"
+          :remote-method="handleSearchGoods"
+          :loading="searchGoodsLoading"
+        >
+          <el-option v-for="item in goodsList" :key="item.productId" :label="item.productName" :value="item.productId">
+            <div class="name">{{ item.productName }} - {{ item.sectionPrice }}</div>
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="爆品名称" prop="productName">
+        <el-input v-model="form.productName" placeholder="请填写爆品名称"></el-input>
+      </el-form-item>
+
+      <el-form-item label="爆品价格" prop="productPrice">
+        <el-input v-model="form.productPrice" prefix="¥" placeholder="请输入爆品价格"></el-input>
+      </el-form-item>
+
+      <el-form-item label="是否上架" prop="isPut">
+        <el-select v-model="form.isPut" placeholder="请选择">
+          <el-option label="上架" :value="1"></el-option>
+          <el-option label="下架" :value="0"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="爆品主图链接" prop="productImage">
+        <ImageUpload :limit="1" v-model="form.productImage"></ImageUpload>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="hotGoodsAddVisible = false">取 消</el-button>
+      <el-button type="primary" :loading="isLoading" @click="handleConfirm">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import ImageUpload from '@/components/ImageUpload'
+import { getClassifyGetAll } from '@/api/commodity'
+import { addHotGoods, editHotGoods } from '@/api/active/active_hot'
+
+export default {
+  components: { ImageUpload },
+  data() {
+    return {
+      goodsList: [],
+      hotGoodsAddVisible: false,
+      searchGoodsLoading: false,
+      dialogTitle: '新增爆品商品',
+      isLoading: false,
+      form: {
+        id: void 0,
+        productId: '',
+        productName: '',
+        productImage: '',
+        productPrice: '',
+        isPut: 1
+      },
+      rules: {
+        productId: [{ required: true, message: '请选择商品', trigger: 'blur' }],
+        productName: [{ required: true, message: '请输入爆品名称', trigger: 'blur' }],
+        productImage: [{ required: true, message: '请输入爆品主图链接', trigger: 'blur' }],
+        productPrice: [
+          { required: true, message: '请输入爆品价格', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              const priceRegex = /^\d+(\.\d{1,2})?$/
+              if (!value) {
+                callback(new Error('请输入爆品价格'))
+              } else if (!priceRegex.test(value) || parseFloat(value) <= 0) {
+                callback(new Error('请输入有效的价格（正数，最多两位小数）'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
+        isPut: [{ required: true, message: '请选择是否上架', trigger: 'change' }]
+      }
+    }
+  },
+
+  methods: {
+    open(row) {
+      if (row && typeof row === 'object') {
+        this.form.id = row.id
+        this.form.productId = row.productId
+        this.handleSearchGoods(this.form.productId)
+        this.form.productName = row.productName
+        this.form.productImage = row.productImage
+        this.form.productPrice = row.productPrice
+        this.form.isPut = row.isPut
+        this.dialogTitle = '编辑爆款产品'
+      }
+      this.hotGoodsAddVisible = true
+    },
+
+    handleBeforeClose(done) {
+      this.reset()
+      done()
+    },
+
+    async handleSearchGoods(query) {
+      if (query !== '') {
+        this.searchGoodsLoading = true
+        try {
+          const queryData = {
+            productId: query,
+            page: 1,
+            pageSize: 20
+          }
+
+          const res = await getClassifyGetAll(queryData)
+          this.goodsList = res.data.list
+        } catch (error) {
+          this.goodsList = []
+        } finally {
+          this.searchGoodsLoading = false
+        }
+      } else {
+        this.goodsList = []
+      }
+    },
+
+    // 添加商品
+    handleSelectGoods(productId) {
+      const currentGoods = this.goodsList.find((item) => item.productId === productId)
+      if (currentGoods) {
+        this.form.productId = productId
+        this.form.productName = currentGoods.productName
+        this.form.productImage = currentGoods.image
+        this.form.productPrice = Number(currentGoods.price) || 0
+      }
+    },
+
+    // 重置数据
+    reset() {
+      this.form = {
+        productId: '',
+        productName: '',
+        productImage: '',
+        productPrice: '',
+        isPut: 1
+      }
+      this.goodsList = []
+    },
+
+    close() {
+      this.hotGoodsAddVisible = false
+    },
+
+    async handleConfirm() {
+      try {
+        this.isLoading = true
+        await this.$refs.formRef.validate()
+        const api = this.form.id ? editHotGoods : addHotGoods
+        const res = await api(this.form)
+        if (res.code === '200') {
+          this.$message({
+            message: this.form.id ? '编辑成功' : '添加成功',
+            type: 'success'
+          })
+          this.reset()
+          this.$emit('refresh')
+          this.close()
+        }
+      } finally {
+        this.isLoading = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/active/hot/index.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="payreturnPage">
+    <!-- 搜索 -->
+    <div class="formSearch">
+      <!-- 搜索条件 -->
+      <el-form :inline="true" :model="query" class="demo-form-inline">
+        <el-form-item label="爆品名称">
+          <el-input v-model="query.productName" maxlength="20" placeholder="请输入活动名称" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" plain @click="search">查询</el-button>
+          <el-button plain @click="clear">重置</el-button>
+          <el-button type="primary" plain @click="handleAddHotGoods">新增爆品商品</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 表格 -->
+    <div class="tableBox">
+      <el-table ref="multipleTable" :data="tableData" border :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
+        <el-table-column prop="productName" label="爆品名称" align="center" width="220" />
+        <el-table-column prop="productImage" label="爆品图片" align="center">
+          <template slot-scope="scope">
+            <el-image :preview-src-list="[scope.row.productImage]" style="width: 80px; height: 80px; border-radius: 10px;e" :src="scope.row.productImage"></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="productPrice" label="爆品单价" align="center" width="120">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="success">{{ scope.row.productPrice }}元</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isPut" label="是否上架" align="center" width="200">
+          <template slot-scope="scope">
+            <el-switch active-text="已上架" inactive-text="已下架" :value="!!scope.row.isPut" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div class="btnList">
+              <el-button type="text" @click="editHotGoods(scope.row)">编辑</el-button>
+              <el-button type="text" @click="handleCHnageHootGoodsStatus(scope.row)">{{ scope.row.isPut ? '下架' : '上架' }}</el-button>
+              <el-button type="text" @click="deleteHotGoods(scope.row)">删除</el-button>
+              <el-button type="text" @click="editGift(scope.row)">编辑配销产品</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="fenye">
+        <el-pagination
+          :current-page="query.page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+
+    <!-- 添加/ 编辑 爆款产品 -->
+    <HotGoodsAdd @refresh="search" ref="hotGoodsAddRef"></HotGoodsAdd>
+
+    <!-- 编辑配销产品 -->
+    <ExplosiveProductsSubsidiary @refresh="search" ref="explosiveProductsSubsidiaryRef"></ExplosiveProductsSubsidiary>
+  </div>
+</template>
+
+<script>
+import { getHotGoodsList, deleteHotGoods, upDownExplosiveProducts } from '@/api/active/active_hot'
+import HotGoodsAdd from './HotGoodsAdd.vue'
+import ExplosiveProductsSubsidiary from './ExplosiveProductsSubsidiary.vue'
+
+export default {
+  components: {
+    HotGoodsAdd,
+    ExplosiveProductsSubsidiary
+  },
+  data() {
+    return {
+      query: { page: 1, pageSize: 10, productName: '' },
+      total: 1,
+      tableData: []
+    }
+  },
+  created() {
+    this.getAll()
+  },
+  methods: {
+    async getAll() {
+      const res = await getHotGoodsList(this.query)
+      this.tableData = res.data.list
+      this.total = res.data.total
+    },
+    handleSizeChange(val) {
+      this.query.pageSize = val
+      this.getAll()
+    },
+    handleCurrentChange(val) {
+      this.query.page = val
+      this.getAll()
+    },
+    search() {
+      this.total = 1
+      this.query.page = 1
+      this.getAll()
+    },
+    clear() {
+      this.query = {
+        page: 1,
+        pageSize: 10
+      }
+    },
+    handleAddHotGoods() {
+      this.$refs.hotGoodsAddRef.open()
+    },
+    editHotGoods(row) {
+      this.$refs.hotGoodsAddRef.open(row)
+    },
+    // 删除
+    async deleteHotGoods(row) {
+      this.$confirm(`是否删除【${row.productName}】这项爆品?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await deleteHotGoods({ explosiveId: row.id })
+          if (res.code == '200') {
+            this.$message.success('删除成功')
+            this.getAll()
+          }
+        })
+        .catch(() => {})
+    },
+
+    // 上下架
+    handleCHnageHootGoodsStatus(row) {
+      this.$confirm(`是否对爆品【${row.productName}】${row.isPut ? '下架' : '上架'}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const res = await upDownExplosiveProducts({ explosiveId: row.id, isPut: row.isPut ? 0 : 1 })
+          if (res.code == '200') {
+            this.$message.success(row.isPut ? '下架' : '上架' + '成功')
+            this.getAll()
+          }
+        })
+        .catch(() => {})
+    },
+
+    // 编辑配销产品
+    editGift(row = {}) {
+      this.$refs.explosiveProductsSubsidiaryRef.open(row, this.query)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.payreturnPage {
+  padding: 30px;
+
+  .tableBox {
+    .fenye {
+      margin: 20px;
+    }
+  }
+}
+</style>