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

src/pages/mobileTemplate/ownMallTemplateEdit/index.tsx

@@ -195,7 +195,7 @@ const OwnMallTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
       const _mallLayoutConfig: any = cloneDeep(channelLayoutConfig);
       const allState = {
         top: defaultHeaderNavData,
-        channelName: webMallInfo.name,
+        channelName: webMallInfo?.name,
         categoryList: await getFirstCategoryList(),
         navList: appConfig?.navList ? appConfig?.navList.details : [],
         advert: appConfig?.advert ? appConfig?.advert.details : [],

src/pages/mobileTemplate/ownMallTemplateEdit/preview.tsx

@@ -209,7 +209,7 @@ const OwnMallTempletePreview: React.FC<ShopPreviewPropsType> = props => {
       const _mallLayoutConfig: any = cloneDeep(channelLayoutConfig);
       const allState = {
         top: defaultHeaderNavData,
-        channelName: webMallInfo.name,
+        channelName: webMallInfo?.name,
         categoryList: await getFirstCategoryList(),
         navList: appConfig?.navList ? appConfig?.navList.details : [],
         advert: appConfig?.advert ? appConfig?.advert.details : [],

src/pages/ownMall/ownMallManager/ownMallAboutUs/index.tsx

@@ -117,10 +117,9 @@ const OwnMallAboutUs = () => {
       const { albumUrls, ...rest } = values
       const params = {
         ...rest,
-        albumName: albumUrls[0]?.name,
-        albumUrl: albumUrls[0]?.url
+        albumName: albumUrls?.[0]?.name,
+        albumUrl: albumUrls?.[0]?.url
       }
-      console.log(`params`, params)
       setSaveLoading(true)
       PublicApi.postTemplateWebMemberSelfWebSaveCurrMemberSelf(params).then(res => {
         if (res.code === 1000) {

src/pages/ownMall/ownMallManager/templateDetail/index.tsx

@@ -129,7 +129,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
           <label>商城装修</label>
         </div>
         {
-          detailInfo?.environment === 4 && (
+          (detailInfo?.environment === 4 || detailInfo?.environment === 3) && (
             <div className={cx(styles.btn, styles.fit)} onClick={() => handleCategoryJump()}>
               <LayoutOutlined />
               <label>品类导航页装修</label>