Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/docker.sh

@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.4 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-4.2.0:0.0.2 .

docker-push.sh

@@ -1,5 +1,5 @@
-docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.4
+docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-4.2.0:0.0.2
-docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-1.0.1:0.0.4
+docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-4.2.0:0.0.2
-docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.4
+docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-4.2.0:0.0.2
-docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.4
+docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-4.2.0:0.0.2
 

manager/docker.sh

@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.4 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-4.2.0:0.0.2 .

manager/src/views/goods/goods-manage/category.vue

@@ -2,13 +2,8 @@
   <div class="wrapper">
     <div class="operation">
       <Button @click="addParent" icon="md-add">添加一级分类</Button>
-      选择分类:
-      <Select @on-change="changeSortCate" v-model="sortCate" style="width:200px">
-        <Option v-for="item in sortCateList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-      </Select>
-
     </div>
-    <tree-table ref="treeTable" size="default" :loading="loading" :data="tableData" :columns="columns" :border="true" :show-index="false" :is-fold="true" :expand-type="false" primary-key="id">
+    <Table size="default" :load-data="handleLoadData" row-key="id" :loading="loading" :data="tableData" :columns="columns">
 
       <template slot="action" slot-scope="scope">
         <Dropdown v-show="scope.row.level == 2" transfer="true" trigger="click">
@@ -53,7 +48,7 @@
           <Badge text="禁用" status="error"></Badge>
         </div>
       </template>
-    </tree-table>
+    </Table>
 
     <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
       <Form ref="form" :model="formAdd" :label-width="100" :rules="formValidate">
@@ -132,19 +127,17 @@ import {
   saveCategorySpec,
   getCategoryTree,
 } from "@/api/goods";
-import TreeTable from "@/views/my-components/tree-table/Table/Table";
+
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
 
 export default {
   name: "lili-components",
   components: {
-    TreeTable,
     uploadPicInput,
   },
   data() {
     return {
       categoryList: [], // 分类列表
-      sortCateList: [], //筛选出分类第一级
       sortCate: "", //筛选的数据
       loading: false, // 加载状态
       selectCount: 0, // 选择数量
@@ -184,47 +177,44 @@ export default {
         {
           title: "分类名称",
           key: "name",
-          minWidth: "120px",
+          tree: true,
         },
         {
           title: "状态",
           key: "deleteFlag",
-          headerAlign: "center",
+
-          type: "template",
+          slot: "deleteFlag",
-          template: "deleteFlag",
         },
         {
-          title: "佣金(%)",
+          title: "佣金",
           key: "commissionRate",
-          headerAlign: "center",
+
-          type: "template",
+          slot: "commissionRate",
-          template: "commissionRate",
         },
         {
           fixed: "right",
           title: "操作",
           key: "action",
-          align: "left",
+
-          headerAlign: "center",
+          slot: "action",
-          type: "template",
-          template: "action",
         },
       ],
       tableData: [],
       categoryIndex: 0,
+      checkedCategoryChildren: "", //选中的分类子级
     };
   },
   methods: {
-    changeSortCate(val) {
+    // changeSortCate(val) {
-      let way = this.categoryList.find((item, index) => {
+    //   let way = this.categoryList.find((item, index) => {
-        if (item.name == val) {
+    //     if (item.name == val) {
-          this.categoryIndex = index;
+    //       this.categoryIndex = index;
-          console.log((this.categoryIndex = index));
+    //       console.log((this.categoryIndex = index));
-          return item.name == val;
+    //       return item.name == val;
-        }
+    //     }
-      });
+    //   });
-      this.tableData = [way];
+    //   this.tableData = [way];
-    },
+    // },
     init() {
       this.getAllList(0);
       this.getBrandList();
@@ -240,7 +230,6 @@ export default {
     getSpecList() {
       getSpecificationList().then((res) => {
         if (res.length != 0) {
-
           this.specifications = res;
         }
       });
@@ -379,26 +368,64 @@ export default {
         },
       });
     },
+
+    // 异步手动加载分类名称
+    handleLoadData(item, callback) {
+      console.warn(item);
+      if (item.level == 0) {
+        let categoryList = JSON.parse(JSON.stringify(this.categoryList));
+        categoryList.forEach((val) => {
+          if (val.id == item.id) {
+            val.children.map((child) => {
+              child._loading = false;
+              child.children = [];
+            });
+            // 模拟加载
+            setTimeout(() => {
+              callback(val.children);
+            }, 1000);
+          }
+        });
+      } else {
+        this.deepCategoryChildren(item.id, this.categoryList);
+        console.log(this.checkedCategoryChildren);
+        setTimeout(() => {
+          callback(this.checkedCategoryChildren);
+        }, 1000);
+      }
+    },
+
+    // 通过递归children来实现手动加载数据
+    deepCategoryChildren(id, list) {
+      if (id != "0" && list.length != 0) {
+        for (let i = 0; i < list.length; i++) {
+          let item = list[i];
+          if (item.id == id) {
+            this.checkedCategoryChildren = item.children;
+            return;
+          } else {
+            this.deepCategoryChildren(id, item.children);
+          }
+        }
+      }
+    },
+
     getAllList(parent_id) {
-      this.sortCateList = [];
       this.loading = true;
       getCategoryTree(parent_id).then((res) => {
         this.loading = false;
         if (res.success) {
           localStorage.setItem("category", JSON.stringify(res.result));
-          res.result.forEach((e, index, arr) => {
+          this.categoryList = JSON.parse(JSON.stringify(res.result));
-            this.sortCateList.push({
+          this.tableData = res.result.map((item) => {
-              label: e.name,
+            if (item.children.length != 0) {
-              value: e.name,
+              item.children = [];
-            });
+              item._loading = false;
-            this.sortCate = arr[0].name;
+            }
+            return item;
           });
 
-          this.categoryList = res.result;
+          console.log(this.tableData);
-
-          this.$nextTick(() => {
-            this.$set(this, "tableData", [res.result[this.categoryIndex]]);
-          });
         }
       });
     },

manager/src/views/lili-dialog/template/pages.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="wrapper">
-    <div class="list">
+    <!-- TODO 目前数据少暂且不用 -->
+    <!-- <div class="list">
       <div class="list-item active">
         文章页
       </div>
-    </div>
+    </div> -->
     <div class="content">
       <Article @callbacked="callbackArticle" :selected="true" />
     </div>
@@ -36,8 +37,8 @@ export default {
   height: 414px;
   overflow: auto;
 }
-.ivu-table-wrapper ivu-table-wrapper-with-border{
+.ivu-table-wrapper ivu-table-wrapper-with-border {
-  height: 300px  !important;
+  height: 300px !important;
 }
 .list {
   margin: 0 1.5%;

seller/docker.sh

@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.4 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-4.2.0:0.0.2 .