Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

demo.js

@@ -4,7 +4,7 @@ const mockData = {
   data: {
     global: {
       siteId: 352,
-      siteUrl: 'http://localhost:4396',
+      siteUrl: 'http://10.0.0.25:4396',
       logo: 'https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/4db4e7c5424c471c968ab540bce027f31597319423082.png',
       countryList: [
         {

src/app.tsx

@@ -117,15 +117,19 @@ export function render(oldRender: Function) {
 export function onRouteChange({ routes, matchedRoutes, location, action }) {
   console.log('onRouteChange')
 
-  if (isDev) {
-
-    return;
+  // if (isDev) {
+  //   return;
+  // }
+  if (whiteLists.includes(location.pathname)) {
+    return
   }
 
   // 是否登录
   if (getAuth()) {
+
     const routeAuthUrls = getRouters()
     const { query, pathname } = location
+
     if (userLoginLists.includes(pathname)) {
       // 当登录过， 并且尝试访问登录相关页面, 需重定向到首页
       history.replace('/memberCenter/home')

src/pages/channel/channelInfo/index.less

@@ -20,6 +20,7 @@
   .form_item_wrap {
     display: flex;
     align-items: center;
+    flex-wrap: wrap;
 
     .size_require {
       color: #97A0AF;
@@ -62,6 +63,7 @@
     cursor: pointer;
     margin-right: 24px;
     overflow: hidden;
+    margin-bottom: 12px;
 
     &.upload {
       border: 1px solid rgba(223, 225, 230, 1);

src/pages/lxMall/index/index.tsx

@@ -110,7 +110,7 @@ const MallIndex: React.FC<MallIndexPropsType> = (props) => {
               </FloorLine.FloorHeader>
               <FloorLine.Horizontal>
                 <FloorLine.Goods goodsList={categoryDetail.goodsBOList} />
-                <FloorLine.Shops shopsList={categoryDetail.shopBOList} linkUrl={`/shop?shopId=${btoa(JSON.stringify({ shopId: 3, memberId: 6 }))}`} />
+                <FloorLine.Shops shopsList={categoryDetail.shopBOList} linkUrl={`/shop`} />
               </FloorLine.Horizontal>
             </FloorLine.Vertical>
           </FloorLine.Horizontal>

src/pages/lxMall/layouts/LXShopLayout.tsx

@@ -44,8 +44,8 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
   }, [])
 
   useEffect(() => {
-    if (query.memberId) {
-      fetchShopInfo(query.memberId)
+    if (query.meberId) {
+      fetchShopInfo(query.meberId)
     }
   }, [query])
 
@@ -81,7 +81,7 @@ const LXShopLayout: React.FC<LXMallLayoutPropsType> = (props) => {
               {
                 layoutType: 'shop',
                 shopId: query.shopId,
-                memberId: query.memberId,
+                memberId: query.meberId,
                 shopUrlParam: shopId,
                 shopInfo
               },

src/pages/shop/shopInfo/index.less

@@ -19,6 +19,7 @@
 
   .form_item_wrap {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
 
     .size_require {
@@ -62,6 +63,7 @@
     cursor: pointer;
     margin-right: 24px;
     overflow: hidden;
+    margin-bottom: 12px;
 
     &.upload {
       border: 1px solid rgba(223, 225, 230, 1);

src/pages/shop/shopInfo/index.tsx

@@ -305,7 +305,6 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => {
             label={<RequireItem label="资质荣誉" brief={<Tooltip placement="top" title="如商标注册证书、品牌授权证书等证明材料"><QuestionCircleOutlined /></Tooltip>} />}
           >
             <div className={styles.form_item_wrap}>
-
               <div className={styles.img_list}>
                 {
                   honorPics.map((item, index) => (