diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js
index 9c9c075..c2b5395 100644
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@@ -163,6 +163,37 @@ const marketingRouter =
         }
       ]
     },
+    {
+      path: 'energy',
+      name: 'energy',
+      meta: {
+        title: '能量管理',
+        noCache: true
+      },
+      redirect: 'noRedirect',
+      component: () => import('@/views/marketing/energy/index'),
+      children: [
+        {
+          path: 'list',
+          name: 'energyGoods',
+          meta: {
+            title: '能量商品',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/energy/energyGoods/index')
+        },
+        {
+          path: 'createGoods/:id?/:edit?',
+          name: 'CreateEnergyGoods',
+          meta: {
+            title: '添加能量商品',
+            noCache: true,
+            activeMenu: `${roterPre}/marketing/energy/list`
+          },
+          component: () => import('@/views/marketing/energy/energyGoods/createGoods')
+        }
+      ]
+    },
     {
       path: 'allDiscount',
       name: 'allDiscount',
diff --git a/src/views/marketing/energy/energyGoods/createGoods.vue b/src/views/marketing/energy/energyGoods/createGoods.vue
new file mode 100644
index 0000000..3f79d4d
--- /dev/null
+++ b/src/views/marketing/energy/energyGoods/createGoods.vue
@@ -0,0 +1,1911 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-steps :active="currentTab" align-center finish-status="success">
+          <el-step title="选择能量商品" />
+          <el-step title="填写基础信息" />
+          <el-step title="修改商品详情" />
+        </el-steps>
+      </div>
+      <el-form
+        ref="formValidate"
+        v-loading="fullscreenLoading"
+        class="formValidate mt20"
+        :rules="ruleValidate"
+        :model="formValidate"
+        label-width="120px"
+        @submit.native.prevent
+      >
+        <div v-show="currentTab === 0" style="overflow: hidden;">
+          <el-row :gutter="24">
+            <el-col v-bind="grid2">
+              <el-form-item label="选择商品：" prop="spike_image">
+                <div class="upLoadPicBox" @click="add()">
+                  <div v-if="formValidate.spike_image" class="pictrue">
+                    <img :src="formValidate.spike_image" />
+                  </div>
+                  <div v-else class="upLoad">
+                    <i class="el-icon-camera cameraIconfont" />
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div v-show="currentTab === 1">
+          <el-row :gutter="24">
+            <el-col v-bind="grid2">
+              <el-form-item label="商品主图：" prop="image">
+                <div class="upLoadPicBox" @click="modalPicTap('1')">
+                  <div v-if="formValidate.image" class="pictrue">
+                    <img :src="formValidate.image" />
+                  </div>
+                  <div v-else class="upLoad">
+                    <i class="el-icon-camera cameraIconfont" />
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品轮播图：" prop="slider_image">
+                <div class="acea-row">
+                  <div
+                    v-for="(item, index) in formValidate.slider_image"
+                    :key="index"
+                    class="pictrue"
+                    draggable="false"
+                    @dragstart="handleDragStart($event, item)"
+                    @dragover.prevent="handleDragOver($event, item)"
+                    @dragenter="handleDragEnter($event, item)"
+                    @dragend="handleDragEnd($event, item)"
+                  >
+                    <img :src="item" />
+                    <i
+                      class="el-icon-error btndel"
+                      @click="handleRemove(index)"
+                    />
+                  </div>
+                  <div
+                    v-if="formValidate.slider_image.length < 10"
+                    class="upLoadPicBox"
+                    @click="modalPicTap('2')"
+                  >
+                    <div class="upLoad">
+                      <i class="el-icon-camera cameraIconfont" />
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 商品信息-->
+            <el-col class="sp100">
+              <el-form-item label="商品名称：" prop="store_name">
+                <el-input
+                  :disabled="true"
+                  v-model="formValidate.store_name"
+                  size="small"
+                  placeholder="请输入商品名称"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row :gutter="24">
+            <el-col v-bind="grid2">
+              <el-form-item label="商户商品分类：">
+                <el-cascader
+                  v-model="formValidate.mer_cate_id"
+                  size="small"
+                  disabled
+                  class="selWidth"
+                  :options="merCateList"
+                  :props="propsMer"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <el-row :gutter="24">
+            <el-col v-bind="grid2">
+              <el-form-item label="平台商品分类：" prop="cate_id">
+                <el-cascader
+                  disabled
+                  v-model="formValidate.cate_id"
+                  size="small"
+                  class="selWidth"
+                  :options="categoryList"
+                  :props="props"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col v-bind="grid2">
+              <el-form-item label="能量商品关键字：">
+                <el-input
+                  v-model="formValidate.keyword"
+                  size="small"
+                  placeholder="请输入商品关键字"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col class="sp100">
+              <el-form-item label="能量活动简介：" prop="store_info">
+                <el-input
+                  v-model="formValidate.store_info"
+                  type="textarea"
+                  size="small"
+                  :rows="3"
+                  placeholder="请输入能量活动简介"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <!-- <el-col v-bind="grid2">
+              <el-form-item label="能量活动日期：">
+                <i class="required">*</i>
+                <el-date-picker
+                  v-model="timeVal"
+                  value-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd"
+                  size="small"
+                  type="daterange"
+                  placement="bottom-end"
+                  placeholder="请选择活动时间"
+                  @change="onchangeTime"
+                />
+                <el-date-picker
+                  v-model="select_act_date"
+                  type="month"
+                  placeholder="选择月">
+                </el-date-picker>
+              </el-form-item>
+            </el-col> -->
+            <el-col v-bind="grid2">
+              <el-form-item label="能量活动日期：" prop="select_act_date">
+                <el-select
+                  clearable
+                  v-model="formValidate.select_act_date"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="(item, key) in options"
+                    :key="key"
+                    :label="key"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid2">
+              <el-form-item
+                label="活动日期内最多购买件数："
+                prop="all_pay_count"
+                label-width="210px"
+              >
+                <el-input-number
+                  v-model="formValidate.all_pay_count"
+                  size="small"
+                  :max="3"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col v-bind="grid2">
+              <el-form-item label="能量活动时间：">
+                <i class="required">*</i>
+                <div class="acea-row">
+                  <el-select
+                    v-model="timeVal2"
+                    placeholder="请选择"
+                    size="small"
+                    class="selWidthd"
+                    @change="onchangeTime2"
+                  >
+                    <el-option
+                      v-for="item in spikeTimeList"
+                      :key="item.seckill_time_id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                </div>
+              </el-form-item>
+            </el-col> -->
+            <!-- <el-col v-bind="grid2">
+              <el-form-item
+                label="能量时间段内最多购买件数："
+                prop="once_pay_count"
+                label-width="210px"
+              >
+                <el-input-number
+                  v-model="formValidate.once_pay_count"
+                  size="small"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col v-bind="grid2">
+              <el-form-item label="单位：" prop="unit_name">
+                <el-input
+                  disabled
+                  v-model="formValidate.unit_name"
+                  size="small"
+                  placeholder="请输入单位"
+                  style="width: 250px;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid2">
+              <el-form-item label="排序：" label-width="210px">
+                <el-input-number
+                  v-model="formValidate.sort"
+                  size="small"
+                  placeholder="请输入排序序号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="送货方式：" prop="delivery_way">
+                <div class="acea-row">
+                  <el-checkbox-group
+                    disabled
+                    v-model="formValidate.delivery_way"
+                  >
+                    <el-checkbox
+                      v-for="item in deliveryList"
+                      :key="item.value"
+                      :label="item.value"
+                    >
+                      {{ item.name }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col
+              v-if="
+                (formValidate.delivery_way.length == 2 ||
+                  (formValidate.delivery_way.length == 1 &&
+                    formValidate.delivery_way[0] == 2)) &&
+                  formValidate.type == 0
+              "
+              :span="24"
+            >
+              <el-form-item label="是否包邮：">
+                <el-radio-group disabled v-model="formValidate.delivery_free">
+                  <el-radio :label="0" class="radio">否</el-radio>
+                  <el-radio :label="1">是</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col
+              v-if="
+                formValidate.delivery_free == 0 &&
+                  (formValidate.delivery_way.length == 2 ||
+                    (formValidate.delivery_way.length == 1 &&
+                      formValidate.delivery_way[0] == 2)) &&
+                  formValidate.type == 0
+              "
+              :span="24"
+            >
+              <el-form-item label="运费模板：" prop="temp_id">
+                <div class="acea-row">
+                  <el-select
+                    v-model="formValidate.temp_id"
+                    size="small"
+                    placeholder="请选择"
+                    class="selWidthd mr15"
+                  >
+                    <el-option
+                      v-for="item in shippingList"
+                      :key="item.shipping_template_id"
+                      :label="item.name"
+                      :value="item.shipping_template_id"
+                    />
+                  </el-select>
+                  <el-button size="small" @click="addTem"
+                    >添加运费模板</el-button
+                  >
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="labelList.length" :span="24">
+              <el-form-item label="商品标签：">
+                <el-select
+                  v-model="formValidate.mer_labels"
+                  size="small"
+                  multiple
+                  placeholder="请选择"
+                  class="selWidthd"
+                >
+                  <el-option
+                    v-for="item in labelList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="平台保障服务：">
+                <div class="acea-row">
+                  <el-select
+                    v-model="formValidate.guarantee_template_id"
+                    placeholder="请选择"
+                    size="small"
+                    clearable
+                    class="selWidthd mr20"
+                  >
+                    <el-option
+                      v-for="item in guaranteeList"
+                      :key="item.guarantee_template_id"
+                      :label="item.template_name"
+                      :value="item.guarantee_template_id"
+                    />
+                  </el-select>
+                  <el-button size="small" @click="addServiceTem"
+                    >添加服务说明模板</el-button
+                  >
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <!-- <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="活动状态：">
+                <el-radio-group v-model="formValidate.is_show">
+                  <el-radio :label="0" class="radio">关闭</el-radio>
+                  <el-radio :label="1">开启</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row> -->
+          <!--系统表单-->
+          <el-row
+            v-if="
+              formData.length > 0 &&
+                currentTab === 1 &&
+                formValidate.mer_form_id
+            "
+          >
+            <el-col>
+              <el-form-item label="关联系统表单：">
+                <!-- <el-select
+                  size="small"
+                  class="selWidthd"
+                  disabled
+                  v-model="formValidate.mer_form_id"
+                >
+                  <el-option
+                    v-for="items in formList"
+                    :key="items.form_id"
+                    :value="items.form_id"
+                    :label="items.name"
+                  >{{ items.name }}
+                  </el-option>
+                </el-select> -->
+                <span class="explanation"
+                  >如需改活动商品系统表单，请前往对应普通商品>编辑>修改系统表单即可实现</span
+                >
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item>
+                <div style="width: 350px;">
+                  <iframe
+                    id="iframe"
+                    class="iframe-box"
+                    :src="formUrl"
+                    frameborder="0"
+                    ref="iframe"
+                    style="min-height: 300px;"
+                  ></iframe>
+                </div>
+                <!-- <el-table
+                  border
+                  class="tabNumWidth"
+                  :data="formData"
+                  size="small"
+                >
+                  <el-table-column prop="label" label="表单标题" min-width="100" />
+                  <el-table-column prop="type" label="表单类型" min-width="100">
+                    <template slot-scope="{row}">
+                      <span>{{row.type | formTypeFilter}}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column min-width="100" label="是否必填">
+                    <template slot-scope="{row}">
+                      <span>{{row.val ? '必填'  : '不必填'}}</span>
+                    </template>
+                  </el-table-column>
+                </el-table> -->
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col
+              v-if="
+                formValidate.spec_type === 1 && formValidate.attr.length > 0
+              "
+              :span="24"
+              class="noForm"
+            >
+              <el-form-item label="批量设置：">
+                <el-table
+                  :data="oneFormBatch"
+                  border
+                  class="tabNumWidth"
+                  size="small"
+                >
+                  <el-table-column
+                    align="center"
+                    label="商品规格"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <div
+                        @click="batchAttr"
+                        class="acea-row row-between-wrapper"
+                        style="cursor: pointer;"
+                      >
+                        <div style="width: 45px;">
+                          {{ oneFormBatch[0]["attr"] }}
+                        </div>
+                        <i class="el-icon-arrow-down" />
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="center" label="图片" min-width="80">
+                    <template slot-scope="scope">
+                      <div
+                        class="upLoadPicBox"
+                        title="750*750px"
+                        @click="modalPicTap('1', 'pi')"
+                      >
+                        <div v-if="scope.row.image" class="pictrue tabPic">
+                          <img :src="scope.row.image" />
+                        </div>
+                        <div v-else class="upLoad tabPic">
+                          <i class="el-icon-camera cameraIconfont" />
+                        </div>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    v-for="(item, iii) in attrValue"
+                    :key="iii"
+                    :label="formThead[iii].title"
+                    align="center"
+                    min-width="120"
+                  >
+                    <template slot-scope="scope">
+                      <div>
+                        <!-- <el-input
+                          v-if="formThead[iii].title === '商品编号'"
+                          v-model="scope.row[iii]"
+                          type="text"
+                          size="small"
+                          class="priceBox"
+                          disabled
+                        /> -->
+                        <el-input
+                          v-if="
+                            formThead[iii].title === '成本价' ||
+                              formThead[iii].title === '限量'
+                          "
+                          v-model="scope.row[iii]"
+                          type="number"
+                          size="small"
+                          min="0"
+                          class="priceBox"
+                          controls-position="right"
+                        />
+                        <span v-else>{{ scope.row[iii] }}</span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" min-width="80">
+                    <template>
+                      <el-button
+                        type="text"
+                        class="submission"
+                        @click="batchAdd"
+                        size="small"
+                        >批量添加</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <!-- 单规格表格-->
+              <el-form-item
+                v-if="formValidate.spec_type === 0"
+                label="规格列表："
+              >
+                <el-table
+                  :data="OneattrValue"
+                  border
+                  class="tabNumWidth"
+                  size="mini"
+                >
+                  <el-table-column align="center" label="图片" min-width="80">
+                    <template slot-scope="scope">
+                      <div
+                        class="upLoadPicBox"
+                        @click="modalPicTap('1', 'dan', 'pi')"
+                      >
+                        <div v-if="formValidate.image" class="pictrue tabPic">
+                          <img :src="scope.row.image" />
+                        </div>
+                        <div v-else class="upLoad tabPic">
+                          <i class="el-icon-camera cameraIconfont" />
+                        </div>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    v-for="(item, iii) in attrValue"
+                    :key="iii"
+                    :label="formThead[iii].title"
+                    align="center"
+                    min-width="120"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-if="formThead[iii].title == '限量'"
+                        v-model="scope.row[iii]"
+                        type="number"
+                        size="small"
+                        :min="0"
+                        class="priceBox"
+                        @change="judgInventory(scope.row)"
+                      />
+                      <el-input
+                        v-else-if="formThead[iii].title == '成本价'"
+                        v-model="scope.row[iii]"
+                        type="number"
+                        size="small"
+                        :min="0"
+                        class="priceBox"
+                        @input="costpriceChange(scope.row)"
+                        @blur="rateChange(scope.row)"
+                      />
+                      <!-- <el-input
+                        v-else-if="formThead[iii].title == '能量值'"
+                        v-model="scope.row[iii]"
+                        type="number"
+                        size="small"
+                        :min="0"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else-if="formThead[iii].title == '商品编号'"
+                        v-model="scope.row[iii]"
+                        type="text"
+                        size="small"
+                        class="priceBox"
+                      /> -->
+                      <span v-else>{{ scope.row[iii] }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+              <!-- 多规格表格-->
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-form-item
+              v-if="
+                formValidate.spec_type === 1 && formValidate.attr.length > 0
+              "
+              label="规格列表："
+            >
+              <el-table
+                ref="multipleSelection"
+                size="small"
+                :data="ManyAttrValue"
+                tooltip-effect="dark"
+                class="tabNumWidth"
+                :row-key="
+                  row => {
+                    return row.id;
+                  }
+                "
+                @selection-change="handleSelectionChange"
+              >
+                <el-table-column
+                  align="center"
+                  type="selection"
+                  :reserve-selection="true"
+                  min-width="50"
+                />
+                <template v-if="manyTabDate">
+                  <el-table-column
+                    v-for="(item, iii) in manyTabDate"
+                    :key="iii"
+                    align="center"
+                    :label="manyTabTit[iii].title"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <span
+                        class="priceBox"
+                        :class="scope.row.select ? 'selectOn' : ''"
+                        v-text="scope.row[iii]"
+                      />
+                    </template>
+                  </el-table-column>
+                </template>
+                <el-table-column align="center" label="图片" min-width="80">
+                  <template slot-scope="scope">
+                    <div
+                      class="upLoadPicBox"
+                      @click="modalPicTap('1', 'duo', scope.$index)"
+                    >
+                      <div v-if="scope.row.image" class="pictrue tabPic">
+                        <img :src="scope.row.image" />
+                      </div>
+                      <div v-else class="upLoad tabPic">
+                        <i class="el-icon-camera cameraIconfont" />
+                      </div>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  v-for="(item, iii) in attrValue"
+                  :key="iii"
+                  :label="formThead[iii].title"
+                  align="center"
+                  min-width="120"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      v-if="formThead[iii].title == '限量'"
+                      v-model="scope.row[iii]"
+                      type="number"
+                      size="small"
+                      :min="0"
+                      class="priceBox"
+                      @change="judgInventory(scope.row, scope.$index)"
+                    />
+                    <el-input
+                      v-else-if="formThead[iii].title == '成本价'"
+                      v-model="scope.row[iii]"
+                      type="number"
+                      size="small"
+                      :min="0"
+                      class="priceBox"
+                      @input="costpriceChange(scope.row, scope.$index)"
+                      @blur="rateChange(scope.row, scope.$index)"
+                    />
+                    <!-- <el-input
+                      v-else-if="formThead[iii].title == '能量值'"
+                      v-model="scope.row[iii]"
+                      type="number"
+                      size="small"
+                      :min="0"
+                      class="priceBox"
+                    />
+                    <el-input
+                      v-else-if="formThead[iii].title == '商品编号'"
+                      v-model="scope.row[iii]"
+                      type="text"
+                      size="small"
+                      class="priceBox"
+                    /> -->
+                    <span v-else>{{ scope.row[iii] }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-row>
+        </div>
+        <!-- 商品详情-->
+        <el-row v-show="currentTab === 2">
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <!--<vue-ueditor-wrap v-model="formValidate.content" @beforeInit="addCustomDialog"  :config="myConfig"></vue-ueditor-wrap>-->
+              <ueditorFrom
+                v-model="formValidate.content"
+                :content="formValidate.content"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item style="margin-top:30px;">
+          <el-button
+            v-show="currentTab > 0"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmitUp"
+            >上一步</el-button
+          >
+          <el-button
+            v-show="currentTab == 0"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmitNest1('formValidate')"
+            >下一步</el-button
+          >
+          <el-button
+            v-show="currentTab == 1"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmitNest2('formValidate')"
+            >下一步</el-button
+          >
+          <el-button
+            v-show="currentTab === 2"
+            :loading="loading"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmit('formValidate')"
+            >提交</el-button
+          >
+          <el-button
+            v-show="currentTab === 2"
+            :loading="loading"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handlePreview('formValidate')"
+            >预览</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <!--属性选择弹窗-->
+    <el-dialog
+      v-if="attrShow"
+      :visible.sync="attrShow"
+      title="请选择商品规格"
+      width="320px"
+    >
+      <attr-list
+        :attrs="attrsList"
+        @activeData="activeAttr"
+        @close="labelAttr"
+        @subAttrs="subAttrs"
+        v-if="attrShow"
+      ></attr-list>
+    </el-dialog>
+    <!--选择商品-->
+    <goods-list ref="goodsList" @getProduct="getProduct" :isSeckill="true" />
+    <!--添加服务保障模板-->
+    <guarantee-service ref="serviceGuarantee" @get-list="getGuaranteeList" />
+    <!--预览商品-->
+    <div v-if="previewVisible">
+      <div class="bg" @click.stop="previewVisible = false" />
+      <preview-box
+        v-if="previewVisible"
+        ref="previewBox"
+        :product-type="1"
+        :preview-key="previewKey"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import ueditorFrom from "@/components/ueditorFrom";
+import goodsList from "./goodsList";
+import guaranteeService from "@/components/serviceGuarantee/index";
+import previewBox from "@/components/previewBox/index";
+import attrList from "@/components/attrList";
+import {
+  shippingListApi,
+  seckillProductCreateApi,
+  seckillProductDetailApi,
+  categorySelectApi,
+  categoryListApi,
+  seckillProductUpdateApi,
+  seckillProTimeApi,
+  guaranteeListApi,
+  seckillPreviewApi,
+  productConfigApi,
+  getProductLabelApi,
+  associatedFormList,
+  associatedFormInfo
+} from "@/api/product";
+import { roterPre } from "@/settings";
+import SettingMer from "@/libs/settingMer";
+import { getToken } from "@/utils/auth";
+import { mateName } from "@/utils";
+import { toFixedNoRounding } from "@/utils/util";
+import { number } from "echarts/lib/export";
+const defaultObj = {
+  old_product_id: "",
+  image: "",
+  spike_image: "",
+  slider_image: [],
+  store_name: "",
+  store_info: "",
+  start_day: "",
+  end_day: "",
+  start_time: "",
+  end_time: "",
+  all_pay_count: 1,
+  once_pay_count: 0,
+  is_open_recommend: 1,
+  is_open_state: 1,
+  is_show: 1,
+  keyword: "",
+  cate_id: "", // 平台分类id
+  mer_cate_id: [], // 商户分类id
+  unit_name: "",
+  integral: 0,
+  sort: 0,
+  is_good: 0,
+  temp_id: "",
+  guarantee_template_id: "",
+  delivery_way: [],
+  mer_labels: [],
+  delivery_free: 1,
+  select_act_date: "",
+  attrValue: [
+    {
+      image: "",
+      original_price: "", //参加活动前的成本
+      price: null,
+      original_cost: "", //参加活动前的价格
+      cost: null,
+      ot_price: null,
+      old_stock: null,
+      stock: null,
+      bar_code: "",
+      weight: null,
+      volume: null
+      // give_discount: "" //让利比例
+    }
+  ],
+  attr: [],
+  extension_type: 0,
+  content: "",
+  spec_type: 0,
+  is_gift_bag: 0
+};
+const objTitle = {
+  original_price: {
+    title: "原售价"
+  },
+  price: {
+    title: "能量值"
+  },
+  original_cost: {
+    title: "原成本价"
+  },
+  cost: {
+    title: "成本价"
+  },
+  ot_price: {
+    title: "市场价"
+  },
+  old_stock: {
+    title: "库存"
+  },
+  stock: {
+    title: "限量"
+  },
+  bar_code: {
+    title: "商品编号"
+  },
+  weight: {
+    title: "重量（KG）"
+  },
+  volume: {
+    title: "体积(m³)"
+  }
+};
+const proOptions = [{ name: "店铺推荐", value: "is_good" }];
+export default {
+  name: "SeckillProductAdd",
+  components: {
+    ueditorFrom,
+    goodsList,
+    guaranteeService,
+    previewBox,
+    attrList
+  },
+  data() {
+    const url =
+      SettingMer.https + "/upload/image/0/file?ueditor=1&token=" + getToken();
+    return {
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: "100%", // 初始容器宽度
+        UEDITOR_HOME_URL: "/UEditor/",
+        serverUrl: url,
+        imageUrl: url,
+        imageFieldName: "file",
+        imageUrlPrefix: "",
+        imageActionName: "upfile",
+        imageMaxSize: 2048000,
+        imageAllowFiles: [".png", ".jpg", ".jpeg", ".gif", ".bmp"]
+      },
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      dialogVisible: false,
+      product_id: "",
+      multipleSelection: [],
+      optionsCate: {
+        value: "store_category_id",
+        label: "cate_name",
+        children: "children",
+        emitPath: false
+      },
+      roterPre: roterPre,
+      options: [],
+      selectRule: "",
+      checkboxGroup: [],
+      recommend: proOptions,
+      tabs: [],
+      fullscreenLoading: false,
+      props: { emitPath: false },
+      propsMer: { emitPath: false, multiple: true },
+      active: 0,
+      OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
+      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+      merCateList: [], // 商户分类筛选
+      categoryList: [], // 平台分类筛选
+      shippingList: [], // 运费模板
+      guaranteeList: [], // 服务保障模板
+      spikeTimeList: [],
+      deliveryList: [],
+      labelList: [], // 商品标签
+      formThead: Object.assign({}, objTitle),
+      formValidate: Object.assign({}, defaultObj),
+      timeVal: "",
+      timeVal2: "",
+      maxStock: "",
+      addNum: 0,
+      singleSpecification: {},
+      multipleSpecifications: [],
+      formDynamics: {
+        template_name: "",
+        template_value: []
+      },
+      manyTabTit: {},
+      manyTabDate: {},
+      grid2: {
+        lg: 10,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      // 规格数据
+      formDynamic: {
+        attrsName: "",
+        attrsVal: ""
+      },
+      isBtn: false,
+      manyFormValidate: [],
+      images: [],
+      currentTab: 0,
+      isChoice: "",
+      grid: {
+        xl: 8,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      loading: false,
+      ruleValidate: {
+        store_name: [
+          { required: true, message: "请输入商品名称", trigger: "blur" }
+        ],
+        select_act_date: [
+          { required: true, message: "请输入能量活动日期", trigger: "blur" }
+        ],
+        // activity_date: [{ required: true, message: '请输入能量活动日期', trigger: 'blur' }],
+        // activity_time: [{ required: true, message: '请输入能量活动日期', trigger: 'blur' }],
+        all_pay_count: [
+          { required: true, message: "请输入购买次数", trigger: "blur" },
+          { pattern: /^\+?[1-9][0-9]*$/, message: "最小为1" }
+        ],
+        once_pay_count: [
+          { required: true, message: "请输入购买次数", trigger: "blur" },
+          { pattern: /^\+?[1-9][0-9]*$/, message: "最小为1" }
+        ],
+        mer_cate_id: [
+          {
+            required: true,
+            message: "请选择商户分类",
+            trigger: "change",
+            type: "array",
+            min: "1"
+          }
+        ],
+        cate_id: [
+          { required: true, message: "请选择平台分类", trigger: "change" }
+        ],
+        keyword: [
+          { required: true, message: "请输入商品关键字", trigger: "blur" }
+        ],
+        unit_name: [{ required: true, message: "请输入单位", trigger: "blur" }],
+        store_info: [
+          { required: true, message: "请输入能量活动简介", trigger: "blur" }
+        ],
+        temp_id: [
+          { required: true, message: "请选择运费模板", trigger: "change" }
+        ],
+        image: [{ required: true, message: "请上传商品图", trigger: "change" }],
+        spike_image: [
+          { required: true, message: "请选择商品", trigger: "change" }
+        ],
+        slider_image: [
+          {
+            required: true,
+            message: "请上传商品轮播图",
+            type: "array",
+            trigger: "change"
+          }
+        ],
+        delivery_way: [
+          { required: true, message: "请选择送货方式", trigger: "change" }
+        ]
+      },
+      attrInfo: {},
+      previewVisible: false,
+      previewKey: "",
+      deliveryType: [],
+      attrs: [],
+      attrsList: [],
+      activeAtter: [],
+      attrShow: false,
+      formData: [],
+      formUrl: "",
+      // baseURL: 'http://localhost:8080',
+      baseURL: SettingMer.httpUrl || "http://localhost:8080",
+      formList: [],
+      give_discount_rate: ""
+    };
+  },
+  computed: {
+    attrValue() {
+      const obj = Object.assign({}, defaultObj.attrValue[0]);
+      delete obj.image;
+      return obj;
+    },
+    oneFormBatch() {
+      const obj = [Object.assign({}, defaultObj.attrValue[0])];
+      obj[0]["attr"] = "全部";
+      delete obj[0].bar_code;
+      return obj;
+    }
+  },
+  watch: {
+    "formValidate.attr": {
+      handler: function(val) {
+        if (this.formValidate.spec_type === 1) this.watCh(val);
+      },
+      immediate: false,
+      deep: true
+    }
+  },
+  created() {
+    this.tempRoute = Object.assign({}, this.$route);
+    if (this.$route.params.id && this.formValidate.spec_type === 1) {
+      this.$watch("formValidate.attr", this.watCh);
+    }
+  },
+  mounted() {
+    this.getCategorySelect();
+    this.getCategoryList();
+    this.getShippingList();
+    this.getGuaranteeList();
+    this.getSpikeTimeList();
+    this.$store.dispatch("settings/setEdit", true);
+    this.getLabelLst();
+    this.formValidate.slider_image = [];
+    if (this.$route.params.id) {
+      this.setTagsViewTitle();
+      this.getInfo(this.$route.params.id);
+    } else {
+      this.productCon();
+    }
+    this.formValidate.attr.map(item => {
+      this.$set(item, "inputVisible", false);
+    });
+  },
+  methods: {
+    // 获取标签项
+    getLabelLst() {
+      getProductLabelApi()
+        .then(res => {
+          this.labelList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    productCon() {
+      productConfigApi()
+        .then(res => {
+          console.log(res);
+
+          this.give_discount_rate = res.data?.give_discount_rate || 0;
+          this.deliveryType = res.data.delivery_way.map(String);
+          const name = this.formValidate.type == 0 ? "快递配送" : "虚拟发货";
+          if (this.deliveryType.length == 2) {
+            if (this.formValidate.type == 2) {
+              //卡密商品
+              this.deliveryList = [{ value: "2", name: name }];
+            } else {
+              this.deliveryList = [
+                { value: "1", name: "到店自提" },
+                { value: "2", name: name }
+              ];
+            }
+          } else {
+            if (
+              this.deliveryType.length == 1 &&
+              this.deliveryType[0] == "1" &&
+              this.formValidate.type != 2
+            ) {
+              this.deliveryList = [{ value: "1", name: "到店自提" }];
+            } else {
+              this.deliveryList = [{ value: "2", name: name }];
+              this.formValidate.delivery_way = ["2"];
+            }
+          }
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    add() {
+      this.$refs.goodsList.dialogVisible = true;
+    },
+    getProduct(data) {
+      this.formValidate.spike_image = data.src;
+      this.product_id = data.id;
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.formValidate.start_day = e ? e[0] : "";
+      this.formValidate.end_day = e ? e[1] : "";
+    },
+    // 具体日期
+    onchangeTime2(e) {
+      this.timeVal2 = e;
+      this.formValidate.start_time = e ? e.split("-")[0] : "";
+      this.formValidate.end_time = e ? e.split("-")[1] : "";
+    },
+    setTagsViewTitle() {
+      const title = "编辑商品";
+      const route = Object.assign({}, this.tempRoute, {
+        title: `${title}-${this.$route.params.id}`
+      });
+      this.$store.dispatch("tagsView/updateVisitedView", route);
+    },
+    //打开属性
+    batchAttr() {
+      this.attrShow = true;
+    },
+    //选中属性
+    activeAttr(e) {
+      this.attrsList = e;
+    },
+    //关闭属性弹窗
+    labelAttr() {
+      this.attrShow = false;
+    },
+    //获取属性
+    getAttr() {
+      this.oneFormBatch[0].attr = "全部";
+      let data = this.attrs;
+      data.map(el => {
+        el.details = [];
+        el.detail.map(label => {
+          el.details.push({
+            name: label,
+            select: false
+          });
+        });
+      });
+      this.attrsList = data;
+    },
+    doCombination(arr) {
+      var count = arr.length - 1; //数组长度(从0开始)
+      var tmp = [];
+      var totalArr = []; // 总数组
+      return doCombinationCallback(arr, 0); //从第一个开始
+      //js 没有静态数据，为了避免和外部数据混淆，需要使用闭包的形式
+      function doCombinationCallback(arr, curr_index) {
+        for (let val of arr[curr_index]) {
+          tmp[curr_index] = val; //以curr_index为索引，加入数组
+          //当前循环下标小于数组总长度，则需要继续调用方法
+          if (curr_index < count) {
+            doCombinationCallback(arr, curr_index + 1); //继续调用
+          } else {
+            totalArr.push(tmp.join(",")); //(直接给push进去，push进去的不是值，而是值的地址)
+          }
+          //js  对象都是 地址引用(引用关系)，每次都需要重新初始化，否则 totalArr的数据都会是最后一次的 tmp 数据；
+          let oldTmp = tmp;
+          tmp = [];
+          for (let index of oldTmp) {
+            tmp.push(index);
+          }
+        }
+        return totalArr;
+      }
+    },
+
+    //提交属性值；
+    subAttrs(e) {
+      let selectData = [];
+      this.attrsList.forEach((el, index) => {
+        let obj = [];
+        el.details.forEach(label => {
+          if (label.select) {
+            obj.push(label.name);
+          }
+        });
+        if (obj.length) {
+          selectData.push(obj);
+        }
+      });
+      let newData = [];
+      if (selectData.length) {
+        newData = this.doCombination(selectData);
+      }
+      this.attrShow = false;
+      this.activeAtter = selectData;
+      this.oneFormBatch[0].attr = newData.length ? newData.join(";") : "全部";
+      let manyAttr = this.ManyAttrValue;
+      manyAttr.forEach(j => {
+        j.select = false;
+        if (newData.length) {
+          newData.forEach(item => {
+            if (j.sku.split("").length == item.split("").length) {
+              if (j.sku == item) {
+                j.select = true;
+              }
+            } else {
+              if (j.sku == item) {
+                j.select = true;
+              }
+            }
+          });
+        } else {
+          j.select = true;
+        }
+      });
+      this.$nextTick(function() {
+        this.$set(this, "ManyAttrValue", manyAttr);
+      });
+    },
+    watCh(val) {
+      const tmp = {};
+      const tmpTab = {};
+      this.formValidate.attr.forEach((o, i) => {
+        tmp["value" + i] = { title: o.value };
+        tmpTab["value" + i] = "";
+      });
+      this.ManyAttrValue.forEach((val, index) => {
+        const key = Object.values(val.detail)
+          .sort()
+          .join("/");
+        if (this.attrInfo[key]) this.ManyAttrValue[index] = this.attrInfo[key];
+      });
+      this.attrInfo = {};
+      this.ManyAttrValue.forEach(val => {
+        this.attrInfo[
+          Object.values(val.detail)
+            .sort()
+            .join("/")
+        ] = val;
+      });
+      this.manyTabTit = tmp;
+      this.manyTabDate = tmpTab;
+      this.formThead = Object.assign({}, this.formThead, tmp);
+    },
+    // 限制购买数量不能大于库存
+    judgInventory(row, index) {
+      const stock = row.stock;
+      if (typeof index === "undefined") {
+        if (this.singleSpecification[0]["old_stock"] < stock) {
+          this.$message.warning("限量不能大于库存！");
+          this.OneattrValue[0]["stock"] = this.singleSpecification[0][
+            "old_stock"
+          ];
+        }
+      } else {
+        console.log(this.multipleSpecifications[index]["old_stock"]);
+        if (this.multipleSpecifications[index]["old_stock"] < stock) {
+          this.$message.warning("限量不能大于库存！");
+          this.ManyAttrValue[index]["stock"] = this.multipleSpecifications[
+            index
+          ]["old_stock"];
+        }
+      }
+    },
+    costpriceChange(row, index) {
+      row.cost = row.cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/, "$1");
+    },
+    rateChange(row, index) {
+      // if (
+      //   toFixedNoRounding(1 - Number(row.cost) / Number(row.original_cost)) <
+      //   this.give_discount_rate
+      // ) {
+      //   return this.$message.warning("成本价过高请重新调整!!!");
+      // }
+      // row.price = toFixedNoRounding(
+      //   row.original_price *
+      //     (1 -
+      //       toFixedNoRounding(1 - Number(row.cost) / Number(row.original_cost)))
+      // );
+      // row.price = toFixedNoRounding(row.cost / 0.89);
+    },
+    // 运费模板
+    addTem() {
+      const _this = this;
+      this.$modalTemplates(0, function() {
+        _this.getShippingList();
+      });
+    },
+    // 添加服务保障模板
+    addServiceTem() {
+      this.$refs.serviceGuarantee.add();
+    },
+    // 商户分类；
+    getCategorySelect() {
+      categorySelectApi()
+        .then(res => {
+          this.merCateList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 平台分类；
+    getCategoryList() {
+      categoryListApi()
+        .then(res => {
+          this.categoryList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 运费模板；
+    getShippingList() {
+      shippingListApi().then(res => {
+        this.shippingList = res.data;
+      });
+    },
+    // 获取服务保障模板
+    getGuaranteeList() {
+      guaranteeListApi().then(res => {
+        this.guaranteeList = res.data;
+      });
+    },
+    // 能量可选时间
+    getSpikeTimeList() {
+      seckillProTimeApi().then(res => {
+        this.spikeTimeList = res.data;
+        this.options = res.data[0].days;
+        this.spikeTimeList.map(item => {
+          this.$set(
+            item,
+            "name",
+            item.start_time + ":00:00 - " + item.end_time + ":00:00"
+          );
+        });
+      });
+    },
+    // 删除表格中的属性
+    delAttrTable(index) {
+      this.ManyAttrValue.splice(index, 1);
+    },
+    // 批量添加
+    batchAdd() {
+      for (const val of this.ManyAttrValue) {
+        if (val.select) {
+          if (this.oneFormBatch[0].attr != "")
+            this.$set(val, "attr", this.oneFormBatch[0].attr);
+          if (this.oneFormBatch[0].image != "")
+            this.$set(val, "image", this.oneFormBatch[0].image);
+          if (
+            this.oneFormBatch[0].price != null &&
+            this.oneFormBatch[0].price != ""
+          )
+            this.$set(val, "price", this.oneFormBatch[0].price);
+          if (
+            this.oneFormBatch[0].stock != null &&
+            this.oneFormBatch[0].stock != ""
+          )
+            this.$set(val, "stock", this.oneFormBatch[0].stock);
+        }
+      }
+    },
+    // 添加按钮
+    addBtn() {
+      this.clearAttr();
+      this.isBtn = true;
+    },
+    // 取消
+    offAttrName() {
+      this.isBtn = false;
+    },
+    clearAttr() {
+      this.formDynamic.attrsName = "";
+      this.formDynamic.attrsVal = "";
+    },
+    // 删除规格
+    handleRemoveAttr(index) {
+      this.formValidate.attr.splice(index, 1);
+      this.manyFormValidate.splice(index, 1);
+    },
+    // 删除属性
+    handleClose(item, index) {
+      item.splice(index, 1);
+    },
+    // 详情
+    getInfo(id) {
+      this.fullscreenLoading = true;
+      seckillProductDetailApi(id)
+        .then(async res => {
+          const info = res.data;
+          this.attrs = info.attr || [];
+          info.attrValue.forEach(val => {
+            val.select = true;
+            val.cost = 0;
+          });
+          this.formValidate = {
+            type: info.type,
+            old_product_id: info.product_id,
+            image: info.image,
+            spike_image: info.image,
+            slider_image: info.slider_image,
+            store_name: this.$route.params.id
+              ? info.store_name
+              : "【底价能量】 " + info.store_name,
+            store_info: info.store_info,
+            start_day: info.seckillActive ? info.seckillActive.start_day : "",
+            end_day: info.seckillActive ? info.seckillActive.end_day : "",
+            start_time: info.seckillActive
+              ? info.seckillActive.start_time + ":00"
+              : "",
+            end_time: info.seckillActive
+              ? info.seckillActive.end_time + ":00"
+              : "",
+            cate_id: info.cate_id, // 平台分类id
+            mer_cate_id: info.mer_cate_id || [], // 商户分类id
+            mer_form_id: info.mer_form_id,
+            unit_name: info.unit_name,
+            sort: info.sort,
+            is_good: info.is_good,
+            keyword: info.keyword,
+            temp_id: mateName(
+              this.shippingList,
+              "shipping_template_id",
+              info.temp_id
+            ),
+            guarantee_template_id: mateName(
+              this.guaranteeList,
+              "guarantee_template_id",
+              info.guarantee_template_id
+            ),
+            is_show: info.is_show,
+            attr: info.attr,
+            extension_type: info.extension_type,
+            content: info.content,
+            spec_type: info.spec_type,
+            is_gift_bag: info.is_gift_bag,
+            all_pay_count: info.seckillActive
+              ? info.seckillActive.all_pay_count
+              : "1",
+            once_pay_count: info.seckillActive
+              ? info.seckillActive.once_pay_count
+              : "0",
+            delivery_way:
+              info.delivery_way && info.delivery_way.length
+                ? info.delivery_way
+                : this.deliveryType,
+            delivery_free: info.delivery_free ? info.delivery_free : 1,
+            mer_labels:
+              info.mer_labels && info.mer_labels.length
+                ? info.mer_labels.map(Number)
+                : []
+          };
+          if (info.mer_form_id) {
+            this.getFormList();
+            this.getFormInfo();
+          }
+          if (this.formValidate.spec_type === 0) {
+            // console.log(info.attrValue);
+
+            this.OneattrValue = info.attrValue;
+            this.singleSpecification = JSON.parse(
+              JSON.stringify(info.attrValue)
+            );
+          } else {
+            this.multipleSelection = info.attrValue;
+            this.$nextTick(() => {
+              info.attrValue.forEach(row => {
+                this.$refs.multipleSelection.toggleRowSelection(row, true);
+              });
+            });
+            this.ManyAttrValue = info.attrValue;
+            this.multipleSpecifications = JSON.parse(
+              JSON.stringify(info.attrValue)
+            );
+            this.ManyAttrValue.forEach(val => {
+              this.attrInfo[
+                Object.values(val.detail)
+                  .sort()
+                  .join("/")
+              ] = val;
+            });
+          }
+          if (this.formValidate.is_good === 1) {
+            this.checkboxGroup.push("is_good");
+          }
+          this.fullscreenLoading = false;
+          if (this.$route.params.id && info.seckillActive) {
+            this.timeVal = [
+              info.seckillActive.start_day,
+              info.seckillActive.end_day
+            ];
+            this.timeVal2 =
+              info.seckillActive.start_time +
+              ":00:00-" +
+              info.seckillActive.end_time +
+              ":00:00";
+          }
+          this.getAttr();
+          this.productCon();
+        })
+        .catch(res => {
+          this.fullscreenLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    // 系统表单下拉数据
+    getFormList() {
+      associatedFormList()
+        .then(res => {
+          this.formList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 关联的表单信息
+    getFormInfo() {
+      associatedFormInfo(this.formValidate.mer_form_id)
+        .then(res => {
+          this.formData = res.data;
+          let time = new Date().getTime() * 1000;
+          let formUrl = `${
+            this.baseURL
+          }/pages/admin/system_form/index?inner_frame=1&time=${time}&form_id=${
+            this.formValidate.mer_form_id
+          }`;
+          this.formUrl = formUrl;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    handleRemove(i) {
+      this.formValidate.slider_image.splice(i, 1);
+    },
+    // 点击商品图
+    modalPicTap(tit, num, i) {
+      const _this = this;
+      const attr = [];
+      this.$modalUpload(function(img) {
+        if (tit === "1" && !num) {
+          _this.formValidate.image = img[0];
+          _this.OneattrValue[0].image = img[0];
+        }
+        if (tit === "2" && !num) {
+          img.map(item => {
+            attr.push(item.attachment_src);
+            _this.formValidate.slider_image.push(item);
+            if (_this.formValidate.slider_image.length > 10) {
+              _this.formValidate.slider_image.length = 10;
+            }
+          });
+        }
+        if (tit === "1" && num === "dan") {
+          _this.OneattrValue[0].image = img[0];
+        }
+        if (tit === "1" && num === "duo") {
+          _this.ManyAttrValue[i].image = img[0];
+        }
+        if (tit === "1" && num === "pi") {
+          _this.oneFormBatch[0].image = img[0];
+        }
+      }, tit);
+    },
+    handleSubmitUp() {
+      if (this.currentTab-- < 0) this.currentTab = 0;
+    },
+    handleSubmitNest1(name) {
+      if (!this.formValidate.spike_image) {
+        this.$message.warning("请选择商品！");
+        return;
+      } else {
+        this.currentTab++;
+        if (!this.$route.params.id) this.getInfo(this.product_id);
+      }
+    },
+    handleSubmitNest2(name) {
+      if (this.formValidate.spec_type === 1) {
+        this.formValidate.attrValue = this.multipleSelection;
+      } else {
+        this.formValidate.attrValue = this.OneattrValue;
+        this.formValidate.attr = [];
+      }
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          if (
+            !this.formValidate.store_name ||
+            !this.formValidate.cate_id ||
+            !this.formValidate.unit_name ||
+            !this.formValidate.store_info ||
+            !this.formValidate.image ||
+            !this.formValidate.slider_image ||
+            !this.formValidate.select_act_date
+            // !this.formValidate.start_day ||
+            // !this.formValidate.end_day ||
+            // !this.formValidate.start_time ||
+            // !this.formValidate.end_time
+          ) {
+            this.$message.warning("请填写完整商品信息！");
+            return;
+          }
+          if (
+            this.formValidate.all_pay_count < this.formValidate.once_pay_count
+          ) {
+            this.$message.warning("日期内购买次数必须大于时间段内购买次数!");
+            return;
+          }
+          let isCost = this.formValidate.attrValue.every(item => {
+            let isValue =
+              toFixedNoRounding(
+                1 - Number(item.cost) / Number(item.original_cost)
+              ) < this.give_discount_rate;
+
+            return !isValue;
+          });
+          if (!isCost && this.give_discount_rate) {
+            return this.$message.warning("成本价过高请重新调整!!!");
+          }
+          if (
+            !this.formValidate.attrValue ||
+            this.formValidate.attrValue.length == 0
+          ) {
+            this.$message.warning("请选择商品规格！");
+            return;
+          }
+          this.currentTab++;
+        }
+      });
+    },
+    // 提交
+    handleSubmit(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.$store.dispatch("settings/setEdit", false);
+          this.fullscreenLoading = true;
+          this.loading = true;
+          this.$route.params.id
+            ? seckillProductUpdateApi(this.$route.params.id, this.formValidate)
+                .then(async res => {
+                  this.fullscreenLoading = false;
+                  this.$message.success(res.message);
+                  this.$router.push({
+                    path: this.roterPre + "/marketing/seckill/list"
+                  });
+                  this.$refs[name].resetFields();
+                  this.formValidate.slider_image = [];
+                  this.loading = false;
+                })
+                .catch(res => {
+                  this.fullscreenLoading = false;
+                  this.loading = false;
+                  this.$message.error(res.message);
+                })
+            : seckillProductCreateApi(this.formValidate)
+                .then(async res => {
+                  this.fullscreenLoading = false;
+                  this.$message.success(res.message);
+                  this.$router.push({
+                    path: this.roterPre + "/marketing/seckill/list"
+                  });
+                  this.$refs[name].resetFields();
+                  this.formValidate.slider_image = [];
+                  this.loading = false;
+                })
+                .catch(res => {
+                  this.fullscreenLoading = false;
+                  this.loading = false;
+                  this.$message.error(res.message);
+                });
+        } else {
+          if (
+            !this.formValidate.store_name ||
+            !this.formValidate.cate_id ||
+            !this.formValidate.unit_name ||
+            !this.formValidate.store_info ||
+            !this.formValidate.image ||
+            !this.formValidate.slider_image
+          ) {
+            this.$message.warning("请填写完整商品信息！");
+          }
+        }
+      });
+    },
+    // 预览
+    handlePreview(name) {
+      seckillPreviewApi(this.formValidate)
+        .then(async res => {
+          this.previewVisible = true;
+          this.previewKey = res.data.preview_key;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 表单验证
+    validate(prop, status, error) {
+      if (status === false) {
+        this.$message.warning(error);
+      }
+    },
+    // 移动
+    handleDragStart(e, item) {
+      this.dragging = item;
+    },
+    handleDragEnd(e, item) {
+      this.dragging = null;
+    },
+    handleDragOver(e) {
+      e.dataTransfer.dropEffect = "move";
+    },
+    handleDragEnter(e, item) {
+      e.dataTransfer.effectAllowed = "move";
+      if (item === this.dragging) {
+        return;
+      }
+      const newItems = [...this.formValidate.slider_image];
+      const src = newItems.indexOf(this.dragging);
+      const dst = newItems.indexOf(item);
+      newItems.splice(dst, 0, ...newItems.splice(src, 1));
+      this.formValidate.slider_image = newItems;
+    },
+    // 添加自定义弹窗
+    addCustomDialog(editorId) {}
+  }
+};
+</script>
+<style scoped lang="scss">
+.bg {
+  z-index: 100;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.1);
+}
+.required {
+  color: #ff4949;
+  position: absolute;
+  left: -113px;
+  display: inline-block;
+}
+.sp100 {
+  width: 100%;
+}
+.proCoupon ::v-deep .el-form-item__content {
+  margin-top: 5px;
+}
+.tabPic {
+  width: 40px !important;
+  height: 40px !important;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.noLeft ::v-deep .el-form-item__content {
+  margin-left: 0 !important;
+}
+.tabNumWidth th {
+  line-height: 20px;
+}
+.tabNumWidth ::v-deep .el-input-number--medium {
+  width: 121px !important;
+}
+.tabNumWidth ::v-deep .el-input-number__increase {
+  width: 20px !important;
+  font-size: 12px !important;
+}
+.tabNumWidth ::v-deep .el-input-number__decrease {
+  width: 20px !important;
+  font-size: 12px !important;
+}
+.tabNumWidth ::v-deep .el-input-number--medium .el-input__inner {
+  padding-left: 25px !important;
+  padding-right: 25px !important;
+}
+.tabNumWidth ::v-deep thead {
+  line-height: normal !important;
+}
+.tabNumWidth ::v-deep .el-table .cell {
+  line-height: normal !important;
+}
+.selectOn {
+  color: var(--prev-color-primary);
+}
+.selWidth {
+  width: 100%;
+}
+.selWidthd {
+  width: 350px;
+}
+.button-new-tag {
+  height: 28px;
+  line-height: 26px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
+.pictrue {
+  width: 60px;
+  height: 60px;
+  border: 1px dotted rgba(0, 0, 0, 0.1);
+  margin-right: 10px;
+  position: relative;
+  cursor: pointer;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.btndel {
+  position: absolute;
+  z-index: 1;
+  width: 20px !important;
+  height: 20px !important;
+  left: 46px;
+  top: -4px;
+}
+.labeltop ::v-deep .el-form-item__label {
+  float: none !important;
+  display: inline-block !important;
+  margin-left: 120px !important;
+  width: auto !important;
+}
+</style>
diff --git a/src/views/marketing/energy/energyGoods/goodsList.vue b/src/views/marketing/energy/energyGoods/goodsList.vue
new file mode 100644
index 0000000..205b4a5
--- /dev/null
+++ b/src/views/marketing/energy/energyGoods/goodsList.vue
@@ -0,0 +1,199 @@
+<template>
+  <el-dialog
+    v-if="dialogVisible"
+    title="商品信息"
+    :visible.sync="dialogVisible"
+    width="900px"
+  >
+    <div class="divBox">
+      <div class="container">
+        <el-form size="small" inline label-width="85px">
+          <el-form-item label="商品分类：">
+            <el-select
+              v-model="tableFrom.mer_cate_id"
+              placeholder="请选择"
+              class="dialogWidth"
+              clearable
+              @change="getList()"
+            >
+              <el-option
+                v-for="item in merCateList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品搜索：">
+            <el-input
+              v-model="tableFrom.keyword"
+              placeholder="请输入商品名称，关键字，产品编号"
+              class="dialogWidth"
+              clearable
+              @keyup.enter.native="getList"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="getList"
+              >查询</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-if="resellShow" class="mb10">
+        <el-alert
+          title="注：添加为预售商品后，原普通商品会下架；如该商品已开启其它营销活动，请勿选择！"
+          type="warning"
+          v-if="resellShow"
+          show-icon
+        >
+        </el-alert>
+      </div>
+      <el-table v-loading="listLoading" :data="tableData.data" size="small">
+        <el-table-column width="55">
+          <template slot-scope="scope">
+            <el-radio
+              v-model="templateRadio"
+              :label="scope.row.product_id"
+              @change.native="getTemplateRow(scope.row)"
+              >&nbsp</el-radio
+            >
+          </template>
+        </el-table-column>
+        <el-table-column prop="product_id" label="ID" min-width="50" />
+        <el-table-column label="商品图" min-width="70">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image
+                style="width: 36px; height: 36px"
+                :src="scope.row.image"
+                :preview-src-list="[scope.row.image]"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="store_name" label="商品名称" min-width="230" />
+        <el-table-column prop="stock" label="库存" min-width="70" />
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { goodLstApi, categorySelectApi } from "@/api/product";
+import { roterPre } from "@/settings";
+export default {
+  name: "EnergyList",
+  props: {
+    resellShow: {
+      type: Boolean,
+      default: false
+    },
+    isSeckill: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      templateRadio: 0,
+      merCateList: [],
+      roterPre: roterPre,
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 6,
+        cate_id: "",
+        store_name: "",
+        keyword: "",
+        is_gift_bag: 0,
+        status: 1,
+        is_ficti: this.isSeckill ? "" : 0,
+        is_action: this.isSeckill ? "" : 1
+      },
+      multipleSelection: {},
+      checked: []
+    };
+  },
+  mounted() {
+    this.getList();
+    this.getCategorySelect();
+    window.addEventListener("unload", e => this.unloadHandler(e));
+  },
+  methods: {
+    getTemplateRow(row) {
+      this.multipleSelection = { src: row.image, id: row.product_id };
+      this.dialogVisible = false;
+      this.$emit("getProduct", this.multipleSelection);
+    },
+    // 商户分类；
+    getCategorySelect() {
+      categorySelectApi()
+        .then(res => {
+          this.merCateList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表
+    getList() {
+      this.listLoading = true;
+      goodLstApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          // this.checked =
+          //   window.form_create_helper.get(this.$route.query.field) || [];
+          // this.tableData.data.forEach((item) => {
+          //   this.checked.forEach((element) => {
+          //     if (Number(item.product_id) === Number(element.id)) {
+          //       this.$nextTick(() => {
+          //         this.$refs.multipleTable.toggleRowSelection(item, true);
+          //       });
+          //     }
+          //   });
+          // });
+          this.listLoading = false;
+        })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList();
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.seachTiele {
+  line-height: 35px;
+}
+.fr {
+  float: right;
+}
+</style>
diff --git a/src/views/marketing/energy/energyGoods/index.vue b/src/views/marketing/energy/energyGoods/index.vue
new file mode 100644
index 0000000..8925314
--- /dev/null
+++ b/src/views/marketing/energy/energyGoods/index.vue
@@ -0,0 +1,1016 @@
+<template>
+  <div class="divBox">
+    <div class="selCard">
+      <el-form
+        :model="tableFrom"
+        ref="searchForm"
+        size="small"
+        label-width="85px"
+        :inline="true"
+      >
+        <el-form-item label="能量状态：" prop="seckill_status">
+          <el-select
+            v-model="tableFrom.seckill_status"
+            placeholder="请选择"
+            class="filter-item selWidth mr20"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in seckillStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品状态：" prop="us_status">
+          <el-select
+            v-model="tableFrom.us_status"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in productStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品标签：" prop="mer_labels">
+          <el-select
+            v-model="tableFrom.mer_labels"
+            placeholder="请选择"
+            class="filter-item selWidth"
+            clearable
+            filterable
+            @change="getList(1)"
+          >
+            <el-option
+              v-for="item in labelList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键字：" prop="keyword">
+          <el-input
+            v-model="tableFrom.keyword"
+            placeholder="请输入商品名称，关键字，产品编号"
+            clearable
+            class="selWidth"
+            @keyup.enter.native="getList(1)"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="getList(1)"
+            >搜索</el-button
+          >
+          <el-button size="small" @click="searchReset()">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-card class="mt14">
+      <el-tabs
+        v-model="tableFrom.type"
+        @tab-click="getList(1), getLstFilterApi()"
+      >
+        <el-tab-pane
+          v-for="(item, index) in headeNum"
+          :key="index"
+          :name="item.type.toString()"
+          :label="item.name + '(' + item.count + ')'"
+        />
+      </el-tabs>
+      <div class="mt5">
+        <router-link
+          :to="{ path: `${roterPre}` + '/marketing/energy/createGoods' }"
+        >
+          <el-button size="small" type="primary">
+            <i class="add">+</i> 添加能量商品
+          </el-button>
+        </router-link>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        class="mt20"
+        size="small"
+        :row-class-name="tableRowClassName"
+        @rowclick.stop="closeEdit"
+      >
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form
+              label-position="left"
+              inline
+              class="demo-table-expand demo-table-expand1"
+            >
+              <el-form-item label="品牌：">
+                <span class="mr10">{{
+                  props.row.brand ? props.row.brand.brand_name : "-"
+                }}</span>
+              </el-form-item>
+              <el-form-item label="市场价格：">
+                <span>{{ props.row.ot_price | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item label="成本价：">
+                <span>{{ props.row.cost | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item label="收藏：">
+                <span>{{ props.row.care_count | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item
+                v-if="tableFrom.type === '7'"
+                key="1"
+                label="未通过原因："
+              >
+                <span>{{ props.row.care_count | filterEmpty }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column prop="product_id" label="ID" min-width="50" />
+        <el-table-column label="商品图" min-width="80">
+          <template slot-scope="scope">
+            <div class="demo-image__preview">
+              <el-image
+                :src="scope.row.image"
+                :preview-src-list="[scope.row.image]"
+              />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="store_name" label="活动标题" min-width="120" />
+        <el-table-column prop="store_info" label="商品简介" min-width="120" />
+        <el-table-column prop="price" label="能量价" min-width="90" />
+        <el-table-column prop="sales" label="已售数量" min-width="90" />
+        <el-table-column label="限量剩余" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.stock - scope.row.sales }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="stock" label="能量状态" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.seckill_status | seckillStatusFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="能量活动日期" min-width="160">
+          <template slot-scope="scope">
+            <div>
+              开始日期：{{
+                scope.row.seckillActive && scope.row.seckillActive.start_day
+                  ? scope.row.seckillActive.start_day.slice(0, 10)
+                  : ""
+              }}
+            </div>
+            <div>
+              结束日期：{{
+                scope.row.seckillActive && scope.row.seckillActive.end_day
+                  ? scope.row.seckillActive.end_day.slice(0, 10)
+                  : ""
+              }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="能量活动时间" min-width="130">
+          <template slot-scope="scope">
+            <div>
+              开始时间：{{
+                scope.row.seckillActive
+                  ? scope.row.seckillActive.start_time + ":00"
+                  : ""
+              }}
+            </div>
+            <div>
+              结束时间：{{
+                scope.row.seckillActive
+                  ? scope.row.seckillActive.end_time + ":00"
+                  : ""
+              }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="tableFrom.type != 1"
+          prop="status"
+          label="上/下架"
+          min-width="80"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_show"
+              :active-value="1"
+              :inactive-value="0"
+              :width="55"
+              active-text="上架"
+              inactive-text="下架"
+              @change="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="stock" label="商品状态" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.us_status | productStatusFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" align="center" label="排序" min-width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.index === tabClickIndex">
+              <el-input
+                v-model.number="scope.row['sort']"
+                type="number"
+                maxlength="300"
+                size="mini"
+                autofocus
+                @blur="inputBlur(scope)"
+              />
+            </span>
+            <span v-else @dblclick.stop="tabClick(scope.row)">{{
+              scope.row["sort"]
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="200" fixed="right">
+          <template slot-scope="scope">
+            <router-link
+              v-if="tableFrom.type != 1"
+              :to="{
+                path:
+                  roterPre +
+                  '/marketing/seckill/createGoods/' +
+                  scope.row.product_id
+              }"
+            >
+              <el-button type="text" size="small" class="mr10">编辑</el-button>
+            </router-link>
+            <el-button
+              v-if="tableFrom.type !== '5'"
+              type="text"
+              size="small"
+              @click="handlePreview(scope.row.product_id)"
+              >预览</el-button
+            >
+            <el-button
+              v-if="tableFrom.type !== '5'"
+              type="text"
+              size="small"
+              @click="onEditLabel(scope.row)"
+              >编辑标签</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="goDetail(scope.row.product_id)"
+              >详情</el-button
+            >
+            <el-button
+              v-if="tableFrom.type === '5'"
+              type="text"
+              size="small"
+              @click="handleRestore(scope.row.product_id)"
+              >恢复商品</el-button
+            >
+            <el-button
+              v-if="
+                tableFrom.type !== '1' &&
+                  tableFrom.type !== '3' &&
+                  tableFrom.type !== '4'
+              "
+              type="text"
+              size="small"
+              @click="handleDelete(scope.row.product_id, scope.$index)"
+              >{{ tableFrom.type === "5" ? "删除" : "加入回收站" }}</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          background
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <el-dialog
+      v-if="dialogVisible"
+      title="能量商品详情"
+      center
+      :visible.sync="dialogVisible"
+      width="660px"
+    >
+      <div v-loading="loading" style="margin-top: 5px;">
+        <div class="box-container">
+          <div class="title">基本信息</div>
+          <div class="acea-row">
+            <div class="list sp100">
+              <label class="name">商品ID：</label>{{ formValidate.product_id }}
+            </div>
+            <div class="list sp100">
+              <label class="name">商品名称：</label
+              ><span>{{ formValidate.store_name }}</span>
+            </div>
+            <div class="list sp100 image">
+              <label class="name">商品图：</label>
+              <img
+                style="max-width: 150px; height: 80px;"
+                :src="formValidate.image"
+              />
+            </div>
+            <div class="list sp100">
+              <label class="name">商品信息:</label>
+              <!-- 单规格表格-->
+              <div v-if="formValidate.spec_type === 0">
+                <el-table :data="OneattrValue" size="small">
+                  <el-table-column
+                    align="center"
+                    label="能量价格"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <span>{{ scope.row["price"] }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    align="center"
+                    label="已售商品数量"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <span>{{ scope.row["sales"] }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+              <!-- 多规格表格-->
+              <div
+                v-if="formValidate.spec_type === 1"
+                class="labeltop"
+                label="规格列表："
+              >
+                <el-table
+                  :data="ManyAttrValue"
+                  height="250"
+                  size="small"
+                  tooltip-effect="dark"
+                  :row-key="
+                    row => {
+                      return row.id;
+                    }
+                  "
+                >
+                  <template v-if="manyTabDate">
+                    <el-table-column
+                      v-for="(item, iii) in manyTabDate"
+                      :key="iii"
+                      align="center"
+                      :label="manyTabTit[iii].title"
+                      min-width="80"
+                    >
+                      <template slot-scope="scope">
+                        <span class="priceBox" v-text="scope.row[iii]" />
+                      </template>
+                    </el-table-column>
+                  </template>
+                  <el-table-column
+                    align="center"
+                    label="能量价格"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <span>{{ scope.row["price"] }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    align="center"
+                    label="已售商品数量"
+                    min-width="80"
+                  >
+                    <template slot-scope="scope">
+                      <span>{{ scope.row["sales"] }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+          <div class="title" style="margin-top: 20px;">能量商品活动信息</div>
+          <div class="acea-row">
+            <div
+              v-if="
+                formValidate.mer_labels_data &&
+                  formValidate.mer_labels_data.length
+              "
+              class="list sp100"
+            >
+              <label class="name">商户标签：</label>
+              <template>
+                <span
+                  v-for="(item, index) in formValidate.mer_labels_data"
+                  :key="index"
+                  class="value-item"
+                >
+                  {{ item }}
+                </span>
+              </template>
+            </div>
+            <div class="list sp100">
+              <label class="name">能量简介：</label
+              >{{ formValidate.store_info }}
+            </div>
+            <div class="list sp100">
+              <label class="name">能量活动日期：</label
+              >{{ formValidate.start_day + "-" + formValidate.end_day }}
+            </div>
+            <div class="list sp100">
+              <label class="name">能量活动时间：</label
+              >{{ formValidate.start_time + "-" + formValidate.end_time }}
+            </div>
+            <div class="list sp100">
+              <label class="name">活动日期内最多购买次数：</label
+              >{{ formValidate.all_pay_count }}
+            </div>
+            <!-- <div class="list sp100">
+              <label class="name">能量时间段内最多购买次数：</label
+              >{{ formValidate.once_pay_count }}
+            </div> -->
+            <div class="list sp">
+              <label class="name">审核状态：</label
+              >{{
+                formValidate.status === 1
+                  ? "审核通过"
+                  : formValidate.status === 0
+                  ? "未审核"
+                  : "审核未通过"
+              }}
+            </div>
+            <div class="list sp">
+              <label class="name">商品状态：</label
+              >{{
+                formValidate.us_status === 1
+                  ? "上架显示"
+                  : formValidate.us_status === -1
+                  ? "平台关闭"
+                  : "下架"
+              }}
+            </div>
+            <div class="list sp">
+              <label class="name">能量活动状态：</label
+              >{{
+                formValidate.seckill_status === 0
+                  ? "未开始"
+                  : formValidate.seckill_status === 1
+                  ? "正在进行"
+                  : "已结束"
+              }}
+            </div>
+            <div class="list sp">
+              <label class="name">创建时间：</label
+              >{{ formValidate.create_time }}
+            </div>
+            <div style="color: red" class="list sp" v-if="formValidate.refusal">
+              <label style="color: red" class="name">审核拒绝原因：</label
+              >{{ formValidate.refusal }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <!--预览商品-->
+    <div v-if="previewVisible">
+      <div class="bg" @click.stop="previewVisible = false" />
+      <preview-box
+        v-if="previewVisible"
+        ref="previewBox"
+        :goods-id="goodsId"
+        :product-type="1"
+        :preview-key="previewKey"
+      />
+    </div>
+    <!--编辑标签-->
+    <el-dialog
+      v-if="dialogLabel"
+      title="选择标签"
+      :visible.sync="dialogLabel"
+      width="470px"
+      :before-close="handleClose"
+    >
+      <el-form ref="labelForm" :model="labelForm" @submit.native.prevent>
+        <el-form-item>
+          <el-select
+            v-model="labelForm.mer_labels"
+            clearable
+            multiple
+            size="small"
+            placeholder="请选择"
+            style="width: 100%;"
+          >
+            <el-option
+              v-for="item in labelList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id.toString()"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogLabel = false">取消</el-button>
+        <el-button type="primary" size="small" @click="submitForm('labelForm')"
+          >提交</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  seckillProductLstApi,
+  spikeProductDeleteApi,
+  categorySelectApi,
+  spikelstFilterApi,
+  spikeStatusApi,
+  categoryListApi,
+  spikeDestoryApi,
+  spikeRestoreApi,
+  updatetSeckillLabel,
+  getProductLabelApi
+} from "@/api/product";
+import { seckillProSort, seckillDetailApi } from "@/api/marketing";
+import previewBox from "@/components/previewBox/index";
+import { roterPre } from "@/settings";
+const defaultObj = {
+  product_id: "",
+  image: "",
+  slider_image: [],
+  store_name: "",
+  store_info: "",
+  start_day: "",
+  end_day: "",
+  start_time: "",
+  end_time: "",
+  is_open_recommend: 1,
+  is_open_state: 1,
+  is_show: 1,
+  seckill_status: "",
+  keyword: "",
+  brand_id: "", // 品牌id
+  cate_id: "", // 平台分类id
+  mer_cate_id: [], // 商户分类id
+  unit_name: "",
+  integral: 0,
+  sort: 0,
+  is_good: 0,
+  temp_id: "",
+  seckill_date: "",
+  finalPayment_date: "",
+  delivery_type: 1,
+  delivery_day: 10,
+  create_time: "",
+  attrValue: [
+    {
+      image: "",
+      price: null,
+      cost: null,
+      ot_price: null,
+      old_stock: null,
+      stock: null,
+      bar_code: "",
+      weight: null,
+      volume: null
+    }
+  ],
+  attr: [],
+  extension_type: 0,
+  content: "",
+  spec_type: 0,
+  is_gift_bag: 0,
+  tattend_two: {},
+  tattend_one: {}
+};
+export default {
+  name: "EnergyList",
+  components: { previewBox },
+  data() {
+    return {
+      props: {
+        emitPath: false
+      },
+      roterPre: roterPre,
+      headeNum: [],
+      listLoading: true,
+      labelLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      seckillStatusList: [
+        { label: "正在进行", value: 2 },
+        { label: "活动已结束", value: 3 },
+        { label: "活动未开始", value: 1 }
+      ],
+      productStatusList: [
+        { label: "上架显示", value: 1 },
+        { label: "下架", value: 0 },
+        { label: "平台关闭", value: -1 }
+      ],
+      labelList: [],
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        mer_cate_id: "",
+        cate_id: "",
+        mer_labels: "",
+        keyword: "",
+        type: this.$route.query.type ? this.$route.query.type : "1",
+        seckill_status: "",
+        us_status: "",
+        product_id: this.$route.query.id ? this.$route.query.id : ""
+      },
+      categoryList: [], // 平台
+      merCateList: [], // 商户分类筛选
+      modals: false,
+      dialogVisible: false,
+      manyTabTit: {},
+      manyTabDate: {},
+      formValidate: Object.assign({}, defaultObj),
+      OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
+      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+      attrInfo: {},
+      tabClickIndex: "",
+      previewVisible: false,
+      goodsId: "",
+      previewKey: "",
+      dialogLabel: false,
+      labelForm: {}
+    };
+  },
+  mounted() {
+    this.getLstFilterApi();
+    this.getCategorySelect();
+    this.getCategoryList();
+    this.getLabelLst();
+    this.getList("");
+  },
+  methods: {
+    /**重置 */
+    searchReset() {
+      this.$refs.searchForm.resetFields();
+      this.getList(1);
+    },
+    // 把每一行的索引放进row
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex;
+    },
+    // 添加明细原因 row 当前行 column 当前列
+    tabClick(row) {
+      this.tabClickIndex = row.index;
+    },
+    // 失去焦点初始化
+    inputBlur(scope) {
+      if (!scope.row.sort || scope.row.sort < 0) scope.row.sort = 0;
+      seckillProSort(scope.row.product_id, { sort: scope.row.sort })
+        .then(res => {
+          this.closeEdit();
+        })
+        .catch(res => {});
+    },
+    closeEdit() {
+      this.tabClickIndex = null;
+    },
+    handleClose() {
+      this.dialogLabel = false;
+    },
+    // 获取标签项
+    getLabelLst() {
+      getProductLabelApi()
+        .then(res => {
+          this.labelList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    handleRestore(id) {
+      this.$modalSure("恢复商品").then(() => {
+        spikeRestoreApi(id)
+          .then(res => {
+            this.$message.success(res.message);
+            this.getLstFilterApi();
+            this.getList("");
+          })
+          .catch(res => {
+            this.$message.error(res.message);
+          });
+      });
+    },
+    // 商户分类；
+    getCategorySelect() {
+      categorySelectApi()
+        .then(res => {
+          this.merCateList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 平台分类；
+    getCategoryList() {
+      categoryListApi()
+        .then(res => {
+          this.categoryList = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    // 列表表头；
+    getLstFilterApi() {
+      spikelstFilterApi()
+        .then(res => {
+          this.headeNum = res.data;
+        })
+        .catch(res => {
+          this.$message.error(res.message);
+        });
+    },
+    watCh(val) {
+      const tmp = {};
+      const tmpTab = {};
+      this.formValidate.attr.forEach((o, i) => {
+        tmp["value" + i] = { title: o.value };
+        tmpTab["value" + i] = "";
+      });
+      this.ManyAttrValue.forEach((val, index) => {
+        const key = Object.values(val.detail)
+          .sort()
+          .join("/");
+        if (this.attrInfo[key]) this.ManyAttrValue[index] = this.attrInfo[key];
+      });
+      this.attrInfo = {};
+      this.ManyAttrValue.forEach(val => {
+        this.attrInfo[
+          Object.values(val.detail)
+            .sort()
+            .join("/")
+        ] = val;
+      });
+      this.manyTabTit = tmp;
+      this.manyTabDate = tmpTab;
+      // this.formThead = Object.assign({}, this.formThead, tmp);
+    },
+    // 查看详情
+    goDetail(id) {
+      this.dialogVisible = true;
+      this.loading = true;
+      this.formValidate = {};
+      seckillDetailApi(id)
+        .then(async res => {
+          this.loading = false;
+          const info = res.data;
+          this.formValidate = {
+            product_id: info.product_id,
+            image: info.image,
+            slider_image: info.slider_image,
+            store_name: info.store_name,
+            store_info: info.store_info,
+            start_time:
+              info.seckillActive && info.seckillActive.start_time
+                ? info.seckillActive.start_time + ":00:00"
+                : "",
+            end_time:
+              info.seckillActive && info.seckillActive.end_time
+                ? info.seckillActive.end_time + ":00:00"
+                : "",
+            start_day:
+              info.seckillActive && info.seckillActive.start_day
+                ? info.seckillActive.start_day.slice(0, 10)
+                : "",
+            end_day:
+              info.seckillActive && info.seckillActive.end_day
+                ? info.seckillActive.end_day.slice(0, 10)
+                : "",
+            mer_labels_data: info.mer_labels_data,
+            brand_id: info.brand_id, // 品牌id
+            cate_id: info.cate_id ? info.cate_id : "", // 平台分类id
+            mer_cate_id: info.mer_cate_id, // 商户分类id
+            unit_name: info.unit_name,
+            sort: info.sort,
+            is_good: info.is_good,
+            temp_id: info.temp_id,
+            is_show: info.is_show,
+            attr: info.attr,
+            extension_type: info.extension_type,
+            content: info.content,
+            spec_type: info.spec_type,
+            is_gift_bag: info.is_gift_bag,
+            create_time: info.create_time,
+            product_status: info.product_status,
+            status: info.status,
+            all_pay_count: info.seckillActive
+              ? info.seckillActive.all_pay_count
+              : "",
+            once_pay_count: info.seckillActive
+              ? info.seckillActive.once_pay_count
+              : "",
+            stock: info.stock,
+            stock_count: info.stock_count,
+            seckill_status: info.seckill_status,
+            us_status: info.us_status,
+            refusal: info.refusal
+          };
+          if (this.formValidate.spec_type === 0) {
+            this.OneattrValue = info.attrValue;
+          } else {
+            this.ManyAttrValue = info.attrValue;
+            this.watCh(this.formValidate.attr);
+          }
+          console.log(this.ManyAttrValue);
+          this.fullscreenLoading = false;
+          this.formValidate.seckill_date = [info.start_time, info.end_time];
+        })
+        .catch(res => {
+          this.fullscreenLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    // 编辑标签
+    onEditLabel(row) {
+      this.dialogLabel = true;
+      this.labelLoading = true;
+      this.product_id = row.product_id;
+      this.labelForm = {
+        mer_labels: row.mer_labels
+      };
+    },
+    submitForm(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          updatetSeckillLabel(this.product_id, this.labelForm).then(
+            ({ message }) => {
+              this.$message.success(message);
+              this.getList("");
+              this.dialogLabel = false;
+            }
+          );
+        } else {
+          return;
+        }
+      });
+    },
+    // 预览
+    handlePreview(id) {
+      this.previewVisible = true;
+      this.goodsId = id;
+      this.previewKey = "";
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num || this.tableFrom.page;
+      seckillProductLstApi(this.tableFrom)
+        .then(res => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch(res => {
+          this.listLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList("");
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList("");
+    },
+    // 删除
+    handleDelete(id, idx) {
+      this.$modalSure(
+        this.tableFrom.type !== "5" ? "加入回收站" : "删除该商品"
+      ).then(() => {
+        this.tableFrom.type === "5"
+          ? spikeDestoryApi(id)
+              .then(({ message }) => {
+                this.$message.success(message);
+                this.getList("");
+                this.getLstFilterApi();
+              })
+              .catch(({ message }) => {
+                this.$message.error(message);
+              })
+          : spikeProductDeleteApi(id)
+              .then(({ message }) => {
+                this.$message.success(message);
+                this.getList("");
+                this.getLstFilterApi();
+              })
+              .catch(({ message }) => {
+                this.$message.error(message);
+              });
+      });
+    },
+    onchangeIsShow(row) {
+      spikeStatusApi(row.product_id, row.is_show)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList("");
+          this.getLstFilterApi();
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.bg {
+  z-index: 100;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.1);
+}
+.goods_detail .goods_detail_wrapper {
+  z-index: -10;
+}
+::v-deep table .el-input__inner {
+  padding: 0;
+}
+.add {
+  font-style: normal;
+  position: relative;
+  top: -1.2px;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand1 ::v-deep label {
+  width: 77px !important;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 33.33%;
+}
+.box-container {
+  overflow: hidden;
+}
+.box-container .list {
+  float: left;
+  margin-top: 15px;
+}
+.box-container .sp {
+  width: 50%;
+  font-size: 13px;
+}
+.box-container .sp3 {
+  width: 33.3333%;
+}
+.box-container .sp100 {
+  width: 100%;
+  font-size: 13px;
+}
+.box-container .list .name {
+  display: inline-block;
+  color: #606266;
+}
+.box-container .list .blue {
+  color: var(--prev-color-primary);
+}
+.box-container .list.image {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
+.labeltop {
+  max-height: 280px;
+  overflow-y: auto;
+}
+.title {
+  color: #17233d;
+  font-size: 14px;
+  font-weight: bold;
+  line-height: 15px;
+  padding-left: 5px;
+  border-left: 3px solid var(--prev-color-primary);
+}
+</style>
diff --git a/src/views/marketing/energy/index.vue b/src/views/marketing/energy/index.vue
new file mode 100644
index 0000000..98240ae
--- /dev/null
+++ b/src/views/marketing/energy/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>