浏览代码

修改bug

修改bug
Sean 6 月之前
父节点
当前提交
b48d6e6347

+ 4 - 4
src/layout/components/template/pages/index/sector.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sectorBox">
-    <div class="sectorItemBox" @click="addIndexModule('headSector',19)">
+    <!-- <div class="sectorItemBox" @click="addIndexModule('headSector',19)">
       <div class="sectorItem">
         <img src="@/assets/template/sector/headSector.png" />
       </div>
@@ -11,7 +11,7 @@
         <img src="@/assets/template/sector/menuSector.png" />
       </div>
       <div class="sectorItemTitle">网站导航</div>
-    </div>
+    </div> -->
     <div class="sectorItemBox" @click="addIndexModule('imgTitleSector',6)">
       <div class="sectorItem">
         <img src="@/assets/template/sector/imgTitleSector.png" />
@@ -54,12 +54,12 @@
       </div>
       <div class="sectorItemTitle">友情链接</div>
     </div>
-    <div class="sectorItemBox">
+    <!-- <div class="sectorItemBox">
       <div class="sectorItem">
         <img src="@/assets/template/sector/footerSector.png" @click="addIndexModule('footerSector',38)"/>
       </div>
       <div class="sectorItemTitle">页尾板块</div>
-    </div>
+    </div> -->
   </div>
 </template>
 

+ 10 - 1
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>

+ 2 - 2
src/views/news/creatNews.vue

@@ -144,8 +144,8 @@
               </div>
             </div>
             <div v-if="form.is_original==1">
-              <el-form-item label="来源链接:" prop="linkurl" class="custom-align-right">
-                <el-input v-model="form.linkurl" autocomplete="off" placeholder="请输入来源链接" disabled="disabled"></el-input>
+              <el-form-item label="来源名称:" prop="linkurl" class="custom-align-right">
+                <el-input v-model="form.linkurl" autocomplete="off" placeholder="请输入来源名称" disabled="disabled"></el-input>
               </el-form-item>
             </div>
 

+ 1 - 1
src/views/website/WebsiteList.vue

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

+ 1 - 1
src/views/website/categoryList.vue

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

+ 17 - 5
src/views/website/editNavigation.vue

@@ -334,12 +334,24 @@ export default {
         category_id:item.category_id,
         website_id:item.website_id,
       }
-      this.$store.dispatch('pool/delWebsiteCategory',data).then(res=> {
-        this.$message.success("删除成功!");
-        this.getData();
+      this.$confirm('删除后,该条信息及其绑定关系全部删除,确定吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('pool/delWebsiteCategory',data).then(res=> {
+          this.$message.success("删除成功!");
+          this.getData();
+        }).catch(() => {
+          this.$message.info("网络错误,请重试!");
+        })
       }).catch(() => {
-        this.$message.info("网络错误,请重试!");
-      })
+        this.$message({
+          type: 'warning',
+          message: '已取消删除'
+        });
+      });
+      
     },
     //提交编辑的数据
     addToServe(){

+ 1 - 1
src/views/website/websiteColumn.vue

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