Merge branch 'dev-new-campaign-0302' into 'release'

唤起app添加活动id  code reviewer : 张平

唤起app添加活动id  code reviewer : 张平

See merge request !9

pages/login-point/index.vue

@@ -180,6 +180,7 @@ export default {
                 taskId: this.taskId,
                 activityId: this.activityId
             };
+            
             pointResult(param).then(res => {
                 this.loadingFlag = false;
                 if(res.code == '000000') {
@@ -187,7 +188,7 @@ export default {
                         this.$toast('不能给自己点赞哦');
                     }else {
                         //this.$router.push({path: "/point-result",query: {code: res.data}});
-                        let routeData = this.$router.resolve({path: "/point-result",query: {code: res.data}});
+                        let routeData = this.$router.resolve({path: "/point-result",query: {code: res.data,activityId: this.activityId}});
                         let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + routeData.href
                         location.href = url;
                     }

pages/point-result.vue

@@ -31,6 +31,7 @@ export default {
             pointText2: "",
             btnText: "",
             code: '',
+            activityId: '',
             status: 1,
             isWeb: false,
             isWeixinWeb: false
@@ -38,6 +39,7 @@ export default {
     },
     created() {
         this.code = this.$route.query.code;
+        this.activityId = this.$route.query.activityId;
         if(this.code == '900002'){
             this.status = 1;
             this.pointText1 = "点赞成功";
@@ -86,7 +88,7 @@ export default {
         openApp() {
             // let path = window.location.origin + window.location.hash;
             const { NUXT_ENV_APP } = process.env;
-            let path = ENV_CONFIG[NUXT_ENV_APP]['shareUrl']  + `/campaign_ssr/`;
+            let path = ENV_CONFIG[NUXT_ENV_APP]['shareUrl']  + `/campaign_ssr/?id=${this.activityId}`;
             this.$callApp(path);
         },
         downloadApp() {

pages/ranks/index.vue

@@ -142,7 +142,7 @@ export default {
         // 全部奖品
         allAward(){
             const { NUXT_ENV_APP } = process.env;
-            let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=701';
+            let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=703';
             let itemData={
                 "title":"",
                 "imageUrl":"",