feat:添加

src/api/marketing/marketing.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询商品属性列表
+export function listAttrimarketing(data) {
+  return request({
+    url: '/marketing/team/list',
+    method: 'post',
+    data:data
+  })
+}
+
+//添加拼团列表
+export function addInfoActivity(data) {
+  return request({
+    url: '/marketing/team/activityInfoAdd',
+    method: 'post',
+    data:data
+  })
+}

src/api/product/info.js

@@ -36,9 +36,9 @@ export function addInfo(data) {
 // 修改商品信息
 export function updateInfo(data) {
   return request({
-    url: '/product/info/'+data.id,
+    url: '/product/info/'+data.projectAddModel.id,
     method: 'put',
-    data: data
+    data: data.projectAddModel
   })
 }
 
@@ -49,3 +49,10 @@ export function delInfo(id) {
     method: 'delete'
   })
 }
+
+export function getCacheInfo(id) {
+  return request({
+    url: '/product/cache/' + id,
+    method: 'get'
+  })
+}

src/api/product/sku.js

@@ -0,0 +1,9 @@
+import request from "@/utils/request";
+
+export function getSkuList(projectId) {
+  return request({
+    url: '/product/sku/list/' + projectId,
+    method: 'get'
+
+  })
+}

src/router/index.js

@@ -104,7 +104,7 @@ export const constantRoutes = [
     path: '/user',
     component: Layout,
     hidden: true,
-    redirect: 'noredirect',
+    redirect: 'redirects',
     children: [
       {
         path: 'profile',

src/views/marketing/marketing/index.vue

@@ -0,0 +1,353 @@
+<template>
+  <div>
+    <el-form ref="form" :model="market" label-width="80px">
+      <el-form-item label="查询商品名称">
+         <el-input v-model="market.name"></el-input>
+       </el-form-item>
+      <el-form-item label="查询商品状态">
+        <el-input v-model="market.status"></el-input>
+      </el-form-item>
+    </el-form>
+
+
+    <el-button type="text" @click="dialogFormVisible = true">添加商品</el-button>
+    <el-dialog title="添加商品" :visible.sync="dialogFormVisible">
+      <el-steps :active="active" finish-status="success">
+        <el-step title="选择商品"></el-step>
+        <el-step title="填写信息"></el-step>
+        <el-step title="规格信息"></el-step>
+        <el-step title="修改详情"></el-step>
+      </el-steps>
+      <el-form :model="form">
+        <div v-show="active === 0">
+          <!-- Table -->
+          <el-button type="text" @click="dialogTableVisible = true">选择商品</el-button>
+          <el-dialog title="商品列表" :visible.sync="dialogTableVisible">
+            <el-table :data="infoList">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="主键" align="center" prop="id" />
+              <el-table-column label="商品名称" align="center" prop="name" />
+              <el-table-column label="商品描述" align="center" prop="introduction" />
+              <el-table-column label="主类型" align="center" prop="mianType" />
+              <el-table-column label="父类型" align="center" prop="parentType" />
+              <el-table-column label="商品类型" align="center" prop="type" />
+              <el-table-column label="商品图片" align="center" prop="image" width="100">
+                <template slot-scope="scope">
+                  <image-preview :src="scope.row.image" :width="50" :height="50"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="商品轮播图" align="center" prop="carouselImages" width="100">
+                <template slot-scope="scope">
+                  <image-preview :src="scope.row.carouselImages" :width="50" :height="50"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="商品状态" align="center" prop="status">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="ruleId" />
+              <el-table-column label="品牌" align="center" prop="brandId" />
+              <el-table-column label="备注" align="center" prop="remark" />
+            </el-table>
+            <el-button type="primary" @click="addProduct()">确 定</el-button>
+          </el-dialog>
+          <el-form>
+            <el-form-item label="商品Id">
+              <el-input v-model="productList.projectId"></el-input>
+            </el-form-item>
+            <el-form-item label="商品图片" prop="image">
+                <image-upload v-model="productList.image"/>
+           </el-form-item>
+          </el-form>
+        </div>
+        <div v-show="active === 1">
+          <el-form label-width="80px" :model="form">
+            <el-form-item label="拼团活动名称">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="拼团活动简介">
+              <el-input v-model="form.introduction"></el-input>
+            </el-form-item>
+            <el-form-item label="商品单位">
+              <el-input v-model="form.unit"></el-input>
+            </el-form-item>
+            <el-form-item label="商品轮播图" prop="carouselImages">
+              <image-upload v-model="form.carouselImages"/>
+            </el-form-item>
+          </el-form>
+          -------------------------------------------------------------------------
+          <el-form label-width="80px" :model="form">
+          <el-form-item label="活动时间">
+            <el-input v-model="form.endTime"></el-input>
+          </el-form-item>
+          <el-form-item label="策略状态">
+            <el-input v-model="form.strategyType"></el-input>
+          </el-form-item>
+            <el-form-item label="策略Id">
+              <el-input v-model="form.strategyId"></el-input>
+            </el-form-item>
+            <el-form-item label="商品规格">
+              <el-input v-model="form.productSku"></el-input>
+            </el-form-item>
+            <el-form-item label="拼团价格">
+              <el-input v-model="form.teamPrice"></el-input>
+            </el-form-item>
+            <el-form-item label="拼团库存">
+              <el-input v-model="form.teamStock"></el-input>
+            </el-form-item>
+            <el-form-item label="排序">
+              <el-input v-model="form.sort"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div v-show="active === 2">
+          <el-form :model="formTeamData">
+            <el-table
+              ref="multipleTable"
+              :data="skuData"
+              tooltip-effect="dark"
+              style="width: 150%"
+              @selection-change="handleSelection">
+              <el-table-column
+                type="selection"
+                width="55">
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="sku" />
+              <el-table-column label="规格库存" align="center" prop="stock" />
+              <el-table-column label="规格价格" align="center" prop="price" />
+            </el-table>
+          </el-form>
+        </div>
+        <div v-show="active === 3">
+          <el-form-item label="商品描述" prop="introduction">
+            <editor v-model="form.content" :min-height="192"/>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button style="margin-top: 12px;" @click="last" v-if="active > 0">上一步</el-button>
+        <el-button style="margin-top: 12px;" @click="next" v-if="active < 3">下一步</el-button>
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submit()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <template>
+      <el-table
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column label="ID编号" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.id }}</span></template>
+        </el-table-column>
+        <el-table-column label="拼团名称" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.name }}</span></template>
+        </el-table-column>
+<!--        <el-table-column label="拼团商品图片" width="180">-->
+<!--          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.productImage }}</span></template>-->
+<!--        </el-table-column>-->
+        <el-table-column label="拼团商品图片" align="center" prop="image" width="100">
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.productImage" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品价格" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.productPrice }}</span></template>
+        </el-table-column>
+        <el-table-column label="拼团价格" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.teamPrice }}</span></template>
+        </el-table-column>
+        <el-table-column label="拼团人数" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.attendNumber }}</span></template>
+        </el-table-column>
+        <el-table-column label="开团人数" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.openTeamNumber }}</span></template>
+        </el-table-column>
+        <el-table-column label="参团人数" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.addTeamNumber }}</span></template>
+        </el-table-column>
+        <el-table-column label="团购库存" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.teamStock }}</span></template>
+        </el-table-column>
+        <el-table-column label="剩余库存" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.remainStock }}</span></template>
+        </el-table-column>
+        <el-table-column label="团购结束时间" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.endTime }}</span></template>
+        </el-table-column>
+        <el-table-column label="团购状态" width="180">
+          <template slot-scope="scope"><span style="margin-left: 10px">{{ scope.row.status }}</span></template>
+        </el-table-column>
+      </el-table>
+      <div>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="market.pageNum"
+        :page-sizes="[10, 20, 30, 50]"
+        :page-size="market.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="market.total">
+      </el-pagination>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+
+
+import {addInfoActivity, listAttrimarketing} from "@/api/marketing/marketing";
+import {getCacheInfo, getProduct, listInfo} from '@/api/product/info'
+import {getSkuList} from "@/api/product/sku";
+
+export default {
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {},
+  name: "Info",
+  dicts: ['sys_yes_no'],
+    data() {
+      //这里存放数据"
+
+      return {
+        // 选中数组
+        ids: [],
+        tableData:[],
+        market:{
+          pageNum:1,
+          pageSize:10,
+          total:0,
+          name:"",
+          status:"",
+          carouselImages:null,
+          introduction:null,
+        },
+        ruleList: [],
+        form:{
+
+        },
+        formTeamData: {
+          carouselImages: '',
+          groupIntroduction: ''
+        },
+        skuData: [],
+        infoList:[],
+        productList:{
+          projectId:"",
+          image:""
+        },
+        addForm:[],
+        active: 0,
+        dialogTableVisible: false,
+        dialogFormVisible: false,
+        formLabelWidth: '120px',
+        formLabelAlign: {},
+        skuList:[],
+      };
+    },
+    //计算属性 类似于data概念",
+    computed: {
+
+    },
+    //监控data中的数据变化",
+    watch: {
+
+    },
+    //方法集合",
+    methods: {
+     /**下一页*/
+      next() {
+        if (this.active++ > 3) this.active = 0;
+      },
+      /** 查询商品信息列表 */
+      getList() {
+        listInfo().then(response => {
+          this.infoList = response.data.rows;
+          let productId = this.infoList[0].id
+          getSkuList(productId).then(res =>{
+            this.skuData=res.data
+          })
+        });
+      },
+      /**分页条数*/
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.market.pageSize = val
+        this.marketingList()
+      },
+      /**分页页数*/
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.market.pageNum = val
+        this.marketingList()
+      },
+      /**上一页*/
+      last() {
+        this.active--
+      },
+      /**拼团活动列表*/
+      marketingList(){
+        listAttrimarketing(this.market).then(res=>{
+          this.tableData = res.data.rows
+          this.market.total = res.data.total
+        })
+      },
+      /**商品表回显Id,和图片*/
+      addProduct(){
+        console.log(this.infoList)
+        console.log(this.productList.projectId)
+        this.productList.projectId = this.infoList[0].id;
+        this.productList.image = this.infoList[0].image
+        this.dialogTableVisible = false;
+      },
+      /**添加拼团活动*/
+      submit(){
+          this.dialogTableVisible = false;
+          for(let i = 0 ;i<this.skuList.length;i++){
+            this.skuList[i].productSku = this.skuList[i].sku
+            this.skuList[i].teamPrice = this.skuList[i].price
+            this.skuList[i].teamStock = this.skuList[i].stock
+          }
+          this.form.productId  = this.infoList[0].id
+          this.form.skuList = this.skuList
+          addInfoActivity(this.form).then(res=>{
+            console.log(res.data)
+            this.$message.success("添加成功")
+            this.dialogFormVisible = false
+            this.marketingList()
+        })
+      },
+      handleSelection(val) {
+        this.skuList = val;
+      },
+    },
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+      this.marketingList();
+      this.getList();
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>

