🐞 fix(ID1000961): 【电子商城】11-21(UI还原-1)

【【电子商城】11-21(UI还原-1)】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001000961
This commit is contained in:
xuan 2022-12-14 11:04:51 +08:00
parent 9b8c9cb207
commit 41a43c5be7
7 changed files with 43 additions and 31 deletions

View File

@ -34,7 +34,7 @@
"minifyWXML": true
},
"compileType": "miniprogram",
"libVersion": "2.24.5",
"libVersion": "2.28.0",
"srcMiniprogramRoot": "dist/",
"packOptions": {
"ignore": [],

View File

@ -16,7 +16,7 @@
margin-left: 20px;
margin-top: 16px;
.title {
padding-bottom: 15px;
padding-bottom: 10px;
font-size: 40px;
font-weight: 550;
}
@ -44,16 +44,20 @@
}
.inputCode {
width: 100%;
height: 106px;
background: #f6f6f6;
border: 2px solid #f0f0f0;
border-radius: 20px;
display: flex;
align-items: center;
padding: 20px 0 20px 30px;
padding: 48px 0 48px 30px;
box-sizing: border-box;
position: relative;
input {
&Result {
position: absolute;
left: 0;
bottom: -40px;
}
.inputBar {
flex: 1;
z-index: 0;
letter-spacing: 10px;
@ -64,11 +68,6 @@
display: flex;
justify-content: center;
align-items: center;
border-left: 1px solid #ccc;
.miconfont {
font-size: 50px;
color: #007aff;
}
}
.close_btn {
padding: 0 20px;
@ -90,6 +89,7 @@
border-radius: 10px;
}
&__text {
font-size: 28px;
}
}
.salesMan {

View File

@ -9,6 +9,7 @@ import LayoutBlock from '../layoutBlock'
import IconText from '../iconText'
import IconFont from '../iconfont/iconfont'
import InputX from '../InputX'
import Divider from '../divider'
import styles from './index.module.scss'
import { formatImgUrl } from '@/common/fotmat'
import { alert, goLink } from '@/common/common'
@ -138,7 +139,6 @@ const BindSalesManDialog = ({ onSuccess }: params, ref: Ref<SalesManDialogRef>)
</View>
<View className={styles.right}>
<View className={styles.iconContainer}>
<Image className={styles.icon} src={getCDNSource('/user/inviteCode.png')} mode="widthFix" />
</View>
</View>
@ -148,7 +148,7 @@ const BindSalesManDialog = ({ onSuccess }: params, ref: Ref<SalesManDialogRef>)
<LayoutBlock circle>
<View className={styles.inputCode}>
<Input
className={isError ? styles.error : ''}
className={classnames(styles.inputBar, isError ? styles.error : '')}
alwaysEmbed
cursorSpacing={150}
maxlength={4}
@ -158,14 +158,17 @@ const BindSalesManDialog = ({ onSuccess }: params, ref: Ref<SalesManDialogRef>)
type="text"
/>
<View className={styles.close_btn}>
{submitData.invitation_code && <CloseBtn styleObj={{ backgroundColor: '#ccc', color: '#fff' }} onClose={oncloseEven} />}
{submitData.invitation_code && <CloseBtn styleObj={{ color: '#fff' }} onClose={oncloseEven} />}
</View>
<View className={styles.scan_code} onClick={() => onScanCode()}>
<Divider direction="vertical"></Divider>
<View className={styles.scan_code} onClick={onScanCode}>
<IconFont name="icon-gongnengtubiao-saomiao" size={48} color="#c2c3c5"></IconFont>
</View>
</View>
<View className={styles.inputCodeResult}>
{(salesMan && !isError) ? <View className={styles.salesMan}>{salesMan?.name} {salesMan?.phone}</View> : null}
{(submitData.invitation_code && isError) ? <View className={classnames(styles.salesMan, styles.error)}></View> : null}
</View>
</View>
<View className={styles.tipsGroup}>
<View className={styles.tips}>1</View>
<View className={styles.tips} onClick={onCustomer}><View>2-</View><IconText svg iconSize={24} text="联系客服" direction="right" iconName="icon-rukou" textCustomStyle={{ color: '#337FFF', fontSize: '24rpx', padding: '0' }} color="#337FFF"></IconText></View>
@ -173,7 +176,7 @@ const BindSalesManDialog = ({ onSuccess }: params, ref: Ref<SalesManDialogRef>)
</LayoutBlock>
<View className={styles.bottomBar}>
<NormalButton type="primary" customTextClassName={styles.bottomBar__text} customClassName={styles.bottomBar__button} customStyles={{ width: '100%' }} onClick={handleConfirm}>
</NormalButton>
</View>
</View>

View File

@ -1,9 +1,7 @@
.icon_a_cuowuwrong_self {
height: 20px;
width: 20px;
font-size: 27px;
padding: 10px;
border-radius: 50%;
color: #ccc;
display: flex;
justify-content: center;

View File

@ -12,7 +12,7 @@ const CloseBtn = ({ onClose, styleObj = {} }: Params) => {
<View
style={styleObj}
className={style.icon_a_cuowuwrong_self}
onClick={() => onClose?.()}
onClick={onClose}
>
<View className={style.icon_a_btn}>
<IconFont name="icon-qingchuxinxi" size={40} color="#acacac"></IconFont>

View File

@ -74,7 +74,6 @@ page {
flex-flow: row nowrap;
justify-content: center;
align-items: center;
letter-spacing: 10px;
font-size: 40px;
font-weight: 400;
color: #9fa0a1;
@ -93,6 +92,12 @@ page {
color: #9e9e9e;
}
.inviteCordTitle {
display: flex;
align-items: center;
justify-content: flex-start;
.titleText {
width: 200px;
}
font-weight: 500;
color: #000000;
}

View File

@ -280,8 +280,11 @@ const BindSalesman = () => {
</LayoutBlock>
<LayoutBlock circle>
<View className={styles.inviteCord}>
<View className={styles.inviteCordTitle}></View>
{invite === 0 ? <Text className={styles.noop}></Text> : <Text>{invite}</Text>}
<View className={styles.inviteCordTitle}>
<Text className={styles.titleText}></Text>
{invite === 0 && <Text className={styles.noop}></Text>}
</View>
{invite !== 0 && <Text>{invite}</Text>}
<View className={styles.inviteCordMore} onClick={handleInviteCord}>
<IconText svg text="查看" direction="right" iconName="icon-rukou" textCustomStyle={{ color: '#337FFF' }} color="#337FFF"></IconText>
</View>
@ -289,15 +292,18 @@ const BindSalesman = () => {
</LayoutBlock>
<LayoutBlock circle>
<View className={styles.inviteCord}>
<View className={styles.inviteCordTitle}></View>
{!salesMan?.inviter_id
? <Text className={styles.noop}></Text>
: <View className={styles.inviteCordMore}>
<View className={styles.inviteCordTitle}>
<Text className={styles.titleText}></Text>
{!salesMan?.inviter_id && <Text className={styles.noop}></Text>}
</View>
{!!salesMan?.inviter_id && <View className={styles.inviteCordMore}>
{salesMan.inviter_name}{salesMan.phone}
</View>}
{!salesMan?.inviter_id && <View onClick={handleBindSalesMan}>
{!salesMan?.inviter_id
&& <View onClick={handleBindSalesMan}>
<IconText svg text="立即绑定" direction="right" iconName="icon-rukou" textCustomStyle={{ color: '#337FFF' }} color="#337FFF"></IconText>
</View>}
</View>
}
</View>
</LayoutBlock>
<View className={styles.tips} style={{ justifyContent: 'flex-start' }}></View>