Merge branch 'dev-new-campaign-0302' of...

Merge branch 'dev-new-campaign-0302' of 192.168.110.53:com.pica.cloud.education.frontend/pica-new-compaign into dev-new-campaign-0302

components/task-activity.vue

@@ -146,7 +146,8 @@ export default {
                             this.$emit('getTaskId',{taskId: this.taskList[i].id});
                         }
                         if(this.taskList[i].resourceType == 10) {
-                            this.$emit('firstEnterActivity',{taskId: this.taskList[i].id});
+                            let score = JSON.parse(this.taskList[i].rewardJsonInfo)[0].rewardQuantity;
+                            this.$emit('firstEnterActivity',{firstEnterScore: score});
                         }
                     }
                 }

pages/index.vue

@@ -184,7 +184,7 @@ export default {
     _this.getActivityTime();
   },
   methods: {
-    // 获取时间
+    // 获取服务器当前时间
     getActivityTime() {
       getActivityTime().then(res => {
         if(res.code == '000000') {
@@ -197,7 +197,7 @@ export default {
       });
     },
     // 首次进入活动页面
-    firstEnterActivity() {
+    firstEnterActivity(data) {
       checkFirstEnter({
         activityId: this.activityId
       }).then(res => {
@@ -252,15 +252,19 @@ export default {
     },
     // 查看活动规则
     ruleDetail() {
-      this.$router.push({path: "/login-point/point-result",query: {}});
+      // this.$router.push({path: "/login-point/point-result",query: {}});
     },
     // 查看排名
     gotoRank() {
+      if(getCookie('token')) {
         let queryData = {
             id: this.activityId,
             token: this.token
         };
         this.$router.push({path: "/ranks",query: queryData});
+      }else {
+        this.$rocNative.goToLogin();
+      }
     },
     // 去登录
     goToLogin() {
@@ -284,7 +288,7 @@ export default {
 		activityTaskJump(data) {
       let shareUrl = '';
       const { NUXT_ENV_APP } = process.env;
-      if(data.resourceType == 7) {  // 邀请好友点赞
+      if(data.resourceType == 11) {  // 邀请好友点赞
         const { tempId, token, encryptId, userName, myAvatarl, shareTitle1, shareTitle2, shareIconUrl } = this;
         //shareUrl = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/compaign_ssr/?id=' + tempId + '&token=' + token;
         shareUrl = `http://10.177.10.217:3000/compaign_ssr/login-point?activityId=${tempId}&taskId=${data.id}&id=${encryptId}&name=${userName}&avatar=${myAvatarl}`;

pages/ranks/index.vue

@@ -17,8 +17,8 @@
                     </div>
                 </div>
                 <div class="info-score">
-                    <p>{{rank}}</p>
-                    <span>我的排名</span>
+                    <p>{{rank}}<span v-if="rank > 100">+</span></p>
+                    <span class="text">我的排名</span>
                 </div>
             </div>
             <div class="rank-detail">
@@ -181,10 +181,17 @@ export default {
             .info-score {
                 color: #FFE8A5;
                 p {
+                    position: relative;
                     font-size: 26px;
                     text-align: center;
-                }
                     span {
+                        position: absolute;
+                        right: 0;
+                        top: 0;
+                        font-size: 14px;
+                    }
+                }
+                span.text {
                     display: inline-block;
                     width: 68px;
                     height: 18px;

plugins/vue-inject.js

@@ -27,7 +27,7 @@ import {
 
 const { name } = require('../package.json');
 const cookies = require('cookie-universal')();
-// const { NUXT_ENV_APP } = process.env;
+const { NUXT_ENV_APP } = process.env;
 
 if(!(process.env.NODE_ENV === 'uat' || process.env.NODE_ENV === 'pro')) {
 // if(!(process.env.BUILD_ENV === 'pro')) {