From 1b96cb80cad3e5dc1600adbdf557ca263e0a585e Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 18 Nov 2023 18:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/marketing.js                          |   96 +
 src/api/product.js                            |    6 +
 src/router/modules/marketing.js               |   36 +
 src/utils/timeOptions.js                      |   62 +
 .../integral/addProduct/copyRecord.vue        |  102 +
 .../marketing/integral/addProduct/index.vue   | 1715 +++++++++++++++++
 .../marketing/integral/classify/index.vue     |  143 ++
 .../marketing/integral/orderList/index.vue    |  560 ++++++
 .../integral/orderList/orderDetails.vue       |  622 ++++++
 .../integral/productList/goodsList.vue        |  153 ++
 .../marketing/integral/productList/index.vue  |  256 +++
 src/views/order/index.vue                     |    3 +-
 12 files changed, 3753 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/timeOptions.js
 create mode 100644 src/views/marketing/integral/addProduct/copyRecord.vue
 create mode 100644 src/views/marketing/integral/addProduct/index.vue
 create mode 100644 src/views/marketing/integral/classify/index.vue
 create mode 100644 src/views/marketing/integral/orderList/index.vue
 create mode 100644 src/views/marketing/integral/orderList/orderDetails.vue
 create mode 100644 src/views/marketing/integral/productList/goodsList.vue
 create mode 100644 src/views/marketing/integral/productList/index.vue

diff --git a/src/api/marketing.js b/src/api/marketing.js
index c678776..de47655 100644
--- a/src/api/marketing.js
+++ b/src/api/marketing.js
@@ -488,3 +488,99 @@ export function holdIntegralList(data) {
 export function holdIntegralTitleApi() {
   return request.get(`integral/hold_list_title`)
 }
+
+// 积分商品分类 -- 列表
+export function integralCategoryListApi() {
+  return request.get('points/cate/lst')
+}
+// 积分商品分类 -- 新增表单
+export function integralCategoryCreateApi() {
+  return request.get('points/cate/create/form')
+}
+
+// 积分商品分类 -- 编辑表单
+export function integralCategoryUpdateApi(id) {
+  return request.get(`points/cate/update/form/${id}`)
+}
+
+// 积分商品分类 -- 删除
+export function integralCategoryDeleteApi(id) {
+  return request.delete(`points/cate/delete/${id}`)
+}
+
+// 积分商品分类 -- 修改状态
+export function integralCategoryStatusApi(id, status) {
+  return request.post(`points/cate/status/${id}`, {status})
+}
+
+// 积分商品 -- 商品列表
+export function integralProList(data) {
+  return request.get(`points/product/lst`, data)
+}
+
+// 积分商品 -- 删除
+export function integralProDeleteApi(id) {
+  return request.delete(`points/product/delete/${id}`)
+}
+
+// 积分商品 -- 修改状态
+export function integralProductStatusApi(id, status) {
+  return request.post(`points/product/status/${id}`, {status})
+}
+
+// 积分商品 -- 创建商品
+export function createIntegralProduct(data) {
+  return request.post(`points/product/create`, data)
+}
+// 积分商品 -- 商品详情
+export function integralProDetailApi(id) {
+  return request.get(`points/product/detail/${id}`)
+}
+// 积分商品 -- 商品分类选择
+export function integralProCateSelect() {
+  return request.get(`points/cate/select`)
+}
+// 积分商品 -- 编辑商品
+export function integralProUpdateApi(id, data) {
+  return request.post(`points/product/update/${id}`, data)
+}
+// 积分商品列表 -- 立即生成规格
+export function generateAttrApi(id, data) {
+  return request.post(`points/product/get_attr_value/${id}`, data)
+}
+// 积分订单 -- 列表
+export function integralOrderLstApi(data) {
+  return request.get(`points/order/lst`, data)
+}
+// 积分订单 -- 导出
+export function integralOrderExcelApi(data) {
+  return request.get(`points/order/excel`, data)
+}
+// 积分订单 -- 快递公司列表
+export function expressOptionsApi(data) {
+  return request.get(`expr/options`)
+}
+// 积分订单 -- 发货
+export function integralDelivery(id, data) {
+  return request.post(`points/order/delivery/${id}`, data)
+}
+// 积分订单 -- 删除
+export function integralOrderDeleteApi(id) {
+  return request.delete(`points/order/delete/${id}`)
+}
+// 积分订单 -- 快递查询
+export function integralOrderExpressApi(id) {
+  return request.get(`points/order/express/${id}`)
+}
+// 积分订单 -- 详情
+export function integralOrderDetailApi(id) {
+  return request.get(`points/order/detail/${id}`)
+}
+// 积分订单 -- 订单记录
+export function integralOrderLog(id, data) {
+  return request.get(`points/order/status/${id}`, data)
+}
+// 积分订单 -- 备注
+export function integralMarkApi(id) {
+  return request.get(`points/order/mark/${id}/form`)
+}
diff --git a/src/api/product.js b/src/api/product.js
index 233c21c..b37529b 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -140,6 +140,12 @@ export function categorySelectApi() {
 export function categoryListApi() {
   return request.get(`store/category/list`)
 }
+/**
+ * @description 商户商品列表 -- 选择弹窗
+ */
+export function merProductLstApi(data) {
+  return request.get(`store/product/list`, data)
+}
 /**
  * @description 商品列表 -- 品牌分类
  */
diff --git a/src/router/modules/marketing.js b/src/router/modules/marketing.js
index 5ce7727..73a1f47 100644
--- a/src/router/modules/marketing.js
+++ b/src/router/modules/marketing.js
@@ -302,6 +302,42 @@ const marketingRouter =
           },
           component: () => import('@/views/marketing/integral/log/index')
         },
