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

package.json

@@ -69,7 +69,7 @@
     "@linkseeks/design-core": "^1.0.0",
     "@linkseeks/design-react": "^1.0.0",
     "@linkseeks/design-react-web": "^1.0.0",
-    "@linkseeks/design-ui": "^1.0.0",
+    "@linkseeks/design-ui": "^1.0.2",
     "@turf/turf": "^6.4.0",
     "@types/crypto-js": "^4.0.1",
     "@types/js-cookie": "^2.2.6",

src/pages/mobileTemplate/channelTemplateEdit/index.tsx

@@ -188,6 +188,17 @@ const mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
     return '';
   };
 
+  const getGroupLabel = (info: any) => {
+    if (!info || !info?.activityList) return ''
+    let label = ''
+    info.activityList.forEach((item) => {
+      if (item.id === info.activityId) {
+        label = item.label
+      }
+    })
+    return label
+  }
+
   const getComponentsConfig = async () => {
     try {
       const appConfig = await getAppChannelConfig();
@@ -686,6 +697,7 @@ const mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
                         detail: {
                           title: item.productName,
                           img: item.productImgUrl,
+                          label: getGroupLabel(item),
                           originalPrice: priceFormat(item.price),
                           discountPrice: priceFormat(item.activityPrice),
                           endTime: 1627372487509,

src/pages/mobileTemplate/ownMallTemplateEdit/index.tsx

@@ -188,6 +188,17 @@ const OwnMallTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
     }
   };
 
+  const getGroupLabel = (info: any) => {
+    if (!info || !info?.activityList) return ''
+    let label = ''
+    info.activityList.forEach((item) => {
+      if (item.id === info.activityId) {
+        label = item.label
+      }
+    })
+    return label
+  }
+
   const getComponentsConfig = async () => {
     try {
       const appConfig = await getAppConfig();
@@ -687,6 +698,7 @@ const OwnMallTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
                         detail: {
                           title: item.productName,
                           img: item.productImgUrl,
+                          label: getGroupLabel(item),
                           originalPrice: item.activityPrice ? priceFormat(item.price) : undefined,
                           discountPrice: priceFormat(item.activityPrice ? item.activityPrice : item.price),
                           endTime: 1627372487509,

src/pages/mobileTemplate/shopTemplateEdit/index.tsx

@@ -250,6 +250,17 @@ const  mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
     return listRes
   }
 
+  const getGroupLabel = (info: any) => {
+    if (!info || !info?.activityList) return ''
+    let label = ''
+    info.activityList.forEach((item) => {
+      if (item.id === info.activityId) {
+        label = item.label
+      }
+    })
+    return label
+  }
+
   const getComponentsConfig = async () => {
     try {
       const appConfig = await getAppShopConfig()
@@ -775,6 +786,7 @@ const  mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
                         detail: {
                           title: item.productName,
                           img: item.productImgUrl,
+                          label: getGroupLabel(item),
                           originalPrice: item.activityPrice ? priceFormat(item.price) : undefined,
                           discountPrice: priceFormat(item.activityPrice ? item.activityPrice : item.price),
                           endTime: 1627372487509,