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

apps/self/web/components/Recommand/index.tsx

@@ -113,6 +113,7 @@ const Recommand: React.FC<RecommandPropsType> = (props) => {
         categoryId,
         memberId,
         roleId,
+        shopId: mallInfo.id,
       }
 
       getTemplateAdornWebSelfMemberCategoryAdorn(param).then(res => {

apps/self/web/page/index/index.tsx

@@ -123,6 +123,7 @@ const Page: SFC<Props> = (props: Props): JSX.Element => {
         categoryId,
         memberId,
         roleId,
+        shopId: mallId,
       }
 
       getTemplateAdornWebSelfMemberCategoryAdorn(param).then(res => {

apps/srm/web/layout/shopLayout.tsx

@@ -90,9 +90,9 @@ const MallLayout: SFC<LayoutProps> = (
       <ShopTop
         shopMessage={{ ...shopMessage }}
         logo={mallInfo?.logoUrl}
-        shopId={shopMessage ? shopMessage.id : "1"}
+        shopId={shopMessage ? shopMessage.id : ""}
       />
-      <ShopNav shopId={shopMessage ? shopMessage.id : "1"} />
+      <ShopNav shopId={shopMessage ? shopMessage.id : ""} />
       <div className={styles.container}>
         {shopMessage
           ? props.children &&