+        {
+          path: 'classify',
+          name: `integralClassify`,
+          meta: {
+            title: '积分商品分类',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/integral/classify/index')
+        },
+        {
+          path: 'proList',
+          name: `integralProductList`,
+          meta: {
+            title: '积分商品列表',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/integral/productList/index')
+        },
+        {
+          path: 'addProduct/:id?/:edit?',
+          name: `addIntegralProduct`,
+          meta: {
+            title: '添加积分商品',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/integral/addProduct/index')
+        },
+        {
+          path: 'orderList',
+          name: `IntegralOrderList`,
+          meta: {
+            title: '兑换记录',
+            noCache: true
+          },
+          component: () => import('@/views/marketing/integral/orderList/index')
+        },
         {
           path: 'give',
           name: `integralGive`,
diff --git a/src/utils/timeOptions.js b/src/utils/timeOptions.js
new file mode 100644
index 0000000..f3a7155
--- /dev/null
+++ b/src/utils/timeOptions.js
@@ -0,0 +1,62 @@
+
+export default {
+  shortcuts: [
+    {
+      text: '今天',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()));
+        picker.$emit('pick', [start, end]);
+      },
+    },
+    {
+      text: '昨天',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(
+          start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 1)),
+        );
+        end.setTime(end.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 1)));
+        picker.$emit('pick', [start, end]);
+      },
+    },
+    {
+      text: '最近7天',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        picker.$emit('pick', [start, end]);
+      },
+    },
+    {
+      text: '最近30天',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        picker.$emit('pick', [start, end]);
+      },
+    },
+    {
+      text: '本月',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), 1)));
+        picker.$emit('pick', [start, end]);
+      },
+    },
+    {
+      text: '本年',
+      onClick(picker) {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.setTime(new Date(new Date().getFullYear(), 0, 1)));
+        picker.$emit('pick', [start, end]);
+      },
+    },
+  ],
+};
diff --git a/src/views/marketing/integral/addProduct/copyRecord.vue b/src/views/marketing/integral/addProduct/copyRecord.vue
new file mode 100644
index 0000000..05be5fc
--- /dev/null
+++ b/src/views/marketing/integral/addProduct/copyRecord.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog v-if="showRecord" title="复制记录" :visible.sync="showRecord" width="900px">
+    <div v-loading="loading">
+      <el-table
+        v-loading="loading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="mini"
+        class="table"
+        highlight-current-row
+      >
+        <el-table-column label="ID" prop="mer_id" min-width="50" />
+        <el-table-column label="使用次数" prop="num" min-width="80" />
+        <el-table-column label="复制商品平台名称" prop="type" min-width="120" />
+        <el-table-column label="剩余次数" prop="number" min-width="80" />
+        <el-table-column label="商品复制链接" prop="info" min-width="180" />
+        <el-table-column label="操作时间" prop="create_time" min-width="120" />
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[10, 20]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import { productCopyRecordApi } from '@/api/product'
+export default {
+  name: 'CopyRecord',
+  data() {
+    return {
+      showRecord: false,
+      loading: false,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 10
+      }
+    }
+  },
+
+  methods: {
+    getRecord() {
+      this.showRecord = true
+      this.loading = true
+      productCopyRecordApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list
+          this.tableData.total = res.data.count
+          this.loading = false
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+          this.listLoading = false
+        })
+    },
+
+    pageChange(page) {
+      this.tableFrom.page = page
+      this.getRecord()
+    },
+    pageChangeLog(page) {
+      this.tableFromLog.page = page
+      this.getRecord()
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val
+      this.getRecord()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.title {
+  margin-bottom: 16px;
+  color: #17233d;
+  font-weight: 500;
+  font-size: 14px;
+}
+.description {
+  &-term {
+    display: table-cell;
+    padding-bottom: 10px;
+    line-height: 20px;
+    width: 50%;
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/src/views/marketing/integral/addProduct/index.vue b/src/views/marketing/integral/addProduct/index.vue
new file mode 100644
index 0000000..6b7618c
--- /dev/null
+++ b/src/views/marketing/integral/addProduct/index.vue
@@ -0,0 +1,1715 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div class="clearfix">
+        <el-tabs v-if="headTab.length > 0" v-model="currentTab">
+          <el-tab-pane
+            v-for="(item, index) in headTab"
+            :key="index"
+            :name="item.name"
+            :label="item.title"
+          />
+        </el-tabs>
+      </div>
+      <el-form
+        ref="formValidate"
+        :key="currentTab"
+        v-loading="fullscreenLoading"
+        class="formValidate mt20"
+        :rules="ruleValidate"
+        :model="formValidate"
+        label-width="160px"
+        @submit.native.prevent
+      >
+        <el-row v-if="currentTab == '1'" :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="商品标题：" prop="store_name">
+              <el-input
+                v-model="formValidate.store_name"
+                placeholder="请输入商品标题"
+                class="selWidth"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品分类：" prop="cate_id">
+              <el-select
+                v-model="formValidate.cate_id"
+                placeholder="请选择"
+                class="selWidth"
+              >
+                <el-option
+                  v-for="item in categoryList"
+                  :key="item.store_category_id"
+                  :label="item.cate_name"
+                  :value="item.store_category_id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品封面图：" prop="image">
+              <div
+                class="upLoadPicBox"
+                title="750*750px"
+                @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="uploadCont"
+                  title="750*750px"
+                >
+                  <div class="upLoadPicBox" @click="modalPicTap('2')">
+                    <div class="upLoad">
+                      <i class="el-icon-camera cameraIconfont" />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid2">
+            <el-form-item label="用户兑换总数量限制：" prop="once_max_count">
+              <el-input-number
+                v-model="formValidate.once_max_count"
+                :min="1"
+                placeholder="请输入排序序号"
+                style="width: 200px;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="单位：" prop="unit_name">
+              <el-input
+                v-model="formValidate.unit_name"
+                placeholder="请输入单位"
+                class="selWidth"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序：">
+              <el-input-number
+                v-model="formValidate.sort"
+                placeholder="请输入排序序号"
+                style="width: 200px;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="上架状态：" props="is_used" required>
+              <el-radio-group
+                v-model="formValidate.is_used"
+              >
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="好物精选：" props="is_hot" required>
+              <el-radio-group
+                v-model="formValidate.is_hot"
+              >
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品关键字：">
+              <el-input
+                v-model="formValidate.keyword"
+                placeholder="请输入商品关键字"
+                class="selWidth"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品简介：" prop="store_info">
+              <el-input
+                v-model="formValidate.store_info"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入商品简介"
+                class="selWidth"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 规格设置 -->
+        <el-row v-if="currentTab == '2'">
+          <el-col :span="24">
+            <el-form-item label="商品规格：" props="spec_type">
+              <el-radio-group
+                v-model="formValidate.spec_type"
+                @change="onChangeSpec(formValidate.spec_type)"
+              >
+                <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.spec_type === 1" :span="24" class="noForm">
+            <!-- <el-form-item label="设置规格：">
+              <div class="acea-row">
+                <el-select v-model="selectRule">
+                  <el-option
+                    v-for="item in ruleList"
+                    :key="item.attr_template_id"
+                    :label="item.template_name"
+                    :value="item.attr_template_id"
+                  />
+                </el-select>
+                <el-button
+                  type="primary"
+                  class="ml15"
+                  size="small"
+                  @click="confirm"
+                >确认</el-button>
+                <el-button
+                  class="ml15"
+                  size="small"
+                  @click="addRule"
+                >添加规格模板</el-button>
+              </div>
+            </el-form-item> -->
+            <el-form-item v-if="formValidate.attr.length > 0">
+              <div v-for="(item, index) in formValidate.attr" :key="index">
+                <div class="acea-row row-middle">
+                  <span class="mr5">{{ item.value }}</span>
+                  <i
+                    class="el-icon-circle-close"
+                    @click="handleRemoveAttr(index)"
+                  />
+                </div>
+                <div class="rulesBox">
+                  <el-tag
+                    v-for="(j, indexn) in item.detail"
+                    :key="indexn"
+                    closable
+                    size="medium"
+                    :disable-transitions="false"
+                    class="mb5 mr10"
+                    @close="handleClose(item.detail, indexn)"
+                  >{{ j }}
+                  </el-tag>
+                  <el-input
+                    v-if="item.inputVisible"
+                    ref="saveTagInput"
+                    v-model="item.detail.attrsVal"
+                    class="input-new-tag"
+                    size="small"
+                    @keyup.enter.native="
+                      createAttr(item.detail.attrsVal, index)
+                    "
+                    @blur="createAttr(item.detail.attrsVal, index)"
+                  />
+                  <el-button
+                    v-else
+                    class="button-new-tag"
+                    size="small"
+                    @click="showInput(item)"
+                  >+ 添加</el-button>
+                </div>
+              </div>
+            </el-form-item>
+            <el-col v-if="isBtn">
+              <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
+                <el-form-item label="规格：">
+                  <el-input
+                    v-model="formDynamic.attrsName"
+                    placeholder="请输入规格"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="9" :md="9" :sm="24" :xs="24">
+                <el-form-item label="规格值：">
+                  <el-input
+                    v-model="formDynamic.attrsVal"
+                    placeholder="请输入规格值"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="12" :lg="6" :md="6" :sm="24" :xs="24">
+                <el-form-item class="noLeft">
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="createAttrName"
+                  >确定</el-button>
+                  <el-button size="small" @click="offAttrName">取消</el-button>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-form-item v-if="!isBtn" label="设置规格：">
+              <el-button
+                type="primary"
+                icon="md-add"
+                size="small"
+                @click="addBtn"
+              >添加新规格</el-button>
+              <el-button
+                type="success"
+                icon="md-add"
+                size="small"
+                @click="generate"
+              >立即生成</el-button>
+            </el-form-item>
+          </el-col>
+          <!-- 批量设置-->
+          <el-col
+            v-if="(formValidate.spec_type === 1 && formValidate.attr.length > 0 && $route.params.id) || (!$route.params.id && createProduct)"
+            :span="24"
+            class="noForm"
+          >
+            <el-form-item label="批量设置：" class="labeltop">
+              <el-table
+                :data="oneFormBatch"
+                border
+                class="tabNumWidth"
+                size="mini"
+              >
+                <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"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else-if="formThead[iii].title === '兑换积分'"
+                        v-model.number="scope.row[iii]"
+                        type="number"
+                        oninput="value=value.replace(/[^0-9]/g,'')"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else
+                        v-model="scope.row[iii]"
+                        type="number"
+                        min="0"
+                        class="priceBox"
+                      />
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" 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-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+            <!-- 单规格表格-->
+            <el-form-item v-if="formValidate.spec_type === 0">
+              <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">
+                    <div>
+                      <el-input
+                        v-if="formThead[iii].title === '商品编号'"
+                        v-model="scope.row[iii]"
+                        type="text"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else-if="formThead[iii].title === '兑换积分'"
+                        v-model.number="scope.row[iii]"
+                        type="number"
+                        oninput="value=value.replace(/[^0-9]/g,'')"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else
+                        v-model="scope.row[iii]"
+                        type="number"
+                        :min="0"
+                        class="priceBox"
+                      />
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+            <!-- 多规格表格-->
+            <el-form-item
+              v-if="(formValidate.spec_type === 1 && formValidate.attr.length > 0 && $route.params.id) || (!$route.params.id && createProduct)"
+              class="labeltop"
+              label="规格列表："
+            >
+              <el-table
+                :data="ManyAttrValue"
+                border
+                class="tabNumWidth"
+                size="mini"
+                key="2"
+              >
+                <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"
+                      title="750*750px"
+                      @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">
+                    <div>
+                      <el-input
+                        v-if="formThead[iii].title === '商品编号'"
+                        v-model="scope.row[iii]"
+                        type="text"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else-if="formThead[iii].title === '兑换积分'"
+                        v-model.number="scope.row[iii]"
+                        type="number"
+                        oninput="value=value.replace(/[^0-9]/g,'')"
+                        class="priceBox"
+                      />
+                      <el-input
+                        v-else
+                        v-model="scope.row[iii]"
+                        :min="0"
+                        class="priceBox"
+                        type="number"
+                      />
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  key="3"
+                  align="center"
+                  label="操作"
+                  min-width="80"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      type="text"
+                      class="submission"
+                      size="small"
+                      @click="delAttrTable(scope.$index)"
+                    >删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 商品详情-->
+        <el-row v-if="currentTab == '3'">
+          <el-col :span="24">
+            <el-form-item label="商品详情：">
+              <vue-ueditor-wrap
+                v-model="formValidate.content"
+                :config="myConfig"
+                @beforeInit="addCustomDialog"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item style="margin-top:30px;">
+          <el-button
+            v-show="currentTab > 1"
+            type="primary"
+            size="small"
+            @click="handleSubmitUp"
+          >上一步
+          </el-button>
+          <el-button
+            v-show="currentTab < 3"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmitNest('formValidate')"
+          >下一步
+          </el-button>
+          <el-button
+            v-show="currentTab == '3' || $route.params.id"
+            :loading="loading"
+            type="primary"
+            class="submission"
+            size="small"
+            @click="handleSubmit('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>
+    <!--预览商品-->
+    <div v-if="previewVisible">
+      <div class="bg" @click.stop="previewVisible = false" />
+      <preview-box
+        v-if="previewVisible"
+        ref="previewBox"
+        :preview-key="previewKey"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import ueditorFrom from '@/components/ueditorFrom'
+import VueUeditorWrap from 'vue-ueditor-wrap'
+import Sortable from 'sortablejs'
+import {
+  createIntegralProduct,
+  integralProDetailApi,
+  integralProCateSelect,
+  integralProUpdateApi,
+  generateAttrApi
+} from '@/api/marketing'
+import { roterPre } from '@/settings'
+import previewBox from '@/components/previewBox/index'
+import attrList from "@/components/attrList";
+import SettingMer from '@/libs/settingMer'
+import { getToken } from '@/utils/auth'
+import copyRecord from './copyRecord'
+import { mateName } from '@/utils'
+const defaultObj = {
+  image: '',
+  slider_image: [],
+  store_name: '',
+  store_info: '',
+  keyword: '',
+  cate_id: '', // 平台分类id
+  param_temp_id: [],
+  unit_name: '',
+  sort: 0,
+  once_max_count: 0,
+  is_hot: 0,
+  is_used: 0,
+  attrValue: [
+    {
+      image: '',
+      price: null,
+      cost: null,
+      ot_price: null,
+      select: false,
+      stock: null,
+      bar_code: '',
+      weight: null,
+      volume: null
+    }
+  ],
+  attr: [],
+  content: '',
+  spec_type: 0,
+  type: 0,
+  product_type: 0
+}
+const objTitle = {
+  cost: {
+    title: '市场价'
+  },
+  ot_price: {
+    title: '兑换积分'
+  },
+  price: {
+    title: '兑换金额'
+  },
+  stock: {
+    title: '库存'
+  },
+  bar_code: {
+    title: '商品编号'
+  },
+  weight: {
+    title: '重量（KG）'
+  },
+  volume: {
+    title: '体积(m³)'
+  }
+}
+export default {
+  name: 'IntegralProductAdd',
+  components: {
+    ueditorFrom,
+    VueUeditorWrap,
+    previewBox,
+    attrList,
+    copyRecord
+  },
+  data() {
+    const url =
+      SettingMer.https + '/upload/image/0/file?ueditor=1&token=' + getToken()
+    return {
+      myConfig: {
+        autoHeightEnabled: false, // 编辑器不自动被内容撑高
+        initialFrameHeight: 500, // 初始容器高度
+        initialFrameWidth: '100%', // 初始容器
+        enableAutoSave: false,
+        UEDITOR_HOME_URL: '/UEditor/',
+        serverUrl: url,
+        imageUrl: url,
+        imageFieldName: 'file',
+        imageUrlPrefix: '',
+        imageActionName: 'upfile',
+        imageMaxSize: 2048000,
+        imageAllowFiles: ['.png', '.jpg', '.jpeg', '.gif', '.bmp']
+      },
+      roterPre: roterPre,
+      selectRule: '',
+      checkboxGroup: [],
+      tabs: [],
+      fullscreenLoading: false,
+      props: { emitPath: false },
+      propsMer: { emitPath: true },
+      active: 0,
+      deduction_set: -1,
+      OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
+      ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+      ruleList: [],
+      categoryList: [], // 分类筛选
+      deliveryList: [],
+      labelList: [], // 商品标签
+      formThead: Object.assign({}, objTitle),
+      formValidate: Object.assign({}, defaultObj),
+      picValidate: true,
+      formDynamics: {
+        template_name: '',
+        template_value: []
+      },
+      manyTabTit: {},
+      manyTabDate: {},
+      grid2: {
+        xl: 10,
+        lg: 12,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      // 规格数据
+      formDynamic: {
+        attrsName: '',
+        attrsVal: ''
+      },
+      isBtn: false,
+      images: [],
+      currentTab: '1',
+      grid: {
+        xl: 8,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      loading: false,
+      ruleValidate: {
+        store_name: [
+          { required: true, message: '请输入商品名称', trigger: 'blur' }
+        ],
+        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' }
+        ],
+        once_max_count: [
+          { required: true, message: '请输入限购数量', trigger: 'change' }
+        ],
+        image: [{ required: true, message: '请上传商品图', trigger: 'change' }],
+        slider_image: [
+          {
+            required: true,
+            message: '请上传商品轮播图',
+            type: 'array',
+            trigger: 'change'
+          }
+        ],
+        spec_type: [
+          { required: true, message: '请选择商品规格', trigger: 'change' }
+        ],
+        delivery_way: [
+          { required: true, message: '请选择送货方式', trigger: 'change' }
+        ]
+      },
+      attrInfo: {},
+      previewVisible: false,
+      previewKey: '',
+      headTab: [
+        { title: '商品信息', name: '1' },
+        { title: '规格设置', name: '2' },
+        { title: '商品详情', name: '3' },
+      ],
+      type: 0,
+      attrVal: {
+        price: null,
+        cost: null,
+        ot_price: null,
+        stock: null,
+        bar_code: '',
+        weight: null,
+        volume: null
+      },
+      attrs: [],
+      attrsList:[],
+			activeAtter:[],
+      attrShow: false,
+      isGenerate: false,
+      createProduct: false,
+      generateArr: [],
+      createCount: this.$route.params.id ? 0 : -10
+    }
+  },
+  computed: {
+    attrValue() {
+      const obj = Object.assign({}, this.attrVal)
+      return obj
+    },
+    oneFormBatch() {
+      const obj = [Object.assign({}, defaultObj.attrValue[0])]
+      if (this.OneattrValue[0] && this.OneattrValue[0]['image']) { obj[0]['image'] = this.OneattrValue[0]['image'] }
+      obj[0]['attr'] = '全部'
+      delete obj[0].bar_code
+      return obj
+    }
+  },
+  watch: {
+    'formValidate.attr': {
+      handler: function(val) {
+        this.createCount+=1
+        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.getCategoryList();
+    if (this.$route.params.id) {
+      this.setTagsViewTitle()
+      this.$nextTick(() => {
+        this.getInfo()
+      })
+    }else{
+      this.formValidate.slider_image = [];
+    }
+    this.formValidate.attr.map(item => {
+      this.$set(item, 'inputVisible', false)
+    })
+    this.type = this.$route.query.type || 0
+    // this.$store.dispatch('settings/setEdit', true)
+  },
+  destroyed() {
+    window.removeEventListener('popstate', this.goBack, false)
+  },
+  methods: {
+    setSort() {
+      // ref一定跟table上面的ref一致
+      const el = this.$refs.tableParameter.$el.querySelectorAll(
+        '.el-table__body-wrapper > table > tbody'
+      )[0]
+      this.sortable = Sortable.create(el, {
+        ghostClass: 'sortable-ghost',
+        setData: function(dataTransfer) {
+          dataTransfer.setData('Text', '')
+        },
+        // 监听拖拽事件结束时触发
+        onEnd: evt => {
+          this.elChangeExForArray(evt.oldIndex, evt.newIndex, this.formValidate.params)
+        }
+      })
+    },
+    elChangeExForArray(index1, index2, array) {
+      const temp = array[index1]
+      array[index1] = array[index2]
+      array[index2] = temp
+      return array
+    },
+    goBack() {
+      sessionStorage.clear()
+      window.history.back()
+    },
+    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)
+      })
+	  },
+    setTagsViewTitle() {
+      const title = '编辑商品'
+      const route = Object.assign({}, this.tempRoute, {
+        title: `${title}-${this.$route.params.id}`
+      })
+      this.$store.dispatch('tagsView/updateVisitedView', route)
+    },
+    watCh(val) {
+      const tmp = {}
+      const tmpTab = {}
+      this.formValidate.attr.forEach((o, i) => {
+        tmp['value' + i] = { title: o.value }
+        tmpTab['value' + i] = ''
+      })
+      if(this.isGenerate || this.createCount == 1 ){
+        this.ManyAttrValue = this.attrFormat(val)
+        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 => {
+          if (val.detail !== 'undefined' && val.detail !== null) {
+            this.attrInfo[
+              Object.values(val.detail)
+                .sort()
+                .join('/')
+            ] = val
+          }
+        })
+        this.manyTabTit = tmp
+        this.manyTabDate = tmpTab
+        this.formThead = Object.assign({}, this.formThead, tmp)
+      }
+      this.isGenerate = false
+    },
+    attrFormat(arr) {
+      let data = [],that = this;
+      const res = []
+      return format(arr)
+      function format(arr) {
+        if (arr.length > 1) {
+          arr.forEach((v, i) => {
+            if (i === 0) data = arr[i]['detail']
+            const tmp = []
+            data.forEach(function(vv) {
+              arr[i + 1] &&
+                arr[i + 1]['detail'] &&
+                arr[i + 1]['detail'].forEach(g => {
+                  const rep2 =
+                    (i !== 0 ? '' : arr[i]['value'] + '_$_') +
+                    vv +
+                    '-$-' +
+                    arr[i + 1]['value'] +
+                    '_$_' +
+                    g
+                  tmp.push(rep2)
+                  if (i === arr.length - 2) {
+                    const rep4 = {
+                      image: '',
+                      price: 0,
+                      cost: 0,
+                      ot_price: 0,
+                      select: true,
+                      sku: vv.sku,
+                      stock: 0,
+                      bar_code: '',
+                      weight: 0,
+                      volume: 0,
+                      brokerage: 0,
+                      brokerage_two: 0
+                    }
+                    rep2.split('-$-').forEach((h, k) => {
+                      const rep3 = h.split('_$_')
+                      if (!rep4['detail']) rep4['detail'] = {}
+                      rep4['detail'][rep3[0]] = rep3.length > 1 ? rep3[1] : ''
+                    })
+                    // if(rep4.detail !== 'undefined' && rep4.detail !== null){
+                    Object.values(rep4.detail).forEach((v, i) => {
+                      rep4['value' + i] = v
+                    })
+                    // }
+
+                    res.push(rep4)
+                  }
+                })
+            })
+            data = tmp.length ? tmp : []
+          })
+        } else {
+          const dataArr = []
+          arr.forEach((v, k) => {
+            v['detail'].forEach((vv, kk) => {
+              dataArr[kk] = v['value'] + '_' + vv
+              res[kk] = {
+                image: '',
+                price: 0,
+                cost: 0,
+                ot_price: 0,
+                select: true,
+                sku: "",
+                stock: 0,
+                bar_code: '',
+                weight: 0,
+                volume: 0,
+                brokerage: 0,
+                brokerage_two: 0,
+                detail: { [v['value']]: vv }
+              }
+              Object.values(res[kk].detail).forEach((v, i) => {
+                res[kk]['value' + i] = v
+              })
+            })
+          })
+          data.push(dataArr.join('$&'))
+        }
+        if(that.generateArr.length>0){
+          that.generateArr.forEach((v, i) => {
+            res[i]['sku'] = v.sku
+          })
+        }
+        return res
+      }
+    },
+    // 选择规格
+    onChangeSpec(num) {},
+    // 切换积分抵扣
+    changeIntergral(e) {
+      if (e == -1) {
+        this.formValidate.integral_rate = -1
+      } else {
+        this.formValidate.integral_rate = this.formValidate.integral_rate
+      }
+    },
+    // 选择属性确认
+    confirm() {
+      if (!this.selectRule) {
+        return this.$message.warning('请选择属性')
+      }
+      this.ruleList.forEach(item => {
+        if (item.attr_template_id === this.selectRule) {
+          this.formValidate.attr = item.template_value
+          this.attrs = item.template_value
+        }
+      })
+      this.addmanyData(this.ManyAttrValue)
+      this.getAttr();
+    },
+    addmanyData(data){
+      data.forEach(item=>{
+        item.select = true
+      })
+      this.ManyAttrValue = data;
+    },
+    //打开属性
+	  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;
+		},
+    // 积分商品分类；
+    getCategoryList() {
+      integralProCateSelect()
+        .then(res => {
+          this.categoryList = res.data
+        })
+        .catch(res => {
+          this.$message.error(res.message)
+        })
+    },
+    // 获取商品属性模板；
+    showInput(item) {
+      this.$set(item, 'inputVisible', true)
+    },
+    addcustom() {
+      if (this.formValidate.extend.length > 9) {
+        this.$message.warning('最多添加10条')
+      } else {
+        this.formValidate.extend.push({
+          title: '',
+          key: 'text',
+          value: '',
+          require: false
+        })
+      }
+    },
+
+    // 乘法
+    accMul(arg1, arg2) {
+      var max = 0
+      var s1 = arg1.toString()
+      var s2 = arg2.toString()
+      try {
+        max += s1.split('.')[1].length
+      } catch (e) {}
+      try {
+        max += s2.split('.')[1].length
+      } catch (e) {}
+      return (
+        (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) /
+        Math.pow(10, max)
+      )
+    },
+    // 删除表格中的属性
+    delAttrTable(index) {
+      this.ManyAttrValue.splice(index, 1)
+    },
+    // 批量添加
+    batchAdd() {
+      for (const val of this.ManyAttrValue) {
+        if(val.select){
+          console.log(this.oneFormBatch[0])
+          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.$set(val, 'price', this.oneFormBatch[0].price)
+          if(this.oneFormBatch[0].cost!= null)this.$set(val, 'cost', this.oneFormBatch[0].cost)
+          if(this.oneFormBatch[0].ot_price!= null)this.$set(val, 'ot_price', this.oneFormBatch[0].ot_price)
+          if(this.oneFormBatch[0].svip_price!= null)this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price)
+          if(this.oneFormBatch[0].stock!= null)this.$set(val, 'stock', this.oneFormBatch[0].stock)
+          if(this.oneFormBatch[0].bar_code!= null)this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code)
+          if(this.oneFormBatch[0].weight!= null)this.$set(val, 'weight', this.oneFormBatch[0].weight)
+          if(this.oneFormBatch[0].volume!= null)this.$set(val, 'volume', this.oneFormBatch[0].volume)
+          if(this.oneFormBatch[0].extension_one!= null)this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
+          if(this.oneFormBatch[0].extension_two!= null)this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
+        }
+      }
+    },
+    // 添加按钮
+    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.ManyAttrValue.splice(index, 1)
+    },
+    // 删除属性
+    handleClose(item, index) {
+      item.splice(index, 1)
+      this.attrs = this.formValidate.attr;
+    },
+    // 添加规则名称
+    createAttrName() {
+      if (this.formDynamic.attrsName && this.formDynamic.attrsVal) {
+        const data = {
+          value: this.formDynamic.attrsName,
+          detail: [this.formDynamic.attrsVal]
+        }
+        this.formValidate.attr.push(data)
+        var hash = {}
+        this.formValidate.attr = this.formValidate.attr.reduce(function(
+          item,
+          next
+        ) {
+          /* eslint-disable */
+          hash[next.value] ? "" : (hash[next.value] = true && item.push(next));
+          return item;
+        },
+        []);
+        this.clearAttr();
+        this.attrs = this.formValidate.attr;
+        this.isGenerate = true;
+        this.isBtn = false;
+      } else {
+        this.$message.warning("请添加完整的规格！");
+      }
+    },
+    // 添加属性
+    createAttr(num, idx) {
+      if (num) {
+        this.formValidate.attr[idx].detail.push(num);
+        var hash = {};
+        this.formValidate.attr[idx].detail = this.formValidate.attr[
+          idx
+        ].detail.reduce(function(item, next) {
+          /* eslint-disable */
+          hash[next] ? "" : (hash[next] = true && item.push(next));
+          return item;
+        }, []);
+        this.formValidate.attr[idx].inputVisible = false;
+      } else {
+        this.$message.warning("请添加属性");
+      }
+    },
+     // 立即生成
+    generate() {
+      let id = this.$route.params.id || 0;
+      generateAttrApi(id,{ attrs: this.attrs,product_type: this.formValidate.product_type })
+        .then((res) => {
+          let info = res.data
+          this.generateArr = res.data.value
+          this.formValidate.attr = res.data.attr;
+          this.createProduct = true
+          this.isGenerate = true
+          if (this.$route.params.id !== "0") {
+			      this.addmanyData(info.value);
+          }
+          // if (!this.$route.params.id && this.formValidate.spec_type === 1) {
+          //   this.ManyAttrValue.map((item) => {
+          //     item.image = this.formValidate.slider_image[0];
+          //   });
+          //   this.oneFormBatch[0].image = this.formValidate.slider_image[0];
+          // } else if (this.$route.params.id) {
+          //   this.ManyAttrValue.map((item) => {
+          //     if (!item.image) {
+          //       item.image = this.formValidate.slider_image[0];
+          //     }
+          //   });
+          //   this.oneFormBatch[0].image = this.formValidate.slider_image[0];
+          // }
+					this.getAttr();
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+        });
+    },
+    // 详情
+    getInfo() {
+      this.fullscreenLoading = true;
+      integralProDetailApi(this.$route.params.id)
+        .then(async res => {
+          let info = res.data;
+          this.infoData(info);
+        })
+        .catch(res => {
+          this.fullscreenLoading = false;
+          this.$message.error(res.message);
+        });
+    },
+    infoData(info) {
+      this.deduction_set = info.integral_rate == -1 ? -1 : 1;
+      this.attrs = info.attr || [];
+        info.attrValue.forEach(val => {
+          val.select = true;
+        });
+      this.formValidate = {
+        product_type: info.product_type || 0,
+        image: info.image,
+        attrValue: info.attrValue,
+        slider_image: info.slider_image,
+        store_name: info.store_name,
+        store_info: info.store_info,
+        keyword: info.keyword,
+        cate_id: this.type == 1 ? "" : mateName(this.categoryList,'store_category_id',info.cate_id), // 分类id
+        is_used: info.is_used,
+        unit_name: info.unit_name,
+        sort: info.sort,
+        once_max_count: info.once_max_count || 1,
+        is_hot: info.is_hot,
+        attr: info.attr,
+        content: info.content,
+        spec_type: Number(info.spec_type),
+        type: info.type || 0,
+      };
+      if (this.formValidate.spec_type === 0) {
+        this.OneattrValue = info.attrValue;
+      } else {
+        this.ManyAttrValue = info.attrValue;
+        this.ManyAttrValue.forEach(val => {
+          if (val.detail !== "undefined" && val.detail !== null) {
+            this.attrInfo[
+              Object.values(val.detail)
+                .sort()
+                .join("/")
+            ] = val;
+          }
+        });
+      }
+      this.getAttr();
+      this.fullscreenLoading = false;
+    },
+    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() {
+      this.currentTab = (Number(this.currentTab) - 1).toString();
+    },
+    handleSubmitNest(name) {
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.currentTab = (Number(this.currentTab) + 1).toString();
+        }
+      });
+    },
+    // 提交
+    handleSubmit(name) {
+      // this.$store.dispatch("settings/setEdit", false);
+      if (this.formValidate.spec_type === 1) {
+        this.formValidate.attrValue = this.ManyAttrValue;
+      } else {
+        this.formValidate.attrValue = this.OneattrValue;
+        this.formValidate.attr = [];
+      }
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.fullscreenLoading = true;
+          this.loading = true;
+          let disCreate = this.$route.params.id && !this.$route.query.type;
+          disCreate
+            ? integralProUpdateApi(this.$route.params.id, this.formValidate)
+                .then(async res => {
+                  this.fullscreenLoading = false;
+                  this.$message.success(res.message);
+                  this.$refs[name].resetFields();
+                  this.formValidate.slider_image = [];
+                  this.$router.push({ path: this.roterPre + "/marketing/integral/proList" });
+
+                  this.loading = false;
+                })
+                .catch(res => {
+                  this.fullscreenLoading = false;
+                  this.loading = false;
+                  this.$message.error(res.message);
+                })
+            : createIntegralProduct(this.formValidate)
+                .then(async res => {
+                  this.fullscreenLoading = false;
+                  this.$message.success(res.message);
+                  this.$refs[name].resetFields();
+                  this.formValidate.slider_image = [];
+                  this.$router.push({ path: this.roterPre + "/marketing/integral/proList" });
+                  this.loading = false;
+                })
+                .catch(res => {
+                  this.fullscreenLoading = false;
+                  this.loading = false;
+                  this.$message.error(res.message);
+                });
+        } else {
+          if (!this.formValidate.store_name.trim()) {
+            return this.$message.warning("商品名称不能为空");
+          }
+          if (!this.formValidate.unit_name) {
+            return this.$message.warning("单位不能为空");
+          }
+          if (!this.formValidate.cate_id) {
+            return this.$message.warning("商品分类不能为空");
+          }
+          if (!this.formValidate.image) {
+            return this.$message.warning("商品封面图不能为空");
+          }
+          if (this.formValidate.slider_image.length < 0) {
+            return this.$message.warning("商品轮播图不能为空");
+          }
+        }
+      });
+    },
+    // 表单验证
+    validate(prop, status, error) {
+      if (status === false) {
+        this.$message.warning(error);
+      }
+    },
+    // 规格图片验证
+    specPicValidate(ManyAttrValue) {
+      for (let i = 0; i < ManyAttrValue.length; i++) {
+        if (ManyAttrValue[i].image === "" || !ManyAttrValue[i].image) {
+          this.$message.warning("请上传商品规格图！");
+          this.picValidate = false;
+          break;
+        }
+      }
+    },
+    // 移动
+    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) {
+      window.UE.registerUI(
+        "test-dialog",
+        function(editor, uiName) {
+          // 创建 dialog
+          let dialog = new window.UE.ui.Dialog({
+            iframeUrl: roterPre + "/admin/widget/image?field=dialog",
+            editor: editor,
+            name: uiName,
+            title: "上传图片",
+            cssRules: "width:1200px;height:500px;padding:20px;"
+          });
+          this.dialog = dialog;
+          let btn = new window.UE.ui.Button({
+            name: "dialog-button",
+            title: "上传图片",
+            cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
+            onclick: function() {
+              // 渲染dialog
+              dialog.render();
+              dialog.open();
+            }
+          });
+          return btn;
+        },
+        37
+      );
+      window.UE.registerUI(
+        "video-dialog",
+        function(editor, uiName) {
+          let dialog = new window.UE.ui.Dialog({
+            iframeUrl: roterPre + "/admin/widget/video?fodder=video",
+            editor: editor,
+            name: uiName,
+            title: "上传视频",
+            cssRules: "width:600px;height:420px;padding:10px 20px 20px;"
+          });
+          this.dialog = dialog;
+          let btn = new window.UE.ui.Button({
+            name: "video-button",
+            title: "上传视频",
+            cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -320px -20px;`,
+            onclick: function() {
+              // 渲染dialog
+              dialog.render();
+              dialog.open();
+            }
+          });
+          return btn;
+        },
+        38
+      );
+    }
+  }
+};
+</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.5);
+}
+.goods_detail .goods_detail_wrapper {
+  z-index: -10;
+}
+/deep/ .upLoadPicBox {
+  .upLoad {
+    -webkit-box-orient: vertical;
+    -moz-box-orient: vertical;
+    -o-box-orient: vertical;
+    -webkit-flex-direction: column;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    line-height: 20px;
+  }
+  span {
+    font-size: 10px;
+  }
+}
+.proCoupon {
+  /deep/ .el-form-item__content {
+    margin-top: 5px;
+  }
+}
+.tabPic {
+  width: 40px !important;
+  height: 40px !important;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.noLeft {
+  /deep/ .el-form-item__content {
+    margin-left: 10px !important;
+  }
+}
+.tabNumWidth {
+  /deep/ .el-input-number--medium {
+    width: 100px;
+  }
+  /deep/.el-input__inner{
+    padding: 0 0 0 15px;
+  }
+  /deep/ thead {
+    line-height: normal !important;
+  }
+  /deep/.cell {
+    line-height: normal !important;
+    text-overflow: clip !important;
+  }
+}
+.addfont {
+  display: inline-block;
+  font-size: 13px;
+  font-weight: 400;
+  color: #437FFD;
+  margin-left: 14px;
+  cursor: pointer;
+}
+.selectOn{
+	color: #2d8cf0;
+}
+.titTip {
+  display: inline-bolck;
+  font-size: 12px;
+  font-weight: 400;
+  color: #999999;
+}
+.addCustom_content {
+  margin-top: 20px;
+  .custom_box {
+    margin-bottom: 10px;
+  }
+}
+.addCustomBox {
+  margin-top: 12px;
+  font-size: 13px;
+  font-weight: 400;
+  color: #437FFD;
+  .btn {
+    cursor: pointer;
+    width: max-content;
+  }
+  .remark {
+    display: flex;
+    margin-top: 14px;
+  }
+}
+.selWidth {
+  width: 50%;
+}
+.ml15 {
+  margin-left: 15px;
+}
+.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%;
+  }
+}
+.iview-video-style {
+  width: 40%;
+  height: 180px;
+  border-radius: 10px;
+  background-color: #707070;
+  margin-top: 10px;
+  position: relative;
+  overflow: hidden;
+}
+.iconv {
+  color: #fff;
+  line-height: 180px;
+  display: inherit;
+  font-size: 26px;
+  position: absolute;
+  top: -74px;
+  left: 50%;
+  margin-left: -25px;
+}
+.iview-video-style .mark {
+  position: absolute;
+  width: 100%;
+  height: 30px;
+  top: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  text-align: center;
+}
+.uploadVideo {
+  margin-left: 10px;
+}
+.perW50 {
+  width: 50%;
+}
+.submission {
+  margin-left: 10px;
+}
+.btndel {
+  position: absolute;
+  z-index: 1;
+  width: 20px !important;
+  height: 20px !important;
+  left: 46px;
+  top: -4px;
+}
+.labeltop {
+  /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/integral/classify/index.vue b/src/views/marketing/integral/classify/index.vue
new file mode 100644
index 0000000..e13fa2b
--- /dev/null
+++ b/src/views/marketing/integral/classify/index.vue
@@ -0,0 +1,143 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-button size="small" type="primary" class="mb20" @click="onAdd">添加积分商品分类</el-button>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="small"
+        row-key="store_category_id"
+      >
+        <el-table-column
+          label="分类名称"
+          min-width="200"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.cate_name + '  [ ' + scope.row.store_category_id + '  ]' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="sort"
+          label="排序"
+          min-width="50"
+        />
+        <el-table-column
+          prop="status"
+          label="是否显示"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_show"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="显示"
+              inactive-text="隐藏"
+              @change="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="150"
+        />
+        <el-table-column label="操作" min-width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onEdit(scope.row.store_category_id)">编辑</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+
+import {
+  integralCategoryListApi, integralCategoryCreateApi, integralCategoryUpdateApi, integralCategoryDeleteApi,
+  integralCategoryStatusApi
+} from '@/api/marketing'
+export default {
+  name: 'ProductClassify',
+  data() {
+    return {
+      moren: require("@/assets/images/bjt.png"),
+      isChecked: false,
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 列表
+    getList() {
+      this.listLoading = true
+      integralCategoryListApi(this.tableFrom).then(res => {
+        this.tableData.data = res.data
+        this.tableData.total = res.data.count
+        this.listLoading = false
+      }).catch(res => {
+        this.listLoading = false
+        this.$message.error(res.message)
+      })
+    },
+    pageChange(page) {
+      this.tableData.page = page
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.tableData.limit = val
+      this.getList()
+    },
+    // 添加
+    onAdd() {
+      this.$modalForm(integralCategoryCreateApi()).then(() => this.getList())
+    },
+    // 编辑
+    onEdit(id) {
+      this.$modalForm(integralCategoryUpdateApi(id)).then(() => this.getList())
+    },
+    // 删除
+    handleDelete(row, idx) {
+      let modalText = ""
+      if(row.has_product == 1){
+        modalText ="该分类下有商品，删除后不可恢复，请确认是否删除"
+      }else{
+       modalText ="确定删除该分类吗"
+      }
+      this.$modalSure(modalText).then(() => {
+        integralCategoryDeleteApi(row.store_category_id).then(({ message }) => {
+          this.$message.success(message)
+          this.getList()
+        }).catch(({ message }) => {
+          this.$message.error(message)
+        })
+      })
+    },
+    onchangeIsShow(row) {
+      integralCategoryStatusApi(row.store_category_id, row.is_show).then(({ message }) => {
+        this.$message.success(message)
+      }).catch(({ message }) => {
+        this.$message.error(message)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/marketing/integral/orderList/index.vue b/src/views/marketing/integral/orderList/index.vue
new file mode 100644
index 0000000..698d00e
--- /dev/null
+++ b/src/views/marketing/integral/orderList/index.vue
@@ -0,0 +1,560 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <div class="container">
+          <el-form size="small" inline label-width="80px">
+            <el-form-item label="订单状态：">
+              <el-select
+                v-model="tableFrom.status"
+                placeholder="请选择"
+                class="filter-item selWidth"
+                clearable
+                @change="getList(1)"
+              >
+                <el-option label="全部" value="" />
+                <el-option label="待付款" :value="-3" />
+                <el-option label="待发货" :value="0" />
+                <el-option label="待收货" :value="1" />
+                <el-option label="交易完成" :value="3" />
+                <el-option label="已删除" :value="-10" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间：" prop="date">
+              <el-date-picker
+                v-model="timeVal"
+                value-format="yyyy/MM/dd"
+                align="right"
+                unlink-panels
+                format="yyyy/MM/dd"
+                size="small"
+                type="daterange"
+                placement="bottom-end"
+                placeholder="自定义时间"
+                class="selWidth"
+                :picker-options="pickerOptions"
+                @change="onchangeTime"
+              />
+            </el-form-item>
+            <el-form-item label="搜索：" class="width100" style="display: inline-block;">
+              <el-input placeholder="请输入内容" v-model="keywords" class="input-with-select">
+                <el-select v-model="select" slot="prepend" placeholder="请选择">
+                  <el-option label="全部" value=""></el-option>
+                  <el-option label="订单号" value="order_sn"></el-option>
+                  <el-option label="UID" value="uid"></el-option>
+                  <el-option label="用户姓名" value="nickname"></el-option>
+                  <el-option label="用户电话" value="phone"></el-option>
+                </el-select>
+                <el-button slot="append" type="primary" style="background-color:#437FFD;border-color:#437FFD;color:#fff;border-radius:0 4px 4px 0;" icon="el-icon-search" @click="changeSearch"></el-button>
+              </el-input>
+
+            </el-form-item>
+            <el-button size="small" type="primary" icon="el-icon-top" @click="exports">导出</el-button>
+          </el-form>
+        </div>
+      </div>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        size="small"
+        class="table"
+        highlight-current-row
+        :cell-class-name="addTdClass"
+      >
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="用户备注：">
+                <span>{{ props.row.mark | filterEmpty }}</span>
+              </el-form-item>
+              <el-form-item label="商家备注：">
+                <span>{{ props.row.remark | filterEmpty }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" min-width="150">
+          <template slot-scope="scope">
+            <span style="display: block;" v-text="scope.row.order_sn" />
+            <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="real_name" label="收货人" min-width="100" />
+        <el-table-column label="商品信息" min-width="330">
+          <template slot-scope="scope">
+            <div
+              v-for="(val, i) in scope.row.orderProduct"
+              :key="i"
+              class="tabBox acea-row row-middle"
+            >
+              <div class="demo-image__preview">
+                <el-image
+                  :src="val.cart_info.product.image"
+                  :preview-src-list="[val.cart_info.product.image]"
+                />
+              </div>
+              <span
+                class="tabBox_tit"
+              >{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
+              <span class="tabBox_pice">
+                {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }}
+                <em
+                  v-if="val.refund_num < val.product_num && val.refund_num  > 0"
+                  style="color: red;font-style: normal;"
+                >(-{{ val.product_num - val.refund_num }})</em>
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换积分" prop="integral" min-width="80"/>
+        <el-table-column label="兑换金额" prop="pay_price" min-width="80"/>
+        <el-table-column label="订单状态" min-width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_del === 0">
+              <span v-if="scope.row.paid === 0">待付款</span>
+              <span v-else>
+                <span>{{ scope.row.status | integralOrderStatus }}</span>
+              </span>
+            </span>
+            <span v-else>已删除</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="serviceScore" label="下单时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.create_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="120" fixed="right" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.paid==1&&scope.row.status==0" type="text" size="small" @click="send(scope.row.order_id)">发送货</el-button>
+            <el-button type="text" size="small" @click="onOrderDetails(scope.row.order_id)">订单详情</el-button>
+            <el-button v-if="scope.row.is_del > 0" type="text" size="small" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--发送货-->
+    <el-dialog title="订单发送货" :visible.sync="sendVisible" width="800px" :before-close="handleClose">
+      <el-form ref="shipment" :model="shipment" :rules="rules" label-width="120px" @submit.native.prevent>
+        <el-form-item label="选择类型：" prop="delivery_type">
+          <el-radio-group v-model="shipment.delivery_type" @change="changeSend">
+            <el-radio :label="1">手动发货</el-radio>
+            <el-radio :label="3" class="radio"> 无需物流</el-radio>
+            <el-radio :label="2">自己配送</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item v-if="shipment.delivery_type == 1" label="快递公司：" prop="delivery_name">
+          <el-select
+            filterable
+            v-model="shipment.delivery_name"
+            placeholder="请选择快递公司"
+            class="filter-item selWidth mr20"
+          >
+            <el-option
+              v-for="item in deliveryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="shipment.delivery_type == 1" label="快递单号：" prop="delivery_id">
+          <el-input v-model="shipment.delivery_id" placeholder="请输入快递单号" />
+        </el-form-item>
+        <el-form-item v-if="shipment.delivery_type == 2" label="送货人姓名：" prop="to_name">
+          <el-input v-model="shipment.to_name"  maxlength="10" placeholder="请输入送货人姓名" />
+        </el-form-item>
+        <el-form-item v-if="shipment.delivery_type == 2" label="送货人手机号：" prop="to_phone">
+          <el-input v-model="shipment.to_phone" placeholder="请输入送货人手机号" />
+        </el-form-item>
+        <el-form-item  label="备注：" prop="remark">
+          <el-input v-model="shipment.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button :loading="loading" type="primary" @click="submitForm('shipment')">提交</el-button>
+      </span>
+    </el-dialog>
+    <!--详情-->
+    <order-detail
+      ref="orderDetail"
+      @closeDrawer="closeDrawer"
+      @changeDrawer="changeDrawer"
+      @send="send"
+      :drawer="drawer"
+    ></order-detail>
+  </div>
+</template>
+
+<script>
+
+import { integralOrderLstApi, integralOrderExcelApi, expressOptionsApi, integralDelivery, integralOrderDeleteApi } from "@/api/marketing";
+import orderDetail from './orderDetails.vue';
+import createWorkBook from '@/utils/newToExcel.js';
+import timeOptions from '@/utils/timeOptions';
+export default {
+  components: { orderDetail },
+  data() {
+    return {
+      select: "",
+      keywords: "",
+      orderId: 0,
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      pickerOptions: timeOptions,
+      listLoading: true,
+      tableFrom: {
+        keywords: "",
+        status: "",
+        date: "",
+        page: 1,
+        limit: 20,
+        product_id: '',
+      },
+      timeVal: [],
+      ids: "",
+      uid: "",
+      visibleDetail: false,
+      tableFromLog: {
+        page: 1,
+        limit: 10,
+      },
+      loading: false,
+      dialogVisible: false,
+      cardLists: [],
+      orderDatalist: null,
+      shipment: {
+        delivery_type: 1
+      },
+      deliveryList: [],
+      drawer: false,
+      sendVisible: false,
+      rules: {
+        delivery_type: [
+          { required: true, message: '请选择发送货方式', trigger: 'change' }
+        ],
+        delivery_name: [
+          { required: true, message: '请选择快递公司', trigger: 'change' }
+        ],
+        to_name: [
+          { required: true, message: '请输入送货人姓名', trigger: 'blur' }
+        ],
+        delivery_id: [
+          { required: true, message: '请输入快递单号', trigger: 'blur' }
+        ],
+        to_phone: [
+          { required: true, message: '请输入送货人手机号', trigger: 'blur' },
+          { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+    watch: {
+    '$route.query.id': {
+      handler: function(val) {
+        this.tableFrom.product_id  = val || ""
+        this.getList('');
+      },
+      immediate: false,
+      deep: true
+    },
+  },
+  mounted() {
+    if (this.$route.query.id) {
+      this.tableFrom.product_id = this.$route.query.id;
+    } else {
+      this.tableFrom.product_id = "";
+    }
+    this.getExpressLst();
+    this.getList('');
+  },
+  // 被缓存接收参数
+  activated() {
+    if (this.$route.query.id) {
+      this.tableFrom.product_id = this.$route.query.id;
+    } else {
+      this.tableFrom.product_id = "";
+    }
+    this.getList('');
+  },
+  methods: {
+    // 表格某一行添加特定的样式
+    addTdClass(val) {
+      if (val.row.status > 0 && val.row.paid == 1) {
+        for (let i = 0; i < val.row.orderProduct.length; i++) {
+          if (val.row.orderProduct[i].refund_num > 0 && val.row.orderProduct[i].refund_num < val.row.orderProduct[i].product_num) {
+            return "row-bg";
+          }
+        }
+      } else {
+        return " ";
+      }
+    },
+    async exports() {
+      let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
+      excelData.page = 1
+      let pageCount = 1
+      let lebData = {};
+      for (let i = 0; i < pageCount; i++) {
+        lebData = await this.downData(excelData)
+        pageCount = Math.ceil(lebData.count/excelData.limit)
+        if (lebData.export.length) {
+          data = data.concat(lebData.export)
+          excelData.page++
+        }
+      }
+      createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
+      return
+    },
+    /**订单列表 */
+    downData(excelData) {
+      return new Promise((resolve, reject) => {
+        integralOrderExcelApi(excelData).then((res) => {
+          return resolve(res.data)
+        })
+      })
+    },
+    // 导出
+    exportRecord() {
+      exportOrderApi(this.tableFrom)
+        .then((res) => {
+          const h = this.$createElement;
+          this.$msgbox({
+            title: '提示',
+            message: h('p', null, [
+              h('span', null, '文件正在生成中，请稍后点击"'),
+              h('span', { style: 'color: teal' }, '导出记录'),
+              h('span', null, '"查看~ '),
+            ]),
+            confirmButtonText: '我知道了',
+          }).then(action => {
+
+          });
+        })
+        .catch((res) => {
+          this.$message.error(res.message)
+        })
+    },
+    // 订单删除
+    handleDelete(row, idx) {
+      this.$modalSure().then(() => {
+        integralOrderDeleteApi(row.order_id)
+          .then(({
+            message
+          }) => {
+            this.$message.success(message)
+            this.tableData.data.splice(idx, 1)
+          })
+          .catch(({
+            message
+          }) => {
+            this.$message.error(message)
+          })
+      })
+    },
+    // 获取快递公司列表
+    getExpressLst() {
+      expressOptionsApi().then((res) => {
+        this.deliveryList = res.data
+      }).catch((res) => {
+        this.$message.error(res.message)
+      })
+    },
+    // 发货
+    send(id) {
+      this.sendVisible = true
+      this.orderId = id
+      this.sendReset();
+    },
+    sendReset() {
+      this.shipment = {
+        delivery_type: 1,
+        delivery_name: '',
+        delivery_id: '',
+        from_name: '',
+        from_addr: '',
+        from_tel: '',
+        remark: ''
+      }
+    },
+    changeSend() {
+      this.$refs['shipment'].clearValidate();
+    },
+    handleClose() {
+      this.sendVisible = false
+      this.$refs['shipment'].resetFields()
+    },
+    submitForm(name) {
+      if (this.shipment.delivery_type == 2) {
+        this.shipment.delivery_name = this.shipment.to_name
+        this.shipment.delivery_id = this.shipment.to_phone
+      }
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          this.loading = true;
+          delete this.shipment.to_name;
+          delete this.shipment.to_phone;
+          integralDelivery(this.orderId, this.shipment).then(res => {
+              this.sendVisible = false;
+              this.$message.success(res.message);
+              this.getList('');
+              this.loading = false;
+
+              // this.sendReset()
+            }).catch(({ message }) => {
+              this.$message.error(message);
+              this.loading = false;
+            })
+        } else {
+          return
+        }
+      })
+    },
+    // 详情
+    onOrderDetails(id) {
+      this.orderId = id;
+      this.$refs.orderDetail.getInfo(id);
+      this.drawer = true;
+    },
+    changeDrawer(v) {
+      this.drawer = v;
+    },
+    closeDrawer() {
+      this.drawer = false;
+    },
+    pageChangeLog(page) {
+      this.tableFromLog.page = page;
+      this.getList('');
+    },
+    handleSizeChangeLog(val) {
+      this.tableFromLog.limit = val;
+      this.getList('');
+    },
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e;
+      this.tableFrom.date = e ? this.timeVal.join('-') : '';
+      this.getList(1);
+    },
+    changeSearch(){
+      this.resetSearchVal();
+      switch(this.select){
+        case "uid":
+          this.tableFrom.uid = this.keywords;
+          this.getList(1);
+          break;
+        case "nickname":
+          this.tableFrom.nickname = this.keywords;
+          this.getList(1);
+          break;
+        case "phone":
+          this.tableFrom.phone = this.keywords;
+          this.getList(1);
+          break;
+        case "order_sn":
+          this.tableFrom.order_sn = this.keywords;
+          this.getList(1);
+          break;
+        case "mer_name":
+          this.tableFrom.mer_name = this.keywords;
+          this.getList(1);
+          break;
+        default:
+          this.tableFrom.keywords = this.keywords;
+          this.getList(1);
+          break;
+      }
+
+    },
+    resetSearchVal(){
+      this.tableFrom.mer_name="";
+      this.tableFrom.order_sn="";
+      this.tableFrom.phone="";
+      this.tableFrom.nickname="";
+      this.tableFrom.uid="";
+      this.tableFrom.keywords="";
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num ? num : this.tableFrom.page;
+      integralOrderLstApi(this.tableFrom)
+        .then((res) => {
+          this.tableData.data = res.data.list;
+          this.tableData.total = res.data.count;
+          this.listLoading = false;
+        })
+        .catch((res) => {
+          this.$message.error(res.message);
+          this.listLoading = false;
+        });
+    },
+    pageChange(page) {
+      this.tableFrom.page = page;
+      this.getList('');
+    },
+    handleSizeChange(val) {
+      this.tableFrom.limit = val;
+      this.getList('');
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.demo-table-expand {
+  /deep/ label {
+    width: 83px !important;
+  }
+}
+/deep/.el-input-group__prepend .el-input{
+  width: 90px;
+}
+/deep/.el-input-group__prepend div.el-select .el-input__inner{
+  padding: 0 10px;
+  display: block;
+  font-size: 13px;
+}
+.selWidth {
+  width: 260px;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+  font-size: 12px;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.tabBox_tit {
+  width: 60%;
+  font-size: 12px !important;
+  margin: 0 2px 0 10px;
+  letter-spacing: 1px;
+  padding: 5px 0;
+  box-sizing: border-box;
+}
+
+/deep/.row-bg {
+  .cell {
+    color: red !important;
+  }
+}
+</style>
diff --git a/src/views/marketing/integral/orderList/orderDetails.vue b/src/views/marketing/integral/orderList/orderDetails.vue
new file mode 100644
index 0000000..ba0a7e3
--- /dev/null
+++ b/src/views/marketing/integral/orderList/orderDetails.vue
@@ -0,0 +1,622 @@
+<template>
+  <div>
+    <el-drawer
+      :with-header="false"
+      :size="1000"
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose"
+    >
+      <div v-loading="loading">
+        <div class="head">
+          <div class="full">
+            <img class="order_icon" :src="orderImg" alt="" />
+            <div class="text">
+              <div class="title">普通订单</div>
+              <div>
+                <span class="mr20">订单编号：{{ orderDetailList.order_sn }}</span>
+              </div>
+            </div>
+            <div>
+              <el-button
+                v-if="orderDetailList.status === 0 && orderDetailList.paid === 1"
+                type="primary"
+                size="small"
+                @click="toSendGoods"
+                >发送货</el-button
+              >
+             <el-button
+                size="small"
+                @click="onOrderMark"
+                >备注</el-button
+              >
+            </div>
+          </div>
+          <ul class="list">
+            <li class="item">
+              <div class="title">订单状态</div>
+              <div>
+                <div v-if="orderDetailList.is_del == 1" class="value1">用户已删除</div>
+                <div v-else-if="!orderDetailList.pay_time && orderDetailList.is_del == 0" class="value1">待付款</div>
+                <div v-else-if="orderDetailList.pay_time && orderDetailList.is_del == 0" class="value1">
+                  <span>{{ orderDetailList.status | integralOrderStatus }}</span>
+                </div>
+              </div>
+            </li>
+            <li class="item">
+              <div class="title">实际支付</div>
+              <div> {{ !orderDetailList.pay_time ? '-' : orderDetailList.integral+'个积分+'+orderDetailList.pay_price+'元' }}</div>
+            </li>
+            <li class="item">
+              <div class="title">支付方式</div>
+              <div v-if="orderDetailList.pay_time"><span>积分</span><span v-if="Number(orderDetailList.pay_price)!=0">+{{ orderDetailList.pay_type | payTypeFilter }}</span>支付</div>
+              <div v-else>-</div>
+            </li>
+            <li class="item">
+              <div class="title">支付时间</div>
+              <div>{{ orderDetailList.create_time }}</div>
+            </li>
+          </ul>
+        </div>
+        <el-tabs type="border-card" v-model="activeName" @tab-click="tabClick">
+          <el-tab-pane label="订单信息" name="detail">
+            <div class="section">
+              <div class="title">用户信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>用户昵称：</div>
+                  <div class="value">
+                    {{
+                      orderDetailList.user.real_name ? orderDetailList.user.real_name : orderDetailList.user.nickname
+                    }}
+                  </div>
+                </li>
+                <li class="item">
+                  <div>用户ID：</div>
+                  <div class="value">{{ orderDetailList.user.uid ? orderDetailList.user.uid : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>绑定电话：</div>
+                  <div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">收货信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>收货人：</div>
+                  <div class="value">{{ orderDetailList.real_name ? orderDetailList.real_name : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>收货电话：</div>
+                  <div class="value">{{ orderDetailList.user_phone ? orderDetailList.user_phone : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>收货地址：</div>
+                  <div class="value">{{ orderDetailList.user_address ? orderDetailList.user_address : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">订单信息</div>
+              <ul class="list">
+                <li class="item">
+                  <div>创建时间：</div>
+                  <div class="value">{{ orderDetailList.create_time ? orderDetailList.create_time : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>商品总数：</div>
+                  <div class="value">{{ orderDetailList.total_num ? orderDetailList.total_num : '-' }}</div>
+                </li>
+                <li class="item">
+                  <div>实际支付：</div>
+                  <div class="value">{{ !orderDetailList.pay_time ? '-' : orderDetailList.integral+'个积分+'+orderDetailList.pay_price+'元' }}</div>
+                </li>
+                <li v-if="orderDetailList.integral" class="item">
+                  <div>积分抵扣：</div>
+                  <div class="value">使用了{{ orderDetailList.integral }}个积分</div>
+                </li>
+                <li class="item">
+                  <div>订单总价：</div>
+                  <div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section" v-if="orderDetailList.delivery_type === '1'">
+              <div class="title">物流信息</div>
+              <ul class="list">
+                <li class="item acea-row row-middle">
+                  <div>快递公司：</div>
+                  <div class="value">{{ orderDetailList.delivery_name ? orderDetailList.delivery_name : '-' }}</div>
+                </li>
+                <li class="item acea-row row-middle">
+                  <div>快递单号：</div>
+                  <div class="value">{{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }}</div>
+                  <el-button type="text" size="mini" @click="openLogistics">物流查询</el-button>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">买家留言</div>
+              <ul class="list">
+                <li class="item">
+                  <div>{{ orderDetailList.mark ? orderDetailList.mark : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+            <div class="section">
+              <div class="title">商家备注</div>
+              <ul class="list">
+                <li class="item">
+                  <div>{{ orderDetailList.remark ? orderDetailList.remark : '-' }}</div>
+                </li>
+              </ul>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="商品信息" name="goods">
+           <el-table :data="orderDetailList.orderProduct">
+              <el-table-column label="商品信息" min-width="300">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="demo-image__preview">
+                      <el-image
+                        :src="scope.row.cart_info.product.image"
+                        :preview-src-list="[scope.row.cart_info.product.image]"
+                      />
+                    </div>
+                    <div>
+                      <div class="line1">{{ scope.row.cart_info.product.store_name }}</div>
+                      <div class="line1 gary">
+                        规格：{{
+                          scope.row.cart_info.productAttr.sku ? scope.row.cart_info.productAttr.sku : '默认'
+                        }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="售价" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.cart_info.productAttr.price ? scope.row.cart_info.productAttr.price : '-' }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+               <el-table-column label="实付金额" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.product_price ? scope.row.product_price+'元' : '-' }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+               <el-table-column label="实付积分" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.integral_total ? scope.row.integral_total+'积分' : '-' }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="购买数量" min-width="90">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">
+                      {{ scope.row.product_num }}
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <el-tab-pane label="订单记录" name="orderList">
+            <div>
+              <el-form size="small" label-width="80px">
+                <div class="acea-row">
+                  <el-form-item label="操作端：">
+                    <el-select
+                      v-model="tableFromLog.user_type"
+                      placeholder="请选择"
+                      style="width: 140px; margin-right: 20px"
+                      clearable
+                      filterable
+                      @change="onOrderLog(orderId)"
+                    >
+                      <el-option label="系统" value="0" />
+                      <el-option label="用户" value="1" />
+                      <el-option label="平台" value="2" />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="操作时间：">
+                    <el-date-picker
+                      style="width: 380px; margin-right: 20px"
+                      v-model="timeVal"
+                      type="datetimerange"
+                      placeholder="选择日期"
+                      value-format="yyyy/MM/dd HH:mm:ss"
+                      clearable
+                      @change="onchangeTime"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </div>
+              </el-form>
+            </div>
+            <el-table :data="tableDataLog.data" size="small">
+              <el-table-column prop="order_id" label="订单编号" min-width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.order_sn }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作记录" min-width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.change_message }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作角色" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div>{{ operationType(scope.row.user_type) }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作人" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div>{{ scope.row.nickname }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作时间" min-width="150">
+                <template slot-scope="scope">
+                  <div class="tab">
+                    <div class="line1">{{ scope.row.change_time }}</div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block">
+              <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFromLog.limit" :current-page="tableFromLog.page" layout="total, sizes, prev, pager, next, jumper" :total="tableDataLog.total" @size-change="handleSizeChangeLog" @current-change="pageChangeLog" />
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-drawer>
+    <el-dialog
+      title="物流查询"
+      :visible.sync="dialogLogistics"
+      width="350px"
+      v-if="dialogLogistics"
+    >
+      <div class="logistics acea-row row-top">
+        <div class="logistics_img"><img src="@/assets/images/expressi.jpg"></div>
+        <div class="logistics_cent">
+          <span>物流公司：{{ orderDetailList.delivery_name }}</span>
+          <span>物流单号：{{ orderDetailList.delivery_id }}</span>
+        </div>
+      </div>
+      <div class="acea-row row-column-around trees-coadd">
+        <div class="scollhide">
+          <el-timeline v-if="result.length>0">
+            <el-timeline-item v-for="(item,i) in result" :key="i">
+              <p class="time" v-text="item.time" />
+              <p class="content" v-text="item.status" />
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+import {
+  integralOrderExpressApi,
+  integralOrderDetailApi,
+  integralOrderLog,
+  integralMarkApi
+} from '@/api/marketing';
+export default {
+  props: {
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: true,
+      orderId: '',
+      direction: 'rtl',
+      activeName: 'detail',
+      goodsList: [],
+      orderConfirm: false,
+      sendGoods: false,
+      dialogLogistics: false,
+      confirmReceiptForm: {
+        id: '',
+      },
+      orderData: [],
+      contentList: [],
+      nicknameList: [],
+      result: [],
+      timeVal: [],
+      childOrder: [],
+      childOrder: [],
+      tableDataLog: {
+        data: [],
+        total: 0
+      },
+      tableFromLog: {
+        user_type: '',
+        date: [],
+        page: 1,
+        limit: 10
+      },
+      orderDetailList: {
+        user: {
+          real_name: '',
+        },
+        groupOrder: {
+          group_order_sn: '',
+        },
+      },
+      orderImg: require('@/assets/images/order_icon.png'),
+    };
+  },
+  filters: {
+  },
+  methods: {
+    // 具体日期
+    onchangeTime(e) {
+      this.timeVal = e
+      this.tableFromLog.date = e ? this.timeVal.join('-') : ''
+      this.onOrderLog(this.orderId)
+    },
+    handleClose() {
+      this.activeName = 'detail';
+      this.$emit('closeDrawer');
+      this.sendGoods = false;
+      this.orderRemark = false;
+    },
+    openLogistics() {
+      this.getOrderData()
+      this.dialogLogistics = true
+    },
+     // 获取订单物流信息
+    getOrderData() {
+      integralOrderExpressApi(this.orderId).then(async res => {
+        this.result = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
+    },
+    //发送货
+    toSendGoods() {
+      this.$emit('send',this.orderId);
+    },
+    // 备注
+    onOrderMark() {
+      this.$modalForm(integralMarkApi(this.orderId)).then(() => this.getInfo(this.orderId))
+    },
+    getInfo(id) {
+      this.loading = true;
+      this.orderId = id
+      integralOrderDetailApi(id)
+        .then((res) => {
+          this.drawer = true;
+          this.loading = false;
+          this.orderDetailList = res.data;
+        })
+        .catch((res) => {
+          this.loading = false;
+          this.$message.error(res.message);
+        });
+    },
+    tabClick(tab) {
+      if (tab.name === 'orderList') {
+       this.onOrderLog(this.orderId)
+      }
+    },
+    onOrderLog(id){
+      integralOrderLog(id, this.tableFromLog).then((res) => {
+        this.tableDataLog.data = res.data.list
+        this.tableDataLog.total = res.data.count
+      });
+    },
+    pageChangeLog(page) {
+      this.tableFromLog.page = page
+      this.onOrderLog(this.orderId)
+    },
+    handleSizeChangeLog(val) {
+      this.tableFromLog.limit = val
+      this.onOrderLog(this.orderId)
+    },
+    operationType(type) {
+      if (type == 0) {
+        return '系统';
+      } else if (type == 1) {
+        return '用户';
+      } else if (type == 2) {
+        return '平台';
+      } else {
+        return '未知';
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.head {
+  padding: 30px 35px 25px;
+  .full {
+    display: flex;
+    align-items: center;
+    .order_icon {
+      width: 60px;
+      height: 60px;
+    }
+    .iconfont {
+      color: #437FFD;
+      &.sale-after {
+        color: #90add5;
+      }
+    }
+    .text {
+      align-self: center;
+      flex: 1;
+      min-width: 0;
+      padding-left: 12px;
+      font-size: 13px;
+      color: #606266;
+      .title {
+        margin-bottom: 10px;
+        font-weight: 500;
+        font-size: 16px;
+        line-height: 16px;
+        color: rgba(0, 0, 0, 0.85);
+      }
+      .order-num {
+        padding-top: 10px;
+        white-space: nowrap;
+      }
+    }
+  }
+  .list {
+    display: flex;
+    margin-top: 20px;
+    overflow: hidden;
+    list-style: none;
+    padding: 0;
+    .item {
+      flex: none;
+      width: 200px;
+      font-size: 14px;
+      line-height: 14px;
+      color: rgba(0, 0, 0, 0.85);
+      .title {
+        margin-bottom: 12px;
+        font-size: 13px;
+        line-height: 13px;
+        color: #666666;
+      }
+      .value1 {
+        color: #f56022;
+      }
+
+      .value2 {
+        color: #1bbe6b;
+      }
+
+      .value3 {
+        color: #437FFD;
+      }
+
+      .value4 {
+        color: #6a7b9d;
+      }
+
+      .value5 {
+        color: #f5222d;
+      }
+    }
+  }
+}
+.el-tabs--border-card {
+  box-shadow: none;
+  border-bottom: none;
+}
+.section {
+  padding: 20px 0 5px;
+  border-bottom: 1px dashed #eeeeee;
+  .title {
+    padding-left: 10px;
+    border-left: 3px solid #437FFD;
+    font-size: 15px;
+    line-height: 15px;
+    color: #303133;
+  }
+  .list {
+    display: flex;
+    flex-wrap: wrap;
+    list-style: none;
+    padding: 0;
+  }
+  .item {
+    flex: 0 0 calc(100% / 3);
+    display: flex;
+    margin-top: 16px;
+    font-size: 13px;
+    color: #606266;
+    &:nth-child(3n + 1) {
+      padding-right: 20px;
+    }
+
+    &:nth-child(3n + 2) {
+      padding-right: 10px;
+      padding-left: 10px;
+    }
+
+    &:nth-child(3n + 3) {
+      padding-left: 20px;
+    }
+  }
+  .value {
+    flex: 1;
+    image {
+      display: inline-block;
+      width: 40px;
+      height: 40px;
+      margin: 0 12px 12px 0;
+      vertical-align: middle;
+    }
+  }
+}
+.tab {
+  display: flex;
+  align-items: center;
+  .el-image {
+    width: 36px;
+    height: 36px;
+    margin-right: 10px;
+  }
+}
+/deep/.el-drawer__body {
+  overflow: auto;
+}
+.gary {
+  color: #aaa;
+}
+.logistics{
+  align-items: center;
+  padding: 10px 0px;
+  .logistics_img{
+    width: 45px;
+    height: 45px;
+    margin-right: 12px;
+    img{
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .logistics_cent{
+    span{
+      display: block;
+      font-size: 12px;
+    }
+  }
+}
+.tabBox_tit {
+  width: 53%;
+  font-size: 12px !important;
+  margin: 0 2px 0 10px;
+  letter-spacing: 1px;
+  padding: 5px 0;
+  box-sizing: border-box;
+}
+</style>
diff --git a/src/views/marketing/integral/productList/goodsList.vue b/src/views/marketing/integral/productList/goodsList.vue
new file mode 100644
index 0000000..75e62a8
--- /dev/null
+++ b/src/views/marketing/integral/productList/goodsList.vue
@@ -0,0 +1,153 @@
+<template>
+  <el-dialog v-if="dialogVisible" title="商品信息" :visible.sync="dialogVisible" width="1000px">
+    <div class="divBox">
+      <div class="header clearfix">
+        <div class="container">
+          <el-form size="small" inline label-width="100px">
+            <el-form-item label="商品分类：" class="width100">
+              <el-cascader v-model="tableFrom.pid" :options="merCateList" :props="{ checkStrictly: true, emitPath:false }" clearable @change="getList(1)" />
+            </el-form-item>
+            <el-form-item label="商品搜索：" class="width100">
+              <el-input
+                v-model="tableFrom.keyword"
+                placeholder="请输入商品名称，关键字，编号"
+                clearable
+                @keyup.enter.native="getList"
+              >
+                <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
+              </el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+       <el-alert
+        title="注：添加为预售商品后，原普通商品会下架；如该商品已开启其它营销活动，请勿选择！"
+        type="warning"
+        v-if="resellShow"
+        show-icon>
+      </el-alert>
+      <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%;margin-top:10px;" size="mini">
+        <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="80">
+          <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="150" />
+        <el-table-column prop="stock" label="库存" min-width="80" />
+      </el-table>
+      <div class="block mb20">
+        <el-pagination
+          :page-sizes="[10, 20, 40]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import { merProductLstApi, categoryListApi } from '@/api/product'
+import { roterPre } from '@/settings'
+export default {
+  name: 'GoodsList',
+  props:{
+    resellShow:{
+      type:Boolean,
+      default:false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      templateRadio: 0,
+      merCateList: [],
+      roterPre: roterPre,
+      listLoading: true,
+      tableData: {
+        data: [],
+        total: 0
+      },
+      tableFrom: {
+        page: 1,
+        limit: 10,
+        cate_id: '',
+        store_name: '',
+        keyword: '',
+        type: 1,
+        is_gift_bag: 0,
+      },
+      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() {
+      categoryListApi().then(res => {
+        this.merCateList = res.data
+      }).catch(res => {
+        this.$message.error(res.message)
+      })
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true
+      this.tableFrom.page = num || this.tableFrom.page;
+      merProductLstApi(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()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/views/marketing/integral/productList/index.vue b/src/views/marketing/integral/productList/index.vue
new file mode 100644
index 0000000..d811065
--- /dev/null
+++ b/src/views/marketing/integral/productList/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="divBox">
+    <el-card class="box-card">
+      <div class="container">
+        <el-form ref="tableFrom" :model="tableFrom" size="small" label-width="90px" :inline="true">
+          <el-form-item label="创建时间：" prop="date">
+            <el-date-picker
+              v-model="timeVal"
+              value-format="yyyy/MM/dd"
+              align="right"
+              unlink-panels
+              format="yyyy/MM/dd"
+              size="small"
+              type="daterange"
+              placement="bottom-end"
+              placeholder="自定义时间"
+              class="selWidth"
+              :picker-options="pickerOptions"
+              @change="onchangeTime"
+            />
+          </el-form-item>
+          <el-form-item label="上架状态：" prop="status">
+            <el-select
+              v-model="tableFrom.is_used"
+              placeholder="请选择"
+              class="filter-item selWidth"
+              clearable
+              @change="getList(1)"
+            >
+              <el-option label="上架" :value="1" />
+              <el-option label="下架" :value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="商品搜索：">
+            <el-input
+              v-model="tableFrom.keyword"
+              placeholder="请输入商品名称/ID"
+              class="selWidth"
+              clearable
+              @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="reset('tableFrom')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <router-link :to="{ path: `${roterPre}` + '/marketing/integral/addProduct' }">
+        <el-button size="small" type="primary">添加积分商品</el-button>
+      </router-link>
+      <el-button size="small" type="success" @click="quickAdd()">快速添加</el-button>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData.data"
+        style="width: 100%"
+        class="mt20"
+        size="small"
+        highlight-current-row
+      >
+        <el-table-column prop="product_id" label="ID" min-width="50" />
+        <el-table-column min-width="100" label="商品图片">
+          <template slot-scope="scope">
+            <el-image style="width: 36px; height: 36px" :src="scope.row.image" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="store_name" label="商品标题" min-width="150" />
+        <el-table-column prop="ot_price" label="兑换积分" min-width="100" />
+        <el-table-column prop="price" label="兑换金额" min-width="100" />
+        <el-table-column prop="stock" label="库存" min-width="80" />
+        <el-table-column prop="sales" label="已兑换数量" min-width="100" />
+        <el-table-column prop="create_time" min-width="200" label="创建时间" />
+        <el-table-column prop="sort" min-width="120" label="排序" />
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_used"
+              :active-value="1"
+              :inactive-value="0"
+              active-text="上架"
+              inactive-text="下架"
+              @click.native="onchangeIsShow(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="180" fixed="right">
+          <template slot-scope="scope">
+            <router-link :to="{ path: `${roterPre}` + '/marketing/integral/orderList?id=' + scope.row.product_id }">
+              <el-button type="text" size="small" class="mr10">兑换记录</el-button>
+            </router-link>
+            <router-link :to="{ path: `${roterPre}` + '/marketing/integral/addProduct/' + scope.row.product_id }">
+              <el-button type="text" size="small" class="mr10">编辑</el-button>
+            </router-link>
+             <router-link :to="{ path: `${roterPre}` + '/marketing/integral/addProduct/' + scope.row.product_id + '?type=2' }">
+              <el-button type="text" size="small" class="mr10">复制</el-button>
+            </router-link>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.product_id, scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :page-sizes="[20, 40, 60, 80]"
+          :page-size="tableFrom.limit"
+          :current-page="tableFrom.page"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="tableData.total"
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+        />
+      </div>
+    </el-card>
+    <!--快速添加商品-->
+    <goods-list ref="goodsList" @getProduct="getProduct"></goods-list>
+  </div>
+</template>
+
+<script>
+
+import { integralProList, integralProDeleteApi, integralProductStatusApi } from '@/api/marketing';
+import { roterPre } from '@/settings';
+import timeOptions from '@/utils/timeOptions';
+import goodsList from './goodsList'
+export default {
+  name: 'integralProduct',
+  components: {goodsList},
+  data() {
+    return {
+      props: { multiple: false, emitPath: false },
+      Loading: false,
+      dialogVisible: false,
+      roterPre: roterPre,
+      listLoading: true,
+      receiveType: 0,
+      id: '',
+      categoryList: [],
+      labelList: [],
+      tableData: {
+        data: [],
+        total: 0,
+      },
+      tableFrom: {
+        page: 1,
+        limit: 20,
+        keyword: '',
+        is_used: '',
+        date: '',
+      },
+      type: 0,
+      isShow: false,
+      pickerOptions: timeOptions,
+      timeVal: [],
+    };
+  },
+  mounted() {
+    this.getList(1);
+  },
+  methods: {
+    quickAdd(){
+      this.$refs.goodsList.dialogVisible = true;
+    },
+    getProduct(row){
+      this.$router.push({ path: this.roterPre + `/marketing/integral/addProduct/${row.id}?type=1` });
+    },
+    onchangeTime(e) {
+     this.timeVal = e
+      this.tableFrom.date = e ? this.timeVal.join('-') : ''
+      this.tableFrom.page = 1;
+      this.getList()
+    },
+    reset(formName) {
+      this.timeVal = [];
+      this.tableFrom = {
+        page: 1,
+        limit: 20,
+        keyword: '',
+        is_used: '',
+        date: '',
+      };
+      this.getList('');
+    },
+    // 删除
+    handleDelete(id, idx) {
+      this.$modalSureDelete(`删除积分商品后将无法恢复，请谨慎操作!`).then(() => {
+        integralProDeleteApi(id)
+          .then(({ message }) => {
+            this.$message.success(message);
+            this.getList('');
+          })
+          .catch(({ message }) => {
+            this.$message.error(message);
+          });
+      });
+    },
+    // 列表
+    getList(num) {
+      this.listLoading = true;
+      this.tableFrom.page = num || this.tableFrom.page;
+      integralProList(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('');
+    },
+    // 修改状态
+    onchangeIsShow(row) {
+      integralProductStatusApi(row.product_id, row.is_used)
+        .then(({ message }) => {
+          this.$message.success(message);
+          this.getList('');
+        })
+        .catch(({ message }) => {
+          this.$message.error(message);
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.modalbox {
+  /deep/.el-dialog {
+    min-width: 550px;
+  }
+}
+.selWidth {
+  width: 250px !important;
+}
+.container {
+  min-width: 821px;
+}
+.selWidth {
+  width: 100%;
+}
+.dialogBox {
+  box-sizing: border-box;
+  .el-pagination {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 25px;
+  }
+}
+</style>
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 622438e..c41a431 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -738,7 +738,8 @@ export default {
         this.isDump = res.data.crmeb_serve_dump
         if (res.data.crmeb_serve_dump == 1) this.getEleTempData()
       }).catch((res) => {
-        this.$message.error(res.message)
+        console.log(res);
+        // this.$message.error(res.message)
       })
     },
     // 获取快递公司列表