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/bussiness/detail-list.vue

@@ -2,20 +2,22 @@
   <div class="detail-list br">
     <div v-if="dataList.length">
       <ul>
-        <li class="list" v-for="(item, index) in dataList" :key="index">
-          <!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信-->
-          <img v-if="item.resourceType == 1" src="../../static/images/task-two.png" /> 
-          <img v-if="item.resourceType == 3" src="../../static/images/task-five.png" /> 
-          <img v-if="item.resourceType == 7" src="../../static/images/task-one.png" /> 
-          <img v-if="item.resourceType == 8" src="../../static/images/task-three.png" />
-          <img v-if="item.resourceType == 9" src="../../static/images/task-four.png" />
-          <img v-if="item.resourceType == 10" src="../../static/images/task-six.png" />
-          <ul class="desc">
-            <li class="text">{{item.taskName}}</li>
-            <li class="time">{{item.sortFinishTime}}</li>
-          </ul>
-          <span class="score"><span>+{{getRewardType(item.timsRewardResp)}}</span>勤奋分</span>
-        </li>
+        <div v-for="(item, index) in dataList" :key="index">
+          <li class="list" v-if="item.timsRewardResp[0].rewardType == 3">
+            <!-- 1.课程 2.考试 3.调查问卷 4.患者招募 5.宣教漫画 6.打卡 7.邀请 8.任务排查 9.绑定居民到微信 10.首次进入 11.邀请点赞-->
+              <img v-if="item.resourceType == 1" src="../../static/images/task-two.png" /> 
+              <img v-if="item.resourceType == 3" src="../../static/images/task-five.png" /> 
+              <img v-if="item.resourceType == 11" src="../../static/images/task-one.png" /> 
+              <img v-if="item.resourceType == 8" src="../../static/images/task-three.png" />
+              <img v-if="item.resourceType == 9" src="../../static/images/task-four.png" />
+              <img v-if="item.resourceType == 10" src="../../static/images/task-six.png" />
+              <ul class="desc">
+                <li class="text">{{item.taskName}}</li>
+                <li class="time">{{item.sortFinishTime}}</li>
+              </ul>
+              <span class="score"><span>+{{getRewardType(item.timsRewardResp)}}</span>勤奋分</span>
+          </li>
+        </div>
       </ul>
       <DetailBtn 
       style="margin-top: 30px;" 

components/header/index.vue

