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

src/api/commodity.js

@@ -221,3 +221,13 @@ export function productExport(data) {
     responseType: 'blob'
   })
 }
+
+
+//  加入选品
+export function addProductFixed(data) {
+  return request({
+    url: '/selection/selectionLibrary',
+    method: 'post',
+    data
+  })
+}

src/api/platformProduct.js

@@ -1,119 +1,123 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 商品分类管理
 // /platformProductClassify/getAll 商品类别管理查询
-export const getAllClass = (data) => request({
-  url: '/platformProductClassify/getAll',
-  method: 'POST',
-  data
-})
+export const getAllClass = (data) =>
+  request({
+    url: "/platformProductClassify/getAll",
+    method: "POST",
+    data,
+  });
 
 // /platformProductClassify/save 添加商品类别
-export const createdShopClass = (data) => request({
-  url: '/platformProductClassify/save',
-  method: 'POST',
-  data
-})
+export const createdShopClass = (data) =>
+  request({
+    url: "/platformProductClassify/save",
+    method: "POST",
+    data,
+  });
 
 // /platformProductClassify/update 修改商品类别
-export const updateClass = (data) => request({
-  url: '/platformProductClassify/update',
-  method: 'POST',
-  data
-})
+export const updateClass = (data) =>
+  request({
+    url: "/platformProductClassify/update",
+    method: "POST",
+    data,
+  });
 
 // /platformProductClassify/delete 删除商品类别
-export const deleteClass = (data) => request({
-  url: '/platformProductClassify/delete',
-  method: 'POST',
-  data
-})
+export const deleteClass = (data) =>
+  request({
+    url: "/platformProductClassify/delete",
+    method: "POST",
+    data,
+  });
 
 // /platformProductClassify/getById 商品类别编辑/查询
-export const getClassDetails = (data) => request({
-  url: '/platformProductClassify/getById',
-  method: 'POST',
-  data
-})
+export const getClassDetails = (data) =>
+  request({
+    url: "/platformProductClassify/getById",
+    method: "POST",
+    data,
+  });
 
 // 选品管理
 // 选品管理查询
 export function getClassifyGetAll(data) {
   return request({
-    url: '/platformProduct/getAll',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/getAll",
+    method: "POST",
+    data,
+  });
 }
 // /platformProduct/save  新增选品商品
 export function getClassifyAdd(data) {
   return request({
-    url: '/platformProduct/save',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/save",
+    method: "POST",
+    data,
+  });
 }
 
 // /platformProduct/update 修改选品商品
 export function getClassifyUpdate(data) {
   return request({
-    url: '/platformProduct/update',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/update",
+    method: "POST",
+    data,
+  });
 }
 
 // /platformProduct/delete 删除商品
 export function getClassifyDelete(data) {
   return request({
-    url: '/platformProduct/delete',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/delete",
+    method: "POST",
+    data,
+  });
 }
 
 // /platformProduct/start 商品上下架
 export function getClassifyStart(data) {
   return request({
-    url: '/platformProduct/start',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/start",
+    method: "POST",
+    data,
+  });
 }
 
 // 获取品牌列表
 export function getBrandList() {
   return request({
-    url: '/platformProduct/getBrandList',
-    method: 'POST'
-  })
+    url: "/platformProduct/getBrandList",
+    method: "POST",
+  });
 }
 
 // 商品分类
 export function getClassify(data) {
   return request({
-    url: '/platformProduct/getClassify',
-    method: 'POST',
-    data
-  })
+    url: "/platformProduct/getClassify",
+    method: "POST",
+    data,
+  });
 }
 // /voucher/getAll 获取可选择的代金卷
 export function getVoucher(data) {
   return request({
-    url: '/voucher/getAll',
-    method: 'POST',
-    data
-  })
+    url: "/voucher/getAll",
+    method: "POST",
+    data,
+  });
 }
 
-
 //  // 修改商品
 export function getClassifyGetById(data) {
   return request({
-    url: '/platformProduct/getById',
-    method: 'post',
-    data
-  })
+    url: "/platformProduct/getById",
+    method: "post",
+    data,
+  });
 }
 
 // // 导出商品信息
