From 06e68e8fc908f7b061cf81abdb6fdfbc6849bbb6 Mon Sep 17 00:00:00 2001
From: Zhang HaoYang <1304907854@qq.com>
Date: Thu, 28 Dec 2023 22:55:04 +0800
Subject: [PATCH] update

---
 src/assets/img/avater.png                     | Bin 0 -> 15119 bytes
 src/components/detail/NavDetail.vue           |  44 +-
 .../setting/banner/BannerManage.vue           | 441 +++++++++++++++++-
 .../setting/category/CategoryManage.vue       | 198 ++++----
 .../setting/notice/NoticeManage.vue           | 384 ++++++++++++++-
 .../setting/website/websiteManage.vue         | 224 ++++++---
 6 files changed, 1118 insertions(+), 173 deletions(-)
 create mode 100644 src/assets/img/avater.png

diff --git a/src/assets/img/avater.png b/src/assets/img/avater.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d87ad324901561e4a848197c8898504b9c417ea
GIT binary patch
literal 15119
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
X#aFM4*u~X#6B<*c)m)#PkCp!e5^+((

literal 0
HcmV?d00001

diff --git a/src/components/detail/NavDetail.vue b/src/components/detail/NavDetail.vue
index 8035b68..fd9a03b 100644
--- a/src/components/detail/NavDetail.vue
+++ b/src/components/detail/NavDetail.vue
@@ -176,7 +176,12 @@
                           <el-rate style="margin-top:5px" v-model="form.rating" show-text ></el-rate>
                         </el-form-item>
                           <div style="display: flex;flex-direction: row;margin-top:5px">
-                          <img class="little-Circle" style="width:60px !important;height: 60px !important;"  src="../../assets/img/beauty.jpg"/>
+                            <el-image class="little-Circle" style="width:60px !important;height: 60px !important;" :src="userItem.avatar">
+                              <div slot="error" class="image-slot">
+                                <img style="width: 100%" :src="require('@/assets/img/avater.png')" alt="图标">
+                              </div>
+                            </el-image>
+<!--                          <img class="little-Circle" style="width:60px !important;height: 60px !important;"  src="../../assets/img/beauty.jpg"/>-->
                           <el-form-item prop="content">
                             <el-input v-model="form.content" style="width:350px;margin-top:12px;margin-left:10px;" type="textarea" placeholder="请输入一条友善的评论~"></el-input>
                           </el-form-item>
@@ -207,7 +212,16 @@
                        <div   v-for="(item,index) in allcomment" :key="index" class="circleRoll" style="margin-top:50px">
                          <div style="width:100%;height:2px;background-color: var(--theme-color-trans)"></div>
                          <div style="display:flex;flex-direction: row;flex-wrap: nowrap;margin-top:40px">
-                           <img class="little-Circle" style="width:50px !important;height:50px !important;margin-top:20px;"  src="../../assets/img/beauty.jpg"/>
+<!--                           <el-image style="width: 50px;height:auto;margin-right: 20px" :src="">-->
+<!--                             <div slot="error" class="image-slot">-->
+<!--                               <img style="width: 100%;margin-top: 5px" :src="require('@/assets/img/NAV.png')" alt="图标">-->
+<!--                             </div>-->
+<!--                           </el-image>-->
+                           <el-image class="little-Circle" style="width:50px !important;height:50px !important;margin-top:20px;" :src="item.user.avatar">
+                             <div slot="error" class="image-slot">
+                               <img style="width: 100%" :src="require('@/assets/img/avater.png')" alt="图标">
+                             </div>
+                           </el-image>
                            <div style="display: flex;flex-direction: column">
                              <div style="display: flex;flex-direction: row;color:var(--theme-color);margin-left:5px;">
                                <span style="font-family: STHupo;width:50px">用户:</span><span style="font-size:13px;margin-left:5px;width:100px">{{item.user.userLogin}}</span>
@@ -233,7 +247,11 @@
                              </div>
                              <!--子评论-->
                              <div  v-for="(item2,index2) in rootId_AllComment[item.id]" :key="index2" >
-                               <img class="little-Circle" style="width:50px !important;height:50px !important;margin-top:40px;"  src="../../assets/img/beauty.jpg"/>
+                               <el-image class="little-Circle" style="width:50px !important;height:50px !important;margin-top:20px;" :src="item2.user.avatar">
+                                 <div slot="error" class="image-slot">
+                                   <img style="width: 100%" :src="require('@/assets/img/avater.png')" alt="图标">
+                                 </div>
+                               </el-image>
                                <el-card style="border:var(--border-color) 5px solid;min-height:60px;
                                background-color: var(--theme-comment-color) !important;
                                margin-top:-70px;margin-left:70px;">
