Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

pages/person-detail/index.vue

@@ -28,8 +28,8 @@
         </div>
         <div class="awards-details">血压计 1 支/温度计 1 支/小米电视4C 2 台/米家洗衣机 1 台/米家冰箱 2 台/华为荣耀Play3 2 部</div>
       </div>-->
-      <div class="detail-list" v-if="personDetails.length" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
-        <div class="item" v-for="item in personDetails">
+      <div class="detail-list"  v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
+        <div class="item" v-for="item in personDetails" v-if="personDetails.length">
           <div class="left">
             <img :src="detailTaskIcon(item.resourceType)" alt="">
           </div>
@@ -46,7 +46,7 @@
             </div>
           </div>
         </div>
-        <div class="no-more" v-if="noMore">
+        <div class="no-more" v-if="noMore&&personDetails.length">
           <span class="line"></span>
           <span class="text">到底啦</span>
           <span class="line"></span>
@@ -135,8 +135,8 @@
                   this.noMore = true;
                 }
               } else {
-                if(res.data.hasNextPage) {
                 this.personDetails = this.personDetails.concat(res.data.personalDetails);
+                if(res.data.hasNextPage) {
                   this.busy = false;
                 } else {
                   this.noMore = true
@@ -145,7 +145,6 @@
             } else {
               this.personDetails = []
             }
-
           }
         })
       },

pages/shareActive.vue

@@ -100,7 +100,6 @@
     	}
 		},
 		mounted(){
-			alert(JSON.stringify(this.parsed))
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
   		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		this.checkCache();

pages/shareResult.vue

@@ -55,19 +55,25 @@
 <script>
 	import { wxShare } from '@/configs/wxShare';
 	export default {
-		asyncData({ query }){
-			const { status } = query; // 上个页面传递过来领取结果， false 为已领取， true 为领取成功
-			const statusTxt = (status=='true') ? '领取成功' : '您已领取';
-			return {
-				statusTxt
-			}
-		},
+		// asyncData({ query }){
+		// 	const { status } = query; // 上个页面传递过来领取结果， false 为已领取， true 为领取成功
+		// 	const statusTxt = (status=='true') ? '领取成功' : '您已领取';
+		// 	return {
+		// 		statusTxt
+		// 	}
+		// },
 		data(){
 			return {
 				shareObj: wxShare,
+				statusTxt: ''
 			}
 		},
 		mounted(){
+			if(this.$route.query.status.toString()=='true'){
+				this.statusTxt = '领取成功';
+			}else{
+				this.statusTxt = '您已领取';
+			}
   		document.querySelector('body').setAttribute('style', 'background: "";');
   		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		// 微信分享

service/index.js

@@ -56,8 +56,11 @@ export const checkToken = async (token) => {
 // 获取邀请人的头像和名字信息
 export const getInviteInfo = async (id) => {
   return request({
-    url: `campaign/inviteOne/info?id=${id}`,
-    method: 'get'
+    url: `campaign/inviteOne/info`,
+    method: 'get',
+    params: {
+      id
+    }
   })
 }