圣诞快乐

# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题

admin/src/views/store/index.vue

@@ -11,7 +11,7 @@
               <el-cascader v-model="tableFrom.cateId" :options="merCateList" :props="props" clearable class="selWidth mr20" @change="seachList" size="small"/>
             </el-form-item>
             <el-form-item label="商品搜索：">
-              <el-input v-model="tableFrom.keywords" placeholder="请输入商品名称，关键字，商品ID" class="selWidth" size="small">
+              <el-input v-model="tableFrom.keywords" placeholder="请输入商品名称，关键字，商品ID" class="selWidth" size="small" clearable>
                 <el-button slot="append" icon="el-icon-search" @click="seachList" size="small"/>
               </el-input>
             </el-form-item>
@@ -20,7 +20,7 @@
         <router-link :to=" { path:'/store/list/creatProduct' } ">
           <el-button size="small" type="primary" class="mr10">添加商品</el-button>
         </router-link>
-        <el-button size="small" type="success" class="mr10" @click="onCopy">复制淘宝、天猫、拼多多、京东、苏宁</el-button>
+        <el-button size="small" type="success" class="mr10" @click="onCopy">商品采集</el-button>
         <el-button size="small" @click="exports">导出</el-button>
       </div>
       <el-table
@@ -116,13 +116,13 @@
             <span>{{scope.row.addTime | formatDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" min-width="120" fixed="right" align="center">
+        <el-table-column label="操作" min-width="150" fixed="right" align="center">
           <template slot-scope="scope">
             <router-link :to="{path: '/store/list/creatProduct/' + scope.row.id}">
               <el-button type="text" size="small" class="mr10">编辑</el-button>
             </router-link>
             <el-button  v-if="tableFrom.type === '5'" type="text" size="small" @click="handleRestore(scope.row.id, scope.$index)">恢复商品</el-button>
-            <el-button type="text" size="small" @click="handleDelete(scope.row.id, scope.$index)">{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-button>
+            <el-button type="text" size="small" @click="handleDelete(scope.row.id, tableFrom.type)">{{ tableFrom.type === '5' ? '删除' : '加入回收站' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -140,19 +140,19 @@
     </el-card>
 
     <el-dialog
-      title="复制淘宝、天猫、拼多多、京东、苏宁"
+      title="复制淘宝、天猫、京东、苏宁"
       :visible.sync="dialogVisible"
-      width="1000px"
+      width="1200px"
       :modal="false"
       class="taoBaoModal"
       :before-close="handleClose">
-      <tao-bao v-if="dialogVisible"></tao-bao>
+      <tao-bao v-if="dialogVisible" @handleClose="handleClose"></tao-bao>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { productLstApi, productDeleteApi, categoryApi, putOnShellApi, offShellApi, productHeadersApi, productExportApi, restoreApi } from '@/api/store'
+import { productLstApi, productDeleteApi, categoryApi, putOnShellApi, offShellApi, productHeadersApi, productExportApi, restoreApi, productExcelApi } from '@/api/store'
 import { getToken } from '@/utils/auth'
 import taoBao from './taoBao'
 export default {
@@ -209,13 +209,21 @@ export default {
     handleClose() {
       this.dialogVisible = false
     },
+    handleCloseMod(item){
+      this.dialogVisible = item
+      this.goodHeade();
+      this.getList();
+    },
     // 复制
     onCopy(){
       this.dialogVisible = true
     },
     // 导出
     exports () {
-      window.open(this.objectUrl + 'admin/export/excel/product?type=1&Authori-zation=' + getToken())
+      productExcelApi({cateId:this.tableFrom.cateId,keywords: this.tableFrom.keywords, type:this.tableFrom.type}).then((res) => {
+        window.open(res.fileName)
+      })
+    //  window.open(this.objectUrl + 'admin/export/excel/product?type=1&Authori-zation=' + getToken())
     },
     // 获取商品表单头数量
     goodHeade () {
@@ -231,6 +239,7 @@ export default {
         this.merCateList = res
       }).catch(res => {
         this.$message.error(res.message)
+        this.$message.error(res.message)
       })
     },
     // 列表
@@ -270,10 +279,14 @@ export default {
           this.$message.success('上架成功')
           this.getList()
           this.goodHeade();
+        }).catch(()=>{
+          row.isShow = !row.isShow
         }) : offShellApi(row.id).then(() => {
           this.$message.success('下架成功')
           this.getList()
           this.goodHeade();
+        }).catch(()=>{
+          row.isShow = !row.isShow
         })
     }
   }