@@ -103,7 +103,7 @@ export default {
       let shareUrl = '';
       const { NUXT_ENV_APP } = process.env;
       const { tempId, taskId, userName, encryptId, avatarl, token, shareTitle1, shareTitle2, shareIconUrl } = this;
-      shareUrl = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + `/compaign_ssr/login-point?activityId=${tempId}&taskId=${taskId}&id=${userId}&name=${userName}&avatar=${avatarl}`;
+      shareUrl = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + `/compaign_ssr/login-point?activityId=${tempId}&taskId=${taskId}&id=${encryptId}&name=${userName}&avatar=${avatarl}`;
       //shareUrl = `http://10.177.10.217:3000/compaign_ssr/login-point?activityId=${tempId}&taskId=${taskId}&id=${encryptId}&name=${userName}&avatar=${avatarl}`;
       this.$rocNative.shareWechat({
         type: 6,

components/task-activity.vue

@@ -144,16 +144,9 @@ export default {
             let self = this;
             let req = null;
             let {acTempId, acToken} = this;
-            if(self.isWeb) {
-                req = {
-                    id: acTempId,
-                    token: getCookie('token') || '2B7FA4D845C74D7EA3183F9E316630C6'
-                }
-            }else {
-                req = {
-                    id: acTempId,
-                    token: acToken
-                }
+            req = {
+                id: acTempId,
+                token: getCookie('token')
             }
             getNewActivityDesc({ id: req.id, token: req.token }).then(res => {
                 if(res.code == '000000') {
@@ -171,6 +164,9 @@ export default {
                         if(this.taskList[i].resourceType == 11 && this.taskList[i].resourceId == 1) {
                             this.$emit('getTaskId',{taskId: this.taskList[i].id});
                         }
+                        if(this.taskList[i].resourceType == 11 && this.taskList[i].resourceId == 2) {
+                            this.$emit('getNewTaskId',{taskId: this.taskList[i].id});
+                        }
                         if(this.taskList[i].resourceType == 10) {
                             let score = JSON.parse(this.taskList[i].rewardJsonInfo)[0].rewardQuantity;
                             this.$emit('firstEnterActivity',{firstEnterScore: score});

pages/index.vue

@@ -57,6 +57,7 @@
         :acTempId="activityId"
         @activityTaskJump="activityTaskJump"
         @getTaskId="getTaskId" 
+        @getNewTaskId="getNewTaskId"
         @firstEnterActivity="firstEnterActivity"/>
       </div>
       <div class="step bt">
@@ -141,7 +142,7 @@ export default {
       shareTitle1: '',
       shareTitle2: '做任务瓜分500W云鹊豆，点一下你也能获得75分哦',
       shareTitle3: '',
-      shareTitle4: '',
+      shareTitle4: '绑定专属医生，随时接收医生的信息和问诊资讯。',
       shareIconUrl: 'https://file.yunqueyi.com/h5/images/commons/share_hd1.png',
       isScroll: false,
       imgSrc1: require('@/static/images/score.png'),
@@ -269,12 +270,36 @@ export default {
           _this.userId = res.data.id;
           _this.userName = res.data.name;
           _this.shareTitle1 = `${_this.userName}医生邀请您为他助力`;
+          _this.shareTitle3 = `${_this.userName}医生邀请您绑定`;
         }
       })
     },
     // 查看活动规则
     ruleDetail() {
-      // this.$router.push({path: "/login-point/point-result",query: {}});
+      const { NUXT_ENV_APP } = process.env;
+      let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=701';
+      let itemData={
+          "title":"",
+          "imageUrl":"",
+          "appModuleInfo":{
+              "code":"M300",
+              "type":4,
+              "name":"wwww",
+              "paramFlag":1,
+              "paramList":[
+                  {
+                      "key":"pageUrl",
+                      "value": url,
+                      "type":4,
+                      "seqNo":1
+                  }
+              ]
+          }
+      };
+      rocNative.dispatchEventByModuleCode({
+          modeCode: itemData.appModuleInfo.code,
+          jsonString: itemData.appModuleInfo.paramList
+      })
     },
     // 查看排名
     gotoRank() {
@@ -305,11 +330,14 @@ export default {
     // 获取点赞任务id
     getTaskId(data) {
       this.taskId = data.taskId;
-      this.inviteFirstEnter();
+    },
+    // 邀请进入
+    getNewTaskId(data) {
+      this.inviteFirstEnter(data.taskId)
     },
     // 点赞后进入活动主页
-    inviteFirstEnter() {
-      inviteFirstEnter({taskId: this.taskId, activityId: this.activityId}).then(res => {});
+    inviteFirstEnter(a) {
+      inviteFirstEnter({taskId: a, activityId: this.activityId}).then(res => {});
     },
     // 活动任务
 		activityTaskJump(data) {

pages/ranks/index.vue

@@ -22,12 +22,12 @@
                 </div>
             </div>
             <div class="rank-detail">
-                <div class="rank-num" v-if="rank != 1">
+                <div class="rank-num" v-if="firstScore">
                     <span class="dlot"></span>
                     <span class="num">前一名：<span class="score">{{firstScore}}</span>勤奋分</span>
                 </div>
-                <div class="line" v-if="rank != 1"></div>
-                <div class="rank-num">
+                <div class="line" v-if="firstScore && lastScore"></div>
+                <div class="rank-num" v-if="lastScore">
                     <span class="dlot"></span>
                     <span class="num">后一名：<span class="score">{{lastScore}}</span>勤奋分</span>
                 </div>
@@ -67,6 +67,7 @@
 <script>
 import Header from '../../components/header';
 import DetailBtn from '../../components/bussiness/detail-btn';
+import { ENV_CONFIG } from '@/utils/enumerate';
 import { getRankData, getSelfAllScore } from '@/service';
 export default {
     components: {
@@ -135,7 +136,30 @@ export default {
         },
         // 全部奖品
         allAward(){
-            
+            const { NUXT_ENV_APP } = process.env;
+            let url = ENV_CONFIG[NUXT_ENV_APP]['shareUrl'] + '/template_v2/?id=701';
+            let itemData={
+                "title":"",
+                "imageUrl":"",
+                "appModuleInfo":{
+                    "code":"M300",
+                    "type":4,
+                    "name":"wwww",
+                    "paramFlag":1,
+                    "paramList":[
+                        {
+                            "key":"pageUrl",
+                            "value": url,
+                            "type":4,
+                            "seqNo":1
+                        }
+                    ]
+                }
+            };
+            rocNative.dispatchEventByModuleCode({
+                modeCode: itemData.appModuleInfo.code,
+                jsonString: itemData.appModuleInfo.paramList
+            })
         },
         goBack() {
             this.$sendBuriedData({