@@ -329,6 +347,7 @@ export default {
   data() {
     return {
       userId:'',
+      userItem:{},
       // 点赞数：
       LikeNum:{},
       flag1:true,
@@ -480,15 +499,20 @@ export default {
       this.rootid = rootid;
     },
     getUser() {
-      let _this = this;
+      var _this = this;
       if(localStorage.getItem("Authorization") && localStorage.getItem("userId")){
         _this.userId = localStorage.getItem("userId")
-      } else {
-        Vue.prototype.$notify.error({
-          title: '错误',
-          message: "登录状态失效，请重新登录！",
-          offset: 0
-        });
+        axios({
+          method: 'get',
+          // 请求的地址
+          url: '/api/getUserDetailes',
+          // URL 中的查询参数
+          params: {
+            id:_this.userId,
+          }
+        }).then((res)=> {
+          _this.userItem = res.data;
+      })
       }
     },
     // 提交回复（无评分，默认0）
diff --git a/src/components/setting/banner/BannerManage.vue b/src/components/setting/banner/BannerManage.vue
index 8d31692..5c59907 100644
--- a/src/components/setting/banner/BannerManage.vue
+++ b/src/components/setting/banner/BannerManage.vue
@@ -1,23 +1,456 @@
 <template>
+  <div class="main" style="text-shadow: 0 0 20px var(--font-border);overflow: scroll">
+    <div class="HeadLine" style="margin-top:30px;margin-left:15px;">
+      <div class="HeadSquare" ></div>
+      <div class="TitleFont" style="color:var(--theme-color)"><i class="el-icon-s-grid"></i>Banner管理</div>
+    </div>
+    <div class="base-style" style="margin-top:20px;font-family: SimHei;font-size:18px;font-weight:600;margin-left:20px">
+      <el-row>
+        <el-col :span="24">
+          <el-button @click="openAddCategoryFun()" type="primary" plain size="medium" round >创建Banner</el-button>
+        </el-col>
+        <el-col :span="24" style="margin-top:20px">
+          <el-input
+              placeholder="请输入内容"
+              v-model="searchCate"
+              clearable
+              style="width:200px">
+          </el-input>
+          <el-button type="success" plain size="medium" round style="margin-left:10px">查询目录</el-button>
+        </el-col>
+      </el-row>
+      <el-table class="MyTable"
+                :data="List"
+                header-row-class-name="table_header_class"
+                border>
+        <el-table-column
 
+            align="center"
+            type="index"
+            :index="hIndex"
+            prop="date"
+            label="序号"
+            width="50">
+        </el-table-column>
+        <el-table-column
+
+            align="center"
+            prop="name"
+            label="分类名称"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="id"
+            label="分类编号"
+            width="150">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="createtime"
+            label="创建时间"
+            width="140">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="urlNumber"
+            label="包含网址数"
+            width="100">
+        </el-table-column>
+        <!--        <el-table-column align="center" key="status" prop="status" label="启用状态" width="90" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-switch-->
+        <!--                v-model="scope.row.status"-->
+        <!--                :active-value="0"-->
+        <!--                :inactive-value="1"-->
+        <!--                active-color="#13ce66"-->
+        <!--                inactive-color="#ff4949"-->
+        <!--                disabled-->
+        <!--            >-->
+        <!--            </el-switch>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" key="needLogin" prop="needLogin" label="公开状态" width="90">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-switch-->
+        <!--                v-model="scope.row.needLogin"-->
+        <!--                :active-value="1"-->
+        <!--                :inactive-value="0"-->
+        <!--                active-color="#13ce66"-->
+        <!--                inactive-color="#ff4949"-->
+        <!--                disabled-->
+        <!--            >-->
+        <!--            </el-switch>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column
+            align="center"
+            prop="weigh"
+            label="权重"
+            width="80">
+        </el-table-column>
+        <el-table-column prop="date" label="操作" width="160">
+          <template slot-scope="scope">
+            <div class="ButtonBlock">
+              <img class="MyButton" @click="handleEdit(scope.row)"
+                   src="../../../assets/img/EditButton.svg" style="width:60px">
+              <img class="MyButton" @click="handleDelete(scope.row)"
+                   src="../../../assets/img/DeleteButton.svg" style="width:60px">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog :title="titlename" :visible.sync="openAddCategory" width="30%"
+                 append-to-body
+                 :close-on-click-modal="false"
+                 :before-close="closeDialog"
+      >
+        <el-form ref="form" :rules="rules" class="login_container" :model="form"
+                 style="margin-top:-10px" status-icon  label-width="100px" >
+          <el-form-item label="分类名" prop="name">
+            <el-input v-model="form.name"  placeholder='分类名称'  clearable></el-input>
+          </el-form-item>
+          <el-form-item label="分类权重" prop="weigh" >
+            <el-input v-model="form.weigh"  placeholder='分类权重' clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="用户id" prop="userId" style="display: none">
+            <el-input v-model="form.userId" placeholder='用户id' clearable  ></el-input>
+          </el-form-item>
+          <el-form-item label="编号" prop="id" style="display: none">
+            <el-input v-model="form.id" placeholder='id' clearable  ></el-input>
+          </el-form-item>
+          <!--          <el-form-item label="是否启用" prop="status">-->
+          <!--            <el-radio-group v-model="form.status" >-->
+          <!--              <el-radio :label="0">有效</el-radio>-->
+          <!--              <el-radio :label="1">无效</el-radio>-->
+          <!--            </el-radio-group>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="是否公开" prop="needLogin">-->
+          <!--            <el-radio-group v-model="form.needLogin" >-->
+          <!--              <el-radio :label="1">公开</el-radio>-->
+          <!--              <el-radio :label="0">私有</el-radio>-->
+          <!--            </el-radio-group>-->
+          <!--          </el-form-item>-->
+          <el-form-item>
+            <div style="display: flex;flex-direction: row;align-items: center;flex-wrap: nowrap;justify-content: space-between">
+              <el-button @click="addCategory('form',titlename)" type="primary" style=";margin-top:10px">确认</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+    </div>
+
+
+  </div>
 </template>
 <script>
+import axios from "axios";
+import Vue from "vue";
 export default {
   name: "BannerManage",
   data() {
-    return {}
+    return {
+      // 表头名字：
+      titlename:null,
+      // 新增目录页面：
+      openAddCategory:false,
+      // 对话框显示：
+      dialogVisible:false,
+      // 允许对话框修改：
+      isEdit:true,
+      searchCate:'',
+      userId:null,
+      List:[],
+      form:{
+        name:'',
+        weigh:'',
+        needLogin:'',
+        status:'',
+        userId:'',
+        id:'',
+      },
+      // 校验规则
+      rules: {
+        name: [{ required: 'true', message: '请输入分类名', trigger: 'blur' }],
+        weigh: [{ required: 'true', message: '请输入权重', trigger: 'blur' }],
+        // needLogin: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        // status: [{ required: 'true', message: '请输入是否启用', trigger: 'blur' }],
+        userId: [{ required: 'true', message: '登录信息有误', trigger: 'blur' }],
+      }
+    }
   },
   mounted() {
-
+    this.getFormatDate();
   },
   created() {
-
+    this.getUserInfo();
+    // this.GetData();
   },
   computed: {},
-  methods: {}
+  methods: {
+
+    // 删除网址：
+    handleDelete(index) {
+      var that=this;
+      this.$confirm('此操作将永久删除该Banner, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        axios({
+          method: 'post',
+          // 请求的地址
+          url: '/api/banners/delete_url',
+          // URL 中的查询参数
+          params: {
+            Id: this.form.id,
+          }
+        }).then(function (res) {
+          if (res.data.code === 500) {
+            Vue.prototype.$notify.error({
+              title: '错误',
+              message: res.data.msg,
+              offset: 50
+            });
+          } else {
+            Vue.prototype.$notify({
+              title: '成功',
+              message: ('i', {style: 'color: teal'}, "删除成功"),
+              type: 'success',
+              offset: 50
+            });
+            that.GetData();
+          }
+
+        });
+      }).catch(() => {
+        // 点击取消:不删除了
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    // 关闭弹出对话框之前：
+    closeDialog() {
+      var that = this;
+      // 先重置
+      this.GetData();
+      //表单重置
+      that.form = {
+        name:'',
+        weigh:'',
+        needLogin:'',
+        status:'',
+        userId:'',
+        id:'',
+      }
+      // 后关闭
+      this.dialogVisible = false;
+      this.openAddCategory=false;
+      that.getUserInfo();
+    },
+    // 新增按钮:
+    openAddCategoryFun(){
+      var _this = this;
+      // console.log(_this.List);
+      _this.titlename="新增Banner";
+      this.openAddCategory=true;
+    },
+    // 编辑按钮：
+    handleEdit(index) {
+      var _this = this;
+      this.openAddCategoryFun();
+      _this.titlename="编辑Banner";
+      // 深拷贝
+      this.form = index;
+    },
+    // 提交新增：
+    addCategory(rulelist,flag){
+      var _this = this;
+      _this.$refs[rulelist].validate((valid)=>{
+        if(valid){
+          if(flag == "新增分类"){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/UrlAndCate/insertCateByUser',
+              // URL 中的查询参数
+              params: {
+                name: this.form.name,
+                weigh: this.form.weigh,
+                status: 0,
+                need_login: 0,
+                userId: this.form.userId,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }else if(flag == "编辑分类"){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/UrlAndCate/updateUrlCate',
+              // URL 中的查询参数
+              params: {
+                id: this.form.id,
+                weigh: this.form.weigh,
+                status: 0,
+                name: this.form.name,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }
+
+        }
+      })
+
+      //调用方法提交
+
+    },
+    // 时间转换：
+    getFormatDate() {
+      var that = this;
+      console.log(that.List.length + "changdu");
+      for(let i = 0 ; i < that.List.length; i++){
+        var date = new Date(that.List[i].createtime);// 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年';
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+        var D = date.getDate() + '日 ';
+        console.log("date: " + Y + M + D);
+        that.List[i].createtime = "" + Y + M + D;
+      }
+    },
+    // 获取条数：
+    hIndex(index){
+      var linenum = parseInt( parseInt(index) + parseInt(1))
+      return linenum;
+    },
+    // 获取用户ID
+    getUserInfo() {
+      let _this = this;
+      if(localStorage.getItem("Authorization") && localStorage.getItem("userId")){
+        _this.userId = localStorage.getItem("userId")
+        _this.GetData();
+      } else {
+        Vue.prototype.$notify.error({
+          title: '错误',
+          message: "登录状态失效，请重新登录！",
+          offset: 0
+        });
+      }
+    },
+    GetData(){
+      // 获取数据
+      var that = this;
+      axios({
+        method:'post',
+        url:'/api/UrlAndCate/returnCateByUserId',
+        params:{
+          userId: that.userId
+        }
+      }).then(function(res){
+        that.List = res.data.data;
+        for(let i = 0 ; i < that.List.length; i++){
+          var date = new Date(that.List[i].createtime);// 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+          var Y = date.getFullYear() + '年';
+          var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+          var D = date.getDate() + '日 ';
+          that.List[i].createtime = "" + Y + M + D;
+        }
+      })
+      // /selectAllArticleByadmin
+      that.form.userId = that.userId;
+
+    },
+
+  }
 
 }
 </script>
 <style scoped>
+.base-style{
+  display: flex;
+  flex-direction: column;
+}
+/**表格样式，直接复制**/
+::v-deep .table_header_class th{
+  background-color: var(--table-bg-color)!important;
+  color:var(--theme-color);
+  text-align: center;
+}
+.MyTable{
+  margin-top:10px;
+  width: 100%;
+  background-color:var(--table-bg-color);
+  color:var(--theme-color);
+  border-radius: 5px;
+}
 
+::v-deep .el-table__body tr:hover > td {
+  background-color: var(--table-bg-color-hover) !important;
+}
+
+::v-deep .el-table tr,
+.el-table th.el-table__cell {
+  background-color: var(--table-bg-color);
+  border: var(--table-border) solid 3px;
+}
+
+::v-deep .el-table--border{
+  border: var(--table-border) solid 3px;
+}
+.login_container {
+  width: 400px;
+  border: 1px solid #eaeaea;
+  margin: 100px auto;
+  padding: 35px 35px 15px 35px;
+  box-sizing: border-box;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 0 25px #cac6c6;
+  .login_title{
+    color: #505458;
+    text-align: center;
+    margin-bottom: 40px;}
+}
+
+::v-deep .el-dialog__body{
+  background-image: url("../../../assets/img/SkyPic.jpg");
+  margin-top:15px;
+  height:300px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/setting/category/CategoryManage.vue b/src/components/setting/category/CategoryManage.vue
index c8eadec..514686e 100644
--- a/src/components/setting/category/CategoryManage.vue
+++ b/src/components/setting/category/CategoryManage.vue
@@ -40,11 +40,10 @@
             width="180">
         </el-table-column>
         <el-table-column
-
             align="center"
             prop="id"
             label="分类编号"
-            width="50">
+            width="150">
         </el-table-column>
         <el-table-column
             align="center"
@@ -58,32 +57,32 @@
             label="包含网址数"
             width="100">
         </el-table-column>
-        <el-table-column align="center" key="status" prop="status" label="启用状态" width="90" >
-          <template slot-scope="scope">
-            <el-switch
-                v-model="scope.row.status"
-                :active-value="0"
-                :inactive-value="1"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                disabled
-            >
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" key="needLogin" prop="needLogin" label="公开状态" width="90">
-          <template slot-scope="scope">
-            <el-switch
-                v-model="scope.row.needLogin"
-                :active-value="1"
-                :inactive-value="0"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-                disabled
-            >
-            </el-switch>
-          </template>
-        </el-table-column>
+<!--        <el-table-column align="center" key="status" prop="status" label="启用状态" width="90" >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                :active-value="0"-->
+<!--                :inactive-value="1"-->
+<!--                active-color="#13ce66"-->
+<!--                inactive-color="#ff4949"-->
+<!--                disabled-->
+<!--            >-->
+<!--            </el-switch>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column align="center" key="needLogin" prop="needLogin" label="公开状态" width="90">-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-switch-->
+<!--                v-model="scope.row.needLogin"-->
+<!--                :active-value="1"-->
+<!--                :inactive-value="0"-->
+<!--                active-color="#13ce66"-->
+<!--                inactive-color="#ff4949"-->
+<!--                disabled-->
+<!--            >-->
+<!--            </el-switch>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
             align="center"
             prop="weigh"
@@ -101,7 +100,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog title="新增分类" :visible.sync="openAddCategory" width="30%"
+      <el-dialog :title="titlename" :visible.sync="openAddCategory" width="30%"
                  append-to-body
                  :close-on-click-modal="false"
                  :before-close="closeDialog"
@@ -117,21 +116,24 @@
           <el-form-item label="用户id" prop="userId" style="display: none">
             <el-input v-model="form.userId" placeholder='用户id' clearable  ></el-input>
           </el-form-item>
-          <el-form-item label="是否启用" prop="status">
-            <el-radio-group v-model="form.status" >
-              <el-radio :label="0">有效</el-radio>
-              <el-radio :label="1">无效</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="是否公开" prop="needLogin">
-            <el-radio-group v-model="form.needLogin" >
-              <el-radio :label="1">公开</el-radio>
-              <el-radio :label="0">私有</el-radio>
-            </el-radio-group>
+          <el-form-item label="编号" prop="id" style="display: none">
+            <el-input v-model="form.id" placeholder='id' clearable  ></el-input>
           </el-form-item>
+<!--          <el-form-item label="是否启用" prop="status">-->
+<!--            <el-radio-group v-model="form.status" >-->
+<!--              <el-radio :label="0">有效</el-radio>-->
+<!--              <el-radio :label="1">无效</el-radio>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="是否公开" prop="needLogin">-->
+<!--            <el-radio-group v-model="form.needLogin" >-->
+<!--              <el-radio :label="1">公开</el-radio>-->
+<!--              <el-radio :label="0">私有</el-radio>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
           <el-form-item>
             <div style="display: flex;flex-direction: row;align-items: center;flex-wrap: nowrap;justify-content: space-between">
-              <el-button @click="addCategory('form')" type="primary" style=";margin-top:10px">确认</el-button>
+              <el-button @click="addCategory('form',titlename)" type="primary" style=";margin-top:10px">确认</el-button>
             </div>
           </el-form-item>
         </el-form>
@@ -165,13 +167,14 @@ export default {
         needLogin:'',
         status:'',
         userId:'',
+        id:'',
       },
       // 校验规则
       rules: {
         name: [{ required: 'true', message: '请输入分类名', trigger: 'blur' }],
         weigh: [{ required: 'true', message: '请输入权重', trigger: 'blur' }],
-        needLogin: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
-        status: [{ required: 'true', message: '请输入是否启用', trigger: 'blur' }],
+        // needLogin: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        // status: [{ required: 'true', message: '请输入是否启用', trigger: 'blur' }],
         userId: [{ required: 'true', message: '登录信息有误', trigger: 'blur' }],
       }
     }
@@ -185,6 +188,7 @@ export default {
   },
   computed: {},
   methods: {
+
     // 删除网址：
     handleDelete(index) {
       var that=this;
@@ -239,10 +243,13 @@ export default {
         weigh:'',
         needLogin:'',
         status:'',
+        userId:'',
+        id:'',
       }
       // 后关闭
       this.dialogVisible = false;
       this.openAddCategory=false;
+      that.getUserInfo();
     },
     // 新增按钮:
     openAddCategoryFun(){
@@ -260,48 +267,75 @@ export default {
       this.form = index;
     },
     // 提交新增：
-    addCategory(rulelist){
+    addCategory(rulelist,flag){
       var _this = this;
       _this.$refs[rulelist].validate((valid)=>{
         if(valid){
-          axios({
-            method: 'post',
-            // 请求的地址
-            url: '/api/UrlAndCate/insertCateByUser',
-            // URL 中的查询参数
-            params: {
-              name: this.form.name,
-              weigh: this.form.weigh,
-              status: this.form.status,
-              need_login: this.form.need_login,
-              userId: this.form.userId,
-            }
-          }).then(function (res) {
-            if (res.data.code === 500) {
-              Vue.prototype.$notify.error({
-                title: '错误',
-                message: res.data.msg,
-                offset: 50
-              });
+          if(flag == "新增分类"){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/UrlAndCate/insertCateByUser',
+              // URL 中的查询参数
+              params: {
+                name: this.form.name,
+                weigh: this.form.weigh,
+                status: 0,
+                need_login: 0,
+                userId: this.form.userId,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }else if(flag == "编辑分类"){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/UrlAndCate/updateUrlCate',
+              // URL 中的查询参数
+              params: {
+                id: this.form.id,
+                weigh: this.form.weigh,
+                status: 0,
+                name: this.form.name,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }
 
-            } else {
-              _this.closeDialog();
-              Vue.prototype.$notify({
-                title: '成功',
-                message: ('i', {style: 'color: teal'}, "更新成功！"),
-                type: 'success',
-                offset: 50
-              });
-            }
-          }).catch((error)=>{
-            // Vue.prototype.$notify.error({
-            //   title: '错误',
-            //   message: error,
-            //   offset: 50
-            // });
-          })
-        }else{
-          return;
         }
       })
 
@@ -418,6 +452,6 @@ export default {
 ::v-deep .el-dialog__body{
   background-image: url("../../../assets/img/SkyPic.jpg");
   margin-top:15px;
-  height:500px;
+  height:300px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/setting/notice/NoticeManage.vue b/src/components/setting/notice/NoticeManage.vue
index f081edc..c25e0df 100644
--- a/src/components/setting/notice/NoticeManage.vue
+++ b/src/components/setting/notice/NoticeManage.vue
@@ -1,23 +1,399 @@
 <template>
+  <div class="main" style="text-shadow: 0 0 20px var(--font-border);overflow: scroll">
+    <div class="HeadLine" style="margin-top:30px;margin-left:15px;">
+      <div class="HeadSquare" ></div>
+      <div class="TitleFont" style="color:var(--theme-color)"><i class="el-icon-s-grid"></i>通知管理</div>
+    </div>
+    <div class="base-style" style="margin-top:20px;font-family: SimHei;font-size:18px;font-weight:600;margin-left:20px">
+      <el-row>
+        <el-col :span="24">
+          <el-button @click="openAddCategoryFun()" type="primary" plain size="medium" round >创建通知</el-button>
+        </el-col>
+<!--        <el-col :span="24" style="margin-top:20px">-->
+<!--          <el-input-->
+<!--              placeholder="请输入内容"-->
+<!--              v-model="searchCate"-->
+<!--              clearable-->
+<!--              style="width:200px">-->
+<!--          </el-input>-->
+<!--          <el-button type="success" plain size="medium" round style="margin-left:10px">查询</el-button>-->
+<!--        </el-col>-->
+      </el-row>
+      <el-table class="MyTable"
+                :data="List"
+                header-row-class-name="table_header_class"
+                border>
+        <el-table-column
+            align="center"
+            prop="id"
+            label="通知编号"
+            width="150">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="title"
+            label="通知标题"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="content"
+            label="通知内容"
+            width="160">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="url"
+            label="通知URL"
+            width="100">
+        </el-table-column>
 
+        <el-table-column
+            align="center"
+            prop="createtime"
+            label="创建时间"
+            width="120">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="urlNumber"
+            label="包含网址数"
+            width="100">
+        </el-table-column>
+        <!--        <el-table-column align="center" key="status" prop="status" label="启用状态" width="90" >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-switch-->
+        <!--                v-model="scope.row.status"-->
+        <!--                :active-value="0"-->
+        <!--                :inactive-value="1"-->
+        <!--                active-color="#13ce66"-->
+        <!--                inactive-color="#ff4949"-->
+        <!--                disabled-->
+        <!--            >-->
+        <!--            </el-switch>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column align="center" key="needLogin" prop="needLogin" label="公开状态" width="90">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-switch-->
+        <!--                v-model="scope.row.needLogin"-->
+        <!--                :active-value="1"-->
+        <!--                :inactive-value="0"-->
+        <!--                active-color="#13ce66"-->
+        <!--                inactive-color="#ff4949"-->
+        <!--                disabled-->
+        <!--            >-->
+        <!--            </el-switch>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+<!--        <el-table-column-->
+<!--            align="center"-->
+<!--            prop="weigh"-->
+<!--            label="权重"-->
+<!--            width="80">-->
+<!--        </el-table-column>-->
+        <el-table-column prop="date" label="操作" width="100">
+          <template slot-scope="scope">
+            <div class="ButtonBlock">
+              <img class="MyButton" @click="handleDelete(scope.row)"
+                   src="../../../assets/img/DeleteButton.svg" style="width:60px">
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog title="新增公告" :visible.sync="openAddCategory" width="30%"
+                 append-to-body
+                 :close-on-click-modal="false"
+                 :before-close="closeDialog"
+      >
+        <el-form ref="form" :rules="rules" class="login_container" :model="form"
+                 style="margin-top:-10px" status-icon  label-width="100px" >
+          <el-form-item label="公告标题" prop="title">
+            <el-input v-model="form.title"  placeholder='公告标题'  clearable></el-input>
+          </el-form-item>
+          <el-form-item label="公告内容" prop="content" >
+            <el-input v-model="form.content"  placeholder='公告内容' clearable ></el-input>
+          </el-form-item>
+          <el-form-item label="公告链接" prop="url">
+            <el-input v-model="form.url" placeholder='公告连接' clearable  ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <div style="display: flex;flex-direction: row;align-items: center;flex-wrap: nowrap;justify-content: space-between">
+              <el-button @click="addCategory('form')" type="primary" style=";margin-top:10px">确认</el-button>
+            </div>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+    </div>
+
+
+  </div>
 </template>
 <script>
+import axios from "axios";
+import Vue from "vue";
 export default {
   name: "NoticeManage",
   data() {
-    return {}
+    return {
+      // 表头名字：
+      titlename:null,
+      // 新增目录页面：
+      openAddCategory:false,
+      // 对话框显示：
+      dialogVisible:false,
+      // 允许对话框修改：
+      isEdit:true,
+      searchCate:'',
+      userId:null,
+      List:[],
+      form:{
+        title: null,
+        content: null,
+        url: null,
+      },
+      // 校验规则
+      rules: {
+        title: [{ required: 'true', message: '请输入通标题', trigger: 'blur' }],
+        content: [{ required: 'true', message: '请输入通知内容', trigger: 'blur' }],
+        // needLogin: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        // status: [{ required: 'true', message: '请输入是否启用', trigger: 'blur' }],
+        url: [{ required: 'true', message: '请慎入跳转连接', trigger: 'blur' }],
+      }
+    }
   },
   mounted() {
-
+    this.getFormatDate();
   },
   created() {
-
+    this.getUserInfo();
+    // this.GetData();
   },
   computed: {},
-  methods: {}
+  methods: {
+
+    // 删除网址：
+    handleDelete(index) {
+      var that=this;
+      this.$confirm('此操作将永久删除该通知, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        axios({
+          method: 'get',
+          // 请求的地址
+          url: '/api/notice/delete',
+          // URL 中的查询参数
+          params: {
+            id: index.id,
+          }
+        }).then(function (res) {
+          if (res.data.code === 500) {
+            Vue.prototype.$notify.error({
+              title: '错误',
+              message: res.data.msg,
+              offset: 50
+            });
+          } else {
+            Vue.prototype.$notify({
+              title: '成功',
+              message: ('i', {style: 'color: teal'}, "删除成功"),
+              type: 'success',
+              offset: 50
+            });
+            that.GetData();
+          }
+
+        });
+      }).catch(() => {
+        // 点击取消:不删除了
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    // 关闭弹出对话框之前：
+    closeDialog() {
+      var that = this;
+      // 先重置
+      this.GetData();
+      //表单重置
+      that.form = {
+        title: null,
+        content: null,
+        url: null,
+      }
+      // 后关闭
+      this.dialogVisible = false;
+      this.openAddCategory=false;
+      that.getUserInfo();
+    },
+    // 新增按钮:
+    openAddCategoryFun(){
+      var _this = this;
+      // console.log(_this.List);
+      _this.titlename="新增通知";
+      this.openAddCategory=true;
+    },
+    // 编辑按钮：
+    handleEdit(index) {
+      var _this = this;
+      this.openAddCategoryFun();
+      _this.titlename="编辑通知";
+      // 深拷贝
+      this.form = index;
+    },
+    // 提交新增：
+    addCategory(rulelist){
+      var _this = this;
+      _this.$refs[rulelist].validate((valid)=>{
+        if(valid){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/notice/add',
+              // URL 中的查询参数
+              params: {
+                title: this.form.title,
+                content: this.form.content,
+                url: this.form.url,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+        }
+      })
+
+      //调用方法提交
+
+    },
+    // 时间转换：
+    getFormatDate() {
+      var that = this;
+      console.log(that.List.length + "changdu");
+      for(let i = 0 ; i < that.List.length; i++){
+        var date = new Date(that.List[i].createtime);// 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+        var Y = date.getFullYear() + '年';
+        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+        var D = date.getDate() + '日 ';
+        console.log("date: " + Y + M + D);
+        that.List[i].createtime = "" + Y + M + D;
+      }
+    },
+    // 获取条数：
+    hIndex(index){
+      var linenum = parseInt( parseInt(index) + parseInt(1))
+      return linenum;
+    },
+    // 获取用户ID
+    getUserInfo() {
+      let _this = this;
+      if(localStorage.getItem("Authorization") && localStorage.getItem("userId")){
+        _this.userId = localStorage.getItem("userId")
+        _this.GetData();
+      } else {
+        Vue.prototype.$notify.error({
+          title: '错误',
+          message: "登录状态失效，请重新登录！",
+          offset: 0
+        });
+      }
+    },
+    GetData(){
+      // 获取数据
+      var that = this;
+      axios({
+        method:'get',
+        url:'/api/notice/select',
+        params:{
+        }
+      }).then(function(res){
+        that.List = res.data;
+        for(let i = 0 ; i < that.List.length; i++){
+          var date = new Date(that.List[i].createtime);// 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+          var Y = date.getFullYear() + '年';
+          var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
+          var D = date.getDate() + '日 ';
+          that.List[i].createtime = "" + Y + M + D;
+        }
+      })
+      // /selectAllArticleByadmin
+      that.form.userId = that.userId;
+
+    },
+
+  }
 
 }
 </script>
 <style scoped>
+.base-style{
+  display: flex;
+  flex-direction: column;
+}
+/**表格样式，直接复制**/
+::v-deep .table_header_class th{
+  background-color: var(--table-bg-color)!important;
+  color:var(--theme-color);
+  text-align: center;
+}
+.MyTable{
+  margin-top:10px;
+  width: 100%;
+  background-color:var(--table-bg-color);
+  color:var(--theme-color);
+  border-radius: 5px;
+}
 
+::v-deep .el-table__body tr:hover > td {
+  background-color: var(--table-bg-color-hover) !important;
+}
+
+::v-deep .el-table tr,
+.el-table th.el-table__cell {
+  background-color: var(--table-bg-color);
+  border: var(--table-border) solid 3px;
+}
+
+::v-deep .el-table--border{
+  border: var(--table-border) solid 3px;
+}
+.login_container {
+  width: 400px;
+  border: 1px solid #eaeaea;
+  margin: 100px auto;
+  padding: 35px 35px 15px 35px;
+  box-sizing: border-box;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 0 25px #cac6c6;
+  .login_title{
+    color: #505458;
+    text-align: center;
+    margin-bottom: 40px;}
+}
+
+::v-deep .el-dialog__body{
+  background-image: url("../../../assets/img/SkyPic.jpg");
+  margin-top:15px;
+  height:400px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/setting/website/websiteManage.vue b/src/components/setting/website/websiteManage.vue
index 1e5ccc1..cdd1481 100644
--- a/src/components/setting/website/websiteManage.vue
+++ b/src/components/setting/website/websiteManage.vue
@@ -33,6 +33,33 @@
             label="序号"
             width="50">
         </el-table-column>
+        <el-table-column
+            style="display: none"
+            align="center"
+            prop="cate_id"
+            label="所属编号"
+            width="50">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="urlId"
+            label="网站编号"
+            width="100">
+        </el-table-column>
+        <el-table-column align="center" prop="url" label="网站URL" width="150">
+          <template slot-scope="scope">
+            <el-tooltip v-if="(scope.row.url) != null && (scope.row.url).length > 12"  placement="top" width="150"
+                        trigger="hover"
+                        effect="dark" close-delay="2000">
+              <div class="MyPopover" slot="content">{{scope.row.url}}</div>
+              <div>
+                <span v-if="(scope.row.url) == null">暂无</span>
+                <span v-else-if="(scope.row.url).length < 12">{{scope.row.url}}</span>
+                <span v-else-if="(scope.row.url).length > 12">{{ scope.row.url.substr(0,12)}}...</span>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column align="center" key="name" prop="name" label="网站名" width="190">
           <template slot-scope="scope">
             <el-tooltip  placement="top" width="150"
@@ -58,18 +85,19 @@
             label="创建时间"
             width="140">
         </el-table-column>
-        <el-table-column align="center" key="desc" prop="desc" label="描述" width="100">
-<!--          <template slot-scope="scope">-->
-<!--            <el-tooltip  placement="top" width="150"-->
-<!--                         trigger="hover"-->
-<!--                         effect="dark" close-delay="2000">-->
-<!--              <div class="MyPopover" slot="content">{{scope.row.desc}}</div>-->
-<!--              <div>-->
-<!--                <span>{{ scope.row.desc.substr(0,12)}}</span>-->
-<!--                <span v-if="(scope.row.desc).length > 12">...</span>-->
-<!--              </div>-->
-<!--            </el-tooltip>-->
-<!--          </template>-->
+        <el-table-column align="center" key="desc" prop="desc" label="描述" width="200">
+          <template slot-scope="scope">
+            <el-tooltip v-if="(scope.row.desc) != null && (scope.row.desc).length > 12"  placement="top" width="150"
+                         trigger="hover"
+                         effect="dark" close-delay="2000">
+              <div class="MyPopover" slot="content">{{scope.row.desc}}</div>
+              <div>
+                <span v-if="(scope.row.desc) == null">暂无</span>
+                <span v-else-if="(scope.row.desc).length < 12">{{scope.row.desc}}</span>
+                <span v-else-if="(scope.row.desc).length > 12">{{ scope.row.desc.substr(0,12)}}...</span>
+              </div>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column
             align="center"
@@ -134,7 +162,7 @@
         </el-table-column>
       </el-table>
       <div style="width:100%;height:100px"></div>
-      <el-dialog title="新增分类" :visible.sync="openAddCategory" width="45%"
+      <el-dialog :title="titlename" :visible.sync="openAddCategory" width="45%"
                  append-to-body
                  :close-on-click-modal="false"
                  :before-close="closeDialog"
@@ -148,12 +176,21 @@
           <el-form-item label="网站名" prop="name">
             <el-input v-model="form.name" placeholder='网站名' clearable ></el-input>
           </el-form-item>
+          <el-form-item label="网站id" prop="id" style="display: none">
+            <el-input v-model="form.id" placeholder='网站名' clearable ></el-input>
+          </el-form-item>
           <el-form-item label="网站图标" prop="icon">
             <el-input v-model="form.icon" placeholder='网站图标' clearable ></el-input>
           </el-form-item>
+          <el-form-item label="代理提示" prop="agentHint">
+            <el-input v-model="form.agentHint" placeholder='代理提示' clearable ></el-input>
+          </el-form-item>
           <el-form-item label="网站Tag" prop="tags">
             <el-input v-model="form.tags" placeholder='网站Tag' clearable ></el-input>
           </el-form-item>
+          <el-form-item label="网站描述" prop="desc">
+            <el-input v-model="form.desc" placeholder='网站描述' clearable ></el-input>
+          </el-form-item>
           <el-row>
             <el-col :span="12">
               <el-form-item label="网站归类" prop="cate_id">
@@ -183,7 +220,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="titlename=='编辑网址'">
               <el-form-item label="是否公开" prop="needLogin">
                 <el-radio-group v-model="form.needLogin" >
                   <el-radio :label="1">公开</el-radio>
@@ -194,8 +231,8 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="需要代理" prop="is_need_agent">
-                <el-radio-group v-model="form.is_need_agent" >
+              <el-form-item label="需要代理" prop="isNeedAgent">
+                <el-radio-group v-model="form.isNeedAgent" >
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="0">否</el-radio>
                 </el-radio-group>
@@ -205,7 +242,7 @@
 
           <el-form-item>
             <div style="display: flex;flex-direction: row;align-items: center;flex-wrap: nowrap;justify-content: space-between;width:60%">
-              <el-button @click="addCategory('form')" type="primary" style=";margin-top:10px">确认</el-button>
+              <el-button @click="addCategory('form',titlename)" type="primary" style=";margin-top:10px">确认</el-button>
               <el-button @click="reset('form')" type="success" style=";margin-top:10px">重置</el-button>
             </div>
           </el-form-item>
@@ -240,6 +277,8 @@ export default {
       userId:null,
       List:[],
       form:{
+        agentHint:'',
+        urlId:'',
         name:'',
         weigh:'',
         status:'',
@@ -248,7 +287,8 @@ export default {
         url:'',
         tags:'',
         desc:'',
-        is_need_agent:'',
+        isNeedAgent:'',
+        needLogin:'',
       },
       // 校验规则
       rules: {
@@ -266,6 +306,7 @@ export default {
   },
   mounted() {
     this.GetData();
+
   },
   created() {
     this.getUserInfo();
@@ -276,15 +317,18 @@ export default {
     // 重置表单：
     reset(){
       this.form = {
-            name:'',
-            weigh:'',
-            status:'',
-            icon:'',
-            cate_id:'',
-            url:'',
-            tags:'',
-            desc:'',
-            is_need_agent:'',
+        agentHint:'',
+        urlId:'',
+        name:'',
+        weigh:'',
+        status:'',
+        icon:'',
+        cate_id:'',
+        url:'',
+        tags:'',
+        desc:'',
+        isNeedAgent:'',
+        needLogin:'',
       }
     },
     // 解析网址：
@@ -351,6 +395,8 @@ export default {
       // 先重置
       //表单重置
       that.form = {
+        agentHint:'',
+        urlId:'',
         name:'',
         weigh:'',
         status:'',
@@ -359,7 +405,8 @@ export default {
         url:'',
         tags:'',
         desc:'',
-        is_need_agent:'',
+        isNeedAgent:'',
+        needLogin:'',
       }
       // 后关闭
       this.dialogVisible = false;
@@ -376,57 +423,88 @@ export default {
     handleEdit(index) {
       var _this = this;
       this.openAddCategoryFun();
-      _this.titlename="编辑分类";
+      _this.titlename="编辑网址";
       // 深拷贝
       this.form = index;
     },
     // 提交新增：
-    addCategory(rulelist){
+    addCategory(rulelist,title){
       var _this = this;
       _this.$refs[rulelist].validate((valid)=>{
         if(valid){
-          axios({
-            method: 'post',
-            // 请求的地址
-            url: '/api/admin/weblist/insertUrlByUser',
-            // URL 中的查询参数
-            params: {
-              name: this.form.name,
-              weigh: this.form.weigh,
-              icon:this.form.icon,
-              cateId:this.form.cate_id,
-              status: this.form.status,
-              need_login: this.form.need_login,
-              isNeedAgent:this.form.is_need_agent,
-              url: this.form.url,
-              desc: this.form.desc,
-            }
-          }).then(function (res) {
-            if (res.data.code === 500) {
-              Vue.prototype.$notify.error({
-                title: '错误',
-                message: res.data.msg,
-                offset: 50
-              });
+          if(title == "编辑网址"){
 
-            } else {
-              _this.closeDialog();
-              Vue.prototype.$notify({
-                title: '成功',
-                message: ('i', {style: 'color: teal'}, "更新成功！"),
-                type: 'success',
-                offset: 50
-              });
-            }
-          }).catch((error)=>{
-            // Vue.prototype.$notify.error({
-            //   title: '错误',
-            //   message: error,
-            //   offset: 50
-            // });
-          })
-        }else{
-          return;
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/admin/weblist/update',
+              // URL 中的查询参数
+              params: {
+                id:this.form.id,
+                name: this.form.name,
+                weigh: this.form.weigh,
+                icon:this.form.icon,
+                cateId:this.form.cate_id,
+                status: this.form.status,
+                isNeedAgent:this.form.isNeedAgent,
+                url: this.form.url,
+                desc: this.form.desc,
+                needLogin:this.form.needLogin,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }else if(title == "新增网址"){
+            axios({
+              method: 'post',
+              // 请求的地址
+              url: '/api/admin/weblist/insertUrlByUser',
+              // URL 中的查询参数
+              params: {
+                name: this.form.name,
+                weigh: this.form.weigh,
+                icon:this.form.icon,
+                cateId:this.form.cate_id,
+                status: this.form.status,
+                isNeedAgent:this.form.isNeedAgent,
+                url: this.form.url,
+                desc: this.form.desc,
+              }
+            }).then(function (res) {
+              if (res.data.code === 500) {
+                Vue.prototype.$notify.error({
+                  title: '错误',
+                  message: res.data.msg,
+                  offset: 50
+                });
+
+              } else {
+                _this.closeDialog();
+                Vue.prototype.$notify({
+                  title: '成功',
+                  message: ('i', {style: 'color: teal'}, "更新成功！"),
+                  type: 'success',
+                  offset: 50
+                });
+              }
+            }).catch((error)=>{
+            })
+          }
         }
       })
 
@@ -486,7 +564,8 @@ export default {
           tmp[i].childUC = tmp[i].childUC.map(item=>{
             return{
               ...item,
-              root:rootName
+              root:rootName,
+              root_id:catenum
             }
           });
           tmp2 = tmp2.concat(tmp[i].childUC);
@@ -501,7 +580,6 @@ export default {
         }
       });
       that.form.userId = that.userId;
-
     },
 
   }