Merge branch 'dev' into test

src/pages/editor/channelEdit/index.tsx

@@ -185,9 +185,13 @@ const ChannelPreview: React.FC<ChannelPreviewPropsType> = (props) => {
 
     // 二号位广告
     serviceAdvertConfig[serviceAdvertConfig.key].props.advertList = await findSecondAdvertsByType()
+    
+    //店铺信息 
+    const channelInfo: any = await fetchShopInfo()
+    AboutUsConfig[AboutUsConfig.key].props.shopInfo = channelInfo
 
-    //店铺信息
-    AboutUsConfig[AboutUsConfig.key].props.shopInfo = await fetchShopInfo()
+    headerConfig[headerConfig.key].props.logoUrl = channelInfo.logo || ""
+    topBarConfig[topBarConfig.key].props.shopname = channelInfo.company || ""
 
     // 行情资讯
     InformationConfig[InformationConfig.key].props.newsList = await fetchLeadNews()

src/pages/editor/settingsPanel/propsSettings/components/AdvertSetting/index.tsx

 import React, { forwardRef, useState, useCallback } from 'react'
-import { Button, Input } from 'antd'
+import { Button, Input, Select } from 'antd'
 import UploadImage from '@/components/UploadImage'
 import { filterPropsFunction, getAdvertType } from '../../../../utils'
 import SettingPanel from '../../../../components/SettingPanel'
@@ -193,9 +193,17 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
       return
     }
     setConfirmLoading(true)
-    saveAdvert(newProps).then(() => {
+    let newParam: any = JSON.parse(JSON.stringify(newProps))
+    newParam.advertList = newParam.advertList.map((item) => {
+      if (!item.link.startsWith('http://') && !item.link.startsWith('https://')) {
+        item.link = `http://${item.link}`
+      }
+      return item
+    })
+
+    saveAdvert(newParam).then(() => {
       changeProps({
-        props: newProps
+        props: newParam
       })
       clearSelectedStatus()
       setConfirmLoading(false)
@@ -263,6 +271,13 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
 
   }
 
+  const selectBefore = (
+    <Select defaultValue="http://" className="select-before">
+      <Select.Option value="http://">http://</Select.Option>
+      <Select.Option value="https://">https://</Select.Option>
+    </Select>
+  );
+
   return (
     <SettingPanel
       confirmLoading={confirmLoading}
@@ -304,7 +319,11 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
                       <div className={styles.advert_setting_line_addItem_line}>
                         <div className={styles.advert_setting_line_addItem_line_label}>链接</div>
                         <div className={styles.advert_setting_line_addItem_line_brief}>
-                          <Input className={styles.advert_setting_line_addItem_input} value={item.link} onChange={(e) => handleKeyChange(e.target.value, item.sort, 'link')} />
+                          <Input 
+                            className={styles.advert_setting_line_addItem_input} 
+                            value={item.link} 
+                            onChange={(e) => handleKeyChange(e.target.value, item.sort, 'link')} 
+                          />
                         </div>
                       </div>
                     </div>

src/pages/lxMall/information/components/breadCrumbs/index.less

@@ -35,7 +35,7 @@
       background-color: rgba(250, 250, 250, 1);
       box-shadow: none;
 
-      &:focus {
+      &:focus, &:active, &:hover {
         box-shadow: none;
       }
     }

src/pages/lxMall/information/components/breadCrumbs/index.tsx

@@ -20,15 +20,15 @@ const BreadCrumbs: React.FC<BreadCrumbsPropsType> = (props) => {
 
   const handlePreeEnter = (e) => {
     const { value } = e.target
-    history.push(getLink('/infomation/search', `?keyword=${value}`))
+    history.push(getLink('/infomation/search', `&keyword=${value}`))
   }
 
   const getLink = (path, param?) => {
     switch (layoutType) {
       case LAYOUT_TYPE.channel:
-        return `${GlobalConfig.channelRootRoute}${path}${param ? param : ''}&channelId=${shopUrlParam}`
+        return `${GlobalConfig.channelRootRoute}${path}?channelId=${shopUrlParam}${param ? param : ''}`
       case LAYOUT_TYPE.ichannel:
-        return `${GlobalConfig.ichannelRootRoute}${path}${param ? param : ''}&channelId=${shopUrlParam}`
+        return `${GlobalConfig.ichannelRootRoute}${path}?channelId=${shopUrlParam}${param ? param : ''}`
       default:
         return `${path}${param ? param : ''}`
     }