diff --git a/src/common/constant.ts b/src/common/constant.ts
index 898a1e9..6d1f580 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -53,6 +53,7 @@ export const PAY_H5_CODE_URL = CURRENT_PAY_H5_CODE_URL
export const HOME_ITEM1 = getCDNSource('/mall/home_item1.png')
export const HOME_ITEM2 = getCDNSource('/mall/home_item2.png')
export const HOME_ITEM3 = getCDNSource('/mall/home_item3.png')
+export const HOME_ITEM4 = getCDNSource('/mall/home_item4.png')
// 场景值
export const SCENE = {
diff --git a/src/components/returnCashModal/index.tsx b/src/components/returnCashModal/index.tsx
index 2ecf27c..08c17a2 100644
--- a/src/components/returnCashModal/index.tsx
+++ b/src/components/returnCashModal/index.tsx
@@ -35,7 +35,7 @@ const OrganizationNameModal = (props: PropsType) => {
下大货订单,每条布返现12元
邀请好友下单,每条布返现6元
- 活动规则:每笔订单产生的返佣,在已收货14天后会自动到账账户余额中,期间中途产生的退货条数会自动扣除,每天22:00自动更新收益。
+ 活动规则:每笔订单产生的返佣,在已收货14天后会自动到账账户余额中,期间中途产生的退货条数会自动扣除,每天09:00自动更新收益。
我知道了
diff --git a/src/pages/activityIncome/index.tsx b/src/pages/activityIncome/index.tsx
index 0023131..a928603 100644
--- a/src/pages/activityIncome/index.tsx
+++ b/src/pages/activityIncome/index.tsx
@@ -15,7 +15,7 @@ export default () => {
Taro.showModal({
title: '提示',
showCancel: false,
- content: '每笔订单产生的返佣,在已收货14天后会自动到账账户余额中,期间中途产生的退货条数会自动扣除,每天9:00自动更新收益。',
+ content: '每笔订单产生的返佣,在已收货14天后会自动到账账户余额中,期间中途产生的退货条数会自动扣除,每天09:00自动更新收益。',
confirmColor: '#337fff',
confirmText: '我知道了',
})
@@ -37,8 +37,8 @@ export default () => {
账户余额(元)
- {formatPriceDiv(state.data.balance).toLocaleString()}
- 累计收益{formatPriceDiv(state.data.total_income).toLocaleString()}元
+ {formatPriceDiv(state.data.balance, 100, true)}
+ 累计收益{formatPriceDiv(state.data.total_income, 100, true)}元
@@ -46,16 +46,16 @@ export default () => {
-
+
- 今日收益(元)
- {formatPriceDiv(state.data.today_income).toLocaleString()}
+ 昨日收益(元)
+ {formatPriceDiv(state.data.today_income, 100, true)}
-
+
近14日收益(元)
- {formatPriceDiv(state.data.recently_fourteen_day_income).toLocaleString()}
+ {formatPriceDiv(state.data.recently_fourteen_day_income, 100, true)}
@@ -65,7 +65,7 @@ export default () => {
待结算收益(元)
- {formatPriceDiv(state.data.wait_settle_income).toLocaleString()}
+ {formatPriceDiv(state.data.wait_settle_income, 100, true)}
@@ -74,11 +74,11 @@ export default () => {
- {state.data.wait_settle_bulk_roll}条
+ {state.data.wait_settle_bulk_roll || 0}条
大货条数
- {formatPriceDiv(state.data.wait_settle_bulk_income).toLocaleString()}元
+ {formatPriceDiv(state.data.wait_settle_bulk_income, 100, true)}元
大货收益
@@ -90,19 +90,19 @@ export default () => {
- {state.data.passive_wait_settle_bulk_roll}条
+ {state.data.passive_wait_settle_bulk_roll || 0}条
大货条数
- {formatPriceDiv(state.data.passive_wait_settle_bulk_income).toLocaleString()}元
+ {formatPriceDiv(state.data.passive_wait_settle_bulk_income, 100, true)}元
大货收益
- {state.data.passive_wait_settle_user_nums}元
+ {state.data.passive_wait_settle_user_nums || 0}位
下单用户
- {state.data.passive_wait_settle_bulk_order_nums}元
+ {state.data.passive_wait_settle_bulk_order_nums || 0}单
订单数量
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index 5eec1d4..8b8a9ad 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -12,7 +12,7 @@ import useLogin from '@/use/useLogin'
import { dataLoadingStatus } from '@/common/util'
import IconFont from '@/components/iconfont/iconfont'
import IconText from '@/components/iconText'
-import { HOME_ITEM1, HOME_ITEM2, HOME_ITEM3 } from '@/common/constant'
+import { HOME_ITEM1, HOME_ITEM2, HOME_ITEM3, HOME_ITEM4 } from '@/common/constant'
import { EnumLabelPageJumpApi, GetLabelProductsApi } from '@/api/search'
const Index = () => {
@@ -169,7 +169,7 @@ const Index = () => {
handleClickHomeItem('高端奢侈')}>
{/* 高端奢侈 */}
-
+
handleClickHomeItem('热销走量')}>
diff --git a/src/pages/order/components/addressInfoDetail/index.module.scss b/src/pages/order/components/addressInfoDetail/index.module.scss
index 1bdc18b..64c6f0e 100644
--- a/src/pages/order/components/addressInfoDetail/index.module.scss
+++ b/src/pages/order/components/addressInfoDetail/index.module.scss
@@ -23,51 +23,47 @@
flex-direction: column;
justify-content: space-between;
.order_address_text_title {
- font-size: $font_size_medium;
+ font-size: 28px;
margin-top: 10px;
display: flex;
justify-content: space-between;
- .moreIconfont {
- font-size: 20px;
- padding-top: 10px;
- }
+ align-items: center;
.address_text {
word-break: break-all;
}
.address_text_no {
- font-weight: 700;
+ font-weight: 550;
+ font-size: 28px;
padding-left: 20px;
}
}
.order_address_text_name {
- margin-top: 30px;
+ margin-top: 10px;
align-items: center;
- text {
- &:nth-child(1) {
- color: #000;
- font-weight: 700;
- font-size: $color_font_one;
- margin-right: 40px;
- }
- &:nth-child(2) {
- color: $color_font_one;
- font-size: $font_size_medium;
- }
+ display: flex;
+ flex-flow: row nowrap;
+ align-items: center;
+ .name {
+ width: 110px;
+ @include common_ellipsis();
+ color: #333333;
+ font-size: 28px;
+ }
+ .phone {
+ text-align: center;
+ flex: 1;
+ color: #333333;
+ font-size: 28px;
}
}
}
.updateBtn {
- width: 200px;
+ flex: 1;
font-size: $font_size_min;
- // background-color: #f0f0f0;
height: 64px;
- // border-radius: 24px;
color: $color_font_two;
- position: absolute;
- bottom: 10px;
- right: 10px;
- z-index: 999;
display: flex;
+ justify-content: flex-end;
.updateBtn_list {
position: absolute;
display: flex;
@@ -80,15 +76,13 @@
.updateBtn_item {
display: flex;
align-items: center;
- flex: 1;
text-align: center;
line-height: 64px;
color: #666666;
+ font-size: 28px;
}
.updateBtn_item_select_update {
- // background-color: #007aff;
color: #007aff;
- // border-radius: 24px;
}
.updateBtn_select {
color: #fff;
diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx
index 220df82..89a7c41 100644
--- a/src/pages/order/components/addressInfoDetail/index.tsx
+++ b/src/pages/order/components/addressInfoDetail/index.tsx
@@ -1,4 +1,4 @@
-import { Text, View } from '@tarojs/components'
+import { Icon, Text, View } from '@tarojs/components'
import Taro from '@tarojs/taro'
import classnames from 'classnames'
import { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
@@ -12,6 +12,7 @@ import { debounce, throttle } from '@/common/util'
import AddressList from '@/components/AddressList'
import Popup from '@/components/popup'
import IconFont from '@/components/iconfont/iconfont'
+import Divider from '@/components/divider'
interface Param {
onSelect?: (val: any) => void // 选择地址
@@ -198,29 +199,31 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
changeShow()} className={styles.order_address_text_con}>
{formatAddress || '请选择收货地址及信息'}
- {receivingStatus == 2 && !logisticsShow && }
+ {receivingStatus == 2 && !logisticsShow && }
+
- {receivingStatus == 1 ? '谭先生' : addressInfo?.target_user_name}
- {receivingStatus == 1 ? addressInfo?.take_goods_phone : addressInfo?.target_user_phone}
-
-
- {(!logisticsShow && (
-
-
- 自提
-
-
- onReceivingStatus(2, e)}
- >
+ {receivingStatus == 1 ? '谭先生' : addressInfo?.target_user_name}
+ {receivingStatus == 1 ? addressInfo?.take_goods_phone : addressInfo?.target_user_phone}
+ {
+ !logisticsShow
+ ? (
+
+
+ 自提
+
+
+ onReceivingStatus(2, e)}
+ >
物流
-
- {/*
+
+ {/*
onReceivingStatus(1, e)}
@@ -234,14 +237,16 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
物流
*/}
- {/* */}
-
- ))
- || (orderInfo?.status != SaleOrderStatusRefund.value && (
-
+ {/* */}
+
+ )
+ : (orderInfo?.status != SaleOrderStatusRefund.value && (
+
查看物流
-
- ))}
+
+ ))}
+
+
setShowAddressList(false)}>
diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss
index 31ec755..e57881c 100644
--- a/src/pages/order/components/kindList/index.module.scss
+++ b/src/pages/order/components/kindList/index.module.scss
@@ -9,7 +9,7 @@
.orders_list_con {
background-color: #fff;
border-radius: 20px;
- padding: 20px;
+ padding: 20px 32px;
z-index: 999;
position: relative;
.order_list {
@@ -21,15 +21,16 @@
align-items: center;
.tag {
font-size: $font_size_min;
- background-color: #cde5ff;
+ background-color: $color_main;
padding: 5px 10px;
border-radius: 6px;
- color: $color_main;
+ color: white;
+ margin-left: 10px;
}
.title {
+ display: flex;
font-weight: 700;
font-size: $font_size;
- margin-left: 20px;
flex: 1;
}
.num {
@@ -61,16 +62,22 @@
border-radius: 20px;
}
.order_list_item_con {
- display: flex;
width: 100%;
flex: 1;
- border-bottom: 1px solid #f0f0f0;
- height: 150px;
- padding-top: 20px;
+ display: flex;
+ flex-flow: column nowrap;
+ }
+ .order_list_item_container {
+ display: flex;
+ width: 100%;
+ height: 126px;
box-sizing: border-box;
}
.order_list_item_des {
flex: 1;
+ display: flex;
+ flex-flow: column nowrap;
+ justify-content: space-between;
box-sizing: border-box;
padding-left: 30px;
.order_list_item_title {
@@ -115,7 +122,8 @@
}
.order_list_item_count {
display: flex;
- flex-direction: column;
+ flex-flow: column nowrap;
+ justify-content: space-between;
align-items: flex-end;
.count_num {
color: $color_main;
diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx
index 95a5f9d..e5e64f0 100644
--- a/src/pages/order/components/kindList/index.tsx
+++ b/src/pages/order/components/kindList/index.tsx
@@ -9,6 +9,7 @@ import IconFont from '@/components/iconfont/iconfont'
import ReturnCashModal from '@/components/returnCashModal'
import Popup from '@/components/popup'
import Dialog from '@/components/Dialog'
+import Divider from '@/components/divider'
interface OrderParam {
estimate_amount: number // 预估金额
@@ -211,12 +212,15 @@ const KindList = ({ order, comfirm = false }: Param) => {
return (
- {order.sale_mode_name}
- {formatHashTag(item.code, item.name)}
+
+ {formatHashTag(item.code, item.name)}
+ {order.sale_mode_name}
+
{!item.is_screw_recommend
? 共{item?.product_colors.length}种
: 配套螺纹}
+
{item?.product_colors?.map((colorItem) => {
return (
@@ -225,32 +229,32 @@ const KindList = ({ order, comfirm = false }: Param) => {
-
-
- {`${colorItem.code} ${colorItem.name}`}
- {colorItem?.return_roll > 0 && {`已退${colorItem?.return_roll}条`}}
- {colorItem?.apply_return_roll > 0 && {`待退${colorItem?.apply_return_roll}条`}}
-
-
- {/* {
- order?.sale_mode === 0 && colorItem?.standard_sale_price > colorItem.sale_price && ¥{standardPrice(colorItem.standard_sale_price)}
- } */}
- <>
+
+
+
+ {`${colorItem.code} ${colorItem.name}`}
+ {colorItem?.return_roll > 0 && {`已退${colorItem?.return_roll}条`}}
+ {colorItem?.apply_return_roll > 0 && {`待退${colorItem?.apply_return_roll}条`}}
+
+
+ <>
¥{standardPrice(colorItem.sale_price)}
- {aboutWeight(colorItem.estimate_weight)}
- >
+ {aboutWeight(colorItem.estimate_weight)}
+ >
+
-
-
-
+
+
×{formatCount(colorItem)}
- {order.unit}
-
-
- ¥
- {colorPrice(colorItem)}
+ {order.unit}
+
+
+ ¥
+ {colorPrice(colorItem)}
+
+
)
diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss
index afadf40..3518802 100644
--- a/src/pages/user/index.module.scss
+++ b/src/pages/user/index.module.scss
@@ -17,13 +17,11 @@
position: relative;
overflow: hidden;
.user_main__header_con {
- min-height: 315px;
position: relative;
overflow: hidden;
}
.header_bg {
width: 100%;
- height: 100%;
position: absolute;
top: 0;
left: 0;
@@ -338,6 +336,7 @@
display: flex;
margin-top: 8px;
align-items: center;
+ vertical-align: baseline;
.all_earnings {
font-size: 39px;
font-weight: bold;
@@ -359,6 +358,7 @@
color: #4581ff;
font-size: 28px;
display: flex;
+ font-weight: 500;
align-items: center;
}
}
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index 8626abc..65cbc48 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -188,7 +188,7 @@ export default () => {
活动返现收益(元)
- ¥ {formatPriceDiv(state.data.total_income).toLocaleString()} 今日收益 {formatPriceDiv(state.data.today_income).toLocaleString()}
+ ¥ {formatPriceDiv(state.data.total_income, 100, true)} 今日收益 {formatPriceDiv(state.data.today_income, 100, true)}
goLink('/pages/activityIncome/index')}>查看收益