diff --git a/pages/pages_zhentou/myPage/address.vue b/pages/pages_zhentou/myPage/address.vue
index 77be4df..74a55d8 100644
--- a/pages/pages_zhentou/myPage/address.vue
+++ b/pages/pages_zhentou/myPage/address.vue
@@ -9,8 +9,16 @@
{{item.consignee}}
{{item.phone}}
-
- {{item.province}}{{item.city}}{{item.area}}{{item.address}}
+
+
+
+ {{item.province}}{{item.city}}{{item.area}}{{item.address}}
+
+
+
+
+
+
@@ -19,14 +27,17 @@
{{item.phone}}
- {{item.province}}{{item.city}}{{item.area}}{{item.address}}
-
-
-
-
-
+
+ {{item.province}}{{item.city}}{{item.area}}{{item.address}}
+
+
+
+
+
+
+
@@ -74,9 +85,15 @@
联系电话：
-
-
+
+
+
+
+
+
+ 请输入正确的联系方式
+
@@ -169,9 +186,17 @@
deProvince:'',
deCity:'',
deDistrict:'',
- isDefaultAddress:''
+ isDefaultAddress:'',
+ moblieVal:true
+ }
+ },
+ watch:{
+ buyPhone(newVal){
+ const moblie = /^1(3|4|5|6|7|8|9)\d{9}$/;
+ this.moblieVal = moblie.test(newVal);
}
},
+
onLoad(options) {
console.log(options)
this.pageFrom = options.from;
@@ -651,7 +676,9 @@
} else {
this.status = 'more';
}
- } else {
+ }else if(res.data.code == 401){
+ this.doLogin(1)
+ }else {
uni.showToast({
title: res.data.msg,
icon: 'none'
@@ -681,6 +708,12 @@
success: (res) => {
if (res.data.code == 200) {
uni.setStorageSync('token', res.data.data.access_token);
+ if(type == 1){
+ this.addressData = []
+ this.hasMore = true;
+ this.current = 0;
+ this.loadMore()
+ }
} else {
uni.showToast({
title: res.data.msg,
@@ -712,7 +745,7 @@
.address_item {
width: 100%;
- height: 255rpx;
+ // height: 255rpx;
border-bottom: 1rpx solid #F2F2F2;
display: flex;
flex-direction: column;
@@ -721,6 +754,7 @@
width: 100%;
height: 25%;
display: flex;
+ margin-bottom: 30rpx;
align-items: center;
.no_checked_box {
@@ -779,12 +813,14 @@
width: 100%;
height: 75%;
display: flex;
+ // margin-bottom: 40rpx;
.top_item {
- width: 85%;
+ width: 100%;
margin-left: 30rpx;
.top {
+ width: 100%;
margin-top: 30rpx;
display: flex;
height: 40rpx;
@@ -804,31 +840,45 @@
}
.bottom {
- width: 484rpx;
- height: 74rpx;
- font-size: 26rpx;
- color: #333;
- margin-top: 20rpx;
- line-height: 40rpx;
+ width: 100%;
+ display: flex;
+ .bottom_item{
+ width: 484rpx;
+ // height: 74rpx;
+ font-size: 26rpx;
+ color: #333;
+ margin-top: 20rpx;
+ line-height: 40rpx;
+ }
+
+ .edit_box {
+ height: 100%;
+ background-color: red;
+ display: flex;
+ align-items: center;
+ position: relative;
+ margin-left: 100rpx;
+ margin-top: 40rpx;
+
+
+ .img_box {
+ width: 44rpx;
+ height: 44rpx;
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+
+ .img {
+ width: 100%;
+ height: 100%;
+ }
+ }
}
}
}
- .edit_box {
- height: 100%;
- display: flex;
- align-items: center;
-
- .img_box {
- width: 44rpx;
- height: 44rpx;
- }
-
- .img {
- width: 100%;
- height: 100%;
- }
- }
+
}
}
@@ -926,6 +976,22 @@
margin-left: 30rpx;
font-size: 26rpx;
color: #333;
+
+ &.phone_item{
+ flex-direction: column;
+ }
+
+ .input_box{
+ width: 100%;
+ }
+
+ .error_mess{
+ width: 100%;
+ text-align: left;
+ padding-left: 30rpx;
+ font-size: 20rpx;
+ color: #D73232;
+ }
.picker_box {
padding-left: 20rpx;
diff --git a/pages/pages_zhentou/order/checkOrder.vue b/pages/pages_zhentou/order/checkOrder.vue
index 0261b01..acf889f 100644
--- a/pages/pages_zhentou/order/checkOrder.vue
+++ b/pages/pages_zhentou/order/checkOrder.vue
@@ -43,7 +43,7 @@
-
+
收货地址
默认
diff --git a/pages/pages_zhentou/order/order.vue b/pages/pages_zhentou/order/order.vue
index 064bfb6..7ac318c 100644
--- a/pages/pages_zhentou/order/order.vue
+++ b/pages/pages_zhentou/order/order.vue
@@ -83,12 +83,16 @@
userInfo: {}
}
},
- onLoad() {
+ onShow() {
let userInfo = uni.getStorageSync('userInfo');
if (userInfo) {
this.userInfo = JSON.parse(userInfo);
+ this.hasMore = true
this.loadMore();
}
+ },
+ onLoad() {
+
},
methods: {
// 点击再次定制按钮，跳转到提交订单页面
@@ -222,10 +226,10 @@
title: '订单取消成功',
icon: 'none'
})
- setTimeout(() => {
- uni.navigateBack()
- }, 500)
-
+ this.current = 0;
+ this.orderData = [];
+ this.hasMore = true;
+ this.loadMore();
} else if (res.data.code == 401) {
this.doLogin()
} else {
@@ -243,6 +247,51 @@
});
},
+
+ // 确认收货
+ handleConfirm(row) {
+ let params = {
+ id: this.orderId
+ }
+ uni.showModal({
+ title: '提示',
+ content: '确认收到该商品了吗？',
+ success: (res) => {
+ if (res.confirm) {
+ uni.request({
+ url: getApp().globalData.baseUrl +
+ '/blade-desk/order/confirmReceive?id=' + row.id,
+ method: "POST",
+ header: {
+ 'Blade-Auth': 'bearer ' + uni.getStorageSync('token')
+ },
+ success: (res) => {
+ console.log(res)
+ if (res.data.code == 200) {
+ uni.showToast({
+ title: '收货成功',
+ icon: 'none'
+ })
+ this.current = 0;
+ this.orderData = [];
+ this.hasMore = true;
+ this.loadMore();
+ } else if (res.data.code == 401) {
+ this.doLogin()
+ } else {
+ uni.showToast({
+ title: res.data.msg,
+ icon: 'none'
+ })
+ }
+ }
+ })
+ } else if (res.cancel) {
+
+ }
+ }
+ });
+ },
// 删除订单
handleDelete(row) {
uni.showModal({
@@ -264,9 +313,10 @@
title: '订单删除成功',
icon: 'none'
})
- setTimeout(() => {
- uni.navigateBack()
- }, 500)
+ this.current = 0;
+ this.orderData = [];
+ this.hasMore = true;
+ this.loadMore();
} else if (res.data.code == 401) {
this.doLogin()
} else {
@@ -303,7 +353,7 @@
this.status = 'more';
}
} else if (res.data.code == 401) {
- this.doLogin()
+ this.doLogin(1)
} else {
uni.showToast({
title: res.data.msg,
@@ -346,6 +396,12 @@
success: (res) => {
if (res.data.code == 200) {
uni.setStorageSync('token', res.data.data.access_token);
+ if(type == 1){
+ this.current = 0;
+ this.orderData = [];
+ this.hasMore = true;
+ this.loadMore();
+ }
} else {
uni.showToast({
title: res.data.msg,