Merge branch 'v18' into dev

components/ProductWindow.vue

@@ -183,7 +183,7 @@ export default {
       this.$emit("changeFun", { action: "changeattr", value: false })
     },
     CartNumDes() {
-      if(this.cartNumber === 1) return
+      if(this.cartNumber <= 1) return
       console.log(this.cartNumber, 'cartNumber');
       this.cartNumber--
       this.$emit("changeFun", { action: "ChangeCartNum", value: this.cartNumber })

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"

pkg_product/views/housekeeperDetail.vue

@@ -39,14 +39,14 @@
             <view>家</view>
           </view>
           <view class="v12-mt-3 v12-weight-500 v12-font-28">
-            {{ record.desc }}
+            {{ record.intro }}
           </view>
         </view>
         <view class="v12-mt-3 v12-align-center">
           <view v-for="tag in record.tags" :key="tag" class="v12-primary-text v12-primary-border v12-radius-100 tag-item v12-mr-2">{{ tag }}</view>
         </view>
         <view class="v12-mt-2 v12-font-24" style="color: #666">
-          {{ record.intro }}
+          {{ record.desc }}
         </view>
         <view class="v12-mt-3 service-wrap v12-pa-3">
           <view class="title-wrap" style="padding-left: 12rpx;">

pkg_product/views/sojoumOrderDetails.vue

@@ -124,7 +124,7 @@
       </view>
       <view class="info-item">
         <text class="label">支付状态</text>
-        <text class="value">{{orderInfo._status._type !== '0' && orderInfo._status._type !== '9' ? '已支付' : '未支付'}}</text>
+        <text class="value">{{ orderInfo.paid ? '已支付' : '未支付'}}</text>
       </view>
       <view class="info-item">
         <text class="label">支付方式</text>

pkg_product/views/sojoumStore.vue

@@ -19,8 +19,8 @@
         >
           <swiper-item v-for="(item, index) in store.banner" :key="index">
             <video
-              v-if="item.includes('.mp4')"
+              v-if="item.type === 'video'"
-              :src="item"
+              :src="item.url"
               style="width: 100%; height: 100%"
               @play="videoPlay"
               @ended="videoEnd"
@@ -28,7 +28,7 @@
             ></video>
             <image
               v-else
-              :src="item"
+              :src="item.url"
               style="width: 100%; height: 100%"
             ></image>
           </swiper-item>
@@ -678,8 +678,17 @@ export default {
     getFarmerData() {
       getJiaLouDetail(this.id).then(res => {
         this.store = res.data || {}
+        this.store.banner = res.data.banner.map(img => {
+          return {
+            type: 'img',
+            url: img
+          }
+        })
         if(res.data.video) {
-          this.store.banner.unshift(res.data.video)
+          this.store.banner.unshift({
+            type: 'video',
+            url: res.data.video
+          })
         }
         this.getNews()
         this.getJiaLouProductList()

pkg_product/views/submitOrder.vue

@@ -206,7 +206,7 @@ export default {
     contactMerchant() {
       uni.showModal({
         title: '商家电话',
-        content: this.form.merPhone || '暂无电话',
+        content: this.orderInfo.merPhone || '暂无电话',
         confirmText: '立即拨打',
         cancelText: '取消',
         success: (res) => {

pkg_user/views/gift/gift.vue

@@ -536,7 +536,7 @@ export default {
               this.isPayOk = true;
               
             }).catch(err => {
-              this.makeAgain()
+              // this.makeAgain()
               uni.showToast({
                 title: '支付取消,请在我的礼品卡中完成支付',
                 icon: "none",