up

package.json

@@ -23,19 +23,19 @@
         "vooks": "^0.2.12",
         "vue": "^3.2.39",
         "vue-router": "^4.1.5",
-        "vue-utils-plus": "^1.0.2",
+        "vue-utils-plus": "^1.0.3",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "^3.1.0",
         "@vue/compiler-sfc": "^3.2.39",
-        "autoprefixer": "^10.4.9",
+        "autoprefixer": "^10.4.11",
         "postcss": "^8.4.16",
         "sass": "^1.54.9",
         "tailwindcss": "^3.1.8",
         "unplugin-auto-import": "^0.11.2",
         "unplugin-vue-components": "^0.22.7",
         "vfonts": "^0.0.3",
-        "vite": "^3.1.0"
+        "vite": "^3.1.1"
     }
 }

src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209141800',    //开发版本号
+    dev_version: '202209151455',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

src/layout/modules/MenuBar.vue

@@ -108,7 +108,7 @@ const MenuClick = (item) => {
         position: relative;
         display: inline-block;
         font-size: 16px;
-        right: 10px;
+        right: 15px;
         top: initial;
         height: initial;
         width: initial;

src/layout/modules/UserInfoBar.vue

@@ -48,11 +48,12 @@ onMounted(() => {
 //刷新token
 const getRefreshToken = () => {
     setInterval(() => {
-        const token = getStoreData("token") || {};
+        const token = getStoreData("token",true) || {};
         const date = calcDate(token.datetime, new Date().getTime());
         if (isValueNull(date)) return;
         if (date.seconds >= website.tokenTime && !refreshLock.value) {
             refreshLock.value = true;
+            console.log('刷新token')
             RefreshToken().then(() => {
                 refreshLock.value = false;
             }).catch(() => {
@@ -98,9 +99,11 @@ const handleSelect = async (key) => {
     cursor: pointer;
     padding-left: 24px;
     .user-avatar {
+        width: 40px;
         height: 40px;
         border-radius: 50%;
         background: white;
+        object-fit: cover;
     }
     .user-name {
         font-size: 16px;

src/styles/app/element.scss

@@ -77,7 +77,7 @@
     padding: 8px 20px;
     font-weight: 400;
     height: 40px;
-    border: 0;
+    border: 1px solid #f1f5f8;
     box-shadow: var(--hc-shadow);
     &.is-loading:not([class*='el-button--']) {
         --el-button-bg-color: #f3f3f3;

src/styles/ledger/query.scss

@@ -31,7 +31,41 @@
     }
     .hc-layout-content {
         flex: 1;
+        display: flex;
+        flex-direction: column;
         position: relative;
         margin-left: 24px;
+        .hc-content-box {
+            flex: 1;
+            display: flex;
+            position: relative;
+            margin-bottom: 24px;
+            .hc-table-forem-box {
+                flex: 1;
+                margin-right: 24px;
+                position: relative;
+                background: #f1f5f8;
+                border-radius: 10px;
+                box-shadow: -2px 0px 10px 0px rgba(32,37,50,0.03), 0px 10px 21px 20px rgba(32,37,50,0.03);
+            }
+            .hc-right-pian-box {
+                position: relative;
+                width: 300px;
+                background: #f1f5f8;
+                border-radius: 10px;
+                box-shadow: -2px 0px 10px 0px rgba(32,37,50,0.03), 0px 10px 21px 20px rgba(32,37,50,0.03);
+            }
+        }
+        .hc-footer-box {
+            position: relative;
+            height: 80px;
+            background: #f1f5f8;
+            border-radius: 10px;
+            display: flex;
+            align-items: center;
+            padding: 20px 24px;
+            box-shadow: -2px 0px 10px 0 rgba(32,37,50,0.03), 0 -10px 21px 3px rgba(32,37,50,0.03);
+            overflow: hidden;
+        }
     }
 }

src/styles/view/login.scss

@@ -243,6 +243,14 @@
             }
         }
     }
+    //预先加载首页背景图
+    .hc-login-theme-home {
+        position: absolute;
+        z-index: -11;
+        img {
+            width: 100px;
+        }
+    }
 }
 
 //动画效果

src/utils/tools.js

@@ -24,12 +24,3 @@ export const setMainColor = (color) => {
     const val = toColor('#000000', color , 0.9)
     el.style.setProperty('--el-color-primary-dark-2', val)
 }
-
-//表单验证
-export const formValidate = async (formRef) => {
-    return new Promise( (resolve) => {
-        formRef.validate((valid) => {
-            resolve(!!valid)
-        })
-    });
-}

src/views/ledger/query.vue

@@ -20,7 +20,24 @@
             </el-scrollbar>
         </div>
         <div class="hc-layout-content">
-            123456
+            <div class="hc-content-box">
+                <div class="hc-table-forem-box">
+                    456789
+                </div>
+                <div class="hc-right-pian-box">
+                    123456
+                </div>
+            </div>
+            <div class="hc-footer-box">
+                <el-button type="primary" hc-btn>
+                    <HcIcon name="save"/>
+                    <span>保存</span>
+                </el-button>
+                <el-button hc-btn>
+                    <HcIcon name="send-plane-2"/>
+                    <span>上报</span>
+                </el-button>
+            </div>
         </div>
     </div>
 </template>
@@ -60,7 +77,6 @@ const queryLogList = async () => {
         menuOptions.value = []
     }
 }
-
 </script>
 
 <style lang="scss" scoped>
@@ -79,6 +95,9 @@ const queryLogList = async () => {
     .el-sub-menu, .el-menu-item {
         user-select: none;
     }
+    .el-sub-menu .el-sub-menu__icon-arrow {
+        right: 4px;
+    }
     .el-sub-menu .el-menu-item.is-active {
         background: #f1f5f8;
         border-radius: 6px;

src/views/login/index.vue

@@ -86,9 +86,14 @@
                         </el-form-item>
                     </el-form>
                 </div>
-
             </div>
         </div>
+        <!--预先加载首页背景图-->
+        <div class="hc-login-theme-home">
+            <template v-for="item in theme.home">
+                <img :src="item.bg" :alt="item.name">
+            </template>
+        </div>
     </div>
 </template>
 
@@ -98,6 +103,7 @@ import router from '~src/router/index';
 import {useAppStore} from "~src/store";
 import {useAppLogin} from "~sto/user";
 import {formValidate} from "vue-utils-plus"
+import theme from '~src/config/theme'
 
 const userStore = useAppStore()
 userStore.clearStoreData() //先清理下缓存

yarn.lock

@@ -259,13 +259,13 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-autoprefixer@^10.4.9:
-  version "10.4.9"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.9.tgz#40f932f7d0535264823882031f9254ea72c693e5"
-  integrity sha512-Uu67eduPEmOeA0vyJby5ghu1AAELCCNSsLAjK+lz6kYzNM5sqnBO36MqfsjhPjQF/BaJM5U/UuFYyl7PavY/wQ==
+autoprefixer@^10.4.11:
+  version "10.4.11"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.11.tgz#835136aff1d9cd43640151e0d2dba00f8eac7c1c"
+  integrity sha512-5lHp6DgRodxlBLSkzHOTcufWFflH1ewfy2hvFQyjrblBFlP/0Yh4O/Wrg4ow8WRlN3AAUFFLAQwX8hTptzqVHg==
   dependencies:
     browserslist "^4.21.3"
-    caniuse-lite "^1.0.30001394"
+    caniuse-lite "^1.0.30001399"
     fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
@@ -328,10 +328,10 @@ caniuse-lite@^1.0.30001370:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz#158a43011e7068ef7fc73590e9fd91a7cece5e7f"
   integrity sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==
 
-caniuse-lite@^1.0.30001394:
-  version "1.0.30001399"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001399.tgz#1bf994ca375d7f33f8d01ce03b7d5139e8587873"
-  integrity sha512-4vQ90tMKS+FkvuVWS5/QY1+d805ODxZiKFzsU8o/RsVJz49ZSRR8EjykLJbqhzdPgadbX6wB538wOzle3JniRA==
+caniuse-lite@^1.0.30001399:
+  version "1.0.30001400"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001400.tgz#3038bee70d8b875604cd8833cb0e5e254ee0281a"
+  integrity sha512-Mv659Hn65Z4LgZdJ7ge5JTVbE3rqbJaaXgW5LEI9/tOaXclfIZ8DW7D7FCWWWmWiiPS7AC48S8kf3DApSxQdgA==
 
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
   version "3.5.3"
@@ -1231,10 +1231,10 @@ vfonts@^0.0.3:
   resolved "https://registry.yarnpkg.com/vfonts/-/vfonts-0.0.3.tgz#999d66fecea18efee3f2b966c81101ae8ce01a29"
   integrity sha512-nguyw8L6Un8eelg1vQ31vIU2ESxqid7EYmy8V+MDeMaHBqaRSkg3dTBToC1PR00D89UzS/SLkfYPnx0Wf23IQQ==
 
-vite@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-3.1.0.tgz#3138b279072941d57e76bcf7f66f272fc6a17fe2"
-  integrity sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==
+vite@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-3.1.1.tgz#fcfe12c3fe7e4c6def1fc52e4dc9cb0ccb2b1a59"
+  integrity sha512-hgxQWev/AL7nWYrqByYo8nfcH9n97v6oFsta9+JX8h6cEkni7nHKP2kJleNYV2kcGhE8jsbaY1aStwPZXzPbgA==
   dependencies:
     esbuild "^0.15.6"
     postcss "^8.4.16"
@@ -1262,10 +1262,10 @@ vue-router@^4.1.5:
   dependencies:
     "@vue/devtools-api" "^6.1.4"
 
-vue-utils-plus@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/vue-utils-plus/-/vue-utils-plus-1.0.2.tgz#8069c00c30a0e5cb83d7277c6975843814d8d452"
-  integrity sha512-Fg/2U0ysqpE2flCZ1Vmg5pRSnkmlmakmkEJ+w7ULDalme7SvoPp2sbe9UukZRL5eAm6ZqpKprrwLaj81nEyiRQ==
+vue-utils-plus@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/vue-utils-plus/-/vue-utils-plus-1.0.3.tgz#cc58d356096cafd818a6195bd50594d112110ced"
+  integrity sha512-4OmDjxMQNEdsRym2DGQC8qwp137GIRQs0Ax24JoJrxX7isHtHebnGyz7w4xw4A/0arvyb09Ilzdlv01ftySqSg==
 
 vue@^3.2.39:
   version "3.2.39"