diff --git a/src/components/partner-profit/index.less b/src/components/partner-profit/index.less
index 5b8da56..f260145 100644
--- a/src/components/partner-profit/index.less
+++ b/src/components/partner-profit/index.less
@@ -78,10 +78,13 @@
&:last-child {
padding-right: 0;
}
- &.time,
- &.project {
+ &.time {
flex: 2;
}
+ &.project {
+ width: 150px;
+ flex-shrink: 0;
+ }
&.status {
width: 96px;
padding: 0 8px;
diff --git a/src/constants/partner.ts b/src/constants/partner.ts
index 5693df9..549fe0f 100644
--- a/src/constants/partner.ts
+++ b/src/constants/partner.ts
@@ -52,3 +52,9 @@ export const ProfitStatusDescriptions = {
OTHER: '',
FINISHED: '已分账',
};
+
+export const WithdrawStatusDescriptions = {
+ 0: '提现中',
+ 1: '已提现',
+ 2: '失败',
+};
diff --git a/src/hooks/user-role-type.tsx b/src/hooks/user-role-type.tsx
index db4969c..cc799ba 100644
--- a/src/hooks/user-role-type.tsx
+++ b/src/hooks/user-role-type.tsx
@@ -1,5 +1,6 @@
import { useSelector } from 'react-redux';
+import { RoleType } from '@/constants/app';
import { selectRoleType } from '@/store/selector';
import { RoleType } from '@/constants/app';
diff --git a/src/http/api.ts b/src/http/api.ts
index 676e0ac..d4f3046 100644
--- a/src/http/api.ts
+++ b/src/http/api.ts
@@ -82,4 +82,6 @@ export enum API {
BECOME_PARTNER = '/user/becomePartner',
GET_PROFIT_LIST = '/user/profit/list',
GET_PROFIT_STAT = '/user/profits',
+ WITHDRAW = '/user/withdraw',
+ GET_WITHDRAW_LIST = '/user/withdraw/records',
}
diff --git a/src/pages/message-chat/index.tsx b/src/pages/message-chat/index.tsx
index d230127..b0cce34 100644
--- a/src/pages/message-chat/index.tsx
+++ b/src/pages/message-chat/index.tsx
@@ -31,7 +31,7 @@ import {
PostMessageRequest,
} from '@/types/message';
import { isAnchorMode } from '@/utils/app';
-import { getScrollItemId, last, logWithPrefix } from '@/utils/common';
+import { getScrollItemId, last, logWithPrefix, safeJsonParse } from '@/utils/common';
import { collectEvent } from '@/utils/event';
import {
isExchangeMessage,
@@ -55,6 +55,7 @@ import Toast from '@/utils/toast';
import { getUserId } from '@/utils/user';
import './index.less';
+import useUserInfo from '@/hooks/use-user-info';
const PREFIX = 'page-message-chat';
const LIST_CONTAINER_CLASS = `${PREFIX}__chat-list`;
@@ -85,8 +86,19 @@ const getHeaderLeftButtonText = (job?: IJobMessage, material?: IMaterialMessage)
return isAnchorMode() ? '不感兴趣' : '标记为不合适';
};
+const getResumeId = (messages: IChatMessage[], userId?: string) => {
+ const resumeStr = messages.find(it => it.type === MessageType.Material && it.senderUserId !== userId)?.actionObject;
+ if (resumeStr) {
+ const { id } = safeJsonParse(resumeStr);
+ log('resumeId', id);
+ return id;
+ }
+ return undefined;
+};
+
export default function MessageChat() {
const listHeight = useListHeight(CALC_LIST_PROPS);
+ const { userId } = useUserInfo();
const [input, setInput] = useState('');
const [showMore, setShowMore] = useState(false);
const [chat, setChat] = useState
(null);
@@ -96,6 +108,7 @@ export default function MessageChat() {
const [messageStatusList, setMessageStatusList] = useState([]);
const [jobId, setJobId] = useState();
const [job, setJob] = useState();
+ const [resumeId, setResumeId] = useState();
const [material, setMaterial] = useState();
const [scrollItemId, setScrollItemId] = useState();
const scrollToLowerRef = useRef(false);
@@ -252,6 +265,14 @@ export default function MessageChat() {
// };
// }, []);
+ useEffect(() => {
+ if (resumeId) {
+ return;
+ }
+
+ setResumeId(getResumeId(messages, userId));
+ }, [messages, resumeId, userId]);
+
useEffect(() => {
if (!chat) {
return;
@@ -353,6 +374,7 @@ export default function MessageChat() {
id={message.msgId}
key={message.msgId}
message={message}
+ resumeId={resumeId}
isRead={messageStatusList.some(m => m.msgId === message.msgId && !!m.isRead)}
/>
);
diff --git a/src/pages/partner/index.tsx b/src/pages/partner/index.tsx
index d1e4d7d..4d1677e 100644
--- a/src/pages/partner/index.tsx
+++ b/src/pages/partner/index.tsx
@@ -1,20 +1,23 @@
import { useShareAppMessage } from '@tarojs/taro';
import { Tabs } from '@taroify/core';
+import { useState } from 'react';
import PartnerIntro from '@/components/partner-intro';
import PartnerInviteList from '@/components/partner-invite-list';
import PartnerProfit from '@/components/partner-profit';
import useInviteCode from '@/hooks/use-invite-code';
import { getCommonShareMessage } from '@/utils/share';
-
import './index.less';
const PREFIX = 'partner';
export default function Partner() {
const inviteCode = useInviteCode();
-
+ const [tab, setTab] = useState(0);
+ const handleChange = v => {
+ setTab(v);
+ };
useShareAppMessage(() => {
console.log('Partner inviteCode', inviteCode);
return getCommonShareMessage(false, inviteCode);
@@ -22,12 +25,12 @@ export default function Partner() {
return (
-
+
-
+
diff --git a/src/pages/withdraw-record/index.less b/src/pages/withdraw-record/index.less
index ef8edfc..a067e2f 100644
--- a/src/pages/withdraw-record/index.less
+++ b/src/pages/withdraw-record/index.less
@@ -2,4 +2,52 @@
@import '@/styles/variables.less';
.withdraw-record {
+ &__item {
+ height: 131px;
+ width: 100%;
+ background: #fff;
+ padding: 24px 32px 0 32px;
+ box-sizing: border-box;
+ font-size: 28px;
+
+ &-border {
+ border-bottom: 1px solid #e6e7e8;
+ }
+
+ &-content {
+ .flex-row();
+ width: 100%;
+ padding-bottom: 24px;
+ }
+
+ &-time {
+ padding-right: 8px;
+ line-height: 40px;
+ flex: 1;
+ .noWrap();
+ }
+
+ &-withdraw {
+ width: 200px;
+ text-align: right;
+ padding-left: 8px;
+ flex-shrink: 0;
+ }
+
+ &-money {
+ line-height: 40px;
+ padding-bottom: 8px;
+ .noWrap();
+ font-weight: 600;
+ font-size: 30px;
+ color: #ff5051;
+ }
+
+ &-status {
+ font-size: 24px;
+ line-height: 36px;
+ color: #999999;
+ .noWrap();
+ }
+ }
}
diff --git a/src/pages/withdraw-record/index.tsx b/src/pages/withdraw-record/index.tsx
index 1baec79..a3cc0de 100644
--- a/src/pages/withdraw-record/index.tsx
+++ b/src/pages/withdraw-record/index.tsx
@@ -1,14 +1,119 @@
import { useShareAppMessage } from '@tarojs/taro';
+import { List, PullRefresh } from '@taroify/core';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import ListPlaceholder from '@/components/list-placeholder';
+import { WithdrawStatusDescriptions } from '@/constants/partner';
+import useInviteCode from '@/hooks/use-invite-code';
+import { WithdrawRecord } from '@/types/partner';
+import { logWithPrefix } from '@/utils/common';
+import { formatMoney, formatTimestamp, getWithdrawList as requestData } from '@/utils/partner';
import { getCommonShareMessage } from '@/utils/share';
+
import './index.less';
const PREFIX = 'withdraw-record';
+const log = logWithPrefix(PREFIX);
+const FIRST_PAGE = 0;
-export default function WithdrawRecord() {
+export default function WithdrawRecords() {
+ const inviteCode = useInviteCode();
+ const [hasMore, setHasMore] = useState(true);
+ const [refreshing, setRefreshing] = useState(false);
+ const [loadingMore, setLoadingMore] = useState(false);
+ const [loadMoreError, setLoadMoreError] = useState(false);
+ const [dataList, setDataList] = useState([]);
+ const currentPage = useRef(FIRST_PAGE);
+
+ const handleRefresh = useCallback(async () => {
+ log('start pull refresh');
+ try {
+ setRefreshing(true);
+ setLoadMoreError(false);
+ const { content, totalPages } = await requestData({ page: 1 });
+ setDataList(content);
+ currentPage.current = 1;
+ setHasMore(currentPage.current < totalPages);
+ log('pull refresh success');
+ } catch (e) {
+ setDataList([]);
+ setHasMore(false);
+ setLoadMoreError(true);
+ currentPage.current = FIRST_PAGE;
+ log('pull refresh failed');
+ } finally {
+ setRefreshing(false);
+ }
+ }, []);
+
+ const handleLoadMore = useCallback(async () => {
+ log('start load more', hasMore);
+ if (!hasMore) {
+ return;
+ }
+ setLoadMoreError(false);
+ setLoadingMore(true);
+ try {
+ const { totalPages, content } = await requestData({ page: currentPage.current + 1 });
+ setDataList([...dataList, ...content]);
+ currentPage.current = currentPage.current + 1;
+ setHasMore(currentPage.current < totalPages);
+ log('load more success');
+ } catch (e) {
+ setLoadMoreError(true);
+ log('load more failed');
+ } finally {
+ setLoadingMore(false);
+ }
+ }, [dataList, hasMore]);
+ // 初始化数据&配置变更后刷新数据
+ useEffect(() => {
+ const refresh = async () => {
+ log('visible changed, start refresh list data');
+ try {
+ setDataList([]);
+ setLoadingMore(true);
+ setLoadMoreError(false);
+ const { totalPages, content } = await requestData({ page: 1 });
+ setDataList(content);
+ currentPage.current = 1;
+ setHasMore(currentPage.current < totalPages);
+ } catch (e) {
+ setDataList([]);
+ setHasMore(false);
+ setLoadMoreError(true);
+ } finally {
+ log('visible changed, refresh list data end');
+ setLoadingMore(false);
+ }
+ };
+ refresh();
+ }, []);
useShareAppMessage(() => {
- return getCommonShareMessage(false);
+ return getCommonShareMessage(false, inviteCode);
});
- return ;
+ return (
+
+
+
+ {dataList.map(item => (
+
+
+
+
{formatTimestamp(item.created)}
+
+
{formatMoney(item.amt)}
+
{WithdrawStatusDescriptions[item.status]}
+
+
+
+
+
+