Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
京东前端
nutui-react
提交
8923e116
N
nutui-react
项目概览
京东前端
/
nutui-react
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
nutui-react
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
8923e116
编写于
2月 03, 2023
作者:
Y
yangxiaolu1993
提交者:
GitHub
2月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修复 address 组件无法设置标题 (#622)
上级
f75dd5ab
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
14 addition
and
14 deletion
+14
-14
src/packages/address/address.taro.tsx
src/packages/address/address.taro.tsx
+6
-6
src/packages/address/address.tsx
src/packages/address/address.tsx
+6
-6
src/packages/address/existRender.tsx
src/packages/address/existRender.tsx
+2
-2
未找到文件。
src/packages/address/address.taro.tsx
浏览文件 @
8923e116
...
@@ -58,15 +58,15 @@ const defaultProps = {
...
@@ -58,15 +58,15 @@ const defaultProps = {
modelValue
:
false
,
modelValue
:
false
,
modelSelect
:
[],
modelSelect
:
[],
type
:
'
custom
'
,
type
:
'
custom
'
,
customAddressTitle
:
'
请选择所在地区
'
,
customAddressTitle
:
''
,
province
:
[],
province
:
[],
city
:
[],
city
:
[],
country
:
[],
country
:
[],
town
:
[],
town
:
[],
isShowCustomAddress
:
true
,
isShowCustomAddress
:
true
,
existAddress
:
[],
existAddress
:
[],
existAddressTitle
:
'
配送至
'
,
existAddressTitle
:
''
,
customAndExistTitle
:
'
选择其他地址
'
,
customAndExistTitle
:
''
,
height
:
'
200px
'
,
height
:
'
200px
'
,
defaultIcon
:
'
location2
'
,
defaultIcon
:
'
location2
'
,
selectedIcon
:
'
Check
'
,
selectedIcon
:
'
Check
'
,
...
@@ -233,8 +233,8 @@ export const Address: FunctionComponent<
...
@@ -233,8 +233,8 @@ export const Address: FunctionComponent<
<
div
className
=
{
b
(
'
header__title
'
)
}
>
<
div
className
=
{
b
(
'
header__title
'
)
}
>
{
privateType
===
'
custom
'
{
privateType
===
'
custom
'
?
locale
.
address
.
selectRegion
||
customAddressTitle
?
customAddressTitle
||
locale
.
address
.
selectRegion
:
locale
.
address
.
deliveryTo
||
existAddressTitle
}
:
existAddressTitle
||
locale
.
address
.
deliveryTo
}
</
div
>
</
div
>
<
div
onClick
=
{
()
=>
handClose
()
}
>
<
div
onClick
=
{
()
=>
handClose
()
}
>
...
@@ -305,7 +305,7 @@ export const Address: FunctionComponent<
...
@@ -305,7 +305,7 @@ export const Address: FunctionComponent<
defaultIcon
=
{
defaultIcon
}
defaultIcon
=
{
defaultIcon
}
isShowCustomAddress
=
{
isShowCustomAddress
}
isShowCustomAddress
=
{
isShowCustomAddress
}
customAndExistTitle
=
{
customAndExistTitle
=
{
locale
.
address
.
chooseAnotherAddress
||
customAndExistTitle
customAndExistTitle
||
locale
.
address
.
chooseAnotherAddress
}
}
onSelected
=
{
selectedExist
}
onSelected
=
{
selectedExist
}
onSwitchModule
=
{
onSwitchModule
}
onSwitchModule
=
{
onSwitchModule
}
...
...
src/packages/address/address.tsx
浏览文件 @
8923e116
...
@@ -58,15 +58,15 @@ const defaultProps = {
...
@@ -58,15 +58,15 @@ const defaultProps = {
modelValue
:
false
,
modelValue
:
false
,
modelSelect
:
[],
modelSelect
:
[],
type
:
'
custom
'
,
type
:
'
custom
'
,
customAddressTitle
:
'
请选择所在地区
'
,
customAddressTitle
:
''
,
province
:
[],
province
:
[],
city
:
[],
city
:
[],
country
:
[],
country
:
[],
town
:
[],
town
:
[],
isShowCustomAddress
:
true
,
isShowCustomAddress
:
true
,
existAddress
:
[],
existAddress
:
[],
existAddressTitle
:
'
配送至
'
,
existAddressTitle
:
''
,
customAndExistTitle
:
'
选择其他地址
'
,
customAndExistTitle
:
''
,
height
:
'
200px
'
,
height
:
'
200px
'
,
defaultIcon
:
'
location2
'
,
defaultIcon
:
'
location2
'
,
selectedIcon
:
'
Check
'
,
selectedIcon
:
'
Check
'
,
...
@@ -233,8 +233,8 @@ export const Address: FunctionComponent<
...
@@ -233,8 +233,8 @@ export const Address: FunctionComponent<
<
div
className
=
{
b
(
'
header__title
'
)
}
>
<
div
className
=
{
b
(
'
header__title
'
)
}
>
{
privateType
===
'
custom
'
{
privateType
===
'
custom
'
?
locale
.
address
.
selectRegion
||
customAddressTitle
?
customAddressTitle
||
locale
.
address
.
selectRegion
:
locale
.
address
.
deliveryTo
||
existAddressTitle
}
:
existAddressTitle
||
locale
.
address
.
deliveryTo
}
</
div
>
</
div
>
<
div
onClick
=
{
()
=>
handClose
()
}
>
<
div
onClick
=
{
()
=>
handClose
()
}
>
...
@@ -305,7 +305,7 @@ export const Address: FunctionComponent<
...
@@ -305,7 +305,7 @@ export const Address: FunctionComponent<
defaultIcon
=
{
defaultIcon
}
defaultIcon
=
{
defaultIcon
}
isShowCustomAddress
=
{
isShowCustomAddress
}
isShowCustomAddress
=
{
isShowCustomAddress
}
customAndExistTitle
=
{
customAndExistTitle
=
{
locale
.
address
.
chooseAnotherAddress
||
customAndExistTitle
customAndExistTitle
||
locale
.
address
.
chooseAnotherAddress
}
}
onSelected
=
{
selectedExist
}
onSelected
=
{
selectedExist
}
onSwitchModule
=
{
onSwitchModule
}
onSwitchModule
=
{
onSwitchModule
}
...
...
src/packages/address/existRender.tsx
浏览文件 @
8923e116
...
@@ -27,7 +27,7 @@ const defaultProps = {
...
@@ -27,7 +27,7 @@ const defaultProps = {
defaultIcon
:
'
location2
'
,
defaultIcon
:
'
location2
'
,
selectedIcon
:
'
Check
'
,
selectedIcon
:
'
Check
'
,
isShowCustomAddress
:
true
,
isShowCustomAddress
:
true
,
customAndExistTitle
:
'
选择其他地址
'
,
customAndExistTitle
:
''
,
}
as
ExistRenderProps
}
as
ExistRenderProps
export
const
ExistRender
:
FunctionComponent
<
export
const
ExistRender
:
FunctionComponent
<
...
@@ -122,7 +122,7 @@ export const ExistRender: FunctionComponent<
...
@@ -122,7 +122,7 @@ export const ExistRender: FunctionComponent<
{
isShowCustomAddress
&&
(
{
isShowCustomAddress
&&
(
<
div
className
=
{
b
(
'
choose-other
'
)
}
onClick
=
{
switchModule
}
>
<
div
className
=
{
b
(
'
choose-other
'
)
}
onClick
=
{
switchModule
}
>
<
div
className
=
{
b
(
'
choose-other-btn
'
)
}
>
<
div
className
=
{
b
(
'
choose-other-btn
'
)
}
>
{
locale
.
address
.
chooseAnotherAddress
||
customAndExistTitle
}
{
customAndExistTitle
||
locale
.
address
.
chooseAnotherAddress
}
</
div
>
</
div
>
</
div
>
</
div
>
)
}
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录