fix: 调整店铺装修页面

xinkeaboard-seller/src/pages/store/pc_diy/diy_lists.js

@@ -25,8 +25,8 @@ import SldModal from '@/components/SldModal/SldModal';
 import Search from '@/components/Search/Search';
 
 let pageSize = list_com_page_size_10;
-@connect(({ product }) => ({
-  product,
+@connect(({ product, global }) => ({
+  product, global
 }))
 @Form.create()
 export default class DiyLists extends Component {
@@ -138,7 +138,7 @@ export default class DiyLists extends Component {
           width: 100,
           render: (text, record) => (
             <Fragment>
-              <Link to={{ pathname: `/store/decorate_pc_home_to_edit`, search: `?id=${record.decoId}` }}
+              <Link to={{ pathname: `/store/decorate_pc_home_to_edit`, search: `?id=${record.decoId}&webSite=${props.global.currentSite}` }}
                     target="_blank">
                 {
                   sldtbaleOpeBtnText(`${sldComLanguage('装修')}`, null)

xinkeaboard-seller/src/pages/store/pc_diy/diy_page.less

@@ -1,4 +1,5 @@
 @import '~antd/lib/style/themes/default.less';
+@import '../../../themeColor.less';
 
 /* 装修页面样式-start */
 .diy_page_wrap {
@@ -443,7 +444,7 @@
   z-index: 12;
   width: 100vw;
   height: 48px;
-  background: linear-gradient(90deg, #FF5216 0%, #FF8A39 100%);
+  background: @theme-linear;
   padding-left: calc(50vw - 605px);
   padding-right: calc(50vw - 605px);
   .left{

xinkeaboard-seller/src/pages/store/pc_diy/edit_diy_page_head.js

@@ -173,15 +173,15 @@ export default class EditDdiyPageHead extends Component {
                        style={{ color: 'rgb(153,153,153)' }}/>
                 <input type="submit" value={sldComLanguage('搜索')} className={styles.button}/>
               </form>
-              <input type="submit" value={sldComLanguage('搜本店')} className={`${styles.button} ${styles.fl}`}
-                     style={{ background: '#333' }}/>
+              {/* <input type="submit" value={sldComLanguage('搜本店')} className={`${styles.button} ${styles.fl}`}
+                     style={{ background: '#333' }}/> */}
             </div>
 
             <div className={styles.sld_cart_wrap}>
               <dl>
                 <dt className={`${styles.ld} ${styles.cart_icon_text_wrap}`}
                     style={{ borderBottom: '1px solid rgb(239, 239, 239)' }}>
-                  <span className={styles.iconfont}>{sldSvgIcon('#e2231a',16,16,'youxiang')}</span>
+                  <span className={styles.iconfont}>{sldSvgIcon('#036EB8',16,16,'youxiang')}</span>
                   <a href="javascript:void(0)">{sldComLanguage('我的询盘')}</a>
                   {/*<div className={styles.cart_goods_num}>0</div>*/}
                 </dt>

xinkeaboard-seller/src/pages/store/pc_diy/edit_diy_page_head.less

@@ -3,15 +3,15 @@
 
 .header_wrap {
   width: 100%;
-  height: 33px;
+  height: 45px;
   background: #f7f7f7;
   display: flex;
   align-items: center;
   justify-content: center;
 
   .header {
-    width: 1210px;
-    height: 33px;
+    width: 1440px;
+    height: 45px;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -168,12 +168,15 @@
 }
 .sld_store_header {
   width: 100%;
+  background: #F6F8FA;
   .container {
-    width: 1210px;
+    display: flex;
+    align-items: center;
+    width: 1440px;
     margin: 0 auto;
     padding-left: 0;
     padding-right: 0;
-    height: 99px;
+    height: 80px;
     position: relative;
     z-index: 12;
 
@@ -370,14 +373,12 @@
     }
 
     .search_wrap {
-      width: 550px;
-      float: left;
-      padding-top: 4px;
-      margin-top: 30px;
+      flex: 1;
+      width: 100%;
 
       form {
-        width: 443px;
-        border: 2px solid #e2231a;
+        width: 536px;
+        border: 2px solid @theme-color;
 
         .text {
           width: 334px;
@@ -405,7 +406,7 @@
 
       .button {
         width: 103px;
-        background: #e2231a;
+        background: @theme-color;
         font-size: 16px;
         font-weight: 600;
         color: #fff;
@@ -443,11 +444,15 @@
 
     .sld_store_nav {
       width: 100%;
-      height: 38px;
-      line-height: 38px;
-      background-color: #080808;
+      height: 48px;
+      line-height: 48px;
+      background: @theme-linear;
 
       .sld_all_store_cat {
+        height: 100%;
+        font-weight: 400;
+        font-size: 12px;
+        color: #FFFFFF;
         &:hover {
           .sld_store_first_cat {
             display: block !important;
@@ -457,9 +462,9 @@
 
       .sld_store_first_cat {
         position: absolute;
-        top: 38px;
+        top: 48px;
         left: 0;
-        width: 171px;
+        width: 200px;
         font-size: 15px;
         background-color: #ffffff;
         z-index: 119;
@@ -471,7 +476,7 @@
           height: 40px;
           line-height: 40px;
           box-sizing: border-box;
-          border-bottom: 1px solid rgba(0, 0, 0, .2);
+          border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 
           a {
             display: block;
@@ -526,7 +531,7 @@
           width: 171px;
           background-color: #ffffff;
           color: #333333;
-          font-size: 17px;
+          font-size: 12px;
           padding: 0;
           cursor: pointer;
 
@@ -544,7 +549,7 @@
       }
 
       ul {
-        width: 1210px;
+        width: 1440px;
         margin: 0 auto;
         position: relative;
       }
@@ -553,20 +558,16 @@
         position: absolute;
         left: 171px;
         width: 810px;
-        height: 38px;
+        height: 100%;
         overflow: hidden;
       }
     }
   }
 
   .sld_cart_wrap {
-    float: right;
-    position: relative;
-    z-index: 99;
     width: 165px;
     height: 40px;
-    margin-top: 34px;
-    margin-right: 13px;
+    text-align: center;
 
     dl {
       margin-bottom: 0px;
@@ -574,7 +575,7 @@
       .cart_goods_num {
         font: 11px/16px Verdana;
         color: #FFF;
-        background: #e2231a;
+        background: @theme-color;
         text-align: center;
         display: inline-block;
         height: 16px;
@@ -596,8 +597,8 @@
 
         .iconfont {
           display: inline-block;
-          margin: 0 13px 0 12px;
-          color: #e2231a;
+          margin: 0 13px 0 0px;
+          color: @theme-color;
           font-weight: 600;
           vertical-align: bottom;
           font-size: 17px;
@@ -609,7 +610,7 @@
 
         &.cart_icon_text_wrap {
           a {
-            color: #666666;
+            color: @theme-color;
             font-size: 14px;
             line-height: 36px;
           }
@@ -722,20 +723,20 @@
   .search_line{
     width: 1px;
     height: 20px;
-    border: 1px solid #FFFFFF;
+    border: 1px solid #ffffff;
     opacity: 0.5;
     position: absolute;
-    right: 210px;
-    top: 8px;
+    right: 300px;
+    top: 14px;
   }
   .search_modle{
-    width: 192px;
+    width: 282px;
     position: absolute;
     right: 0;
-    height: 38px;
+    height: 100%;
     .search_input{
-      width: 160px;
-      height: 20px;
+      width: 100%;
+      height: 32px;
       background: #FFFFFF;
       border-radius: 2px 0 0 2px;
       display: block;
@@ -745,15 +746,15 @@
     }
     .search_input_button{
       display: block;
-      width: 50px;
-      height: 20px;
-      background: #e2231a;
+      width: 72px;
+      height: 32px;
+      background: @theme-color;
       border-radius: 0 2px 2px 0;
       font-size: 12px;
       //font-family: Microsoft YaHei;
       font-weight: 400;
-      color: #FFFFFF;
-      line-height: 20px;
+      color: #ffffff;
+      line-height: 32px;
       text-align: center;
       cursor: pointer;
     }

xinkeaboard-seller/src/pages/store/pc_diy/pcdecorate.less

@@ -1476,6 +1476,10 @@ a {
 /* adv_11-end */
 
 /* adv_12-start */
+.adv_12 {
+  width: 1440px;
+  margin: 0 auto;
+}
 .adv_12 .adv_12_wrap {
   width: 100%;
   position: relative;

xinkeaboard-seller/src/utils/utils.js

@@ -1382,7 +1382,8 @@ export function getSldStatYTitle() {
  * */
 export function sldComRequest(method, url, params, data_type = '') {
   const state = window.g_app._store.getState();
-  const currentSite = state.global.currentSite || localStorage.getItem('currentSite');
+  const { webSite = '' } = state.routing.location.query;
+  const currentSite = webSite || state.global.currentSite || localStorage.getItem('currentSite');
   const currentPath = state.routing.location.pathname;
   if (!currentPath.includes('/apply') && !currentPath.includes('/user/login')) {
     params = Object.assign({}, { webSite: currentSite }, params ?? {})