Xiao_123 10 месяцев назад
Родитель
Сommit
cfa0e6737a
3 измененных файлов с 137 добавлено и 9 удалено
  1. 130 1
      index.html
  2. 1 2
      src/store/user.js
  3. 6 6
      src/utils/getText.js

+ 130 - 1
index.html

@@ -8,9 +8,138 @@
   <title>%VITE_APP_TITLE%</title>
 </head>
 <body>
-  <div id="app"></div>
+  <div id="app">
+    <style>
+      .app-loading {
+        display: flex;
+        width: 100%;
+        height: 100%;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        background: #f0f2f5;
+      }
+
+      .app-loading .app-loading-wrap {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        display: flex;
+        -webkit-transform: translate3d(-50%, -50%, 0);
+        transform: translate3d(-50%, -50%, 0);
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+      }
+
+      .app-loading .app-loading-title {
+        margin-bottom: 30px;
+        font-size: 20px;
+        font-weight: bold;
+        text-align: center;
+      }
+
+      .app-loading .app-loading-logo {
+        width: 100px;
+        margin: 0 auto 15px auto;
+      }
+
+      .app-loading .app-loading-item {
+        position: relative;
+        display: inline-block;
+        width: 60px;
+        height: 60px;
+        vertical-align: middle;
+        border-radius: 50%;
+      }
+
+      .app-loading .app-loading-outter {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        border: 4px solid #2d8cf0;
+        border-bottom: 0;
+        border-left-color: transparent;
+        border-radius: 50%;
+        animation: loader-outter 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
+      }
+
+      .app-loading .app-loading-inner {
+        position: absolute;
+        top: calc(50% - 20px);
+        left: calc(50% - 20px);
+        width: 40px;
+        height: 40px;
+        border: 4px solid #87bdff;
+        border-right: 0;
+        border-top-color: transparent;
+        border-radius: 50%;
+        animation: loader-inner 1s cubic-bezier(0.42, 0.61, 0.58, 0.41) infinite;
+      }
+
+      @-webkit-keyframes loader-outter {
+        0% {
+          -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+        }
+
+        100% {
+          -webkit-transform: rotate(360deg);
+          transform: rotate(360deg);
+        }
+      }
+
+      @keyframes loader-outter {
+        0% {
+          -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+        }
+
+        100% {
+          -webkit-transform: rotate(360deg);
+          transform: rotate(360deg);
+        }
+      }
+
+      @-webkit-keyframes loader-inner {
+        0% {
+          -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+        }
+
+        100% {
+          -webkit-transform: rotate(-360deg);
+          transform: rotate(-360deg);
+        }
+      }
+
+      @keyframes loader-inner {
+        0% {
+          -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+        }
+
+        100% {
+          -webkit-transform: rotate(-360deg);
+          transform: rotate(-360deg);
+        }
+      }
+    </style>
+    <div class="app-loading">
+      <div class="app-loading-wrap">
+        <div class="app-loading-title">
+          <div class="app-loading-title">%VITE_APP_TITLE%</div>
+        </div>
+        <div class="app-loading-item">
+          <div class="app-loading-outter"></div>
+          <div class="app-loading-inner"></div>
+        </div>
+      </div>
+    </div>
+  </div>
   <script type="module" src="/src/main.js"></script>
 </body>
+
 <style>
 /* 复写vuetify css属性 */
 html {

+ 1 - 2
src/store/user.js

@@ -77,11 +77,10 @@ export const useUserStore = defineStore('user',
           const data = await api({ userId: userId || this.accountInfo.userId })
           if (!data) return
           this.baseInfo = await this.getFieldText(data)
-          console.log(this.baseInfo, data, 'baseInfo-login==============')
           localStorage.setItem('baseInfo', JSON.stringify(this.baseInfo))
         } catch (error) {
           console.log(error, 'error')
-          Snackbar.error(error.msg)
+          Snackbar.error(error)
         }
       },
       // 字典对应中文

+ 6 - 6
src/utils/getText.js

@@ -13,16 +13,16 @@ export const getBaseInfoDictOfName = async (index = 0, baseInfo, value, addKeyNa
     { dictType: 'menduner_area_type', itemText: 'name', itemValue: 'id', saveType: 'areaList' },
     { dictType: 'menduner_education_type', itemText: 'label', itemValue: 'value' },
     { dictType: 'menduner_exp_type', itemText: 'label', itemValue: 'value' },
-    { dictType: 'system_user_sex', itemText: 'label', itemValue: 'value', saveType: 'dict' },
-    { dictType: 'menduner_job_type', itemText: 'label', itemValue: 'value', saveType: 'dict' },
-    { dictType: 'menduner_job_status', itemText: 'label', itemValue: 'value', saveType: 'dict' },
-    { dictType: 'menduner_marital_status', itemText: 'label', itemValue: 'value', saveType: 'dict' },
+    { dictType: 'system_user_sex', itemText: 'label', itemValue: 'value' },
+    { dictType: 'menduner_job_type', itemText: 'label', itemValue: 'value' },
+    { dictType: 'menduner_job_status', itemText: 'label', itemValue: 'value' },
+    { dictType: 'menduner_marital_status', itemText: 'label', itemValue: 'value' },
   ]
   const e = test[index]
 
   if (!value && value !== 0 && !e) baseInfo[addKeyName] = '暂无'
-  const params = e.saveType === 'dict' ? null : {}
-  const { data } = await getDict(e.dictType, params, (e.saveType || e.dictType))
+  const params = e.saveType === 'areaList' ? {} : null
+  const { data } = await getDict(e.dictType, params, (e.saveType || 'dict'))
   const item = data.find(formItem => Number(formItem[e.itemValue]) === Number(value))
   baseInfo[addKeyName] = item ? item[e.itemText] : '暂无'
 }