Merge branch 'fix-0318' into 'v2-220318'

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

@@ -72,8 +72,8 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
 
     getTemplateWebPageTemplateWebFindSelfTemplateDetails(param).then(async (res) => {
       if (res.code === 1000) {
-        await getMemberShopAll(res.data.environment, res.data.property)
         setDetailInfo(res.data)
+        await getMemberShopAll(res.data.environment, res.data.property)
       }
     })
   }
@@ -102,7 +102,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const handleLinkEdit = () => {
     if(detailInfo?.environment === 1) {
       // 自营商城装修
-      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/edit?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${ detailInfo.selfShopId || detailInfo.shopId}&property=${detailInfo?.property}`
+      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/edit?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${shopId}&property=${detailInfo?.property}`
     } else if ([2, 3, 4].includes(detailInfo?.environment)) {
       // 自营商城装修
       window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/mobile/edit?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${shopId}&environment=${detailInfo?.environment}&property=${detailInfo?.property}`
@@ -114,9 +114,9 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const handleLinkPreview = () => {
     const shopId = detailInfo?.shopId || detailInfo?.sourceShopId
     if(detailInfo?.environment === 1) {
-      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${detailInfo.selfShopId || detailInfo.shopId}&property=${detailInfo?.property}`
+      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${shopId}&property=${detailInfo?.property}`
     } else if ([2, 3, 4].includes(detailInfo?.environment)) {
-      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/mobile/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${detailInfo.selfShopId || detailInfo.shopId}&environment=${detailInfo?.environment}&property=${detailInfo?.property}`
+      window.location.href = `/memberCenter/ownMallAbility/ownMallManager/template/mobile/preview?id=${detailInfo.id}&template=${detailInfo.fileName}&shopId=${shopId}&environment=${detailInfo?.environment}&property=${detailInfo?.property}`
     } else {
       message.info(intl.formatMessage({ id: 'shop.template.preview.tip' }))
     }