diff --git a/pages/help/index/index.js b/pages/help/index/index.js
index dc06a21..e072231 100644
--- a/pages/help/index/index.js
+++ b/pages/help/index/index.js
@@ -229,7 +229,7 @@ Page({
key:'pre-order',
success:(res)=>{
res.data.addressid = this.data.currentAddress.id;
- res.data.community_id = this.data.currentCommunity.id;
+ res.data.price_request.community_id = this.data.currentCommunity.id;
userApi.order.real(res.data).then((data)=>{
this.setData({
isShowOrderConfirm:false,
@@ -241,7 +241,7 @@ Page({
wx.showTabBar({
success(){
wx.navigateTo({
- url: `/pages/help/success/index?id=${data.order.orderid}&success_text=${data.success_text}`,
+ url: `/pages/help/success/index?id=${data.order.orderid}&success_text=${data.delivery_time}`,
})
}
});
diff --git a/pages/help/index/index.wxml b/pages/help/index/index.wxml
index dee35b1..7328996 100644
--- a/pages/help/index/index.wxml
+++ b/pages/help/index/index.wxml
@@ -138,4 +138,5 @@ bind:enter="enterPageContainer" bind:leave="leavePageContainer" wx:if="{{isShowO
-
\ No newline at end of file
+
+
diff --git a/pages/help/package/index.js b/pages/help/package/index.js
index 07fc67c..7cc64c4 100644
--- a/pages/help/package/index.js
+++ b/pages/help/package/index.js
@@ -80,6 +80,7 @@ Page({
})
return;
}
+ console.log('this.data.sendType',this.data.sendType)
wx.setStorage({
key:'pre-order',
data:{
@@ -189,7 +190,7 @@ Page({
imgOrderCount = preOrder.price_request.pickup_images_count||0;
}
this.setData({
- sendType:preOrder.delivery_method,
+ sendType:preOrder.delivery_method||this.data.sendType,
stationList:data.items,
tempImgs,
imgOrderCount
diff --git a/pages/help/success/index.wxml b/pages/help/success/index.wxml
index cc0a25b..6826d71 100644
--- a/pages/help/success/index.wxml
+++ b/pages/help/success/index.wxml
@@ -3,7 +3,9 @@
恭喜下单成功
- {{successText}}
+
+ 预计 送达,请注意查收!
+
diff --git a/pages/help/success/index.wxss b/pages/help/success/index.wxss
index a8a2bde..3327dc1 100644
--- a/pages/help/success/index.wxss
+++ b/pages/help/success/index.wxss
@@ -32,6 +32,10 @@ page{
color:#555555;
margin-top:40rpx;
}
+.sub-title .red{
+ color:#ff0000;
+ font-weight: 500;
+}
.button{
border: 1.2rpx solid #999999!important;
color:var(--main-font-color)!important;
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 1879998..e931f25 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -1,4 +1,5 @@
import userApi from '../../../api/user';
+const app = getApp();
Page({
/**
@@ -73,21 +74,13 @@ Page({
prePage.refreshList();
});
},
- //订单更改后上一个页面如果是订单列表,就刷新
- refreshOrderList(){
- const pages = getCurrentPages();
- const prePage = pages[pages.length-2];
- if(prePage&&prePage.refreshList){
- prePage.refreshList();
- }
- },
pay(){
const merchantPay = this.selectComponent('#merchantOrderComponent');
merchantPay.createPayment(this.data.orderDetail.orderid,true);
},
paySuccess(){
- this.refreshOrderList();
this.getOrderDetail();
+ app.globalData.needRefreshOrderList = true;
},
copyOrderId(){
wx.setClipboardData({
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 52b58b9..eac9f80 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -2,12 +2,12 @@
{{orderStatusKV[orderDetail.status]}}
-
- 原因:
+
+ 原因:
- 配送员发起了加价申请,请点击查看
+ class="order-tips right-arrow" wx:if="{{orderDetail.status==orderStatus.received&&orderDetail.order_additional_fee&&orderDetail.order_additional_fee.result=='PENDING'}}">
+ 申请:
配送员
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index 35930ee..33aeb99 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -39,17 +39,18 @@
.order-status.COMPLETED::before,.order-status.CANCELLED::before{
background-color:var(--main-font-color);
}
-.cancel-reason,.markup-tips{
- background: rgba(255, 195, 0, 0.15);
+.order-tips{
+ background-color: rgba(255, 195, 0, 0.1);
border-radius: 18rpx;
padding:36rpx;
margin:20rpx;
color: var(--main-font-color);
}
-.markup-tips.right-arrow::after{
+.order-tips.right-arrow::after{
right:20rpx;
+ color: #222222;
}
-.cancel-reason .reason{
+.order-tips .tips{
font-weight: 500;
}
.page-container .spliter{
diff --git a/pages/order/markup/index.wxml b/pages/order/markup/index.wxml
index 06a7ac2..192102b 100644
--- a/pages/order/markup/index.wxml
+++ b/pages/order/markup/index.wxml
@@ -34,21 +34,22 @@
加价金额
- {{applyDetail.additional_fee_amount}}
+ {{applyDetail.additional_fee_amount}}元
-
+
-
+