Merge branch 'feature' into 'dev'

活动规则分享

See merge request !13

src/views/jiedao/profile/components/IntegralActivity.vue

@@ -56,8 +56,8 @@ export default {
       if (item.type == 3) {
         return `${this.locale === 'zh_CN' ? item.extraRecommend.shareContentZh : item.extraRecommend.shareContentEn} ${item.recommendUrl} `
       } else if (item.type == 4) {
-        return `${this.locale === 'zh_CN' ? item.titleZh
-          : item.titleEn} ${item.extraShare.activityUrl} `
+        return `${this.locale === 'zh' ? item.titleZh
+          : item.titleEn} ${item.extraShare.activityUrl}?id=${item.id}&memberId=${this.$store.getters.id}&language=${this.locale == 'zh_CN' ? 'zh' : 'en'}`
       }
     },
     // 复制按钮