1

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/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
           ? {