Browse Source

feat(api): new saving 5

gemercheung 3 years ago
parent
commit
78d78e47ef

+ 2 - 1
.husky/lintstagedrc.js

@@ -3,7 +3,8 @@ module.exports = {
   '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': ['prettier --write--parser json'],
   'package.json': ['prettier --write'],
   '*.vue': ['eslint --fix', 'prettier --write'],
-  '*.{scss,less,styl,html}': ['stylelint --fix', 'prettier --write'],
+  '*.{scss,less,styl}': ['stylelint --fix', 'prettier --write'],
+  // '*.{scss,less,styl,html}': ['stylelint --fix', 'prettier --write'],
   '*.md': ['prettier --write'],
 };
 // '*.vue': ['eslint --fix', 'prettier --write', 'stylelint --fix'],

+ 4 - 4
index.html

@@ -73,9 +73,10 @@
 
         .app-loading .app-loading-logo {
           display: block;
-          width: 90px;
+          /* width: 90px; */
           margin: 0 auto;
-          margin-bottom: 20px;
+          height: 44px;
+          margin-top: 20px;
         }
 
         .dot {
@@ -153,11 +154,10 @@
       </style>
       <div class="app-loading">
         <div class="app-loading-wrap">
-          <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
           <div class="app-loading-dots">
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
           </div>
-          <div class="app-loading-title"><%= title %></div>
+          <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />
         </div>
       </div>
     </div>

+ 1 - 1
package.json

@@ -172,7 +172,7 @@
       "eslint --fix",
       "prettier --write"
     ],
-    "*.{scss,less,styl,html}": [
+    "*.{scss,less,styl}": [
       "stylelint --fix",
       "prettier --write"
     ],

BIN
public/resource/img/logo-bk.png


BIN
public/resource/img/logo.png


BIN
src/assets/images/logo-1.png


BIN
src/assets/images/logo.png


+ 1 - 1
src/components/Application/src/AppLogo.vue

@@ -4,7 +4,7 @@
 -->
 <template>
   <div class="anticon" :class="getAppLogoClass" @click="goHome">
-    <img src="../../../assets/images/logo.png" />
+    <!-- <img src="../../../assets/images/logo.png" /> -->
     <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle">
       {{ title }}
     </div>

+ 1 - 1
src/settings/projectSetting.ts

@@ -48,7 +48,7 @@ const setting: ProjectConfig = {
   contentMode: ContentEnum.FULL,
 
   // Whether to display the logo
-  showLogo: true,
+  showLogo: false,
 
   // Whether to show footer
   showFooter: false,

+ 1 - 1
src/views/corporation/detailsModal.vue

@@ -91,7 +91,7 @@
         // },
         {
           field: 'companyName',
-          label: t('sys.login.corporationName'),
+          label: t('routes.corporation.enterpriseName'),
           slot: 'text',
           component: 'Input',
         },

+ 1 - 1
src/views/corporation/verify.vue

@@ -158,7 +158,7 @@
         let obj = {
           1: { color: 'success', text: t('routes.corporation.stateName.1') },
           2: { color: 'warning', text: t('routes.corporation.stateName.2') },
-          0: { color: 'green', text: t('routes.corporation.stateName.0') },
+          0: { color: 'blue', text: t('routes.corporation.stateName.0') },
         };
         let active = obj[state] || { color: 'green', text: t('routes.corporation.stateName.9') };
         // console.log('active', active, state);