Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/src/pages/decorate/pc/home/adv_28.js

@@ -85,8 +85,8 @@ export default class Adv_28 extends Component {
         },
         left: {
           type: 'img_cat',
-          width: 300,
-          height: 386,
+          width: 348,
+          height: 654,
           data: {
             imgUrl: '',
             imgPath: '',

xinkeaboard-admin/src/pages/decorate/pc/home/adv_29.js

@@ -60,8 +60,8 @@ export default class Adv_29 extends Component {
         },//上方两个标题
         left: {
           type: 'img_cat',
-          width: '1210',
-          height: '330',
+          width: '1440',
+          height: '654',
           data: {
             imgUrl: '',
             imgPath: '',
@@ -278,7 +278,7 @@ export default class Adv_29 extends Component {
             <div className={`${styles.sourcing_centent}`}>
               <div className={`${styles.sourcing_form}`}>
                 <div className={`${styles.form_title}`}>Want to get quotations?</div>
-                <div class="form" style={{width:'100%'}}>
+                <div class="form" style={{width:'531px'}}>
                   <Form
                     name="basic"
                   >
@@ -287,7 +287,7 @@ export default class Adv_29 extends Component {
                       name=""
                       rules={[{ required: true, message: 'Please enter your username!' }]}
                     >
-                      <Input placeholder="Please enter name" style={{width:'100%'}}/>
+                      <Input placeholder="Please enter name" style={{width:'100%', height: '48px'}}/>
                     </Form.Item>
 
                     <Form.Item
@@ -295,7 +295,7 @@ export default class Adv_29 extends Component {
                       name=""
                       rules={[{ required: true, message: 'Please enter your email!' }]}
                     >
-                      <Input placeholder="Please enter email" style={{width:'100%'}}/>
+                      <Input placeholder="Please enter email" style={{width:'100%', height: '48px'}}/>
                     </Form.Item>
 
                     <Form.Item
@@ -303,15 +303,15 @@ export default class Adv_29 extends Component {
                       name=""
                       rules={[{ required: true, message: 'Please enter quantity!' }]}
                     >
-                      <Input placeholder="Please enter quantity" style={{width:'100%'}}/>
+                      <Input placeholder="Please enter quantity" style={{width:'100%', height: '48px'}}/>
                     </Form.Item>
 
                     <Form.Item label="" style={{margin_bottom:'8px'}}>
-                      <TextArea rows={6} placeholder="Please enter Message" style={{width:'100%'}}/>
+                      <TextArea rows={6} placeholder="Please enter Message" style={{width:'100%', height: '148px'}}/>
                     </Form.Item>
 
                       <Form.Item >
-                      <Button type="primary" htmlType="submit" style={{ width: '200px' }}>
+                      <Button type="primary" htmlType="submit" style={{ width: '200px', height: '42px', fontWeight: 'bold', fontSize: '14px',color: '#FFFFFF', marginTop: '20px' }}>
                         Post Your Request Now
                       </Button>
                     </Form.Item>

xinkeaboard-admin/src/pages/decorate/pc/home/edit_diy_page_head.less

@@ -10,7 +10,7 @@
   justify-content: center;
 
   .header {
-    width: 1210px;
+    width: 1440px;
     height: 33px;
     display: flex;
     justify-content: space-between;
@@ -170,7 +170,7 @@
   height: 99px;
   position: relative;
   z-index: 12;
-  width: 1210px;
+  width: 1440px;
   margin: 0 auto 15px;
   padding-left: 0px;
   padding-right: 0px;
@@ -517,7 +517,7 @@
   }
 }
 .header {
-  width: 1210px;
+  width: 1440px;
   height: 37px;
   margin: 0 auto;
   display: flex;

xinkeaboard-admin/src/pages/decorate/pc/pcdecorate.less

@@ -2716,6 +2716,7 @@ a {
 
 /* adv_29-start */
 .adv_29 {
+  height: 654px;
   margin-top: 20px;
   margin-bottom: 20px;
   padding: 30px;
@@ -2762,50 +2763,53 @@ a {
 //}
 
 .adv_29 .sourcing_centent {
-  padding-top:8px;
-  padding-bottom: 8px;
-  position: relative;
+  // padding-top:8px;
+  // padding-bottom: 8px;
+  // position: relative;
 }
 
 .adv_29 .sourcing_form {
-  float: right;
-  padding: 20px 25px;
+  padding-top: 40px;
+  padding-left: 28px;
+  position: absolute;
+  right: 80px;
+  top: 53px;
   background: #fff;
-  margin-left: 225px;
-  width: 530px;
+  width: 587px;
+  height: 548px;
 }
 
 .adv_29 .sourcing_form .form_title {
-  font-size: 24px;
-  line-height: 30px;
+  font-weight: 400;
+  font-size: 32px;
+  color: #282E30;
   margin-bottom: 10px;
-  font-weight: normal;
 }
 
 .adv_29 .sourcing_form .form {
-  background-color: #e2231a;
-  height: 34px;
+  // background-color: #e2231a;
+  // height: 34px;
   overflow: hidden;
 }
 
 
 .adv_29 .sourcing_text {
-  width: 250px;
-  height: 370px;
+  width: 400px;
+  height: 100%;
   // padding-top: 20px;
-  padding-left: 30px;
+  padding-left: 80px;
+  padding-top: 53px;
   overflow: hidden;
   position: relative;
 }
 
 .adv_29 .sourcing_title {
+  font-weight: bold;
   font-size: 40px;
   color: #FFFFFF;
-  font-size: 32px;
-  font-weight: bold;
   margin-bottom: 80px;
-  transform: scaleX(1.2);
-  transform-origin: left;
+  // transform: scaleX(1.2);
+  // transform-origin: left;
 }
 
 .adv_29 .sourcing_desc {

xinkeaboard-web/assets/style/decorate.scss

@@ -4119,10 +4119,13 @@ a {
 
 
 /* adv_29-start */
+
+.adv_29_wrap {
+  height: 654px;
+}
 .adv_29_wrap .easy-sourcing {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  padding: 30px;
+  height: 100%;
+  width: 100%;
   position: relative;
   overflow: hidden;
   .sourcing-bg {
@@ -4144,36 +4147,41 @@ a {
 
 
   .sourcing-centent {
+    width: 100%;
+    height: 100%;
     position: relative;
   }
   .sourcing-form {
-    float: right;
-    padding: 20px 25px;
+    padding-top: 40px;
+    padding-left: 28px;
+    position: absolute;
+    right: 80px;
+    top: 53px;
     background: #fff;
-    margin-left: 225px;
-    width: 530px;
-    height: 410px;
+    width: 587px;
+    height: 548px;
     .form-title {
-      font-size: 24px;
-      line-height: 30px;
+      font-weight: 400;
+      font-size: 32px;
+      color: #282E30;
       margin-bottom: 10px;
-      font-weight: normal;
     }
   }
   .sourcing-text {
-    position: absolute;
-    left: 20px;
-    top: 0px;
-    height: 410px;
-    width: 350px;
+   width: 400px;
+    height: 548px;
+    // padding-top: 20px;
+    padding-left: 80px;
+    padding-top: 53px;
     overflow: hidden;
+    position: relative;
+    box-sizing: content-box;
   }
   .sourcing-title {
     font-weight: bold;
-    font-size: 40px;
-    color: #FFFFFF;
-    margin-bottom: 20px;
-    transform-origin: left;
+  font-size: 40px;
+  color: #FFFFFF;
+  margin-bottom: 80px;
   }
   .sourcing-desc-warp {
     position: absolute;

xinkeaboard-web/components/Home/sourcingForm.vue

@@ -197,6 +197,23 @@ onMounted(() => {
 
 <style lang="scss" scoped>
 .form {
+  width: 531px;
+  :deep(.el-input) {
+    height: 48px !important;
+  }
+
+  :deep(.el-button) {
+    width: 200px;
+    height: 42px;
+    font-weight: bold;
+    font-size: 14px;
+    color: #FFFFFF;
+    margin-top: 20px;
+  }
+
+  :deep(.el-textarea) {
+    height: 148px !important;
+  }
   :deep(.el-input-number) {
     width: 100% !important;