修改bug

修改bug

src/views/news/NewList.vue

@@ -69,7 +69,16 @@
             <el-table-column prop="title" label="资讯题目" width=""></el-table-column>
             <el-table-column prop="category_name" label="导航池名称" width=""></el-table-column>
             <el-table-column prop="islink" label="是否引用外链" width=""></el-table-column>
-            <el-table-column prop="linkurl" label="来源" width=""></el-table-column>
+            <el-table-column prop="linkurl" label="是否为原创" width="">
+              <template slot-scope="scope">
+                <span v-if="scope.row.is_original==1">
+                  是
+                </span>
+                <span v-if="scope.row.is_original==0">
+                  否
+                </span>
+              </template>
+            </el-table-column>
             <el-table-column prop="author" label="作者" width=""></el-table-column>
             <el-table-column prop="created_at" label="创建时间" width=""></el-table-column>
             <el-table-column prop="updated_at" label="修改时间" width=""></el-table-column>

src/views/website/WebsiteList.vue

@@ -411,7 +411,7 @@ export default {
     },
     //1.2 删除内容
     deleteData(id){
-      this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+      this.$confirm('删除后，该条信息及其绑定关系全部删除，确定吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/website/categoryList.vue

@@ -425,7 +425,7 @@ export default {
     },
     //1.2 删除内容
     deleteData(id){
-      this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+      this.$confirm('删除后，该条信息及其绑定关系全部删除，确定吗', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/views/website/websiteColumn.vue

@@ -43,7 +43,7 @@
             <el-table-column fixed="right" label="操作" width="280" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>移除</div>
+                  <!-- <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i class="el-icon-delete"></i>移除</div> -->
                   <div class="listEditBtn" @click="editRow(scope.row.id, scope.row.website_name)"><i class="el-icon-edit-outline"></i>编辑</div>
                   <div class="listMainBtn" @click="manageRow(scope.row.id, tableData)"><i class="el-icon-edit-outline"></i>详情</div>
                 </div>
@@ -225,13 +225,15 @@ export default {
     },
     //1.2 删除内容
     deleteRow(id){
-      this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
+      this.$confirm('删除后，该条信息及其绑定关系全部删除，确定吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        //website_id
+        //category_id
         console.log("当前删除：" + id)
-        this.$store.dispatch('pool/delWebsiteCategory',{id:id}).then(res=> {
+        this.$store.dispatch('pool/delWebsiteCategory',{category_id:id}).then(res=> {
           this.getData();
           this.$message({
             type: 'success',