Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
李俊赕
self-support
Commits
840bea4b
Commit
840bea4b
authored
May 19, 2021
by
Morson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
我的地址问题修复
配件押金问题修改
parent
7a508973
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
106 deletions
+32
-106
addSite.vue
src/pages/mine/address/addSite.vue
+28
-74
index.vue
src/pages/mine/address/index.vue
+3
-31
index.vue
src/pages/mine/deposit/index.vue
+1
-1
No files found.
src/pages/mine/address/addSite.vue
View file @
840bea4b
...
...
@@ -10,25 +10,20 @@
<view
class=
"left"
>
电话
</view>
<input
disabled
v-model=
"mobile"
type=
"text"
placeholder-class=
"line"
placeholder=
"请填写电话"
/>
</view>
<u-field
v-model=
"address"
label=
"地址"
label-width=
"88"
type=
"textarea"
:border-bottom=
"false"
placeholder=
"请填写地址"
>
<view
slot=
"right"
class=
"right"
@
tap=
"autoLocation"
>
<u-icon
name=
"map"
color=
"#2272FF"
size=
"30"
></u-icon>
<text>
自动定位
</text>
<view
class=
"item address"
>
<view
class=
"left label"
>
地址
</view>
<textarea
v-model=
"address"
type=
"text"
placeholder-class=
"line"
placeholder=
"请填写地址"
/>
<view
class=
"right"
@
tap=
"autoLocation"
>
<u-icon
name=
"map"
color=
"#2272FF"
size=
"30"
label=
"自动定位"
label-size=
"24"
label-color=
"#2272FF"
></u-icon>
</view>
</u-field>
<!--
<view
class=
"site-clipboard"
>
<textarea
placeholder-class=
"line"
value=
""
placeholder=
"粘贴文本,可自动识别姓名和地址等"
/>
<view
class=
"clipboard"
>
地址粘贴板
<u-icon
name=
"arrow-down"
class=
"icon"
:size=
"20"
></u-icon>
</view>
</view>
-->
</view>
</view>
<view
class=
"bottom"
>
<button
class=
"btn, bottom-btn"
@
click=
"show = true"
>
...
...
@@ -70,7 +65,6 @@
<
script
>
let
r
=
require
(
"libs/bmap-wx.min.js"
);
let
h
=
new
r
.
BMapWX
({
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
ak
:
"lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI"
});
export
default
{
...
...
@@ -142,8 +136,6 @@ export default {
};
if
(
lat
&&
long
)
{
let
e
=
lat
+
","
+
long
// let e = "113.88308" + ',' + "22.55329"
// let e = "22.55329" + ',' + "113.88308"
t
.
location
=
e
;
}
h
.
regeocoding
(
t
);
...
...
@@ -176,14 +168,11 @@ export default {
address
:
self
.
address
}
let
res
=
await
self
.
$u
.
api
.
syncAddress
(
params
)
const
callback
=
(
vm
,
res
)
=>
{
vm
.
$u
.
route
({
type
:
'back'
})
}
if
(
res
&&
res
.
code
==
200
)
{
self
.
$u
.
route
({
type
:
'redirect'
,
url
:
"pages/mine/address/index"
,
params
:
{
sync
:
true
}
})
getApp
().
getBaseInfo
(
this
,
callback
);
}
}
}
...
...
@@ -218,59 +207,24 @@ export default {
text-align
:
left
;
}
}
/
deep
/
.u-field
{
.address
{
padding
:
24rpx
0
;
border-bottom
:
solid
2rpx
$u-border-color
;
.u-label-text
{
font-weight
:
400
;
color
:
#999999
;
}
align-items
:
flex-start
;
textarea
{
line-height
:
40rpx
;
}
.u-button-wrap
{
align-self
:
flex-start
;
margin-left
:
42
rpx
;
height
:
2
40rpx
;
background-color
:
#f7f7f7
;
line-height
:
60rpx
;
padding
:
20rpx
;
width
:
400
rpx
;
}
.right
{
text-align
:
right
;
width
:
160rpx
;
font-size
:
24rpx
;
font-weight
:
400
;
color
:
#2272FF
;
line-height
:
40rpx
;
}
}
.address
{
padding
:
20rpx
0
;
textarea
{
// width: 100%;
height
:
150rpx
;
background-color
:
#f7f7f7
;
line-height
:
60rpx
;
margin
:
40rpx
auto
;
padding
:
20rpx
;
}
}
.site-clipboard
{
padding-right
:
40rpx
;
textarea
{
// width: 100%;
height
:
150rpx
;
background-color
:
#f7f7f7
;
line-height
:
60rpx
;
margin
:
40rpx
auto
;
padding
:
20rpx
;
}
.clipboard
{
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
font-size
:
26rpx
;
color
:
$u-tips-color
;
height
:
80rpx
;
.icon
{
margin-top
:
6rpx
;
margin-left
:
10rpx
;
}
line-height
:
88rpx
;
}
}
}
...
...
src/pages/mine/address/index.vue
View file @
840bea4b
<
template
>
<view
class=
"address-wrap"
>
<w-navbar
title=
"收货地址"
></w-navbar>
<view
class=
"item"
v-if=
"hasAdderss"
>
<view
class=
"item"
v-if=
"hasAdderss"
@
tap=
"toAddSite('修改地址')"
>
<view
class=
"top"
>
<view
class=
"name"
>
{{
settled
.
id_card_name
||
settled
.
nickname
||
settled
.
name
||
'--'
}}
</view>
<view
class=
"phone"
>
{{
settled
.
mobile
}}
</view>
</view>
<view
class=
"bottom"
>
<view
class=
"address"
>
{{
settled
.
address
}}
</view>
<u-icon
:name=
"editPen"
:size=
"32"
color=
"#999999"
@
tap=
"toAddSite('修改地址')"
></u-icon>
<u-icon
:name=
"editPen"
:size=
"32"
color=
"#999999"
></u-icon>
</view>
<view
class=
"default"
v-show=
"true"
>
<u-icon
name=
"checkmark-circle"
color=
"#2272FF"
size=
"32"
></u-icon>
<text
class=
"txt"
>
默认地址
</text>
</view>
</view>
<!--
<view
class=
"addSite"
@
tap=
"toAddSite('新增地址')"
>
<view
class=
"add"
>
<u-icon
name=
"plus"
color=
"#ffffff"
class=
"icon"
:size=
"30"
></u-icon>
新建收货地址
</view>
</view>
-->
</view>
</
template
>
...
...
@@ -45,11 +40,9 @@ export default {
return
this
.
settled
&&
this
.
settled
.
address
&&
this
.
settled
.
id_card_name
},
},
on
Load
(
e
)
{
on
Show
(
)
{
if
(
!
this
.
vuex_token
)
{
this
.
$u
.
route
({
url
:
'pages/login/index'
})
}
else
if
(
e
&&
e
.
sync
)
{
this
.
getData
();
}
else
if
(
!
this
.
settled
)
{
this
.
getData
();
}
...
...
@@ -61,7 +54,6 @@ export default {
},
toAddSite
(
title
){
this
.
$u
.
route
({
type
:
'redirect'
,
url
:
'pages/mine/address/addSite'
,
params
:
{
title
:
title
...
...
@@ -120,24 +112,4 @@ export default {
}
}
}
.addSite
{
display
:
flex
;
justify-content
:
space-around
;
width
:
600rpx
;
line-height
:
100rpx
;
position
:
absolute
;
bottom
:
30rpx
;
left
:
80rpx
;
background-color
:
red
;
border-radius
:
60rpx
;
font-size
:
30rpx
;
.add
{
display
:
flex
;
align-items
:
center
;
color
:
#ffffff
;
.icon
{
margin-right
:
10rpx
;
}
}
}
</
style
>
src/pages/mine/deposit/index.vue
View file @
840bea4b
...
...
@@ -45,7 +45,7 @@
},
computed
:
{
amount
()
{
return
this
.
settled
&&
this
.
settled
.
deposit
||
'0.00'
;
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
hasPaid
||
'0.00'
;
},
settled
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
record
||
null
...
...
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