Merge branch 'master' of http://39.105.58.247:3100/yidiandao/ydd_front

mer_mer_admin/src/api/article.js

@@ -0,0 +1,178 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+import request from '@/utils/request';
+
+/**
+ * 删除文章
+ * @param id
+ * @constructor
+ */
+export function DelArticle(id) {
+  return request({
+    url: `/admin/merchant/article/delete/${id}`,
+    method: 'POST',
+  });
+}
+
+/**
+ * 文章详情
+ * @param id
+ * @constructor
+ */
+export function InfoArticle(id) {
+  return request({
+    url: `/admin/merchant/article/info/${id}`,
+    method: 'get',
+  });
+}
+
+/**
+ * 文章列表
+ * @param pram
+ * @constructor
+ */
+export function ListArticle(pram) {
+  const data = {
+    author: pram.author,
+    cid: pram.cid,
+    page: pram.page,
+    limit: pram.limit,
+    title: pram.title,
+    searchType: pram.searchType,
+    content: pram.content,
+  };
+  return request({
+    url: '/admin/merchant/article/list',
+    method: 'GET',
+    params: data,
+  });
+}
+
+/**
+ * 新增文章
+ * @param pram
+ * @constructor
+ */
+export function AddArticle(pram) {
+  const data = {
+    author: pram.author,
+    cid: pram.cid,
+    content: pram.content,
+    cover: pram.cover,
+    isBanner: pram.isBanner,
+    isHot: pram.isHot,
+    sort: pram.sort,
+    synopsis: pram.synopsis,
+    title: pram.title,
+    url: pram.url,
+  };
+  return request({
+    url: '/admin/merchant/article/save',
+    method: 'post',
+    data: data,
+  });
+}
+
+/**
+ * 更新文章
+ * @param pram
+ * @constructor
+ */
+export function UpdateArticle(pram) {
+  const data = {
+    author: pram.author,
+    cid: pram.cid,
+    content: pram.content,
+    cover: pram.cover,
+    isBanner: pram.isBanner,
+    isHot: pram.isHot,
+    sort: pram.sort,
+    synopsis: pram.synopsis,
+    title: pram.title,
+    id: pram.id,
+  };
+  return request({
+    url: '/admin/merchant/article/update',
+    method: 'post',
+    data,
+  });
+}
+
+/**
+ * 新增文章分类
+ * @param data
+ * @constructor
+ */
+export function articleCategoryAddApi(data) {
+  return request({
+    url: '/admin/merchant/article/category/add',
+    method: 'POST',
+    data,
+  });
+}
+
+/**
+ * 删除文章分类
+ * @param data
+ * @constructor
+ */
+export function articleCategoryDelApi(row) {
+  return request({
+    url: `admin/merchant/article/category/delete/${row.id}`,
+    method: 'POST',
+  });
+}
+
+/**
+ * 文章分类分页列表
+ * @constructor
+ */
+export function articleCategoryListApi() {
+  return request({
+    url: `admin/merchant/article/category/list`,
+    method: 'GET',
+  });
+}
+
+/**
+ * 修改文章分类
+ * @param data
+ * @constructor
+ */
+export function articleCategoryUpdateApi(data) {
+  return request({
+    url: `admin/merchant/article/category/update`,
+    method: 'POST',
+    data,
+  });
+}
+
+/**
+ * 文章开关
+ * @param data
+ */
+export function articleSwitchApi(id) {
+  return request({
+    url: `/admin/merchant/article/switch/${id}`,
+    method: 'POST',
+  });
+}
+
+/**
+ * 文章分类开关
+ * @param data
+ */
+export function articleCategorySwitchApi(id) {
+  return request({
+    url: `/admin/merchant/article/category/switch/${id}`,
+    method: 'POST',
+  });
+}

mer_mer_admin/src/api/categoryApi.js

@@ -68,7 +68,7 @@ export function listCategroy(pram) {
     type: pram.type,
   };
   return request({
-    url: '/admin/category/list',
+    url: '/admin/merchant/category/list',
     method: 'GET',
     params: data,
   });
@@ -147,7 +147,7 @@ export function categroyUpdateStatus(id) {
  */
 export function articleInfoApi(params) {
   return request({
-    url: `/admin/article/info`,
+    url: `/admin/merchant/article/info`,
     method: 'GET',
     params,
   });

mer_mer_admin/src/components/Category/edit.vue

@@ -48,7 +48,12 @@
         type="primary"
         :loading="loadingBtn"
         @click="handlerSubmit('editPram')"
-        v-hasPermi="['merchant:product:category:update']"
+		v-hasPermi="[
+		  'merchant:product:category:add',
+		  'merchant:product:category:update',
+		  'merchant:article:category:update',
+		  'merchant:article:category:add',
+		]"
         >确定</el-button
       >
     </div>
@@ -67,6 +72,7 @@
 // +----------------------------------------------------------------------
 
 import * as categoryApi from '@/api/categoryApi.js';
+import * as articleApi from '@/api/article.js';
 import * as selfUtil from '@/utils/ZBKJIutil.js';
 import * as storeApi from '@/api/product.js';
 export default {
@@ -101,6 +107,7 @@ export default {
         pid: 0,
         sort: 0,
         id: 0,
+		type: this.biztype.value,
       },
       categoryProps: {
         value: 'id',
@@ -152,14 +159,16 @@ export default {
       this.$emit('hideEditDialog');
     },
     initEditData() {
-      const { icon, name, pid, sort, id } = this.editData;
+      const { icon, name, pid, sort, id ,type} = this.editData;
       if (this.isCreate === 1) {
         this.editPram.icon = icon;
         this.editPram.name = name;
         this.editPram.pid = pid;
         this.editPram.sort = sort;
         this.editPram.id = id;
+		this.editPram.type = type;
       } else {
+		this.editPram.type = this.biztype.value;
         this.editPram.pid = this.prent.id;
       }
     },
@@ -169,35 +178,97 @@ export default {
         this.handlerSaveOrUpdate(this.isCreate === 0);
       });
     },
-    handlerSaveOrUpdate(isSave) {
-      if (isSave) {
-        this.loadingBtn = true;
-        storeApi
-          .productCategoryAddApi(this.editPram)
-          .then((data) => {
-            this.$emit('hideEditDialog');
-            this.$message.success('创建目录成功');
-            this.$store.commit('product/SET_MerProductClassify', []);
-            this.loadingBtn = false;
-          })
-          .catch(() => {
-            this.loadingBtn = false;
-          });
-      } else {
-        this.loadingBtn = true;
-        storeApi
-          .productCategoryUpdateApi(this.editPram)
-          .then((data) => {
-            this.$emit('hideEditDialog');
-            this.$message.success('更新目录成功');
-            this.$store.commit('product/SET_MerProductClassify', []);
-            this.loadingBtn = false;
-          })
-          .catch(() => {
-            this.loadingBtn = false;
-          });
-      }
-    },
+	handlerSaveOrUpdate(isSave) {
+	  if (isSave) {
+	    // this.editPram.pid = this.prent.id
+	    this.loadingBtn = true;
+	    if (this.biztype.value !== 3) {
+	      if (this.editPram.pid === 0) this.editPram.level = 1;
+	      if (!this.editPram.level) this.editPram.level = parseInt(this.prent.level) + 1;
+	      storeApi
+	        .productCategoryAddApi(this.editPram)
+	        .then((data) => {
+	          this.$emit('hideEditDialog');
+	          this.$message.success('创建目录成功');
+	          this.$store.commit('product/SET_AdminProductClassify', []);
+	          this.loadingBtn = false;
+	        })
+	        .catch(() => {
+	          this.loadingBtn = false;
+	        });
+	    } else {
+	      articleApi
+	        .articleCategoryAddApi(this.editPram)
+	        .then((data) => {
+	          this.$emit('hideEditDialog');
+	          this.$message.success('创建目录成功');
+	          localStorage.removeItem('articleClass');
+	          this.loadingBtn = false;
+	        })
+	        .catch(() => {
+	          this.loadingBtn = false;
+	        });
+	    }
+	  } else {
+	    this.loadingBtn = true;
+	    if (this.biztype.value !== 3) {
+	      if (this.editPram.pid === this.editData.id) return this.$message.warning('父级不能选当前分类');
+	      storeApi
+	        .productCategoryUpdateApi(this.editPram)
+	        .then((data) => {
+	          this.$emit('hideEditDialog');
+	          this.$message.success('更新目录成功');
+	          this.$store.commit('product/SET_MerProductClassify', []);
+	          this.loadingBtn = false;
+	        })
+	        .catch(() => {
+	          this.loadingBtn = false;
+	        });
+	    } else {
+	      this.editPram.pid = Array.isArray(this.editPram.pid) ? this.editPram.pid[0] : this.editPram.pid;
+	      articleApi
+	        .articleCategoryUpdateApi(this.editPram)
+	        .then((data) => {
+	          this.$emit('hideEditDialog');
+	          this.$message.success('更新目录成功');
+	          localStorage.removeItem('articleClass');
+	          this.loadingBtn = false;
+	        })
+	        .catch(() => {
+	          this.loadingBtn = false;
+	        });
+	    }
+	  }
+	},
+    // handlerSaveOrUpdate(isSave) {
+    //   if (isSave) {
+    //     this.loadingBtn = true;
+    //     storeApi
+    //       .productCategoryAddApi(this.editPram)
+    //       .then((data) => {
+    //         this.$emit('hideEditDialog');
+    //         this.$message.success('创建目录成功');
+    //         this.$store.commit('product/SET_MerProductClassify', []);
+    //         this.loadingBtn = false;
+    //       })
+    //       .catch(() => {
+    //         this.loadingBtn = false;
+    //       });
+    //   } else {
+    //     this.loadingBtn = true;
+    //     storeApi
+    //       .productCategoryUpdateApi(this.editPram)
+    //       .then((data) => {
+    //         this.$emit('hideEditDialog');
+    //         this.$message.success('更新目录成功');
+    //         this.$store.commit('product/SET_MerProductClassify', []);
+    //         this.loadingBtn = false;
+    //       })
+    //       .catch(() => {
+    //         this.loadingBtn = false;
+    //       });
+    //   }
+    // },
   },
 };
 </script>

mer_mer_admin/src/components/Category/list.vue

@@ -65,9 +65,9 @@
                     <a @click="handleAddMenu(scope.row)">添加子目录</a>
                     <el-divider direction="vertical"></el-divider>
                   </template>
-                  <a @click="handleEditMenu(scope.row)" v-hasPermi="['merchant:product:category:update']">编辑</a>
+                  <a @click="handleEditMenu(scope.row)" v-hasPermi="['merchant:product:category:update', 'merchant:article:category:update']">编辑</a>
                   <el-divider direction="vertical"></el-divider>
-                  <a @click="handleDelMenu(scope.row)" v-hasPermi="['merchant:product:category:delete']">删除</a>
+                  <a @click="handleDelMenu(scope.row)" v-hasPermi="['merchant:product:category:delete', 'merchant:article:category:delete']">删除</a>
                 </template>
               </el-table-column>
             </template>
