Ver Fonte

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei há 4 anos atrás
pai
commit
86c3946ba1
2 ficheiros alterados com 8 adições e 5 exclusões
  1. 5 5
      pages/order/order.vue
  2. 3 0
      pages/toOrder/editAddress.vue

+ 5 - 5
pages/order/order.vue

@@ -47,9 +47,9 @@
 								<view v-if="item.orderState=='WAIT_SEND'||item.orderState=='SEND_PART'" class="text-right">
 									<u-button :custom-style="btnStyle" @click="showTip" shape="circle" size="medium">提醒发货</u-button>
 								</view>
-								<view v-if="item.orderState=='SEND_ALL'" class="text-right">
+								<view v-if="item.orderState=='SEND_ALL'||item.orderState=='SEND_PART'" class="text-right">
 									<u-button @click="showLog(item)" :custom-style="btnStyle" style="margin-right: 20upx;" shape="circle" size="medium">查看物流</u-button>
-									<u-button :custom-style="btnStyle" shape="circle" type="primary" size="medium">确认收货</u-button>
+									<u-button :custom-style="btnStyle" @click="showLog(item)" shape="circle" type="primary" size="medium">确认收货</u-button>
 								</view>
 								<view v-if="item.orderState=='FINISH'" class="text-right">
 									<u-button @click="showLog(item)" :custom-style="btnStyle" shape="circle" size="medium">查看物流</u-button>
@@ -136,12 +136,12 @@
 					{
 						dispName: '待发货',
 						typeId: 3,
-						queryLabel: ['WAIT_SEND', 'SEND_PART'] // tab参数
+						queryLabel: ['WAIT_SEND'] // tab参数
 					},
 					{
-						dispName: '已发货',
+						dispName: '待收货',
 						typeId: 3,
-						queryLabel: ['SEND_ALL'] // tab参数
+						queryLabel: ['SEND_ALL','SEND_PART'] // tab参数
 					},
 					{
 						dispName: '已完成',

+ 3 - 0
pages/toOrder/editAddress.vue

@@ -90,6 +90,9 @@
 							receiveAreas: this.receiveAreas, 
 							receiveAddress: this.form.receiveAddress // 详细地址
 						}
+						if(this.form.id) {
+							params.id = this.form.id
+						}
 						saveAddress(params).then(res=>{
 							if(res.status == 200) {
 								uni.showToast({