Merge branch 'pre_category_03_11_liu' into pre

src/views/website/categoryList.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="layerBoxNoBg">
       <div>
-        <el-button type="primary" @click="addCategoryList">添加栏目名称</el-button>
+        <el-button type="primary" @click="addCategoryList()">添加栏目名称</el-button>
       </div>
       <div>
         <el-button @click="clearSearchList">重置</el-button>
@@ -51,13 +51,12 @@
             </el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
             <el-table-column prop="updated_at" label="修改时间"></el-table-column>
-            <el-table-column fixed="right" label="操作" width="200" header-align="center">
+            <el-table-column fixed="right" label="操作" width="230" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i
-                      class="el-icon-delete"></i>删除</div>
-                  <div class="listEditBtn" @click="getDataMain(scope.row.id, tableData)"><i
-                      class="el-icon-edit-outline"></i>编辑</div>
+                  <div class="listDeleteBtn" @click="deleteData(scope.row.id, tableData)"><i class="el-icon-delete"></i>删除</div>
+                  <div class="listEditBtn" @click="getDataMain(scope.row.id, tableData)"><i  class="el-icon-edit-outline"></i>编辑</div>
+                  <div class="listMainBtn" @click="addCategoryList(scope.row)"><i class="el-icon-document-add"></i>添加</div>
                 </div>
                 <!-- <el-button @click.native.prevent="deleteData(scope.row.id, tableData)" type="text" size="small">删除</el-button>
                 <el-button @click.native.prevent="getDataMain(scope.row.id, tableData)" type="text" size="small">编辑</el-button> -->
@@ -524,12 +523,26 @@ export default {
       this.windowStatus = true;
     },
     //2.1.1 添加栏目池
-    addCategoryList() {
+    addCategoryList(row) {
+      this.form.pid_arr =[];
       this.show_url = false;
       // this.form.is_url = 0;
       this.editId = 0;
       this.editBtn = false;
       this.tags = []
+      if(row){
+        if(row.pid==0){
+          this.form.pid_arr.push(row.id)
+        }else{
+          let pidArr = [];
+          // console.log("fuck:",row.pid_arr);
+          pidArr =  JSON.parse(row.pid_arr)
+          pidArr.push(row.id)
+          this.form.pid_arr = pidArr
+          // console.log('追加id：',this.form.pid_arr)
+        }
+      }
+      // console.log("=========:", this.form.pid_arr)
       this.openWindow();
     },
     //2.2 关闭弹出框
@@ -758,5 +771,43 @@ export default {
   text-align: right;
   /* 设置标签文字右对齐 */
 }
+.collector {
+        margin-left: 0px;
+        padding-left: 0px;
+        margin-right: 20px;
+        width: 76px;
+        height: 36px;
+        line-height: 36px;
+        position: relative;
+
+        .collectorIcon {
+            display: inline-block;
+            width: 20px;
+            height: 20px;
+            background: url("../../assets/advertise/Graph.png");
+            vertical-align: middle;
+            margin-right: 6px;
+        }
+
+        .collectorIcon1 {
+            position: absolute;
+            top: 12px;
+            left: 8px;
+        }
+
+    }
+
+
+    .collector {
+        text-align: center;
+        border-radius: 8px;
+        cursor: pointer;
+        color: #519C66;
+        background-color: rgba(81, 156, 102, 0.16);
+
+        >i {
+            padding-right: 8px;
+        }
+    }
 
 //表单微调 end------------------------------------------------------------>*/</style>