@@ -112,6 +112,7 @@ import info from './info';
 import edit from './edit';
 import * as selfUtil from '@/utils/ZBKJIutil.js';
 import { checkPermi } from '@/utils/permission';
+import * as articleApi from '@/api/article.js';
 export default {
   // name: "list"
   components: { info, edit },
@@ -177,7 +178,13 @@ export default {
     };
   },
   mounted() {
-    if (checkPermi(['merchant:product:category:list'])) this.handlerGetTreeList();
+		if (this.biztype.value === 3) {
+		  if (checkPermi(['merchant:article:category:list'])) this.handlerGetList();
+		} else {
+		  if (checkPermi(['merchant:product:category:list'])) this.handlerGetTreeList();
+		}
+		
+    //if (checkPermi(['merchant:product:category:list'])) this.handlerGetTreeList();
   },
   methods: {
     checkPermi, //权限控制
@@ -225,18 +232,57 @@ export default {
         }
       }
     },
+	
+	// handleDelete(rowData) {
+	//   this.$modalSure(this.biztype.value === 2 ? '删除当前数据?' : '删除品类吗？该品类优惠券将同步删除。').then(() => {
+	//     if (this.biztype.value === 2) {
+	//       articleApi.articleCategoryDelApi(rowData).then((data) => {
+	//         this.handlerGetList();
+	//         localStorage.removeItem('articleClass');
+	//         this.$message.success('删除成功');
+	//       });
+	//     } else {
+	//       storeApi.productCategoryDeleteApi(rowData.id).then((data) => {
+	//         this.handlerGetTreeList();
+	//         this.$message.success('删除成功');
+	//       });
+	//     }
+	//   });
+	// },
+	
     handleDelMenu(rowData) {
       this.$modalSure('删除当前数据?').then(() => {
-        storeApi.productCategoryDeleteApi(rowData.id).then((res) => {
-          this.handlerGetTreeList();
-          this.$store.commit('product/SET_MerProductClassify', []);
-          this.$message.success('删除成功');
-        });
+		if (this.biztype.value === 3) {
+			articleApi.articleCategoryDelApi(rowData).then((data) => {
+			  this.handlerGetList();
+			  localStorage.removeItem('articleClass');
+			  this.$message.success('删除成功');
+			  this.handlerGetList();
+			});
+		  
+		} else {
+			storeApi.productCategoryDeleteApi(rowData.id).then((res) => {
+			  this.$store.commit('product/SET_MerProductClassify', []);
+			  this.$message.success('删除成功');
+			   this.handlerGetTreeList();
+			});
+		  
+		}
+       
       });
     },
