diff --git a/api/business/member.js b/api/business/member.js index 1f137e9..241ea0b 100644 --- a/api/business/member.js +++ b/api/business/member.js @@ -8,6 +8,20 @@ export function bloggerDetail(userId) { url: '/member/member/bloggerDetail/' + userId, method: 'get' }) +export function queryDetail(params) { + return request({ + url: '/member/member/queryDetail', + method: 'get', + params:params + }) +} +//保存博主 +export function uniSaveMember(data) { + return request({ + url: '/member/member/uniSaveMember', + method: 'post', + data:data + }) } @@ -99,10 +113,11 @@ export function getById(params) { params: params }) } + //获取会员权益 export function selectMemberRights() { return request({ url: '/member/card/selectMemberRights', method: 'get' }) -} \ No newline at end of file +} diff --git a/config.js b/config.js index f5f68c1..70005e5 100644 --- a/config.js +++ b/config.js @@ -27,6 +27,12 @@ module.exports = { }, { title: "认证指南", code: "user_auth_text" + }, { + title: "了解通告券", + code: "coupon_text" + }, { + title: "通告券购买协议", + code: "coupon_agreement" } ] } diff --git a/pages.json b/pages.json index a54c47a..882d1e6 100644 --- a/pages.json +++ b/pages.json @@ -161,6 +161,27 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "coupon/coupon-list", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "coupon/my-coupon", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "history/history", + "style": { + "navigationBarTitleText": "", + "componentPlaceholder": { + "notice-item": "view" + } + } } ] }], diff --git a/pages/components/my-notice.vue b/pages/components/my-notice.vue index d9957d9..7bdfab1 100644 --- a/pages/components/my-notice.vue +++ b/pages/components/my-notice.vue @@ -15,12 +15,9 @@ - - - - + diff --git a/pages/mine/auth/auth-form.vue b/pages/mine/auth/auth-form.vue index dd3eb50..250ccdb 100644 --- a/pages/mine/auth/auth-form.vue +++ b/pages/mine/auth/auth-form.vue @@ -9,7 +9,7 @@ 我是 “{{identityTypeText}}” - 认证指南认证指南 @@ -252,7 +252,7 @@ this.identityTypeText = getTextByIdentityType(option.key) }, methods: { - viewAuthText() { + viewRichText() { this.$tab.navigateTo( `/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[4].title}&code=${this.globalConfig.appInfo.agreements[4].code}` ) diff --git a/pages/mine/coupon/coupon-list.vue b/pages/mine/coupon/coupon-list.vue new file mode 100644 index 0000000..89a4c9d --- /dev/null +++ b/pages/mine/coupon/coupon-list.vue @@ -0,0 +1,215 @@ + + + + + \ No newline at end of file diff --git a/pages/mine/coupon/my-coupon.vue b/pages/mine/coupon/my-coupon.vue new file mode 100644 index 0000000..7500203 --- /dev/null +++ b/pages/mine/coupon/my-coupon.vue @@ -0,0 +1,440 @@ + + + + + \ No newline at end of file diff --git a/pages/mine/history/history.vue b/pages/mine/history/history.vue new file mode 100644 index 0000000..af5b72c --- /dev/null +++ b/pages/mine/history/history.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue index e47961f..69d4b94 100644 --- a/pages/mine/mine-index.vue +++ b/pages/mine/mine-index.vue @@ -98,13 +98,13 @@ 通告主认证 - + 通告券 - + 足迹 @@ -182,7 +182,7 @@ getStrData } from '@/utils/auth.js' import { - bloggerDetail + queryDetail } from '@/api/business/member.js' export default { props: { @@ -215,7 +215,6 @@ popupImgUrl: "", } }, - mounted() {}, onShow() { }, @@ -225,7 +224,7 @@ mounted() { if (null != getJSONData(constant.userInfo)) { this.userInfo = getJSONData(constant.userInfo) - this.getBloggerDetail() + this.getDetail() } }, computed: { @@ -240,11 +239,15 @@ // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 this.$refs.popup.open(type) }, - getBloggerDetail() { - bloggerDetail(this.userInfo.userId).then(res => { + getDetail() { + queryDetail({ + userId: this.userInfo.userId, + userType: this.localUserType + }).then(res => { this.userInfo.tfansNum = res.data.tfansNum.toString() this.userInfo.pointsBalance = res.data.pointsBalance.toString() this.userInfo.report = res.data.report.toString() + this.userInfo.avatar = this.imageUrl + res.data.avatar }) }, /** @@ -254,6 +257,7 @@ changeUserType(type) this.localUserType = type this.$emit('update:nowUserType', this.localUserType) + this.getDetail() this.$forceUpdate() }, handleToInfo() { @@ -280,14 +284,21 @@ goAuth() { this.$tab.navigateTo('/pages/mine/auth/auth-choose') }, + goCoupon() { + this.$tab.navigateTo('/pages/mine/coupon/coupon-list') + }, + goHistory() { + this.$tab.navigateTo('/pages/mine/history/history') + }, goMemberCard() { - this.$tab.navigateTo('/pages/mine/member/member-card?userType='+this.localUserType) + this.$tab.navigateTo('/pages/mine/member/member-card?userType=' + this.localUserType) }, /** * 跳转编辑页 */ goEdit() { - this.$tab.navigateTo('/pages/mine/set/my-info') + this.$tab.navigateTo('/pages/mine/set/my-info?userType=' + this.localUserType + '&userId=' + this.userInfo + .userId) }, viewNewPeople() { this.$tab.navigateTo( diff --git a/pages/mine/set/my-info.vue b/pages/mine/set/my-info.vue index 9b979d5..49d2a2f 100644 --- a/pages/mine/set/my-info.vue +++ b/pages/mine/set/my-info.vue @@ -5,7 +5,7 @@ - + @@ -18,15 +18,15 @@ - + - - + + - - + + @@ -38,17 +38,25 @@