From a9c401e79d244ec2cfa6ca9d71f36c1bd7add848 Mon Sep 17 00:00:00 2001
From: "DESKTOP-00SUCB6\\Administrator" <qinshunyu07@sina.com>
Date: Wed, 20 Jan 2021 18:22:05 +0800
Subject: [PATCH] =?UTF-8?q?v0.6=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.js                              |  6 +-
 public/template/001/login/login/index.scss    |  2 +-
 public/template/001/styles/element-ui.scss    | 22 +++---
 public/template/001/styles/index.scss         |  1 +
 public/template/001/styles/sidebar.scss       | 12 +--
 src/store/modules/user.js                     |  1 +
 src/utils/request.js                          |  2 +-
 src/views/layout/components/AppMain.vue       |  2 +-
 src/views/layout/components/Sidebar/index.vue |  6 +-
 src/views/layout/components/header.vue        |  2 +-
 src/views/login/editPassword.vue              |  2 +-
 src/views/login/index.vue                     |  4 +-
 src/views/login/register.vue                  |  4 +-
 src/views/login/retrievePassword.vue          | 10 +--
 src/views/login/userInfo.vue                  |  4 +-
 src/views/systemManage/company/company.vue    | 12 +--
 .../systemManage/company/companyDetail.vue    |  2 +-
 .../systemManage/company/companyExamine.vue   |  4 +-
 src/views/systemManage/menu.vue               |  6 +-
 src/views/systemManage/notice/notice.vue      | 26 +++----
 .../systemManage/notice/noticeDetail.vue      | 76 ++++++++++++++-----
 src/views/systemManage/notice/noticeShow.vue  | 19 ++++-
 src/views/systemManage/permission.vue         |  4 +-
 src/views/systemManage/role.vue               |  4 +-
 src/views/systemManage/user.vue               |  8 +-
 25 files changed, 146 insertions(+), 95 deletions(-)

diff --git a/public/config.js b/public/config.js
index 6a082a5..82ffee6 100644
--- a/public/config.js
+++ b/public/config.js
@@ -5,9 +5,9 @@
 //         SHOW_URL: "http://www.fatoaniic.com/ftpfile/",
 //     }
     config = {
-        API_URL: 'http://172.119.51.18:8082',
-        UPLOAD_URL: "http://172.119.51.18:8082/attachment/uploadOne",
-        DOWNLOAD_URL: "http://172.119.51.18:8082/api-ftp/ftp/download?filename=",
+        API_URL: 'http://172.119.51.140:8082',
+        UPLOAD_URL: "http://172.119.51.140:8082/attachment/uploadOne",
+        DOWNLOAD_URL: "http://172.119.51.140:8082/api-ftp/ftp/download?filename=",
         SHOW_URL: "http://www.fatoaniic.com/ftpfile/",
     }
     
\ No newline at end of file
diff --git a/public/template/001/login/login/index.scss b/public/template/001/login/login/index.scss
index 27a994a..3d3aa33 100644
--- a/public/template/001/login/login/index.scss
+++ b/public/template/001/login/login/index.scss
@@ -68,7 +68,7 @@
             color:rgba(255,255,255,1);
             width:405px;
             height:35px;
-            background:linear-gradient(-24deg,rgba(223,52,52,1),rgba(255,108,88,1));
+            // background:linear-gradient(-24deg,rgba(223,52,52,1),rgba(255,108,88,1));
             border:1px solid rgba(220, 220, 220, 1);
             border-radius:4px;
         }
