xuan/TestEShopDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🌈 style(ID1001495): 【面料优选A+】下单返现UI查验

Browse Source 
【【面料优选A+】下单返现UI查验】https://www.tapd.cn/53459131/bugtrace/bugs/view?bug_id=1153459131001001495
This commit is contained in:
xuan 2023-03-10 16:01:25 +08:00
parent b5296aa204
commit 601457e5cb
10 changed files with 121 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/constant.ts
View File

@ -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 = {

2
src/components/returnCashModal/index.tsx
View File

@ -35,7 +35,7 @@ const OrganizationNameModal = (props: PropsType) => {
<View className={styles.organizationNameModal_content}>
<View className={styles.text}>下大货订单，每条布返现12元</View>
<View className={styles.text}>邀请好友下单，每条布返现6元</View>
<View className={styles.activity_rules}>活动规则：每笔订单产生的返佣，在已收货14天后会自动到账账户余额中，期间中途产生的退货条数会自动扣除，每天22:00自动更新收益。</View>
<View className={styles.activity_rules}>活动规则：每笔订单产生的返佣，在已收货14天后会自动到账账户余额中，期间中途产生的退货条数会自动扣除，每天09:00自动更新收益。</View>
</View>
<View className={styles.organizationNameModal_bottomBar} onClick={handleClose}>
<Text>我知道了</Text>

30
src/pages/activityIncome/index.tsx
View File

@ -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 () => {
<View className={styles.header_balance_total}>
<View className={styles.balance}>
<View>账户余额（元）</View>
<View className={styles.balance_num}>{formatPriceDiv(state.data.balance).toLocaleString()}</View>
<View className={styles.accumulative_count}>累计收益<Text>{formatPriceDiv(state.data.total_income).toLocaleString()}</Text>元</View>
<View className={styles.balance_num}>{formatPriceDiv(state.data.balance, 100, true)}</View>
<View className={styles.accumulative_count}>累计收益<Text>{formatPriceDiv(state.data.total_income, 100, true)}</Text>元</View>
</View>
<View className={styles.withdraw} onClick={openWithdraw}>
<IconFont name="icon-lijitixian" size={37} />
@ -46,16 +46,16 @@ export default () => {
<IconFont name="icon-rukou" color="#fff" size={35} />
</View>
</View>
<Divider direction="horizontal" customStyles={{ margin: '0', opacity: '0.6', transform: 'translateY(1px) scaleY(0.6)' }}></Divider>
<Divider direction="horizontal" customStyles={{ margin: '0', opacity: '0.3', transform: 'translateY(1px) scaleY(0.6)' }}></Divider>
<View className={styles.price_list}>
<View className={styles.price_list_item}>
<Text>今日收益（元）</Text>
<Text>{formatPriceDiv(state.data.today_income).toLocaleString()}</Text>
<Text>昨日收益（元）</Text>
<Text>{formatPriceDiv(state.data.today_income, 100, true)}</Text>
</View>
<Divider direction="vertical" customStyles={{ margin: '0', height: '100rpx', opacity: '0.6', transform: 'scaleX(0.6)' }}></Divider>
<Divider direction="vertical" customStyles={{ margin: '0', height: '100rpx', opacity: '0.3', transform: 'scaleX(0.6)' }}></Divider>
<View className={styles.price_list_item}>
<Text>近14日收益（元）</Text>
<Text>{formatPriceDiv(state.data.recently_fourteen_day_income).toLocaleString()}</Text>
<Text>{formatPriceDiv(state.data.recently_fourteen_day_income, 100, true)}</Text>
</View>
</View>
</View>
@ -65,7 +65,7 @@ export default () => {
<Text>待结算收益（元）</Text>
<IconFont name="icon-tishi" size={30}></IconFont>
</View>
<View className={styles.price}>{formatPriceDiv(state.data.wait_settle_income).toLocaleString()}</View>
<View className={styles.price}>{formatPriceDiv(state.data.wait_settle_income, 100, true)}</View>
</View>
<View className={styles.card}>
<View className={styles.title}>
@ -74,11 +74,11 @@ export default () => {
</View>
<View className={styles.card_list}>
<View className={styles.card_item}>
<Text>{state.data.wait_settle_bulk_roll}条</Text>
<Text>{state.data.wait_settle_bulk_roll || 0}条</Text>
<Text>大货条数</Text>
</View>
<View className={styles.card_item}>
<Text>{formatPriceDiv(state.data.wait_settle_bulk_income).toLocaleString()}元</Text>
<Text>{formatPriceDiv(state.data.wait_settle_bulk_income, 100, true)}元</Text>
<Text>大货收益</Text>
</View>
</View>
@ -90,19 +90,19 @@ export default () => {
</View>
<View className={styles.card_list}>
<View className={styles.card_item}>
<Text>{state.data.passive_wait_settle_bulk_roll}条</Text>
<Text>{state.data.passive_wait_settle_bulk_roll || 0}条</Text>
<Text>大货条数</Text>
</View>
<View className={styles.card_item}>
<Text>{formatPriceDiv(state.data.passive_wait_settle_bulk_income).toLocaleString()}元</Text>
<Text>{formatPriceDiv(state.data.passive_wait_settle_bulk_income, 100, true)}元</Text>
<Text>大货收益</Text>
</View>
<View className={styles.card_item}>
<Text>{state.data.passive_wait_settle_user_nums}元</Text>
<Text>{state.data.passive_wait_settle_user_nums || 0}位</Text>
<Text>下单用户</Text>
</View>
<View className={styles.card_item}>
<Text>{state.data.passive_wait_settle_bulk_order_nums}元</Text>
<Text>{state.data.passive_wait_settle_bulk_order_nums || 0}单</Text>
<Text>订单数量</Text>
</View>
</View>

4
src/pages/index/index.tsx
View File

@ -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 = () => {
<View className={classNames(styles.grid_item, styles.grid_left)} onClick={() => handleClickHomeItem('高端奢侈')}>
{/* 高端奢侈 */}
<View className={styles.grid_left_image}>
<Image className="full-100" src={HOME_ITEM1} mode="aspectFit" />
<Image className="full-100" src={HOME_ITEM4} mode="aspectFit" />
</View>
</View>
<View className={classNames(styles.grid_item, styles.grid_top)} onClick={() => handleClickHomeItem('热销走量')}>

48
src/pages/order/components/addressInfoDetail/index.module.scss
View File

@ -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;

23
src/pages/order/components/addressInfoDetail/index.tsx
View File

@ -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,18 +199,20 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
<View onClick={() => changeShow()} className={styles.order_address_text_con}>
<View className={styles.order_address_text_title}>
<Text className={classnames(styles.address_text, styles.address_text_no)}>{formatAddress || '请选择收货地址及信息'}</Text>
{receivingStatus == 2 && !logisticsShow && <Text className={classnames(styles.moreIconfont, 'iconfont icon-a-moreback')}></Text>}
{receivingStatus == 2 && !logisticsShow && <IconFont name="icon-rukou" size={40} color="#ccc"></IconFont>}
</View>
<Divider direction="horizontal" customStyles={{ margin: '10px 0 0' }}></Divider>
<View className={styles.order_address_text_name}>
<Text>{receivingStatus == 1 ? '谭先生' : addressInfo?.target_user_name}</Text>
<Text>{receivingStatus == 1 ? addressInfo?.take_goods_phone : addressInfo?.target_user_phone}</Text>
</View>
</View>
{(!logisticsShow && (
<Text className={styles.name}>{receivingStatus == 1 ? '谭先生' : addressInfo?.target_user_name}</Text>
<Text className={styles.phone}>{receivingStatus == 1 ? addressInfo?.take_goods_phone : addressInfo?.target_user_phone}</Text>
{
!logisticsShow
? (
<View className={styles.updateBtn}>
<View
className={classnames(styles.updateBtn_item)}
onClick={handleTips}
style={{ marginRight: '24rpx' }}
>
<Text style={{ marginRight: '3px' }}>自提</Text>
<IconFont name="icon-tishi" size={30} color="#666666"></IconFont>
@ -236,13 +239,15 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
</View> */}
{/* <View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View> */}
</View>
))
|| (orderInfo?.status != SaleOrderStatusRefund.value && (
)
: (orderInfo?.status != SaleOrderStatusRefund.value && (
<View className={styles.logisticsBtn} onClick={onLogistics}>
查看物流
</View>
))}
</View>
</View>
</View>
<Popup show={showAddressList} showTitle={false} onClose={() => setShowAddressList(false)}>
<View className={styles.order_address_list}>
<View className={styles.order_address_title}>请选择收货地址</View>

26
src/pages/order/components/kindList/index.module.scss
View File

@ -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;

16
src/pages/order/components/kindList/index.tsx
View File

@ -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 (
<View key={item.product_code} className={styles.order_list}>
<View className={styles.order_list_title}>
<View className={styles.title}>
{formatHashTag(item.code, item.name)}
<View className={styles.tag}>{order.sale_mode_name}</View>
<View className={styles.title}>{formatHashTag(item.code, item.name)}</View>
</View>
{!item.is_screw_recommend
? <View className={styles.num}>共{item?.product_colors.length}种</View>
: <View className={styles.label}>配套螺纹</View>}
</View>
<Divider direction="horizontal" customStyles={{ margin: '10px 0', marginBottom: '0' }}></Divider>
<View className={styles.order_list_scroll}>
{item?.product_colors?.map((colorItem) => {
return (
@ -225,6 +229,7 @@ const KindList = ({ order, comfirm = false }: Param) => {
<LabAndImg value={{ lab: colorItem.lab, rgb: colorItem.rgb, texture_url: colorItem.texture_url }} showStatus={false} />
</View>
<View className={styles.order_list_item_con}>
<View className={styles.order_list_item_container}>
<View className={styles.order_list_item_des}>
<View className={styles.order_list_item_title}>
{`${colorItem.code} ${colorItem.name}`}
@ -232,9 +237,6 @@ const KindList = ({ order, comfirm = false }: Param) => {
{colorItem?.apply_return_roll > 0 && <Text>{`待退${colorItem?.apply_return_roll}条`}</Text>}
</View>
<View className={styles.order_list_item_price}>
{/* {
order?.sale_mode === 0 && colorItem?.standard_sale_price > colorItem.sale_price && <View className={styles.lastPrice}>¥{standardPrice(colorItem.standard_sale_price)}</View>
} */}
<>
¥{standardPrice(colorItem.sale_price)}
{aboutWeight(colorItem.estimate_weight)}
@ -244,14 +246,16 @@ const KindList = ({ order, comfirm = false }: Param) => {
<View className={styles.order_list_item_count}>
<View className={styles.count_num}>
×{formatCount(colorItem)}
<text>{order.unit}</text>
<Text>{order.unit}</Text>
</View>
<View className={styles.count_price}>
<text>¥</text>
<Text>¥</Text>
{colorPrice(colorItem)}
</View>
</View>
</View>
<Divider direction="horizontal" customStyles={{ marginTop: '10px', marginLeft: '30rpx', marginBottom: '0' }}></Divider>
</View>
</View>
)
})}

4
src/pages/user/index.module.scss
View File

@ -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;
}
}

2
src/pages/user/index.tsx
View File

@ -188,7 +188,7 @@ export default () => {
<View className={styles.earnings_con}>
<View className={styles.earnings_price}>
<Text className={styles.earnings_title}>活动返现收益（元）</Text>
<View className={styles.earnings_total}><Text>¥</Text> <Text className={styles.all_earnings}>{formatPriceDiv(state.data.total_income).toLocaleString()}</Text> <View className={styles.today_earnings}>今日收益 {formatPriceDiv(state.data.today_income).toLocaleString()}</View></View>
<View className={styles.earnings_total}><Text>¥</Text> <Text className={styles.all_earnings}>{formatPriceDiv(state.data.total_income, 100, true)}</Text> <View className={styles.today_earnings}>今日收益 {formatPriceDiv(state.data.today_income, 100, true)}</View></View>
</View>
<View className={styles.more} onClick={() => goLink('/pages/activityIncome/index')}><Text>查看收益</Text><IconFont name="icon-rukou" size={30} /></View>
</View>