Skip to content

J
jinfa-platform
Commit eedf7dfb authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

fixbug

parent a8e67237
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 25 deletions
src/pages/member/components/EquityInfo/index.tsx
View file @ eedf7dfb
......@@ -96,7 +96,7 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
},
{
title: '会员权益名称',
dataIndex: 'rightTypeName ',
dataIndex: 'rightTypeName',
align: 'center',
},
{
......@@ -288,7 +288,7 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
<div className={styles.exhibition}>
<div className={styles['exhibition-left']}>
<div className={styles['exhibition-title']}>
可用积分
已用积分/可用积分
</div>
<div className={styles['exhibition-amount']}>
{equityInfo?.sumUsedPoint}/{equityInfo?.sumPoint}
......
src/pages/member/components/SincerityInfo/index.tsx
View file @ eedf7dfb
......@@ -327,7 +327,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
switch (item.star) {
case 1:
case 2: {
target = ret[0];
target = ret[2];
break;
}
......@@ -338,7 +338,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
case 4:
case 5: {
target = ret[2];
target = ret[0];
break;
}
......@@ -373,9 +373,9 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
const getSummaryEvaluatePie = (data: EstimateSumItems[]) => {
const source = data || [];
const count = source.reduce((pre, now) => now.sum + pre, 0);
const bad = source[0] && source[0].sum ? source[0].sum : 0;
const good = source[0] && source[0].sum ? source[0].sum : 0;
const notBad = source[1] && source[1].sum ? source[1].sum : 0;
const good = source[2] && source[2].sum ? source[2].sum : 0;
const bad = source[2] && source[2].sum ? source[2].sum : 0;
const ret = [
{
......@@ -522,9 +522,10 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<Col span={24}>
<Spin spinning={Boolean(basicInfo.loading)}>
<Row gutter={24}>
<Col span={8}>
<Col flex="386px">
<MellowCard
title="信用积分"
fullHeight
>
<Pie
hasLegend
......@@ -538,9 +539,9 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
</Col>
{basicInfo.loading === false && (
<Col span={16}>
<Col flex="1">
<div className={styles.tofo}>
<MellowCard>
<MellowCard fullHeight>
{integralItems.map(item => (
<Card.Grid key={item.id} className={styles['tofo-item']}>
<ContentBox
......@@ -581,7 +582,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<TabPane tab="交易评价统计" key="evaluateSum">
<Spin spinning={Boolean(salesEstimateSum.loading)}>
<Row gutter={24}>
<Col span={8}>
<Col flex="386px">
<Pie
hasLegend
subTitle="累计评价"
......@@ -595,7 +596,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
/>
</Col>
<Col span={16}>
<Col flex="1">
<PolymericTable
dataSource={salesEvaluate}
columns={evaluateColumns}
......@@ -645,7 +646,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
<TabPane tab="售后评价统计" key="evaluateSum">
<Spin spinning={Boolean(afterEstimateSum.loading)}>
<Row gutter={24}>
<Col span={8}>
<Col flex="386px">
<Pie
hasLegend
subTitle="累计评价"
......@@ -659,7 +660,7 @@ const SincerityInfo: React.FC<SincerityInfoProps> = ({
/>
</Col>
<Col span={16}>
<Col flex="1">
<PolymericTable
dataSource={afterEvaluate}
columns={evaluateColumns}
......
src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/effects/repayment/useBusinessEffects.ts
View file @ eedf7dfb
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-10-22 17:31:08
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-04 09:56:33
* @LastEditTime: 2020-11-24 10:40:03
* @Description: 联动逻辑相关
*/
import { FormEffectHooks, FormPath } from '@formily/antd';
......@@ -32,4 +32,14 @@ export const useBusinessEffects = (context, actions) => {
onFieldInputChange$('amountSlide').subscribe(fieldState => {
linkage.value('repayQuota', `${fieldState.value}`);
});
// 支付方式 联动 支付渠道
onFieldValueChange$('tradeType').subscribe(fieldState => {
const { value } = fieldState;
if (value === 2) {
linkage.hide('tradeChannel');
} else {
linkage.show('tradeChannel');
}
});
}
\ No newline at end of file
src/pages/payandSettle/creditApplication/quotaMenage/detail/components/IntroduceRow/schema/index.ts
View file @ eedf7dfb
......@@ -139,7 +139,7 @@ export const uploadVoucherModalSchema: ISchema = {
},
'x-rules': [
{
required: true,
required: false,
message: '请上传支付凭证',
},
],
......
src/pages/transaction/purchaserEvaluation/analysis/index.tsx
View file @ eedf7dfb
......@@ -86,7 +86,7 @@ const Analysis: React.FC<AnalysisProps> = ({
switch (item.star) {
case 1:
case 2: {
target = ret[0];
target = ret[2];
break;
}
......@@ -97,7 +97,7 @@ const Analysis: React.FC<AnalysisProps> = ({
case 4:
case 5: {
target = ret[2];
target = ret[0];
break;
}
......@@ -132,9 +132,9 @@ const Analysis: React.FC<AnalysisProps> = ({
const getSummaryEvaluatePie = (data: EstimateSumItems[]) => {
const source = data || [];
const count = source.reduce((pre, now) => now.sum + pre, 0);
const bad = source[0] && source[0].sum ? source[0].sum : 0;
const good = source[0] && source[0].sum ? source[0].sum : 0;
const notBad = source[1] && source[1].sum ? source[1].sum : 0;
const good = source[2] && source[2].sum ? source[2].sum : 0;
const bad = source[2] && source[2].sum ? source[2].sum : 0;
const ret = [
{
......
src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx
View file @ eedf7dfb
......@@ -107,7 +107,7 @@ const EvaluateOrder: React.FC = () => {
};
});
PublicApi.postMemberCommentSupplyOrderTradeSubmit({
PublicApi.postMemberCommentConsumerOrderTradeSubmit({
commentSubmitDetailList: payload,
}).then(res => {
if (res.code === 1000) {
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/schema/index.ts
View file @ eedf7dfb
......@@ -405,6 +405,12 @@ export const addBillSchema: ISchema = {
renderAddition: () => null,
renderRemove: '{{renderListTableRemove}}',
},
'x-rules': [
{
required: true,
message: '请添加单据明细',
},
],
items: {
type: 'object',
properties: {
......
src/pages/transaction/supplierEvaluation/analysis/index.tsx
View file @ eedf7dfb
......@@ -86,7 +86,7 @@ const Analysis: React.FC<AnalysisProps> = ({
switch (item.star) {
case 1:
case 2: {
target = ret[0];
target = ret[2];
break;
}
......@@ -97,7 +97,7 @@ const Analysis: React.FC<AnalysisProps> = ({
case 4:
case 5: {
target = ret[2];
target = ret[0];
break;
}
......@@ -132,9 +132,9 @@ const Analysis: React.FC<AnalysisProps> = ({
const getSummaryEvaluatePie = (data: EstimateSumItems[]) => {
const source = data || [];
const count = source.reduce((pre, now) => now.sum + pre, 0);
const bad = source[0] && source[0].sum ? source[0].sum : 0;
const good = source[0] && source[0].sum ? source[0].sum : 0;
const notBad = source[1] && source[1].sum ? source[1].sum : 0;
const good = source[2] && source[2].sum ? source[2].sum : 0;
const bad = source[2] && source[2].sum ? source[2].sum : 0;
const ret = [
{
......
src/pages/transaction/supplierEvaluation/unevaluated/schema/index.tsx
View file @ eedf7dfb
......@@ -45,7 +45,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
supplyMembersName: {
membersName: {
type: 'string',
default: undefined,
'x-component-props': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment