拼团列表分享判断activityId

@@ -98,7 +98,7 @@ class GroupPurchaseContainer extends Component {
     }
 
     shareSnapshootAction(shareType,url) {
-        let fromPage = 'GroupPurchaseDetail';
+        let fromPage = 'GroupPurchase';
         let param = {
           shareType,
           imageUrl: url,
@@ -123,7 +123,13 @@ class GroupPurchaseContainer extends Component {
         if (!resource) {
           return;
         }
-        let miniProgramPath = '/pages/group/list?activityId=' + activityId;
+
+        let miniProgramPath;
+        if (activityId == null) {
+          miniProgramPath = '/pages/group/list?';
+        } else {
+           miniProgramPath = '/pages/group/list?activityId=' + activityId;
+        }
         miniProgramPath = Helper.joinWxProgramPath(miniProgramPath, groupListParams)
         
         let fromPage = 'GroupPurchase';

@@ -15,16 +15,29 @@ export default class groupPurchaseService {
 
     async fetchGroupProductList(activityId, page=1, limit=20, fromPage, listParams) {
 
-        return await this.api.get({
-            url: '',
-            body: {
+        let bodyParam;
+        if (activityId == null) {
+          bodyParam = {
+              method: 'app.collage.productList.page',
+              ...listParams,
+              page,
+              limit,
+              fromPage,
+          };
+        } else {
+          bodyParam = {
               method: 'app.collage.productList.page',
               ...listParams,
               page,
               limit,
               activityId,
               fromPage,
+          };
         }
+
+        return await this.api.get({
+            url: '',
+            body: bodyParam
         })
         .then((json) => {
             return json;