twt пре 2 месеци
родитељ
комит
c59d421905

+ 8 - 2
pages/user/myOrder/activityOrderDetail.vue

@@ -240,10 +240,16 @@
 			<view class="cancel" @click="cancelBespeak" >取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
-		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
+		<!-- <view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
 		   <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>
 		   <view class="cancel" @click="cancelBespeak" v-else>取消订单</view>
-		</view>
+		</view> -->
+		<view class="" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
+		 <view v-if="orderData.data.payState==2"></view>
+		 <viwe class="bottom" v-else>
+			  <view class="cancel" @click="cancelBespeak" >取消订单</view>
+		 </viwe>
+		 </view>
 
 
 		<!-- 券码 -->

+ 2 - 2
pages/user/myOrder/mallOrderDetail.vue

@@ -230,9 +230,9 @@
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}"  @click="pay">立即支付</view>
 		</view>
-		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
+		<!-- <view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
 		    <view class="cancel" @click="cancelOrder" >退款</view>
-		</view>
+		</view> -->
 
 
 		<!-- 券码 -->

+ 5 - 2
pages/user/myOrder/paintOrderDetail.vue

@@ -209,8 +209,11 @@
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
-		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>
-			<view class="cancel" @click="cancelBespeak" v-else>取消订单</view>
+		  <view  v-if="orderData.data.payState==2"></view>
+		  <!--  <view class="cancel" @click="cancelOrder">退款</view> -->
+		  <view class="bottom"  v-else>
+		  			  	<view class="cancel" @click="cancelBespeak">取消订单</view>
+		  </view>
 		</view>