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

src/pages/pageCustomized/mallEdit/index.tsx

@@ -190,7 +190,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
         [String(initIndex + 6)]: {
           "componentName": "FloorLine.FloorHeader",
           "props": {
-            // linkdisable: true,
+            linkdisable: true,
             shopNum: categoryDetail.shopNum,
             goodsNum: categoryDetail.goodsNum
           },

src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx

@@ -20,7 +20,6 @@ interface CategoryRecommendSettingPropsType {
 }
 
 const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (props) => {
-  console.log(props)
   const { secondCategoryList = [], categoryAdvertPicUrl = '', onChange, templateid, categoryid } = props
   const [imgUrl, setImgUrl] = useState<string>(categoryAdvertPicUrl)
   const [selectKeys, setSelectKeys] = useState<number[]>([])

src/pages/pageCustomized/templateDetail/index.tsx

@@ -148,7 +148,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
         {
           type === 'mall' && (
             <Fragment>
-              <div className={cx(styles.btn, styles.renovation)} onClick={() => history.push(`/mall/template/edit?id=${id}&template=${detailInfo?.fileName}`)} >
+              <div className={cx(styles.btn, styles.renovation)} onClick={() => window.location.href = `/mall/template/edit?id=${id}&template=${detailInfo?.fileName}`} >
                 <LayoutOutlined />
                 <label>装修</label>
               </div>