@@ -125,3 +129,75 @@ export function getClassifyGetById(data) {
 //     responseType: 'blob'
 //   })
 // }
+
+//  新增定价管理
+export function addFixed(data) {
+  return request({
+    url: "/priceControl/save",
+    method: "post",
+    data,
+  });
+}
+
+//  删除定价方案
+export function delFixed(params) {
+  return request({
+    url: "/priceControl/delete",
+    method: "delete",
+    params,
+  });
+}
+
+//  获取单个定价方案
+export function getFixedOne(id) {
+  return request({
+    url: `/priceControl/${id}`,
+    method: "get",
+  });
+}
+
+//  更新定价方案
+export function updateFixed(data) {
+  return request({
+    url: "/priceControl/update",
+    method: "put",
+    data,
+  });
+}
+
+//  获取定价方案
+export function getFixed(data) {
+  return request({
+    url: "/priceControl/page",
+    method: "post",
+    data,
+  });
+}
+
+
+//  获取我的选品列表
+export function getMyProduct(data) {
+  return request({
+    url: "canvas/getAll",
+    method: "post",
+    data,
+  });
+}
+
+//  获取选品商家
+export function getProductMerchant(data) {
+  return request({
+    url: "/selection/getShopAll",
+    method: "post",
+    data,
+  });
+}
+
+//  获取选品商家当前下的选品列表
+export function getProductMerchantList(data) {
+  return request({
+    url: "/selection/getProductAll",
+    method: "post",
+    data,
+  });
+}

src/views/platformProduct/business/index.vue

@@ -0,0 +1,247 @@
+<template>
+    <div class="mySelection">
+        <el-table :data="tableData" style="width: 100%;" align="center" border row-key="id"
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333', textAlign: 'center' }"
+            :tree-props="{ children: 'childs' }">
+            <!-- <el-table-column prop="productId" align="center" label="商品id" show-overflow-tooltip width="80" /> -->
+            <el-table-column align="center" label="店铺名称" width="220">
+                <template slot-scope="scope">{{ scope.row.shopName }}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="shopCode" label="店铺编码" />
+            <el-table-column align="center" prop="chargePersonName" label="负责人" />
+            <el-table-column align="center" prop="chargePersonPhone" label="联系电话" />
+            <el-table-column align="center" label="合同状态">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.contractState === 0">无效</span>
+                    <span v-if="scope.row.contractState === 1">有效</span>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="createTime" label="创建时间" />
+            <el-table-column label="操作" align="center" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <div class="btnList">
+                        <el-button type="text" @click="seeMore(scope.row)">
+                            查看商家选品
+                        </el-button>
+                        <!-- <el-button type="text" @click="edit(scope.row)">
+                            编辑
+                        </el-button>
+                        <el-button v-if="scope.row.state == 1" type="text" @click="del(scope.row)">
+                            禁用
+                        </el-button>
+                        <el-button v-else type="text" @click="del(scope.row)">
+                            启用
+                        </el-button>
+                        <el-button type="text" @click="delBusiness(scope.row)">
+                            删除
+                        </el-button> -->
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="fenye">
+            <el-pagination :current-page="currentPage" :page-sizes="[5, 10, 20, 50, 100]" :page-size="5"
+                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+                @current-change="handleCurrentChange" />
+        </div>
+        <el-dialog width="70%" title="商家选品列表" :visible.sync="showDialog" center :close-on-click-modal="false"
+            @close="closeDialog">
+            <div class="select-box">
+                <span>请选择要查看的类型：</span>
+                <el-select v-model="value" placeholder="请选择" @change="selectBlur">
+                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <el-table :data="dataProduct" style="width: 100%;" align="center" border row-key="id"
+                :header-cell-style="{ background: '#EEF3FF', color: '#333333', textAlign: 'center' }"
+                :tree-props="{ children: 'childs' }" v-loading="loading">
+                <el-table-column prop="productId" label="商品id" show-overflow-tooltip />
+                <el-table-column label="商品主图" width="150" align="center">
+                    <template slot-scope="scope">
+                        <img height="80" width="80" :src="scope.row.image" alt srcset>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="productName" label="商品名称" width="220" />
+                <el-table-column prop="section" label="售价区间" show-overflow-tooltip />
+                <el-table-column prop="memberSection" label="会员价" show-overflow-tooltip />
+                <el-table-column prop="ifCredit" label="积分兑换" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.ifCredit == 1">允许</span>
+                        <span v-if="scope.row.ifCredit == 0">不允许</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="stockNumber" label="库存" show-overflow-tooltip />
+                <el-table-column prop="volume" label="销量" show-overflow-tooltip />
+                <el-table-column prop="volume" label="上架状态" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.shelveState == 0">未上架</span>
+                        <span v-if="scope.row.shelveState == 1">已上架</span>
+                        <span v-if="scope.row.shelveState == 2">待审核</span>
+                        <span v-if="scope.row.shelveState == 3">审核失败</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="reject" label="驳回原因" show-overflow-tooltip />
+                <el-table-column prop="createTime" label="创建时间" width="180" />
+            </el-table>
+            <div class="dialog-footer">
+                <el-pagination :current-page="currentPage" :page-sizes="[5, 10, 20, 50, 100]" :page-size="5"
+                    layout="total, sizes, prev, pager, next, jumper" :total="totalDia" @size-change="handleSizeDialog"
+                    @current-change="handleCurrentDialog" />
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getProductMerchant, getProductMerchantList } from "@/api/platformProduct"
+
+export default {
+    created() {
+        this.getMyBusiness()
+    },
+    data() {
+        return {
+            tableData: [],
+            searchBusiness: {
+                shopName: "",
+                shopCode: "",
+                chargePersonName: "",
+                contractState: "",
+                page: 1,
+                pageSize: 10,
+                shopType: 2
+            },
+            currentPage: 1,
+            total: null,
+            showDialog: false,
+            options: [
+                {
+                    value: '1',
+                    label: '团长'
+                },
+                {
+                    value: '2',
+                    label: '合伙人'
+                },
+                {
+                    value: '3',
+                    label: '加盟商'
+                },
+                {
+                    value: '4',
+                    label: '代理商'
+                },
+            ],
+            value: "",
+            //  选品商家的商品查询参数
+            selectionProduct: {
+                shelveState: "",
+                productName: "",
+                productId: "",
+                shopName: "",
+                page: 1,
+                pageSize: 5,
+                shopId: "",
+                type: 0
+            },
+            //  选品商家的商品列表
+            dataProduct: [],
+            //  加载
+            loading: true,
+            totalDia: null
+        }
+    },
+    methods: {
+        // 获取我的选品列表
+        async getMyBusiness() {
+            let res = await getProductMerchant(this.searchBusiness)
+            console.log(res);
+            this.tableData = res.data.list
+            this.total = res.data.total
+        },
+        handleSizeChange(val) {
+            this.searchBusiness.pageSize = val
+            this.getMyBusiness()
+        },
+        handleCurrentChange(val) {
+            this.searchBusiness.page = val
+            this.getMyBusiness()
+        },
+        //  下拉选择
+        selectBlur() {
+            // console.log(this.value);
+            this.selectionProduct.type = this.value
+            this.getBusinessProduct()
+        },
+        //  发起请求获取当前商家下面的选品
+        async getBusinessProduct() {
+            this.loading = true
+            try {
+                let res = await getProductMerchantList(this.selectionProduct)
+                this.dataProduct = res.data.list
+                this.totalDia = res.data.total
+                 //  关闭 loading
+                this.loading = false
+            } catch (error) {
+                this.loading = false
+            }
+        },
+        seeMore(item) {
+            this.selectionProduct.shopId = item.shopId
+            this.showDialog = true
+            this.getBusinessProduct()
+        },
+        //  弹框里面的分页
+        handleSizeDialog(val) {
+            this.selectionProduct.pageSize = val
+            this.getBusinessProduct()
+        },
+        handleCurrentDialog(val) {
+            this.selectionProduct.page = val
+            this.getBusinessProduct()
+        },
+        //  关闭弹框 重置数据
+        closeDialog() {
+            this.value = ""
+            this.selectionProduct = {
+                shelveState: "",
+                productName: "",
+                productId: "",
+                shopName: "",
+                page: 1,
+                pageSize: 5,
+                shopId: "",
+                type: 0
+            }
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.mySelection {
+    padding: 80px 50px 0;
+}
+
+.fenye {
+    margin: 50px auto;
+    display: flex;
+    justify-content: center;
+}
+
+.select-box {
+    margin: 20px 0;
+
+    span {
+        font-size: 16px;
+        margin-right: 30px;
+    }
+}
+.dialog-footer{
+    margin: 20px 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+</style>

src/views/platformProduct/fixedPrice/index.vue

@@ -0,0 +1,312 @@
+<template>
+    <div class="fixedPrice">
+        <div class="btn">
+            <el-button type="success" @click="addProgramme">新增商家分销定价方案</el-button>
+        </div>
+        <el-table :data="tableData" style="width: 100%;" align="center" border row-key="id"
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333', textAlign: 'center' }"
+            :tree-props="{ children: 'childs' }">
+            <el-table-column align="center" prop="programmeName" label="方案名称" />
+            <el-table-column align="center" prop="preferentialPrice" label="优惠价比例" />
+            <el-table-column align="center" prop="marketPrice" label="市场价比例" />
+            <el-table-column align="center" prop="supplyPrice" label="供货价比例" />
+            <el-table-column align="center" prop="channelPrice" label="渠道价比例" />
+            <el-table-column align="center" prop="createTime" label="创建时间" />
+            <el-table-column align="center" prop="status" label="操作">
+                <template slot-scope="scope">
+                    <!-- <el-button type="text" @click.native.prevent="updateRow(scope.row)">编辑</el-button> -->
+                    <el-button type="text" @click="updateRow(scope.row.priceId)">编辑</el-button>
+                    <el-button type="text" @click="open(scope.row.priceId)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagina">
+            <el-pagination layout="prev, pager, next" :total="total" @current-change="change"></el-pagination>
+        </div>
+        <el-dialog width="800px" title="新增定价方案" :visible.sync="addFormDialog" center :close-on-click-modal="false"
+            @close="closeDialog">
+            <div class="title">
+                <div class="name">
+                    <h3>方案名称：</h3>
+                    <el-input class="ipt" placeholder="请输入方案名称" v-model="addQuery.programmeName"></el-input>
+                </div>
+                <div class="select">
+                    <span>增加定价方案的类型：</span>
+                    <el-select v-model="value" placeholder="请选择">
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
+            </div>
+            <div class="rule-list">
+                <div class="rule-item">
+                    <p>优惠比例：</p>
+                    <el-input-number v-model="addQuery.preferentialPrice" :precision="2" :min="0"
+                        :step="0.01"></el-input-number>
+                </div>
+                <div class="rule-item">
+                    <p>市场价比例：</p>
+                    <el-input-number v-model="addQuery.marketPrice" :precision="2" :min="0"
+                        :step="0.01"></el-input-number>
+                </div>
+                <div class="rule-item">
+                    <p>供货价比例：</p>
+                    <el-input-number v-model="addQuery.supplyPrice" :precision="2" :min="0"
+                        :step="0.01"></el-input-number>
+                </div>
+                <div class="rule-item">
+                    <p>渠道比例：</p>
+                    <el-input-number v-model="addQuery.channelPrice" :precision="2" :min="0"
+                        :step="0.01"></el-input-number>
+                </div>
+            </div>
+            <div class="btn-list">
+                <el-button type="primary" @click="preserve">保存</el-button>
+                <el-button type="info" plain @click="cancel">取消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { addFixed, getFixed, delFixed, getFixedOne, updateFixed } from "@/api/platformProduct"
+export default {
+    created() {
+        this.getList()
+    },
+    data() {
+        return {
+            addFormDialog: false,
+            tableData: [],
+            //  新增方案的参数
+            addQuery: {
+                shopId: "186",
+                preferentialPrice: "",
+                programmeName: "",
+                marketPrice: "",
+                supplyPrice: "",
+                channelPrice: "",
+                startTime: "1",
+                endTime: "1",
+                type:""
+            },
+            //  分页获取列表
+            searchList: {
+                page: "1",
+                pageSize: "10",
+                shopId: 186
+            },
+            total: null,
+            // 用于判断是编辑还是新增
+            isEdit: false,
+            //  增加的类型
+            options: [
+                {
+                    value: '1',
+                    label: '团长'
+                },
+                {
+                    value: '2',
+                    label: '合伙人'
+                },
+                {
+                    value: '3',
+                    label: '加盟商'
+                },
+                {
+                    value: '4',
+                    label: '代理商'
+                },
+            ],
+            value: "",
+        }
+    },
+    methods: {
+        //  新增商家分销方案
+        addProgramme() {
+            this.addFormDialog = true
+        },
+        //  弹窗关闭事件
+        closeDialog() {
+            this.isEdit = false
+            this.addQuery = {
+                shopId: "186",
+                preferentialPrice: "",
+                programmeName: "",
+                marketPrice: "",
+                supplyPrice: "",
+                channelPrice: "",
+                startTime: "1",
+                endTime: "1"
+            }
+        },
+        //   获取方案列表
+        async getList() {
+            try {
+                let res = await getFixed(this.searchList);
+                if (res.code == "") {
+                    this.tableData = res.data.list
+                    this.total = res.data.total
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        //  保存文件
+        async preserve() {
+            this.addQuery.type = this.value
+            if (this.addQuery.programmeName == "") {
+                this.$message({
+                    message: '请输入方案名称',
+                    type: 'error'
+                });
+                return false;
+            }
+            if(this.addQuery.type == ""){
+                this.$message({
+                    message: '请选择增加方案类型',
+                    type: 'error'
+                });
+                return false;
+            }
+            //  判断是保存还是修改
+            if (!this.isEdit) {
+                try {
+                    let data = await addFixed(this.addQuery);
+                    if (data.code == "") {
+                        this.$message.success("新增成功");
+                        this.addFormDialog = false
+                        this.getList()
+                    }
+                } catch (error) {
+                    console.log(error);
+                }
+            } else {
+                try {
+                    let res = await updateFixed(this.addQuery);
+                    if (res.code == "") {
+                        this.$message.success("修改成功");
+                        this.addFormDialog = false
+                        this.getList()
+                    }
+                } catch (error) {
+                    console.log(error);
+                }
+            }
+        },
+        open(id) {
+            this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                // ids: [id]
+                let res = await delFixed({ id: id })
+                if (res.code == "") {
+                    this.$message({
+                        type: 'success',
+                        message: '删除成功'
+                    });
+                    this.getList()
+                }
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消删除'
+                });
+            });
+        },
+        // 编辑
+        async updateRow(id) {
+            this.isEdit = true
+            try {
+                let res = await getFixedOne(id)
+                if (res.code == "") {
+                    this.addQuery = {
+                        ...this.addQuery,
+                        ...res.data
+                    }
+                    console.log(this.addQuery);
+                    this.addFormDialog = true
+                }
+            } catch (error) {
+
+            }
+        },
+        //  改变页数
+        change(e) {
+            this.searchList.page = e
+            this.getList()
+        },
+        //  取消
+        cancel() {
+            this.addFormDialog = false
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.fixedPrice {
+    padding: 50px;
+    box-sizing: border-box;
+    .btn {
+        margin: 30px 0;
+    }
+
+    .title {
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        gap: 30px;
+
+        .name {
+            display: flex;
+            align-items: center;
+            gap: 30px;
+            h3 {
+                width: 90px;
+                font-size: 16px;
+            }
+            .ipt {
+            width: 50%;
+        }
+        }
+    }
+
+    .rule-list {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        justify-content: space-around;
+
+        .rule-item {
+            width: 50%;
+            margin-top: 30px;
+            display: flex;
+            align-items: center;
+            gap: 30px;
+
+            p {
+                width: 90px;
+            }
+        }
+    }
+
+    .pagina {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin: 40px 0;
+    }
+
+    .btn-list {
+        margin: 0 auto;
+        margin-top: 50px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 20px;
+    }
+}
+</style>

src/views/platformProduct/mySelection/index.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="mySelection">
+        <el-table :data="tableData" style="width: 100%;" align="center" border row-key="id"
+            :header-cell-style="{ background: '#EEF3FF', color: '#333333', textAlign: 'center' }"
+            :tree-props="{ children: 'childs' }">
+            <el-table-column prop="productId" align="center" label="商品id" show-overflow-tooltip width="80" />
+            <el-table-column label="商品主图" width="150" align="center">
+                <template slot-scope="scope">
+                    <img height="80" width="80" :src="scope.row.image.replace('http://', 'https://')" alt srcset>
+                </template>
+            </el-table-column>
+            <el-table-column prop="productName" align="center" label="商品名称" width="180" />
+            <el-table-column prop="shopName" align="center" label="商家名称" width="180" />
+            <el-table-column prop="supplierName" align="center" label="供应商名称" width="180" />
+            <el-table-column prop="classifyHierarchy" align="center" label="分类层级" width="180" />
+            <el-table-column prop="sectionPrice" align="center" label="售价区间" show-overflow-tooltip />
+            <el-table-column prop="stockNumber" align="center" label="库存" show-overflow-tooltip />
+            <el-table-column prop="volume" align="center" label="实际销售" show-overflow-tooltip />
+            <el-table-column prop="fictitiousNumber" align="center" label="虚拟销售" show-overflow-tooltip />
+            <el-table-column prop="createTime" align="center" label="创建时间" width="180" />
+            <el-table-column prop="shelveState" align="center" label="上架状态" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <span v-if="scope.row.shelveState == 0">已下架</span>
+                    <span v-if="scope.row.shelveState == 1">已上架</span>
+                    <span v-if="scope.row.shelveState == 2">待审核</span>
+                    <span v-if="scope.row.shelveState == 3">审核失败</span>
+                </template>
+            </el-table-column>
+            <el-table-column>
+                <template slot-scope="scope">
+                    <!-- <el-button type="text" @click.native.prevent="updateRow(scope.row)">编辑</el-button> -->
+                    <!-- <el-button type="text" @click="updateRow(scope.row.priceId)">编辑</el-button>
+                    <el-button type="text" @click="open(scope.row.priceId)">删除</el-button> -->
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="fenye">
+            <el-pagination :current-page="currentPage" :page-sizes="[5, 10, 20, 50, 100]" :page-size="5"
+                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+                @current-change="handleCurrentChange" />
+        </div>
+    </div>
+</template>
+
+<script>
+import { getMyProduct } from "@/api/platformProduct"
+
+export default {
+    created() {
+        this.getMySelection()
+    },
+    data() {
+        return {
+            tableData: [],
+            searchMyProduct: {
+                page: 1,
+                pageSize: 5,
+                productId: "",
+                productName: "",
+                shelveState: "",
+                shopName: "",
+                shopId: 186,
+                ifSelection: 1
+            },
+            currentPage:1,
+            total:null
+        }
+    },
+    methods: {
+        // 获取我的选品列表
+        async getMySelection() {
+            let res = await getMyProduct(this.searchMyProduct);
+            console.log(res.data);
+            this.tableData = res.data.list
+            this.total = res.data.total
+            console.log(res);
+        },
+        handleSizeChange(val) {
+            this.searchMyProduct.pageSize = val
+            this.getMySelection()
+        },
+        handleCurrentChange(val) {
+            this.searchMyProduct.page = val
+            this.getMySelection()
+        },
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.mySelection {
+    padding: 80px 50px 0;
+}
+.fenye{
+    margin: 50px auto;
+    display: flex;
+    justify-content: center;
+}
+</style>

src/views/renovation/commoditySystem/index.vue

@@ -89,6 +89,7 @@
                 </el-button>
                 <el-button v-if="scope.row.shelveState == 2" type="text" @click="examineShow(scope.row)">审核</el-button>
                 <el-button type="text" @click="Godetails(scope.row)">查看详情</el-button>
+                <el-button  type="text" v-if="scope.row.shelveState == 1" @click="addProduct(scope.row)">加入选品</el-button>
               </div>
             </template>
           </el-table-column>
@@ -132,6 +133,24 @@
         <el-button type="primary" @click="FicSubmintUs">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="是否加入选品商品" :visible.sync="selectionDia" width="30%" style="margin-top:10%" @close="selectionClonse">
+      <div class="selection-box">
+        <div class="box-item">
+          <span>商家Id：</span>
+          <el-input v-model="productData.productIdproductId" placeholder="请输入商家id"></el-input>
+        </div>
+        <div class="box-item">
+          <span>是否加入选品：</span>
+          <el-radio v-model="productData.shelveState" label="1">是</el-radio>
+          <el-radio v-model="productData.shelveState" label="0">不是</el-radio>
+        </div>
+      </div>
+      <div class="btn-list">
+        <el-button type="primary" @click="addSelection" :disabled="productData.shelveState == '0'">加入选品</el-button>
+        <el-button @click="selectionDia = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 加入选品 -->
     <AddCommodity ref="addCommodity" :examine-show="examineShow" @reset="reset" />
   </div>
 </template>
@@ -142,7 +161,9 @@ import {
   Forced,
   setFictitious,
   examine,
-  productExport
+  productExport,
+  getProductById,
+  addProductFixed
 } from '@/api/commodity'
 import AddCommodity from './addCommodity'
 export default {
@@ -174,7 +195,17 @@ export default {
         shelveState: 1
       },
       examineVisible: false,
-      isDetail: false
+      isDetail: false,
+      //  选品弹窗
+      selectionDia:false,
+      //  加入选品的参数
+      productData: {
+        productId: 0,
+        productIdproductId: 186,
+        shopParentId:"",
+        shopGroupId:"",
+        shelveState:"1"
+      }
     }
   },
   // 监听属性 类似于data概念
@@ -189,6 +220,39 @@ export default {
   },
   // 方法集合
   methods: {
+    //  加入选品
+    async addProduct(row){
+      this.productData.productId = row.productId
+      //  获取商品详情
+      const res = await getProductById({ productId: row.productId })
+      console.log(res);
+      this.productData.shopParentId = res.data.shopId
+      this.productData.shopGroupId = res.data.shopGroupId
+      this.selectionDia = true
+    },
+    //  保存选品
+    async addSelection(){
+      if(this.productData.productIdproductId == ""){
+        this.$message.error("商家id不能为空")
+        return
+      }
+      // console.log(this.productData);
+      let res = await addProductFixed(this.productData)
+      if(res.code == ""){
+        this.$message.success("选品添加成功")
+        this.selectionDia = false
+      }
+    },
+    //  选品弹窗关闭
+    selectionClonse(){
+      this.productData = {
+        productId: 0,
+        productIdproductId: 186,
+        shopParentId:"",
+        shopGroupId:"",
+        shelveState:"1"
+      }
+    },
     // 查看详情
     Godetails(row) {
       this.$refs.addCommodity.show(row.productId)
@@ -382,4 +446,20 @@ export default {
 		}
 	}
 }
+.selection-box{
+  .box-item{
+    margin-bottom: 30px;
+    display: flex;
+    align-items: center;
+    span{
+      width: 200px;
+      font-size: 18px;
+    }
+  }
+}
+.btn-list{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

src/views/setup/agentMenus/index.vue

@@ -0,0 +1,13 @@
+<template>
+    <div class="agentMenus">
+        <h1>代理商菜单</h1>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/setup/franchiseesMenus/index.vue

@@ -0,0 +1,13 @@
+<template>
+    <div class="franchiseesMenus">
+        <h1>加盟商菜单</h1>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/setup/partnerMenus/index.vue

@@ -0,0 +1,15 @@
+<template>
+    <div class="partnerMenus">
+        <h1>合伙人菜单</h1>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/setup/teamMenus/index.vue

@@ -0,0 +1,15 @@
+<template>
+    <div class="teamMenus">
+        <h1>团长菜单</h1>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>