Merge branch 'v18' into dev

pages/home/index.vue

@@ -1481,6 +1481,12 @@ export default {
               success: () => {
               }
             })
+          } else {
+            uni.showToast({
+              title: res.msg + '',
+              icon: 'none',
+              duration: 3000
+            })
           }
         }).catch((err) => {
           uni.showToast({

pages/order/MyOrder/index.vue

@@ -186,6 +186,13 @@
             入住时间: {{ order.travelGroupOrderInfo.orderStartDate }}
           </text>
         </view>
+        <view v-if="order._status && ['1'].includes(order._status._type) && order.confirmTimeout" class="v12-ml-4 v12-mb-2" >
+          <text class="v12-primary-text v12-font-24">
+              等待商家确认时间，剩余
+              <u-count-down format="HH:mm:ss" autoStart :time="$global.diffSSS(order.confirmTimeout)" />
+              订单将自动取消
+            </text>
+        </view>
         <view
           v-if="!order.isGiftCardSend"
           class="bottom flex jc-between ai-center"
@@ -267,6 +274,7 @@
               >{{ '申请退款' }}</view>
               <view
                 class="bnt service"
+                :class="{'v12-primary-text v12-primary-border': order.isTravelGroup === 1}"
                 @click="goOrderDetails(order)"
               >{{ order.isTravelGroup === 0 ? '查看详情' : '查看券码' }}</view>
             </template>
@@ -276,7 +284,24 @@
                 @click="goOrderDetails(order)"
               >立即核销</view>
             </template>
-            <template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0">
+            <template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0 && order.isTravelGroup === 1">
+              <view
+                v-if="order.isTravelGroup === 1"
+                class="bnt service"
+                @click="editTime(order)"
+              >{{ '修改时间' }}</view>
+              <view
+                v-if="order.isTravelGroup === 1"
+                class="bnt service"
+                @click="applyRefund(order)"
+              >{{ '申请退款' }}</view>
+              <view
+                class="bnt service"
+                :class="{'v12-primary-text v12-primary-border': order.isTravelGroup === 1}"
+                @click="goOrderDetails(order)"
+              >{{ order.isTravelGroup === 0 ? '查看详情' : '查看券码' }}</view>
+            </template>
+            <template v-if="parseInt(order._status._type) === 2 && order.isTickets === 0 && order.isTravelGroup === 0">
               <view
                 v-if="order.isExtendedDelivery === 0"
                 class="bnt default"