diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 0415720..175c7f2 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -9,6 +9,12 @@
订单将在{{info.close_time.slice(-8)}}自动取消
+
+
+ 系统将在1-7个工作日内原路退回您的原支付账户
+
+
+ 您的退款金额已退还到您的原支付账户
@@ -221,12 +227,12 @@
店铺名称
-
+
营业时间
- {{merchantInfo.open_time}}
+ {{info.order_child[0].goods_data.open_description}}
@@ -238,18 +244,19 @@
class="shop-time">
- {{merchantInfo.province_name}}{{merchantInfo.city_name}}{{merchantInfo.district_name}}{{merchantInfo.detail_addr}}
+ {{info.order_child[0].goods_data.address}}
- 距您约{{merchantInfo.juli}}
+
+ 距您约{{info.order_child[0].goods_data.distance > 1000 ? info.order_child[0].goods_data.distance / 1000 + 'km' : info.order_child[0].goods_data.distance + 'm'}}
+ @click="clickPhone(info.order_child[0].goods_data.tel)">
+ @click="openLocation(info.order_child[0].goods_data.lat,info.order_child[0].goods_data.distancelon)">
@@ -368,8 +375,36 @@
立即支付
+
+
+ 快递查询
+
+
+
+ 确认收货
+
+
+
+
+
+
+ 物流信息
+ x
+
+
+
+ ·
+ ·
+
+ {{item.AcceptStation}}
+ {{item.AcceptTime}}
+
+
+
+
+
@@ -384,7 +419,8 @@
current: 0,
isQrcode: false,
remainNum: 0,
- merchantInfo: {}
+ maskShow: false,
+ postInfo: []
}
},
onLoad(option) {
@@ -406,7 +442,9 @@
// 获取订单详情
getDetail() {
this.Post({
- order_id: this.order_id
+ order_id: this.order_id,
+ lon: uni.getStorageSync('location').lon || '110.43785794300781',
+ lat: uni.getStorageSync('location').lat || '36.95286642085422'
}, '/api/order/orderDetail').then(res => {
this.info = res.data;
@@ -420,15 +458,6 @@
.foodInfo = item
})
})
-
- // 商家信息
- this.Post({
- lon: uni.getStorageSync('location').lon || '110.43785794300781',
- lat: uni.getStorageSync('location').lat || '36.95286642085422',
- specifications_id: this.info.order_child[0].specifications_id
- }, '/api/extract/getMerchantExtractStoreList').then(res => {
- this.merchantInfo = res.data[0] || {}
- })
}
// 景点、美食二维码
@@ -608,6 +637,48 @@
}
});
},
+ // 快递查询
+ openMask() {
+ this.Post({
+ child_order_id: this.info.order_child[0].child_id
+ }, '/api/order/getExpress').then(res => {
+ if (res.data.length > 0){
+ this.postInfo = res.data.reverse()
+ this.maskShow = true
+ }else {
+ uni.showToast({
+ title: '暂未查询到物流信息，请联系客服',
+ icon: 'none'
+ });
+ }
+ })
+ },
+ // 确认收货
+ confirmGoods() {
+ uni.showModal({
+ title: '提示',
+ content: '是否确认收货？',
+ success: successRes => {
+ if (successRes.confirm) {
+ this.Post({
+ order_id: this.info.order_id
+ }, '/api/order/confirmPost').then(res => {
+ if (res.code == 1) {
+ uni.showToast({
+ title: '确认收货成功',
+ icon: 'none'
+ });
+ this.getDetail();
+ uni.$emit("updateDataByConnect", {
+ msgType: 'updateOrderTrades',
+ data: {}
+ })
+ }
+ })
+ }
+ }
+ });
+ }
}
}
@@ -1346,4 +1417,116 @@
}
}
}
+
+ // 快递查询
+ .mask {
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ background: rgba(0, 0, 0, 0.6);
+ z-index: 1000;
+ display: flex;
+ align-items: flex-end;
+ justify-content: center;
+ }
+
+ .mask-bg {
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ }
+
+ .mask-content {
+ width: 100%;
+ padding: 28rpx 0;
+ border-radius: 20rpx 20rpx 0 0;
+ background: white;
+ height: 70%;
+ position: relative;
+ overflow-y: auto;
+ }
+
+ .mask-content .icon-close {
+ position: absolute;
+ right: 20rpx;
+ top: 20rpx;
+ }
+
+ .mask-content .close-btn {
+ background-image: url("https://static.ticket.sz-trip.com/taizhou/images/close.png");
+ width: 80rpx;
+ height: 80rpx;
+ position: absolute;
+ bottom: -100rpx;
+ left: 0;
+ right: 0;
+ margin: auto;
+ }
+
+ .mask-title {
+ font-size: 36rpx;
+ font-weight: bold;
+ padding-left: 37rpx;
+ }
+
+ .mask-content .iconfont {
+ position: absolute;
+ right: 30rpx;
+ top: 20rpx;
+ }
+
+ .express-all {
+ margin: 40rpx;
+ position: relative;
+ }
+
+ .express-item {
+ display: flex;
+ justify-content: space-between;
+ padding-bottom: 60rpx;
+ position: relative;
+ z-index: 1;
+ }
+
+
+ .line {
+ width: 1rpx;
+ height: 100%;
+ background: #CCCCCC;
+ position: absolute;
+ left: 13rpx;
+ }
+
+ .express-info {
+ width: 600rpx;
+ font-size: 26rpx;
+ line-height: 40rpx;
+ color: #999;
+ }
+
+ .express-info.active {
+ color: #000;
+ }
+
+ .express-time {
+ font-size: 22rpx;
+ color: #666;
+ margin-top: 10rpx;
+ }
+
+ .express-item-icon {
+ width: 27rpx;
+ height: 27rpx;
+ background: #CCCCCC;
+ border-radius: 50%;
+ position: relative;
+ }
+
+ .express-item-icons {
+ background: #71B580;
+ }
\ No newline at end of file
diff --git a/subPackages/user/collect.vue b/subPackages/user/collect.vue
index 1dec597..fc74abc 100644
--- a/subPackages/user/collect.vue
+++ b/subPackages/user/collect.vue
@@ -4,7 +4,7 @@
{{item.arr.title}}
- {{item.arr.low_money / 100}}
+ {{(item.arr.low_money || item.arr.price) / 100}}