Merge branch 'feature/Feature_loginPage' into develop

src/api/policy_list.js

@@ -272,3 +272,48 @@ export function getProductList(params) {
     params
   })
 }
+
+//获取轮播图列表
+export function getImgCarouseList(params) {
+  return request({
+    url:'/record/list',
+    method: 'get',
+    params
+  })
+}
+
+//轮播图显示与隐藏
+export function handleImgIsShow(params) {
+  return request({
+    url:'/record/updateImgStatus',
+    method: 'post',
+    params
+  })
+}
+
+//增加轮播图
+export function addImgCarousel(params) {
+  return request({
+    url:'/record/carousel/add',
+    method: 'post',
+    data: params
+  })
+}
+
+//批量删除轮播图
+export function delImgData(params) {
+  return request({
+    url: '/record/delete',
+    method: 'post',
+    params
+  })
+}
+
+//添加公司信息
+export function addCompany(params) {
+  return request({
+    url: '/record/company/add',
+    method: 'post',
+    data: params
+  })
+}

src/views/notice/index.vue

@@ -71,7 +71,7 @@
           <!-- <el-table-column align="center" label="已确认" prop="readFlag" min-width="140" show-overflow-tooltip></el-table-column> -->
         </el-table>
       </div>
-      
+
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
@@ -143,7 +143,7 @@
         <el-form-item label="上传附件" prop="fileUrl">
           <ImageUpload :fileList="fileList" :multiple="true" />
         </el-form-item>
-        
+
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -155,12 +155,12 @@
     <!-- 已阅记录 -->
     <el-dialog title="已阅记录" :visible.sync="recordDialog" :show-close="false" width="70%" :close-on-click-modal="false">
       <div class="table" style="margin: 10px 0 20px;">
-        <el-table 
-          v-loading="detailTable_listLoading" 
-          :data="detailTable_dataList" 
-          element-loading-text="Loading" 
-          tooltip-effect="dark" 
-          style="width: 100%" 
+        <el-table
+          v-loading="detailTable_listLoading"
+          :data="detailTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
           max-height="270">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="title" label="标题" min-width="140" show-overflow-tooltip></el-table-column>
@@ -296,7 +296,7 @@ export default {
     }
   },
   computed: {
-    
+
   },
   created() {
     this.getList();
@@ -565,4 +565,4 @@ export default {
   .el-divider--horizontal {
     margin: 16px 0;
   }
-</style>
+</style>

src/views/setting/account.vue

@@ -66,7 +66,7 @@
           <el-button size="small" type="primary" @click="handleExport">导出</el-button>
 
           <el-button size="small" type="primary" :loading="importLoading" @click="clickImport">{{ importLoading ? '导入中...' : '导入' }}</el-button>
-          
+
           <el-button size="small" @click="handleDownload" v-if="checkBtnRole('download')">下载导入模板</el-button> -->
         </div>
       </div>
@@ -103,10 +103,10 @@
               </el-popconfirm> -->
             </template>
           </el-table-column>
-          
+
         </el-table>
       </div>
-      
+
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
@@ -121,7 +121,7 @@
         </div>
       </div>
     </div>
-    
+
     <!-- 添加编辑账号 -->
     <el-dialog :title="AccountFormType == 'add' ? '添加账号':'编辑账号'" :visible.sync="AccountFormVisible" :show-close="false" width="40%" :close-on-click-modal="false">
       <el-form ref="AccountForm" :model="AccountForm" :rules="AccountFormRules" label-position="left" label-width="80px">
@@ -305,7 +305,7 @@ export default {
           { required: true, validator: validatePass4, trigger: 'blur' }
         ],
       },
-      editAccountId: null, 
+      editAccountId: null,
 
       filterText: '',
       departmentList: [],
@@ -793,4 +793,5 @@ export default {
     cursor: pointer;
     user-select: none;
   }
-</style>
+
+</style>