Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

# Conflicts:
#	pages/mine/member/member-index.vue

pages/mine/member/member-index.vue

@@ -71,10 +71,9 @@
 	} from '@/api/business/member.js'
 	import noticeItem from '@/pages/components/notice-item.vue'
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
-	import config from '@/config'
-	import {
-		postForkUser
-	} from '@/api/business/base.js'
+  import config from '@/config'
+  import {postForkUser} from '@/api/business/base.js'
+  import {getNoticeDetail} from '@/api/business/notice';
 	export default {
 		components: {
 			navigationBarVue,
@@ -95,18 +94,21 @@
 				total: 0,
 				//下来刷新状态
 				isTriggered: false,
-				//当前用户是否关注该博主
-				isLove: false,
+        //当前用户是否关注该博主
+        isLove: false,
+        noticeId:null,
 			}
 		},
 
-		onLoad(option) {
-			this.userId = option.userId
-			this.queryParams.userId = option.userId
-			this.isLove = option.isLove
-			this.initMember()
-			this.initNotice()
-		},
+    onLoad(option){
+		  console.log(option,'option')
+		  this.userId = option.userId
+      this.queryParams.userId = option.userId
+      this.noticeId = option.noticeId
+      this.initMember()
+      this.initNotice()
+      this.getDetail()
+    },
 
 		methods: {
 
@@ -136,6 +138,26 @@
 				})
 			},
 
+      /**
+       * 查通告详情
+       */
+      getDetail() {
+        getNoticeDetail({
+          noticeId: this.noticeId
+        }).then(res => {
+          if (res.code == 200) {
+            this.isLove = res.data.isLove
+          }
+        }).catch((e) => {
+          this.isTriggered = false
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
+        })
+      },
+
 			/**出初始化通告主详情*/
 			initMember() {
 				announcerDetail(this.userId).then(res => {

pages/notice/detail.vue

@@ -457,8 +457,8 @@
 					.noticeId)
 			},
 			goMemberIndex() {
-				this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '&isLove' + this
-					.isLove)
+				this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '&noticeId=' + this
+            .noticeId)
 			},
 			/**
 			 * 去报名列表