diff --git a/public/template/001/styles/element-ui.scss b/public/template/001/styles/element-ui.scss
index 5ba4a53..ae62306 100644
--- a/public/template/001/styles/element-ui.scss
+++ b/public/template/001/styles/element-ui.scss
@@ -26,24 +26,24 @@
   color: #606266;
 }
 .el-pagination.is-background .el-pager li:not(.disabled):hover {
-  color: #df3434;
+  color: #1b5c7d;
 }
 .el-pagination.is-background .el-pager li:not(.disabled).active {
-  background-color: #df3434;
+  background-color: #1b5c7d;
   color: #fff;
 }
 .el-pagination__sizes .el-input .el-input__inner:hover {
-  border-color: #df3434;
+  border-color: #1b5c7d;
 }
 .el-select .el-input.is-focus .el-input__inner {
-  border-color: #df3434;
+  border-color: #1b5c7d;
 }
 .el-select-dropdown__item.selected {
-  color: #df3434;
+  color: #1b5c7d;
 }
 .el-input.is-active .el-input__inner,
 .el-input__inner:focus {
-  border-color: #df3434;
+  border-color: #1b5c7d;
 }
 
 .el-dialog__header {
@@ -85,15 +85,15 @@
 
 //步骤条
 .el-step__head.is-process {
-  color: #DF3434;
-  border-color: #DF3434;
+  color: #1b5c7d;
+  border-color: #1b5c7d;
 }
 .el-step__title.is-process {
   font-weight: 700;
-  color: #DF3434;
+  color: #1b5c7d;
 }
 .el-step__description.is-process {
-  color: #DF3434;
+  color: #1b5c7d;
 }
 
 //文字链接
@@ -106,7 +106,7 @@
   width:100%;
   padding: 0;
   height:84px;
-  background-color: #DF3434;
+  background-color: #1b5c7d;
   z-index: 100;
 }
 
diff --git a/public/template/001/styles/index.scss b/public/template/001/styles/index.scss
index 99149a8..78657a4 100644
--- a/public/template/001/styles/index.scss
+++ b/public/template/001/styles/index.scss
@@ -141,6 +141,7 @@ a:active {
 .app-main {
   min-height: 100%;
   padding-top:84px;
+  border-top: 2px solid #1b5c7d;
 }
 
 .app-container {
diff --git a/public/template/001/styles/sidebar.scss b/public/template/001/styles/sidebar.scss
index e886303..356a02f 100644
--- a/public/template/001/styles/sidebar.scss
+++ b/public/template/001/styles/sidebar.scss
@@ -23,7 +23,7 @@
         // height: 60px;
         position: fixed;
         min-width: 700px;
-        background-color: #DF3434;
+        background-color: #1b5c7d;
         color: #fff;
         top: 0;
         left: 0;
@@ -133,16 +133,16 @@
             background-size: 100% 100%;
             li {
                 &:hover {
-                    color: #DF3434;
-                    background-color: #FFE8E6 !important;
+                    color: #1b5c7d;
+                    background-color: #ececec !important;
                 }
             }
         }
         .is-active {
-            border-left: 3px solid #DF3434;
-            color: #DF3434;
+            border-left: 3px solid #1b5c7d;
+            color: #1b5c7d;
             border-bottom: 0;
-            background-color: #FFE8E6 !important;
+            background-color: #ececec !important;
         }
     }
     .openSidebar {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c01731d..d0a281a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -126,6 +126,7 @@ const user = {
         commit('SET_NAME', "")
         removeToken();
         removeName()
+        resolve();
       });
     },
   },
