From 3b381d8e1f4c67c87603b8a162d3f32e07b53754 Mon Sep 17 00:00:00 2001
From: xk_chenlianjie <15255791639@163.com>
Date: Tue, 30 Jan 2024 11:31:26 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/finance/marketing.js                  |  300 ++---
 src/components/Upload/index.vue               |  261 ++--
 .../advertisement/advertisementAdd.vue        |  236 ++--
 .../advertisement/advertisementList.vue       |  558 ++++-----
 .../advertisement/advertisementUpdate.vue     |  229 ++--
 src/views/order/orderListCancle.vue           |  186 +--
 src/views/order/orderListDetail.vue           |  595 ++++-----
 src/views/order/orderRefundListDetail.vue     |  548 ++++----
 .../statistics/productStatisticsList.vue      | 1101 +++++++++--------
 vue.config.js                                 |  288 ++---
 10 files changed, 2174 insertions(+), 2128 deletions(-)

diff --git a/src/api/finance/marketing.js b/src/api/finance/marketing.js
index 4f86586..548554a 100644
--- a/src/api/finance/marketing.js
+++ b/src/api/finance/marketing.js
@@ -1,150 +1,150 @@
-import request from '@/utils/request'
-var service_name = 'oil-mall'
-var group_name = 'mallAdvertise'
-var new_group_name = 'mallHomeRecommended'
-export default {
-  getByPage(page) {
-    // 分页查询
-    return request({
-      url: `/${service_name}/${group_name}/getByPage`,
-      method: 'post',
-      data: page
-    })
-  },
-
-  save(data) {
-    // 新增广告
-    return request({
-      url: `/${service_name}/${group_name}/save`,
-      method: 'post',
-      data: data
-    })
-  },
-  update(data) {
-    // 修改广告
-    return request({
-      url: `/${service_name}/${group_name}/update`,
-      method: 'post',
-      data: data
-    })
-  },
-  delete(data) {
-    // 删除广告
-    return request({
-      url: `/${service_name}/${group_name}/delete`,
-      method: 'post',
-      data: data
-    })
-  },
-
-  get(id) {
-    // 查询广告详情
-    return request({
-      url: `/${service_name}/${group_name}/get/${id}`,
-      method: 'get'
-    })
-  },
-  goOnlineAndGoOffline(page) {
-    // 广告上下线
-    return request({
-      url: `/${service_name}/${group_name}/goOnlineAndGoOffline`,
-      method: 'post',
-      data: page
-    })
-  },
-
-  getHomeByPage(page) {
-    // 分页查询
-    return request({
-      url: `/${service_name}/${new_group_name}/getByPage`,
-      method: 'post',
-      data: page
-    })
-  },
-  topOne(id) {
-    // 置顶
-    return request({
-      url: `/${service_name}/${new_group_name}/topOne/${id}`,
-      method: 'get'
-    })
-  },
-
-  homeDelete(page) {
-    // 删除首页推荐
-    return request({
-      url: `/${service_name}/${new_group_name}/delete`,
-      method: 'post',
-      data: page
-    })
-  },
-  whetherToRecommend(page) {
-    // 修改是否推荐
-    return request({
-      url: `/${service_name}/${new_group_name}/whetherToRecommend`,
-      method: 'post',
-      data: page
-    })
-  },
-  chooseProducts(page) {
-    // 选择商品新增推荐
-    return request({
-      url: `/${service_name}/${new_group_name}/chooseProducts`,
-      method: 'post',
-      data: page
-    })
-  },
-  getModuleByPage(page) {
-    // 模块分页查询
-    return request({
-      url: `/${service_name}/mallModule/getByPage`,
-      method: 'post',
-      data: page
-    })
-  },
-  getProductByPage(page) {
-    // 商品分页查询
-    return request({
-      url: `/${service_name}/mallProductInfo/getByPage`,
-      method: 'post',
-      data: page
-    })
-  },
-  getByPageNew(page) {
-    // 搜索统计列表
-    return request({
-      url: `/${service_name}/mallSearch/getByPageNew`,
-      method: 'post',
-      data: page
-    })
-  },
-  getProductByPage(page) {
-    // 商品销售列表
-    return request({
-      url: `/${service_name}/mallProductInfo/getPage`,
-      method: 'post',
-      data: page
-    })
-  },
-  commodityChart(time) {
-    // 商品统计图
-    return request({
-      url: `/${service_name}/mallProductClassification/commodityChart/${time}`,
-      method: 'get'
-    })
-  },
-  updateModule(page) {
-    // 模块显示隐藏
-    return request({
-      url: `/${service_name}/mallModule/update`,
-      method: 'post',
-      data: page
-    })
-  },
-  fluctuation(id, type) {
-    // 模块上下移动
-    return request({
-      url: `/${service_name}/mallModule/fluctuation/${id}/${type}`,
-      method: 'get'
-    })
-  }
-}
+import request from '@/utils/request'
+var service_name = 'oil-mall'
+var group_name = 'mallAdvertise'
+var new_group_name = 'mallHomeRecommended'
+export default {
+  getByPage(page) {
+    // 分页查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+
+  save(data) {
+    // 新增广告
+    return request({
+      url: `/${service_name}/${group_name}/save`,
+      method: 'post',
+      data: data
+    })
+  },
+  update(data) {
+    // 修改广告
+    return request({
+      url: `/${service_name}/${group_name}/update`,
+      method: 'post',
+      data: data
+    })
+  },
+  delete(data) {
+    // 删除广告
+    return request({
+      url: `/${service_name}/${group_name}/delete`,
+      method: 'post',
+      data: data
+    })
+  },
+
+  get(id) {
+    // 查询广告详情
+    return request({
+      url: `/${service_name}/${group_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+  goOnlineAndGoOffline(page) {
+    // 广告上下线
+    return request({
+      url: `/${service_name}/${group_name}/goOnlineAndGoOffline`,
+      method: 'post',
+      data: page
+    })
+  },
+
+  getHomeByPage(page) {
+    // 分页查询
+    return request({
+      url: `/${service_name}/${new_group_name}/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  topOne(id) {
+    // 置顶
+    return request({
+      url: `/${service_name}/${new_group_name}/topOne/${id}`,
+      method: 'get'
+    })
+  },
+
+  homeDelete(page) {
+    // 删除首页推荐
+    return request({
+      url: `/${service_name}/${new_group_name}/delete`,
+      method: 'post',
+      data: page
+    })
+  },
+  whetherToRecommend(page) {
+    // 修改是否推荐
+    return request({
+      url: `/${service_name}/${new_group_name}/whetherToRecommend`,
+      method: 'post',
+      data: page
+    })
+  },
+  chooseProducts(page) {
+    // 选择商品新增推荐
+    return request({
+      url: `/${service_name}/${new_group_name}/chooseProducts`,
+      method: 'post',
+      data: page
+    })
+  },
+  getModuleByPage(page) {
+    // 模块分页查询
+    return request({
+      url: `/${service_name}/mallModule/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  getProductByPage(page) {
+    // 商品分页查询
+    return request({
+      url: `/${service_name}/mallProductInfo/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  getByPageNew(page) {
+    // 搜索统计列表
+    return request({
+      url: `/${service_name}/mallSearch/getByPageNew`,
+      method: 'post',
+      data: page
+    })
+  },
+  getProductByPage(page) {
+    // 商品销售列表
+    return request({
+      url: `/${service_name}/mallProductInfo/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  commodityChart(time) {
+    // 商品统计图
+    return request({
+      url: `/${service_name}/mallProductClassification/commodityChart/${time}`,
+      method: 'get'
+    })
+  },
+  updateModule(page) {
+    // 模块显示隐藏
+    return request({
+      url: `/${service_name}/mallModule/update`,
+      method: 'post',
+      data: page
+    })
+  },
+  fluctuation(id, type) {
+    // 模块上下移动
+    return request({
+      url: `/${service_name}/mallModule/fluctuation/${id}/${type}`,
+      method: 'get'
+    })
+  }
+}
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index e0d1aed..8fe7248 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -1,123 +1,138 @@
-<template>
-  <div class="photo-container">
-    <div>
-      <el-upload class="avatar-uploader" :action="uploadUrl"  :show-file-list="false"
-        :on-success="uploadSuccess" :on-remove="removeUrl"
-        :data="{ code: code, ossKey: 'xingyou2', pathKey: 'banner-group', encrypt: 'PUBLIC' }">
-        <img v-if="photoUrl" :src="photoUrl" class="avatar" />
-        <i v-else class="el-icon-plus avatar-uploader-icon" />
-      </el-upload>
-      <slot name="button_footer" style="width: 100%;text-align: center;">
-        <i @click="removeUrl" style="font-size: 20px;" v-if="photoUrl" class="el-icon-delete" />
-      </slot>
-    </div>
-    <span class="upload-span">
-      <slot name="bottom">{{ tip }}</slot>
-    </span>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    tip: {
-      type: String,
-      default: '请上传图片'
-    },
-    photo: {
-      // 传参用的url
-      type: String,
-      default: null
-    },
-    code: {
-      type: String,
-      default: 'A001'
-    },
-    isPrivate: {
-      // 是否加密
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      uploadUrl: process.env.VUE_APP_UPLOAD_URL,
-      photoUrl: this.photo,
-      header: {}
-    }
-  },
-  watch: {
-    photo: function (newVal, oldVal) {
-      this.photoUrl = newVal
-    },
-    isPrivate: function (newVal, oldVal) {
-      this.changeUploadUrl
-    }
-  },
-  created() {
-    this.changeUploadUrl()
-  },
-  methods: {
-    changeUploadUrl() {
-      if (this.isPrivate) {
-        this.uploadUrl = process.env.VUE_APP_UPLOAD_PRIVATE_URL
-      } else {
-        this.uploadUrl = process.env.VUE_APP_UPLOAD_URL
-      }
-    },
-    removeUrl(file, fileList) {
-      this.$emit('success', undefined, { data: { publicUrl: '' }, code: 20000 })
-    },
-    uploadSuccess(res, file) {
-      if (res.code === 20000) {
-        this.$message.success(res.msg)
-        this.photoUrl = res.data.url
-        if (this.isPrivate) {
-          this.$emit('success', this.res.path, res)
-        } else {
-          this.$emit('success', this.photoUrl, res)
-        }
-      } else {
-        this.$message.error(res.msg)
-      }
-    }
-  }
-}
-</script>
-<style scoped lang="scss"></style>
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-
-.photo-container {
-  display: flex;
-  flex-direction: column;
-  /* justify-content: space-around; */
-  /* align-items: center; */
-  margin-bottom: 20px;
-}
-</style>
+<template>
+  <div class="photo-container">
+    <div>
+      <el-upload
+        accept=".png,.jpg"
+        class="avatar-uploader"
+        :action="uploadUrl"
+        :show-file-list="false"
+        :on-success="uploadSuccess"
+        :on-remove="removeUrl"
+        :before-upload="beforeAvatarUpload"
+        :data="{ code: code, ossKey: 'xingyou2', pathKey: 'banner-group', encrypt: 'PUBLIC' }"
+      >
+        <img v-if="photoUrl" :src="photoUrl" class="avatar" />
+        <i v-else class="el-icon-plus avatar-uploader-icon" />
+      </el-upload>
+      <slot name="button_footer" style="width: 100%;text-align: center;">
+        <i @click="removeUrl" style="font-size: 20px;" v-if="photoUrl" class="el-icon-delete" />
+      </slot>
+    </div>
+    <span class="upload-span">
+      <slot name="bottom">{{ tip }}</slot>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tip: {
+      type: String,
+      default: '请上传图片'
+    },
+    photo: {
+      // 传参用的url
+      type: String,
+      default: null
+    },
+    code: {
+      type: String,
+      default: 'A001'
+    },
+    isPrivate: {
+      // 是否加密
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      uploadUrl: process.env.VUE_APP_UPLOAD_URL,
+      photoUrl: this.photo,
+      header: {}
+    }
+  },
+  watch: {
+    photo: function(newVal, oldVal) {
+      this.photoUrl = newVal
+    },
+    isPrivate: function(newVal, oldVal) {
+      this.changeUploadUrl
+    }
+  },
+  created() {
+    this.changeUploadUrl()
+  },
+  methods: {
+    changeUploadUrl() {
+      if (this.isPrivate) {
+        this.uploadUrl = process.env.VUE_APP_UPLOAD_PRIVATE_URL
+      } else {
+        this.uploadUrl = process.env.VUE_APP_UPLOAD_URL
+      }
+    },
+    removeUrl(file, fileList) {
+      this.$emit('success', undefined, { data: { publicUrl: '' }, code: 20000 })
+    },
+    uploadSuccess(res, file) {
+      if (res.code === 20000) {
+        this.$message.success(res.msg)
+        this.photoUrl = res.data.url
+        if (this.isPrivate) {
+          this.$emit('success', this.res.path, res)
+        } else {
+          this.$emit('success', this.photoUrl, res)
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    beforeAvatarUpload(file) {
+      const isLt2M = file.size / 1024 < 50
+
+      if (!isLt2M) {
+        this.$message.error('图片大小不能超过50KB! 请重新上传!')
+      }
+      return isLt2M
+    }
+  }
+}
+</script>
+<style scoped lang="scss"></style>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+
+.photo-container {
+  display: flex;
+  flex-direction: column;
+  /* justify-content: space-around; */
+  /* align-items: center; */
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/marketing/advertisement/advertisementAdd.vue b/src/views/marketing/advertisement/advertisementAdd.vue
index 97bd073..536ae06 100644
--- a/src/views/marketing/advertisement/advertisementAdd.vue
+++ b/src/views/marketing/advertisement/advertisementAdd.vue
@@ -1,117 +1,119 @@
-<template>
-  <div class="divBox">
-    <!-- <el-card class="box-card"> -->
-    <!-- <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
-        添加广告
-      </div> -->
-    <el-form :rules="rules" ref="form" :model="advertisement" class="formValidate " label-width="100px">
-      <el-row>
-        <el-col :span="15">
-          <el-form-item label="广告名称" prop="advertiseName">
-            <el-input v-model="advertisement.advertiseName" maxlength="249" placeholder="请输入商品名称" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="15">
-          <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker style="width:100%" v-model="advertisement.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="15">
-          <el-form-item label="结束时间" prop="endTime">
-            <el-date-picker style="width:100%" v-model="advertisement.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
-          <el-form-item label="上线/下线">
-            <el-radio-group v-model="advertisement.isDownline">
-              <el-radio label="1">上线</el-radio>
-              <el-radio label="0">下线</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-
-        <el-col>
-          <el-form-item label="广告图片" prop="positionImage">
-            <div class="upLoadPicBox">
-              <upload :photo="advertisement.positionImage" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb"></upload>
-            </div>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="15">
-          <el-form-item label="广告链接" prop="advertiseUrl">
-            <el-input v-model="advertisement.advertiseUrl" type="url" placeholder="请输入广告链接" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-form-item>
-        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
-        <el-button :size="$store.getters.size" @click="close">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- </el-card> -->
-  </div>
-</template>
-<script>
-import marketingApi from '@/api/finance/marketing.js'
-import { loadingFn } from '@/utils/validate'
-import upload from '@/components/Upload/index'
-export default {
-  components: { upload },
-  data() {
-    return {
-      advertisement: { isDownline: '1', positionImage: '' },
-
-      rules: {
-        advertiseName: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
-        startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-        endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
-        positionImage: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
-        advertiseUrl: [{ required: true, message: '请输入广告链接', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    handleSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.save()
-        }
-      })
-    },
-    save() {
-      loadingFn.call(
-        this,
-        'loading',
-        marketingApi.save(this.advertisement).then(res => {
-          if ((res.code = 20000)) this.$message.success(res.msg)
-          this.$emit('closeDialog')
-          this.$emit('getList')
-        })
-      )
-    },
-    uploadSuccess(e, res) {
-      console.log(res)
-      if (res.code == 20000) {
-        this.advertisement.positionImage = res.data.publicUrl
-      }
-    },
-    handleSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.save(this.advertisement)
-        }
-      })
-    },
-    close() {
-      this.$emit('closeDialog')
-    }
-  }
-}
-</script>
-<style scoped lang="stylus"></style>
+<template>
+  <div class="divBox">
+    <!-- <el-card class="box-card"> -->
+    <!-- <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
+        添加广告
+      </div> -->
+    <el-form :rules="rules" ref="form" :model="advertisement" class="formValidate " label-width="100px">
+      <el-row>
+        <el-col :span="15">
+          <el-form-item label="广告名称" prop="advertiseName">
+            <el-input v-model="advertisement.advertiseName" maxlength="249" placeholder="请输入商品名称" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="15">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker style="width:100%" v-model="advertisement.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="15">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker style="width:100%" v-model="advertisement.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="上线/下线">
+            <el-radio-group v-model="advertisement.isDownline">
+              <el-radio label="1">上线</el-radio>
+              <el-radio label="0">下线</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col>
+          <el-form-item label="广告图片" prop="positionImage">
+            <div class="upLoadPicBox">
+              <upload :photo="advertisement.positionImage" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb"></upload>
+            </div>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="15">
+          <el-form-item label="广告链接" prop="advertiseUrl">
+            <el-input v-model="advertisement.advertiseUrl" type="url" placeholder="请输入广告链接" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
+        <el-button :size="$store.getters.size" @click="close">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- </el-card> -->
+  </div>
+</template>
+<script>
+import marketingApi from '@/api/finance/marketing.js'
+import { loadingFn } from '@/utils/validate'
+import upload from '@/components/Upload/index'
+export default {
+  components: { upload },
+  data() {
+    return {
+      advertisement: { isDownline: '1', positionImage: '' },
+
+      rules: {
+        advertiseName: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
+        startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
+        endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+        positionImage: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
+        advertiseUrl: [{ required: true, message: '请输入广告链接', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    handleSubmit() {
+      var start = new Date(this.advertisement.startTime).getTime()
+      var end = new Date(this.advertisement.endTime).getTime()
+
+      console.log('----', start, end)
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (start > end) {
+            this.$message.error('开始时间不得大于结束时间！')
+          } else {
+            this.save()
+          }
+        }
+      })
+    },
+    save() {
+      loadingFn.call(
+        this,
+        'loading',
+        marketingApi.save(this.advertisement).then(res => {
+          if ((res.code = 20000)) this.$message.success(res.msg)
+          this.$emit('closeDialog')
+          this.$emit('getList')
+        })
+      )
+    },
+    uploadSuccess(e, res) {
+      console.log(res)
+      if (res.code == 20000) {
+        this.advertisement.positionImage = res.data.publicUrl
+      }
+    },
+
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style scoped lang="stylus"></style>
diff --git a/src/views/marketing/advertisement/advertisementList.vue b/src/views/marketing/advertisement/advertisementList.vue
index dcf479b..bab6710 100644
--- a/src/views/marketing/advertisement/advertisementList.vue
+++ b/src/views/marketing/advertisement/advertisementList.vue
@@ -1,279 +1,279 @@
-<template>
-  <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt-16">
-      <div>
-        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent>
-          <el-form-item label="广告名称：">
-            <el-input clearable placeholder="广告名称" v-model="page.params.advertiseName" class="form_content_width" />
-          </el-form-item>
-          <el-form-item label="是否上线：">
-            <el-select v-model="page.params.isDownline" placeholder="状态" clearable @keyup.enter.native="getList">
-              <el-option label="是" value="0" />
-              <el-option label="否" value="1" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="到期时间：">
-            <el-date-picker v-model="page.params.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="userSearchs">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <el-button type="primary" class="bnt" @click="addClass()">添加广告</el-button>
-      <el-dropdown class="bnt mr14" @command="batchSelect">
-        <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item :command="1">删除</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-      <el-table row-key="id" class="mt14" v-loading="loading" :data="tableData" empty-text="暂无数据" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="id" label="编号" min-width="120"></el-table-column>
-        <el-table-column prop="advertiseName" label="广告名称"></el-table-column>
-        <el-table-column prop="advertisePosition" label="广告位置"></el-table-column>
-        <el-table-column prop="positionImage" label="广告图片" min-width="80">
-          <template slot-scope="scope">
-            <el-image style="width: 50px; height: 50px" :src="scope.row.positionImage"> </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column label="时间" min-width="150">
-          <template slot-scope="scope">
-            <span>开始时间：{{ scope.row.startTime }}</span>
-            <br />
-            <span>到期时间：{{ scope.row.endTime }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="isDownline" label="上线/下线">
-          <template slot-scope="scope">
-            <el-switch
-              :active-value="1"
-              :inactive-value="0"
-              @change="onchangeIsShow(scope.row)"
-              v-model="scope.row.isDownline"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-            >
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column prop="sortNumber" label="排序" min-width="50" tooltip="true"></el-table-column>
-        <el-table-column prop="date" label="操作" width="120" fixed="right">
-          <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
-
-            <el-button @click="del(scope.row, scope)" type="text">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <div class="acea-row row-right page">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="page.currentPage"
-        :page-sizes="[10, 15, 20, 30]"
-        :page-size="page.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="page.totalCount"
-      />
-    </div>
-
-    <el-dialog title="添加广告" :visible.sync="addDialog" v-el-drag-dialog width="45%">
-      <advertisementAdd @getList="getList" @closeDialog="closeDialog" v-if="addDialog" />
-    </el-dialog>
-
-    <el-dialog title="修改广告" :visible.sync="updateDialog" v-el-drag-dialog width="45%">
-      <advertisementUpdate @getList="getList" @closeDialog="closeDialog" v-if="updateDialog" :advertisement="advertisement" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import advertisementAdd from './advertisementAdd'
-import advertisementUpdate from './advertisementUpdate'
-import marketingApi from '@/api/finance/marketing.js'
-import { loadingFn } from '@/utils/validate'
-export default {
-  name: 'product_productClassify',
-  components: {
-    // editFrom,
-    advertisementAdd,
-    advertisementUpdate
-  },
-  data() {
-    return {
-      addDialog: false, // 添加弹窗
-      updateDialog: false, // 修改弹窗
-      treeSelect: [],
-      FromData: null,
-      multipleSelection: [],
-      advertisement: {},
-      grid: {
-        xl: 7,
-        lg: 7,
-        md: 12,
-        sm: 24,
-        xs: 24
-      },
-      loading: false,
-
-      page: {
-        currentPage: 1,
-        pageSize: 10,
-        params: {},
-        totalCount: 0
-      },
-      total: 0,
-      tableData: [],
-      delData: { ids: [] }
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 批量设置商品
-    batchSelect(type) {
-      this.delData = {}
-      if (!this.multipleSelection || this.multipleSelection.length < 1) {
-        this.$message.error('请选择需要操作的数据')
-        return
-      }
-      this.$alert('确定批量删除？', '提示', {
-        confirmButtonText: '确定',
-        callback: action => {
-          if (action == 'confirm') {
-            this.delData = Object.assign(this.delData, { ids: this.multipleSelection })
-
-            loadingFn.call(
-              this,
-              'loading',
-              marketingApi.delete(this.delData).then(res => {
-                if ((res.code = 20000)) {
-                  this.$message.success('操作成功！')
-                  this.handleCurrentChange()
-                }
-              })
-            )
-          }
-        }
-      })
-    },
-    handleSizeChange(val) {
-      this.page.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.page.currentPage = val
-      this.getList()
-    },
-    handleSelectionChange(val) {
-      console.log('handleSelectionChange-----', val)
-      this.multipleSelection = val
-    },
-    // 列表
-    getList() {
-      loadingFn.call(
-        this,
-        'loading',
-        marketingApi.getByPage(this.page).then(res => {
-          if ((res.code = 20000)) ({ list: this.tableData = [], totalCount: this.page.totalCount = 0 } = res.data)
-        })
-      )
-    },
-    pageChange(index) {
-      this.page.currentPage = index
-      this.getList()
-    },
-    // 添加
-    addClass() {
-      this.addDialog = true
-    },
-    // 编辑
-    edit(row) {
-      // 跳转到更新
-      marketingApi.get(row.id).then(res => {
-        this.advertisement = res.data
-        this.updateDialog = true
-      })
-    },
-
-    closeDialog() {
-      this.addDialog = false
-      this.updateDialog = false
-    },
-    // 修改状态
-    onchangeIsShow(row) {
-      console.log(row)
-      let data = {
-        id: row.id,
-        isDownline: row.isDownline
-      }
-      marketingApi
-        .goOnlineAndGoOffline(data)
-        .then(async res => {
-          this.$message.success(res.msg)
-          this.getList()
-        })
-        .catch(res => {
-          this.$message.error(res.msg)
-          this.getList()
-        })
-    },
-
-    // 删除
-    del(row, scope) {
-      console.log(row)
-
-      this.$alert('请确定删除！', '提示', {
-        confirmButtonText: '确定',
-        callback: action => {
-          if (action == 'confirm') {
-            this.delData = {}
-            this.delData.ids.push(row)
-            console.log('----', this.delData)
-            loadingFn.call(
-              this,
-              'loading',
-              marketingApi.delete(this.delData).then(res => {
-                if ((res.code = 20000)) {
-                  this.$message.success('操作成功！')
-                  this.handleCurrentChange()
-                }
-              })
-            )
-          }
-        }
-      })
-    },
-    // 表格搜索
-    userSearchs() {
-      this.page.currentPage = 1
-      this.getList()
-    }
-  }
-}
-</script>
-<style scoped lang="stylus">
-.treeSel ::v-deep .ivu-select-dropdown-list {
-  padding: 0 10px !important;
-  box-sizing: border-box;
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-
-
-  }
-}
-</style>
+<template>
+  <div class="article-manager">
+    <el-card :bordered="false" shadow="never" class="ivu-mt-16">
+      <div>
+        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent>
+          <el-form-item label="广告名称：">
+            <el-input clearable placeholder="广告名称" v-model="page.params.advertiseName" class="form_content_width" />
+          </el-form-item>
+          <el-form-item label="是否上线：">
+            <el-select v-model="page.params.isDownline" placeholder="状态" clearable @keyup.enter.native="getList">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="到期时间：">
+            <el-date-picker v-model="page.params.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"> </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="userSearchs">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <el-button type="primary" class="bnt" @click="addClass()">添加广告</el-button>
+      <el-dropdown class="bnt mr14" @command="batchSelect">
+        <el-button>批量修改<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item :command="1">删除</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-table row-key="id" class="mt14" v-loading="loading" :data="tableData" empty-text="暂无数据" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column prop="id" label="编号" min-width="120"></el-table-column>
+        <el-table-column prop="advertiseName" label="广告名称"></el-table-column>
+        <el-table-column prop="advertisePosition" label="广告位置"></el-table-column>
+        <el-table-column prop="positionImage" label="广告图片" min-width="80">
+          <template slot-scope="scope">
+            <el-image style="width: 50px; height: 50px" :src="scope.row.positionImage"> </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column label="时间" min-width="150">
+          <template slot-scope="scope">
+            <span>开始时间：{{ scope.row.startTime }}</span>
+            <br />
+            <span>到期时间：{{ scope.row.endTime }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="isDownline" label="上线/下线">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              @change="onchangeIsShow(scope.row)"
+              v-model="scope.row.isDownline"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column prop="sortNumber" label="排序" min-width="50" tooltip="true"></el-table-column>
+        <el-table-column prop="date" label="操作" width="120" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+
+            <el-button @click="del(scope.row, scope)" type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <div class="acea-row row-right page">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="page.currentPage"
+        :page-sizes="[10, 15, 20, 30]"
+        :page-size="page.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="page.totalCount"
+      />
+    </div>
+
+    <el-dialog title="添加广告" :visible.sync="addDialog" v-el-drag-dialog width="45%">
+      <advertisementAdd @getList="getList" @closeDialog="closeDialog" v-if="addDialog" />
+    </el-dialog>
+
+    <el-dialog title="修改广告" :visible.sync="updateDialog" v-el-drag-dialog width="45%">
+      <advertisementUpdate @getList="getList" @closeDialog="closeDialog" v-if="updateDialog" :advertisement="advertisement" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import advertisementAdd from './advertisementAdd'
+import advertisementUpdate from './advertisementUpdate'
+import marketingApi from '@/api/finance/marketing.js'
+import { loadingFn } from '@/utils/validate'
+export default {
+  name: 'product_productClassify',
+  components: {
+    // editFrom,
+    advertisementAdd,
+    advertisementUpdate
+  },
+  data() {
+    return {
+      addDialog: false, // 添加弹窗
+      updateDialog: false, // 修改弹窗
+      treeSelect: [],
+      FromData: null,
+      multipleSelection: [],
+      advertisement: {},
+      grid: {
+        xl: 7,
+        lg: 7,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      loading: false,
+
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        params: {},
+        totalCount: 0
+      },
+      total: 0,
+      tableData: [],
+      delData: { ids: [] }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 批量设置商品
+    batchSelect(type) {
+      this.delData = {}
+      if (!this.multipleSelection || this.multipleSelection.length < 1) {
+        this.$message.error('请选择需要操作的数据')
+        return
+      }
+      this.$alert('确定批量删除？', '提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          if (action == 'confirm') {
+            this.delData = Object.assign(this.delData, { ids: this.multipleSelection })
+
+            loadingFn.call(
+              this,
+              'loading',
+              marketingApi.delete(this.delData).then(res => {
+                if ((res.code = 20000)) {
+                  this.$message.success('操作成功！')
+                  this.handleCurrentChange()
+                }
+              })
+            )
+          }
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+      this.getList()
+    },
+    handleSelectionChange(val) {
+      console.log('handleSelectionChange-----', val)
+      this.multipleSelection = val
+    },
+    // 列表
+    getList() {
+      loadingFn.call(
+        this,
+        'loading',
+        marketingApi.getByPage(this.page).then(res => {
+          if ((res.code = 20000)) ({ list: this.tableData = [], totalCount: this.page.totalCount = 0 } = res.data)
+        })
+      )
+    },
+    pageChange(index) {
+      this.page.currentPage = index
+      this.getList()
+    },
+    // 添加
+    addClass() {
+      this.addDialog = true
+    },
+    // 编辑
+    edit(row) {
+      // 跳转到更新
+      marketingApi.get(row.id).then(res => {
+        this.advertisement = res.data
+        this.updateDialog = true
+      })
+    },
+
+    closeDialog() {
+      this.addDialog = false
+      this.updateDialog = false
+    },
+    // 修改状态
+    onchangeIsShow(row) {
+      console.log(row)
+      let data = {
+        id: row.id,
+        isDownline: row.isDownline
+      }
+      marketingApi
+        .goOnlineAndGoOffline(data)
+        .then(async res => {
+          this.$message.success(res.msg)
+          this.getList()
+        })
+        .catch(res => {
+          this.$message.error(res.msg)
+          this.getList()
+        })
+    },
+
+    // 删除
+    del(row, scope) {
+      console.log(row)
+
+      this.$alert('请确定删除！', '提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          if (action == 'confirm') {
+            this.delData = { ids: [] }
+            this.delData.ids.push(row)
+            console.log('----', this.delData)
+            loadingFn.call(
+              this,
+              'loading',
+              marketingApi.delete(this.delData).then(res => {
+                if ((res.code = 20000)) {
+                  this.$message.success('操作成功！')
+                  this.handleCurrentChange()
+                }
+              })
+            )
+          }
+        }
+      })
+    },
+    // 表格搜索
+    userSearchs() {
+      this.page.currentPage = 1
+      this.getList()
+    }
+  }
+}
+</script>
+<style scoped lang="stylus">
+.treeSel ::v-deep .ivu-select-dropdown-list {
+  padding: 0 10px !important;
+  box-sizing: border-box;
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+
+
+  }
+}
+</style>
diff --git a/src/views/marketing/advertisement/advertisementUpdate.vue b/src/views/marketing/advertisement/advertisementUpdate.vue
index 48524e1..3336ce3 100644
--- a/src/views/marketing/advertisement/advertisementUpdate.vue
+++ b/src/views/marketing/advertisement/advertisementUpdate.vue
@@ -1,111 +1,118 @@
-<template>
-  <div class="divBox">
-    <!-- <el-card class="box-card">
-      <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
-        添加广告
-      </div> -->
-    <el-form :rules="rules" ref="form" :model="advertisement" class="formValidate" label-width="100px">
-      <el-row>
-        <el-col :span="13">
-          <el-form-item label="广告名称" prop="advertiseName">
-            <el-input v-model="advertisement.advertiseName" maxlength="249" placeholder="请输入商品名称" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="13">
-          <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker style="width:100%" v-model="advertisement.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="13">
-          <el-form-item label="结束时间" prop="endTime">
-            <el-date-picker style="width:100%" v-model="advertisement.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
-          <el-form-item label="上线/下线">
-            <el-radio-group v-model="advertisement.isDownline">
-              <el-radio :label="1">上线</el-radio>
-              <el-radio :label="0">下线</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-
-        <el-col>
-          <el-form-item label="广告图片" prop="positionImage">
-            <div class="upLoadPicBox">
-              <upload :photo="advertisement.positionImage" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb"></upload>
-            </div>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="13">
-          <el-form-item label="广告链接" prop="advertiseUrl">
-            <el-input v-model="advertisement.advertiseUrl" type="url" placeholder="请输入广告链接" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-form-item>
-        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
-        <el-button :size="$store.getters.size" @click="close">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- </el-card> -->
-  </div>
-</template>
-<script>
-import marketingApi from '@/api/finance/marketing.js'
-import upload from '@/components/Upload/index'
-export default {
-  components: { upload },
-  props: {
-    advertisement: {
-      type: Object,
-      default() {}
-    }
-  },
-  data() {
-    return {
-      advertisement: {},
-
-      rules: {
-        advertiseName: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
-        startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
-        endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
-        picture: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
-        advertiseUrl: [{ required: true, message: '请输入广告链接', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    handleSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.update()
-        }
-      })
-    },
-    update() {
-      marketingApi.update(this.advertisement).then(res => {
-        if ((res.code = 20000)) this.$message.success(res.msg)
-        this.$emit('closeDialog')
-        this.$emit('getList')
-      })
-    },
-    uploadSuccess(e, res) {
-      console.log(res)
-      if (res.code == 20000) {
-        this.advertisement.positionImage = res.data.publicUrl
-      }
-    },
-    close() {
-      this.$emit('closeDialog')
-    }
-  }
-}
-</script>
-<style scoped lang="stylus"></style>
+<template>
+  <div class="divBox">
+    <!-- <el-card class="box-card">
+      <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
+        添加广告
+      </div> -->
+    <el-form :rules="rules" ref="form" :model="advertisement" class="formValidate" label-width="100px">
+      <el-row>
+        <el-col :span="13">
+          <el-form-item label="广告名称" prop="advertiseName">
+            <el-input v-model="advertisement.advertiseName" maxlength="249" placeholder="请输入商品名称" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="13">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker style="width:100%" v-model="advertisement.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="13">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker style="width:100%" v-model="advertisement.endTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="上线/下线">
+            <el-radio-group v-model="advertisement.isDownline">
+              <el-radio :label="1">上线</el-radio>
+              <el-radio :label="0">下线</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col>
+          <el-form-item label="广告图片" prop="positionImage">
+            <div class="upLoadPicBox">
+              <upload :photo="advertisement.positionImage" @success="uploadSuccess" tip="只能上传jpg/png格式文件，文件不能超过50kb"></upload>
+            </div>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="13">
+          <el-form-item label="广告链接" prop="advertiseUrl">
+            <el-input v-model="advertisement.advertiseUrl" type="url" placeholder="请输入广告链接" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
+        <el-button :size="$store.getters.size" @click="close">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- </el-card> -->
+  </div>
+</template>
+<script>
+import marketingApi from '@/api/finance/marketing.js'
+import upload from '@/components/Upload/index'
+export default {
+  components: { upload },
+  props: {
+    advertisement: {
+      type: Object,
+      default() {}
+    }
+  },
+  data() {
+    return {
+      advertisement: {},
+
+      rules: {
+        advertiseName: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
+        startTime: [{ required: true, message: '请选择开始时间', trigger: 'change' }],
+        endTime: [{ required: true, message: '请选择结束时间', trigger: 'change' }],
+        positionImage: [{ required: true, message: '请上传广告图片', trigger: 'change' }],
+        advertiseUrl: [{ required: true, message: '请输入广告链接', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    handleSubmit() {
+      var start = new Date(this.advertisement.startTime).getTime()
+      var end = new Date(this.advertisement.endTime).getTime()
+
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (start > end) {
+            this.$message.error('开始时间不得大于结束时间！')
+          } else {
+            this.update()
+          }
+        }
+      })
+    },
+    update() {
+      marketingApi.update(this.advertisement).then(res => {
+        if ((res.code = 20000)) this.$message.success(res.msg)
+        this.$emit('closeDialog')
+        this.$emit('getList')
+      })
+    },
+    uploadSuccess(e, res) {
+      console.log(res)
+      if (res.code == 20000) {
+        this.advertisement.positionImage = res.data.publicUrl
+      }
+    },
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style scoped lang="stylus"></style>
diff --git a/src/views/order/orderListCancle.vue b/src/views/order/orderListCancle.vue
index 89776bd..0d4d007 100644
--- a/src/views/order/orderListCancle.vue
+++ b/src/views/order/orderListCancle.vue
@@ -1,93 +1,93 @@
-<template>
-  <div class="divBox ">
-    <!-- <el-card class="box-card"> -->
-    <!-- <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
-        添加广告
-      </div> -->
-    <el-form :rules="rules" ref="form" :model="detailData" class="formValidate " label-width="100px">
-      <el-row>
-        <el-col :span="15">
-          <el-form-item label="订单编号:">
-            <span>{{ detailData.orderCode }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="15">
-          <el-form-item label="取消说明" prop="cancelMark">
-            <el-input v-model="detailData.cancelMark" placeholder="请输入取消说明" type="textarea" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="15">
-          <el-form-item label="订单金额:">
-            <span>¥{{ detailData.marketPrice }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="15">
-          <el-form-item label="可退积分">
-            <el-input v-model="detailData.integral" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-form-item>
-        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
-        <el-button :size="$store.getters.size" @click="close">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- </el-card> -->
-  </div>
-</template>
-<script>
-import orderInfoApi from '@/api/order/orderInfo.js'
-import { loadingFn } from '@/utils/validate'
-export default {
-  props: {
-    detailData: {
-      type: Object,
-      default() {}
-    }
-  },
-  data() {
-    return {
-      detailData: {},
-
-      rules: {
-        cancelMark: [{ required: true, message: '请输入取消说明', trigger: 'blur' }]
-        // integral: [{ required: true, message: '请输入积分', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    handleSubmit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.save()
-        }
-      })
-    },
-    save() {
-      this.detailData.createSource = 'MALL_COMS_WEB'
-      loadingFn.call(
-        this,
-        'loading',
-
-        orderInfoApi.cancelOrder(this.detailData).then(res => {
-          if ((res.code = 20000)) this.$message.success(res.msg)
-          this.$emit('closeDialog')
-          this.$emit('getList')
-        })
-      )
-    },
-    uploadSuccess(e, res) {
-      console.log(res)
-      if (res.code == 20000) {
-        this.advertisement.positionImage = res.data.publicUrl
-      }
-    },
-
-    close() {
-      this.$emit('closeDialog')
-    }
-  }
-}
-</script>
-<style scoped lang="stylus"></style>
+<template>
+  <div class="divBox ">
+    <!-- <el-card class="box-card"> -->
+    <!-- <div style="width :100%;height:45px;line-height: 45px;background: #f3f3f3; padding-left:20px">
+        添加广告
+      </div> -->
+    <el-form :rules="rules" ref="form" :model="detailData" class="formValidate " label-width="100px">
+      <el-row>
+        <el-col :span="15">
+          <el-form-item label="订单编号:">
+            <span>{{ detailData.orderCode }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="18">
+          <el-form-item label="取消说明" prop="cancelMark">
+            <el-input v-model="detailData.cancelMark" placeholder="请输入取消说明" type="textarea" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="15">
+          <el-form-item label="订单金额:">
+            <span>¥{{ detailData.marketPrice }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="18">
+          <el-form-item label="可退积分">
+            <el-input v-model="detailData.integral" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-form-item>
+        <el-button type="primary" class="submission" @click="handleSubmit">提交</el-button>
+        <el-button :size="$store.getters.size" @click="close">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- </el-card> -->
+  </div>
+</template>
+<script>
+import orderInfoApi from '@/api/order/orderInfo.js'
+import { loadingFn } from '@/utils/validate'
+export default {
+  props: {
+    detailData: {
+      type: Object,
+      default() {}
+    }
+  },
+  data() {
+    return {
+      detailData: {},
+
+      rules: {
+        cancelMark: [{ required: true, message: '请输入取消说明', trigger: 'blur' }]
+        // integral: [{ required: true, message: '请输入积分', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    handleSubmit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          this.save()
+        }
+      })
+    },
+    save() {
+      this.detailData.createSource = 'MALL_COMS_WEB'
+      loadingFn.call(
+        this,
+        'loading',
+
+        orderInfoApi.cancelOrder(this.detailData).then(res => {
+          if ((res.code = 20000)) this.$message.success(res.msg)
+          this.$emit('closeDialog')
+          this.$emit('getList')
+        })
+      )
+    },
+    uploadSuccess(e, res) {
+      console.log(res)
+      if (res.code == 20000) {
+        this.advertisement.positionImage = res.data.publicUrl
+      }
+    },
+
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style scoped lang="stylus"></style>
diff --git a/src/views/order/orderListDetail.vue b/src/views/order/orderListDetail.vue
index 7e64ef7..96ec758 100644
--- a/src/views/order/orderListDetail.vue
+++ b/src/views/order/orderListDetail.vue
@@ -1,296 +1,299 @@
-<template>
-  <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
-      <el-descriptions title="基本信息" class="text" direction="vertical" :column="6" border>
-        <el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
-        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
-        <el-descriptions-item label="支付积分">{{ detailData.integral }}</el-descriptions-item>
-        <el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
-        <el-descriptions-item label="自提油站">{{ detailData.takeSiteName }}</el-descriptions-item>
-        <el-descriptions-item label="提货码">{{ detailData.takeCode }}</el-descriptions-item>
-      </el-descriptions>
-
-      <el-descriptions title="收货人信息" class="text" direction="vertical" :column="3" border>
-        <el-descriptions-item label="收货人">{{ detailData.customerName }}</el-descriptions-item>
-        <el-descriptions-item label="手机号码">{{ detailData.customerPhone }}</el-descriptions-item>
-        <el-descriptions-item label="订单备注">{{ detailData.remark || '暂无' }}</el-descriptions-item>
-      </el-descriptions>
-
-      <div class="text">商品信息</div>
-      <el-table
-        :data="detailData.mallOrderInfoDetails"
-        class="ivu-mt mt14"
-        v-loading="loading"
-        highlight-current-row
-        empty-text="暂无数据"
-        show-summary
-        :summary-method="getSummaries"
-      >
-        <el-table-column label="商品图片" min-width="80" align="center" prop="oderDetailImg">
-          <template slot-scope="scope">
-            <el-image style="width: 60px; height: 50px" :src="scope.row.oderDetailImg"> </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" min-width="120" align="center" prop="productName">
-          <template slot-scope="scope">
-            <span>{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="价格/货号" min-width="120" prop="marketPrice">
-          <template slot-scope="scope">
-            <span>价格：¥{{ scope.row.marketPrice }}</span>
-            <br />
-            <span>货号：{{ scope.row.productNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="属性" min-width="60" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.attributeJson }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" min-width="80" align="center" prop="orderNum"> </el-table-column>
-
-        <el-table-column label="小计" min-width="120" align="center" prop="allMarketPrice"> </el-table-column>
-      </el-table>
-      <div class="text">操作信息</div>
-      <el-table :data="detailData.mallOrderInfoRecords" class="ivu-mt mt14" v-loading="loading" border highlight-current-row empty-text="暂无数据">
-        <el-table-column label="操作者" min-width="120" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.customerName }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作时间" min-width="60" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createTime }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="订单状态" min-width="100" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.orderStatus | orderStatus }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="支付状态" min-width="100" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.payStatus | payStatus }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="备注" min-width="120" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.remark }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
-</template>
-
-<script>
-export default {
-  filters: {
-    orderStatus(e) {
-      switch (e) {
-        case '0':
-          return '已下单'
-        case '1':
-          return '待核销'
-        case '2':
-          return '已核销'
-        case '-1':
-          return '已取消'
-        default:
-          return '暂无'
-      }
-    },
-    payStatus(e) {
-      switch (e) {
-        case '0':
-          return '待支付'
-        case '1':
-          return '已经发'
-        case '2':
-          return '退款申请'
-        case '3':
-          return '全部退款'
-        case '4':
-          return '部分退款'
-        default:
-          return '暂无'
-      }
-    }
-  },
-
-  props: {
-    detailData: {
-      type: Object,
-      default() {}
-    }
-  },
-  data() {
-    return {
-      template: false,
-      modals: false,
-      batchModal: false,
-      grid: {
-        xl: 6,
-        lg: 8,
-        md: 12,
-        sm: 24,
-        xs: 24
-      }
-    }
-  },
-  created() {},
-  activated() {},
-  methods: {
-    getSummaries(param) {
-      // 合计
-      const { columns, data } = param
-      const sums = []
-
-      if (columns && data) {
-        let allMarketPrice = 0 // 交易金额
-
-        data.forEach(item => {
-          allMarketPrice += item.allMarketPrice ? item.allMarketPrice : 0
-        })
-        allMarketPrice = allMarketPrice.toFixed(2)
-
-        columns.forEach((column, index) => {
-          switch (
-            column.property // column.property可以匹配它的每一列的命名， 然后赋值
-          ) {
-            case 'allMarketPrice':
-              sums[index] = '合计' + allMarketPrice + '元' // 值取自后台
-              break
-
-            default:
-              break
-          }
-        })
-        return sums
-      } else {
-        return sums
-      }
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-tabs__item {
-  height: 54px !important;
-  line-height: 54px !important;
-}
-::v-deep .ivu-modal-mask {
-  z-index: 999 !important;
-}
-
-::v-deep .ivu-modal-wrap {
-  z-index: 999 !important;
-}
-
-.Box {
-  ::v-deep .ivu-modal-body {
-    height: 700px;
-    overflow: auto;
-  }
-}
-
-.batch-box {
-  ::v-deep .ivu-modal-body {
-    overflow: auto;
-    min-height: 350px;
-  }
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.bg {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 11;
-}
-
-::v-deep .happy-scroll-content {
-  width: 100%;
-
-  .demo-spin-icon-load {
-    animation: ani-demo-spin 1s linear infinite;
-  }
-
-  @keyframes ani-demo-spin {
-    from {
-      transform: rotate(0deg);
-    }
-
-    50% {
-      transform: rotate(180deg);
-    }
-
-    to {
-      transform: rotate(360deg);
-    }
-  }
-
-  .demo-spin-col {
-    height: 100px;
-    position: relative;
-    border: 1px solid #eee;
-  }
-}
-
-.labelInput {
-  border: 1px solid #dcdee2;
-  width: 100%;
-  padding: 0 15px;
-  border-radius: 5px;
-  min-height: 30px;
-  cursor: pointer;
-  font-size: 12px;
-
-  .span {
-    color: #c5c8ce;
-  }
-
-  .iconxiayi {
-    font-size: 12px;
-  }
-}
-.el-dropdown-link {
-  cursor: pointer;
-  color: var(--prev-color-primary);
-  font-size: 12px;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-.el-dropdown-menu__item {
-  a {
-    color: #606266;
-  }
-}
-.label_width {
-  width: 400px;
-}
-.text {
-  font-size: 16px;
-  font-weight: bold;
-  margin-top: 20px;
-}
-</style>
+<template>
+  <div class="article-manager">
+    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
+      <div style="background: #f3f3f3;height:60px">
+        <span style="line-height:60px;margin:0px  30px;color:red; font-size:16px"> 当前订单状态：{{ detailData.orderStatus | orderStatus }}</span>
+      </div>
+      <el-descriptions title="基本信息" class="text" direction="vertical" :column="6" border>
+        <el-descriptions-item label="订单编号">{{ detailData.orderCode }}</el-descriptions-item>
+        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
+        <el-descriptions-item label="支付积分">{{ detailData.integral }}</el-descriptions-item>
+        <el-descriptions-item label="下单时间">{{ detailData.createTime }}</el-descriptions-item>
+        <el-descriptions-item label="自提油站">{{ detailData.takeSiteName }}</el-descriptions-item>
+        <el-descriptions-item label="提货码">{{ detailData.takeCode }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-descriptions title="收货人信息" class="text" direction="vertical" :column="3" border>
+        <el-descriptions-item label="收货人">{{ detailData.customerName }}</el-descriptions-item>
+        <el-descriptions-item label="手机号码">{{ detailData.customerPhone }}</el-descriptions-item>
+        <el-descriptions-item label="订单备注">{{ detailData.remark || '暂无' }}</el-descriptions-item>
+      </el-descriptions>
+
+      <div class="text">商品信息</div>
+      <el-table
+        :data="detailData.mallOrderInfoDetails"
+        class="ivu-mt mt14"
+        v-loading="loading"
+        highlight-current-row
+        empty-text="暂无数据"
+        show-summary
+        :summary-method="getSummaries"
+      >
+        <el-table-column label="商品图片" min-width="80" align="center" prop="oderDetailImg">
+          <template slot-scope="scope">
+            <el-image style="width: 60px; height: 50px" :src="scope.row.oderDetailImg"> </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="120" align="center" prop="productName">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格/货号" min-width="120" prop="marketPrice">
+          <template slot-scope="scope">
+            <span>价格：¥{{ scope.row.marketPrice }}</span>
+            <br />
+            <span>货号：{{ scope.row.productNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="属性" min-width="60" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.attributeJson }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" min-width="80" align="center" prop="orderNum"> </el-table-column>
+
+        <el-table-column label="小计" min-width="120" align="center" prop="allMarketPrice"> </el-table-column>
+      </el-table>
+      <div class="text">操作信息</div>
+      <el-table :data="detailData.mallOrderInfoRecords" class="ivu-mt mt14" v-loading="loading" border highlight-current-row empty-text="暂无数据">
+        <el-table-column label="操作者" min-width="120" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.customerName }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作时间" min-width="60" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="订单状态" min-width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.orderStatus | orderStatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付状态" min-width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.payStatus | payStatus }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="备注" min-width="120" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remark }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  filters: {
+    orderStatus(e) {
+      switch (e) {
+        case '0':
+          return '已下单'
+        case '1':
+          return '待核销'
+        case '2':
+          return '已核销'
+        case '-1':
+          return '已取消'
+        default:
+          return '暂无'
+      }
+    },
+    payStatus(e) {
+      switch (e) {
+        case '0':
+          return '待支付'
+        case '1':
+          return '已经发'
+        case '2':
+          return '退款申请'
+        case '3':
+          return '全部退款'
+        case '4':
+          return '部分退款'
+        default:
+          return '暂无'
+      }
+    }
+  },
+
+  props: {
+    detailData: {
+      type: Object,
+      default() {}
+    }
+  },
+  data() {
+    return {
+      template: false,
+      modals: false,
+      batchModal: false,
+      grid: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      }
+    }
+  },
+  created() {},
+  activated() {},
+  methods: {
+    getSummaries(param) {
+      // 合计
+      const { columns, data } = param
+      const sums = []
+
+      if (columns && data) {
+        let allMarketPrice = 0 // 交易金额
+
+        data.forEach(item => {
+          allMarketPrice += item.allMarketPrice ? item.allMarketPrice : 0
+        })
+        allMarketPrice = allMarketPrice.toFixed(2)
+
+        columns.forEach((column, index) => {
+          switch (
+            column.property // column.property可以匹配它的每一列的命名， 然后赋值
+          ) {
+            case 'allMarketPrice':
+              sums[index] = '合计' + allMarketPrice + '元' // 值取自后台
+              break
+
+            default:
+              break
+          }
+        })
+        return sums
+      } else {
+        return sums
+      }
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-tabs__item {
+  height: 54px !important;
+  line-height: 54px !important;
+}
+::v-deep .ivu-modal-mask {
+  z-index: 999 !important;
+}
+
+::v-deep .ivu-modal-wrap {
+  z-index: 999 !important;
+}
+
+.Box {
+  ::v-deep .ivu-modal-body {
+    height: 700px;
+    overflow: auto;
+  }
+}
+
+.batch-box {
+  ::v-deep .ivu-modal-body {
+    overflow: auto;
+    min-height: 350px;
+  }
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.bg {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 11;
+}
+
+::v-deep .happy-scroll-content {
+  width: 100%;
+
+  .demo-spin-icon-load {
+    animation: ani-demo-spin 1s linear infinite;
+  }
+
+  @keyframes ani-demo-spin {
+    from {
+      transform: rotate(0deg);
+    }
+
+    50% {
+      transform: rotate(180deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .demo-spin-col {
+    height: 100px;
+    position: relative;
+    border: 1px solid #eee;
+  }
+}
+
+.labelInput {
+  border: 1px solid #dcdee2;
+  width: 100%;
+  padding: 0 15px;
+  border-radius: 5px;
+  min-height: 30px;
+  cursor: pointer;
+  font-size: 12px;
+
+  .span {
+    color: #c5c8ce;
+  }
+
+  .iconxiayi {
+    font-size: 12px;
+  }
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--prev-color-primary);
+  font-size: 12px;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.el-dropdown-menu__item {
+  a {
+    color: #606266;
+  }
+}
+.label_width {
+  width: 400px;
+}
+.text {
+  font-size: 16px;
+  font-weight: bold;
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/order/orderRefundListDetail.vue b/src/views/order/orderRefundListDetail.vue
index ebfc475..3fbe360 100644
--- a/src/views/order/orderRefundListDetail.vue
+++ b/src/views/order/orderRefundListDetail.vue
@@ -1,265 +1,283 @@
-<template>
-  <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16 mb30" :body-style="{ padding: '0 20px 20px' }">
-      <div class="text">退货商品</div>
-      <el-table
-        :data="detailData.mallOrderInfoDetails"
-        class="ivu-mt mt14"
-        highlight-current-row
-        empty-text="暂无数据"
-        show-summary
-        :summary-method="getSummaries"
-      >
-        <el-table-column label="商品图片" min-width="80" align="center" prop="oderDetailImg">
-          <template slot-scope="scope">
-            <el-image style="width: 60px; height: 50px" :src="scope.row.oderDetailImg"> </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" min-width="120" align="center" prop="productName">
-          <template slot-scope="scope">
-            <span>{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="价格/货号" min-width="120" prop="marketPrice">
-          <template slot-scope="scope">
-            <span>价格：¥{{ scope.row.marketPrice }}</span>
-            <br />
-            <span>货号：{{ scope.row.productNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="属性" min-width="60" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.attributeJson }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" min-width="80" align="center" prop="orderNum"> </el-table-column>
-
-        <el-table-column label="小计" min-width="120" align="center" prop="allMarketPrice"> </el-table-column>
-      </el-table>
-
-      <el-descriptions title="基本信息" class="text" :column="1" border>
-        <el-descriptions-item label="订单id">{{ detailData.id }}</el-descriptions-item>
-        <el-descriptions-item label="申请状态">{{ detailData.refundStatus | refundStatus }}</el-descriptions-item>
-        <el-descriptions-item label="订单编号">{{ detailData.orderCode }} </el-descriptions-item>
-        <el-descriptions-item label="申请时间">{{ detailData.createTime }}</el-descriptions-item>
-        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
-        <el-descriptions-item label="订单金额">¥{{ detailData.marketPrice }}</el-descriptions-item>
-        <el-descriptions-item label="退款积分"> {{ detailData.refundIntegral }} </el-descriptions-item>
-        <el-descriptions-item label="退款类型">{{ detailData.refundType | refundType }}</el-descriptions-item>
-        <el-descriptions-item label="退款原因">{{ detailData.refundMark }}</el-descriptions-item>
-      </el-descriptions>
-
-      <el-descriptions title="" class="text" :column="1" border>
-        <el-descriptions-item label="处理人员">{{ OrderInfoRecord.customerName }}</el-descriptions-item>
-        <el-descriptions-item label="处理时间">{{ OrderInfoRecord.createTime }}</el-descriptions-item>
-        <el-descriptions-item label="操作备注">{{ OrderInfoRecord.remark }} </el-descriptions-item>
-      </el-descriptions>
-    </el-card>
-  </div>
-</template>
-
-<script>
-export default {
-  filters: {
-    refundStatus(e) {
-      switch (e) {
-        // 0待审核 1 审核通过-1 审核不通过
-        case '0':
-          return '待审核'
-        case '1':
-          return '审核通过'
-        case '-1':
-          return '审核不通过'
-        default:
-          return '暂无'
-      }
-    },
-    refundType(e) {
-      //0 退货退款   仅退款
-      switch (e) {
-        case '0':
-          return '退货退款'
-        case '1':
-          return '仅退款'
-        default:
-          return '暂无'
-      }
-    }
-  },
-
-  props: {
-    detailData: {
-      type: Object,
-      default() {}
-    }
-  },
-  data() {
-    return {
-      OrderInfoRecord: {},
-
-      grid: {
-        xl: 6,
-        lg: 8,
-        md: 12,
-        sm: 24,
-        xs: 24
-      }
-    }
-  },
-  created() {
-    if (this.detailData.mallOrderInfoRecords && this.detailData.mallOrderInfoRecords.length > 0) {
-      this.OrderInfoRecord = this.detailData.mallOrderInfoRecords[0]
-    }
-    console.log('----', this.OrderInfoRecord)
-  },
-  activated() {},
-  methods: {
-    getSummaries(param) {
-      // 合计
-      const { columns, data } = param
-      const sums = []
-
-      if (columns && data) {
-        let allMarketPrice = 0 // 交易金额
-
-        data.forEach(item => {
-          allMarketPrice += item.allMarketPrice ? item.allMarketPrice : 0
-        })
-        allMarketPrice = allMarketPrice.toFixed(2)
-
-        columns.forEach((column, index) => {
-          switch (
-            column.property // column.property可以匹配它的每一列的命名， 然后赋值
-          ) {
-            case 'allMarketPrice':
-              sums[index] = '合计' + allMarketPrice + '元' // 值取自后台
-              break
-
-            default:
-              break
-          }
-        })
-        return sums
-      } else {
-        return sums
-      }
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-tabs__item {
-  height: 54px !important;
-  line-height: 54px !important;
-}
-::v-deep .ivu-modal-mask {
-  z-index: 999 !important;
-}
-
-::v-deep .ivu-modal-wrap {
-  z-index: 999 !important;
-}
-
-.Box {
-  ::v-deep .ivu-modal-body {
-    height: 700px;
-    overflow: auto;
-  }
-}
-
-.batch-box {
-  ::v-deep .ivu-modal-body {
-    overflow: auto;
-    min-height: 350px;
-  }
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.bg {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 11;
-}
-
-::v-deep .happy-scroll-content {
-  width: 100%;
-
-  .demo-spin-icon-load {
-    animation: ani-demo-spin 1s linear infinite;
-  }
-
-  @keyframes ani-demo-spin {
-    from {
-      transform: rotate(0deg);
-    }
-
-    50% {
-      transform: rotate(180deg);
-    }
-
-    to {
-      transform: rotate(360deg);
-    }
-  }
-
-  .demo-spin-col {
-    height: 100px;
-    position: relative;
-    border: 1px solid #eee;
-  }
-}
-
-.labelInput {
-  border: 1px solid #dcdee2;
-  width: 100%;
-  padding: 0 15px;
-  border-radius: 5px;
-  min-height: 30px;
-  cursor: pointer;
-  font-size: 12px;
-
-  .span {
-    color: #c5c8ce;
-  }
-
-  .iconxiayi {
-    font-size: 12px;
-  }
-}
-.el-dropdown-link {
-  cursor: pointer;
-  color: var(--prev-color-primary);
-  font-size: 12px;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-.el-dropdown-menu__item {
-  a {
-    color: #606266;
-  }
-}
-.label_width {
-  width: 400px;
-}
-.text {
-  font-size: 16px;
-  font-weight: bold;
-  margin-top: 20px;
-}
-</style>
+<template>
+  <div class="article-manager">
+    <el-card :bordered="false" shadow="never" class="ivu-mt mt16 mb30" :body-style="{ padding: '0 20px 20px' }">
+      <div class="text">退货商品</div>
+      <el-table
+        :data="detailData.mallOrderInfoDetails"
+        class="ivu-mt mt14"
+        highlight-current-row
+        empty-text="暂无数据"
+        show-summary
+        :summary-method="getSummaries"
+      >
+        <el-table-column label="商品图片" min-width="80" align="center" prop="oderDetailImg">
+          <template slot-scope="scope">
+            <el-image style="width: 60px; height: 50px" :src="scope.row.oderDetailImg"> </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="120" align="center" prop="productName">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="价格/货号" min-width="120" prop="marketPrice">
+          <template slot-scope="scope">
+            <span>价格：¥{{ scope.row.marketPrice }}</span>
+            <br />
+            <span>货号：{{ scope.row.productNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="属性" min-width="60" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.attributeJson }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" min-width="80" align="center" prop="orderNum"> </el-table-column>
+
+        <el-table-column label="小计" min-width="120" align="center" prop="allMarketPrice"> </el-table-column>
+      </el-table>
+
+      <el-descriptions title="基本信息" class="text" :column="1" border>
+        <el-descriptions-item label="订单id">{{ detailData.id }}</el-descriptions-item>
+        <el-descriptions-item label="申请状态">{{ detailData.refundStatus | refundStatus }}</el-descriptions-item>
+        <el-descriptions-item label="订单编号">{{ detailData.orderCode }} </el-descriptions-item>
+        <el-descriptions-item label="申请时间">{{ detailData.createTime }}</el-descriptions-item>
+        <el-descriptions-item label="用户账号">{{ detailData.acctId }}</el-descriptions-item>
+        <el-descriptions-item label="订单金额">¥{{ detailData.marketPrice }}</el-descriptions-item>
+        <el-descriptions-item label="退款积分"> {{ detailData.refundIntegral }} </el-descriptions-item>
+        <el-descriptions-item label="退款类型">{{ detailData.refundType | refundType }}</el-descriptions-item>
+        <el-descriptions-item label="退款原因">{{ detailData.refundMark }}</el-descriptions-item>
+      </el-descriptions>
+
+      <el-descriptions title="" class="text" :column="1" border>
+        <el-descriptions-item label="处理人员">{{ OrderInfoRecord.customerName }}</el-descriptions-item>
+        <el-descriptions-item label="处理时间">{{ OrderInfoRecord.createTime }}</el-descriptions-item>
+        <el-descriptions-item label="操作备注">{{ OrderInfoRecord.remark }} </el-descriptions-item>
+      </el-descriptions>
+
+      <div v-if="detailData.refundStatus == '0'">
+        <!-- <div v-if="false"> -->
+        <el-col :span="24" style="text-align: right;margin:30px 0px">
+          <el-button @click="auth(detailData)" type="primary">退款审核</el-button>
+        </el-col>
+      </div>
+    </el-card>
+    <el-dialog title="审核" :visible.sync="verifyDialog" width="45%" :append-to-body="true">
+      <orderRefundListVerify @getList="getList" @closeDialog="closeDialog" v-if="verifyDialog" :detailData="detailData" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import orderRefundListVerify from './orderRefundListVerify'
+export default {
+  components: { orderRefundListVerify },
+  filters: {
+    refundStatus(e) {
+      switch (e) {
+        // 0待审核 1 审核通过-1 审核不通过
+        case '0':
+          return '待审核'
+        case '1':
+          return '审核通过'
+        case '-1':
+          return '审核不通过'
+        default:
+          return '暂无'
+      }
+    },
+    refundType(e) {
+      //0 退货退款   仅退款
+      switch (e) {
+        case '0':
+          return '退货退款'
+        case '1':
+          return '仅退款'
+        default:
+          return '暂无'
+      }
+    }
+  },
+
+  props: {
+    detailData: {
+      type: Object,
+      default() {}
+    }
+  },
+  data() {
+    return {
+      OrderInfoRecord: {},
+      verifyDialog: false,
+      grid: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      }
+    }
+  },
+  created() {
+    if (this.detailData.mallOrderInfoRecords && this.detailData.mallOrderInfoRecords.length > 0) {
+      this.OrderInfoRecord = this.detailData.mallOrderInfoRecords[0]
+    }
+    console.log('----', this.OrderInfoRecord)
+  },
+  activated() {},
+  methods: {
+    getSummaries(param) {
+      // 合计
+      const { columns, data } = param
+      const sums = []
+
+      if (columns && data) {
+        let allMarketPrice = 0 // 交易金额
+
+        data.forEach(item => {
+          allMarketPrice += item.allMarketPrice ? item.allMarketPrice : 0
+        })
+        allMarketPrice = allMarketPrice.toFixed(2)
+
+        columns.forEach((column, index) => {
+          switch (
+            column.property // column.property可以匹配它的每一列的命名， 然后赋值
+          ) {
+            case 'allMarketPrice':
+              sums[index] = '合计' + allMarketPrice + '元' // 值取自后台
+              break
+
+            default:
+              break
+          }
+        })
+        return sums
+      } else {
+        return sums
+      }
+    },
+    // 取消
+    auth(row) {
+      this.detailData = row
+      this.verifyDialog = true
+      console.log(row)
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-tabs__item {
+  height: 54px !important;
+  line-height: 54px !important;
+}
+::v-deep .ivu-modal-mask {
+  z-index: 999 !important;
+}
+
+::v-deep .ivu-modal-wrap {
+  z-index: 999 !important;
+}
+
+.Box {
+  ::v-deep .ivu-modal-body {
+    height: 700px;
+    overflow: auto;
+  }
+}
+
+.batch-box {
+  ::v-deep .ivu-modal-body {
+    overflow: auto;
+    min-height: 350px;
+  }
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.bg {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 11;
+}
+
+::v-deep .happy-scroll-content {
+  width: 100%;
+
+  .demo-spin-icon-load {
+    animation: ani-demo-spin 1s linear infinite;
+  }
+
+  @keyframes ani-demo-spin {
+    from {
+      transform: rotate(0deg);
+    }
+
+    50% {
+      transform: rotate(180deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .demo-spin-col {
+    height: 100px;
+    position: relative;
+    border: 1px solid #eee;
+  }
+}
+
+.labelInput {
+  border: 1px solid #dcdee2;
+  width: 100%;
+  padding: 0 15px;
+  border-radius: 5px;
+  min-height: 30px;
+  cursor: pointer;
+  font-size: 12px;
+
+  .span {
+    color: #c5c8ce;
+  }
+
+  .iconxiayi {
+    font-size: 12px;
+  }
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--prev-color-primary);
+  font-size: 12px;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.el-dropdown-menu__item {
+  a {
+    color: #606266;
+  }
+}
+.label_width {
+  width: 400px;
+}
+.text {
+  font-size: 16px;
+  font-weight: bold;
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/statistics/productStatisticsList.vue b/src/views/statistics/productStatisticsList.vue
index a537313..b3c7f96 100644
--- a/src/views/statistics/productStatisticsList.vue
+++ b/src/views/statistics/productStatisticsList.vue
@@ -1,550 +1,551 @@
-<template>
-  <div class="article-manager">
-    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
-      <div>
-        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent style="background: #f3f3f3;height:60px">
-          <el-form-item>
-            <span style="line-height:60px;margin:0px  30px">商品类目销售分析</span>
-            <el-date-picker
-              v-model="Time"
-              type="daterange"
-              align="right"
-              unlink-panels
-              value-format="yyyy-MM-dd"
-              range-separator="~"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions"
-            >
-            </el-date-picker>
-            <el-button type="primary" @click="productSearchs" style="margin-left:10px">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div style="width: 100%; height:500px;margin-top:20px" id="chart"></div>
-
-      <el-table
-        :data="productList"
-        class="ivu-mt mt14"
-        v-loading="loading"
-        highlight-current-row
-        :row-key="getRowKey"
-        border
-        @selection-change="handleSelectRow"
-        empty-text="暂无数据"
-      >
-        <el-table-column label="分类名称" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.categoryName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="销售数量" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sellNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="数量比例" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sellScale }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="销售金额" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sellMoney }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="金额比例" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sellMoneyScale }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div>
-        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent style="background: #f3f3f3;height:60px">
-          <el-form-item>
-            <span style="line-height:60px;margin:0px  30px">商品销售情况</span>
-
-            <el-date-picker
-              v-model="createTime2"
-              type="daterange"
-              align="right"
-              unlink-panels
-              value-format="yyyy-MM-dd"
-              range-separator="~"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :picker-options="pickerOptions"
-            >
-            </el-date-picker>
-            <el-button type="primary" @click="userSearchs" style="margin-left:10px">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <el-table
-        :data="tableList"
-        class="ivu-mt mt14"
-        v-loading="loading"
-        highlight-current-row
-        :row-key="getRowKey"
-        border
-        @selection-change="handleSelectRow"
-        empty-text="暂无数据"
-      >
-        <el-table-column label="商品名称" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.productName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="浏览量" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.browseNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="浏览人数" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.browsePeopleNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="付款人数" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.paymentPeopleNum }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单品转化率" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.convertRate }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="销售数量" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.salesVolume }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="销售金额" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.salesMoney }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="acea-row row-right page">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="page.currentPage"
-          :page-sizes="[10, 15, 20, 30]"
-          :page-size="page.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="page.totalCount"
-        />
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script>
-import marketingApi from '@/api/finance/marketing.js'
-import echarts from 'echarts'
-
-export default {
-  name: 'product_productList',
-
-  data() {
-    return {
-      template: false,
-      batchModal: false,
-      grid: {
-        xl: 6,
-        lg: 8,
-        md: 12,
-        sm: 24,
-        xs: 24
-      },
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            }
-          },
-          {
-            text: '最近一个月',
-            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.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            }
-          }
-        ]
-      },
-      page: {
-        currentPage: 1,
-        pageSize: 10,
-        params: {},
-        totalCount: 0
-      },
-      Time: '',
-      createTime: '',
-      createTime2: '',
-
-      type: '',
-      tableList: [],
-      productList: [],
-      loading: false,
-      data: [],
-      total: 0,
-      ids: [],
-      goodsId: '',
-      isProductBox: false,
-      multipleSelection: [],
-      detailData: {}, //详情对象
-      myChart: '',
-      option: {
-        title: {
-          text: '一级分类商品',
-          // subtext: 'Fake Data',
-          left: 'center'
-        },
-        tooltip: {
-          trigger: 'item'
-        },
-        legend: {
-          // orient: 'vertical',
-          bottom: '20'
-        },
-        series: [
-          {
-            type: 'pie',
-            radius: '50%',
-            center: ['30%', '50%'],
-            data: []
-          },
-          {
-            type: 'pie',
-            radius: '50%',
-            center: ['75%', '50%'],
-            data: []
-          }
-        ]
-      }
-    }
-  },
-  created() {},
-  mounted() {
-    this.myChart = echarts.init(document.getElementById('chart'))
-
-    var DaysAgo = this.timeBefore()
-    var sevenDaysAgo = this.timeBefore7()
-    console.log('sevenDaysAgo', sevenDaysAgo, DaysAgo)
-
-    this.createTime = sevenDaysAgo + '/' + DaysAgo
-
-    console.log('createTime', this.createTime)
-
-    this.page.params.startTime = sevenDaysAgo
-    this.page.params.endTime = DaysAgo
-
-    this.getList()
-    this.getChartList()
-  },
-
-  methods: {
-
-    closeLabel(label) {
-      let index = this.dataLabel.indexOf(this.dataLabel.filter(d => d.id == label.id)[0])
-      this.dataLabel.splice(index, 1)
-    },
-    timeBefore(date) {
-      if (!date) {
-        date = new Date()
-      }
-      var y = date.getFullYear()
-      var m = date.getMonth() + 1
-      var d = date.getDate()
-      if (d < 0) {
-        m = date.getMonth()
-        var d1 = new Date(y, m, 0)
-        var d2 = d1.getDate()
-        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d2 + d)
-      } else {
-        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-      }
-    },
-    timeBefore7(date) {
-      if (!date) {
-        date = new Date()
-      }
-      var y = date.getFullYear()
-      var m = date.getMonth() + 1
-      var d = date.getDate() - 7
-      if (d < 0) {
-        m = date.getMonth()
-        var d1 = new Date(y, m, 0)
-        var d2 = d1.getDate()
-        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d2 + d)
-      } else {
-        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
-      }
-    },
-
-    getPath() {},
-    // 导出
-    async exports() {
-      let [th, filekey, data, fileName] = [[], [], [], '']
-      let excelData = JSON.parse(JSON.stringify(this.artFrom))
-      excelData.page = 1
-      excelData.limit = 50
-      excelData.ids = this.ids
-      for (let i = 0; i < excelData.page + 1; i++) {
-        let lebData = await this.getExcelData(excelData)
-        if (!fileName) fileName = lebData.filename
-        if (!filekey.length) {
-          filekey = lebData.fileKey
-        }
-        if (!th.length) th = lebData.header
-        if (lebData.export.length) {
-          data = data.concat(lebData.export)
-          excelData.page++
-        } else {
-          this.$exportExcel(th, filekey, fileName, data)
-          return
-        }
-      }
-    },
-    getExcelData(excelData) {},
-
-    getRowKey(row) {
-      return row.id
-    },
-    //  选中某一行
-    handleSelectRow(selection) {
-      const uniqueArr = []
-      const ids = []
-      for (let i = 0; i < selection.length; i++) {
-        const item = selection[i]
-        if (!ids.includes(item.id)) {
-          uniqueArr.push(item)
-          ids.push(item.id)
-        }
-      }
-      this.ids = ids
-      this.multipleSelection = uniqueArr
-    },
-
-    handleSizeChange(val) {
-      this.page.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.page.currentPage = val
-      this.getList()
-    },
-
-    // 商品统计图列表；
-    async getChartList() {
-      await marketingApi.commodityChart(this.createTime).then(res => {
-        if ((res.code = 20000)) {
-          this.productList = res.data
-
-          for (var i = 0; i < this.productList.length; i++) {
-            var obj = new Object()
-            var obj2 = new Object()
-            obj.name = this.productList[i].categoryName
-            obj.value = this.productList[i].sellNum
-
-            obj2.name = this.productList[i].categoryName
-            obj2.value = this.productList[i].sellMoney
-            this.option.series[0].data[i] = obj
-            this.option.series[1].data[i] = obj2
-          }
-          console.log('op', this.option)
-          console.log('series', this.option.series)
-          this.myChart.setOption(this.option)
-        }
-      })
-      window.onresize = function() {
-        this.myChart.resize()
-      }
-    },
-    // 商品销售列表
-    async getList() {
-      await marketingApi.getProductByPage(this.page).then(res => {
-        if ((res.code = 20000)) ({ list: this.tableList = [], totalCount: this.page.totalCount = 0 } = res.data)
-      })
-      console.log('tableList', this.tableList)
-    },
-    // 表格搜索
-    productSearchs() {
-      console.log(this.Time)
-
-      if (this.Time !== null && this.Time.length !== 0) {
-        this.createTime = this.Time[0] + '/' + this.Time[1]
-        this.getChartList()
-      } else {
-        this.$message.error('请选择要查询的时间段！')
-      }
-    },
-    // 表格搜索
-    userSearchs() {
-      this.page.currentPage = 1
-      if (this.createTime2 !== null && this.createTime2.length !== 0) {
-        this.page.params.startTime = this.createTime2[0]
-        this.page.params.endTime = this.createTime2[1]
-        this.getList()
-      } else {
-        this.$message.error('请选择要查询的时间段！')
-      }
-    },
-    // 数据导出；
-    exportData: function() {},
-
-    // 详情
-    detail(row) {
-      orderInfoApi.getRefund(row.id).then(res => {
-        if ((res.code = 20000)) {
-          this.detailData = res.data
-          this.refundDetailDialog = true
-        }
-      })
-    },
-    // 取消
-    auth(row, tit, num) {
-      // orderInfoApi.get(row.id).then(res => {
-      //   if ((res.code = 20000)) {
-      this.detailData = row
-      this.verifyDialog = true
-      console.log(row)
-      // }
-      // })
-    }
-  }
-}
-</script>
-<style scoped lang="scss">
-::v-deep .el-tabs__item {
-  height: 54px !important;
-  line-height: 54px !important;
-}
-::v-deep .ivu-modal-mask {
-  z-index: 999 !important;
-}
-
-::v-deep .ivu-modal-wrap {
-  z-index: 999 !important;
-}
-
-.Box {
-  ::v-deep .ivu-modal-body {
-    height: 700px;
-    overflow: auto;
-  }
-}
-
-.batch-box {
-  ::v-deep .ivu-modal-body {
-    overflow: auto;
-    min-height: 350px;
-  }
-}
-
-.tabBox_img {
-  width: 36px;
-  height: 36px;
-  border-radius: 4px;
-  cursor: pointer;
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.bg {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 11;
-}
-
-::v-deep .happy-scroll-content {
-  width: 100%;
-
-  .demo-spin-icon-load {
-    animation: ani-demo-spin 1s linear infinite;
-  }
-
-  @keyframes ani-demo-spin {
-    from {
-      transform: rotate(0deg);
-    }
-
-    50% {
-      transform: rotate(180deg);
-    }
-
-    to {
-      transform: rotate(360deg);
-    }
-  }
-
-  .demo-spin-col {
-    height: 100px;
-    position: relative;
-    border: 1px solid #eee;
-  }
-}
-
-.labelInput {
-  border: 1px solid #dcdee2;
-  width: 100%;
-  padding: 0 15px;
-  border-radius: 5px;
-  min-height: 30px;
-  cursor: pointer;
-  font-size: 12px;
-
-  .span {
-    color: #c5c8ce;
-  }
-
-  .iconxiayi {
-    font-size: 12px;
-  }
-}
-.el-dropdown-link {
-  cursor: pointer;
-  color: var(--prev-color-primary);
-  font-size: 12px;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
-.el-dropdown-menu__item {
-  a {
-    color: #606266;
-  }
-}
-.label_width {
-  width: 400px;
-}
-</style>
+<template>
+  <div class="article-manager">
+    <el-card :bordered="false" shadow="never" class="ivu-mt mt16" :body-style="{ padding: '0 20px 20px' }">
+      <div>
+        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent style="background: #f3f3f3;height:60px">
+          <el-form-item>
+            <span style="line-height:60px;margin:0px  30px">商品类目销售分析</span>
+            <el-date-picker
+              v-model="Time"
+              type="daterange"
+              align="right"
+              unlink-panels
+              value-format="yyyy-MM-dd"
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+            <el-button type="primary" @click="productSearchs" style="margin-left:10px">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div style="width: 100%; height:500px;margin-top:20px" id="chart"></div>
+
+      <el-table
+        :data="productList"
+        class="ivu-mt mt14"
+        v-loading="loading"
+        highlight-current-row
+        :row-key="getRowKey"
+        border
+        @selection-change="handleSelectRow"
+        empty-text="暂无数据"
+      >
+        <el-table-column label="分类名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.categoryName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="销售数量" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sellNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数量比例" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sellScale }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="销售金额" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sellMoney }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额比例" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sellMoneyScale }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-form :model="page" label-width="80px" label-position="right" inline @submit.native.prevent style="background: #f3f3f3;height:60px">
+          <el-form-item>
+            <span style="line-height:60px;margin:0px  30px">商品销售情况</span>
+
+            <el-date-picker
+              v-model="createTime2"
+              type="daterange"
+              align="right"
+              unlink-panels
+              value-format="yyyy-MM-dd"
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+            <el-button type="primary" @click="userSearchs" style="margin-left:10px">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <el-table
+        :data="tableList"
+        class="ivu-mt mt14"
+        v-loading="loading"
+        highlight-current-row
+        :row-key="getRowKey"
+        border
+        @selection-change="handleSelectRow"
+        empty-text="暂无数据"
+      >
+        <el-table-column label="商品名称" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览量" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.browseNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览人数" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.browsePeopleNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="付款人数" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.paymentPeopleNum }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="单品转化率" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.convertRate }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="销售数量" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.salesVolume }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="销售金额" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.salesMoney }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="acea-row row-right page">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[10, 15, 20, 30]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.totalCount"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import marketingApi from '@/api/finance/marketing.js'
+import echarts from 'echarts'
+
+export default {
+  name: 'product_productList',
+
+  data() {
+    return {
+      template: false,
+      batchModal: false,
+      grid: {
+        xl: 6,
+        lg: 8,
+        md: 12,
+        sm: 24,
+        xs: 24
+      },
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            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.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
+      },
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        params: {},
+        totalCount: 0
+      },
+      Time: '',
+      createTime: '',
+      createTime2: '',
+
+      type: '',
+      tableList: [],
+      productList: [],
+      loading: false,
+      data: [],
+      total: 0,
+      ids: [],
+      goodsId: '',
+      isProductBox: false,
+      multipleSelection: [],
+      detailData: {}, //详情对象
+      myChart: '',
+      option: {
+        title: {
+          text: '一级分类商品',
+          // subtext: 'Fake Data',
+          left: 'center'
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          // orient: 'vertical',
+          bottom: '20'
+        },
+        series: [
+          {
+            type: 'pie',
+            radius: '50%',
+            center: ['30%', '50%'],
+            data: []
+          },
+          {
+            type: 'pie',
+            radius: '50%',
+            center: ['75%', '50%'],
+            data: []
+          }
+        ]
+      }
+    }
+  },
+  created() {},
+  mounted() {
+    this.myChart = echarts.init(document.getElementById('chart'))
+
+    var DaysAgo = this.timeBefore()
+    var sevenDaysAgo = this.timeBefore7()
+
+    this.createTime = sevenDaysAgo + '/' + DaysAgo
+
+    this.Time = [new Date(sevenDaysAgo), new Date(DaysAgo)]
+    this.createTime2 = [new Date(sevenDaysAgo), new Date(DaysAgo)]
+    
+    console.log('createTime', this.createTime)
+
+    this.page.params.startTime = sevenDaysAgo
+    this.page.params.endTime = DaysAgo
+
+    this.getList()
+    this.getChartList()
+  },
+
+  methods: {
+    closeLabel(label) {
+      let index = this.dataLabel.indexOf(this.dataLabel.filter(d => d.id == label.id)[0])
+      this.dataLabel.splice(index, 1)
+    },
+    timeBefore(date) {
+      if (!date) {
+        date = new Date()
+      }
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      var d = date.getDate()
+      if (d < 0) {
+        m = date.getMonth()
+        var d1 = new Date(y, m, 0)
+        var d2 = d1.getDate()
+        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d2 + d)
+      } else {
+        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
+      }
+    },
+    timeBefore7(date) {
+      if (!date) {
+        date = new Date()
+      }
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      var d = date.getDate() - 7
+      if (d < 0) {
+        m = date.getMonth()
+        var d1 = new Date(y, m, 0)
+        var d2 = d1.getDate()
+        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d2 + d)
+      } else {
+        return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d)
+      }
+    },
+
+    getPath() {},
+    // 导出
+    async exports() {
+      let [th, filekey, data, fileName] = [[], [], [], '']
+      let excelData = JSON.parse(JSON.stringify(this.artFrom))
+      excelData.page = 1
+      excelData.limit = 50
+      excelData.ids = this.ids
+      for (let i = 0; i < excelData.page + 1; i++) {
+        let lebData = await this.getExcelData(excelData)
+        if (!fileName) fileName = lebData.filename
+        if (!filekey.length) {
+          filekey = lebData.fileKey
+        }
+        if (!th.length) th = lebData.header
+        if (lebData.export.length) {
+          data = data.concat(lebData.export)
+          excelData.page++
+        } else {
+          this.$exportExcel(th, filekey, fileName, data)
+          return
+        }
+      }
+    },
+    getExcelData(excelData) {},
+
+    getRowKey(row) {
+      return row.id
+    },
+    //  选中某一行
+    handleSelectRow(selection) {
+      const uniqueArr = []
+      const ids = []
+      for (let i = 0; i < selection.length; i++) {
+        const item = selection[i]
+        if (!ids.includes(item.id)) {
+          uniqueArr.push(item)
+          ids.push(item.id)
+        }
+      }
+      this.ids = ids
+      this.multipleSelection = uniqueArr
+    },
+
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+      this.getList()
+    },
+
+    // 商品统计图列表；
+    async getChartList() {
+      await marketingApi.commodityChart(this.createTime).then(res => {
+        if ((res.code = 20000)) {
+          this.productList = res.data
+
+          for (var i = 0; i < this.productList.length; i++) {
+            var obj = new Object()
+            var obj2 = new Object()
+            obj.name = this.productList[i].categoryName
+            obj.value = this.productList[i].sellNum
+
+            obj2.name = this.productList[i].categoryName
+            obj2.value = this.productList[i].sellMoney
+            this.option.series[0].data[i] = obj
+            this.option.series[1].data[i] = obj2
+          }
+          console.log('op', this.option)
+          console.log('series', this.option.series)
+          this.myChart.setOption(this.option)
+        }
+      })
+      window.onresize = function() {
+        this.myChart.resize()
+      }
+    },
+    // 商品销售列表
+    async getList() {
+      await marketingApi.getProductByPage(this.page).then(res => {
+        if ((res.code = 20000)) ({ list: this.tableList = [], totalCount: this.page.totalCount = 0 } = res.data)
+      })
+      console.log('tableList', this.tableList)
+    },
+    // 表格搜索
+    productSearchs() {
+      console.log(this.Time)
+
+      if (this.Time !== null && this.Time.length !== 0) {
+        this.createTime = this.Time[0] + '/' + this.Time[1]
+        this.getChartList()
+      } else {
+        this.$message.error('请选择要查询的时间段！')
+      }
+    },
+    // 表格搜索
+    userSearchs() {
+      this.page.currentPage = 1
+      if (this.createTime2 !== null && this.createTime2.length !== 0) {
+        this.page.params.startTime = this.createTime2[0]
+        this.page.params.endTime = this.createTime2[1]
+        this.getList()
+      } else {
+        this.$message.error('请选择要查询的时间段！')
+      }
+    },
+    // 数据导出；
+    exportData: function() {},
+
+    // 详情
+    detail(row) {
+      orderInfoApi.getRefund(row.id).then(res => {
+        if ((res.code = 20000)) {
+          this.detailData = res.data
+          this.refundDetailDialog = true
+        }
+      })
+    },
+    // 取消
+    auth(row, tit, num) {
+      // orderInfoApi.get(row.id).then(res => {
+      //   if ((res.code = 20000)) {
+      this.detailData = row
+      this.verifyDialog = true
+      console.log(row)
+      // }
+      // })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-tabs__item {
+  height: 54px !important;
+  line-height: 54px !important;
+}
+::v-deep .ivu-modal-mask {
+  z-index: 999 !important;
+}
+
+::v-deep .ivu-modal-wrap {
+  z-index: 999 !important;
+}
+
+.Box {
+  ::v-deep .ivu-modal-body {
+    height: 700px;
+    overflow: auto;
+  }
+}
+
+.batch-box {
+  ::v-deep .ivu-modal-body {
+    overflow: auto;
+    min-height: 350px;
+  }
+}
+
+.tabBox_img {
+  width: 36px;
+  height: 36px;
+  border-radius: 4px;
+  cursor: pointer;
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.bg {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 11;
+}
+
+::v-deep .happy-scroll-content {
+  width: 100%;
+
+  .demo-spin-icon-load {
+    animation: ani-demo-spin 1s linear infinite;
+  }
+
+  @keyframes ani-demo-spin {
+    from {
+      transform: rotate(0deg);
+    }
+
+    50% {
+      transform: rotate(180deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .demo-spin-col {
+    height: 100px;
+    position: relative;
+    border: 1px solid #eee;
+  }
+}
+
+.labelInput {
+  border: 1px solid #dcdee2;
+  width: 100%;
+  padding: 0 15px;
+  border-radius: 5px;
+  min-height: 30px;
+  cursor: pointer;
+  font-size: 12px;
+
+  .span {
+    color: #c5c8ce;
+  }
+
+  .iconxiayi {
+    font-size: 12px;
+  }
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: var(--prev-color-primary);
+  font-size: 12px;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+.el-dropdown-menu__item {
+  a {
+    color: #606266;
+  }
+}
+.label_width {
+  width: 400px;
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 05ad053..5ecc24f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,144 +1,144 @@
-'use strict'
-const path = require('path')
-const defaultSettings = require('./src/settings.js')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-
-const name = defaultSettings.title || '星油能源运营管理平台'
-const port = 9528
-
-module.exports = {
-  publicPath: './',
-  outputDir: 'dist',
-  assetsDir: './static',
-  lintOnSave: process.env.NODE_ENV === 'development',
-  productionSourceMap: false, // 改为false可一定程度上解决浏览器f12查看到源码的问题
-  devServer: {
-    disableHostCheck: true,
-    port: port,
-    overlay: {
-      warnings: false,
-      errors: true
-    },
-    proxy: {
-      [process.env.VUE_APP_BASE_API]: {
-        // target: `cls`,
-        // target: `http://192.168.0.6:38080`,
-        target: `http://192.168.0.18:38080`,
-        // target: `http://192.168.1.83:38080`,
-        // target: 'http://222.132.26.119:8081',
-        // target: `https://www.xingoil.com/adminapi`,
-        // target: 'http://uat.xingoil.com/adminapi',
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      },
-      [process.env.VUE_APP_UPLOAD_URL]: {
-        target: `http://127.0.0.1:38080`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      },
-      [process.env.VUE_APP_BASE_LSM_API]: {
-        target: `http://121.41.3.91:8085`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_LSM_API]: ''
-        }
-      }
-    }
-    // https:true,
-  },
-  configureWebpack: {
-    name: name,
-    resolve: {
-      alias: {
-        '@': resolve('src') // 别名。开启后@表示src下目录
-      }
-    },
-    externals: {
-      './cptable': 'var cptable',
-      AMap: 'AMap'
-    }
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
-    config.entry.app = ['babel-polyfill', './src/main.js']
-    // set svg-sprite-loader
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    if (process.env.use_analyzer) {
-      // 分析
-      config.plugin('webpack-bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
-    }
-
-    // set preserveWhitespace
-    config.module
-      .rule('vue')
-      .use('vue-loader')
-      .loader('vue-loader')
-      .tap(options => {
-        options.compilerOptions.preserveWhitespace = true
-        return options
-      })
-      .end()
-
-    config
-    // https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
-    config.when(process.env.NODE_ENV !== 'development', config => {
-      config
-        .plugin('ScriptExtHtmlWebpackPlugin')
-        .after('html')
-        .use('script-ext-html-webpack-plugin', [
-          {
-            // `runtime` must same as runtimeChunk name. default is `runtime`
-            inline: /runtime\..*\.js$/
-          }
-        ])
-        .end()
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'chunk-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial' // only package third parties that are initially dependent
-          },
-          elementUI: {
-            name: 'chunk-elementUI', // split elementUI into a single package
-            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-            test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-          },
-          commons: {
-            name: 'chunk-commons',
-            test: resolve('src/components'), // can customize your rules
-            minChunks: 3, // minimum common number
-            priority: 5,
-            reuseExistingChunk: true
-          }
-        }
-      })
-      config.optimization.runtimeChunk('single')
-    })
-  }
-}
+'use strict'
+const path = require('path')
+const defaultSettings = require('./src/settings.js')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+const name = defaultSettings.title || '星油能源运营管理平台'
+const port = 9528
+
+module.exports = {
+  publicPath: './',
+  outputDir: 'dist',
+  assetsDir: './static',
+  lintOnSave: process.env.NODE_ENV === 'development',
+  productionSourceMap: false, // 改为false可一定程度上解决浏览器f12查看到源码的问题
+  devServer: {
+    disableHostCheck: true,
+    port: port,
+    overlay: {
+      warnings: false,
+      errors: true
+    },
+    proxy: {
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `cls`,
+        // target: `http://192.168.0.6:38080`,
+        target: `http://192.168.0.24:38080`,
+        // target: `http://192.168.1.83:38080`,
+        // target: 'http://222.132.26.119:8081',
+        // target: `https://www.xingoil.com/adminapi`,
+        // target: 'http://uat.xingoil.com/adminapi',
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      },
+      [process.env.VUE_APP_UPLOAD_URL]: {
+        target: `http://127.0.0.1:38080`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      },
+      [process.env.VUE_APP_BASE_LSM_API]: {
+        target: `http://121.41.3.91:8085`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_LSM_API]: ''
+        }
+      }
+    }
+    // https:true,
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src') // 别名。开启后@表示src下目录
+      }
+    },
+    externals: {
+      './cptable': 'var cptable',
+      AMap: 'AMap'
+    }
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+    config.entry.app = ['babel-polyfill', './src/main.js']
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    if (process.env.use_analyzer) {
+      // 分析
+      config.plugin('webpack-bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
+    }
+
+    // set preserveWhitespace
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .loader('vue-loader')
+      .tap(options => {
+        options.compilerOptions.preserveWhitespace = true
+        return options
+      })
+      .end()
+
+    config
+    // https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
+    config.when(process.env.NODE_ENV !== 'development', config => {
+      config
+        .plugin('ScriptExtHtmlWebpackPlugin')
+        .after('html')
+        .use('script-ext-html-webpack-plugin', [
+          {
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/
+          }
+        ])
+        .end()
+      config.optimization.splitChunks({
+        chunks: 'all',
+        cacheGroups: {
+          libs: {
+            name: 'chunk-libs',
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: 'initial' // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: 'chunk-elementUI', // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+          },
+          commons: {
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
+            minChunks: 3, // minimum common number
+            priority: 5,
+            reuseExistingChunk: true
+          }
+        }
+      })
+      config.optimization.runtimeChunk('single')
+    })
+  }
+}
-- 
2.49.1