修改

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_82qvnhne0zp.css');
+@import url('//at.alicdn.com/t/font_2077629_iur7ea01ckc.css');
 
 html,
 body,

src/api/system/webkit.js

@@ -108,6 +108,20 @@ export function RemoveWebMenuStatus(data) {
     })
 }  
 
+
+/**
+ * 获取网站新闻类型列表
+ * 
+ */
+export function GetWebNewsTypeList(data) {
+    return request({
+      url: '/WebManager/GetWebNewsTypeList',
+      method: 'post',
+      data
+    })
+}  
+
+
 /**
  * 获取新闻类型分页
  * 
@@ -161,11 +175,11 @@ export function GetWebNewsType(data) {
  * 获取网站新闻列表
  * 
  */
-export function GetWebNewsList() {
+export function GetWebNewsList(data) {
     return request({
       url: '/WebManager/GetWebNewsList',
       method: 'post',
-      data:''
+      data
     })
 }  
 
@@ -182,4 +196,38 @@ export function GetWebNewsPage(data) {
     })
 }  
 
+/**
+ * 新增修改网站新闻
+ * 
+ */
+export function SetWebNews(data) {
+    return request({
+      url: '/WebManager/SetWebNews',
+      method: 'post',
+      data
+    })
+}  
+
+/**
+ * 获取网站新闻详情
+ * 
+ */
+export function GetWebNews(data) {
+    return request({
+      url: '/WebManager/GetWebNews',
+      method: 'post',
+      data
+    })
+}  
 
+/**
+ * 修改网站新闻状态
+ * 
+ */
+export function RemoveWebNewsStatus(data) {
+    return request({
+      url: '/WebManager/RemoveWebNewsStatus',
+      method: 'post',
+      data
+    })
+} 
\ No newline at end of file

src/pages/system/menuManage.vue

