diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index 7d5e3eb..4773610 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -52,7 +52,7 @@ Page({
success: function (res) {
console.log(res);
that.setData({
- name: res.name,
+ name: res.name+'('+res.address+')',
address: JSON.stringify(res),
})
},
@@ -153,7 +153,7 @@ Page({
if (res.data.address && JSON.parse(res.data.address).name) {
that.setData({
address: res.data.address,
- name: JSON.parse(res.data.address).name,
+ name: JSON.parse(res.data.address).name +'('+JSON.parse(res.data.address).address+')',
})
}
if (!JSON.parse(res.data.address).name) {
diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml
index 10957b8..03709ed 100644
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@@ -19,10 +19,10 @@
-
+
住址
-
-
+ {{name}}
+ 请输入地址
\ No newline at end of file
diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss
index 8cd2873..40b2abf 100644
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@@ -17,6 +17,12 @@ input {
margin: 0 auto;
border-bottom: 1px solid #eee;
}
+.address{
+ width: 710rpx;
+ margin: 0 auto;
+ border-bottom: 1px solid #eee;
+ padding-bottom: 10rpx;
+}
.radio{
margin-right: 30rpx;
}
@@ -39,6 +45,11 @@ radio {
display: inline-block;
margin-right: 20rpx;
}
+.address > text:nth-of-type(1) {
+ font-size: 32rpx;
+ display: inline-block;
+ margin-right: 20rpx;
+}
.btn{
width: 400rpx;
color: #fff;
@@ -64,4 +75,9 @@ radio {
bottom: 0;
margin: auto;
background: #fff;
+}
+.names{
+ font-size: 26rpx;
+ line-height: 46rpx;
+ color: #999;
}
\ No newline at end of file
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index 139a0f5..f8ee24d 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -70,10 +70,11 @@
- 版本号:2.1.9
+ 版本号:2.2.5
+
\ No newline at end of file