Quellcode durchsuchen

svg文件新增、账号名称切换成nickName

wangtao vor 3 Jahren
Ursprung
Commit
83340c608f

+ 2 - 0
src/assets/icons/svg/二维码.svg

@@ -0,0 +1,2 @@
+<?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="1654586396747" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19721" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M51.2 51.2h409.6v409.6H51.2zM51.2 563.2h409.6v409.6H51.2zM563.2 51.2h409.6v409.6h-409.6zM563.2 563.2h102.4v409.6h-102.4zM716.8 665.6h102.4v307.2h-102.4zM870.4 563.2h102.4v409.6h-102.4z" p-id="19722" ></path></svg>

+ 2 - 0
src/assets/icons/svg/产品.svg

@@ -0,0 +1,2 @@
+<?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="1654578926307" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="82264" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M305.28 128a177.28 177.28 0 0 1 177.152 177.28v177.152H305.28A177.28 177.28 0 0 1 305.28 128z m0 413.568h177.152v177.216A177.28 177.28 0 1 1 305.28 541.44zM718.72 128a177.28 177.28 0 0 1 0 354.432H541.632V305.28A177.28 177.28 0 0 1 718.72 128zM541.632 541.568h177.216a177.28 177.28 0 1 1-177.28 177.216V541.44z" p-id="82265" ></path></svg>

+ 2 - 0
src/assets/icons/svg/充值-1.svg

@@ -0,0 +1,2 @@
+<?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="1654586401572" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19921" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M748 256.8l-48.8-150.4c-6.4-19.2-27.2-30.4-47.2-24L96 262.4l652-5.6zM817.6 701.6v37.6c0 20-23.2 31.2-39.2 19.2l-184-144.8c-12-9.6-12-28 0-37.6l184.8-144.8c16-12 39.2-0.8 39.2 19.2V488H1016V333.6c0-22.4-18.4-40-40-40H48c-22.4 0-40 18.4-40 40V856c0 22.4 18.4 40 40 40h928c22.4 0 40-18.4 40-40V701.6h-198.4z"  p-id="19922"></path><path d="M987.2 530.4H783.2v-22.4c0-12-13.6-19.2-23.2-11.2L648 583.2c-7.2 5.6-7.2 16.8 0 23.2l112 87.2c9.6 7.2 23.2 0.8 23.2-11.2v-22.4h204c8 0 14.4-6.4 14.4-14.4V544.8c0.8-8-6.4-14.4-14.4-14.4z"  p-id="19923"></path></svg>

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/充值-2.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/充值管理.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/充值记录.svg


+ 2 - 0
src/assets/icons/svg/安全.svg

@@ -0,0 +1,2 @@
+<?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="1654578867129" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="79819" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M512 63.2L160.8 226.4v244.8c0 226.4 149.6 437.6 351.2 489.6 201.6-51.2 351.2-263.2 351.2-489.6V226.4L512 63.2z m-8 574.4l-45.6 45.6-45.6-45.6-90.4-90.4 45.6-45.6L458.4 592l204-204 45.6 45.6L504 637.6z" p-id="79820" ></path></svg>

+ 2 - 0
src/assets/icons/svg/定时.svg

