Sfoglia il codice sorgente

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

lilei 4 anni fa
parent
commit
ff8d4efbf0
2 ha cambiato i file con 9 aggiunte e 8 eliminazioni
  1. 7 7
      pages/order/LogList.vue
  2. 2 1
      pages/order/order.vue

+ 7 - 7
pages/order/LogList.vue

@@ -2,16 +2,16 @@
 	<view class="pagesCons">
 		<view class="tab-body">
 					<scroll-view scroll-y class="scroll-view" @scrolltolower="onreachBottom">
-						<view class="check-order-list" v-for="item in list" :key="item.id"
+						<view class="check-order-list" v-for="(item,index) in list" :key="item.id"
 						 >
 							<view class="order-log">
-								<view v-if="item.orderState=='WAIT_SEND'">待发货</view>
+								<view v-if="!item.expressNum">待发货</view>
 								<view v-else>
 									<view>
 										快递公司:<text class="address-title">{{item.expressName}}</text>
 										<u-button v-if="item.expressState=='WAIT_SIGN'" 
 										:custom-style="btnStyle" 
-										@click="handleGet(item)"
+										@click="handleGet(index)"
 										 type="primary" shape="circle" size="mini" >确认收货</u-button>
 									</view>
 									<view>
@@ -101,11 +101,11 @@
 				})
 			},
 			// 确认收货
-			handleGet(item) {
-				console.log(item,'iiiiiiiiii')
+			handleGet(index) {
+				console.log(index,'iiiiiiiiii')
 				let params = {
-					  "expressNo": item.expressNo,
-						"orderNo": item.orderNo,
+					  "expressNo": this.list[index].expressNo,
+						"orderNo": this.list[index].orderNo,
 				}
 				finishOrder(params).then(res=>{
 					if(res.status==200) {

+ 2 - 1
pages/order/order.vue

@@ -48,7 +48,8 @@
 									<u-button :custom-style="btnStyle" @click="showTip" shape="circle" size="medium">提醒发货</u-button>
 								</view>
 								<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 @click="showLog(item)" :custom-style="btnStyle" 
+									style="margin-right: 20upx;margin-left: 20upx;" shape="circle" 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">