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

api/business/member.js

@@ -176,4 +176,12 @@ export function pointList(params) {
 		method: 'get',
 		params: params
 	})
+}
+//新增黑名单
+export function saveBlack(data) {
+	return request({
+		url: '/member/blacklist/saveBlack',
+		method: 'post',
+		data: data
+	})
 }

pages/mine/member/member-index.vue

@@ -12,14 +12,17 @@
 						<view class="name-dom">{{ member.nickName }}</view>
 						<view class="fans-dom">{{ member.tfansNum }}关注</view>
 					</view>
-					<view class="renzheng-dom">
+					<view v-if="null != member.identityName" class="renzheng-dom">
 						<image src="@/static/mine/auth/renzhen.png" mode="aspectFit"></image>
             认证{{ member.identityName }}
 					</view>
+          <view v-else class="renzheng-dom">
+            未认证
+          </view>
 				</view>
 				<view class="opt-box">
-					<view class="lahei">拉黑</view>
-					<view class="guanzhu">关注</view>
+					<view class="guanzhu" v-if="!isLove" @click="forkUser('1')">关注</view>
+					<view class="guanzhu" v-if="isLove" @click="forkUser('0')">取消关注</view>
 				</view>
 			</view>
 <!--			<view class="bozhu-type-box">-->
@@ -61,6 +64,7 @@
 	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'
 	export default {
 		components: {
 			navigationBarVue,
@@ -80,19 +84,48 @@
         userId:null,
 				total: 0,
 				//下来刷新状态
-				isTriggered: false
+				isTriggered: false,
+        //当前用户是否关注该博主
+        isLove: false,
 			}
 		},
 
     onLoad(option){
 		  this.userId = option.userId
       this.queryParams.userId = option.userId
+      this.isLove = option.isLove
       this.initMember()
       this.initNotice()
     },
 
 		methods: {
 
+      /**
+       * 关注、取消关注
+       * @param {Object} isLove
+       */
+      forkUser(isLove) {
+        postForkUser({
+          userId: this.userId,
+          isLove: isLove
+        }).then(res => {
+          if (res.code == 200) {
+            uni.showToast({
+              icon: 'success',
+              duration: 2000,
+              title: '操作成功'
+            });
+            this.isLove = isLove == '1'
+          }
+        }).catch((e) => {
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
+        })
+      },
+
 		  /**出初始化通告主详情*/
 		  initMember(){
         announcerDetail(this.userId).then(res=>{

pages/notice/detail.vue

@@ -401,7 +401,7 @@
 					.noticeId)
 			},
 			goMemberIndex() {
-				this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId)
+				this.$tab.navigateTo('/pages/mine/member/member-index?userId=' + this.userDetail.userId + '&isLove' + this.isLove)
 			},
 			/**
 			 * 去报名列表
@@ -472,12 +472,15 @@
 			 * @param {Object} index
 			 */
 			selectShare(dataObj) {
+			  console.log(dataObj,'dataObje')
 				if ('hb' == dataObj.item.name) {
 					//海报
 					this.$refs.canvas.canvasCreate();
 				} else if ('wx' == dataObj.item.name) {
 					this.onShareAppMessage()
-				}
+				} else if ('jb' == dataObj.item.name){
+				  this.goReportForm()
+        }
 			},
 			/**
 			 * 微信分享