@@ -0,0 +1,2 @@
+<?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="1654586409465" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20323" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M884.736 0c59.392 0 112.64 37.888 132.096 95.232 19.456 57.344 0 119.808-48.128 155.648-46.08-81.92-113.664-149.504-194.56-195.584C799.744 20.48 840.704 0 884.736 0zM109.568 3.072c54.272-11.264 110.592 10.24 142.336 55.296-80.896 47.104-146.432 114.688-192.512 196.608C14.336 222.208-8.192 166.912 3.072 112.64 13.312 57.344 55.296 15.36 109.568 3.072z m377.856 248.832c-12.288-1.024-25.6 2.048-34.816 11.264-9.216 8.192-15.36 20.48-15.36 33.792v268.288c0 15.36 12.288 27.648 27.648 27.648h202.752c13.312 0 25.6-5.12 33.792-15.36 8.192-9.216 12.288-22.528 11.264-34.816-3.072-22.528-22.528-39.936-46.08-39.936H526.336v-204.8c0-23.552-16.384-43.008-38.912-46.08zM516.096 51.2c191.488 0 363.52 120.832 429.056 302.08 65.536 181.248 12.288 384-134.144 508.928l73.728 73.728c20.48 20.48 20.48 52.224 0 72.704-9.216 9.216-22.528 15.36-35.84 15.36-13.312 0-26.624-5.12-35.84-15.36l-88.064-88.064c-132.096 68.608-288.768 67.584-420.864-1.024L215.04 1008.64c-9.216 9.216-22.528 15.36-35.84 15.36s-26.624-5.12-35.84-15.36c-20.48-20.48-20.48-52.224 0-72.704l74.752-74.752C70.656 735.232 18.432 532.48 84.992 351.232 151.552 171.008 323.584 51.2 516.096 51.2z" p-id="20324" ></path></svg>

+ 2 - 0
src/assets/icons/svg/定时计划.svg

@@ -0,0 +1,2 @@
+<?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="1654586404930" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20122" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M554.7 494.3v-67.7c0-23.5-19.2-42.7-42.7-42.7-23.5 0-42.7 19.2-42.7 42.7V512c0 0.4 0.2 0.7 0.2 1 0.1 5.2 1.1 10.4 3.1 15.3 1.3 3 3.4 5.4 5.3 8 1.3 1.9 2.1 4.1 3.8 5.8l60.3 60.3c16.6 16.6 43.7 16.6 60.3 0s16.6-43.7 0-60.3l-47.6-47.8z" p-id="20123" ></path><path d="M785.5 273.5L665.2 153.2C649 137 627.2 128 604.6 128H298.7c-46.9 0-85.3 38.4-85.3 85.3v597.3c0 46.9 38.4 85.3 85.3 85.3h426.7c46.9 0 85.3-38.4 85.3-85.3V334.1c0-22.6-9-44.4-25.2-60.6zM512 725.3c-117.8 0-213.3-95.5-213.3-213.3 0-117.8 95.5-213.3 213.3-213.3 117.8 0 213.3 95.5 213.3 213.3 0 117.8-95.5 213.3-213.3 213.3z" p-id="20124" ></path></svg>

+ 2 - 0
src/assets/icons/svg/导出.svg

@@ -0,0 +1,2 @@
+<?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="1654586392519" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19520" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M0 841.142857m66.742857 0l890.514286 0q66.742857 0 66.742857 66.742857l0 49.371429q0 66.742857-66.742857 66.742857l-890.514286 0q-66.742857 0-66.742857-66.742857l0-49.371429q0-66.742857 66.742857-66.742857Z" p-id="19521" ></path><path d="M900.937143 249.234286L600.137143 3.84a16.457143 16.457143 0 0 0-26.88 12.617143v91.428571a16.64 16.64 0 0 1-14.994286 16.274286c-389.485714 38.4-438.857143 358.4-441.234286 509.805714a16.457143 16.457143 0 0 0 31.268572 7.314286c73.142857-150.674286 227.84-230.4 407.771428-237.714286a16.64 16.64 0 0 1 17.188572 16.64v88.137143a16.457143 16.457143 0 0 0 26.88 12.8L900.937143 274.285714a16.64 16.64 0 0 0 0-25.051428z" p-id="19522" ></path></svg>

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/日志.svg


+ 2 - 0
src/assets/icons/svg/渠道.svg

@@ -0,0 +1,2 @@
+<?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="1654586388612" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19320" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M784.321561 472.741296l-238.706562 137.818938v275.620827l238.706562 137.818939 238.706562-137.818939V610.560234zM0 610.560234v275.620827l238.706562 137.818939 238.706562-137.818939V610.560234l-238.706562-137.818938zM750.050119 137.801888l-238.706562-137.818938-238.706562 137.818938v275.620827l238.706562 137.818939 238.706562-137.818939z"  p-id="19321"></path></svg>

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 0
src/assets/icons/svg/系统设置.svg


+ 2 - 0
src/assets/icons/svg/首页.svg