@@ -140,9 +140,9 @@
         };
         var tipMsg = "";
         if (delMsg.Status == 0) {
-          tipMsg = "是否启用【" + obj.Name + "】菜单?";
+          tipMsg = "是否启用【" + obj.Name + "】?";
         } else {
-          tipMsg = "是否禁用【" + obj.Name + "】菜单?";
+          tipMsg = "是否禁用【" + obj.Name + "】?";
         }
         this.$q.dialog({
           title: '提示信息',
@@ -194,9 +194,7 @@
       refreshPage() {
         if (!this.menuObjOption) {
           this.msg.pageIndex = 1;
-          this.msg.NavTitle = "";
-          this.msg.SubTitle = "";
-          this.msg.NavType = 0;
+          this.msg.Name = "";
           this.msg.Status = "-1";
         }
         this.getList()

src/pages/system/news.vue

@@ -10,21 +10,25 @@
           <q-select @input="resetSearch" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
             v-model="msg.Status" :options="ShowOpts" emit-value map-options label="状态" />
         </div>
+        <div class="col-3">
+          <q-select @input="resetSearch" option-value="Id" option-label="TypeName" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg"
+            v-model="msg.TypeId" :options="TypeList" emit-value map-options label="类型" />
+        </div>
       </div>
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
-          <div class="col-2 q-table__title">菜单信息</div>
+          <div class="col-2 q-table__title">新闻信息</div>
           <q-space />
           <div class="page-option">
-            <q-btn color="accent" class="q-mr-md" size="sm" icon="add" label="新增菜单" @click="EditMenu(null)" />
+            <q-btn color="accent" class="q-mr-md" size="sm" icon="add" label="新增新闻" @click="EditMenu(null)" />
           </div>
         </template>
-        <template v-slot:body-cell-Icon="props">
+        <template v-slot:body-cell-Img="props">
           <q-td :props="props">
-            <img :src="props.row.Icon" style="width:50px;" />
+            <img :src="props.row.Img" style="width:50px;" />
           </q-td>
         </template>
         <template v-slot:body-cell-Status="props">
@@ -44,8 +48,8 @@
           </q-td>
         </template>
       </q-table>
-      <webmenu-form v-if="isShowMenuForm" :save-obj="menuObjOption" @close="closeMenuSaveForm" @success="refreshPage">
-      </webmenu-form>
+      <news-form v-if="isShowNewsForm" :save-obj="menuObjOption" @close="closeMenuSaveForm" @success="refreshPage">
+      </news-form>
     </div>
   </div>
 </template>
@@ -53,40 +57,35 @@
   import {
     GetWebNewsPage,
     RemoveWebMenuStatus,
-    GetWebNewsList
+    GetWebNewsTypeList,
+    RemoveWebNewsStatus
   } from '../../api/system/webkit'
-  import webmenuForm from '../../components/system/webmenu-form'
+  import newsForm from '../../components/system/news-form'
   export default {
     meta: {
       title: "菜单管理"
     },
     components: {
-      webmenuForm
+      newsForm
     },
     data() {
       return {
         columns: [{
-            name: 'Name',
-            label: '菜单名称',
-            field: 'Name',
+            name: 'Title',
+            label: '标题',
+            field: 'Title',
             align: 'left'
           },
           {
-            name: 'MenuUrl',
-            label: '菜单链接',
-            field: 'MenuUrl',
+            name: 'Content',
+            label: '内容',
+            field: 'Content',
             align: 'left'
           },
           {
-            name: 'MenuLevel',
-            label: '菜单等级',
-            field: 'MenuLevel',
-            align: 'left'
-          },
-          {
-            name: 'Icon',
-            label: '图标',
-            field: 'Icon',
+            name: 'Img',
+            label: '图片',
+            field: 'Img',
             align: 'left'
           },
           {
@@ -125,7 +124,8 @@
           Status: -1
         },
         pageCount: 0,
-        isShowMenuForm: false,
+        TypeList:[],
+        isShowNewsForm: false,
         menuObjOption: null,
       }
     },
@@ -143,9 +143,9 @@
         };
         var tipMsg = "";
         if (delMsg.Status == 0) {
-          tipMsg = "是否启用【" + obj.Name + "】菜单?";
+          tipMsg = "是否启用【" + obj.Title + "】?";
         } else {
-          tipMsg = "是否禁用【" + obj.Name + "】菜单?";
+          tipMsg = "是否禁用【" + obj.Title + "】?";
         }
         this.$q.dialog({
           title: '提示信息',
@@ -155,7 +155,7 @@
           ok: "确定",
           cancel: "取消",
         }).onOk(() => {
-          RemoveWebMenuStatus(delMsg).then(res => {
+          RemoveWebNewsStatus(delMsg).then(res => {
             if (res.Code == 1) {
               that.$q.notify({
                 icon: 'iconfont icon-chenggong',
@@ -195,11 +195,15 @@
       },
       //获取下拉数据
       getWebNews(){
-        GetWebNewsList().then(res => {
-          console.log(res,'下拉数据来也！');
+        GetWebNewsTypeList({}).then(res => {
+          this.TypeList = res.Data;
+          let obj = {
+            Id:0,
+            TypeName:'不限'
+          }
+          this.TypeList.unshift(obj);
         }).catch(() => {
         })
-
       },
 
       //刷新页面
@@ -219,11 +223,11 @@
         } else {
           this.menuObjOption = null
         }
-        this.isShowMenuForm = true
+        this.isShowNewsForm = true
       },
       //关闭弹窗
       closeMenuSaveForm() {
-        this.isShowMenuForm = false
+        this.isShowNewsForm = false
       },
     }
   }

src/pages/system/newsType.vue

@@ -128,9 +128,9 @@
         };
         var tipMsg = "";
         if (delMsg.Status == 0) {
-          tipMsg = "是否启用【" + obj.TypeName + "】菜单?";
+          tipMsg = "是否启用【" + obj.TypeName + "】?";
         } else {
-          tipMsg = "是否禁用【" + obj.TypeName + "】菜单?";
+          tipMsg = "是否禁用【" + obj.TypeName + "】?";
         }
         this.$q.dialog({
           title: '提示信息',

src/pages/system/webkitManage.vue

@@ -179,9 +179,9 @@
         };
         var tipMsg = "";
         if (delMsg.Status == 0) {
-          tipMsg = "是否启用【" + obj.NavTitle + "】菜单?";
+          tipMsg = "是否启用【" + obj.NavTitle + "】?";
         } else {
-          tipMsg = "是否禁用【" + obj.NavTitle + "】菜单?";
+          tipMsg = "是否禁用【" + obj.NavTitle + "】?";
         }
         this.$q.dialog({
           title: '提示信息',