This commit is contained in:
2022-07-09 14:45:45 +08:00
parent 458147dac3
commit 148671a2e2
7 changed files with 79 additions and 34 deletions
@@ -3,6 +3,15 @@
align-items: center;
justify-content: space-between;
width: 100%;
.close{
width: 100vw;
height: 100vh;
position: fixed;
z-index: 999;
top: 0;
left: 0;
word-break: break-all;
}
&:nth-last-child(n+2) {
margin-bottom: 30px;
}
@@ -12,6 +21,7 @@
display: flex;
.iconfont_msg{
position: relative;
}
.miconfont{
font-size: 26px;
@@ -28,16 +38,15 @@
padding: 10px;
box-sizing: border-box;
&::before{
z-index: 1;
z-index: 99;
position: absolute;
bottom: -7px;
left: 10px;
width: 15px;
height: 15px;
width: 0;
height: 0;
content: " ";
transform: rotate(45deg);
background: #A8B3BD;
box-sizing: border-box;
left: 10px;
bottom: -20px;
border: 10px solid transparent;
border-top-color: #A8B3BD;
}
}
}
@@ -10,19 +10,23 @@ type Param = {
title?: string,
titleStatus?: true|false, //true 标题加大加深
numberStatus?: 0|1|2, //数字尺寸
messageTitle: string,
messageHeight: number,
messageWidth: number
}
export default memo(({style, number = 0, titleStatus = true, title = '', numberStatus = 1}:Param) => {
export default memo(({style, number = 0, titleStatus = true, title = '', numberStatus = 1, messageHeight = 100, messageWidth = 260}:Param) => {
return (
<>
<View className={styles.order_price}>
<View className={classnames(styles.order_price_text, titleStatus&&styles.emphasis)}>
<Text>{title}</Text>
<View className={styles.iconfont_msg}>
{/* <View style={{height:`${messageHeight}rpx`, top:`${-messageHeight}rpx`, width: `${messageWidth}rpx`}} className={classnames(styles.message)}>1231231231212123123123lll12312123123lll12312123123lll12312</View> */}
<Text className={classnames(styles.miconfont, 'iconfont icon-zhushi')}></Text>
{/* <View className={classnames(styles.message)}>123123123121212312312312312</View> */}
</View>
</View>
<AmountShow status={numberStatus} number={number}/>
{/* <View className={styles.close} catchMove></View> */}
</View>
</>
)
+12 -9
View File
@@ -11,14 +11,17 @@ import { userassets, userorderStatistics } from "@/api/mine"
import { formatPriceDiv } from "@/common/fotmat"
import { useDidShow, } from '@tarojs/taro'
import { GetAdminUserInfoApi } from "@/api/user";
export default () => {
//重新获取用户信息
const {fetchData: useFetchData} = GetAdminUserInfoApi()
const [userDataAgain, setUserDataAgain] = useState<any>({})
const getUserData = async () => {
let res = await useFetchData()
setUserDataAgain(res.data)
}
// const {fetchData: useFetchData} = GetAdminUserInfoApi()
// const [userDataAgain, setUserDataAgain] = useState<any>({})
// const getUserData = async () => {
// let res = await useFetchData()
// setUserDataAgain(res.data)
// }
// 用户信息
@@ -42,7 +45,7 @@ export default () => {
}, [])
useDidShow(() => {
ApigetTotal()
getUserData()
// getUserData()
})
const checkGo = () => {
if (adminUserInfo?.authentication_status === 0 || adminUserInfo?.authentication_status === 1 || adminUserInfo?.authentication_status === 2 || adminUserInfo?.authentication_status === 3) {
@@ -67,8 +70,8 @@ export default () => {
}
return (
<View className={styles.main}>
<Header data={userDataAgain} MenuData={stateData} />
<Assets data={state} checkShow={() => checkGo()} userInfo={userDataAgain}/>
<Header data={adminUserInfo} MenuData={stateData} />
<Assets data={state} checkShow={() => checkGo()} userInfo={adminUserInfo}/>
<Main />
{/* {(adminUserInfo as any)?.authentication_status==1&&<Modal data={adminUserInfo}/>} */}
{/* 测试暂时添加 */}