Browse Source

所有分类

yangc 8 years ago
parent
commit
17723afa52
3 changed files with 6 additions and 29 deletions
  1. 2 2
      assets/scss/common.scss
  2. 3 0
      components/store/CommodityList.vue
  3. 1 27
      pages/store/_uuid/index.vue

+ 2 - 2
assets/scss/common.scss

@@ -332,9 +332,9 @@ div.el-tree-node__content{
   line-height: 36px;
   height: 36px;
 }
-.el-tree-node__children .el-tree-node__content{
+/*.el-tree-node__children .el-tree-node__content{
   padding-left: 8px !important;
-}
+}*/
 .el-tree-node__expand-icon.is-leaf{
   visibility: hidden;
 }

+ 3 - 0
components/store/CommodityList.vue

@@ -136,6 +136,9 @@ function getAllLeafIds (kind) {
     return null
   }
   if (kind.isLeaf === 1) {
+    if (kind.nameCn === '其他') {
+      return '其他'
+    }
     return kind.id
   } else {
     if (!kind.children || kind.children.length === 0) {

+ 1 - 27
pages/store/_uuid/index.vue

@@ -33,33 +33,7 @@ export default {
     let { data } = await axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
 //    axios.get('/api/commodity/components/kinds', { params: { StoreUuid: params.uuid } })
 //      .then(response => {
-    if (!data || data.length === 0) {
-      data = []
-    } else {
-      data.push({
-        id: '其他',
-        nameCn: '其他',
-        children: [],
-        isLeaf: 1,
-        parentid: 0,
-        level: 1
-      })
-    }
-    let arr = []
-    let firstData = {
-      id: null,
-      nameCn: '全部分类',
-      children: [],
-      isLeaf: 0,
-      parentid: 0,
-      level: 1
-    }
-    for (let i = 0; i < data.length; i++) {
-      firstData.children.push(data[i])
-    }
-    arr.push(firstData)
-    console.log(arr)
-    return { kinds: arr }
+    return { kinds: data }
 //      })
   },
   components: {