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

src/api/common/index.js

@@ -216,7 +216,7 @@ export const getHotArea = async () => {
 
 // 上传文件
 export const uploadFile = async (data) => {
-  return await request.upload({ url: '/app-api/infra/file/upload', data })
+  return await request.upload({ url: '/app-api/menduner/system/file/upload', data })
 }
 
 // 获取当前登录的企业用户信息

src/components/pay/index.vue

@@ -333,7 +333,7 @@ if ((props.appId - 0) !== 11) updateAccountInfo(true) // 点数发生支付时
 
 // 倒计时
 
-const countdownTime = 60000*5 // 倒计时五分钟
+const countdownTime = 60000 * 3 // 倒计时三分钟
 let remainder = 0 // number
 const remainderZhShow = ref('') // 倒计时展示
 

src/components/personalRecharge/initPay.vue

@@ -212,8 +212,7 @@ watch(
 const refreshQRCode =() => { // 刷新二维码
   getUnpaidOrderList()
 }
-
-const countdownTime = 60000*5 // 倒计时五分钟
+const countdownTime = 60000 * 3 // 倒计时三分钟
 let remainder = 0 // number
 const remainderZhShow = ref('') // 倒计时展示
 

src/components/personalRecharge/pay.vue

@@ -88,7 +88,7 @@ let _checkPayStatus = checkPayStatus()
 // 计时器
 const initIntervalFun = () => {
 
-  let remainder = props.expirationTime < 0 ? 60000 * 10 : props.expirationTime // 倒计时10分钟(ms)
+  let remainder = props.expirationTime < 0 ? 60000 * 3 : props.expirationTime // 倒计时三分钟(ms)
   if (interTimer) {
     clearInterval(interTimer)
   }

src/plugins/fullScreen/components/entUpdatePassword.vue

@@ -25,7 +25,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .white-bgc {
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 ::-webkit-scrollbar {

src/views/about/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%; height: 100%;" class="">
-    <div class="banner"></div>
-    <div class="default-width white-bgc px-10 my-3">
+    <div v-if="showBanner" class="banner"></div>
+    <div class="default-width white-bgc px-10" :class="{'my-3': showBanner}">
       <div class="pb-15 pt-10">
         <h1 class="title">公司简介</h1>
         <p class="mb-5 mt-10">门墩儿是聚焦酒店及现代服务业人力资源技术与人才数据服务的互联网科技公司。</p>
@@ -45,6 +45,12 @@
 
 <script setup>
 defineOptions({ name: 'about-index'})
+defineProps({
+  showBanner: {
+    type: Boolean,
+    default: true
+  }
+})
 
 const list = [
   { title: '公司使命', desc: '成为中国酒店行业可信赖的人力资源科技公司。', url: 'https://minio.citupro.com/dev/menduner/home/introduct-bg-01.png' },

src/views/login/forgotPassword.vue

@@ -45,7 +45,7 @@ onMounted(() => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 .content {

src/views/login/forgotPasswordEnt.vue

@@ -64,7 +64,7 @@ const verifySuccess = (params) => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 .content {

src/views/login/index.vue

@@ -64,7 +64,7 @@
         </div>
       </div>
       <div class="aboutBox">
-        <about></about>
+        <about :showBanner="false"></about>
       </div>
     </div>
     <navBar v-if="!isMobile" :showLoginBtn="false" class="navBar"></navBar>
@@ -243,7 +243,7 @@ const verifySuccess = (params) => {
   position: relative;
   width: 100%;
   height: 100vh;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
   overflow: hidden;
   .navBar {
@@ -311,6 +311,7 @@ const verifySuccess = (params) => {
   width: 100%;
   background-color: #fff;
   // overflow-x: auto;
+  margin-top: -115px;
 }
 .carousel {
   :deep(.v-window) {

src/views/recruit/entRegister/register.vue

@@ -478,7 +478,7 @@ const passwordConfirmObj = {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 .file-box {

src/views/recruit/enterprise/talentRecommendation/index.vue

@@ -253,7 +253,7 @@ const handleSearch = (val) => {
   position: relative;
   width: 100%;
   height: 100vh;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
   &-box {
     position: absolute;

src/views/register/company.vue

@@ -50,7 +50,7 @@ const handleValidate = async () => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
   background-repeat: no-repeat;
   background-position: center center;

src/views/register/person.vue

@@ -110,7 +110,7 @@ const handleRegister = async () => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 .content {

src/views/register/select.vue

@@ -41,7 +41,7 @@ const handleToRegister = (path) => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-image: url('https://minio.menduner.com/dev/menduner/login-banner.png');
+  background-image: url('https://minio.menduner.com/dev/menduner/login-bgc.jpg');
   background-size: cover;
 }
 .register-content {