From 21e4df820b820d5e3b963519b8e30256c561e42a Mon Sep 17 00:00:00 2001
From: chengkun <2500338766@qq.com>
Date: Wed, 13 Jul 2022 14:14:49 +0800
Subject: [PATCH] feature-hub-1.0: fix bug
---
pages-userInfo/inviteLog/inviteLog.vue | 41 +--
pages-userInfo/notice/notice.vue | 37 +--
pages-userInfo/notice/noticeDetail.vue | 16 +-
pages-userInfo/withdraw/withdraw.vue | 45 ++--
pages-userInfo/withdraw/withdrawDetail.vue | 24 +-
pages.json | 276 ++++++++++-----------
pages/profit/profit.vue | 76 ++++--
pages/profit/profitEndDetails.vue | 29 ++-
pages/profit/profitEndOrder.vue | 21 +-
pages/profit/profitInDetails.vue | 15 +-
pages/profit/profitInOrder.vue | 25 +-
pages/profit/profitPreDetails.vue | 86 +++++--
pages/userInfo/userInfo.vue | 33 ++-
13 files changed, 424 insertions(+), 300 deletions(-)
diff --git a/pages-userInfo/inviteLog/inviteLog.vue b/pages-userInfo/inviteLog/inviteLog.vue
index 11cdbfd..c058855 100644
--- a/pages-userInfo/inviteLog/inviteLog.vue
+++ b/pages-userInfo/inviteLog/inviteLog.vue
@@ -1,8 +1,7 @@
-
+
@@ -16,32 +15,42 @@
return {
inviteLogList: [],
pageSize: 10,
- pageNum: 1
+ pageNum: 1,
+ userInfo: {}
}
},
+ created() {
+ const userInfoSync = uni.getStorageSync('userInfo')
+ this.userInfo = userInfoSync
+ this.getInviteLog();
+ },
// 下拉刷新
onPullDownRefresh() {
- this.showChoiceness = false
+ this.pageNum = 1
+ this.inviteLogList = []
+ this.getInviteLog();
uni.stopPullDownRefresh()
},
- created() {
- const userInfo = uni.getStorageSync('userInfo')
- const params = {
- pageSize: this.pageSize,
- pageNum: this.pageNum,
- creatorId: userInfo.id
+ // 上划加载更多
+ onReachBottom() {
+ if (this.inviteLogList.length > 9) {
+ this.pageNum += 1
+ this.getInviteLog();
}
- this.getInviteLog(params);
},
methods: {
-
+
// 获取邀请记录
- async getInviteLog(params) {
- const res = await getInviteLog(params)
+ async getInviteLog() {
+ const res = await getInviteLog({
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ creatorId: this.userInfo.id
+ })
console.log('res', res)
if (res.data.code === 200) {
- this.inviteLogList = res.data.rows
- console.log('inviteLogList', this.inviteLogList)
+ this.inviteLogList.push(...res.data.rows)
+ console.log('inviteLogList', this.inviteLogList)
} else {
uni.showModal({
content: '邀请记录加载失败！',
diff --git a/pages-userInfo/notice/notice.vue b/pages-userInfo/notice/notice.vue
index a9f09a4..ccb5f38 100644
--- a/pages-userInfo/notice/notice.vue
+++ b/pages-userInfo/notice/notice.vue
@@ -1,8 +1,8 @@
-
+
@@ -19,26 +19,35 @@
pageNum: 1
}
},
+ created() {
+ this.getNoticeList();
+ },
// 下拉刷新
onPullDownRefresh() {
+ this.pageNum = 1
+ this.noticeList = []
+ this.getNoticeList()
uni.stopPullDownRefresh()
},
- created() {
- const params = {
- pageSize: this.pageSize,
- pageNum: this.pageNum,
+ // 上划加载更多
+ onReachBottom() {
+ if (this.noticeList.length > 9) {
+ this.pageNum += 1
+ this.getNoticeList();
}
- this.getNoticeList(params);
},
methods: {
-
+
// 获取公告分页
- async getNoticeList(params) {
- const res = await getNoticeList(params)
- console.log('res', res)
+ async getNoticeList() {
+ const res = await getNoticeList({
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ })
+ //console.log('res', res)
if (res.data.code === 200) {
- this.noticeList = res.data.rows
- console.log('noticeList', this.noticeList)
+ this.noticeList.push(...res.data.rows)
+ //console.log('noticeList', this.noticeList)
} else {
uni.showModal({
content: '公告列表加载失败！',
@@ -46,7 +55,7 @@
});
}
},
-
+
targetToDetail(id) {
console.log('id', id)
if (id) {
diff --git a/pages-userInfo/notice/noticeDetail.vue b/pages-userInfo/notice/noticeDetail.vue
index f962a64..4717b5a 100644
--- a/pages-userInfo/notice/noticeDetail.vue
+++ b/pages-userInfo/notice/noticeDetail.vue
@@ -15,19 +15,25 @@
export default {
data() {
return {
- noticeDetail:{}
+ noticeDetail:{
+ id: 0,
+ title: '',
+ content: '',
+ img: '',
+ createTime: ''
+ }
}
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
- this.id = option.id
+ this.noticeDetail.id = option.id
//console.log('this.id',this.id)
- this.getNoticeDetails(option.id);
+ this.getNoticeDetails();
},
methods: {
// 查询公告详情
- async getNoticeDetails(id) {
- const res = await getNoticeDetails(id)
+ async getNoticeDetails() {
+ const res = await getNoticeDetails(this.noticeDetail.id)
console.log('res', res)
if (res.data.code === 200) {
this.noticeDetail = res.data.data
diff --git a/pages-userInfo/withdraw/withdraw.vue b/pages-userInfo/withdraw/withdraw.vue
index c93bda3..fbcb5fc 100644
--- a/pages-userInfo/withdraw/withdraw.vue
+++ b/pages-userInfo/withdraw/withdraw.vue
@@ -2,8 +2,8 @@
+ :note="item.createTime+'||'+item.channel+'||'+item.status" :rightText="'￥'+item.amt"
+ @click="targetToDetail(item.orderId)" />
@@ -15,27 +15,42 @@
export default {
data() {
return {
- withdrawList:[],
+ withdrawList: [],
pageSize: 10,
- pageNum: 1
+ pageNum: 1,
+ userInfo: {}
}
},
- created(){
- const userInfo = uni.getStorageSync('userInfo')
- const params = {
- pageSize: this.pageSize,
- pageNum: this.pageNum,
- creatorId: userInfo.id
+ created() {
+ const userInfoSync = uni.getStorageSync('userInfo')
+ this.userInfo = userInfoSync
+ this.getWithdrawList();
+ },
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.pageNum = 1
+ this.withdrawList = []
+ this.getWithdrawList()
+ uni.stopPullDownRefresh()
+ },
+ // 上划加载更多
+ onReachBottom() {
+ if (this.withdrawList.length > 9) {
+ this.pageNum += 1
+ this.getWithdrawList();
}
- this.getWithdrawList(params);
},
methods: {
// 查询提现记录列表
- async getWithdrawList(param) {
- const res = await getWithdrawList(param)
+ async getWithdrawList() {
+ const res = await getWithdrawList({
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ creatorId: this.userInfo.id
+ })
console.log('res', res)
if (res.data.code === 200) {
- this.withdrawList = res.data.rows
+ this.withdrawList.push(...res.data.rows)
} else {
uni.showModal({
content: '提现记录列表数据加载失败！',
@@ -43,7 +58,7 @@
});
}
},
-
+
targetToDetail(orderId) {
console.log('orderId', orderId)
if (orderId) {
diff --git a/pages-userInfo/withdraw/withdrawDetail.vue b/pages-userInfo/withdraw/withdrawDetail.vue
index 8edbec0..45b80a4 100644
--- a/pages-userInfo/withdraw/withdrawDetail.vue
+++ b/pages-userInfo/withdraw/withdrawDetail.vue
@@ -19,20 +19,30 @@
export default {
data() {
return {
- withdrawDetailInfo:{}
+ withdrawDetailInfo: {
+ orderId: '',
+ amt: 0,
+ phone: '',
+ bankNo: '',
+ channel: '',
+ status: '',
+ createTime: '',
+ reason: '',
+ achieveTime: ''
+ }
}
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
console.log(option)
- const param = {
- orderId: option.orderId
- }
- this.getWithdrawDetails(param);
+ this.withdrawDetailInfo.orderId = option.orderId
+ this.getWithdrawDetails();
},
methods: {
// 查询提现记录明细
- async getWithdrawDetails(param) {
- const res = await getWithdrawDetails(param)
+ async getWithdrawDetails() {
+ const res = await getWithdrawDetails({
+ orderId: this.withdrawDetailInfo.orderId
+ })
console.log('res', res)
if (res.data.code === 200) {
this.withdrawDetailInfo = res.data.data
diff --git a/pages.json b/pages.json
index d377f73..da4bbff 100644
--- a/pages.json
+++ b/pages.json
@@ -14,169 +14,147 @@
"enablePullDownRefresh": true
}
},
- {
- "path" : "pages/index/upload/upload",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/index/material/material",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/login/login",
- "style" :
- {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/register/register",
- "style" :
- {
- "navigationBarTitleText": "注册",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/index/banner",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/profit/profitPreDetails",
- "style" :
- {
- "navigationBarTitleText": "即将入账详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/profit/profitInDetails",
- "style" :
- {
- "navigationBarTitleText": "已入账详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/profit/profitInOrder",
- "style" :
- {
- "navigationBarTitleText": "收益结算单",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/profit/profitEndDetails",
- "style" :
- {
- "navigationBarTitleText": "转入钱包详情",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "pages/profit/profitEndOrder",
- "style" :
- {
- "navigationBarTitleText": "转入钱包结算单",
- "enablePullDownRefresh": false
- }
- },
{
- "path" : "pages/userInfo/userInfo",
- "style" :
- {
- "navigationBarTitleText": "我的",
- "enablePullDownRefresh": false
+ "path": "pages/index/upload/upload",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
}
- }
- ],
-
- "subPackages": [{
- "root": "pages-userInfo",
- "pages":[{
- "path":"about/about",
- "style":{
- "navigationBarTitleText": "关于节点",
+
+ }, {
+ "path": "pages/index/material/material",
+ "style": {
+ "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
- },
- {
- "path":"contact/contact",
- "style":{
- "navigationBarTitleText": "联系我们",
+
+ }, {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "登录",
"enablePullDownRefresh": false
}
- },
- {
- "path":"extends/extends",
- "style":{
- "navigationBarTitleText": "邀请更多人",
+
+ }, {
+ "path": "pages/register/register",
+ "style": {
+ "navigationBarTitleText": "注册",
"enablePullDownRefresh": false
}
- },
- {
- "path":"inviteLog/inviteLog",
- "style":{
- "navigationBarTitleText": "邀请记录",
+
+ }, {
+ "path": "pages/index/banner",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/profit/profitPreDetails",
+ "style": {
+ "navigationBarTitleText": "即将入账详情",
+ "enablePullDownRefresh": true
+ }
+
+ }, {
+ "path": "pages/profit/profitInDetails",
+ "style": {
+ "navigationBarTitleText": "已入账详情",
+ "enablePullDownRefresh": true
+ }
+
+ }, {
+ "path": "pages/profit/profitInOrder",
+ "style": {
+ "navigationBarTitleText": "收益结算单",
"enablePullDownRefresh": false
}
- },{
- "path":"notice/notice",
- "style":{
- "navigationBarTitleText": "通知公告",
+
+ }, {
+ "path": "pages/profit/profitEndDetails",
+ "style": {
+ "navigationBarTitleText": "转入钱包详情",
+ "enablePullDownRefresh": true
+ }
+
+ }, {
+ "path": "pages/profit/profitEndOrder",
+ "style": {
+ "navigationBarTitleText": "转入钱包结算单",
"enablePullDownRefresh": false
}
},
{
- "path":"withdraw/withdraw",
- "style":{
- "navigationBarTitleText": "提现记录",
+ "path": "pages/userInfo/userInfo",
+ "style": {
+ "navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
- },{
- "path" : "notice/noticeDetail",
- "style" :
- {
- "navigationBarTitleText": "公告详情",
- "enablePullDownRefresh": false
- }
-
- }
-
- ,{
- "path" : "withdraw/withdrawDetail",
- "style" :
- {
- "navigationBarTitleText": "提现详情",
- "enablePullDownRefresh": false
- }
-
- }
- ]
+ }
+ ],
+
+ "subPackages": [{
+ "root": "pages-userInfo",
+ "pages": [{
+ "path": "about/about",
+ "style": {
+ "navigationBarTitleText": "关于节点",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "contact/contact",
+ "style": {
+ "navigationBarTitleText": "联系我们",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "extends/extends",
+ "style": {
+ "navigationBarTitleText": "邀请更多人",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "inviteLog/inviteLog",
+ "style": {
+ "navigationBarTitleText": "邀请记录",
+ "enablePullDownRefresh": true
+ }
+ }, {
+ "path": "notice/notice",
+ "style": {
+ "navigationBarTitleText": "通知公告",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "withdraw/withdraw",
+ "style": {
+ "navigationBarTitleText": "提现记录",
+ "enablePullDownRefresh": true
+ }
+ }, {
+ "path": "notice/noticeDetail",
+ "style": {
+ "navigationBarTitleText": "公告详情",
+ "enablePullDownRefresh": false
+ }
+
+ }
+
+ , {
+ "path": "withdraw/withdrawDetail",
+ "style": {
+ "navigationBarTitleText": "提现详情",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ]
}],
-
+
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "bnyer",
@@ -194,15 +172,15 @@
"iconPath": "static/index-default.png",
"selectedIconPath": "static/index-select.png",
"text": "首页"
- },
- {
+ },
+ {
"pagePath": "pages/profit/profit",
"iconPath": "static/theme-default.png",
"selectedIconPath": "static/theme-select.png",
"text": "收益"
},
{
- "pagePath": "pages/userInfo/userInfo",
+ "pagePath": "pages/userInfo/userInfo",
"iconPath": "static/mine-default.png",
"selectedIconPath": "static/mine-select.png",
"text": "我的"
diff --git a/pages/profit/profit.vue b/pages/profit/profit.vue
index 5addd77..9ba1cae 100644
--- a/pages/profit/profit.vue
+++ b/pages/profit/profit.vue
@@ -1,6 +1,7 @@
+
广告收益:{{profitInfo.yesterdayAdProfit}}
@@ -80,6 +81,9 @@
queryFrontPreProfit, //查询指定艺术家即将入账收益列表
queryFrontInOrOutAmt, //查询指定艺术家已入账/转入钱包累计收益
} from '@/api/profit.js'
+ import {
+ getNoticeList
+ } from '@/api/userInfo.js'
export default {
data() {
return {
@@ -100,6 +104,9 @@
inProfitInfo: {},
endProfitInfo: {},
userInfo: {},
+ noticeList: [],
+ pageSize: 10,
+ pageNum: 1
}
},
// 下拉刷新
@@ -109,24 +116,17 @@
created() {
const userInfoSync = uni.getStorageSync('userInfo')
this.userInfo = userInfoSync
- this.queryFrontProfitInfo(userInfoSync.id);
- this.queryFrontPreDownloadAndInviteCount(userInfoSync.id)
- const paramIn = {
- creatorId: userInfoSync.id,
- status: '1'
- }
- this.queryFrontInAmt(paramIn)
- const paramEnd = {
- creatorId: userInfoSync.id,
- status: '2'
- }
- this.queryFrontEndAmt(paramEnd)
+ this.queryFrontProfitInfo();
+ this.queryFrontPreDownloadAndInviteCount()
+ this.queryFrontInAmt()
+ this.queryFrontEndAmt()
+ this.getNoticeList()
},
methods: {
// 获取艺术家收益统计
- async queryFrontProfitInfo(id) {
- const res = await queryFrontProfitInfo(id)
+ async queryFrontProfitInfo() {
+ const res = await queryFrontProfitInfo(this.userInfo.id)
//console.log('res', res)
if (res.data.code === 200) {
this.profitInfo = res.data.data
@@ -140,8 +140,8 @@
},
// 查询指定艺术家即将入账广告及邀请次数列表
- async queryFrontPreDownloadAndInviteCount(id) {
- const res = await queryFrontPreDownloadAndInviteCount(id)
+ async queryFrontPreDownloadAndInviteCount() {
+ const res = await queryFrontPreDownloadAndInviteCount(this.userInfo.id)
//console.log('res', res)
if (res.data.code === 200) {
this.downloadAndInviteCountInfo = res.data.data
@@ -155,9 +155,12 @@
},
// 查询指定艺术家已入账累计收益
- async queryFrontInAmt(param) {
- const res = await queryFrontInOrOutAmt(param)
- console.log('InAmt', res)
+ async queryFrontInAmt() {
+ const res = await queryFrontInOrOutAmt({
+ creatorId: this.userInfo.id,
+ status: '1'
+ })
+ //console.log('InAmt', res)
if (res.data.code === 200) {
this.inProfitInfo = res.data.data
} else {
@@ -169,9 +172,12 @@
},
// 查询指定艺术家转入钱包累计收益
- async queryFrontEndAmt(param) {
- const res = await queryFrontInOrOutAmt(param)
- console.log('endAmt', res)
+ async queryFrontEndAmt() {
+ const res = await queryFrontInOrOutAmt({
+ creatorId: this.userInfo.id,
+ status: '2'
+ })
+ //console.log('endAmt', res)
if (res.data.code === 200) {
this.endProfitInfo = res.data.data
} else {
@@ -182,6 +188,24 @@
}
},
+ // 获取公告分页
+ async getNoticeList() {
+ const res = await getNoticeList({
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ })
+ //console.log('res', res)
+ if (res.data.code === 200) {
+ this.noticeList = res.data.rows
+ //console.log('noticeList', this.noticeList)
+ } else {
+ uni.showModal({
+ content: '公告列表加载失败！',
+ showCancel: false
+ });
+ }
+ },
+
// 跳转即将到账收益详情页(status:0->即将入账;1->已入账;2->转入钱包)
linkTo(typeId, status) {
if (status === 0) {
@@ -215,13 +239,19 @@
}
})
}
-
},
onClickItem(e) {
if (this.current !== e.currentIndex) {
this.current = e.currentIndex
}
},
+
+ //查看更多公告
+ getMore() {
+ uni.navigateTo({
+ url: '../../pages-userInfo/notice/notice',
+ })
+ }
},
}
diff --git a/pages/profit/profitEndDetails.vue b/pages/profit/profitEndDetails.vue
index e62365a..8c516ca 100644
--- a/pages/profit/profitEndDetails.vue
+++ b/pages/profit/profitEndDetails.vue
@@ -10,7 +10,7 @@
-
+
@@ -38,26 +38,25 @@
userInfo: {}
}
},
- created(){
+ created() {
const userInfoSync = uni.getStorageSync('userInfo')
this.userInfo = userInfoSync
const typeProfitId = uni.getStorageSync('typeId')
this.typeId = typeProfitId
- const param = {
- creatorId: userInfoSync.id,
- type: typeProfitId
- }
if (typeProfitId) {
- this.queryFrontEndProfitAmt(param)
+ this.queryFrontEndProfitAmt()
} else {
- this.queryFrontEndProfitAmt(param)
+ this.queryFrontEndProfitAmt()
}
},
methods: {
-
+
// 查询指定艺术家转入钱包收益列表
- async queryFrontEndProfitAmt(param) {
- const res = await queryFrontEndProfitAmt(param)
+ async queryFrontEndProfitAmt() {
+ const res = await queryFrontEndProfitAmt({
+ creatorId: this.userInfo.id,
+ type: this.typeId
+ })
if (res.data.code === 200) {
this.endProfitList = res.data.data
} else {
@@ -67,7 +66,7 @@
});
}
},
-
+
onClickItem(e) {
let that = this
if (that.typeId !== e.currentIndex) {
@@ -82,7 +81,7 @@
type: that.typeId
}
queryFrontEndProfitAmt(param).then(res => {
- console.log('res',res)
+ //console.log('res', res)
if (res.data.code === 200) {
that.endProfitList = res.data.data
} else {
@@ -97,10 +96,10 @@
uni.hideLoading();
}
});
-
+
}
},
-
+
targetToOrder(id) {
console.log('id', id)
if (id) {
diff --git a/pages/profit/profitEndOrder.vue b/pages/profit/profitEndOrder.vue
index 5dfa00b..69eaaec 100644
--- a/pages/profit/profitEndOrder.vue
+++ b/pages/profit/profitEndOrder.vue
@@ -24,21 +24,28 @@
export default {
data() {
return {
- id: 0,
- orderDetail: {}
+ orderDetail: {
+ id: 0,
+ orderNo: '',
+ platform: '',
+ appType: '',
+ type: '',
+ profit: 0,
+ walletTime: ''
+ }
}
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
- this.id = option.id
+ this.orderDetail.id = option.id
//console.log('this.id',this.id)
- this.queryFrontEndAmtDetails(option.id);
+ this.queryFrontEndAmtDetails();
},
methods: {
// 查询指定艺术家转入钱包收益详情
- async queryFrontEndAmtDetails(id) {
- const res = await queryFrontEndAmtDetails(id)
- console.log('res', res)
+ async queryFrontEndAmtDetails() {
+ const res = await queryFrontEndAmtDetails(this.orderDetail.id)
+ //console.log('res', res)
if (res.data.code === 200) {
this.orderDetail = res.data.data
} else {
diff --git a/pages/profit/profitInDetails.vue b/pages/profit/profitInDetails.vue
index 2186f95..202fc53 100644
--- a/pages/profit/profitInDetails.vue
+++ b/pages/profit/profitInDetails.vue
@@ -43,21 +43,20 @@
this.userInfo = userInfoSync
const typeProfitId = uni.getStorageSync('typeId')
this.typeId = typeProfitId
- const param = {
- creatorId: userInfoSync.id,
- type: typeProfitId
- }
if (typeProfitId) {
- this.queryFrontInProfitAmt(param)
+ this.queryFrontInProfitAmt()
} else {
- this.queryFrontInProfitAmt(param)
+ this.queryFrontInProfitAmt()
}
},
methods: {
// 查询指定艺术家已入账收益列表
- async queryFrontInProfitAmt(param) {
- const res = await queryFrontInProfitAmt(param)
+ async queryFrontInProfitAmt() {
+ const res = await queryFrontInProfitAmt({
+ creatorId: this.userInfo.id,
+ type: this.typeId
+ })
if (res.data.code === 200) {
this.inProfitList = res.data.data
} else {
diff --git a/pages/profit/profitInOrder.vue b/pages/profit/profitInOrder.vue
index 4fbd21c..f1494d6 100644
--- a/pages/profit/profitInOrder.vue
+++ b/pages/profit/profitInOrder.vue
@@ -33,21 +33,32 @@
export default {
data() {
return {
- id: 0,
- orderDetail: {}
+ orderDetail: {
+ id: 0,
+ orderNo: '',
+ platform: '',
+ appType: '',
+ type: '',
+ createTime: '',
+ profit: '',
+ downloadNum: 0,
+ confirmType: '',
+ confirmTime: '',
+ confirmStatus: ''
+ }
}
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
- this.id = option.id
+ this.orderDetail.id = option.id
//console.log('this.id',this.id)
- this.queryFrontInAmtDetails(option.id);
+ this.queryFrontInAmtDetails();
},
methods: {
// 查询指定艺术家已入账收益详情
- async queryFrontInAmtDetails(id) {
- const res = await queryFrontInAmtDetails(id)
- console.log('res', res)
+ async queryFrontInAmtDetails() {
+ const res = await queryFrontInAmtDetails(this.orderDetail.id)
+ //console.log('res', res)
if (res.data.code === 200) {
this.orderDetail = res.data.data
} else {
diff --git a/pages/profit/profitPreDetails.vue b/pages/profit/profitPreDetails.vue
index ebecfad..f72859a 100644
--- a/pages/profit/profitPreDetails.vue
+++ b/pages/profit/profitPreDetails.vue
@@ -6,18 +6,20 @@
-
+
+ -----已经到底啦-----
-
+
+ -----已经到底啦-----
@@ -30,12 +32,16 @@
export default {
data() {
return {
- preProfitList: [],
+ preProfitAdList: [],
+ preprofitInviteList:[],
items: ['广告', '邀请'],
typeId: 0,
activeColor: '#007aff',
styleType: 'text',
- userInfo: {}
+ userInfo: {},
+ pageSize: 10,
+ pageNum: 1,
+ flag: false
}
},
created() {
@@ -43,14 +49,28 @@
this.userInfo = userInfoSync
const typeProfitId = uni.getStorageSync('typeId')
this.typeId = typeProfitId
- const param = {
- creatorId: userInfoSync.id,
- type: typeProfitId
- }
if (typeProfitId) {
- this.queryFrontPreProfit(param)
+ this.queryFrontPreProfit()
} else {
- this.queryFrontPreProfit(param)
+ this.queryFrontPreProfit()
+ }
+ },
+ // 下拉刷新
+ onPullDownRefresh() {
+ this.pageNum = 1
+ this.preProfitList = []
+ this.queryFrontPreProfit()
+ uni.stopPullDownRefresh()
+ },
+ // 上划加载更多
+ onReachBottom() {
+ console.log('this.preProfitList.length',this.preProfitList.length)
+ if (this.preProfitList.length > this.pageNum*this.pageSize-1 ) {
+ this.flag = false;
+ this.pageNum += 1
+ this.queryFrontPreProfit();
+ }else{
+ this.flag = true;
}
},
methods: {
@@ -65,11 +85,21 @@
// 查询即将入账邀请收益列表
const param = {
creatorId: that.userInfo.id,
- type: that.typeId
+ type: that.typeId,
+ pageSize: that.pageSize,
+ pageNum: 1
}
queryFrontPreProfit(param).then(res => {
if (res.data.code === 200) {
- that.preProfitList = res.data.data
+ if(this.typeId = 0){
+ this.preProfitAdList.push(...res.data.rows)
+ }else{
+ this.preprofitInviteList.push(...res.data.rows)
+ }
+ console.log('点击操作preProfitAdList',this.preProfitAdList)
+ console.log('点击操作preprofitInviteList',this.preprofitInviteList)
+ that.preProfitList = res.data.rows
+ this.flag = false;
} else {
uni.showModal({
content: '即将到账列表数据加载失败！',
@@ -87,10 +117,25 @@
},
// 查询即将入账邀请收益列表
- async queryFrontPreProfit(param) {
- const res = await queryFrontPreProfit(param)
+ async queryFrontPreProfit() {
+ const res = await queryFrontPreProfit({
+ creatorId: this.userInfo.id,
+ type: this.typeId,
+ pageSize: this.pageSize,
+ pageNum: this.pageNum
+ })
+ console.log('this.typeId1',this.typeId)
if (res.data.code === 200) {
- this.preProfitList = res.data.data
+ console.log('this.typeId2',this.typeId)
+ if(this.typeId === 0){
+ console.log('this.typeId3',this.typeId)
+ this.preProfitAdList.push(...res.data.rows)
+ }else{
+ console.log('this.typeId4',this.typeId)
+ this.preprofitInviteList.push(...res.data.rows)
+ }
+ console.log('this.preProfitAdList',this.preProfitAdList)
+ console.log('this.preprofitInviteList',this.preprofitInviteList)
} else {
uni.showModal({
content: '即将到账列表数据加载失败！',
@@ -102,6 +147,13 @@
}
-
diff --git a/pages/userInfo/userInfo.vue b/pages/userInfo/userInfo.vue
index 89a4cd1..1a2da7f 100644
--- a/pages/userInfo/userInfo.vue
+++ b/pages/userInfo/userInfo.vue
@@ -1,13 +1,11 @@
-
-
+
{{userInfo.name}}
@@ -40,38 +38,38 @@
export default {
data() {
return {
- list:[{
+ list: [{
url: '/pages-userInfo/about/about',
title: '关于节点',
img: ''
- },{
+ }, {
url: '/pages-userInfo/contact/contact',
title: '联系我们',
img: ''
- },{
+ }, {
url: '/pages-userInfo/extends/extends',
title: '邀请他人',
img: ''
- },{
+ }, {
url: '/pages-userInfo/inviteLog/inviteLog',
title: '邀请记录',
img: ''
- },{
+ }, {
url: '/pages-userInfo/notice/notice',
title: '通知公告',
img: ''
- },{
+ }, {
url: '/pages-userInfo/withdraw/withdraw',
title: '提现记录',
img: ''
}],
pageUrl: '',
- userInfo: {}
+ userInfo: {},
}
},
created() {
this.userInfo = uni.getStorageSync('userInfo')
- console.log('this.userInfo',this.userInfo)
+ console.log('this.userInfo', this.userInfo)
},
methods: {
change(e) {
@@ -79,7 +77,7 @@
index
} = e.detail
this.pageUrl = this.list[index].url
- console.log('this.pageUrl',this.pageUrl)
+ console.log('this.pageUrl', this.pageUrl)
/** 跳转指定页面*/
uni.navigateTo({
url: this.pageUrl
@@ -90,27 +88,28 @@