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

pages/activityPage.vue

@@ -234,7 +234,7 @@
         showAwadModal: true, // 根据活动时间是否展示中奖弹层以及查看昨日榜单逻辑
         yestodayAwards: '', // 昨日可获得
         token: '',
-        activityId: 2,    // 上线前等产品通知修改默认值
+        activityId: '',    // 上线前等产品通知修改默认值
 
         encryptId: '',    // 加密后的id，（分享传参用）
         serverTime: '',
@@ -665,6 +665,9 @@
         });
         this.$router.push({
           name: 'person-detail',
+          query: {
+            activityId: vm.activityId
+          }
         });
       },
       // 查看个人榜单

pages/person-detail/index.vue

@@ -120,7 +120,7 @@
       getPersonDetails() {
         getPersonDetails({
           pageNo: this.pageNo,
-          activityId: 2
+          activityId: this.$route.query.activityId
         }).then(res => {
           console.log(res)
           if(res.code == '000000') {

service/activityMainpage.js

@@ -9,10 +9,10 @@ export const getUserScoreInfo = () => {
 	return request({
     url: `campaign/ranking/user_info`,
     method: 'post',
-    // withCredentials: true,
-    headers: {
-      token: 'D3FFA515261C48478773C0BA17C11F52'
-    }
+    withCredentials: true,
+    // headers: {
+    //   token: 'D3FFA515261C48478773C0BA17C11F52'
+    // }
   })
 }
 
@@ -29,7 +29,7 @@ export const getBEServerTime = () => {
 // 获取已邀请的医生列表
 export const getInviteList = () => {
 	return request({
-    url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=10`,
+    url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=4`,
     method: 'get',
     withCredentials: true,
     // headers: {