Merge branch '12_4_dangyunlong' into dev

src/layout/components/template/componentMenu.vue

@@ -45,7 +45,7 @@
           </div>
           <div class="sectorItemBox">
             <div class="sectorItem">
-              <img src="@/assets/template/sector/newsSector.png" @click="addModule('listSector',20)"/>
+              <img src="@/assets/template/sector/newsSector.png" @click="addModule('listSector',28)"/>
             </div>
             <div class="sectorItemTitle">文章列表</div>
           </div>

src/views/template/style/1/listSector.vue

@@ -49,10 +49,22 @@ export default {
       align-items: center;
     }
     .listSectorBoxContent {
-
-    }
-    .listNewsRight {
-
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 80%;
+      .listNewsLeft {
+        width: 50%;
+        box-sizing: border-box;
+        border: 1px dashed #5570F1;
+        padding-right: 10px;
+      }
+      .listNewsRight {
+        width: 50%;
+        box-sizing: border-box;
+        border: 1px dashed #5570F1;
+        padding-left: 10px;
+      }
     }
   }
 </style>

src/views/website/WebsiteList.vue

@@ -631,7 +631,7 @@ export default {
               this.closeWindow();
             }else{
               this.$message({
-                type: 'success',
+                type: 'error',
                 message: '添加失败！请检查网络！'
               });
               //清空并退出
@@ -784,9 +784,9 @@ export default {
         this.form.keywords = res.data.keywords;
         this.form.description = res.data.description;
         //回显模板信息
-        this.form.template_id = res.data.template_id;
-        this.TemplateName = res.data.template_name;
-        this.TemplateImg = JSON.parse(res.data.template_img)[0];
+        // this.form.template_id = res.data.template_id;
+        // this.TemplateName = res.data.template_name;
+        // this.TemplateImg = JSON.parse(res.data.template_img)[0];
       })
 
       this.editBtn = true;//显示编辑按钮
@@ -808,15 +808,23 @@ export default {
           this.form.id = this.editId;
           //提交表单
           this.$store.dispatch('pool/updateWebsite',this.form).then(res=> {
-            //汇报结果
-            this.$message({
-              type: 'success',
-              message: '已成功修改网站信息！'
-            });
-            //清空并退出
-            this.closeWindow();
-            //重新请求列表
-            this.getData();
+            console.log(res.code)
+            if(res.code==200){
+              //汇报结果
+              this.$message({
+                type: 'success',
+                message: '已成功修改网站信息！'
+              });
+              //清空并退出
+              this.closeWindow();
+              //重新请求列表
+              this.getData();
+            }else{
+              this.$message.error('修改失败！')
+              //清空并退出
+              this.closeWindow();
+            }
+            
           }).catch(() => {
             this.$message({
               type: 'warning',