From 158d9be6036a7745c999e07e9dafafb4427ffc43 Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Fri, 25 May 2018 16:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                         | 10 ----
 .../pms/brand/components/BrandDetail.vue      |  4 +-
 src/views/pms/brand/index.vue                 | 49 +++++++++----------
 src/views/pms/product/add.vue                 | 11 ++++-
 src/views/pms/product/index.vue               | 13 +++--
 .../components/ProductAttrDetail.vue          |  4 +-
 src/views/pms/productAttr/index.vue           |  4 +-
 src/views/pms/productAttr/productAttrList.vue |  4 +-
 .../components/ProductCateDetail.vue          |  4 +-
 src/views/pms/productCate/index.vue           |  4 +-
 10 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index ea00056..24da4c0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -58,16 +58,6 @@ a:hover {
   padding: 20px;
 }
 
-//外框样式
-.container-frame {
-  padding: 10px;
-  border: 1px solid rgb(235, 235, 235);
-  border-image: initial;
-  border-radius: 3px;
-  transition: 0.2s;
-  overflow: hidden;
-}
-
 //搜索栏样式
 .filter-container {
 
diff --git a/src/views/pms/brand/components/BrandDetail.vue b/src/views/pms/brand/components/BrandDetail.vue
index 6601d9c..e7a5253 100644
--- a/src/views/pms/brand/components/BrandDetail.vue
+++ b/src/views/pms/brand/components/BrandDetail.vue
@@ -1,5 +1,5 @@
 <template> 
-  <div class="form-container container-frame">
+  <el-card class="form-container" shadow="never">
     <el-form :model="brand" :rules="rules" ref="brandFrom" label-width="150px">
       <el-form-item label="品牌名称：" prop="name">
         <el-input v-model="brand.name"></el-input>
@@ -40,7 +40,7 @@
         <el-button v-if="!isEdit" @click="resetForm('brandFrom')">重置</el-button>
       </el-form-item>
     </el-form>
-  </div>
+  </el-card>
 </template>
 <script>
   import {createBrand, getBrand, updateBrand} from '@/api/brand'
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 85b1bf9..026ca21 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,36 +1,35 @@
 <template> 
   <div class="app-container">
-    <div class="filter-container container-frame">
-      <div>
-        <i class="el-icon-search"></i>
-        <span>筛选搜索</span>
-        <el-button
-          style="float: right"
-          @click="searchBrandList()"
-          type="primary"
-          size="small">
-          查询结果
-        </el-button>
-      </div>
-      <div style="margin-top: 15px">
-        <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
-          <el-form-item label="输入搜索：">
-            <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="品牌名称/关键字"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-    <div class="operate-container container-frame">
-
-      <i class="el-icon-tickets" style="margin-top: 5px"></i>
-      <span style="margin-top: 5px">数据列表</span>
+    <el-card class="filter-container" shadow="never">
+        <div>
+          <i class="el-icon-search"></i>
+          <span>筛选搜索</span>
+          <el-button
+            style="float: right"
+            @click="searchBrandList()"
+            type="primary"
+            size="small">
+            查询结果
+          </el-button>
+        </div>
+        <div style="margin-top: 15px">
+          <el-form :inline="true" :model="listQuery" size="small" label-width="140px">
+            <el-form-item label="输入搜索：">
+              <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="品牌名称/关键字"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
       <el-button
         class="btn-add"
         @click="addBrand()"
         size="mini">
         添加
       </el-button>
-    </div>
+    </el-card>
     <div class="table-container">
       <el-table ref="brandTable"
                 :data="list"
diff --git a/src/views/pms/product/add.vue b/src/views/pms/product/add.vue
index 4bdf394..51515f7 100644
--- a/src/views/pms/product/add.vue
+++ b/src/views/pms/product/add.vue
@@ -1,11 +1,18 @@
 <template> 
-  <div> {{msg}}</div>
+  <el-card class="form-container" shadow="never">
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane label="first" name="first">first</el-tab-pane>
+      <el-tab-pane label="second" name="second">second</el-tab-pane>
+      <el-tab-pane label="third" name="third">third</el-tab-pane>
+      <el-tab-pane label="fourth" name="fourth">fourth</el-tab-pane>
+    </el-tabs>
+  </el-card>
 </template>
 <script>
   export default {
     name: 'addProduct',
     data() {
-      return {msg: '添加商品'}
+      return {activeName: 'first'}
     }
   }
 </script>
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index bca0719..fd2d505 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -1,6 +1,6 @@
 <template> 
   <div class="app-container">
-    <div class="filter-container container-frame">
+    <el-card class="filter-container" shadow="never">
       <div>
         <i class="el-icon-search"></i>
         <span>筛选搜索</span>
@@ -65,18 +65,17 @@
           </el-form-item>
         </el-form>
       </div>
-    </div>
-    <div class="operate-container container-frame">
-
-      <i class="el-icon-tickets" style="margin-top: 5px"></i>
-      <span style="margin-top: 5px">数据列表</span>
+    </el-card>
+    <el-card class="operate-container" shadow="never">
+      <i class="el-icon-tickets"></i>
+      <span>数据列表</span>
       <el-button
         class="btn-add"
         @click="handleAddItem()"
         size="mini">
         添加
       </el-button>
-    </div>
+    </el-card>
     <div class="table-container">
       <el-table ref="productTable"
                 :data="list"
diff --git a/src/views/pms/productAttr/components/ProductAttrDetail.vue b/src/views/pms/productAttr/components/ProductAttrDetail.vue
index 19d3ff2..b6d629c 100644
--- a/src/views/pms/productAttr/components/ProductAttrDetail.vue
+++ b/src/views/pms/productAttr/components/ProductAttrDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="form-container container-frame">
+  <el-card class="form-container" shadow="never">
     <el-form :model="productAttr" :rules="rules" ref="productAttrFrom" label-width="150px">
       <el-form-item label="属性名称：" prop="name">
         <el-input v-model="productAttr.name"></el-input>
@@ -63,7 +63,7 @@
         <el-button  v-if="!isEdit" @click="resetForm('productAttrFrom')">重置</el-button>
       </el-form-item>
     </el-form>
-  </div>
+  </el-card>
 </template>
 
 <script>
diff --git a/src/views/pms/productAttr/index.vue b/src/views/pms/productAttr/index.vue
index ff96b0a..8fc2c70 100644
--- a/src/views/pms/productAttr/index.vue
+++ b/src/views/pms/productAttr/index.vue
@@ -1,6 +1,6 @@
 <template> 
   <div class="app-container">
-    <div class="operate-container container-frame">
+    <el-card class="operate-container" shadow="never">
       <i class="el-icon-tickets" style="margin-top: 5px"></i>
       <span style="margin-top: 5px">数据列表</span>
       <el-button
@@ -9,7 +9,7 @@
         size="mini">
         添加
       </el-button>
-    </div>
+    </el-card>
     <div class="table-container">
       <el-table ref="productAttrCateTable"
                 style="width: 100%"
diff --git a/src/views/pms/productAttr/productAttrList.vue b/src/views/pms/productAttr/productAttrList.vue
index 5f73bba..2a149ca 100644
--- a/src/views/pms/productAttr/productAttrList.vue
+++ b/src/views/pms/productAttr/productAttrList.vue
@@ -1,6 +1,6 @@
 <template> 
   <div class="app-container">
-    <div class="operate-container container-frame">
+    <el-card class="operate-container" shadow="never">
 
       <i class="el-icon-tickets" style="margin-top: 5px"></i>
       <span style="margin-top: 5px">数据列表</span>
@@ -10,7 +10,7 @@
         size="mini">
         添加
       </el-button>
-    </div>
+    </el-card>
     <div class="table-container">
       <el-table ref="productAttrTable"
                 :data="list"
diff --git a/src/views/pms/productCate/components/ProductCateDetail.vue b/src/views/pms/productCate/components/ProductCateDetail.vue
index 08381b8..b375e77 100644
--- a/src/views/pms/productCate/components/ProductCateDetail.vue
+++ b/src/views/pms/productCate/components/ProductCateDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="form-container container-frame">
+  <el-card class="form-container" shadow="never">
     <el-form :model="productCate"
              :rules="rules"
              ref="productCateFrom"
@@ -64,7 +64,7 @@
         <el-button v-if="!isEdit" @click="resetForm('productCateFrom')">重置</el-button>
       </el-form-item>
     </el-form>
-  </div>
+  </el-card>
 </template>
 
 <script>
diff --git a/src/views/pms/productCate/index.vue b/src/views/pms/productCate/index.vue
index 2e4f118..477936c 100644
--- a/src/views/pms/productCate/index.vue
+++ b/src/views/pms/productCate/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="operate-container container-frame">
+    <el-card class="operate-container" shadow="never">
       <i class="el-icon-tickets" style="margin-top: 5px"></i>
       <span style="margin-top: 5px">数据列表</span>
       <el-button
@@ -9,7 +9,7 @@
         size="mini">
         添加
       </el-button>
-    </div>
+    </el-card>
     <div class="table-container">
       <el-table ref="productCateTable"
                 style="width: 100%"