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

src/views/login/index.vue

@@ -2,7 +2,7 @@
   <div class="box">
     <div class="content">
       <div class="login-content">
-        <v-card height="392px" class="carousel mr-3" style="width: 792px; border-radius: 0px;">
+        <v-card height="392px" class="carousel mr-3" style="width: 792px; border-radius: 8px;">
           <v-carousel show-arrows="hover" cycle>
             <v-carousel-item v-for="(item, i) in carouselList" :key="i">
               <div style="height: 392px; overflow: hidden;">
@@ -230,9 +230,9 @@ const carouselList = ref([
   position: relative;
   width: 450px;
   background-color: #fff;
-  border-radius: 0px;
+  border-radius: 8px;
   padding: 36px 50px;
-  margin-right: 12px;
+  // margin-right: 12px;
 }
 .left {
   display: flex;

src/views/recruit/personal/PersonalCenter/resume/online/components/jobIntention.vue

@@ -139,8 +139,9 @@ const items = ref({
       type: 'number',
       key: 'payFrom',
       value: '',
-      col: 4,
+      col: 6,
       label: '最低薪资 *',
+      flexStyle: 'mr-3',
       suffix: '元',
       rules: [
         value => {
@@ -162,9 +163,8 @@ const items = ref({
       type: 'number',
       key: 'payTo',
       value: '',
-      col: 4,
+      col: 6,
       label: '最高薪资 *',
-      flexStyle: 'mx-3',
       suffix: '元',
       rules: [
         value => {