fix: 修复整体样式问题

xinkeaboard-admin/src/components/SldHomeSetting/SldHomeSetting.js

@@ -49,8 +49,8 @@ export default class SldHomeSetting extends Component {
       data: [{
         key: 'img',
         name: '',
-        value: 'https://img.alicdn.com/simba/img/TB1jsBeKYPpK1RjSZFFSuu5PpXa.jpg',
-        imgPath: '/images/brand/3e56e20d-453d-4cf8-906f-a928de37ce6a.png',
+        value: '',
+        imgPath: '',
         type: 'img',
         required: true,
       }, {

xinkeaboard-web/assets/style/member/collect.scss

@@ -58,11 +58,11 @@ i {
 }
 
 .sld_collect_wrapper {
-    float: left;
+    flex: 1;
+    width: 100%;
 
     .wrapper_main {
-        float: left;
-        width: 967px;
+        width: 100%;
         padding-left: 10px;
         //font-family: "微软雅黑";
 

xinkeaboard-web/assets/style/member/footprint.scss

@@ -21,9 +21,9 @@ a:visited {
     text-decoration: none;
 }
 .sld_look_log {
-    float: left;
     margin-left: 10px;
-    width: 957px;
+    flex: 1;
+    width: 100%;
     .log_banner {
         position: relative;
     }
@@ -32,7 +32,7 @@ a:visited {
         height: 40px;
         background: #DDE1E6;
         position: absolute;
-        right: 30px;
+        right: 0px;
         top: 2px;
         font-weight: 400;
         font-size: $fontE;

xinkeaboard-web/assets/style/member/info.scss

@@ -11,8 +11,10 @@
 
 .member_info_container {
     padding: 0 0 0 11px;
-    float: left;
-    width: 967px;
+    flex: 1;
+    width: 100%;
+    overflow: auto;
+    
 
     .breadcrumb {
         //font-family: "MicroSoft yahei";
@@ -28,16 +30,30 @@
     }
 
     .member_info {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
         border: 1px solid #eee;
         background-color: #fff;
-
+        padding: 40px 0;
         .form_item {
-            padding: 37px 0 0 0px;
-            line-height: 30px;
+            // padding: 37px 0 0 0px;
+            // line-height: 30px;
             margin-bottom: 20px;
             color: #333;
-            img {
+
+            .chooseBtn {
+                display: inline-block;
+                width: 60px;
+                height: 60px;
                 border-radius: 50%;
+            }
+            img {
+                width: 100%;
+                height: 100%;
+                object-fit: contain;
                 cursor: pointer;
             }
 
@@ -55,7 +71,7 @@
                 }
             }
            .el-input__inner {
-                height: 27px;
+                height: 40px;
                 width: 302px;
                 line-height: 25px;
                 outline: none;
@@ -96,25 +112,26 @@
             .tag_name {
                 display: block;
                 float: left;
-                width: 110px;
+                min-width: 110px;
                 line-height: 60px;
                 text-align: left;
                 font-weight: 400;
-                margin-right: 0;
+                margin-right: 10px;
                 padding-left: 10px;
+                font-size: 14px;
                 text-transform: capitalize;
             }
 
-            img {
-                width: 60px;
-                height: 60px;
-            }
+            // img {
+            //     width: 60px;
+            //     height: 60px;
+            // }
         }
 
         .memInfo_save {
-            padding-left: 150px;
-            margin-bottom: 50px;
-            margin-top: 35px;
+            // padding-left: 150px;
+            // margin-bottom: 50px;
+            // margin-top: 35px;
             button {
                 background-color: $colorMain;
                 color: #fff;

xinkeaboard-web/assets/style/store/contac-about.scss

@@ -1,6 +1,6 @@
 @import "../theme.scss";
 
-.wrap{
+.wrap {
     position: relative;
     width: 1440px;
     margin: 0px auto 0px;
@@ -19,9 +19,11 @@
     display: block;
     overflow: hidden;
 }
+
 .sr-txt-title {
     margin-bottom: 40px;
 }
+
 .sr-txt-h2 {
     font-weight: bold;
     font-size: 20px;
@@ -30,31 +32,38 @@
     vertical-align: middle;
     word-break: break-word;
 }
-.sr-comProfile-info-l{
+
+.sr-comProfile-info-l {
     width: 38.3386%;
     min-width: 240px;
     margin-right: 30px;
     max-width: 360px;
     float: left;
-    img{
+
+    img {
         width: 100%;
     }
 }
+
 .sr-comProfile-infos.infos-top {
     float: left;
     width: calc(100% - 390px);
+
     table {
         border-collapse: collapse;
         border-spacing: 0;
-        td{
+
+        td {
             vertical-align: top;
             padding-bottom: 10px;
         }
-        .info-label-td{
+
+        .info-label-td {
             padding-right: 20px;
             color: #888;
             width: 195px;
-            .info-label-txt{
+
+            .info-label-txt {
                 display: block;
             }
         }
@@ -69,10 +78,11 @@
 }
 
 
-.sr-comProfile-intro a{
+.sr-comProfile-intro a {
     color: $colorMain;
     text-decoration: underline;
 }
+
 .sr-comProfile-intro .intro-cnt {
     display: -webkit-box;
     -webkit-box-orient: vertical;
@@ -89,9 +99,11 @@
 .sr-comProfile-item {
     margin-bottom: 10px;
 }
+
 .no-yes .sr-comProfile-label {
     padding-left: 0;
 }
+
 .sr-comProfile-label {
     color: #888;
     float: left;
@@ -99,9 +111,11 @@
     padding-left: 25px;
     width: 225px;
 }
+
 .no-yes .sr-comProfile-fields {
     margin-left: 240px;
 }
+
 .about-sub-block .about-sub-title .title-txt {
     font-size: 16px;
     display: inline-block;
@@ -120,48 +134,54 @@
     font-weight: normal;
 }
 
-.sld_store_list .sld_vendor_goods{
+.sld_store_list .sld_vendor_goods {
     width: 100%;
     height: auto;
     margin: 20px 0;
     padding: 0 55px;
-    .slide_wrap{
+
+    .slide_wrap {
         width: 100%;
         height: auto;
         margin: 0 auto;
-        .sld_img.sld-img-center:hover{
-            .magnifier_icon.flex_row_center_center{
+
+        .sld_img.sld-img-center:hover {
+            .magnifier_icon.flex_row_center_center {
                 height: 100%;
-                .iconfont{
+
+                .iconfont {
                     top: 0px;
-                  }
+                }
             }
         }
-        .img{
+
+        .img {
             cursor: pointer;
         }
 
         .magnifier_icon.flex_row_center_center {
             position: absolute;
-              bottom: 0;
-              right: 0;
-              background: rgba(0, 0, 0, 0.3);
-              z-index: 10;
-              top: 0;
-              left: 0;
-              width: 100%;
-              height: 0%;
-              transition:  all .3s;
-              cursor: pointer;
-              .iconfont{
+            bottom: 0;
+            right: 0;
+            background: rgba(0, 0, 0, 0.3);
+            z-index: 10;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 0%;
+            transition: all .3s;
+            cursor: pointer;
+
+            .iconfont {
                 color: #fff;
                 top: -10px;
                 position: relative;
-              }
-          }
+            }
+        }
 
     }
-    ul{
+
+    ul {
         overflow: hidden;
     }
 }
@@ -169,8 +189,11 @@
 
 
 .fence-wide {
-    width: 100%;
+    display: flex;
+    align-items: center;
+    width: 1440px;
     height: 100%;
+    background-color: #FFF;
     margin: 0 auto;
     zoom: 1;
 
@@ -185,15 +208,19 @@
     float: left;
 }
 
-.ly-left, .ly-right {
+.ly-left,
+.ly-right {
     display: inline;
 }
+
 .color-green {
     color: #2dbb55;
 }
+
 .fb {
     font-weight: 700;
 }
+
 .pr5 {
     padding-right: 5px;
 }
@@ -202,44 +229,144 @@
     //font-family: Arial, Helvetica, sans-serif;
 }
 
-.fence,.fence-wide{overflow:hidden;zoom:1;}
-
 /*header*/
-#header{ background:#FFF none;height:80px;zoom:1;}
-#header .logo h1 a{width:310px;line-height:80px;text-indent:-9999px;display:block;}
-#header .language .button{margin-top:25px;}
+#header {
+    background: #FFF none;
+    height: 80px;
+    zoom: 1;
+}
+
+#header .logo h1 a {
+    width: 310px;
+    line-height: 80px;
+    text-indent: -9999px;
+    display: block;
+}
+
+#header .language .button {
+    margin-top: 25px;
+}
 
 /*foot*/
-#footer p{margin:0;}
-#footer a{color:#b8b8b8;margin:0 3px;}
-#footer a:hover{color:#dbdbdb;}
+#footer p {
+    margin: 0;
+}
+
+#footer a {
+    color: #b8b8b8;
+    margin: 0 3px;
+}
+
+#footer a:hover {
+    color: #dbdbdb;
+}
 
 /*info*/
-.bannerBox{ background-color:#e2e6f5;height:520px;width: 100%;}
-.main{background-color:#f3f3f3;padding:50px 0; }
-.picBox{width:375px;margin:0 45px 0 30px;}
-.aboutBox{width:720px;padding:0 30px 0 0;zoom:1;font-size: 14px;}
-.f35{font-size:35px;margin-top:30px;}
-.aboutBox li{list-style-type:decimal;margin:15px 0 15px 25px;}
+.bannerBox {
+    background-color: #e2e6f5;
+    height: 520px;
+    max-width: 1920px;
+
+    .fence-wide {
+        width: 100%;
+    }
+}
+
+.main {
+    background-color: #fff;
+    height: 400px;
+    margin: 20px 0;
+}
+
+.picBox {
+    width: 375px;
+    height: 100%;
+}
+
+.aboutBox {
+   flex: 1;
+   width: 100%;
+   height: 100%;
+   overflow: auto;
+    padding: 0 30px;
+    zoom: 1;
+    font-size: 14px;
+}
+
+.f35 {
+    font-size: 35px;
+    margin-top: 30px;
+}
+
+.aboutBox li {
+    list-style-type: decimal;
+    margin: 15px 0 15px 25px;
+}
 
 
 /*search*/
-.searchInfo{padding:200px 0; text-align:center;}
-.searchInfo h3{font-size:75px;}
-.searchBar input{background-color:#fff;border: 1px solid;border-color: #b3b3b3 #ccc #ccc;border-radius:7px 0 0 7px;width:720px;padding:0 20px;height:78px;font-size:22px;overflow:hidden;}
-.searchBar .button{ background-color:#55d6ba;font-size:32px;width:180px;height:78px;padding:0;border-radius:0 7px 7px 0!important;
+.searchInfo {
+    padding: 200px 0;
+    text-align: center;
+}
+
+.searchInfo h3 {
+    font-size: 75px;
+}
+
+.searchBar input {
+    background-color: #fff;
+    border: 1px solid;
+    border-color: #b3b3b3 #ccc #ccc;
+    border-radius: 7px 0 0 7px;
+    width: 720px;
+    padding: 0 20px;
+    height: 78px;
+    font-size: 22px;
+    overflow: hidden;
+}
+
+.searchBar .button {
+    background-color: #55d6ba;
+    font-size: 32px;
+    width: 180px;
+    height: 78px;
+    padding: 0;
+    border-radius: 0 7px 7px 0 !important;
     //font-family:Verdana, Geneva, sans-serif;
 }
 
 /*case*/
-.caseBox{padding:0 0 50px;}
-.caseBox p{margin:0 50px 30px;}
-.caseBox dl{float:left;width:380px;margin:30px 10px; overflow:hidden;zoom:1;}
-.caseBox dt{color:#55d6ba;font-size:22px;margin-bottom:10px;}
-.caseBox dd{font-size:15px;color:#666;margin-left:30px;}
+.caseBox {
+    padding: 0 0 50px;
+}
 
+.caseBox p {
+    margin: 0 50px 30px;
+}
 
- .contact-ways {
+.caseBox dl {
+    float: left;
+    width: 380px;
+    margin: 30px 10px;
+    overflow: hidden;
+    zoom: 1;
+}
+
+.caseBox dt {
+    color: #55d6ba;
+    font-size: 22px;
+    margin-bottom: 10px;
+}
+
+.caseBox dd {
+    font-size: 15px;
+    color: #666;
+    margin-left: 30px;
+}
+
+
+.contact-ways {
     padding-top: 20px;
     padding-left: 22px;
     padding-right: 9px;
@@ -257,7 +384,7 @@
 }
 
 
- .contact-ways .contact-text {
+.contact-ways .contact-text {
     height: 27px;
     line-height: 27px;
     margin-bottom: 6px;
@@ -290,7 +417,9 @@
 }
 
 
-.btn-large, .btn-large:link, .btn-large:visited {
+.btn-large,
+.btn-large:link,
+.btn-large:visited {
     display: inline-block;
     vertical-align: middle;
     *vertical-align: middle;
@@ -313,7 +442,9 @@
     font-weight: bold;
 }
 
-.btn-main, .btn-main:link, .btn-main:visited {
+.btn-main,
+.btn-main:link,
+.btn-main:visited {
     color: #fff;
     background-color: #e64545;
     border: solid 1px #e64545;
@@ -325,7 +456,7 @@
     top: 0px;
     width: 230px;
     height: 157px;
-    background: rgba(0,0,0,.2);
+    background: rgba(0, 0, 0, .2);
     background: #000 \9;
     filter: alpha(opacity=20);
     overflow: hidden;
@@ -349,7 +480,7 @@
 }
 
 .contact-detail-video:hover .video-play {
-    background: rgba(0,0,0,.8);
+    background: rgba(0, 0, 0, .8);
     background: #000 \9;
     filter: alpha(opacity=80);
 }
@@ -362,24 +493,26 @@
 }
 
 
-.empty{
+.empty {
     display: block;
     text-align: center;
     margin: 0 auto;
 }
 
-.self-btn{
+.self-btn {
     width: 100%;
     background: $colorMain;
 }
 
-.self-btn:focus, .self-btn:hover {
+.self-btn:focus,
+.self-btn:hover {
     // border-color: #1ba66c;
     // background-color: #1ba66c;
 }
 
-.cancel-btn:focus, .cancel-btn:hover {
+.cancel-btn:focus,
+.cancel-btn:hover {
     border-color: #dcdfe6;
     background-color: #dcdfe6;
-    color:#606266;
-}
+    color: #606266;
+}

xinkeaboard-web/components/MemberLeftNav.vue

@@ -160,7 +160,7 @@ const testIfShow = (nav_info) => {
   border: 1px solid #ebebeb;
   border-top: 1px solid #fff;
   margin-top: -1px;
-  margin-bottom: 20px;
+  // margin-bottom: 20px;
   padding-bottom: 40px;
 
   .menu {

xinkeaboard-web/components/NavTopBar.vue

@@ -77,7 +77,7 @@
           <li @click="goToByPush('/article')">
             <div class="li_item">{{ L["服务中心"] }}</div>
           </li>
-          <li v-if="!!google">
+          <li>
           <div class="li_item">
             <div id=google_translate_element></div>
 

xinkeaboard-web/pages/member/account.vue

@@ -142,8 +142,8 @@ const toPage = (url, type) => {
 }
 
 .sld_account {
-  width: 957px;
-  float: left;
+  flex: 1;
+  width: 100%;
   margin-left: 10px;
 
   .container {

xinkeaboard-web/pages/member/download/center.vue

@@ -164,14 +164,13 @@
     }
 
     .sld_mydownloadcenter_wrapper {
-        width: 957px;
+        flex: 1;
+        width: 100%;
         margin-left: 10px;
-        float: left;
 
         .container {
             padding: 20px;
             background-color: #fff;
-            margin-bottom: 10px;
         }
 
         .point_table {

xinkeaboard-web/pages/member/enquiry/list.vue

@@ -289,16 +289,17 @@ const indexMethod = (index) => {
 }
 
 .sld_myenquiry_wrapper {
-  width: 957px;
+  flex: 1;
+  width: 100%;
+  height: 100%;
   margin-left: 10px;
-  float: left;
 }
 
 .sld_myenquiry_wrapper {
   .container {
     padding: 20px;
     background-color: #fff;
-    margin-bottom: 10px;
+    // margin-bottom: 10px;
   }
 }
 

xinkeaboard-web/pages/member/info.vue

@@ -10,9 +10,7 @@
             </td>
             <td>
               <form action="" enctype="multipart/form-data">
-                <label for="file" class="chooseBtn"
-                  ><img :src="tempSrc" id="show"
-                /></label>
+                <label for="file" class="chooseBtn"><img :src="tempSrc" id="show"/></label>
                 <input
                   id="file"
                   class="filepath"