-    handlerGetList() {
-      this.handlerGetTreeList();
-    },
+    // handlerGetList() {
+    //   this.handlerGetTreeList();
+    // },
+	handlerGetList() {
+	  articleApi.articleCategoryListApi().then((data) => {
+	    this.dataList = data;
+	    let list = data.filter((item) => {
+	      return item.status;
+	    });
+	    localStorage.setItem('articleClass', JSON.stringify(list));
+	  });
+	},
     changeNodes(data) {
       if (data.length > 0) {
         for (var i = 0; i < data.length; i++) {
@@ -285,7 +331,11 @@ export default {
         this.editDialogConfig.prent = {};
         this.editDialogConfig.type = 0;
         this.editDialogConfig.visible = false;
-        this.handlerGetTreeList();
+		if (this.biztype.value === 3) {
+		  this.handlerGetList();
+		} else {
+		   this.handlerGetTreeList();
+		}
       }, 200);
     },
     handleSelectionChange(d1, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {

mer_mer_admin/src/mixins/product.js

@@ -27,6 +27,7 @@ export default {
         attrList: info.attrList ? info.attrList : [],
         attrValueList: info.attrValueList ? info.attrValueList : [],
         isSub: info.isSub ? info.isSub : false,
+		isHot: info.isHot ? info.isHot : false,
         content: info.content ? this.$selfUtil.replaceImgSrcHttps(info.content) : '',
         id: info.id ? info.id : 0,
         coupons: info.coupons ? info.coupons : [],

mer_mer_admin/src/router/modules/marketing.js

@@ -26,34 +26,73 @@ const marketingRouter = {
       path: 'seckill',
       component: () => import('@/views/marketing/seckill/index'),
       name: 'Seckill',
-      meta: { title: '秒杀', icon: '' },
+      meta: { title: '精选', icon: '' },
       children: [
         {
           path: 'list',
           component: () => import('@/views/marketing/seckill/seckillList/index'),
           name: 'SeckillList',
-          meta: { title: '秒杀商品', icon: '' },
+          meta: { title: '精选商品', icon: '' },
         },
         {
           path: 'seckillActivity',
           component: () => import('@/views/marketing/seckill/seckillActivity/index'),
           name: 'SeckillActivity',
-          meta: { title: '秒杀活动', icon: '' },
+          meta: { title: '精选活动', icon: '' },
         },
         {
           path: 'creatActivity/:activityId?',
           component: () => import('@/views/marketing/seckill/seckillActivity/creatSeckill'),
           name: 'creatActivity',
-          meta: { title: '参加秒杀活动', icon: '', noCache: true, activeMenu: `/marketing/seckill/seckillActivity` },
+          meta: { title: '参加精选活动', icon: '', noCache: true, activeMenu: `/marketing/seckill/seckillActivity` },
         },
         {
           path: 'creatSeckill/:activityId?',
           component: () => import('@/views/marketing/seckill/seckillActivity/creatSeckill'),
           name: 'CreatSeckill',
-          meta: { title: '添加秒杀商品', icon: '', noCache: true, activeMenu: `/marketing/seckill/list` },
+          meta: { title: '添加精选商品', icon: '', noCache: true, activeMenu: `/marketing/seckill/list` },
         },
       ],
     },
+	{
+	  path: 'content',
+	  name: 'Content',
+	  meta: {
+	    title: '公告内容',
+	    noCache: true,
+	  },
+	  component: () => import('@/views/content'),
+	  children: [
+	    {
+	      path: 'articleManager',
+	      name: 'articleManager',
+	      component: () => import('@/views/content/article/list'),
+	      meta: {
+	        title: '文章管理',
+	        icon: 'clipboard',
+	      },
+	    },
+	    {
+	      path: 'articleCreat/:id?',
+	      name: 'articleCreat',
+	      component: () => import('@/views/content/article/edit'),
+	      meta: {
+	        title: '添加文章',
+	        noCache: true,
+	        activeMenu: `/marketing/content/articleManager`,
+	      },
+	    },
+	    {
+	      path: 'classifManager',
+	      name: 'classifManager',
+	      component: () => import('@/views/content/articleclass/list'),
+	      meta: {
+	        title: '文章分类',
+	        icon: 'clipboard',
+	      },
+	    },
+	  ],
+	},
     {
       path: 'group',
       component: () => import('@/views/marketing/group/index'),

mer_mer_admin/src/views/content/article/edit.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="divBox">
+    <pages-header
+      ref="pageHeader"
+      :title="$route.params.id ? '编辑文章' : '添加文章'"
+      backUrl="/marketing/content/articleManager"
+    ></pages-header>
+    <el-card class="box-card mt14" shadow="never" :bordered="false" :body-style="{ padding: '40px 50px' }">
+      <div class="components-container">
+        <el-form ref="pram" label-width="81px" :model="pram" size="small">
+          <el-form-item
+            label="标题："
+            prop="title"
+            :rules="[{ required: true, message: '请填写标题', trigger: ['blur', 'change'] }]"
+          >
+            <el-input v-model.trim="pram.title" class="from-ipt-width" placeholder="标题" maxlength="100" />
+          </el-form-item>
+          <el-form-item
+            label="作者："
+            prop="author"
+            :rules="[{ required: true, message: '请填作者', trigger: ['blur', 'change'] }]"
+          >
+            <el-input v-model.trim="pram.author" class="from-ipt-width" placeholder="作者" maxlength="20" />
+          </el-form-item>
+          <el-form-item
+            label="文章分类："
+            :rules="[{ required: true, message: '请选择分类', trigger: ['blur', 'change'] }]"
+          >
+            <el-select v-model.trim="pram.cid" placeholder="请选择" class="from-ipt-width">
+              <el-option v-for="item in categoryTreeData" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="图文封面："
+            prop="cover"
+            :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]"
+          >
+            <div class="upLoadPicBox" @click="modalPicTap(false)">
+              <div v-if="pram.cover" class="pictrue"><img :src="pram.cover" /></div>
+              <div v-else class="upLoad">
+                <i class="el-icon-camera cameraIconfont" />
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item
+            label="文章简介："
+            prop="synopsis"
+            :rules="[{ required: true, message: '请填写文章简介', trigger: ['blur', 'change'] }]"
+          >
+            <el-input
+              v-model.trim="pram.synopsis"
+              maxlength="100"
+              type="textarea"
+              :rows="2"
+              resize="none"
+              class="from-ipt-width"
+              placeholder="文章简介"
+            />
+          </el-form-item>
+          <el-form-item
+            label="文章内容："
+            prop="content"
+            :rules="[{ required: true, message: '请填写文章内容', trigger: ['blur', 'change'] }]"
+          >
+            <Tinymce v-model.trim="pram.content"></Tinymce>
+          </el-form-item>
+          <el-form-item label="排序：">
+            <el-input-number v-model.trim="pram.sort" :min="0" :max="10" label="排序"></el-input-number>
+          </el-form-item>
+          <el-form-item label="是否Banner：">
+            <el-switch v-model.trim="pram.isBanner" active-text="是" inactive-text="否" />
+          </el-form-item>
+          <el-form-item label="是否热门：">
+            <el-switch v-model.trim="pram.isHot" active-text="是" inactive-text="否" />
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              :loading="loading"
+              @click="handerSubmit('pram')"
+              v-hasPermi="['merchant:article:update', 'merchant:article:save']"
+              >保存</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+// +---------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +---------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +---------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +---------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +---------------------------------------------------------------------
+import Tinymce from '@/components/Tinymce/index';
+import * as articleApi from '@/api/article.js';
+import { getToken } from '@/utils/auth';
+import { Debounce } from '@/utils/validate';
+export default {
+  components: { Tinymce },
+  data() {
+    return {
+      loading: false,
+      constants: this.$constants,
+      categoryTreeData: [],
+      categoryProps: {
+        value: 'id',
+        label: 'name',
+        children: 'child',
+        expandTrigger: 'hover',
+        checkStrictly: true,
+        emitPath: false,
+      },
+      pram: {
+        author: null,
+        cid: null,
+        content: '', //<span>My Document\'s Title</span>
+        cover: '',
+        isBanner: false,
+        isHot: null,
+        shareSynopsis: null,
+        shareTitle: null,
+        sort: 0,
+        synopsis: null,
+        title: null,
+        id: null,
+        // mediaId: null
+      },
+      editData: {},
+      myHeaders: { 'X-Token': getToken() },
+      editorContentLaebl: '',
+    };
+  },
+  created() {
+    this.tempRoute = Object.assign({}, this.$route);
+  },
+  mounted() {
+    if (localStorage.getItem('articleClass')) {
+      this.categoryTreeData = JSON.parse(localStorage.getItem('articleClass'));
+    } else {
+      this.handlerGetCategoryTreeData();
+    }
+    if (this.$route.params.id) {
+      this.getInfo();
+      this.setTagsViewTitle();
+    }
+  },
+  methods: {
+    getInfo() {
+      articleApi.InfoArticle(this.$route.params.id).then((data) => {
+        this.editData = data;
+        this.hadlerInitEditData();
+      });
+    },
+    modalPicTap(multiple) {
+      const _this = this;
+      this.$modalUpload(
+        function (img) {
+          if (!img) return;
+          _this.pram.cover = img[0].sattDir;
+        },
+        multiple,
+        'content',
+      );
+    },
+    hadlerInitEditData() {
+      if (!this.$route.params.id) return;
+      const { author, cid, content, cover, isBanner, isHot, shareSynopsis, shareTitle, sort, synopsis, title, id } =
+        this.editData;
+      this.pram.author = author;
+      this.pram.cid = Number.parseInt(cid);
+      this.pram.content = content;
+      this.pram.cover = cover;
+      this.pram.isBanner = isBanner;
+      this.pram.isHot = isHot;
+      this.pram.shareSynopsis = shareSynopsis;
+      this.pram.shareTitle = shareTitle;
+      this.pram.sort = sort;
+      this.pram.synopsis = synopsis;
+      this.pram.title = title;
+      this.pram.id = id;
+    },
+    handlerGetCategoryTreeData() {
+      articleApi.articleCategoryListApi().then((data) => {
+        this.categoryTreeData = data;
+        let list = data.filter((item) => {
+          return item.status;
+        });
+        localStorage.setItem('articleClass', JSON.stringify(list));
+      });
+    },
+    handerSubmit: Debounce(function (form) {
+      this.$refs[form].validate((valid) => {
+        if (!valid) return;
+        if (!this.$route.params.id) {
+          this.handlerSave();
+        } else {
+          this.handlerUpdate();
+        }
+      });
+    }),
+    handlerUpdate() {
+      this.loading = true;
+      this.pram.shareTitle = this.pram.title;
+      this.pram.shareSynopsis = this.pram.synopsis;
+      articleApi
+        .UpdateArticle(this.pram)
+        .then((data) => {
+          this.$message.success('编辑文章成功');
+          this.loading = false;
+          this.$router.push({ path: '/marketing/content/articleManager' });
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handlerSave() {
+      this.loading = true;
+      //this.pram.cid = Array.isArray(this.pram.cid) ? this.pram.cid[0] : this.pram.cid
+      this.pram.shareTitle = this.pram.title;
+      this.pram.shareSynopsis = this.pram.synopsis;
+      articleApi
+        .AddArticle(this.pram)
+        .then((data) => {
+          this.$message.success('新增文章成功');
+          this.loading = false;
+          this.$router.push({ path: '/marketing/content/articleManager' });
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    setTagsViewTitle() {
+      const title = '编辑文章';
+      const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.$route.params.id}` });
+      this.$store.dispatch('tagsView/updateVisitedView', route);
+    },
+  },
+};
+</script>
+
+<style scoped></style>

mer_mer_admin/src/views/content/article/list.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="divBox">
+    <el-card
+      :bordered="false"
+      shadow="never"
+      class="ivu-mt"
+      :body-style="{ padding: 0 }"
+      v-hasPermi="['merchant:article:list']"
+    >
+      <div class="padding-add">
+        <el-form inline size="small" label-position="right" @submit.native.prevent>
+          <el-form-item label="文章分类：">
+            <el-select
+              v-model="listPram.cid"
+              clearable
+              class="selWidth"
+              placeholder="请选择文章分类"
+              @change="handerSearch"
+            >
+              <el-option v-for="item in categoryTreeData" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="文章标题：">
+            <el-input
+              v-model.trim="title"
+              @keyup.enter.native="handerSearch"
+              placeholder="请输入文章标题"
+              class="selWidth"
+              size="small"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="文章作者：">
+            <el-input
+              v-model.trim="author"
+              @keyup.enter.native="handerSearch"
+              placeholder="请输入文章作者"
+              class="selWidth"
+              size="small"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="handerSearch()">查询</el-button>
+            <el-button size="small" @click="reset()">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="box-card mt14" :body-style="{ padding: '20px' }" shadow="never" :bordered="false">
+      <router-link :to="{ path: '/marketing/content/articleCreat' }">
+        <el-button size="small" type="primary" class="mr10" v-hasPermi="['merchant:article:save']">添加文章</el-button>
+      </router-link>
+      <el-table v-loading="listLoading" :data="listData.list" size="small" highlight-current-row class="mt20">
+        <el-table-column prop="id" label="ID" min-width="50" />
+        <el-table-column label="图片" min-width="80">
+          <template slot-scope="scope">
+            <div class="demo-image__preview line-heightOne">
+              <el-image :src="scope.row.cover" :preview-src-list="[scope.row.cover]" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="title" label="文章标题" min-width="220" :show-overflow-tooltip="true" />
+        <el-table-column prop="visit" label="文章分类" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.cid | articleTypeFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="visit" label="浏览量" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.visit }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="author" label="文章作者" min-width="180" />
+        <el-table-column prop="sort" label="排序" show-overflow-tooltip min-width="80" />
+        <el-table-column prop="createTime" label="创建时间" min-width="150" />
+        <el-table-column label="状态" fixed="right">
+          <template slot-scope="scope">
+            <el-switch
+              v-if="checkPermi(['merchant:article:switch'])"
+              v-model="scope.row.status"
+              :active-value="true"
+              :inactive-value="false"
+              active-text="启用"
+              inactive-text="禁用"
+              @change="handleStatusChange(scope.row)"
+            >
+            </el-switch>
+            <div v-else>{{ scope.row.status ? '启用' : '禁用' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" fixed="right">
+          <template slot-scope="scope">
+            <router-link :to="{ path: '/marketing/content/articleCreat/' + scope.row.id }">
+              <a v-hasPermi="['merchant:article:update']">编辑</a>
+            </router-link>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="handlerDelete(scope.row)" v-hasPermi="['merchant:article:delete']">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        :current-page="listPram.page"
+        :page-sizes="constants.page.limit"
+        :layout="constants.page.layout"
+        :total="listData.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
+    <el-dialog
+      :visible.sync="editDialogConfig.visible"
+      :title="editDialogConfig.isEdit === 0 ? '创建文章' : '编辑文章'"
+      top="1vh"
+      width="900px"
+      destroy-on-close
+      :modal="false"
+      :close-on-click-modal="false"
+      class="articleModal"
+    >
+      <edit
+        v-if="editDialogConfig.visible"
+        :is-edit="editDialogConfig.isEdit"
+        :edit-data="editDialogConfig.editData"
+        @hideDialog="handlerHideDialog"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// +---------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +---------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +---------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +---------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +---------------------------------------------------------------------
+import * as articleApi from '@/api/article.js';
+import edit from './edit';
+import { checkPermi } from '@/utils/permission'; // 权限判断函数
+export default {
+  components: { edit },
+  data() {
+    return {
+      constants: this.$constants,
+      listPram: {
+        author: null,
+        cid: null,
+        page: 1,
+        title: '',
+        limit: this.$constants.page.limit[0],
+      },
+      author: '',
+      title: '',
+      listData: { list: [], total: 0 },
+      editDialogConfig: {
+        visible: false,
+        data: {},
+        isEdit: 0, // 0=add 1=edit
+      },
+      listLoading: true,
+      categoryTreeData: [],
+      categoryProps: {
+        value: 'id',
+        label: 'name',
+        children: 'child',
+        expandTrigger: 'hover',
+        checkStrictly: true,
+        emitPath: false,
+      },
+    };
+  },
+  created() {
+    if (localStorage.getItem('articleClass')) {
+      this.categoryTreeData = JSON.parse(localStorage.getItem('articleClass'));
+    } else {
+      if (checkPermi(['merchant:article:category:list'])) this.handlerGetTreeList();
+    }
+    if (checkPermi(['merchant:article:list'])) this.handlerGetListData(this.listPram);
+  },
+  methods: {
+    checkPermi,
+    //修改状态
+    handleStatusChange(row) {
+      articleApi.articleSwitchApi(row.id).then((res) => {
+        this.$message.success('更新状态成功');
+        this.handlerGetTreeList();
+      });
+    },
+    handlerGetTreeList() {
+      articleApi.articleCategoryListApi().then((data) => {
+        this.categoryTreeData = data;
+        let list = data.filter((item) => {
+          return item.status;
+        });
+        localStorage.setItem('articleClass', JSON.stringify(list));
+      });
+    },
+    handerSearch() {
+      this.listPram.page = 1;
+      this.handlerGetListData(this.listPram);
+    },
+    handlerGetListData(pram) {
+      this.listLoading = true;
+      this.listPram.title = encodeURIComponent(this.title);
+      this.listPram.author = encodeURIComponent(this.author);
+      articleApi.ListArticle(pram).then((data) => {
+        this.listData = data;
+        this.listLoading = false;
+      });
+    },
+    handlerOpenEdit(isEdit, editData) {
+      // 0=add 1=edit
+      if (isEdit === 1) {
+        this.editDialogConfig.isEdit = 1;
+        this.editDialogConfig.editData = editData;
+      } else {
+        this.editDialogConfig.isEdit = 0;
+      }
+      this.editDialogConfig.visible = true;
+    },
+    handlerHideDialog() {
+      this.handlerGetListData(this.listPram);
+      this.editDialogConfig.visible = false;
+    },
+    handlerDelete(rowData) {
+      this.$modalSure('删除当前文章', '提示').then((result) => {
+        articleApi.DelArticle(rowData.id).then((data) => {
+          this.$message.success('删除数据成功');
+          this.handlerGetListData(this.listPram);
+        });
+      });
+    },
+    handleSizeChange(val) {
+      this.listPram.limit = val;
+      this.handlerGetListData(this.listPram);
+    },
+    handleCurrentChange(val) {
+      this.listPram.page = val;
+      this.handlerGetListData(this.listPram);
+    },
+    reset() {
+      this.author = '';
+      this.title = '';
+      this.listPram = {
+        author: null,
+        cid: null,
+        page: 1,
+        title: '',
+        limit: this.$constants.page.limit[0],
+      };
+      this.handlerGetListData(this.listPram);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.articleModal {
+  z-index: 333 !important;
+}
+</style>

mer_mer_admin/src/views/content/articleclass/list.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="components-container">
+    <category-list :biztype="constants.categoryType[2]" :pid="0" />
+  </div>
+</template>
+
+<script>
+// +---------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +---------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +---------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +---------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +---------------------------------------------------------------------
+import categoryList from '@/components/Category/list';
+export default {
+  components: { categoryList },
+  data() {
+    return {
+      constants: this.$constants,
+    };
+  },
+};
+</script>
+
+<style scoped></style>

mer_mer_admin/src/views/content/index.vue

@@ -0,0 +1,20 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>
+
+<script>
+// +---------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +---------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +---------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +---------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +---------------------------------------------------------------------
+export default {};
+</script>
+
+<style lang="sass" scoped></style>

mer_mer_admin/src/views/marketing/seckill/seckillActivity/creatSeckill.vue

@@ -3,7 +3,7 @@
     <div class="container_box">
       <pages-header
         ref="pageHeader"
-        title="添加秒杀商品"
+        title="添加精选商品"
         :backUrl="this.isEdit ? `/marketing/seckill/seckillActivity` : '/marketing/seckill/list'"
       ></pages-header>
       <el-card class="box-card box-body mt14 list-tabs" shadow="never" :bordered="false">
@@ -212,8 +212,8 @@ export default {
         share: [{ required: true, message: '请选择优惠比例', trigger: 'change' }],
         timeVal: [{ required: true, message: '请选择活动日期' }],
         discount: [{ required: true, message: '请选择优惠方式' }],
-        timeVal2: [{ type: 'array', required: true, message: '请输入选择秒杀场次', trigger: 'change' }],
-        id: [{ required: true, message: '请选择秒杀活动', trigger: 'change' }],
+        timeVal2: [{ type: 'array', required: true, message: '请输入选择精选场次', trigger: 'change' }],
+        id: [{ required: true, message: '请选择精选活动', trigger: 'change' }],
       },
       timeVal2: [],
       pickerOptions: timeOptions,
@@ -350,7 +350,7 @@ export default {
     },
     //行删除
     handleDelete(index, row) {
-      this.$modalSure('删除该秒杀商品吗？').then(() => {
+      this.$modalSure('删除该精选商品吗？').then(() => {
         let i = this.proData.findIndex((item) => item == row);
         this.proData.splice(i, 1);
       });
@@ -386,7 +386,7 @@ export default {
     },
     //添加商品
     addGoods() {
-      if (!this.form.id) return this.$message.warning('请先选择秒杀活动');
+      if (!this.form.id) return this.$message.warning('请先选择精选活动');
       const _this = this;
       this.$modalActivityProduct(
         function (row) {
@@ -450,7 +450,7 @@ export default {
             });
           });
           if (!total && total !== 0) return this.$message.warning('商品限量不能为空');
-          if (!price) return this.$message.warning('商品秒杀价格不能为空');
+          if (!price) return this.$message.warning('商品精选价格不能为空');
           if (total < this.proData.length) return this.$message.warning('商品限量总和不能小于0');
           let list = this.proData;
           //this.auditStatus === 3 获取商品规格id。因为重新提交 相当于添加商品，取普通商品规格id

mer_mer_admin/src/views/marketing/seckill/seckillActivity/index.vue

@@ -143,7 +143,7 @@ export default {
     },
     // 删除
     handleDelete(id) {
-      this.$modalSure(`删除该秒杀活动吗？`).then(() => {
+      this.$modalSure(`删除该精选活动吗？`).then(() => {
         seckillAtivityDelApi(id).then(() => {
           this.$message.success('删除成功');
           handleDeleteTable(this.tableData.data.length, this.tableForm);

mer_mer_admin/src/views/order/components/refundOrderDetail.vue

@@ -513,7 +513,7 @@
               <ul class="list">
                 <li class="item">
                   <div class="lang">配送方式：</div>
-                  <div class="value">{{ refundInfo.orderInfoVo.shippingType === 1 ? '商家配送' : '到店自提' }}</div>
+                   <div class="value">{{ refundInfo.orderInfoVo.shippingType === 1 ? '商家配送' :(refundInfo.orderInfoVo.shippingType === 2? '到店自提':'外卖配送' ) }}</div>
                 </li>
                 <li class="item">
                   <div class="lang">收货电话：</div>

mer_mer_admin/src/views/order/orderSend.vue

@@ -13,6 +13,7 @@
           <el-radio label="express">快递配送</el-radio>
           <el-radio label="noNeed">无需发货</el-radio>
           <el-radio label="merchant">商家送货</el-radio>
+		  <el-radio label="takeout">外卖配送</el-radio>
         </el-radio-group>
       </el-form-item>
       <SendFrom :formItem="formItem" :isShowBtn="true"></SendFrom>

mer_mer_admin/src/views/product/creatProduct/default.js

@@ -36,6 +36,7 @@ export const defaultObj = {
   attrs: [], ////数据渲染用
   selectRule: '',
   isSub: false,
+  isHot: false,
   isPaidMember: false,
   content: '',
   specType: false,

mer_mer_admin/src/views/product/creatProduct/index.vue

@@ -297,6 +297,14 @@
               </div>
             </el-form-item>
           </el-col>
+		  <el-col v-bind="grid2">
+					<el-form-item label="热门推荐：" required>
+					  <el-radio-group v-model="formValidate.isHot" :disabled="isDisabled">
+					    <el-radio :label="true" class="radio">是</el-radio>
+					    <el-radio :label="false">否</el-radio>
+					  </el-radio-group>
+					</el-form-item>
+		  </el-col>
         </el-row>
         <!-- 商品规格-->
         <creatAttr
@@ -398,6 +406,7 @@
             <el-checkbox-group v-model="formValidate.deliveryMethodList" :disabled="isDisabled">
               <el-checkbox label="1">商家配送</el-checkbox>
               <el-checkbox label="2">到店自提</el-checkbox>
+			  <el-checkbox label="3">外卖配送</el-checkbox>
             </el-checkbox-group>
             <div class="from-tips mb5">
               请先配置店铺地址之后，再开启到店自提；若店铺统一关闭到店自提功能，商品配送方式选中到店自提，用户购买不支持到店自提！
@@ -649,6 +658,7 @@ export default {
       loading: false,
       loadingBtn: false,
       isShowGroup: 'alone',
+	  isHot: false,
       guaranteeGroupList: [],
       guaranteeNew: [],
       guaranteeName: [],

mer_mer_admin/src/views/product/index.vue

@@ -628,6 +628,7 @@ export default {
       },
       formValidate: {
         tempId: '',
+		isHot: false
       },
       loadingBtn: false,
       dialogVisible: false,

mer_mer_admin/src/views/systemSetting/modifyStoreInfo/index.vue

@@ -155,11 +155,11 @@
                 placeholder="请查找位置"
                 readonly
               >
-                <!--<el-button-->
-                <!--slot="append"-->
-                <!--style="background: #46a6ff; color: #fff; border-radius: 0 4px 4px 0;"-->
-                <!--@click="onSearchs"-->
-                <!--&gt;查找位置</el-button>-->
+               <!--el-button
+                slot="append"
+                style="background: #46a6ff; color: #fff; border-radius: 0 4px 4px 0;"
+                @click="onSearchs">
+                查找位置</el-button-->
               </el-input>
               <iframe id="mapPage" width="100%" height="500px" frameborder="0" :src="keyUrl" />
             </el-form-item>
@@ -389,6 +389,7 @@ export default {
     // 选择经纬度
     selectAdderss(data) {
       this.merInfoForm.addressDetail = data.poiaddress + data.poiname;
+	  this.merInfoForm.city=data.cityname;
       this.merInfoForm.latitude = data.latlng.lat;
       this.merInfoForm.longitude = data.latlng.lng;
     },
@@ -463,6 +464,7 @@ export default {
     getConfigInfo() {
       merchantConfigInfoApi().then((res) => {
         this.merInfoForm = res;
+		//alert(this.merInfoForm.txMapKey)
         this.keyUrl = `https://apis.map.qq.com/tools/locpicker?type=1&key=${this.merInfoForm.txMapKey}&referer=myapp`;
         localStorage.setItem('JavaMerchantConfigInfo', JSON.stringify(res));
         this.labelarr = res.keywords.split(',') || [];

mer_plat_admin/src/router/index.js

@@ -27,6 +27,7 @@ import financeRouter from './modules/finance';
 import operationRouter from './modules/operation';
 import merchant from './modules/merchant';
 import pagediy from '@/router/modules/pagediy';
+
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -74,6 +75,7 @@ export const constantRoutes = [
   merchant,
   // 页面diy
   pagediy,
+
   {
     path: '/404',
     component: () => import('@/views/error-page/404'),

mer_plat_admin/src/router/modules/marketing.js

@@ -68,37 +68,37 @@ const marketingRouter = {
       path: 'seckill',
       component: () => import('@/views/marketing/seckill/index'),
       name: 'Seckill',
-      meta: { title: '秒杀', icon: '' },
+      meta: { title: '精选', icon: '' },
       children: [
         {
           path: 'config',
           component: () => import('@/views/marketing/seckill/seckillConfig/index'),
           name: 'SeckillConfig',
-          meta: { title: '秒杀配置', icon: '' },
+          meta: { title: '精选配置', icon: '' },
         },
         {
           path: 'list/:timeId?',
           component: () => import('@/views/marketing/seckill/seckillList/index'),
           name: 'SeckillList',
-          meta: { title: '秒杀商品', icon: '' },
+          meta: { title: '精选商品', icon: '' },
         },
         {
           path: 'seckillActivity',
           component: () => import('@/views/marketing/seckill/seckillActivity/index'),
           name: 'SeckillActivity',
-          meta: { title: '秒杀活动', icon: '' },
+          meta: { title: '精选活动', icon: '' },
         },
         {
           path: 'creatSeckill/:id?/:type?',
           component: () => import('@/views/marketing/seckill/seckillActivity/creatSeckill'),
           name: 'CreatSeckill',
-          meta: { title: '添加秒杀商品', icon: '', noCache: true, activeMenu: `/marketing/seckill/seckillActivity` },
+          meta: { title: '添加精选商品', icon: '', noCache: true, activeMenu: `/marketing/seckill/seckillActivity` },
         },
         {
           path: 'styleConfig',
           component: () => import('@/views/marketing/seckill/seckillStyleConfig/index'),
           name: 'SeckillStyleConfig',
-          meta: { title: '秒杀配置', icon: '' },
+          meta: { title: '精选配置', icon: '' },
         },
       ],
     },

mer_plat_admin/src/views/article/category/index.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="components-container">
+    <category-list :biztype="constants.categoryType[1]" />
+  </div>
+</template>
+
+<script>
+// +---------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +---------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +---------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +---------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +---------------------------------------------------------------------
+import categoryList from '@/components/Category/list';
+export default {
+  components: { categoryList },
+  data() {
+    return {
+      constants: this.$constants,
+    };
+  },
+};
+</script>
+
+<style scoped></style>

mer_plat_admin/src/views/article/index.vue

@@ -0,0 +1,1226 @@
+<template>
+  <div class="divBox relative">
+    <el-card
+      v-if="checkPermi(['merchant:product:page:list'])"
+      :bordered="false"
+      shadow="never"
+      class="ivu-mt"
+      :body-style="{ padding: 0 }"
+    >
+      <div class="padding-add">
+        <el-form inline size="small" label-position="right" @submit.native.prevent>
+          <el-form-item label="商品搜索：">
+            <el-input
+              v-model.trim="keywords"
+              placeholder="请输入商品名称关键字"
+              class="form_content_width"
+              size="small"
+              @keyup.enter.native="handleSeachList"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="平台分类：">
+            <el-cascader
+              v-model="tableFrom.categoryId"
+              :options="merPlatProductClassify"
+              :props="propsPlant"
+              clearable
+              class="form_content_width"
+              @change="handleSeachList"
+              size="small"
+              placeholder="请输入平台商品分类"
+            />
+          </el-form-item>
+          <el-form-item label="商户分类：">
+            <el-cascader
+              v-model="tableFrom.cateId"
+              :options="merProductClassify"
+              :props="propsMer"
+              clearable
+              class="form_content_width"
+              @change="handleSeachList"
+              size="small"
+              placeholder="请输入商户商品分类"
+            />
+          </el-form-item>
+          <el-form-item label="会员商品：">
+            <el-select
+              v-model="tableFrom.isPaidMember"
+              clearable
+              size="small"
+              placeholder="请选择"
+              class="selWidth"
+              @change="handleSeachList"
+            >
+              <el-option label="是" value="true" />
+              <el-option label="否" value="false" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品类型：">
+            <el-select
+              v-model="tableFrom.productType"
+              clearable
+              size="small"
+              placeholder="请选择"
+              class="selWidth"
+              @change="handleSeachList"
+            >
+              <el-option
+                v-for="(item, index) in productTypeList"
+                :label="item.label"
+                :value="item.value"
+                :key="index"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="handleSeachList">查询</el-button>
+            <el-button size="small" @click="handleReset">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-card>
+    <el-card class="box-card mt14" :body-style="{ padding: '0 20px 20px' }" shadow="never" :bordered="false">
+      <div class="clearfix" ref="headerBox" v-if="checkPermi(['merchant:product:page:list'])">
+        <el-tabs class="list-tabs mb5" v-model="tableFrom.type" @tab-click="handleSeachList">
+          <el-tab-pane
+            :label="item.name + '(' + item.count + ')'"
+            :name="item.type.toString()"
+            v-for="(item, index) in headeNum"
+            :key="index"
+          />
+        </el-tabs>
+      </div>
+      <el-button size="small" type="primary" v-hasPermi="['merchant:product:save']" @click="handleAdd('isAdd')"
+        >添加商品</el-button
+      >
+      <el-button
+        class="mr14"
+        @click="handleAdd('isCopy')"
+        size="small"
+        type="success"
+        v-hasPermi="['merchant:product:import:product']"
+        >商品采集</el-button
+      >
+      <el-dropdown size="small">
+        <el-button :class="checkedIds.length > 0 ? '' : 'active'" :disabled="checkedIds.length > 0 ? false : true">
+          批量设置<i class="el-icon-arrow-down el-icon--right"></i>
+        </el-button>
+        <el-dropdown-menu slot="dropdown">
+          <template v-if="checkedIds.length > 0 ? true : false">
+            <el-dropdown-item
+              v-if="
+                tableFrom.type == ProductTypeEnum.InTheWarehouse &&
+                checkPermi(['merchant:product:batch:set:freight:template'])
+              "
+              @click.native="handleSetFreight()"
+              >设置运费</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="
+                tableFrom.type == ProductTypeEnum.InTheWarehouse && checkPermi(['merchant:product:batch:set:brokerage'])
+              "
+              @click.native="handleSetCommission()"
+              >设置佣金</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="
+                checkPermi(['merchant:product:batch:down']) &&
+                (tableFrom.type == ProductTypeEnum.OnSale || SoldOutAndAlertInventory)
+              "
+              @click.native="batchDelisting('down')"
+              >批量下架</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="
+                checkPermi(['merchant:product:batch:up']) &&
+                (tableFrom.type == ProductTypeEnum.InTheWarehouse || SoldOutAndAlertInventory)
+              "
+              @click.native="batchDelisting('up')"
+              >批量上架</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="checkPermi(['merchant:product:batch:restore']) && tableFrom.type == ProductTypeEnum.RecycleBin"
+              @click.native="handleRestore()"
+              >批量恢复</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="checkPermi(['merchant:product:batch:delete']) && tableFrom.type == ProductTypeEnum.RecycleBin"
+              @click.native="handleRecycleBin(tableFrom.type)"
+              >批量删除</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="
+                tableFrom.type === ProductTypeEnum.PendingReview && checkPermi(['merchant:product:batch:submit:audit'])
+              "
+              @click.native="handlePendingReview()"
+              >提交审核</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="
+                tableFrom.type == ProductTypeEnum.InTheWarehouse &&
+                checkPermi(['merchant:product:batch:add:feedback:coupons'])
+              "
+              @click.native="handleAddCoupon()"
+              >添加回馈券</el-dropdown-item
+            >
+            <el-dropdown-item
+              v-if="checkPermi(['merchant:product:batch:recycle']) && RecycleBin"
+              @click.native="handleRecycleBin(tableFrom.type)"
+              >加入回收站</el-dropdown-item
+            >
+          </template>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="small"
+        class="mt20"
+        :highlight-current-row="true"
+        highlight-current-row
+        @selection-change="handleSelectionChange"
+        @select-all="selectAll"
+        @select="selectOne"
+      >
+        <el-table-column type="expand" width="40">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="收藏：">
+                <span>{{ props.row.collectCount }}</span>
+              </el-form-item>
+              <el-form-item label="初始销量：">
+                <span>{{ props.row.ficti }}</span>
+              </el-form-item>
+              <el-form-item label="拒绝原因：" v-if="tableFrom.type == 7">
+                <span>{{ props.row.reason }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column prop="id" label="ID" min-width="50" v-if="checkedCities.includes('ID')" />
+        <el-table-column label="商品图" min-width="80" v-if="checkedCities.includes('商品图')">
+          <template slot-scope="scope">
+            <div class="demo-image__preview line-heightOne">
+              <el-image :src="scope.row.image" :preview-src-list="[scope.row.image]" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="商品名称"
+          min-width="200"
+          v-if="checkedCities.includes('商品名称')"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <div>
+              <span class="tags_name" :class="'name' + scope.row.specType">{{
+                scope.row.specType ? '[多规格]' : '[单规格]'
+              }}</span
+              >{{ scope.row.name || '-' }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="price" label="商品售价" min-width="90" v-if="checkedCities.includes('商品售价')" />
+        <el-table-column prop="sales" label="销量" min-width="90" v-if="checkedCities.includes('销量')" />
+        <el-table-column prop="stock" label="库存" min-width="90" v-if="checkedCities.includes('库存')" />
+        <el-table-column label="失败原因" min-width="150" v-if="tableFrom.type === '7'" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span class="textE93323">{{ scope.row.reason }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="80" fixed="right" v-if="checkedCities.includes('状态')">
+          <template slot-scope="scope">
+            <el-switch
+              v-if="checkPermi(['merchant:product:up', 'merchant:product:down'])"
+              :disabled="IsShow"
+              v-model="scope.row.isShow"
+              :active-value="true"
+              :inactive-value="false"
+              active-text="上架"
+              inactive-text="下架"
+              @change="onchangeIsShow(scope.row)"
+            />
+            <div v-else>{{ scope.row.isShow ? '上架' : '下架' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column width="190" fixed="right">
+          <template slot="header">
+            <p>
+              <span style="padding-right: 5px">操作</span>
+              <i class="el-icon-setting" @click="handleAddItem"></i>
+            </p>
+          </template>
+          <template slot-scope="scope">
+            <!--id:商品id，isDisabled：是否能编辑(1不能，2能)，isCopy：是否是采集商品(1是，2不是)-->
+            <template
+              v-if="
+                tableFrom.type !== ProductTypeEnum.InTheWarehouse &&
+                tableFrom.type !== ProductTypeEnum.AlertInventory &&
+                tableFrom.type !== ProductTypeEnum.PendingReview &&
+                checkPermi(['merchant:product:info'])
+              "
+            >
+              <router-link :to="{ path: `/product/list/creatProduct/${scope.row.id}/1/2/${scope.row.type}` }">
+                详情
+              </router-link>
+            </template>
+            <template
+              v-if="checkPermi(['merchant:product:submit:audit']) && tableFrom.type === ProductTypeEnum.PendingReview"
+            >
+              <a @click="handlePendingReview(scope.row)">提交审核</a>
+            </template>
+            <template
+              v-if="tableFrom.type !== '5' && tableFrom.type !== '6' && checkPermi(['merchant:product:update'])"
+            >
+              <el-divider v-if="tableFrom.type !== '2' && tableFrom.type !== '4'" direction="vertical"></el-divider>
+              <a @click="onEdit(scope.row)">编辑</a>
+            </template>
+            <template v-if="tableFrom.type === '5' && checkPermi(['merchant:product:restor'])">
+              <el-divider direction="vertical"></el-divider>
+              <a @click="handleRestore(scope.row, scope.$index)">恢复商品</a>
+            </template>
+            <template
+              v-if="
+                (tableFrom.type === ProductTypeEnum.OnSale ||
+                  (tableFrom.type === ProductTypeEnum.AlertInventory && scope.row.isShow) ||
+                  (tableFrom.type === ProductTypeEnum.SoldOut && scope.row.isShow)) &&
+                checkPermi(['merchant:product:quick:stock:add'])
+              "
+            >
+              <el-divider direction="vertical"></el-divider>
+              <a @click="handleEdit(scope.row, true)">编辑库存</a>
+            </template>
+            <template
+              v-if="
+                (tableFrom.type === ProductTypeEnum.InTheWarehouse ||
+                  (tableFrom.type === ProductTypeEnum.SoldOut && !scope.row.isShow) ||
+                  (tableFrom.type === ProductTypeEnum.AlertInventory && !scope.row.isShow)) &&
+                checkPermi(['merchant:product:review:free:edit'])
+              "
+            >
+              <el-divider direction="vertical"></el-divider>
+              <a @click="handleEdit(scope.row, false)">免审编辑</a>
+            </template>
+            <template
+              v-if="
+                (tableFrom.type === ProductTypeEnum.Audit ||
+                  tableFrom.type === ProductTypeEnum.ReviewFailed ||
+                  tableFrom.type === ProductTypeEnum.RecycleBin) &&
+                checkPermi(['merchant:product:delete'])
+              "
+            >
+              <el-divider direction="vertical"></el-divider>
+              <a @click="handleDelete(scope.row.id, tableFrom.type)">{{
+                tableFrom.type === '5' ? '删除' : '加入回收站'
+              }}</a>
+            </template>
+            <!-- 待提审-->
+            <template v-if="tableFrom.type === ProductTypeEnum.PendingReview">
+              <el-divider direction="vertical"></el-divider>
+              <el-dropdown size="small" trigger="click">
+                <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right" /> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    class="infoItem"
+                    @click.native="handleInfo(scope.row.id, scope.row.type)"
+                    v-if="checkPermi(['merchant:product:info'])"
+                    >详情
+                  </el-dropdown-item>
+                  <el-dropdown-item
+                    v-if="checkPermi(['merchant:product:delete'])"
+                    @click.native="handleDelete(scope.row.id, tableFrom.type)"
+                    >{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-dropdown-item
+                  >
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+
+            <template
+              v-if="
+                tableFrom.type === ProductTypeEnum.InTheWarehouse ||
+                tableFrom.type === ProductTypeEnum.AlertInventory ||
+                (operation && !scope.row.isShow)
+              "
+            >
+              <el-divider direction="vertical"></el-divider>
+              <el-dropdown size="small" trigger="click">
+                <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right" /> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    class="infoItem"
+                    @click.native="handleInfo(scope.row.id, scope.row.type)"
+                    v-if="(tableFrom.type === '2' || tableFrom.type === '4') && checkPermi(['merchant:product:info'])"
+                    >详情
+                  </el-dropdown-item>
+                  <el-dropdown-item
+                    @click.native="handleSetFreight(scope.row)"
+                    v-if="
+                      checkPermi(['merchant:product:set:freight:template']) &&
+                      scope.row.type !== 5 &&
+                      scope.row.type !== 6
+                    "
+                    >设置运费</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    v-if="checkPermi(['merchant:product:set:brokerage'])"
+                    @click.native="handleSetCommission(scope.row)"
+                    >设置佣金</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    v-if="checkPermi(['merchant:product:add:feedback:coupons'])"
+                    @click.native="handleAddCoupon(scope.row)"
+                    >添加回馈券</el-dropdown-item
+                  >
+
+                  <el-dropdown-item
+                    v-if="checkPermi(['merchant:product:delete'])"
+                    @click.native="handleDelete(scope.row.id, tableFrom.type)"
+                    >{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-dropdown-item
+                  >
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-sizes="$constants.page.limit"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+      <div class="card_abs" v-show="card_select_show">
+        <template>
+          <div class="cell_ht">
+            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"
+              >全选</el-checkbox
+            >
+            <el-button type="text" @click="checkSave()">保存</el-button>
+          </div>
+          <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+            <el-checkbox v-for="item in columnData" :label="item" :key="item" class="check_cell">{{
+              item
+            }}</el-checkbox>
+          </el-checkbox-group>
+        </template>
+      </div>
+    </el-card>
+
+    <!--编辑库存-->
+    <el-drawer
+      :title="!stockEdit ? '免审编辑' : '编辑库存'"
+      :visible.sync="drawer"
+      :direction="direction"
+      :size="1500"
+      class="showHeader"
+      :before-close="handleCloseEdit"
+    >
+      <store-edit
+        :productId="productId"
+        v-if="drawer && productId"
+        :productType="productType"
+        @subSuccess="subSuccess"
+        :stockEdit="stockEdit"
+        :isSub="isSub"
+      ></store-edit>
+    </el-drawer>
+
+    <!-- 设置运费模板-->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="设置运费"
+      destroy-on-close
+      :close-on-click-modal="false"
+      width="600px"
+      class="dialog-top"
+    >
+      <el-form
+        ref="formValidate"
+        class="formValidate"
+        :rules="ruleValidate"
+        :model="formValidate"
+        label-width="75px"
+        @submit.native.prevent
+      >
+        <el-form-item label="运费模板：" prop="tempId">
+          <el-select v-model="formValidate.tempId" placeholder="请选择" class="mr20" style="width: 100%">
+            <el-option v-for="item in shippingTemplates" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <div class="dialog-footer-inner">
+            <el-button class="btns" size="small" @click="handleClose">取消</el-button>
+            <el-button
+              type="primary"
+              class="submission"
+              @click="handleSubmit('formValidate')"
+              :loading="loadingBtn"
+              v-if="checkPermi(['merchant:product:update'])"
+              >确定</el-button
+            >
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+    <!--批量设置佣金弹窗-->
+    <el-dialog v-if="dialogCommision" title="设置佣金" :visible.sync="dialogCommision" width="600px">
+      <el-form ref="commisionForm" :model="commisionForm" :rules="commisionRule" @submit.native.prevent>
+        <el-form-item label="一级佣金比例：" prop="extension_one">
+          <el-input-number
+            v-model="commisionForm.brokerage"
+            :step="1"
+            step-strictly
+            :min="0"
+            :max="100"
+            class="priceBox"
+            controls-position="right"
+          />
+        </el-form-item>
+        <el-form-item label="二级佣金比例：" prop="extension_two">
+          <el-input-number
+            v-model="commisionForm.brokerageTwo"
+            :step="1"
+            :min="0"
+            step-strictly
+            :max="100"
+            class="priceBox"
+            controls-position="right"
+          />
+        </el-form-item>
+        <el-form-item>
+          <span>备注：订单交易成功后给推广员返佣的比例，例:一级佣金比例设置5，则返订单金额的5%</span>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogCommision = false">取消</el-button>
+        <el-button type="primary" @click="submitCommisionForm('commisionForm')">提交</el-button>
+      </span>
+    </el-dialog>
+
+    <!-- 选择商品类型弹窗-->
+    <!--product-tpye ref="productTpye" :addType="addType"></product-tpye-->
+  </div>
+</template>
+
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+import {
+  productLstApi,
+  productDeleteApi,
+  putOnShellApi,
+  offShellApi,
+  productHeadersApi,
+  restoreApi,
+  productExcelApi,
+  productAuditApi,
+  productBatchDownApi,
+  productBatchUpApi,
+  productSetFreightApi,
+  productBatchFreightApi,
+  productBrokerageApi,
+  productBatchBrokerageApi,
+  productBatchAddCouponsApi,
+  productAddCouponsApi,
+  productBatchDeleteApi,
+  productBatchRecycleApi,
+  productBatchRestoreApi,
+  productBatchAuditApi,
+} from '@/api/product';
+import { getToken } from '@/utils/auth';
+import { checkPermi } from '@/utils/permission'; // 权限判断函数
+import { mapGetters } from 'vuex';
+//import storeEdit from './components/storeEdit';
+//import productTpye from './components/productTpye.vue';
+//import { ProductTypeEnum } from '@/enums/productEnums';
+import * as $constants from '@/utils/constants';
+import { useProduct } from '@/hooks/use-product';
+import { handleDeleteTable } from '@/libs/public';
+const { productTypeList } = useProduct();
+const objTitle = ['出售中', '仓库中', '已售罄', '警戒库存', '回收站', '待审核', '审核失败', '待提审'];
+const tableFroms = {
+  page: 1,
+  limit: $constants.page.limit[0],
+  cateId: '',
+  keywords: '',
+  type: '1',
+  categoryId: null,
+  isPaidMember: null,
+  productType: null,
+};
+export default {
+  name: 'ProductList',
+  directives: {
+    // 计算是否滚动到最下面
+    selectLoadMore: {
+      bind(el, binding) {
+        // 获取element-ui定义好的scroll盒子
+        const SELECTWRAP_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap');
+        SELECTWRAP_DOM.addEventListener('scroll', function () {
+          if (this.scrollHeight - this.scrollTop < this.clientHeight + 1) {
+            binding.value();
+          }
+        });
+      },
+    },
+  },
+ // components: { storeEdit, productTpye },
+  data() {
+    return {
+      productTypeList: productTypeList, //商品类型
+      drawer: false,
+      direction: 'rtl',
+      propsPlant: {
+        children: 'childList',
+        label: 'name',
+        value: 'id',
+        multiple: false,
+        emitPath: false,
+      },
+      propsMer: {
+        children: 'childList',
+        label: 'name',
+        value: 'id',
+        multiple: false,
+        emitPath: false,
+        checkStrictly: true,
+      },
+      headeNum: [],
+      listLoading: false,
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: Object.assign({}, tableFroms),
+      keywords: '',
+      categoryList: [],
+      objectUrl: process.env.VUE_APP_BASE_API,
+      card_select_show: false,
+      checkAll: false,
+      checkedCities: ['ID', '商品图', '商品名称', '商品售价', '销量', '库存', '状态'],
+      columnData: ['ID', '商品图', '商品名称', '商品售价', '销量', '库存', '状态'],
+      isIndeterminate: true,
+      productId: 0,
+      stockEdit: false,
+      multipleSelectionAll: [],
+      checkedIds: [], //选中的id
+      ruleValidate: {
+        tempId: [{ required: true, message: '请选择运费模板', trigger: 'change' }],
+      },
+      formValidate: {
+        tempId: '',
+      },
+      loadingBtn: false,
+      dialogVisible: false,
+      dialogCommision: false, //佣金弹窗
+      commisionForm: { brokerage: 0, brokerageTwo: 0, id: 0, idList: [] }, //设置佣金表单
+      commisionRule: {
+        brokerage: [{ required: true, message: '请输入一级佣金', trigger: 'change' }],
+        brokerageTwo: [{ required: true, message: '请输入二级佣金', trigger: 'change' }],
+      },
+      keyNum: 0,
+      couponIds: [], //优惠券集合
+      productInfo: null, //商品详情
+      productType: 0, //商品类型
+      isSub: false, //佣金设置是否单独设置
+      addType: 'isAdd',
+    };
+  },
+  computed: {
+    ProductTypeEnum() {
+      return ProductTypeEnum;
+    },
+    //操作上下架禁用
+    IsShow() {
+      return (
+        this.tableFrom.type == ProductTypeEnum.RecycleBin ||
+        this.tableFrom.type == ProductTypeEnum.Audit ||
+        this.tableFrom.type == ProductTypeEnum.ReviewFailed ||
+        this.tableFrom.type == ProductTypeEnum.PendingReview
+      );
+    },
+    //已售罄或者警戒库存
+    SoldOutAndAlertInventory() {
+      return (
+        this.tableFrom.type == this.ProductTypeEnum.SoldOut ||
+        this.tableFrom.type == this.ProductTypeEnum.AlertInventory
+      );
+    },
+    //已售罄、警戒库存操作判断
+    operation() {
+      return (
+        this.tableFrom.type == this.ProductTypeEnum.SoldOut ||
+        this.tableFrom.type == this.ProductTypeEnum.AlertInventory
+      );
+    },
+    //加入回收站 操作
+    RecycleBin() {
+      return (
+        this.tableFrom.type == this.ProductTypeEnum.Audit ||
+        this.tableFrom.type == this.ProductTypeEnum.ReviewFailed ||
+        this.tableFrom.type === ProductTypeEnum.InTheWarehouse ||
+        this.tableFrom.type === ProductTypeEnum.PendingReview
+      );
+    },
+    ...mapGetters(['merPlatProductClassify', 'merProductClassify', 'productBrand', 'shippingTemplates']),
+  },
+  activated() {
+    this.goodHeade();
+    this.getList(1);
+  },
+  mounted() {
+    if (checkPermi(['merchant:product:tabs:headers'])) this.goodHeade();
+    if (checkPermi(['merchant:product:page:list'])) this.getList();
+    if (!localStorage.getItem('shippingTemplates')) this.$store.dispatch('product/getShippingTemplates');
+    this.checkedCities = this.$cache.local.has('goods_stroge')
+      ? this.$cache.local.getJSON('goods_stroge')
+      : this.checkedCities;
+    //this.$store.dispatch('product/getAdminProductClassify');
+    this.$store.dispatch('product/getAdminProductClassify');
+    if (!localStorage.getItem('merProductClassify')) this.$store.dispatch('product/getMerProductClassify');
+    this.$store.dispatch('product/getMerProductBrand');
+  },
+  methods: {
+    checkPermi,
+    //提交审核
+    handlePendingReview(row) {
+      if (!row && this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      if (!row) {
+        this.$modalSure(`确定要将此商品提交平台审核吗？`).then(() => {
+          productBatchAuditApi({
+            idList: this.checkedIds,
+          }).then(() => {
+            this.$message.success('批量提交审核成功');
+            this.getList('');
+            this.goodHeade();
+          });
+        });
+      } else {
+        this.$confirm('提审之后是否自动上架？', '提示', {
+          confirmButtonText: '上架',
+          cancelButtonText: '不用了',
+          type: 'warning',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          customClass: 'deleteConfirm',
+        })
+          .then(() => {
+            this.productAudit({ id: row.id, isAutoUp: true });
+          })
+          .catch((action) => {
+            if (action === 'cancel') {
+              this.productAudit({ id: row.id, isAutoUp: false });
+              // 调用取消按钮的方法
+            } else if (action === 'close') {
+              console.log('Closed');
+              // 调用关闭按钮的方法
+            }
+          });
+      }
+    },
+    //提审提交
+    productAudit(data) {
+      productAuditApi(data).then((res) => {
+        this.goodHeade();
+        this.getList();
+      });
+    },
+    //批量加入回收站
+    handleRecycleBin(type) {
+      if (this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      this.$modalSure(type == 5 ? `确定批量删除商品吗？` : `确定批量加入回收站吗？`).then(() => {
+        if (type == 5) {
+          this.onBatchDelete();
+        } else {
+          this.onBatchRecycle();
+        }
+      });
+    },
+    //批量删除
+    onBatchDelete() {
+      productBatchDeleteApi({
+        idList: this.checkedIds,
+      }).then(() => {
+        this.$message.success('批量删除成功');
+        this.tableFrom.page = this.tableFrom.page - 1;
+        this.delSuccess();
+      });
+    },
+    //批量加入回收站
+    onBatchRecycle() {
+      productBatchRecycleApi({
+        idList: this.checkedIds,
+      }).then(() => {
+        this.$message.success('批量加入回收站成功');
+        this.tableFrom.page = this.tableFrom.page - 1;
+        this.delSuccess();
+      });
+    },
+    // 删除成功
+    delSuccess() {
+      handleDeleteTable(this.tableData.data.length, this.tableFrom);
+      this.getList();
+      this.goodHeade();
+    },
+    //添加回馈券
+    handleAddCoupon(row) {
+      this.productInfo = row;
+      if (!row && this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      const _this = this;
+      this.$modalCoupon(
+        'wu',
+        (_this.keyNum += 1),
+        [],
+        function (row) {
+          row.map((item) => {
+            _this.couponIds.push(item.id);
+          });
+          _this.onSetCoupons(_this.couponIds);
+        },
+        '',
+      );
+    },
+    //设置优惠券提交
+    onSetCoupons(couponIds) {
+      if (this.productInfo) {
+        productAddCouponsApi({ id: this.productInfo.id, couponIds: couponIds }).then(() => {
+          this.$message.success('添加回馈券成功');
+        });
+      } else {
+        productBatchAddCouponsApi({ idList: this.checkedIds, couponIds: couponIds }).then(() => {
+          this.$message.success('批量添加回馈券成功');
+        });
+      }
+    },
+    // 设置运费
+    async handleSetFreight(row) {
+      this.productInfo = row;
+      if (!row && this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      this.dialogVisible = true;
+      if (row) this.formValidate.tempId = row.tempId;
+    },
+    //设置运费提交
+    handleSubmit(name) {
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          this.loadingBtn = true;
+          if (this.productInfo) {
+            productSetFreightApi({ id: this.productInfo.id, templateId: this.formValidate.tempId })
+              .then(() => {
+                this.loadingBtn = false;
+                this.$message.success('设置运费模板成功');
+                this.dialogVisible = false;
+              })
+              .catch(() => {
+                this.loadingBtn = false;
+              });
+          } else {
+            productBatchFreightApi({ idList: this.checkedIds, templateId: this.formValidate.tempId })
+              .then(() => {
+                this.loadingBtn = false;
+                this.$message.success('批量设置运费模板成功');
+                this.dialogVisible = false;
+              })
+              .catch(() => {
+                this.loadingBtn = false;
+              });
+          }
+        }
+      });
+    },
+    //取消运费
+    handleClose() {
+      this.dialogVisible = false;
+      this.formValidate.tempId = '';
+    },
+    //设置佣金
+    handleSetCommission(row) {
+      this.productInfo = row;
+      if (!row && this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      this.dialogCommision = true;
+    },
+    //设置佣金提交
+    submitCommisionForm(name) {
+      this.$refs[name].validate((valid) => {
+        if (valid) {
+          if (this.productInfo) {
+            this.commisionForm.id = this.productInfo.id;
+            productBrokerageApi(this.commisionForm).then(() => {
+              this.$message.success('设置佣金成功');
+              this.dialogCommision = false;
+            });
+          } else {
+            this.commisionForm.idList = this.checkedIds;
+            productBatchBrokerageApi(this.commisionForm).then(() => {
+              this.$message.success('批量设置佣金成功');
+              this.dialogCommision = false;
+            });
+          }
+        } else {
+          return;
+        }
+      });
+    },
+    //添加商品
+    handleAdd(type) {
+      this.addType = type;
+      this.$refs.productTpye.proTypedialogVisible = true;
+    },
+    //批量下架
+    batchDelisting(type) {
+      if (this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      if (type === 'down') {
+        this.$modalSure('确定要将选中商品批量下架吗?').then(() => {
+          productBatchDownApi({ idList: this.checkedIds }).then(() => {
+            this.$message.success('批量下架成功');
+            this.getList(1);
+            this.goodHeade();
+          });
+        });
+      } else {
+        this.$modalSure('确定要将选中商品批量上架吗?').then(() => {
+          productBatchUpApi({ idList: this.checkedIds }).then(() => {
+            this.$message.success('批量上架成功');
+            this.getList(1);
+            this.goodHeade();
+          });
+        });
+      }
+    },
+    // 设置选中的方法
+    handleSelectionChange(val) {
+      this.multipleSelectionAll = val;
+      const data = [];
+      this.multipleSelectionAll.map((item) => {
+        data.push(item.id);
+      });
+      this.checkedIds = data;
+    },
+    selectAll(data) {
+      let id = data.map((i, index) => {
+        return i.id;
+      });
+      this.checkedIds = Array.from(new Set([...this.checkedIds, ...id]));
+    },
+    selectOne(data, row) {
+      let id = data.map((i, index) => {
+        return i.id;
+      });
+      let index = this.checkedIds.findIndex((e) => {
+        return e == row.id;
+      });
+      this.checkedIds.splice(index, 1);
+      this.checkedIds = Array.from(new Set([...this.checkedIds, ...id]));
+    },
+    //编辑商品
+    onEdit(row) {
+      //id:商品id，isDisabled：是否能编辑(1不能，2能)，isCopy：是否是采集商品(1是，2不是)
+      if (this.tableFrom.type === '1') {
+        this.$modalSure('下架该商品吗？出售商品需下架之后可编辑。').then(() => {
+          offShellApi(row.id).then(() => {
+            this.$router.push({ path: `/product/list/creatProduct/${row.id}/2/2/${row.type}` });
+          });
+        });
+      } else {
+        this.$router.push({ path: `/product/list/creatProduct/${row.id}/2/2/${row.type}` });
+      }
+    },
+    //编辑库存成功回调
+    subSuccess() {
+      this.drawer = false;
+      this.handleSeachList();
+    },
+    handleEdit(row, stockEdit) {
+      this.productId = row.id;
+      this.productType = row.type;
+      this.isSub = row.isSub;
+      this.drawer = true;
+      this.stockEdit = stockEdit;
+    },
+    handleCloseEdit() {
+      this.drawer = false;
+    },
+    handleAudit(id) {
+      // this.$modalSure('提审商品吗').then(() => {
+      //   productAuditApi(id).then((res) => {
+      //     this.goodHeade();
+      //     this.getList();
+      //   });
+      // });
+      this.$confirm('提审之后是否自动上架？', '提示', {
+        confirmButtonText: '上架',
+        cancelButtonText: '不用了',
+        type: 'warning',
+        showClose: false,
+        closeOnClickModal: false,
+      })
+        .then(() => {
+          this.productAudit({ id: id, isAutoUp: true });
+        })
+        .catch(() => {
+          this.productAudit({ id: id, isAutoUp: false });
+        });
+    },
+    //恢复商品
+    handleRestore(row) {
+      if (!row && this.checkedIds.length === 0) return this.$message.warning('请至少选择一个商品');
+      this.$modalSure(!row ? '确定批量恢复商品吗？' : '确定恢复商品吗？').then(() => {
+        if (row) {
+          restoreApi(row.id).then((res) => {
+            this.$message.success('恢复商品成功');
+            this.goodHeade();
+            this.getList(1);
+          });
+        } else {
+          productBatchRestoreApi({ idList: this.checkedIds }).then((res) => {
+            this.$message.success('批量恢复商品成功');
+            this.goodHeade();
+            this.getList(1);
+          });
+        }
+      });
+    },
+    handleSeachList() {
+      this.getList(1);
+      this.goodHeade();
+    },
+    //重置
+    handleReset() {
+      this.tableFrom.cateId = '';
+      this.tableFrom.keywords = '';
+      this.tableFrom.categoryId = '';
+      this.tableFrom.isPaidMember = null;
+      this.tableFrom.productType = null;
+      this.keywords = '';
+      this.handleSeachList();
+    },
+    // 导出
+    exports() {
+      productExcelApi({
+        cateId: this.tableFrom.cateId,
+        keywords: this.tableFrom.keywords,
+        type: this.tableFrom.type,
+      }).then((res) => {
+        window.location.href = res.fileName;
+      });
+    },
+    // 获取商品表单头数量
+    goodHeade() {
+      let data = Object.assign({}, this.tableFrom);
+      delete data.page;
+      delete data.limit;
+      delete data.type;
+      productHeadersApi(data)
+        .then((res) => {
+          res.map((item) => {
+            item.name = objTitle[Number(item.type) - 1];
+          });
+          this.headeNum = res;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    changeNodes(data) {
+      if (data.length > 0) {
+        for (var i = 0; i < data.length; i++) {
+          if (!data[i].childList || data[i].childList.length < 1) {
+            data[i].childList = undefined;
+          } else {
+            this.changeNodes(data[i].childList);
+          }
+        }
+      }
+      return data;
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      this.tableFrom.keywords = encodeURIComponent(this.keywords);
+      productLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.list;
+          this.tableData.total = res.total;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.listLoading = false;
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList();
+    },
+    //详情
+    handleInfo(id, type) {
+      this.$router.push({ path: `/product/list/creatProduct/${id}/2/2/${type}` });
+    },
+    // 删除
+    handleDelete(id, type) {
+      this.$modalSure(type == 5 ? `删除 id 为 ${id} 的商品` : `id为${id}的商品加入回收站吗`).then(() => {
+        const deleteFlag = type == 5 ? 'delete' : 'recycle';
+        productDeleteApi({
+          id: id,
+          type: deleteFlag,
+        }).then(() => {
+          this.$message.success('删除成功');
+          this.delSuccess();
+        });
+      });
+    },
+    onchangeIsShow(row) {
+      row.isShow
+        ? putOnShellApi(row.id)
+            .then(() => {
+              this.$message.success('上架成功');
+              this.getList(1);
+              this.goodHeade();
+            })
+            .catch(() => {
+              row.isShow = !row.isShow;
+            })
+        : offShellApi(row.id)
+            .then(() => {
+              this.$message.success('下架成功');
+              this.getList(1);
+              this.goodHeade();
+            })
+            .catch(() => {
+              row.isShow = !row.isShow;
+            });
+    },
+    handleAddItem() {
+      if (this.card_select_show) {
+        this.$set(this, 'card_select_show', false);
+      } else if (!this.card_select_show) {
+        this.$set(this, 'card_select_show', true);
+      }
+    },
+    handleCheckAllChange(val) {
+      this.checkedCities = val ? this.columnData : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedCitiesChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnData.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnData.length;
+    },
+    checkSave() {
+      this.$set(this, 'card_select_show', false);
+      this.$modal.loading('正在保存到本地，请稍候...');
+      this.$cache.local.setJSON('goods_stroge', this.checkedCities);
+      setTimeout(this.$modal.closeLoading(), 1000);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.tags_name {
+  font-size: 12px;
+  height: 16px;
+  line-height: 16px;
+  padding: 0 2px;
+  margin-right: 2px;
+  &.namefalse {
+    color: var(--prev-color-primary);
+  }
+  &.nametrue {
+    color: #ff8a4d;
+  }
+}
+::v-deep .el-table__cell:nth-child(2) .cell {
+  padding-left: 14px;
+  padding-right: 14px;
+}
+.infoItem {
+  ::v-deep a {
+    color: #606266 !important;
+  }
+}
+.el-table__body {
+  width: 100%;
+  table-layout: fixed !important;
+}
+.taoBaoModal {
+  //  z-index: 3333 !important;
+}
+.demo-table-expand {
+  ::v-deep label {
+    width: 82px;
+  }
+}
+.demo-table-expand {
+  ::v-deep .el-form-item__content {
+    width: 77%;
+  }
+}
+.seachTiele {
+  line-height: 30px;
+}
+.relative {
+  position: relative;
+}
+.card_abs {
+  position: absolute;
+  padding-bottom: 15px;
+  top: 260px;
+  right: 40px;
+  width: 200px;
+  background: #fff;
+  z-index: 99999;
+  box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.1);
+}
+.cell_ht {
+  height: 50px;
+  padding: 15px 20px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #eeeeee;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.check_cell {
+  width: 100%;
+  padding: 15px 20px 0;
+}
+.mt-1 {
+  margin-top: 6px;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #606266;
+}
+::v-deep .el-drawer__header {
+  font-size: 20px;
+}
+::v-deep .el-drawer__close-btn {
+  font-size: 20px;
+}
+::v-deep .el-dialog__footer {
+  padding: 0 24px 20px !important;
+}
+</style>

mer_plat_admin/src/views/marketing/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style lang="sass" scoped></style>

mer_plat_admin/src/views/marketing/seckill/seckillActivity/creatSeckill.vue

@@ -3,7 +3,7 @@
     <div class="container_box">
       <pages-header
         ref="pageHeader"
-        :title="pageType ? '添加商品' : `${title}秒杀活动`"
+        :title="pageType ? '添加商品' : `${title}精选活动`"
         backUrl="/marketing/seckill/seckillActivity"
       ></pages-header>
       <el-card class="box-card box-body mt14" :bordered="false" shadow="never">
@@ -38,13 +38,13 @@
                   @change="onchangeTime"
                   :picker-options="pickerOptions"
                 />
-                <p class="desc mt10">设置活动开始日期与结束日期，用户可以在有效时间内参与秒杀</p>
+                <p class="desc mt10">设置活动开始日期与结束日期，用户可以在有效时间内参与精选</p>
               </el-form-item>
-              <el-form-item label="秒杀场次:" prop="timeVal2">
+              <el-form-item label="精选场次:" prop="timeVal2">
                 <el-select
                   :disabled="pageType"
                   v-model="ruleForm.timeVal2"
-                  placeholder="请选择秒杀场次"
+                  placeholder="请选择精选场次"
                   multiple
                   cearable
                   class="from-ipt-width"
@@ -85,7 +85,7 @@
                   class="from-ipt-width"
                 ></el-input-number>
                 <p class="desc mt10">
-                  用户参与秒杀时，一次购买最大数量限制。例如设置为2，表示参与秒杀时，用户一次购买数量最大可选择2个，0为不限购
+                  用户参与精选时，一次购买最大数量限制。例如设置为2，表示参与精选时，用户一次购买数量最大可选择2个，0为不限购
                 </p>
               </el-form-item>
               <el-form-item label="商品范围:">
@@ -104,12 +104,15 @@
                     :disabled="!item.isShow"
                   />
                 </el-select>
-                <p class="desc mt10">设置秒杀活动可以参与的商品分类，可多选，不选为全品类商品。</p>
+                <p class="desc mt10">设置精选活动可以参与的商品分类，可多选，不选为全品类商品。</p>
               </el-form-item>
               <el-form-item label="参与门槛:" prop="merStars">
                 <el-rate :disabled="pageType" v-model="ruleForm.merStars" style="margin-top: 6px"></el-rate>
-                <p class="desc mt10">设置秒杀活动可以参与的商户星级。</p>
+                <p class="desc mt10">设置精选活动可以参与的商户星级。</p>
               </el-form-item>
+			<el-form-item label="是否热门：">
+					<el-switch v-model.trim="ruleForm.isHot" active-text="是" inactive-text="否" />
+			</el-form-item>
             </template>
             <template v-if="activeName == 'second'">
               <div v-if="!isEdit || pageType" class="acea-row row-between-wrapper">
@@ -297,13 +300,14 @@ export default {
         timeVal2: [],
         timeVal: [],
         proCategorylist: [],
+		isHot: null
       },
       rules: {
         name: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
         share: [{ required: true, message: '请选择优惠比例', trigger: 'change' }],
         timeVal: [{ required: true, message: '请选择活动日期' }],
         discount: [{ required: true, message: '请选择优惠方式' }],
-        timeVal2: [{ type: 'array', required: true, message: '请选择秒杀场次', trigger: 'change' }],
+        timeVal2: [{ type: 'array', required: true, message: '请选择精选场次', trigger: 'change' }],
         merStars: [{ required: true, message: '请选择商户星级', trigger: 'change' }],
       },
       pickerOptions: {
@@ -355,7 +359,7 @@ export default {
     checkPermi,
     setTagsViewTitle() {
       if (this.$route.params.id!=0) {
-        const title = this.pageType ? '添加商品' : this.$route.params.id!=0 ? '编辑秒杀活动' : '添加秒杀活动';
+        const title = this.pageType ? '添加商品' : this.$route.params.id!=0 ? '编辑精选活动' : '添加精选活动';
         const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.$route.params.id}` });
         this.$store.dispatch('tagsView/updateVisitedView', route);
       }
@@ -416,7 +420,7 @@ export default {
     },
     //行删除
     handleDelete(index, row) {
-      this.$modalSure('删除该秒杀商品吗？').then(() => {
+      this.$modalSure('删除该精选商品吗？').then(() => {
         let i = this.proData.findIndex((item) => item == row);
         this.proData.splice(i, 1);
       });
@@ -532,7 +536,7 @@ export default {
             }
 
             if (!total && total !== 0) return this.$message.warning('商品限量不能为空');
-            if (!price) return this.$message.warning('商品秒杀价格不能为空');
+            if (!price) return this.$message.warning('商品精选价格不能为空');
             if (total < this.proData.length) return this.$message.warning('商品限量总和不能小于0');
           }
           this.ruleForm.productList = this.proData.map((item) => {

mer_plat_admin/src/views/marketing/seckill/seckillActivity/index.vue

@@ -39,7 +39,7 @@
     </el-card>
     <el-card class="box-card mt14" :body-style="{ padding: '20px' }" :bordered="false" shadow="never">
       <router-link :to="{ path: '/marketing/seckill/creatSeckill/0' }" v-hasPermi="['platform:seckill:activity:add']">
-        <el-button size="small" type="primary" class="mr10">添加秒杀活动</el-button>
+        <el-button size="small" type="primary" class="mr10">添加精选活动</el-button>
       </router-link>
       <el-table v-loading="listLoading" :data="tableData.data" size="small" ref="multipleTable" class="mt20">
         <el-table-column prop="id" label="ID" min-width="50" />
@@ -169,7 +169,7 @@ export default {
     },
     // 删除
     handleDelete(id) {
-      this.$modalSure(`删除该秒杀活动吗？`).then(() => {
+      this.$modalSure(`删除该精选活动吗？`).then(() => {
         seckillAtivityDelApi(id).then(() => {
           this.$message.success('删除成功');
           handleDeleteTable(this.tableData.data.length, this.tableFrom);

mer_plat_admin/src/views/marketing/seckill/seckillConfig/index.vue

@@ -20,12 +20,12 @@
     </el-card>
     <el-card class="box-card mt14" :body-style="{ padding: '20px' }" :bordered="false" shadow="never">
       <el-button size="mini" type="primary" @click="add(0)" v-hasPermi="['platform:seckill:time:interval:add']"
-        >添加秒杀配置</el-button
+        >添加精选配置</el-button
       >
       <el-table v-loading="listLoading" :data="tableData.data" size="small" ref="multipleTable" class="mt20">
         <el-table-column prop="id" label="ID" min-width="50" />
         <el-table-column prop="name" label="时段名称" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column label="秒杀时段" min-width="100">
+        <el-table-column label="精选时段" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.startTime + '-' + scope.row.endTime }}
           </template>
@@ -181,8 +181,8 @@ export default {
       const _this = this;
       this.seckillId = editDate ? editDate.id : null;
       this.$modalParserFrom(
-        isCreate === 0 ? '添加秒杀时段' : '编辑秒杀时段',
-        '秒杀时段',
+        isCreate === 0 ? '添加精选时段' : '编辑精选时段',
+        '精选时段',
         isCreate,
         isCreate === 0
           ? {