Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 电子商城测试版v2

This commit is contained in:
2022-06-28 10:02:49 +08:00
23 changed files with 1781 additions and 1651 deletions
@@ -9,9 +9,9 @@
font-size: 28px;
font-weight: 400;
color: #000000;
margin-top: 20px;
width: 150px;
width: 200px;
border-right: 1px solid #F0F0F0;
display: flex;align-items: center;
}
.From-list-certification-label-required::before{
content: "*";
@@ -19,12 +19,12 @@
font-size: 28px;
}
.From-list-certification-right{
width: 506px;
min-width: 100px;
flex: 1;
font-size: 26px;
font-weight: 400;
}
.From-list-certification-right-meet{
width: 506px;
min-height: 45px;
border-radius: 20px;
box-sizing: border-box;
@@ -69,6 +69,8 @@
}
.From-list-certification-right-placeholder{
color: #ababab;
text-overflow: ellipsis;overflow: hidden;white-space: nowrap;
width: 100%;
}
.From-list-certification-right-enter .icon-a-moreback{
font-size: 28px;
@@ -14,12 +14,13 @@ interface ListParams{
style?: object, //整行样式
labelStyle?: object, // label样式
contentStyle?: object,
required?: boolean
required?: boolean,
showIcon?: boolean, // 是否显示右边的箭头,type=select
}
// 表单列表
const FromList = memo((props:ListParams)=>{
const {type="input",value="",style={},labelStyle={},contentStyle={},required=false} = props;
const {type="input",value="",style={},labelStyle={},contentStyle={},required=false,showIcon=true} = props;
return (
<View style={style} className="From-list-certification">
@@ -44,7 +45,9 @@ const FromList = memo((props:ListParams)=>{
{props.placeholder}
</View>
}
<View className="From-list-certification-right-enter"><Text className="iconfont icon-a-moreback"></Text></View>
<View className="From-list-certification-right-enter">
{showIcon&&<Text className="iconfont icon-a-moreback"></Text>}
</View>
</>
}
</View>