From 2aebad23ea8676e003a3ef5fe51991b5e68ef316 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Thu, 12 Jul 2018 17:08:01 +0800
Subject: [PATCH] =?UTF-8?q?perf[litemall-admin]:=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=9A=84=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/views/goods/list.vue | 38 ++++++++++---------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/litemall-admin/src/views/goods/list.vue b/litemall-admin/src/views/goods/list.vue
index ec3a59e6..915a5c3a 100644
--- a/litemall-admin/src/views/goods/list.vue
+++ b/litemall-admin/src/views/goods/list.vue
@@ -36,15 +36,9 @@
             <el-form-item label="品牌商ID">
               <span>{{ props.row.brandId }}</span>
             </el-form-item>
-            <el-form-item label="商品详细介绍">
-              <div v-html="props.row.desc"></div>
-            </el-form-item>         
           </el-form>          
         </template>
       </el-table-column>
-
-      <el-table-column align="center" label="商品ID" prop="id">
-      </el-table-column>
       
       <el-table-column align="center" label="商品编号" prop="goodsSn">
       </el-table-column>
@@ -58,6 +52,15 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="详情" prop="desc">
+        <template slot-scope="scope">
+          <el-dialog title="商品详情" :visible.sync="descDialogVisible">
+            <div v-html="descDetail"></div>
+          </el-dialog>
+          <el-button type="primary" size="mini" @click="showDesc(scope.row.desc)">查看</el-button>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" label="专柜价格" prop="counterPrice">
       </el-table-column>
 
@@ -142,23 +145,8 @@ export default {
         sort: 'add_time',
         order: 'desc'
       },
-      dataForm: {
-        id: undefined,
-        goodsSn: undefined,
-        name: undefined,
-        counterPrice: undefined,
-        retailPrice: undefined,
-        isHot: false,
-        isNew: true,
-        isOnSale: true,
-        picUrl: undefined,
-        brief: undefined,
-        desc: undefined,
-        keywords: undefined,
-        gallery: [],
-        categoryId: undefined,
-        brandId: undefined
-      },
+      descDetail: '',
+      descDialogVisible: false,
       downloadLoading: false
     }
   },
@@ -196,6 +184,10 @@ export default {
     handleUpdate(row) {
       this.$router.push({ path: '/goods/edit', query: { id: row.id }})
     },
+    showDesc(desc) {
+      this.descDetail = desc
+      this.descDialogVisible = true
+    },
     handleDelete(row) {
       deleteGoods(row).then(response => {
         this.$notify({