diff --git a/src/components/setting/website/websiteManage.vue b/src/components/setting/website/websiteManage.vue
index 2a51789..897597f 100644
--- a/src/components/setting/website/websiteManage.vue
+++ b/src/components/setting/website/websiteManage.vue
@@ -9,21 +9,21 @@
         <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-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
-                max-height="400"
+                max-height="500"
                >
         <el-table-column
             align="center"
@@ -35,6 +35,7 @@
         </el-table-column>
         <el-table-column
             align="center"
+            style="display: none"
             prop="parentId"
             label="所属编号"
             width="50">
@@ -59,6 +60,28 @@
             </el-tooltip>
           </template>
         </el-table-column>
+        <el-table-column
+            align="center"
+            prop="tags"
+            label="网站Tag"
+            width="150">
+        </el-table-column>
+        <el-table-column align="center"  prop="icon" label="网站Icon" width="150">
+          <template slot-scope="scope">
+            <div v-if="(scope.row.icon) != null && (scope.row.icon).length < 12">
+              {{scope.row.icon}}
+            </div>
+            <el-tooltip v-else-if="(scope.row.icon) != null && (scope.row.icon).length >= 12"  placement="top" width="150"
+                        trigger="hover"
+                        effect="dark" close-delay="2000">
+              <div class="MyPopover" slot="content">{{scope.row.icon}}</div>
+              <div>
+                <span v-if="(scope.row.icon).length < 12">{{scope.row.icon}}</span>
+                <span v-else-if="(scope.row.icon).length > 12">{{ scope.row.icon.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"
@@ -86,13 +109,15 @@
         </el-table-column>
         <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"
+            <div v-if="(scope.row.desc) != null && (scope.row.desc).length < 12">
+              {{scope.row.desc}}
+            </div>
+            <el-tooltip v-else-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-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>
@@ -175,8 +200,8 @@
           <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 label="网站id" prop="urlId" style="display: none">
+            <el-input v-model="form.urlId" placeholder='网站名' clearable ></el-input>
           </el-form-item>
           <el-form-item label="网站图标" prop="icon">
             <el-input v-model="form.icon" placeholder='网站图标' clearable ></el-input>
@@ -276,6 +301,7 @@ export default {
       userId:null,
       List:[],
       form:{
+        id:'',
         agentHint:'',
         urlId:'',
         name:'',
@@ -296,10 +322,10 @@ export default {
         needLogin: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
         status: [{ required: 'true', message: '请输入是否启用', trigger: 'blur' }],
         icon: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
-        cate_id: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        // parentId: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
         url: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
-        tags: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
-        is_need_agent: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        // tags: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
+        isNeedAgent: [{ required: 'true', message: '请完善信息', trigger: 'blur' }],
       }
     }
   },
@@ -315,6 +341,7 @@ export default {
     // 重置表单：
     reset(){
       this.form = {
+        id:'',
         agentHint:'',
         urlId:'',
         name:'',
@@ -393,6 +420,7 @@ export default {
       // 先重置
       //表单重置
       that.form = {
+        id:'',
         agentHint:'',
         urlId:'',
         name:'',
@@ -429,17 +457,19 @@ export default {
     // 提交新增：
     addCategory(rulelist,title){
       var _this = this;
+      console.log(this.form);
       _this.$refs[rulelist].validate((valid)=>{
         if(valid){
           if(title == "编辑网址"){
-
             axios({
               method: 'post',
               // 请求的地址
               url: '/api/admin/weblist/update',
               // URL 中的查询参数
               params: {
-                id:this.form.id,
+                tags:this.form.tags,
+                agentHint:this.form.agentHint,
+                id:this.form.urlId,
                 name: this.form.name,
                 weigh: this.form.weigh,
                 icon:this.form.icon,
@@ -476,6 +506,7 @@ export default {
               url: '/api/admin/weblist/insertUrlByUser',
               // URL 中的查询参数
               params: {
+                agentHint:this.form.agentHint,
                 name: this.form.name,
                 weigh: this.form.weigh,
                 icon:this.form.icon,
@@ -601,7 +632,7 @@ export default {
 .MyTable{
   overflow:auto;
   margin-top:10px;
-  height:600px;
+  height:500px;
   width: 95%;
   background-color:var(--table-bg-color);
   color:var(--theme-color);