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

pages/components/my-notice-item.vue

@@ -12,7 +12,8 @@
 			</view>
 			<!-- 操作按钮 -->
 			<view class="opt-button-box">
-				<view class="opt-item" v-if="item.signStatus=='已通过'" @click="evaluate(item)">评价</view>
+				<view class="opt-item" v-if="item.signStatus=='已通过'&&item.isEvaluate == 0" @click="evaluate(item)">评价
+				</view>
 				<view class="opt-item" @click="goDetail(item)">查看详情</view>
 			</view>
 		</view>
@@ -88,7 +89,8 @@
 		},
 		methods: {
 			evaluate(item) {
-				this.$tab.navigateTo('/pages/mine/set/evaluate?userType=01&toUserId=' + item.userId)
+				this.$tab.navigateTo('/pages/mine/set/evaluate?userType=01&toUserId=' + item.userId + "&signId=" + item
+					.signId)
 			},
 			/**
 			 * 查看通告详情

pages/mine/history/history.vue

@@ -32,6 +32,7 @@
 	import {
 		getHisList
 	} from '@/api/business/notice.js'
+	import rightsCode from '@/utils/rightsCode'
 	export default {
 		components: {
 			navigationBarVue,
@@ -56,10 +57,14 @@
 			this.initData("dl_blogger_type", "bloggerTypeList")
 			this.selectDataList()
 		},
-		onLoad: function() {
+		onShow: function() {
-
+			this.getMaxNum()
 		},
 		methods: {
+			async getMaxNum() {
+				let res = await hasRights(rightsCode.history)
+				this.maxHisNum = res.remaining
+			},
 			/**
 			 * 初始化数据
 			 * @param {Object} code

pages/mine/member/member-index.vue

@@ -9,12 +9,12 @@
 				</view>
 				<view class="people-name-box">
 					<view class="name-box">
-						<view class="name-dom">{{ member.nickName }}</view>
+						<view class="name-dom">{{ member.nickName||'' }}</view>
-						<view class="fans-dom">{{ member.tfansNum }}关注</view>
+						<view class="fans-dom">{{ member.tfansNum||'0' }}关注</view>
 					</view>
 					<view v-if="null != member.identityName" class="renzheng-dom">
 						<image src="@/static/mine/auth/renzhen.png" mode="aspectFit"></image>
-						认证{{ member.identityName }}
+						认证{{(member.identityName||'')=='转发PR'?'ZFPR':member.identityName}}
 					</view>
 					<view v-else class="renzheng-dom">
 						未认证
@@ -49,7 +49,7 @@
 			<view class="data-list-box">
 				<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="onReachBottomCus" refresher-enabled
 					@refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-					<notice-item v-if="dataList.length>0" :dataList="dataList"></notice-item>
+					<notice-item @goDetail="goDetail" v-if="dataList.length>0" :dataList="dataList"></notice-item>
 					<view style="text-align: center" v-if="dataList.length==0">
 						<image class="" src="@/static/images/nothing.png"></image>
 					</view>
@@ -63,11 +63,15 @@
 	import {
 		toast
 	} from '@/utils/common.js'
+	import {
+		getJSONData
+	} from '@/utils/auth.js';
 	import {
 		queryListByUserId
 	} from '@/api/business/notice.js'
 	import {
-		announcerDetail
+		announcerDetail,
+		dealMemberRights
 	} from '@/api/business/member.js'
 	import noticeItem from '@/pages/components/notice-item.vue'
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
@@ -78,6 +82,10 @@
 	import {
 		getNoticeDetail
 	} from '@/api/business/notice';
+	import {
+		getUserType
+	} from '@/utils/common.js'
+	import constant from '@/utils/constant';
 	export default {
 		components: {
 			navigationBarVue,
@@ -115,6 +123,45 @@
 		},
 
 		methods: {
+			/**
+			 * 查看通告详情
+			 * @param {Object} item
+			 */
+			goDetail(item) {
+				let userInfo = getJSONData(constant.userInfo)
+				if (!userInfo) {
+					store.dispatch('LogOut').then(res => {
+						uni.reLaunch({
+							url: '/pages/login'
+						})
+					})
+				} else {
+
+					let userType = getUserType()
+					let param = {
+						userId: userInfo.userId,
+						userType: userType,
+						noticeId: item.id,
+						rightsCode: 'unlock_notice',
+						deplete: 1
+					}
+					dealMemberRights(param).then(res => {
+						if (res.code == 200) {
+							this.$tab.navigateTo(`/pages/notice/detail?id=${item.id}`)
+						}
+					}).catch((e) => {
+						uni.showToast({
+							icon: 'error',
+							duration: 2000,
+							title: e
+						});
+					})
+				}
+			},
+			/**扣除解锁通告权益*/
+			dealMemberRights() {
+				dealMemberRights()
+			},
 
 			/**
 			 * 关注、取消关注

pages/mine/set/evaluate.vue

@@ -69,13 +69,13 @@
 				readBookList: [{
 					text: '匿名评价',
 					value: '1'
-				}],
+				}]
 			}
 		},
 		onLoad(option) {
 			this.dataObj.toUserId = option.toUserId
 			this.dataObj.userType = option.userType
-			this.dataObj.userType = option.userType
+			this.dataObj.signId = option.signId
 			if (option.userType == '01') {
 				option.toUserType = '02'
 			} else {

pages/notice/detail.vue

@@ -7,7 +7,7 @@
 			<view class="info-box notice-detail" v-if="viewMy">
 				<view class="detail-title">已报名：{{allImgNum||0}}人</view>
 				<view class="image-box" v-if="imageArray.length>0"
-					:style="{height:(imageArray.length*(imageWidth*2))+'rpx'}">
+					:style="{height:(imageArray.length*((imageWidth-15)*2))+'rpx'}">
 					<view class="image-row" v-for="(row,rowIndex) in imageArray">
 						<image v-for="(item,i) in row" v-if="!item"
 							:style="{ top:(imageWidth+10)*rowIndex+'rpx',left:imageWidth*i+'rpx'}"
@@ -29,7 +29,7 @@
 					mode="scaleToFill"></image>
 				<view class="name-info">
 					<view class="name">{{userDetail.nickName||''}}</view>
-					<view class="text">{{userDetail.identityType||''}}</view>
+					<view class="text">{{(userDetail.identityType||'')=='转发PR'?'ZFPR':userDetail.identityType}}</view>
 				</view>
 				<view class="fork-info">
 					<view class="up-box">
@@ -56,8 +56,7 @@
 							奖励：
 						</view>
 						<view class="dl-value">
-							<text v-if="null==noticeDetail.feeUp">无稿费</text>
+							<text>¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||'无上限'}}</text>
-							<text v-else>¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||''}}</text>
 						</view>
 					</view>
 					<view class="dl-item">

pages/notice/report-list.vue

@@ -234,6 +234,7 @@
 			 * 下拉刷新数据
 			 */
 			onRefresherrefresh() {
+				console.log("刷新")
 				let queryData = {}
 				if (this.menuIndex == 0) {
 					queryData = this.waitingParams
@@ -343,7 +344,7 @@
 
 		.content {
 			border-top: 1rpx solid #F4F4F4;
-			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 195rpx);
+			height: 100%;
 			overflow-y: scroll;
 			width: 100%;
 			background-color: #F2F2F2;
@@ -388,7 +389,7 @@
 			}
 
 			.data-list-box {
-				flex: 1;
+				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 270rpx);
 				padding: 20rpx 30rpx;
 				display: flex;
 				flex-direction: column;