From 407978012e13269d17e8580db2582c04fe1bc085 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Thu, 3 Sep 2020 16:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E8=97=8F=E8=B6=B3?=
 =?UTF-8?q?=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/collect/index.vue | 14 ++++----------
 src/views/shop/foot/index.vue    | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/views/shop/collect/index.vue b/src/views/shop/collect/index.vue
index 77667b7..3536522 100644
--- a/src/views/shop/collect/index.vue
+++ b/src/views/shop/collect/index.vue
@@ -41,15 +41,15 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="columns.visible('id')" prop="id" label="id" />
         <el-table-column v-if="columns.visible('uid')" prop="uid" label="用户ID" />
-        <el-table-column v-if="columns.visible('userName')" prop="uid" label="用户名" />
+        <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
         <el-table-column v-if="columns.visible('productId')" prop="productId" label="商品ID" />
-        <el-table-column v-if="columns.visible('product')" prop="product.name" label="商品名称" />
+        <el-table-column v-if="columns.visible('product')" prop="product.storeName" label="商品名称" />
         <el-table-column ref="table" prop="product.image" label="商品图片">
           <template slot-scope="scope">
             <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
           </template>
         </el-table-column>
-        <el-table-column prop="type" label="消息类型">
+        <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             <div>
               <el-tag v-if="scope.row.type == 'collect'" :type="''">收藏</el-tag>
@@ -57,17 +57,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="添加时间">
+        <el-table-column v-if="columns.visible('创建时间')" prop="createTime" label="添加时间">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns.visible('updateTime')" prop="updateTime" label="updateTime">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updateTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="columns.visible('isDel')" prop="isDel" label="isDel" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/src/views/shop/foot/index.vue b/src/views/shop/foot/index.vue
index 2d64a9c..2ce9e41 100644
--- a/src/views/shop/foot/index.vue
+++ b/src/views/shop/foot/index.vue
@@ -41,15 +41,15 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="columns.visible('id')" prop="id" label="id" />
         <el-table-column v-if="columns.visible('uid')" prop="uid" label="用户ID" />
-        <el-table-column v-if="columns.visible('userName')" prop="uid" label="用户名" />
+        <el-table-column v-if="columns.visible('userName')" prop="userName" label="用户名" />
         <el-table-column v-if="columns.visible('productId')" prop="productId" label="商品ID" />
-        <el-table-column v-if="columns.visible('product')" prop="product.name" label="商品名称" />
+        <el-table-column v-if="columns.visible('product')" prop="product.storeName" label="商品名称" />
         <el-table-column ref="table" prop="product.image" label="商品图片">
           <template slot-scope="scope">
             <a :href="scope.row.image" style="color: #42b983" target="_blank"><img :src="scope.row.image" alt="点击打开" class="el-avatar"></a>
           </template>
         </el-table-column>
-        <el-table-column prop="type" label="消息类型">
+        <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             <div>
               <el-tag v-if="scope.row.type == 'collect'" :type="''">收藏</el-tag>
@@ -57,17 +57,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="添加时间">
+        <el-table-column v-if="columns.visible('创建时间')" prop="createTime" label="添加时间">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns.visible('updateTime')" prop="updateTime" label="updateTime">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.updateTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="columns.visible('isDel')" prop="isDel" label="isDel" />
       </el-table>
       <!--分页组件-->
       <pagination />