Merge remote-tracking branch 'origin/master'

orderPages/orderDetail/index.vue

@@ -139,7 +139,7 @@
 
             <view class="bottomHeight"></view>
 
-            <view class="bottom1 flex-col">
+            <view class="bottom1 flex-col" v-if="order.orderStatus != 3">
                 <text class="allMoney"></text>
                 <view class="bottomBtn　flex-row justify-between">
                     <view class=" flex-row">