Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/assets/icons/140.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667975991141" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10700" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 960a448 448 0 1 1 448-448 448 448 0 0 1-448 448z m0-267.968a40 40 0 1 0 40 40 40 40 0 0 0-40-40z m0-352a89.152 89.152 0 0 1 96 80A81.088 81.088 0 0 1 552 492.8a111.424 111.424 0 0 0-52.096 40.896A113.152 113.152 0 0 0 480 598.528v21.504a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-22.72a48.32 48.32 0 0 1 30.912-44.8 144.384 144.384 0 0 0 97.088-132.48 136.32 136.32 0 0 0-48.448-103.36 173.44 173.44 0 0 0-223.232 0A136.448 136.448 0 0 0 352 420.032v7.552a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-7.552A89.216 89.216 0 0 1 512 340.032z" fill="#FFFFFF" p-id="10701"></path></svg>

src/assets/icons/141.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667976054790" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10971" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M96 32v960L512 704l416 288V32h-832z m569.6 588.8L512 544 358.4 620.8 384 454.4 262.4 332.8l166.4-25.6 76.8-153.6 76.8 153.6 166.4 25.6-121.6 121.6 38.4 166.4z" fill="#FFFFFF" p-id="10972"></path></svg>

src/assets/icons/142.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667975964213" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10293" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M356.672 151.936h310.848a34.048 34.048 0 0 0 34.048-34.048V49.92a34.048 34.048 0 0 0-34.048-33.984H356.672a34.048 34.048 0 0 0-34.048 33.984v68.032a34.048 34.048 0 0 0 34.048 34.048z" fill="#FFFFFF" p-id="10294"></path><path d="M886.144 83.968h-143.872v33.856a74.88 74.88 0 0 1-74.816 74.816H356.608a74.88 74.88 0 0 1-74.56-74.816v-33.856H137.984a68.032 68.032 0 0 0-68.032 68.032v788.032a68.032 68.032 0 0 0 68.032 68.032h748.096a68.032 68.032 0 0 0 67.968-68.032V152a68.032 68.032 0 0 0-67.904-68.032z m-225.984 469.056h-72.96v3.2c0 112.384-129.92 210.24-245.376 211.84-9.216 0-11.776-7.488 0-14.592a187.136 187.136 0 0 0 98.432-173.824v-26.624H363.328c-22.976 0-38.4-17.024-23.168-36.288l142.72-177.856a34.688 34.688 0 0 1 56.32 0l144.192 179.2c15.488 19.2 4.096 34.944-23.168 34.944z" fill="#FFFFFF" p-id="10295"></path></svg>

src/assets/icons/25.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667975994259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10835" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M89.408 258.496H4.864v211.2h0.576l-0.384 380.288a84.48 84.48 0 0 0 84.48 84.544h760.512v-84.48H89.408z" fill="#FFFFFF" p-id="10836"></path><path d="M934.4 174.016H596.352l-84.48-84.544H258.496a84.096 84.096 0 0 0-84.096 84.16v0.384l-0.384 507.008a84.48 84.48 0 0 0 84.48 84.48h676.096a84.48 84.48 0 0 0 84.544-84.48v-422.4a84.48 84.48 0 0 0-84.48-84.544zM300.8 638.784L490.944 385.28l147.904 190.336 105.6-126.976 147.904 190.144z" fill="#FFFFFF" p-id="10837"></path></svg>

src/assets/icons/26.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667976060722" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11241" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M582.4 76.8c19.2 6.4 32 12.8 44.8 19.2l6.4 6.4L915.2 384c44.8 44.8 44.8 108.8 6.4 153.6l-6.4 6.4-320 326.4h339.2c25.6 0 44.8 12.8 44.8 32 0 25.6-19.2 32-44.8 32H64c-25.6 0-44.8-6.4-44.8-32s19.2-32 44.8-32h236.8L76.8 640C64 627.2 57.6 614.4 51.2 595.2v-6.4l480-6.4c12.8 0 25.6-12.8 32-25.6v-6.4l19.2-473.6z m-57.6 6.4l-6.4 448-454.4 6.4c0-19.2 6.4-38.4 19.2-44.8l6.4-6.4 377.6-371.2c12.8-12.8 25.6-19.2 44.8-25.6l12.8-6.4z" fill="#FFFFFF" p-id="11242"></path></svg>

