diff --git a/src/api/goods/index.js b/src/api/goods/index.js
index 21b7676..0d58849 100644
--- a/src/api/goods/index.js
+++ b/src/api/goods/index.js
@@ -11,6 +11,7 @@ const api = {
   delete: '/goods/delete',
   state: '/goods/state',
   dataList:'store/platformList',
+  exportData:'/goods/import',
 }
 
 // 列表记录
@@ -107,3 +108,14 @@ export function getDataList (data) {
     data: data
   })
 }
+/**
+ * 导出
+ * @param {*} data
+ */
+export function exportData (data) {
+  return axios({
+    url: api.exportData,
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/components/Table/GoodsItem/GoodsItem.vue b/src/components/Table/GoodsItem/GoodsItem.vue
index b01aebd..c8accf6 100644
--- a/src/components/Table/GoodsItem/GoodsItem.vue
+++ b/src/components/Table/GoodsItem/GoodsItem.vue
@@ -6,17 +6,19 @@
     </div>
     <div class="in-right">
       <!-- 商品名称 -->
-      <p class="title twoline-hide" :style="{ width: `${dataObj.titleWidth}px` }">{{ dataObj.title }}</p>
+      <a-tooltip placement="topLeft" :title="dataObj.title">
+        <p class="title twoline-hide" :style="{ width: `${dataObj.titleWidth}px` }">{{ dataObj.title }}</p></a-tooltip
+      >
       <!-- 副标题 -->
-      <p
-        v-if="isEmpty(dataObj.goodsProps)"
-        class="subtitle"
-        :class="{ 'c-p': subTitleColor }"
-      >{{ dataObj.subtitle }}</p>
+      <p v-if="isEmpty(dataObj.goodsProps)" class="subtitle" :class="{ 'c-p': subTitleColor }">
+        <a-tooltip placement="topLeft" :title="dataObj.subtitle"> {{ dataObj.subtitle }}</a-tooltip>
+      </p>
       <!-- 商品规格 -->
       <div v-else class="goods-props clearfix">
         <div class="goods-props-item" v-for="(props, idx) in dataObj.goodsProps" :key="idx">
-          <span>{{ props.value.name }}</span>
+          <a-tooltip placement="topLeft" :title="props.value.name">
+            <span>{{ props.value.name }}</span></a-tooltip
+          >
         </div>
       </div>
     </div>
@@ -34,28 +36,29 @@ export default {
     // 商品信息
     data: PropTypes.object.def({}),
     // 副标题颜色
-    subTitleColor: PropTypes.bool.def(false)
+    subTitleColor: PropTypes.bool.def(false),
   },
   computed: {
-    dataObj () {
-      return Object.assign({
-        image: '',
-        imageAlt: '',
-        title: '',
-        subtitle: '',
-        goodsProps: [],
-        titleWidth: 200
-      }, this.$props.data)
-    }
+    dataObj() {
+      return Object.assign(
+        {
+          image: '',
+          imageAlt: '',
+          title: '',
+          subtitle: '',
+          goodsProps: [],
+          titleWidth: 200,
+        },
+        this.$props.data
+      )
+    },
   },
-  data () {
+  data() {
     return {
-      isEmpty
+      isEmpty,
     }
   },
-  methods: {
-
-  }
+  methods: {},
 }
 </script>
 
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 06fd31c..16a9db1 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -252,6 +252,12 @@ export const asyncRouterMap = [
             meta: { title: '编辑商品', keepAlive: false, permission: ['/goods/update'] },
             hidden: true,
           },
+          {
+            path: '/goods/modify',
+            component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/modify'),
+            meta: { title: '批量修改', keepAlive: false, permission: ['/goods/modify'] },
+            hidden: true,
+          },
           {
             path: '/goods/copy',
             component: () => import(/* webpackChunkName: "goods" */ '@/views/goods/Copy'),
diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue
index 21221d2..5b98181 100644
--- a/src/views/goods/Index.vue
+++ b/src/views/goods/Index.vue
@@ -34,6 +34,22 @@
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="商品价格">
+            <div style="display: flex" class="goodsType">
+              <a-input v-decorator="['goods_price_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px"
+                >-</span
+              >
+              <a-input style="margin-left: 5px" v-decorator="['goods_price_max']" placeholder="请输入" />
+            </div>
+          </a-form-item>
+          <a-form-item label="利润率">
+            <div style="display: flex" class="goodsType">
+              <a-input v-decorator="['profit_rate_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px"
+                >-</span
+              >
+              <a-input style="margin-left: 5px" v-decorator="['profit_rate_max']" placeholder="请输入" />
+            </div>
+          </a-form-item>
           <a-form-item class="search-btn">
             <a-button type="primary" icon="search" html-type="submit">搜索</a-button>
           </a-form-item>
@@ -59,6 +75,12 @@
           @click="handleImport()"
           >批量导入</a-button
         >
+        <a-button style="background-color: #501212; color: #fff; border: none" @click="handleExport(selectedRowKeys)"
+          >导出</a-button
+        >
+        <a-button class="fl-l" style="background-color: #f0baae; border: none" type="primary" @click="handleModify()"
+          >批量修改</a-button
+        >
         <div v-if="selectedRowKeys.length" class="button-group">
           <a-button-group class="ml-10">
             <a-button v-action:status icon="arrow-up" @click="handleUpdateStatus(selectedRowKeys, true)">上架</a-button>
@@ -87,8 +109,11 @@
         </a>
       </span>
       <!-- 商品名称 -->
-      <span slot="goods_name" slot-scope="text">
-        <p class="twoline-hide" style="width: 270px">{{ text }}</p>
+      <span slot="goods_name" slot-scope="text, item">
+        <a v-if="item.link" :href="item.link" style="white-space: pre-wrap; color: #1890ff" target="_blank">{{
+          text
+        }}</a>
+        <p style="white-space: pre-wrap" v-else>{{ text }}</p>
       </span>
       <!-- 商品状态 -->
       <span slot="status" slot-scope="text, item">
@@ -119,70 +144,91 @@
 import * as GoodsApi from '@/api/goods'
 import { ContentHeader, STable } from '@/components'
 import CategoryModel from '@/common/model/Category'
+import store from '../../store'
 // 表格表头
 const columns = [
   {
     title: '商品ID',
     dataIndex: 'goods_id',
-    width: '100px',
+    width: '80px',
     sorter: true,
   },
   {
     title: '渠道',
-    width: '60px',
+    width: '50px',
     dataIndex: 'channel_name',
   },
   {
     title: '商品编号',
     dataIndex: 'goods_no',
-    width: '120px',
+    width: '100px',
   },
   {
     title: '商品图片',
+    width: '100px',
     dataIndex: 'goods_image',
     scopedSlots: { customRender: 'goods_image' },
   },
   {
     title: '商品名称',
     dataIndex: 'goods_name',
-    width: '302px',
+    width: '260px',
     scopedSlots: { customRender: 'goods_name' },
   },
   {
     title: '商品价格',
+    width: '90px',
     dataIndex: 'goods_price_min',
     scopedSlots: { customRender: 'goods_price_min' },
     sorter: true,
   },
   {
     title: '成本价',
-    dataIndex: 'cost_price',
-    scopedSlots: { customRender: 'cost_price' },
+    width: '80px',
+    dataIndex: 'cost_price_min',
+    scopedSlots: { customRender: 'cost_price_min' },
+    sorter: true,
+  },
+  {
+    title: '利润',
+    width: '80px',
+    dataIndex: 'profit',
+    sorter: true,
+  },
+  {
+    title: '利润率',
+    width: '80px',
+    dataIndex: 'profit_rate',
     sorter: true,
+    scopedSlots: { customRender: 'profit_rate' },
   },
   {
     title: '总销量',
+    width: '80px',
     dataIndex: 'sales_actual',
     sorter: true,
   },
   {
     title: '库存总量',
+    width: '90px',
     dataIndex: 'stock_total',
     sorter: true,
   },
   {
     title: '状态',
+    width: '60px',
     dataIndex: 'status',
     scopedSlots: { customRender: 'status' },
   },
   {
     title: '排序',
+    width: '80px',
     dataIndex: 'sort',
     sorter: true,
   },
   {
     title: '添加时间',
-    width: '180px',
+    width: '130px',
     dataIndex: 'create_time',
     sorter: true,
   },
@@ -265,6 +311,40 @@ export default {
     },
   },
   methods: {
+    // 批量修改
+    handleModify() {
+      this.$router.push('/goods/modify')
+    },
+    // 导出
+    handleExport(goodsIds) {
+      const formData = this.searchForm.getFieldsValue()
+      this.isLoading = true
+      var index = window.publicConfig.BASE_API.indexOf('?')
+      var resolve = window.publicConfig.BASE_API.substring(0, index)
+      let params =
+        '&goodsName=' +
+        (formData.goodsName || '') +
+        '&goodsNo=' +
+        (formData.goodsNo || '') +
+        '&goods_price_max=' +
+        (formData.goods_price_max || '') +
+        '&goods_price_min=' +
+        (formData.goods_price_min || '') +
+        '&profit_rate_max=' +
+        (formData.profit_rate_max || '') +
+        '&profit_rate_min=' +
+        (formData.profit_rate_min || '') +
+        '&categoryId=' +
+        (this.queryParam.categoryId || '') +
+        '&channel=' +
+        this.queryParam.channel +
+        '&goodsIds=' +
+        goodsIds +
+        '&Access-Token=' +
+        store.getters.token
+      console.log(params)
+      window.open(resolve + '?s=/admin/goods/export' + params)
+    },
     getChannel(val) {
       this.queryParam.channel = val
     },
diff --git a/src/views/goods/modify.vue b/src/views/goods/modify.vue
new file mode 100644
index 0000000..fe1159b
--- /dev/null
+++ b/src/views/goods/modify.vue
@@ -0,0 +1,170 @@
+<template>
+  <a-card :bordered="false">
+    <div class="card-title">
+      <span>{{ $route.meta.pageTitle }}</span>
+    </div>
+    <a-spin :spinning="isLoading">
+      <div class="container">
+        <div class="upload-dragger">
+          <a-upload-dragger
+            accept=".xls, .xlsx"
+            :multiple="false"
+            :fileList="fileList"
+            :showUploadList="false"
+            :beforeUpload="beforeUpload"
+            :remove="handleRemove"
+          >
+            <p class="ant-upload-drag-icon">
+              <a-icon type="cloud-upload" />
+            </p>
+            <div v-if="!fileList.length">
+              <p class="ant-upload-text">点击选择文件，或者将文件拖拽至此区域</p>
+              <p class="ant-upload-hint">仅支持.xls, .xlsx 格式的excel文件，限2M以内</p>
+            </div>
+            <div v-else>
+              <p class="ant-upload-text">
+                <span>{{ fileList[0].name }}</span>
+                <a class="ml-10" href="javascript:void(0);" @click.stop="handleRemove(fileList[0])">删除</a>
+              </p>
+              <a-button class="mt-20" type="primary" @click.stop="onFormSubmit">立即导入</a-button>
+            </div>
+          </a-upload-dragger>
+        </div>
+        <div class="import-explain">
+          <h2 class="title">导入说明</h2>
+          <a-timeline class="timeline">
+            <a-timeline-item class="timeline-item">
+              <p class="name">使用模板</p>
+              <ul class="content">
+                <li class="content-li">
+                  <span>模板中最多不能超过500个商品，如超过500个商品，请分批导入</span>
+                </li>
+                <li class="content-li">
+                  <span>模板中的字段含义以及填写规则，可查看模板文件中标题栏的标注</span>
+                </li>
+              </ul>
+            </a-timeline-item>
+          </a-timeline>
+        </div>
+        <!-- 文件选择器 -->
+        <FilesModal ref="FilesModal" :multiple="true" :maxNum="10" :actions="['delete', 'move', 'copyIds']" />
+      </div>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import * as GoodsApi from '@/api/goods'
+import { FilesModal } from '@/components/Modal'
+
+export default {
+  components: {
+    FilesModal,
+  },
+  data() {
+    return {
+      // 正在加载
+      isLoading: false,
+      // 文件列表
+      fileList: [],
+      // 上传文件大小限制 2m
+      uploadSizeLimit: '2',
+    }
+  },
+  // 初始化数据
+  created() {},
+  methods: {
+    // 打开文件选择器
+    handleSelectImage() {
+      this.$refs.FilesModal.show()
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload(file) {
+      const fileSizeMb = file.size / 1024 / 1024
+      if (fileSizeMb > this.uploadSizeLimit) {
+        this.$message.error(`上传的文件大小不能超出${this.uploadSizeLimit}MB`)
+        return false
+      }
+      this.fileList = [file]
+      return false
+    },
+
+    // 文件移除
+    handleRemove(file) {
+      const { fileList } = this
+      const index = fileList.indexOf(file)
+      if (index > -1) {
+        fileList.splice(index, 1)
+      }
+    },
+
+    // 提交到后端api
+    onFormSubmit() {
+      const { fileList } = this
+      const formData = new FormData()
+      formData.append('file', fileList[0])
+
+      this.isLoading = true
+      GoodsApi.exportData(formData)
+        .then((result) => {
+          this.fileList = []
+          this.$message.success(result.message, 1.8)
+          setTimeout(() => this.$router.push('/goods/import/list'), 1500)
+        })
+        .finally(() => (this.isLoading = false))
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+/deep/.ant-upload.ant-upload-drag .ant-upload {
+  padding: 82px 0;
+}
+
+/deep/span.ant-radio + * {
+  color: #7a7a7a;
+}
+
+.card-title {
+  display: flex;
+  justify-content: space-between;
+}
+
+.container {
+  width: 1000px;
+  margin: 0 auto;
+}
+
+.timeline {
+  color: #111;
+}
+
+.import-explain {
+  margin-top: 40px;
+
+  .title {
+    margin-bottom: 25px;
+    font-weight: bold;
+    font-size: 15px;
+  }
+
+  .name {
+    font-size: 14px;
+    margin-bottom: 8px;
+  }
+
+  .timeline-item {
+    padding-bottom: 20px;
+  }
+
+  .content {
+    color: #7a7a7a;
+    padding-left: 20px;
+    .content-li {
+      list-style-type: disc;
+      margin-bottom: 5px;
+    }
+  }
+}
+</style>