홈 탐색 도움말
로그인
zhengnaiwen_citu
/
menduner
1
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

lifanagju_citu 1 년 전
부모
6cb8ef3fa2 cfa0e6737a
커밋
2e3e1b948f
7개의 변경된 파일과 155개의 추가작업 그리고 17개의 파일을 삭제
분할 보기 변경상태 보기
  1. 130 1
      index.html
  2. 10 2
      src/components/Enterprise/hotPromoted.vue
  3. 0 1
      src/components/Position/item.vue
  4. 4 2
      src/config/axios/service.js
  5. 2 1
      src/store/user.js
  6. 6 6
      src/utils/getText.js
  7. 3 4
      src/views/recruit/personal/taskCenter/components/signIn.vue

+ 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 {

+ 10 - 2
src/components/Enterprise/hotPromoted.vue
파일 보기 

@@ -9,7 +9,13 @@
 
           </div>
 
           <div class="company-info">
 
             <h3>{{ item.enterprise.anotherName }}</h3>
 
-            <p>{{ item.financingName }}<span class="septal-line"></span>{{ item.scaleName }}<span class="septal-line"></span>{{ item.industryName }}</p>
 
+            <p>
 
+              {{ item.financingName }}
 
+              <span class="septal-line" v-if="item.financingName && item.scaleName"></span>
 
+              {{ item.scaleName }}
 
+              <span class="septal-line" v-if="item.industryName"></span>
 
+              {{ item.industryName }}
 
+            </p>
 
           </div>
 
         </div>
 
         <!-- 职位列表 -->
 
@@ -22,7 +28,9 @@
 
                 <span class="salary">{{ k.payFrom }}-{{ k.payTo }}/{{ k.payName }}</span>
 
               </div>
 
               <div style="height: 24px; overflow: hidden;">
 
-                <v-chip size="x-small" label class="mr-1" color="var(--color-666)" v-for="j in desc" :key="j">{{ k[j.value] }}</v-chip>
 
+                <span v-for="j in desc" :key="j">
 
+                  <v-chip v-if="k[j.value]" size="x-small" label class="mr-1" color="var(--color-666)">{{ k[j.value] }}</v-chip>
 
+                </span>
 
               </div>
 
             </div>
 
           </li>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
src/components/Position/item.vue


+ 4 - 2
src/config/axios/service.js
파일 보기 

@@ -251,8 +251,10 @@ const handleAuthorized = () => {
 
 // 触发获取积分
 
 const getIntegral = (url, store) => {
 
   rewardEventTrackClick(url).then(() => {
 
-    if (loginType && loginType === 'enterprise') store.getEnterpriseUserAccountInfo()
 
-    else store.getUserAccountInfo()
 
+    setTimeout(() => {
 
+      if (loginType && loginType === 'enterprise') store.getEnterpriseUserAccountInfo()
 
+      else store.getUserAccountInfo()
 
+    }, 2000)
 
   })
 
 }
 
 export { service }

+ 2 - 1
src/store/user.js
파일 보기 

@@ -79,7 +79,8 @@ export const useUserStore = defineStore('user',
 
           this.baseInfo = await this.getFieldText(data)
 
           localStorage.setItem('baseInfo', JSON.stringify(this.baseInfo))
 
         } catch (error) {
 
-          Snackbar.error(error.msg)
 
+          console.log(error, 'error')
 
+          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] : '暂无'
 
 }

+ 3 - 4
src/views/recruit/personal/taskCenter/components/signIn.vue
파일 보기 

@@ -83,13 +83,12 @@ const handleSignIn = async () => {
 
   await createRewardSignInRecord()
 
   setTimeout(async () => {
 
     await getSummary()
 
-    
+    Snackbar.success(t('taskCenter.signInSuccess'))
 
+    signLoading.value = false
 
+
 
     // 更新积分数
 
     await integralRef.value.getIntegral()
 
     await userStore.getUserAccountInfo()
 
-
 
-    Snackbar.success(t('taskCenter.signInSuccess'))
 
-    signLoading.value = false
 
   }, 1000)
 
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.