src/assets/icons/38.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667975986997" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10565" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M829.696 438.656a317.696 317.696 0 0 0-244.48-308.992v-33.28a73.344 73.344 0 0 0-146.624 0v33.28a317.632 317.632 0 0 0-244.48 308.992v268.8l-97.856 97.856v48.896h831.552v-48.896l-97.984-97.472v-268.8z m-317.888 562.368a87.424 87.424 0 0 0 19.584-1.92 98.048 98.048 0 0 0 78.272-96H413.952a98.048 98.048 0 0 0 97.856 97.92z m0 0" fill="#FFFFFF" p-id="10566"></path></svg>

src/assets/icons/8.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667976058402" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11106" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M230.4 620.8l211.2 64 64 217.6c12.8 38.4-12.8 76.8-44.8 89.6h-19.2c-57.6 0-108.8-38.4-121.6-89.6L230.4 620.8zM921.6 32c25.6 0 51.2 19.2 51.2 51.2v723.2c0 25.6-19.2 51.2-51.2 51.2s-51.2-19.2-51.2-51.2V83.2c0-32 25.6-51.2 51.2-51.2zM825.6 128v627.2l-627.2-192V320l627.2-192zM153.6 320v243.2h-51.2c-25.6 0-51.2-19.2-51.2-51.2V364.8c0-25.6 19.2-51.2 51.2-51.2h51.2z" fill="#FFFFFF" p-id="11107"></path></svg>

src/assets/icons/87.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1667975983201" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10429" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M90.496 308.992h95.232a9.664 9.664 0 0 1 9.088 8.896V384.64a9.664 9.664 0 0 1-9.088 8.896H90.496a9.664 9.664 0 0 1-9.088-8.896V317.888a9.664 9.664 0 0 1 9.088-8.896zM90.496 628.992h95.232a9.664 9.664 0 0 1 9.088 8.896v66.752a9.664 9.664 0 0 1-9.088 8.896H90.496a9.664 9.664 0 0 1-9.088-8.896V637.888a9.664 9.664 0 0 1 9.088-8.896z" fill="#FFFFFF" p-id="10430"></path><path d="M868.928 32H219.008a76.16 76.16 0 0 0-73.6 76.8v184.448h55.168q9.216 0 9.216 9.6v96q0 9.6-9.216 9.6h-55.168V615.68h55.168q9.216 0 9.216 9.6v96q0 9.6-9.216 9.6h-55.168v184.96a76.16 76.16 0 0 0 73.6 76.8h649.92a76.16 76.16 0 0 0 73.6-76.8V111.744A75.008 75.008 0 0 0 868.928 32zM571.584 296.704a102.4 102.4 0 1 1-98.432 102.08 98.88 98.88 0 0 1 98.432-102.08z m-190.08 382.72a183.232 183.232 0 0 1 67.456-153.088c42.944-25.6 76.8 9.6 122.624 9.6s76.8-35.072 119.552-9.6a170.624 170.624 0 0 1 70.4 153.088z" fill="#FFFFFF" p-id="10431"></path></svg>

src/components/newLayout/index.vue

@@ -11,13 +11,7 @@
           </div>
         </div>
       </div>
-      <div style="width:60px;">
-        <div class="nav-right">
-          <div v-for="i in 5" :key="i" style="height:40px;width:40px;text-align:center;line-height:40px;border:1px solid #f1f2f3;border-radius:100%;margin:20px 10px">
-            <i class="el-icon-menu" style="color:#fff"></i>
-          </div>
-        </div>
-      </div>
+      <navTemp @getModules="getModules"></navTemp>
     </div>
   </div>
 </template>
@@ -26,12 +20,14 @@
 import headeTemp from './modules/header.vue'
 import asideTemp from './modules/aside.vue'
 import menuTemp from './modules/menu.vue'
+import navTemp from './modules/navRight.vue'
 
 export default {
   components:{
     headeTemp,
     asideTemp,
-    menuTemp
+    menuTemp,
+    navTemp
   },
   data () {
     return {
@@ -41,7 +37,39 @@ export default {
   methods:{
     getModules (mod,type) {
       this.$refs['menu'].setModules(mod,type)
-    }
+    },
+     // 查询应用授权
+    async query_userauth () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.userauthforweb.userauth",
+        "method": "query_userauth",
+        "content": {
+          "place":1
+        }
+      })
+
+      this.auth_data = res.data
+      sessionStorage.setItem('module_info', JSON.stringify(this.auth_data))
+      // this.$router.push('/main')
+    },
+    // 查询文件夹ID信息
+    async querySite_Parameter () {
+      const res = await this.$api.requested({
+        "classname": "webmanage.site.site",
+        "method": "querySite_Parameter",
+        "content": {
+        }
+      })
+      let obj = {
+        appfolderid: res.data.appfolderid, // 应用附件文件夹ID
+        salematerialfolderid: res.data.salematerialfolderid // 营销物文件夹ID
+      }
+      sessionStorage.setItem('folderid',JSON.stringify(obj))
+    }   
+  },
+  created () {
+    this.query_userauth()
+    this.querySite_Parameter()
   }
 }
 