src/views/product/buy/index.vue

@@ -1,34 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="外键，关联商品" prop="projectId">
+      <el-form-item label="" prop="startTime">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入外键，关联商品"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable
                         v-model="queryParams.startTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="请选择开始时间">
+                        placeholder="请选择">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
+      <el-form-item label="" prop="endTime">
         <el-date-picker clearable
                         v-model="queryParams.endTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="请选择结束时间">
+                        placeholder="请选择">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="最小成团人数" prop="minMembers">
+      <el-form-item label="" prop="minMembers">
         <el-input
           v-model="queryParams.minMembers"
-          placeholder="请输入最小成团人数"
+          placeholder="请输入"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -87,20 +79,20 @@
 
     <el-table v-loading="loading" :data="buyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="外键，关联商品" align="center" prop="projectId" />
+      <el-table-column label="" align="center" prop="productId" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+      <el-table-column label="" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="" align="center" prop="endTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="最小成团人数" align="center" prop="minMembers" />
+      <el-table-column label="" align="center" prop="minMembers" />
-      <el-table-column label="活动状态" align="center" prop="status" />
+      <el-table-column label="" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -132,27 +124,46 @@
     <!-- 添加或修改拼团对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="外键，关联商品" prop="projectId">
+        <el-form-item label="" prop="productId">
-          <el-input v-model="form.projectId" placeholder="请输入外键，关联商品" />
+          <el-input v-model="form.productId" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
+        <el-form-item label="" prop="startTime">
           <el-date-picker clearable
                           v-model="form.startTime"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          placeholder="请选择开始时间">
