Prechádzať zdrojové kódy

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

lifanagju_citu 4 mesiacov pred
rodič
commit
9818241070

+ 0 - 1
components.d.ts

@@ -29,7 +29,6 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']

+ 2 - 2
src/config/axios/service.js

@@ -119,7 +119,7 @@ service.interceptors.request.use(
        * params: { data, params, raw }
        * content
        */
-      if (systemInfo.beijingTimestamp === 0 && process?.env?.NODE_ENV === 'production') {
+      if (process?.env?.NODE_ENV === 'production' && systemInfo.beijingTimestamp === 0) {
         const _timestamp = await getBeijingTimestamp()
         setBeijingTimestamp(_timestamp)
       }
@@ -129,7 +129,7 @@ service.interceptors.request.use(
         body,
         appId: 'web_client',
         AppSecret: 'fa0fc0b5098b974b',
-        timestamp: process?.env?.NODE_ENV === 'production' ? systemInfo.beijingTimestamp + 3000 : new Date().getTime() + 3000,
+        timestamp: process?.env?.NODE_ENV === 'production' ? systemInfo.beijingTimestamp : new Date().getTime(),
       })
       const content = {
         data: config.data,

+ 1 - 1
src/views/recruit/personal/home/components/advertisement/dynamic/intercontinental.vue

@@ -7,7 +7,7 @@
       </v-carousel>
       <v-img class="logo-png" src="https://minio.citupro.com/dev/menduner/preferredGroup/IHG-logo.png" width="152" height="72"></v-img>
     </div> -->
-    <v-img src="https://minio.menduner.com/dev/menduner/IHG.gif" lazy-src="https://minio.menduner.com/dev/menduner/IHG.gif" width="1184" height="500">
+    <v-img src="https://minio.menduner.com/dev/9e3d57525496061ed931ee0d6a91c123561ab30a3f22c55a812a66f40d9a281b.gif" lazy-src="https://minio.menduner.com/dev/9e3d57525496061ed931ee0d6a91c123561ab30a3f22c55a812a66f40d9a281b.gif" width="1184" height="500">
       <template v-slot:placeholder>
         <v-row align="center" class="fill-height ma-0" justify="center">
           <v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>