@@ -58,7 +86,8 @@ export default {
 <style scoped>
 .body__panel{
   height: 100vh;
-  padding-right: 16px;
+  /* padding-right: 16px; */
+  margin-right: 10px;
   overflow-y: scroll;
 }
 .body__panel::-webkit-scrollbar{
@@ -75,7 +104,5 @@ export default {
   transform: translate3d(0,-2px,0);
   background: #fff;
 }
-.nav-right{
-  position:fixed;right:0;top:0;height:100%;width:60px;background:rgba(0, 0,0,.3);z-index:9999;
-}
+
 </style>

src/components/newLayout/modules/aside.vue

@@ -137,7 +137,7 @@ export default {
     outStyle () {
       clearTimeout(this.timer)
       this.fixedMenu = 'no__panel'
-    }
+    },
     
   },
   mounted () {
@@ -149,8 +149,7 @@ export default {
 
     this.$store.dispatch('setActiveApp',{app:active_model.apps[0],val:''})
   },
-  watch:{
-
+  created () {
   }
 }
 
@@ -251,7 +250,7 @@ export default {
   box-shadow: 2px 8px 8px 0 rgb(0 0 0 / 20%);
   background: rgba(52,60,71,.95);
   z-index: 999;
-  transition: .5s ease-in-out;
+  transition: .2s ease-in-out;
 }
 .no__panel{
   position: absolute;
@@ -260,7 +259,7 @@ export default {
   top:0;
   background: rgba(32, 30, 30, 0.8);
   z-index: 999;
-  transition: .5s ease-in-out;
+  transition: .2s ease-in-out;
   
 }
 </style>

src/components/newLayout/modules/navRight.vue

@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <div class="nav-right">
+       <el-menu
+          :collapse="true"
+          style="background:none"
+          text-color="#fff"
+          active-text-color="#fff"
+          class="el-menu-vertical-demo">
+          <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
+            <img width="20" :src="require(`@/assets/icons/${item.systemappid}.svg`)" alt="">
+            <span slot="title">{{item.meta.title}}</span>
+          </el-menu-item>
+        </el-menu>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      menuApp:[],
+      modules:[],
+      system:[]
+    }
+  },
+  methods:{
+     // 查询右侧应用授权
+    async query_userauth () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.userauthforweb.userauth",
+        // "method": "query_quickApps",
+        // "content": {
+        // }
+        "method": "query_userauth",
+        "content": {
+          "place":2
+        }
+      })
+      this.system = res.data
+      
+      this.modules = []
+      res.data.map(e=>{
+        this.modules = [...this.modules,...e.modules]
+      })
+      this.modules.map(e=>{
+        this.menuApp =[...this.menuApp,...e.apps] 
+      })
+    },
+    handelMenuAppClick (app,type) {
+      let at_modules = this.modules.filter(e=>{
+        if (e.systemmoduleid === app.systemmoduleid)
+        return e
+      })[0]
+      
+      let at_app = app
+      
+      sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
+
+      // this.$emit('getModules',at_sys_modules,type)
+
+      this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:''})
+      this.$router.replace({path:app.path})
+    },
+  },
+  mounted () {
+    this.query_userauth()
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.nav-right{
+  position:relative;right:0;top:0;height:100%;background:rgba(0, 0,0,.3);z-index:9999;
+}
+</style>

src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -12,7 +12,7 @@
             @onSuccess="onSuccess"
             :hidemediastock="true">
           </upload>
-          <previewImage :image="{}" :deletebtn="true"></previewImage>
+          <!-- <previewImage :image="{}" :deletebtn="true"></previewImage> -->
         </el-form-item>
         
       </el-form>

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -6,10 +6,11 @@
       <!-- <accountDialog style="margin-left:10px" :ownertable="ownertable" @onSuccess="queryGroup"></accountDialog> -->
       <el-popover
         placement="right"
-        trigger="click"
+        trigger="manual"
+        v-model="visible1"
         width="300">
-        <member :param="param" :radio="true" :checked="item.teamleader" @onSelect="onSubmit"></member>
-        <el-button type="text" size="small" slot="reference" @click="(addType = 'leader')">变更</el-button>
+        <member ref="member" :param="param" :radio="true" @onSelect="setLeader"></member>
+        <el-button type="text" size="small" slot="reference" @click="showMenberSelect(item)">变更</el-button>
       </el-popover>
     </div>
     <div style="padding:10px">
@@ -36,10 +37,11 @@
       <p style="flex:1;padding:10px 0;color:#999">参与者</p>
       <el-popover
         placement="right"
-        trigger="click"
+        trigger="manual"
+        v-model="visible"
         width="300">
-        <member :param="param" :radio="false" :checked="item.team" @onSelect="onSubmit"></member>
-        <el-button type="text" size="small" slot="reference"  @click="(addType = 'menber')">变更</el-button>
+        <member ref="member1" :param="param" :radio="false" :checked="item.team" @onSelect="onSubmit"></member>
+        <el-button type="text" size="small" slot="reference"  @click="showMenberSelect1(item)">变更</el-button>
       </el-popover>
     </div>
     <div style="padding:10px">
@@ -69,6 +71,7 @@
 // import tableLayout
 import accountDialog from './select_account.vue'
 import member from '@/template/menber/index.vue'
+import { settings } from 'nprogress'
 export default {
   props:['ownertable'],
   components:{
@@ -77,6 +80,8 @@ export default {
   },
   data () {
     return {
+      visible1:false,
+      visible:false,
       list:[
         {
           ismyteam:1,
@@ -93,7 +98,8 @@ export default {
           "pageSize":20,
           "where":{
             "condition":"",
-            "withoutselect":1
+            "withoutselect":0,
+            
           }
         }
       },
@@ -130,6 +136,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.queryGroup()
+        this.visible1 = false
       })
     },
     async deleteGroupAccount (item) {
@@ -151,20 +158,30 @@ export default {
         "content": {
             "ownertable":this.ownertable,
             "ownerid":this.$route.query.id,
+            "justuserids":true,
             "userids":data.map(e=>{
               return e.userid
             })
         }
       })
-      if (this.addType === 'leader') {
-        this.setLeader(data)
-      } else {
-        this.tool.showMessage(res,()=>{
-          this.queryGroup()
-          this.visiable = false
-        })
-      }
+      this.tool.showMessage(res,()=>{
+        this.queryGroup()
+        this.visiable = false
+      })
+      this.visible = false
     },
+    showMenberSelect (item) {
+      this.visible = false
+      this.visible1 = !this.visible1
+      this.$refs['member'][0].selected = item.teamleader
+    },
+    showMenberSelect1 (item) {
+      this.visible1 = false
+      this.visible = !this.visible
+      this.$refs['member1'][0].selected = item.team.filter(e=>{
+        return e.isleader !== 1
+      })
+    }
   },
   mounted() {
     this.queryGroup()

src/style/style.css

@@ -187,16 +187,22 @@ ul{
 .el-notification.right{
   right:70px !important;
 }
+<<<<<<< HEAD
+=======
 
+>>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 .search__label{
   display: inline-block;
   width: 80px;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;
+<<<<<<< HEAD
+=======
   margin-right: 10px;
 }
 
 .label_center {
   display: flex;
   align-items: center;
+>>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 }

src/template/menber/index.vue

@@ -6,7 +6,14 @@
     </div>
   </el-input> -->
   <div class="search_input normal-margin">
-    <el-tag style="margin:0 5px 5px 0" type="info" size="mini" closable v-for="item in selected" :key="item.index">{{item.name}}</el-tag>
+    <div class="tag flex-align-center" style="margin:0 5px 5px 0" type="primary" size="mini" closable v-for="item in selected" :key="item.index">
+      <div class="avatar-mini">
+        <img class="avatar__image" v-if="item.headpic" :src="item.headpic" alt="">
+        <p v-else>{{item.name.substr(0, 1)}}</p>
+      </div>
+      <p class="inline-16">{{item.name}}</p>
+      <b><i class="el-icon-close" @click="closeTag(item)"></i></b>
+    </div>
     <input class="input_panel" type="text" v-model="search" @keyup.enter="listData" placeholder="输入搜索内容">
   </div>
 	<div class="flex-align-stretch menber__panel">
@@ -61,7 +68,6 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      // this.selected = [...this.selected,...this.checked]
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -92,7 +98,12 @@ export default {
 		},
 		onSelect () {
 			this.$emit('onSelect',this.selected)
-		}
+		},
+    closeTag (item) {
+      this.selected = this.selected.filter(e=>{
+        return e.userid !== item.userid
+      })
+    }
   },
   mounted () {
     this.listData()
@@ -154,8 +165,29 @@ export default {
   height: 100%;
   width: 100%;
 }
+.avatar-mini{
+  position: relative;
+  height:20px;
+  width: 20px;
+  line-height: 20px;
+  text-align: center;
+  margin-right: 5px;
+  color:#fff;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 100%;
+  background: #3874F6;
+}
 .iconCheck{
 	font-weight: bold;
 	color:#3874F6
 }
+.tag{
+  font-size: 12px;
+  color:#666;
+  padding: 5px;
+  border-radius: 3px;
+  background: #b5e4ff6e;
+  cursor: pointer;
+}
 </style>

src/views/login/login.vue

@@ -54,8 +54,8 @@
               </el-form>
             </el-tab-pane>
           </el-tabs>
-          <el-divider><span style="color:#999;font-weight:300">其他登录方式</span></el-divider>
-          <span>敬请期待</span>
+          <!-- <el-divider><span style="color:#999;font-weight:300">其他登录方式</span></el-divider>
+          <span>敬请期待</span> -->
         </div>
       </div>
       
@@ -141,8 +141,11 @@ export default {
       let that = this
       if (res.code === 1) {
         this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
-        this.$router.push('/accounts')
+
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
+
+        sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
+        this.$router.push('/main')
       } else {
         this.$notify({
           title: '失败',
@@ -161,8 +164,11 @@ export default {
       })
       if (res.code === 1) {
         this.checked?localStorage.setItem('phonenumber',this.loginForm.phonenumber):localStorage.clear('phonenumber')
-        this.$router.push('/accounts')
         sessionStorage.setItem('account_list',JSON.stringify(res.account_list))
+        sessionStorage.setItem('active_account',JSON.stringify(res.account_list[0]))
+        this.query_userauth()
+        this.querySite_Parameter()
+        
       } else {
         this.$notify({
           title: '失败',
@@ -170,18 +176,52 @@ export default {
           type: 'error'
         })
       }
-    }
+    },
+    // 查询应用授权
+    async query_userauth () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.userauthforweb.userauth",
+        "method": "query_userauth",
+        "content": {
+          "place":1
+        }
+      })
+
+      this.auth_data = res.data
+      sessionStorage.setItem('module_info', JSON.stringify(this.auth_data))
+      this.$router.push('/main')
+    },
+    // 查询文件夹ID信息
+    async querySite_Parameter () {
+      const res = await this.$api.requested({
+        "classname": "webmanage.site.site",
+        "method": "querySite_Parameter",
+        "content": {
+        }
+      })
+      let obj = {
+        appfolderid: res.data.appfolderid, // 应用附件文件夹ID
+        salematerialfolderid: res.data.salematerialfolderid // 营销物文件夹ID
+      }
+      sessionStorage.setItem('folderid',JSON.stringify(obj))
+    },
   }
 }
 
 </script>
 <style>
