Merge pull request '订单列表按钮顺序' (#340) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/340
This commit is contained in:
		
						commit
						b8bcf50c8f
					
				@ -76,11 +76,11 @@
 | 
			
		||||
		<view class="btn" v-if="['1', '2', '6'].indexOf(orderstate) >= 0">
 | 
			
		||||
			<!-- orderstate == '4' ||  -->
 | 
			
		||||
			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
 | 
			
		||||
			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
 | 
			
		||||
			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
 | 
			
		||||
			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
 | 
			
		||||
			<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
 | 
			
		||||
			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
 | 
			
		||||
			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
 | 
			
		||||
			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
 | 
			
		||||
			<view class="phone" v-if="orderstate == '1' && orderInfo.takeawayer_mobile" @click="makePhone(orderInfo.takeawayer_mobile)">
 | 
			
		||||
				<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
 | 
			
		||||
				<text>联系骑手</text>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user