Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/orderList.vue

@@ -136,7 +136,7 @@
 							<u-avatar mode="circle" size="60" :src="item.GuidePhoto"></u-avatar>
 						</view>
 					</view>
-					<view class="order_BtnList">
+					<view class="order_BtnList" v-if="item.OrderStatus==1||item.OrderStatus==2||item.OrderStatus==3">
 						<view class="order_Btn_inner">
 							<view class="order_Btn_Com" v-if="item.OrderStatus==1" @click.stop="payment(item)" style="color:#FF4048;border-color:#FF4048;">立即支付</view>
 							<!-- <view class="order_Btn_Com">评价晒单</view> -->