diff --git a/src/utils/request.js b/src/utils/request.js
index 9d4d452..75fa645 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -75,7 +75,7 @@ service.interceptors.response.use(
         if (res.status !== 200) {
 
             // 511:失效的token;弹出弹框，返回登录页
-            if (res.status === 511) {
+            if (res.status === 74001) {
                 if (isToken) {
                     isToken = false //防止下个一个token失效的请求在弹出第二个框
                     MessageBox.alert('你已被登出，请重新登录', '确定登出', {
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index 6e6baad..2fad99d 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -62,7 +62,7 @@ import ResizeMixin from "../mixin/ResizeHandler";
         /* max-height: calc(100vh - 194px); */
         position: relative;
         overflow: auto;
-        border-top: 2px solid rgba(223,52,52,1);
+        
         padding: 20px;
     }
 </style>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 8130e6c..c57f977 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -48,12 +48,12 @@
                     {
 						path: 'company',
 						name: 'companyManage',
-						meta: {title: '公司管理', icon: 'dashboard', noCache: true},
+						meta: {title: '公司管理', icon: 'tree', noCache: true},
 					},
                     {
 						path: 'user',
 						name: 'userManage',
-						meta: {title: '用户管理', icon: 'dashboard', noCache: true},
+						meta: {title: '用户管理', icon: 'user', noCache: true},
 					},
 					// {
 					// 	path: 'role',
@@ -68,7 +68,7 @@
                     {
 						path: 'notice',
 						name: 'noticeManage',
-						meta: {title: '公告管理', icon: 'jiaoliu', noCache: true},
+						meta: {title: '文章管理', icon: 'jiaoliu', noCache: true},
 					}
                 ],
             }
diff --git a/src/views/layout/components/header.vue b/src/views/layout/components/header.vue
index 4f8551d..25f654f 100644
--- a/src/views/layout/components/header.vue
+++ b/src/views/layout/components/header.vue
@@ -19,7 +19,7 @@
                 <el-dropdown  :style="{'color':variables.menuText}">
                     <div class="avatar-wrapper">
                         <!-- <img class="user-avatar" src="@/assets/touxiang.png"> -->
-                        <span>{{name.length > 3 ? name.substring(0,3)+'...':name||'欢迎您'}}</span>
+                        <span>{{name.length > 7 ? name.substring(0,6)+'...':name||'欢迎您'}}</span>
                         <i class="el-icon-caret-bottom"></i>
                     </div>
                     <el-dropdown-menu class="user-dropdown" slot="dropdown">
diff --git a/src/views/login/editPassword.vue b/src/views/login/editPassword.vue
index 21410b8..be48a76 100644
--- a/src/views/login/editPassword.vue
+++ b/src/views/login/editPassword.vue
@@ -12,7 +12,7 @@
           <el-input type="password" v-model="form.again" autocomplete="off"></el-input>
         </el-form-item>
         <div class="form-footer">
-          <el-button type="danger" size="mini" @click="submitForm('password')">确定</el-button>
+          <el-button type="primary" size="mini" @click="submitForm('password')">确定</el-button>
           <el-button type="info" size="mini" @click="resetForm('password')">取消</el-button>
         </div>
       </el-form>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3816d0c..d988d6f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -219,7 +219,7 @@ export default {
 };
 </script>
 <style>
-.login-container .login-btn {
+/* .login-container .login-btn {
   background: #ff6c58;
-}
+} */
 </style>
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
index bbcb03b..7c643f6 100644
--- a/src/views/login/register.vue
+++ b/src/views/login/register.vue
@@ -30,12 +30,12 @@
         </el-form-item> -->
         <el-form-item label="短信验证码：" :label-width="formLabelWidth" prop="code">
           <el-input v-model.number="form.code" autocomplete="off" size="small" style="width:110px;margin-right:5px;"></el-input>
-          <el-button type="danger" style="width:100px;" size="small" @click="getSendMessage" :disabled="sendStatus">
+          <el-button type="primary" style="width:100px;" size="small" @click="getSendMessage" :disabled="sendStatus">
             {{ !sendStatus ? '获取验证码' : timer + '秒' }}
           </el-button>
         </el-form-item>
         <el-form-item :label-width="formLabelWidth">
-          <el-button type="danger" size="small" @click="submitForm('userInfo')" style="width:100%;">注册</el-button>
+          <el-button type="primary" size="small" @click="submitForm('userInfo')" style="width:100%;">注册</el-button>
         </el-form-item>
         <el-form-item :label-width="formLabelWidth" class="text-center">
           已有账号？
diff --git a/src/views/login/retrievePassword.vue b/src/views/login/retrievePassword.vue
index 443db44..2e35c8c 100644
--- a/src/views/login/retrievePassword.vue
+++ b/src/views/login/retrievePassword.vue
@@ -21,7 +21,7 @@
             </el-form-item>
             <el-form-item :label-width="formLabelWidth">
               <el-button
-                  type="danger"
+                  type="primary"
                   size="small"
                   style="width:250px;"
                   @click="submitForm('step0')"
@@ -44,9 +44,9 @@
                   size="small"
                   style="width:110px;margin-right:5px;"
               ></el-input>
-              <!-- <el-button type="danger" size="small ">获取验证码</el-button> -->
+              <!-- <el-button type="primary" size="small ">获取验证码</el-button> -->
               <el-button
-                  type="danger"
+                  type="primary"
                   style="width:100px;"
                   size="small"
                   @click="getSendMessage"
@@ -55,7 +55,7 @@
             </el-form-item>
             <el-form-item :label-width="formLabelWidth">
               <el-button
-                  type="danger"
+                  type="primary"
                   size="small"
                   style="width:250px;"
                   @click="submitForm('step1')"
@@ -74,7 +74,7 @@
             </el-form-item>
             <el-form-item :label-width="formLabelWidth">
               <el-button
-                  type="danger"
+                  type="primary"
                   size="small"
                   style="width:250px;"
                   @click="submitForm('step2')"
diff --git a/src/views/login/userInfo.vue b/src/views/login/userInfo.vue
index 3c55e9a..cff556b 100644
--- a/src/views/login/userInfo.vue
+++ b/src/views/login/userInfo.vue
@@ -25,9 +25,9 @@
           <el-input v-else v-model="form.phone" autocomplete="off"></el-input>
         </el-form-item>
         <div class="form-footer">
-          <el-button type="danger" size="mini" v-if="!isEdit" @click="editInfo">编辑</el-button>
+          <el-button type="primary" size="mini" v-if="!isEdit" @click="editInfo">编辑</el-button>
           <div v-else>
-            <el-button type="danger" size="mini" @click="submitForm('userInfo')">确定</el-button>
+            <el-button type="primary" size="mini" @click="submitForm('userInfo')">确定</el-button>
             <el-button type="info" size="mini" @click="resetForm('userInfo')">取消</el-button>
           </div>
         </div>
diff --git a/src/views/systemManage/company/company.vue b/src/views/systemManage/company/company.vue
index 1024ce3..9471279 100644
--- a/src/views/systemManage/company/company.vue
+++ b/src/views/systemManage/company/company.vue
@@ -6,11 +6,11 @@
           <el-input v-model="formSearch.name" size="mini" placeholder="请输入企业名称" clearable maxlength="50"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" size="mini" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-search" @click="search">查询</el-button>
         </el-form-item>
         <el-form-item class="float-right">
-          <el-button type="danger" size="mini" icon="el-icon-refresh" @click="search">刷新</el-button>
-          <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addComany">新增</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-refresh" @click="search">刷新</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addComany">新增</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -46,7 +46,7 @@
       <el-table-column label="操作" width="150">
         <template slot-scope="scope">
           <!--<el-button type="success" size="mini" round v-if="scope.row.auditStatus == 0" @click="auditing(scope.row.code,scope.row.version,'1')">通过</el-button>
-          <el-button type="danger" size="mini"  round v-if="scope.row.auditStatus == 0" @click="auditing(scope.row.code,scope.row.version,'2')">不通过</el-button>
+          <el-button type="primary" size="mini"  round v-if="scope.row.auditStatus == 0" @click="auditing(scope.row.code,scope.row.version,'2')">不通过</el-button>
           <el-button type="text" size="small" v-if="scope.row.auditStatus == 0" @click="showVerifyForm(scope.row.id)">审核</el-button>-->
           <el-button type="text" size="small" @click="showCompany(scope.row.id)">详情</el-button>
           <el-button type="text" size="small" @click="editCompany(scope.row.id)"><i class="el-icon-edit"></i>修改</el-button>
@@ -77,7 +77,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" size="mini" @click="submitForm('verifyForm')">保存</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('verifyForm')">保存</el-button>
         <el-button type="info" size="mini" @click="resetForm('verifyForm')">取消</el-button>
       </div>
     </el-dialog>
@@ -149,7 +149,7 @@ export default {
       getEnterpriseList(params).then(res => {
         if (res.data) {
           this.tableData = res.data.list
-          this.total = res.data.total
+          this.total = res.data.count
         }
       })
     },
diff --git a/src/views/systemManage/company/companyDetail.vue b/src/views/systemManage/company/companyDetail.vue
index cd45a26..e6ac5e0 100644
--- a/src/views/systemManage/company/companyDetail.vue
+++ b/src/views/systemManage/company/companyDetail.vue
@@ -184,7 +184,7 @@
         </el-col>
       </el-row>
       <div class="form-footer">
-        <el-button type="danger" size="mini" @click="submitForm('companyForm')">确定</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('companyForm')">确定</el-button>
         <el-button
             type="info"
             size="mini"
diff --git a/src/views/systemManage/company/companyExamine.vue b/src/views/systemManage/company/companyExamine.vue
index a106a0e..9b25849 100644
--- a/src/views/systemManage/company/companyExamine.vue
+++ b/src/views/systemManage/company/companyExamine.vue
@@ -5,7 +5,7 @@
         <el-tab-pane label="注册审核" name="1"></el-tab-pane>
         <el-tab-pane label="变更审核" name="2"></el-tab-pane>
       </el-tabs>
-      <el-button class="refresh" type="danger" size="mini" icon="el-icon-refresh" @click="initData">刷新</el-button>
+      <el-button class="refresh" type="primary" size="mini" icon="el-icon-refresh" @click="initData">刷新</el-button>
     </div>
     <el-table :data="tableData" style="width: 100%" header-row-class-name="">
       <el-table-column prop="enName" label="企业名称" width="350"></el-table-column>
@@ -52,7 +52,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" size="mini" @click="submitForm('verifyForm')">确定</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('verifyForm')">确定</el-button>
         <el-button type="info" size="mini" @click="resetForm('verifyForm')">取消</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/systemManage/menu.vue b/src/views/systemManage/menu.vue
index 526c29f..37c5dff 100644
--- a/src/views/systemManage/menu.vue
+++ b/src/views/systemManage/menu.vue
@@ -6,10 +6,10 @@
                     <el-input v-model="formSearch.name" size="mini" placeholder="请输入菜单名" clearable maxlength="50"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="danger" size="mini" icon="el-icon-search" @click="search">查询</el-button>
+                    <el-button type="primary" size="mini" icon="el-icon-search" @click="search">查询</el-button>
                 </el-form-item>
                 <el-form-item class="float-right">
-                    <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addUserDialog">新增</el-button>
+                    <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addUserDialog">新增</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -50,7 +50,7 @@
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="danger" size="mini" @click="submitForm('ruleForm')">保存</el-button>
+                <el-button type="primary" size="mini" @click="submitForm('ruleForm')">保存</el-button>
                 <el-button type="info" size="mini" @click="resetForm('ruleForm')">取消</el-button>
             </div>
         </el-dialog>
diff --git a/src/views/systemManage/notice/notice.vue b/src/views/systemManage/notice/notice.vue
index 5dc320f..0b840d5 100644
--- a/src/views/systemManage/notice/notice.vue
+++ b/src/views/systemManage/notice/notice.vue
@@ -16,10 +16,10 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-              <el-button type="danger" size="mini" icon="el-icon-search" @click="search">查询</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-search" @click="search">查询</el-button>
           </el-form-item>
           <el-form-item class="float-right">
-              <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addNotice">新增</el-button>
+              <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addNotice">新增</el-button>
           </el-form-item>
       </el-form>
     </div>
@@ -27,13 +27,11 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="title" label="标题"></el-table-column>
       <el-table-column prop="author" label="作者"></el-table-column>
-      <el-table-column prop="type" label="文章类型">
-        <template slot-scope="scope">
-          {{ scope.row.type | filterAdd1(that) }}
-        </template>
-      </el-table-column>
+      <el-table-column prop="source" label="文章来源"></el-table-column>
+      <el-table-column prop="isIssueText" label="发布状态"></el-table-column>
+      <el-table-column prop="typeName" label="文章类型"></el-table-column>
       <el-table-column prop="issueStartTime" label="发布开始时间"></el-table-column>
-      <el-table-column prop="issueEndTime" label="发布结束时间"></el-table-column>
+      <!-- <el-table-column prop="issueEndTime" label="发布结束时间"></el-table-column> -->
       <el-table-column label="操作" width="150">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showNotice(scope.row.id)">预览</el-button>
@@ -84,7 +82,7 @@ export default {
     }
   },
   mounted() {
-    this.getNoticeType()
+    // this.getNoticeType()
     this.initData()
   },
   methods: {
@@ -111,11 +109,11 @@ export default {
         }
       })
     },
-    getNoticeType(){
-      getNoticeTypeList().then(res => {
-        this.sortType = res.data
-      })
-    },
+    // getNoticeType(){
+    //   getNoticeTypeList().then(res => {
+    //     this.sortType = res.data
+    //   })
+    // },
     //根据ID删除文章
     deleteNotice(id) {
       this.$confirm('此操作将删除该文章, 是否继续?', '提示', {
diff --git a/src/views/systemManage/notice/noticeDetail.vue b/src/views/systemManage/notice/noticeDetail.vue
index a978fb2..68e179a 100644
--- a/src/views/systemManage/notice/noticeDetail.vue
+++ b/src/views/systemManage/notice/noticeDetail.vue
@@ -26,7 +26,7 @@
                   v-for="item in sortType"
                   :key="item.value"
                   :label="item.name"
-                  :value="parseInt(item.value)">
+                  :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -42,16 +42,28 @@
               :inactive-value="0">
             </el-switch>
           </el-form-item>
-          <el-form-item label="生效时间：" :label-width="formLabelWidth" prop="time">
+          <el-form-item label="是否展示在首页轮播：" :label-width="formLabelWidth" prop="isHomeSlideshow">
+            <el-switch
+              v-model="form.isHomeSlideshow"
+              @change="checkIsCarousel"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0">
+            </el-switch>
+          </el-form-item>
+          <el-form-item label="生效时间：" :label-width="formLabelWidth" prop="issueStartTime">
             <el-date-picker
-                v-model="form.time"
-                type="daterange"
+                v-model="form.issueStartTime"
                 value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
+                type="date"
+                placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
+          
+          <el-form-item label="文章来源：" :label-width="formLabelWidth" prop="source">
+            <el-input v-model="form.source" autocomplete="off" placeholder="请输入文章来源"></el-input>
+          </el-form-item>
           <el-form-item label="作者：" :label-width="formLabelWidth" prop="author">
             <el-input v-model="form.author" autocomplete="off" placeholder="请输入作者"></el-input>
           </el-form-item>
@@ -66,6 +78,8 @@
               id="quill-img"
               class="avatar-uploader"
               :action="upload_action"
+              :headers="upload_headers"
+              :data="upload_data"
               :show-file-list="false"
               :on-success="fileChange"
               style="display: none;width:0">
@@ -80,7 +94,7 @@
         </el-form-item>
       </el-row>
       <div class="form-footer">
-        <el-button type="danger" size="mini" @click="submitForm('ruleForm')">确定</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('ruleForm')">确定</el-button>
         <el-button type="info" size="mini" @click="resetForm('ruleForm')">返回</el-button>
       </div>
     </el-form>
@@ -118,11 +132,13 @@ export default {
         title: '',
         imgUrl:'',
         type: '',
-        time: '',
+        issueStartTime: '',
         author: '',
+        source:'',
         description:'',
         content: '',
         isIssue:'1',
+        isHomeSlideshow:0,
         sort:''
       },
       rules: {                            //form校验规则
@@ -132,10 +148,16 @@ export default {
         type: [
           {required: true, message: '请选择公告类别', trigger: 'click'}
         ],
-        isIssue: [
-          {required: true}
+        // isIssue: [
+        //   {required: true}
+        // ],
+        // isHomeSlideshow: [
+        //   {required: true}
+        // ],
+        imgUrl: [
+          {required: false, message: '请上传标题图片', trigger: 'blur'}
         ],
-        time: [
+        issueStartTime: [
           {required: true, message: '请选择生效日期', trigger: 'click'}
         ],
         sort: [
@@ -221,7 +243,6 @@ export default {
         if (res.data) {
           this.form = res.data
           if(this.form.imgUrl) this.titleUrl = this.form.imgUrl
-          this.form.time = [this.form.issueStartTime, this.form.issueEndTime]
         }
       })
     },
@@ -236,7 +257,8 @@ export default {
         // 获取光标所在位置
         let length = quill.getSelection().index;
         // 插入图片  res为服务器返回的图片地址
-        quill.insertEmbed(length, 'image', config.SHOW_URL + res)
+        let picUrl = 'http://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg'
+        quill.insertEmbed(length, 'image', picUrl)
         // 调整光标到最后
         quill.setSelection(length + 1)
       } else {
@@ -249,15 +271,21 @@ export default {
       const param = {
         title: this.form.title,
         type: this.form.type,
-        issueStartTime: this.form.time[0],
-        issueEndTime: this.form.time[1],
+        issueStartTime: this.form.issueStartTime,
         author: this.form.author,
+        source:this.form.source,
         imgUrl:this.form.imgUrl,
         description: this.form.description,
         content: this.form.content,
         isIssue:this.form.isIssue,
+        isHomeSlideshow:this.form.isHomeSlideshow,
         sort:this.form.sort
       }
+      let temp1 = this.sortType.filter(item => {
+        if(item.value == this.form.type)
+        return item
+      })
+      param.typeName = temp1[0].name
       addNoticeInfo(param).then(res => {
         this.$message({
           message: '添加成功！',
@@ -268,10 +296,12 @@ export default {
     },
     //发送修改请求
     editNotice() {
-      this.form.issueStartTime = this.form.time[0]
-      this.form.issueEndTime = this.form.time[1]
       let params = JSON.parse(JSON.stringify(this.form))
-      delete(params.time)
+      let temp1 = this.sortType.filter(item => {
+        if(item.value == this.form.type)
+        return item
+      })
+      params.typeName = temp1[0].name
       editNoticeInfo(params).then(res => {
         this.$message({
           message: '修改成功！',
@@ -314,6 +344,14 @@ export default {
       }
       return isLt2M;
     },
+    checkIsCarousel(value){
+      if(value)
+      {
+        this.rules.imgUrl = [
+          {required: true, message: '请上传标题图片', trigger: 'blur'}
+        ]
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/systemManage/notice/noticeShow.vue b/src/views/systemManage/notice/noticeShow.vue
index be621a7..e7383f7 100644
--- a/src/views/systemManage/notice/noticeShow.vue
+++ b/src/views/systemManage/notice/noticeShow.vue
@@ -1,5 +1,11 @@
 <template>
     <div class="app-container">
+        <h2 class="text-center">{{noticeTitle}}</h2>
+        <p v-if="source" class="text-center"><br>
+            <span style="margin-right:40px;">发布于：{{issueStartTime}}</span>来源：
+            <span>{{source}}</span>
+        </p>
+        <el-divider></el-divider>
         <p class="ql-editor" v-html="content"></p>
     </div>
 </template>
@@ -9,8 +15,11 @@ export default {
     name:"noticeShow",
     data(){
         return {
-            ID: this.$route.query.id || '',
-            content:``
+            noctiveId: this.$route.query.id || '',
+            content:``,
+            noticeTitle:'',
+            source:'',
+            issueStartTime:''
         }
     },
     mounted(){
@@ -19,9 +28,13 @@ export default {
     methods:{
         //根据id获取公告详情
         initData() {
-            getNoticeInfo(this.ID).then(res => {
+            console.log(1,this.noctiveId);
+            getNoticeInfo(this.noctiveId).then(res => {
                 if (res.data) {
                     this.content = res.data.content
+                    this.noticeTitle = res.data.title
+                    this.source = res.data.source
+                    this.issueStartTime = res.data.issueStartTime
                 }
             })
         },
diff --git a/src/views/systemManage/permission.vue b/src/views/systemManage/permission.vue
index 02c9f27..31e02c6 100644
--- a/src/views/systemManage/permission.vue
+++ b/src/views/systemManage/permission.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addPermissionDialog">新增</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addPermissionDialog">新增</el-button>
     </div>
     <el-table :data="permissionData" style="width: 100%" header-row-class-name="">
       <el-table-column type="selection" width="55"></el-table-column>
@@ -70,7 +70,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" size="mini" @click="submitForm('ruleForm')">保存</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('ruleForm')">保存</el-button>
         <el-button type="info" size="mini" @click="resetForm('ruleForm')">取消</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/systemManage/role.vue b/src/views/systemManage/role.vue
index 9fd2726..4e4e325 100644
--- a/src/views/systemManage/role.vue
+++ b/src/views/systemManage/role.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addRoleDialog">新增</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addRoleDialog">新增</el-button>
       <!-- <el-button type="info" size="mini" icon="el-icon-delete">删除</el-button> -->
     </div>
     <el-table :data="roleData" style="width: 100%" header-row-class-name="">
@@ -55,7 +55,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" size="mini" @click="submitForm('ruleForm')">保存</el-button>
+        <el-button type="primary" size="mini" @click="submitForm('ruleForm')">保存</el-button>
         <el-button type="info" size="mini" @click="resetButton('ruleForm')">重置</el-button>
       </div>
     </el-dialog>
diff --git a/src/views/systemManage/user.vue b/src/views/systemManage/user.vue
index 5ac55b8..426a327 100644
--- a/src/views/systemManage/user.vue
+++ b/src/views/systemManage/user.vue
@@ -6,10 +6,10 @@
                     <el-input v-model="formSearch.name" size="mini" placeholder="请输入用户名" clearable maxlength="50"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="danger" size="mini" icon="el-icon-search" @click="search">查询</el-button>
+                    <el-button type="primary" size="mini" icon="el-icon-search" @click="search">查询</el-button>
                 </el-form-item>
                 <el-form-item class="float-right">
-                    <el-button type="danger" size="mini" icon="el-icon-circle-plus-outline" @click="addUserDialog">新增</el-button>
+                    <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="addUserDialog">新增</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -93,7 +93,7 @@
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="danger" size="mini" @click="submitForm('ruleForm')">保存</el-button>
+                <el-button type="primary" size="mini" @click="submitForm('ruleForm')">保存</el-button>
                 <el-button type="info" size="mini" @click="resetForm('ruleForm')">重置</el-button>
             </div>
         </el-dialog>
@@ -107,7 +107,7 @@
             </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-            <el-button type="danger" size="mini" @click="submitForm('passForm')">保存</el-button>
+            <el-button type="primary" size="mini" @click="submitForm('passForm')">保存</el-button>
             <el-button type="info" size="mini" @click="resetForm('passForm'),dialogResetPass = false">取消</el-button>
         </div>
         </el-dialog>