+                          placeholder="请选择">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
+        <el-form-item label="" prop="endTime">
           <el-date-picker clearable
                           v-model="form.endTime"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          placeholder="请选择结束时间">
+                          placeholder="请选择">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="最小成团人数" prop="minMembers">
+        <el-form-item label="" prop="minMembers">
-          <el-input v-model="form.minMembers" placeholder="请输入最小成团人数" />
+          <el-input v-model="form.minMembers" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="createdBy">
+          <el-input v-model="form.createdBy" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="" prop="createdAt">
+          <el-date-picker clearable
+                          v-model="form.createdAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="" prop="updatedAt">
+          <el-date-picker clearable
+                          v-model="form.updatedAt"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择">
+          </el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -192,11 +203,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        projectId: null,
         startTime: null,
         endTime: null,
         minMembers: null,
-        status: null
       },
       // 表单参数
       form: {},
@@ -227,11 +236,14 @@ export default {
     reset() {
       this.form = {
         id: null,
-        projectId: null,
+        productId: null,
         startTime: null,
         endTime: null,
         minMembers: null,
-        status: null
+        status: null,
+        createdBy: null,
+        createdAt: null,
+        updatedAt: null
       };
       this.resetForm("form");
     },

src/views/product/category/index.vue

@@ -186,7 +186,7 @@ import {
   delCategory,
   addCategory,
   updateCategory,
-  parentCommonElement, updateCateStates
+  parentCommonElement, updateCateStates, listCategoryAll
 } from "@/api/product/category";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -366,6 +366,9 @@ export default {
       }
       getCategory(row.id).then(response => {
         this.form = response.data;
+        this.form.attributeInfoList = response.data.attributeInfoList
+        this.form.attributeGroupList = response.data.attributeGroupList
+        this.form.brandInfoList = response.data.brandInfoList
         this.open = true;
         this.title = "修改品类信息";
       });

src/views/product/info/index.vue

@@ -369,7 +369,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/product/info";
+import {listInfo, getInfo, delInfo, addInfo, updateInfo, getDetailInfo} from "@/api/product/info";
 import {listBrand} from "@/api/product/brand";
 import {getTemplateAttribute, listCategory} from "@/api/product/category";
 import {listRule} from "@/api/product/rule";
@@ -723,6 +723,12 @@ export default {
       const id = row.id || this.ids
       getInfo(id).then(response => {
         this.form = response.data;
+        this.categoryOptionValue = [
+          this.form.mianType,
+          this.form.parentType,
+          this.form.type
+        ]
+        this.form.ruleAttrList=response.data.ruleAttrList
         this.open = true;
         this.title = "修改商品信息";
       });