Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

components/normal-header.vue

@@ -4,7 +4,7 @@
     <header class="header-container">
       <img @click="goBack" src="~/assets/img/icon-back.png" alt="">
       {{title}}
-      <div class="btn-right" v-if="rightText">{{rightText}}</div>
+      <div class="btn-right" v-if="rightText" @click="rightBtnClick">{{rightText}}</div>
     </header>
   </section>
 </template>
@@ -44,6 +44,9 @@
         }else {
           this.$rocNative.goBack()
         }
+      },
+      rightBtnClick() {
+        this.$emit('handleRightBtn')
       }
     }
   }

pages/activityPage.vue

@@ -390,7 +390,7 @@
           let msecSixteen = new Date('2019/12/16 00:00:00').getTime();
           let msecThirty = new Date('2019/12/29 23:59:59').getTime();
           let notInActivityTips = (msec) => {
-            if( msec < msecSixteen || mesc > msecThirty ){
+            if( msec < msecSixteen || msec > msecThirty ){
               // alert('不在活动期间内')
               vm.scoreAwardTips = '不在活动期间内';
             }else{
@@ -893,7 +893,7 @@
             }
             setTimeout(() => {
               vm.canClockClick = true;
-            }, 1000)
+            }, 2000)
 
           }
         }else{  // 非打卡，直接走积木tims跳转逻辑
@@ -916,7 +916,7 @@
             }
             setTimeout(() => {
               vm.canClick = true;
-            }, 1000)
+            }, 2000)
           }
         }
       },

pages/invite-details/index.vue

@@ -178,7 +178,10 @@
           console.log(this.node1,this.node2)
         })
       },
-      goInvite() { // 去分享
+      goInvite() { // 去邀请
+        this.$sendBuriedData({
+          component_tag: `308#308001`
+        });
         let shareObj = wxShare;
         //处理分享链接需要的参数
 

pages/yesterday-prize/index.vue

@@ -3,7 +3,8 @@
     <normal-header
       :title="title"
       :rightText="rightText"
-      :backType="1">
+      :backType="1"
+      @handleRightBtn="rightBtn">
     </normal-header>
     <div class="prize-list" :style="{ marginTop: `${44+statusBarHeight}Px`,marginBottom: `${50+homeIndicatorHeight}Px`}">
       <div class="item" v-for="(item, index) in rewardsList">
@@ -67,6 +68,31 @@
           return require('../../assets/img/icon-copper.png')
         }
       },
+      rightBtn() {
+        let url = 'https://phome.yunqueyi.com/template_v2/?id=599';
+        let paramList = [
+          {
+            "key":"pageUrl",
+            "value": url,
+            "type":4,
+            "seqNo":1
+          }/*,{
+            "key":"showTitle",
+            "value": false,
+            "type":1,
+            "seqNo":2
+          },{
+            "key":"title",
+            "value": '',
+            "type":1,
+            "seqNo":3
+          }*/
+        ]
+        this.$rocNative.dispatchEventByModuleCode({
+          modeCode: 'M300',
+          jsonString: paramList
+        });
+      },
       getRewardList() {
         getYesterdayRanking().then(res => {
           if(res.code == '000000') {