diff --git a/pages/components/my-notice-item.vue b/pages/components/my-notice-item.vue
index 7e66b9d..614f7b4 100644
--- a/pages/components/my-notice-item.vue
+++ b/pages/components/my-notice-item.vue
@@ -12,7 +12,8 @@
- 评价
+ 评价
+
查看详情
@@ -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)
},
/**
* 查看通告详情
@@ -179,4 +181,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/mine/history/history.vue b/pages/mine/history/history.vue
index 69dd37a..f973846 100644
--- a/pages/mine/history/history.vue
+++ b/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
@@ -187,4 +192,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/mine/member/member-index.vue b/pages/mine/member/member-index.vue
index 1a47b15..74181d0 100644
--- a/pages/mine/member/member-index.vue
+++ b/pages/mine/member/member-index.vue
@@ -9,12 +9,12 @@
- {{ member.nickName }}
- {{ member.tfansNum }}关注
+ {{ member.nickName||'' }}
+ {{ member.tfansNum||'0' }}关注
- 认证{{ member.identityName }}
+ 认证{{(member.identityName||'')=='转发PR'?'ZFPR':member.identityName}}
未认证
@@ -49,7 +49,7 @@
-
+
@@ -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()
+ },
/**
* 关注、取消关注
@@ -432,4 +479,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/mine/set/evaluate.vue b/pages/mine/set/evaluate.vue
index 66faac5..908003e 100644
--- a/pages/mine/set/evaluate.vue
+++ b/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 {
@@ -284,4 +284,4 @@
.checklist-box {
margin-right: 10rpx !important;
}
-
\ No newline at end of file
+
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index e5df082..c1063ed 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -7,7 +7,7 @@
已报名：{{allImgNum||0}}人
+ :style="{height:(imageArray.length*((imageWidth-15)*2))+'rpx'}">
{{userDetail.nickName||''}}
- {{userDetail.identityType||''}}
+ {{(userDetail.identityType||'')=='转发PR'?'ZFPR':userDetail.identityType}}
@@ -56,8 +56,7 @@
奖励：
- 无稿费
- ¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||''}}
+ ¥{{noticeDetail.feeDown||'0'}}-{{noticeDetail.feeUp||'无上限'}}
@@ -1040,4 +1039,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/pages/notice/report-list.vue b/pages/notice/report-list.vue
index 76d52fc..49bf41c 100644
--- a/pages/notice/report-list.vue
+++ b/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;
diff --git a/static/mine/auth/zhuanfaPR.png b/static/mine/auth/zhuanfaPR.png
new file mode 100644
index 0000000..629902e
Binary files /dev/null and b/static/mine/auth/zhuanfaPR.png differ