Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into dev

This commit is contained in:
czm 2022-06-07 17:58:24 +08:00
commit 5299e74da7
4 changed files with 11 additions and 11 deletions

View File

@ -91,7 +91,7 @@
margin-right: 10px;
color: #007AFF;
}
.credit-line-card-bottom-item:nth-of-type(2) .credit-line-card-bottom-item-title text{
.credit-line-card-bottom-item:nth-child(2) .credit-line-card-bottom-item-title text{
font-size: 28px;
}
.credit-line-card-bottom-item-price{

View File

@ -1,6 +1,6 @@
import AddressList from "@/components/AddressList"
import { Button, Canvas, ScrollView, Text, View } from "@tarojs/components"
import { Button, Canvas, Navigator, ScrollView, Text, View } from "@tarojs/components"
import Taro, { useReady } from "@tarojs/taro"
import { useEffect, useState } from "react"
import {creditInfoApi} from "@/api/creditLine"
@ -141,13 +141,13 @@ export default ()=>{
</View>
<View className="credit-line-card-bottom-item-price"><Text>¥</Text>{Number(data.credit_quota_line[0])?.toLocaleString()}<Text>.{data.credit_quota_line[1]}</Text></View>
</View>
<View className="credit-line-card-bottom-item">
<Navigator hoverClass="none" url="/pages/creditUsed/index" className="credit-line-card-bottom-item">
<View className="credit-line-card-bottom-item-title">
<Text style={style.bottomTitle} className="iconfont icon-tick-pressed"></Text>
<View></View>
</View>
<View className="credit-line-card-bottom-item-price"><Text>¥</Text>{Number(data?.credit_quota_used_line[0])?.toLocaleString()}<Text>.{data.credit_quota_used_line[1]}</Text></View>
</View>
</Navigator>
</View>
</View>
</View>

View File

@ -150,7 +150,7 @@
display: grid;
grid-template-columns: repeat(3,1fr);
}
.assets-content>view{
.assets-content>view,.assets-content>navigator{
text-align: center;
}
.assets-content-item-top{

View File

@ -97,17 +97,17 @@ const Header = memo(() => {
// 我的资产
const Assets = () => {
return (
<Navigator hoverClass="none" url="/pages/depositBeforehand/index" className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
<View className={`${styles.assets} ${styles.crad} ${styles['main-card']}`}>
<View className={`${styles['assets-title']}`}></View>
<View className={`${styles['assets-content']}`}>
<View>
<Navigator hoverClass="none" url="/pages/depositBeforehand/index">
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>0</Text>
<Text className={`${styles['assets-content-item-top-after']}`}>.20</Text>
</View>
<Text className={`${styles['assets-content-item-tips']}`}></Text>
</View>
</Navigator>
<View>
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-content']}`}>4</Text>
@ -115,16 +115,16 @@ const Assets = () => {
</View>
<Text className={`${styles['assets-content-item-tips']}`}></Text>
</View>
<View>
<Navigator hoverClass="none" url="/pages/creditLine/index">
<View className={`${styles['assets-content-item-top']}`}>
<Text className={`${styles['assets-content-item-top-before']}`}>¥</Text>
<Text className={`${styles['assets-content-item-top-content']}`}>99999</Text>
<Text className={`${styles['assets-content-item-top-after']}`}>.-00</Text>
</View>
<Text className={`${styles['assets-content-item-tips']}`}></Text>
</View>
</Navigator>
</View>
</Navigator>
</View>
)
};