diff --git a/pages.json b/pages.json
index fa48596..aee0d5a 100644
--- a/pages.json
+++ b/pages.json
@@ -89,26 +89,26 @@
{
"path": "line/lineList",
"style": {
- "navigationBarTitleText": "特色体验",
+ "navigationBarTitleText": "风雅体验",
"navigationStyle": "custom"
}
},
{
"path": "line/detail",
"style": {
- "navigationBarTitleText": "特色体验"
+ "navigationBarTitleText": "风雅体验"
}
},
{
"path": "line/order",
"style": {
- "navigationBarTitleText": "特色体验"
+ "navigationBarTitleText": "风雅体验"
}
},
{
"path": "line/orders",
"style": {
- "navigationBarTitleText": "特色体验"
+ "navigationBarTitleText": "风雅体验"
}
},
{
@@ -270,13 +270,13 @@
{
"path": "user/bindTel",
"style": {
- "navigationBarTitleText": "修改姓名"
+ "navigationBarTitleText": "修改手机号"
}
},
{
"path": "user/changeNickname",
"style": {
- "navigationBarTitleText": "修改手机号"
+ "navigationBarTitleText": "修改姓名"
}
},
{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index af54651..7cdfc5c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -3,11 +3,11 @@
快捷登录
- 取消
+ 取消登录
@@ -99,8 +99,8 @@
}
.logo {
- width: 186rpx;
- height: 186rpx;
+ width: 135rpx;
+ height: 135rpx;
position: absolute;
top: 79rpx;
left: 50%;
@@ -121,7 +121,7 @@
transform: translate(-50%,0)
}
.btns {
- background: #71B580;
+ background: #515150;
}
.tips {
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index e7e20f7..36eb64d 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -29,7 +29,7 @@
-->
姓名
-
+
手机号
diff --git a/subPackages/notice/noticeList.vue b/subPackages/notice/noticeList.vue
index ce430c0..3c02071 100644
--- a/subPackages/notice/noticeList.vue
+++ b/subPackages/notice/noticeList.vue
@@ -94,7 +94,7 @@
.active {
color: #fff;
- background: #248BAA;
+ background: #525251;
}
}
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 9145d24..9ae9e87 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -1596,13 +1596,12 @@
width: 50%;
font-weight: bold;
font-size: 32rpx;
- color: #248BAA;
+ color: #000000;
line-height: 54rpx;
}
view:first-child {
border-right: 1rpx solid #D8D8D8;
- color: #000000;
}
}
}
diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue
index 26505cf..d35cfb4 100644
--- a/subPackages/user/changeNickname.vue
+++ b/subPackages/user/changeNickname.vue
@@ -1,10 +1,9 @@
- 姓名:
-
+
- 保存修改
+ 保存
@@ -49,16 +48,19 @@
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
index 0592fb5..0984eae 100644
--- a/subPackages/user/profile.vue
+++ b/subPackages/user/profile.vue
@@ -14,17 +14,12 @@
性别
-
-
-
-
+ {{gender == 1 ? '男' : (gender == 2 ? '女' : '保密')}}
-
+
手机号
{{info.mobile}}
-
+
生日
@@ -33,6 +28,14 @@
保存
+
+
+
+
+
@@ -55,6 +58,10 @@
{
value: '2',
text: '女'
+ },
+ {
+ value: '0',
+ text: '保密'
}
],
today: null,
@@ -183,8 +190,9 @@
day = day > 9 ? day : '0' + day;
return `${year}/${month}/${day}`;
},
- changesex(value) {
- this.gender = value.detail.value
+ changesex(index) {
+ this.gender = this.sexes[index].value
+ this.$refs.popup.close()
},
submit() {
uni.showModal({
@@ -220,7 +228,7 @@
}
-
diff --git a/subPackages/user/travelerList.vue b/subPackages/user/travelerList.vue
index 6abadd5..77b6ae9 100644
--- a/subPackages/user/travelerList.vue
+++ b/subPackages/user/travelerList.vue
@@ -20,6 +20,7 @@
{{item.tel}}
+ 默认
@@ -32,7 +33,7 @@
-
@@ -40,7 +41,7 @@
默认出行人
-
+ -->
@@ -89,7 +90,7 @@
- {{showType ? '添加联系人' : '添加出行人'}}
+ {{showType ? '添加联系人' : '添加收货地址'}}
@@ -185,19 +186,29 @@
display: flex;
height: 112rpx;
flex-shrink: 0;
+ background-color: #fff;
.concat-nav-item{
ffont-weight: 500;
font-size: 35rpx;
color: #000000;
+ height: 100%;
text-align: center;
+ position: relative;
+ padding-top: 35rpx;
}
.concat-nav-item.active{
color: #000000;
}
.active-bar{
- width: 100%;
- height: 11rpx;
- background: #248BAA;
+ width: 73rpx;
+ height: 7rpx;
+ background: #515150;
+ border-radius: 3rpx;
+ margin: auto;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
}
}
@@ -205,8 +216,7 @@
width: 697rpx;
background: #FFFFFF;
border-radius: 13rpx;
- margin: 0 auto;
- margin-bottom: 28rpx;
+ margin: 28rpx auto 0;
padding: 26rpx;
.name,
@@ -219,13 +229,13 @@
}
.name {
- view:last-child {
+ view:last-child{
margin-left: 40rpx;
}
span {
padding: 3rpx 9rpx;
- background: #248BAA;
+ background: #515150;
border-radius: 7rpx;
font-weight: bold;
font-size: 24rpx;
@@ -315,7 +325,7 @@
.btn {
width: 697rpx;
line-height: 80rpx;
- background: #248BAA;
+ background: #C3282E;
border-radius: 37rpx;
font-weight: 500;
font-size: 36rpx;