Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-web-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-web-master
Commits
c39a4db4
Commit
c39a4db4
authored
Sep 12, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
418ee805
b7c4bdde
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
456 additions
and
395 deletions
+456
-395
index.vue
src/components/AreaSelector/index.vue
+8
-4
en.js
src/lang/en.js
+154
-158
zh.js
src/lang/zh.js
+118
-121
delivery.vue
src/views/jiedao/profile/delivery.vue
+176
-112
No files found.
src/components/AreaSelector/index.vue
View file @
c39a4db4
<
template
>
<div>
<el-select
v-model=
"formData.country"
:disabled=
"readonly"
>
<el-select
v-model=
"formData.country"
:disabled=
"readonly"
:style=
"
{width: inputWidth}"
>
<el-option
v-for=
"(item) in treeList"
:key=
"item.id"
:value=
"item.id"
:label=
"$l(item, 'title')"
/>
</el-select>
<el-select
v-model=
"formData.province"
class=
"ml-10"
:disabled=
"readonly"
>
<el-select
v-model=
"formData.province"
class=
"ml-10"
:disabled=
"readonly"
:style=
"
{width: inputWidth}"
>
<el-option
v-for=
"(item) in provinceList"
:key=
"item.id"
:value=
"item.id"
:label=
"$l(item, 'title')"
/>
</el-select>
<el-select
v-model=
"formData.city"
class=
"ml-10"
:disabled=
"readonly"
>
<el-select
v-model=
"formData.city"
class=
"ml-10"
:disabled=
"readonly"
:style=
"
{width: inputWidth}"
>
<el-option
v-for=
"(item) in cityList"
:key=
"item.id"
:value=
"item.id"
:label=
"$l(item, 'title')"
/>
</el-select>
</div>
...
...
@@ -19,7 +19,8 @@ export default {
country
:
Number
,
city
:
Number
,
province
:
Number
,
readonly
:
Boolean
readonly
:
Boolean
,
inputWidth
:
String
},
data
()
{
return
{
...
...
@@ -60,9 +61,12 @@ export default {
},
'
formData.country
'
(
country
)
{
this
.
$emit
(
'
countryChange
'
,
country
)
this
.
formData
.
province
=
null
this
.
formData
.
city
=
null
},
'
formData.province
'
(
province
)
{
this
.
$emit
(
'
provinceChange
'
,
province
)
this
.
formData
.
city
=
null
}
},
created
()
{
...
...
src/lang/en.js
View file @
c39a4db4
This diff is collapsed.
Click to expand it.
src/lang/zh.js
View file @
c39a4db4
This diff is collapsed.
Click to expand it.
src/views/jiedao/profile/delivery.vue
View file @
c39a4db4
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