@@ -0,0 +1,2 @@
+<?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="1654580366486" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="92259" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M982.028557 404.405174 573.32303 83.942886c-34.918864-27.694272-89.619352-27.694272-124.538216 0L43.175542 404.577188c-13.933143 11.008903-16.169326 31.134554-5.332437 44.895683s31.134554 16.169326 44.895683 5.332437l13.073072-10.320847 0 387.547791c0 54.872501 56.936671 95.983874 107.852847 95.983874l639.892491 0c50.22812 0 84.1149-38.531161 84.1149-95.983874L927.672098 443.452377l14.449185 11.352931c5.84848 4.644381 12.729044 6.880564 19.781623 6.880564 9.460776 0 18.921552-4.128339 25.286074-12.213002C998.369898 435.539728 995.789686 415.414077 982.028557 404.405174zM607.897867 797.113388l0 66.741475-63.989249 0-63.989249 0-63.989249 0 0-66.741475 0-112.325214c0-37.155048 30.102469-77.234336 95.983874-77.234336 66.053418 0 95.983874 40.079288 95.983874 77.234336L607.897867 797.113388 607.897867 797.113388z" p-id="92260" ></path></svg>

+ 8 - 8
src/layout/components/Navbar.vue

@@ -4,9 +4,9 @@
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
-    
+
     <div class="right-menu">
-      
+
       <template v-if="device!=='mobile'">
         <span class="date" >{{date}}</span>
         <search id="header-search" class="right-menu-item" />
@@ -16,13 +16,13 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-        
+
 
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          {{$store.state.user.name}}
+          {{$store.state.user.nickName}}
           <!-- <img :src="avatar" class="user-avatar"> -->
           <i class="el-icon-caret-bottom" />
         </div>
@@ -49,7 +49,7 @@ import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch' 
+import Search from '@/components/HeaderSearch'
 
 export default {
   data(){
@@ -87,7 +87,7 @@ export default {
         return this.$store.state.settings.topNav
       }
     },
-    
+
   },
   mounted(){
     let that= this;
@@ -102,7 +102,7 @@ export default {
         let sfb = hours + ':' + minutes + ':' + seconds
         that.date = year + month + day + ' ' + sfb
     });
-    
+
   },
   //销毁时清除计时器
   // beforeDestroy: function () {
@@ -220,6 +220,6 @@ export default {
   width:250px;
   margin-right: 20px;
   vertical-align: top;
-  
+
 }
 </style>

+ 1 - 1
src/router/index.js

@@ -75,7 +75,7 @@ export const constantRoutes = [{
             path: 'index',
             component: (resolve) => require(['@/views/index'], resolve),
             name: '首页',
-            meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+            meta: { title: '首页', icon: '首页', noCache: true, affix: true }
         }, ]
     },
     {

+ 6 - 1
src/store/modules/user.js

@@ -6,6 +6,7 @@ const user = {
         token: getToken(),
         name: '',
         avatar: '',
+        nickName: '',
         roles: [],
         permissions: []
     },
@@ -23,6 +24,9 @@ const user = {
         SET_ROLES: (state, roles) => {
             state.roles = roles
         },
+        SET_NICKNAME: (state, nickName) => {
+            state.nickName = nickName
+        },
         SET_PERMISSIONS: (state, permissions) => {
             state.permissions = permissions
         }
@@ -49,7 +53,7 @@ const user = {
         // 登录PER
         LoginERP({ commit }, userInfo) {
             return new Promise((resolve, reject) => {
-                loginERP({username:userInfo.username,password:userInfo.password}).then(res => {
+                loginERP({ username: userInfo.username, password: userInfo.password }).then(res => {
                     setToken(res.data.token)
                     commit('SET_TOKEN', res.data.token)
                     resolve()
@@ -74,6 +78,7 @@ const user = {
                     }
                     commit('SET_NAME', user.userName)
                     commit('SET_AVATAR', avatar)
+                    commit('SET_NICKNAME', user.nickName)
                     resolve(res)
                 }).catch(error => {
                     reject(error)

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.