-
+.login-form .el-input__inner{
+  color:#fff;
+  border: 1px solid #0000004d;
+  background: rgba(0, 0, 0, 0.1);
+  box-shadow: 2px 8px 8px 0 rgb(0 0 0 / 10%) inset;
+}
 </style>
 <style scoped>
 .logo{
   text-align: center;
   margin-bottom: 30px;
+  color:#fff;
 }
 .logo span{
   display: block;
@@ -198,7 +238,7 @@ export default {
   justify-content: space-between;
   height: 33px;
   margin: 0 0 30px;
-  color: #202d40;
+  color: #fff;
   font-size: 24px;
   font-weight: 600;
 }
@@ -209,15 +249,18 @@ export default {
   width: 100%;
   height: 100vh;
   /* background: #fff no-repeat 50% url(../../assets/bg.png); */
-  background: #f1f2f3;
-  background-size: 2560px 1490px;
+  background: url("../../assets/wallhaven-2k987m.jpeg") no-repeat;
+  background-size: cover;
 }
 .login-form{
   /* min-height: 500px; */
   width: 400px;
   padding: 30px;
-  background: #fff;
+  color:#fff;
+  background: rgb(255, 255, 255,.2);
+  backdrop-filter: blur(30px);
   border-radius: 10px;
+  box-shadow: 2px 8px 8px 0 rgb(0 0 0 / 20%);
 }
 .form-input-group{
   margin-bottom: 16px