Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-customer-new-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-customer-new-master
Commits
14cfbb61
Commit
14cfbb61
authored
3 months ago
by
honghy
Committed by
wux
2 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
国家下拉框多国语,协议多国语
parent
85f15bdb
master
jd_cons
jd_fx
1 merge request
!60
Master分支合并到Master_jd分支0107
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
21 deletions
+35
-21
login.vue
src/pages/deletion/login.vue
+8
-4
login.vue
src/pages/login/login.vue
+4
-2
cityListPicker.vue
src/pages/my_info/cityListPicker.vue
+2
-2
my_info.vue
src/pages/my_info/my_info.vue
+11
-9
register.vue
src/pages/register/register.vue
+6
-2
shareRegister.vue
src/pages/register/shareRegister.vue
+4
-2
No files found.
src/pages/deletion/login.vue
View file @
14cfbb61
...
...
@@ -205,9 +205,11 @@ export default {
that
.
areaData
.
push
(
res
.
data
[
i
].
tel
)
if
(
that
.
locale
==
'
zh
'
)
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameZh
)
}
else
{
}
else
if
(
that
.
locale
==
'
en
'
)
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameEn
)
}
}
else
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameFr
)
}
}
}
})
...
...
@@ -230,9 +232,11 @@ export default {
if
(
res
.
code
==
0
&&
res
.
data
)
{
if
(
that
.
$lang
.
locale
==
'
zh
'
)
{
that
.
leviteInfo
=
res
.
data
.
contentZh
}
else
{
}
else
if
(
$lang
.
locale
==
'
en
'
)
{
that
.
leviteInfo
=
res
.
data
.
contentEn
}
}
else
{
that
.
leviteInfo
=
res
.
data
.
contentFr
}
}
})
},
...
...
This diff is collapsed.
Click to expand it.
src/pages/login/login.vue
View file @
14cfbb61
...
...
@@ -219,9 +219,11 @@ export default {
that
.
areaData
.
push
(
res
.
data
[
i
].
tel
)
if
(
that
.
locale
==
'
zh
'
)
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameZh
)
}
else
{
}
else
if
(
that
.
locale
==
'
en
'
)
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameEn
)
}
}
else
{
that
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameFr
)
}
}
}
})
...
...
This diff is collapsed.
Click to expand it.
src/pages/my_info/cityListPicker.vue
View file @
14cfbb61
...
...
@@ -23,7 +23,7 @@
>
<picker-view-column>
<view
v-for=
"item in list"
:key=
"item.id"
class=
"u-column-item"
>
{{
rangeKey
==
'
zh
'
?
item
.
titleZh
:
item
.
titleEn
}}
>
{{
rangeKey
==
'
zh
'
?
item
.
titleZh
:
rangeKey
==
'
en
'
?
item
.
titleEn
:
item
.
titleFr
}}
</view>
</picker-view-column>
</picker-view>
...
...
@@ -53,7 +53,7 @@ export default {
},
computed
:
{
rangeKey
()
{
return
this
.
$lang
.
locale
==
'
zh
'
?
'
zh
'
:
'
en
'
return
this
.
$lang
.
locale
==
'
zh
'
?
'
zh
'
:
this
.
$lang
.
locale
==
'
en
'
?
'
en
'
:
'
fr
'
}
},
data
()
{
...
...
This diff is collapsed.
Click to expand it.
src/pages/my_info/my_info.vue
View file @
14cfbb61
...
...
@@ -85,7 +85,7 @@
<picker
style=
"width: 100%"
:range=
"countryArray"
:range-key=
"rangeKey == 'zh' ? 'titleZh' :
'titleEn
'"
:range-key=
"rangeKey == 'zh' ? 'titleZh' :
rangeKey == 'en'?'titleEn':'titleFr
'"
@
change=
"bindCountyChange"
>
<view
:class=
"
{ placeholder: !params.country }">
{{
...
...
@@ -197,7 +197,7 @@ export default {
return
this
.
getDate
(
'
end
'
)
},
rangeKey
()
{
return
this
.
$lang
.
locale
==
'
zh
'
?
'
zh
'
:
'
en
'
return
this
.
$lang
.
locale
==
'
zh
'
?
'
zh
'
:
this
.
$lang
.
locale
==
'
en
'
?
'
en
'
:
'
fr
'
}
},
watch
:
{
...
...
@@ -279,7 +279,7 @@ export default {
if
(
res
.
data
.
birthday
)
{
this
.
date
=
res
.
data
.
birthday
}
const
{
city
,
country
,
countryTitleZh
,
countryTitleEn
,
c
ityTitleZh
,
cityTitleEn
}
=
const
{
city
,
country
,
countryTitleZh
,
countryTitleEn
,
c
ountryTitleFr
,
cityTitleZh
,
cityTitleEn
,
cityTitleFr
}
=
res
.
data
if
(
this
.
first
)
{
...
...
@@ -288,8 +288,8 @@ export default {
}
this
.
params
.
city
=
city
this
.
params
.
country
=
country
this
.
params
.
cityValue
=
this
.
rangeKey
==
'
zh
'
?
cityTitleZh
:
cityTitleEn
this
.
params
.
countryValue
=
this
.
rangeKey
==
'
zh
'
?
countryTitleZh
:
countryTitleEn
this
.
params
.
cityValue
=
this
.
rangeKey
==
'
zh
'
?
cityTitleZh
:
this
.
rangeKey
==
'
en
'
?
cityTitleEn
:
cityTitleFr
this
.
params
.
countryValue
=
this
.
rangeKey
==
'
zh
'
?
countryTitleZh
:
this
.
rangeKey
==
'
en
'
?
countryTitleEn
:
countryTitleFr
this
.
getCountryList
()
this
.
getCityList
()
this
.
Country
()
...
...
@@ -310,9 +310,11 @@ export default {
}
if
(
that
.
$lang
.
locale
==
'
zh
'
)
{
that
.
areaName
.
push
(
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameZh
)
}
else
{
}
else
if
(
that
.
$lang
.
locale
==
'
en
'
)
{
that
.
areaName
.
push
(
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameEn
)
}
}
else
{
that
.
areaName
.
push
(
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameFr
)
}
}
}
})
...
...
@@ -356,8 +358,8 @@ export default {
// 国家选择 change
bindCountyChange
(
e
)
{
const
index
=
e
.
detail
.
value
const
{
titleZh
,
titleEn
,
id
}
=
this
.
countryArray
[
index
]
const
value
=
this
.
rangeKey
==
'
zh
'
?
titleZh
:
t
itleEn
const
{
titleZh
,
titleEn
,
titleFr
,
id
}
=
this
.
countryArray
[
index
]
const
value
=
this
.
rangeKey
==
'
zh
'
?
titleZh
:
t
his
.
rangeKey
==
'
zh
'
?
titleEn
:
titleFr
if
(
this
.
params
.
country
!=
id
)
{
this
.
$set
(
this
.
params
,
'
cityValue
'
,
''
)
this
.
$set
(
this
.
params
,
'
city
'
,
''
)
...
...
This diff is collapsed.
Click to expand it.
src/pages/register/register.vue
View file @
14cfbb61
...
...
@@ -178,11 +178,15 @@ export default {
this
.
areaName
.
push
(
"
+
"
+
res
.
data
[
i
].
tel
+
"
"
+
res
.
data
[
i
].
nameZh
);
}
else
{
}
else
if
(
this
.
$lang
.
locale
==
"
en
"
)
{
this
.
areaName
.
push
(
"
+
"
+
res
.
data
[
i
].
tel
+
"
"
+
res
.
data
[
i
].
nameEn
);
}
}
else
{
this
.
areaName
.
push
(
"
+
"
+
res
.
data
[
i
].
tel
+
"
"
+
res
.
data
[
i
].
nameFr
);
}
}
}
});
...
...
This diff is collapsed.
Click to expand it.
src/pages/register/shareRegister.vue
View file @
14cfbb61
...
...
@@ -173,9 +173,11 @@ export default {
this
.
areaData
.
push
(
res
.
data
[
i
].
tel
)
if
(
this
.
$lang
.
locale
==
'
zh
'
)
{
this
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameZh
)
}
else
{
}
else
if
(
this
.
$lang
.
locale
==
'
en
'
)
{
this
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameEn
)
}
}
else
{
this
.
areaName
.
push
(
'
+
'
+
res
.
data
[
i
].
tel
+
'
'
+
res
.
data
[
i
].
nameFr
)
}
}
}
})
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment