u

nova-tourism/components/collect/index.wxml

@@ -39,9 +39,8 @@
         <view class="picturebox2">
           <swiper autoplay="{{true}}" indicator-dots='{{true}}' indicator-color='#D9D9D9' indicator-active-color='#F8DA7F' interval="{{5000}}" circular duration="{{500}}" class="img">
             <block wx:for="{{giftBanner}}" wx:key="index" wx:for-item="gifban">
-              <swiper-item class="img">
-                {{}}
-                <image data-url="/nova-tourism/pages/collect/collect-detail/index?gid={{gifban.objectId}}" bindtap="tourl" style="border-radius: 10rpx;" src="{{gifban.image||'https://file-cloud.fmode.cn/EbxZUK5lBI/20250411/frvr1u080411965.jpg'}}" mode="aspectFill"></image>
+              <swiper-item class="img" style="background: rgba(244, 242, 243);">
+                <image data-url="/nova-tourism/pages/collect/collect-detail/index?gid={{gifban.objectId}}" bindtap="tourl" style="border-radius: 10rpx;" src="{{gifban.image||'https://file-cloud.fmode.cn/EbxZUK5lBI/20250411/frvr1u080411965.jpg'}}" mode="aspectFit"></image>
               </swiper-item>
             </block>
           </swiper>
@@ -49,7 +48,9 @@
         <view class="wang-cardbox">
           <block wx:for="{{gift}}" wx:key="index">
             <view class="wang-card" data-url="/nova-tourism/pages/collect/collect-detail/index?gid={{item.objectId}}" bindtap="tourl">
-              <image src="{{item.image||'https://img95.699pic.com/photo/60072/5330.jpg_wh860.jpg'}}" mode="aspectFill"></image>
+            <view style="background: rgba(244, 242, 243);;">
+              <image src="{{item.image||'https://img95.699pic.com/photo/60072/5330.jpg_wh860.jpg'}}" mode="aspectFit"></image>
+            </view>
               <view class="wang-catex">{{item.name}}</view>
               <view class="wang-numbox">
                 <view class="wang-num">

nova-tourism/pages/my/merchant/code-verify/index.js

@@ -30,11 +30,17 @@ Page({
   },
   async getRoomOrder() {
     let id = this.data.id
-    console.log(id, 12222323);
     let RoomOrder = new Parse.Query('RoomOrder')
     RoomOrder.include('room')
     RoomOrder.include('shopStore')
     let roomOrder = await RoomOrder.get(id)
+    let currentStore = wx.getStorageSync('store')
+    if(roomOrder?.get('shopStore')?.id!=currentStore?.objectId){
+      this.setData({
+        isHide:true
+      })
+      return
+    }
     console.log(roomOrder, 666666);
     let Order = roomOrder.toJSON()
     Order.createdAt = dateF.formatTime("YYYY-mm-dd HH:MM:SS", Order.createdAt)

nova-tourism/pages/my/merchant/code-verify/index.wxml

@@ -1,75 +1,80 @@
 <nav type="back" background-color="#46a9a4" title="核销" />
-<block wx:if="{{id}}">
-  <view class="top">
-    <image class="top-image" src="{{order.room.images[0]||'https://file-cloud.fmode.cn/EbxZUK5lBI/20250412/e1hjn1052809193.jpg'}}" mode="aspectFit"></image>
-    <view class="title">
-      <view class="order-name">{{order.room.name}}</view>
-      <view class="order-time">营业时间：{{order.room.open_time}}</view>
-      <view class="order-price">房间单价：￥{{order.room.price}}</view>
+<block wx:if="{{isHide}}">
+  <van-empty description="非本店订单" />
+</block>
+<block wx:else>
+  <block wx:if="{{id}}">
+    <view class="top">
+      <image class="top-image" src="{{order.room.images[0]||'https://file-cloud.fmode.cn/EbxZUK5lBI/20250412/e1hjn1052809193.jpg'}}" mode="aspectFit"></image>
+      <view class="title">
+        <view class="order-name">{{order.room.name}}</view>
+        <view class="order-time">营业时间：{{order.room.open_time}}</view>
+        <view class="order-price">房间单价：￥{{order.room.price}}</view>
+      </view>
     </view>
-  </view>
 
-  <view class="ruleBox">
-    <view style="margin-bottom: 10rpx;">订房须知</view>
-    <view class="list">
-      <view class="key">入离</view>
-      <view class="value">{{chickRoom.book_rules.time||'12:00后入住,12:00前退房'}}</view>
-    </view>
-    <view class="list">
-      <view class="key">发票</view>
-      <view class="value">{{chickRoom.book_rules.ticket||'发票由民宿经营者（房东）提供'}}</view>
-    </view>
-    <view class="list">
-      <view class="key">退订</view>
-      <view class="value" style="color: #7E9F86;">{{chickRoom.book_rules.unsubscribe||'仅限30分钟内免费取消'}}</view>
-    </view>
-    <view class="list">
-      <view class="key">　　　　　</view>
-      <view class="value">
-        <text>{{chickRoom.book_rules.other_1||'订单确认30分钟后,取消订单将扣除当日全部房费（订单需等商家确认后生效，订单确认结果以公众号，短信为准，如订单不确认将全额退款至您的付款账号）'}}</text>
+    <view class="ruleBox">
+      <view style="margin-bottom: 10rpx;">订房须知</view>
+      <view class="list">
+        <view class="key">入离</view>
+        <view class="value">{{chickRoom.book_rules.time||'12:00后入住,12:00前退房'}}</view>
+      </view>
+      <view class="list">
+        <view class="key">发票</view>
+        <view class="value">{{chickRoom.book_rules.ticket||'发票由民宿经营者（房东）提供'}}</view>
+      </view>
+      <view class="list">
+        <view class="key">退订</view>
+        <view class="value" style="color: #7E9F86;">{{chickRoom.book_rules.unsubscribe||'仅限30分钟内免费取消'}}</view>
+      </view>
+      <view class="list">
+        <view class="key">　　　　　</view>
+        <view class="value">
+          <text>{{chickRoom.book_rules.other_1||'订单确认30分钟后,取消订单将扣除当日全部房费（订单需等商家确认后生效，订单确认结果以公众号，短信为准，如订单不确认将全额退款至您的付款账号）'}}</text>
+        </view>
       </view>
     </view>
-  </view>
 
-  <view class="ruleBox orderBox">
-    <view style="margin-bottom: 10rpx;">订单信息</view>
-    <view class="list">
-      <view class="key">订单编号：</view>
-      <view class="value">{{order.orderNum}}</view>
-    </view>
-    <view class="list">
-      <view class="key">订单状态：</view>
-      <view class="value">{{statusMap[order.status]}}</view>
-    </view>
-    <view class="list">
-      <view class="key">入住人姓名：</view>
-      <view class="value">{{order.name||order.mobile||order.user.nickname||order.user.mobile}}</view>
-    </view>
-    <view class="list">
-      <view class="key">下单时间：</view>
-      <view class="value">{{order.createdAt}}</view>
-    </view>
-    <view class="list">
-      <view class="key">入住时间：</view>
-      <view class="value">{{order.startTime}} - {{order.endTime}}</view>
-    </view>
-    <view class="list">
-      <view class="key">入住天数：</view>
-      <view class="value">{{order.day}}</view>
-    </view>
-    <view class="list">
-      <view class="key">订单总额：</view>
-      <view class="value">￥{{order.totalPrice}}</view>
+    <view class="ruleBox orderBox">
+      <view style="margin-bottom: 10rpx;">订单信息</view>
+      <view class="list">
+        <view class="key">订单编号：</view>
+        <view class="value">{{order.orderNum}}</view>
+      </view>
+      <view class="list">
+        <view class="key">订单状态：</view>
+        <view class="value">{{statusMap[order.status]}}</view>
+      </view>
+      <view class="list">
+        <view class="key">入住人姓名：</view>
+        <view class="value">{{order.name||order.mobile||order.user.nickname||order.user.mobile}}</view>
+      </view>
+      <view class="list">
+        <view class="key">下单时间：</view>
+        <view class="value">{{order.createdAt}}</view>
+      </view>
+      <view class="list">
+        <view class="key">入住时间：</view>
+        <view class="value">{{order.startTime}} - {{order.endTime}}</view>
+      </view>
+      <view class="list">
+        <view class="key">入住天数：</view>
+        <view class="value">{{order.day}}</view>
+      </view>
+      <view class="list">
+        <view class="key">订单总额：</view>
+        <view class="value">￥{{order.totalPrice}}</view>
+      </view>
     </view>
-  </view>
-</block>
-<block wx:if="{{!id}}">
-  <van-empty description="暂无" />
-</block>
+  </block>
+  <block wx:if="{{!id}}">
+    <van-empty description="暂无" />
+  </block>
 
-<block wx:if="{{order.status==100||order.status==500||order.status==602}}">
-  <view class="bommon" bindtap="submit">登记入住</view>
-</block>
-<block wx:if="{{order.status==200||order.status==102||order.status==104}}">
-  <view class="bommon" bindtap="submit">确认核销</view>
+  <block wx:if="{{order.status==100||order.status==500||order.status==602}}">
+    <view class="bommon" bindtap="submit">登记入住</view>
+  </block>
+  <block wx:if="{{order.status==200||order.status==102||order.status==104}}">
+    <view class="bommon" bindtap="submit">确认核销</view>
+  </block>
 </block>

nova-tourism/pages/my/merchant/merchant-home/order2-list/index.js

@@ -274,7 +274,8 @@ Page({
         ShopOrder.include('room');
         ShopOrder.include('user');
         ShopOrder.exists('status');
-
+        ShopOrder.notEqualTo('status',105)//未付款
+        ShopOrder.notEqualTo('isDeleted',true)
         ShopOrder.find().then(res => {
             let list = [];
             res.forEach(item => {

nova-tourism/pages/my/merchant/merchant-home/order2-list/index.wxml

@@ -66,11 +66,11 @@
         <van-dialog wx:if="{{showid==item.objectId}}" message='确定该用户已入住' data-item="{{item}}" show="{{ show }}" show-cancel-button bind:cancel="onClose" bind:confirm="getUserInfo">
         </van-dialog>
         <!-- 订单完成 -->
-        <view class="submitbox" wx:if="{{item.status==200}}">
+        <!-- <view class="submitbox" wx:if="{{item.status==200}}">
             <view class="submit" data-item="{{item}}" bindtap="ONShow2">订单完成</view>
-        </view>
+        </view> -->
 
-        <van-dialog wx:if="{{showid2==item.objectId}}" message='确定该订单也已完成' data-item="{{item}}" show="{{ show2 }}" show-cancel-button bind:cancel="onClose2" bind:confirm="ordercom">
+        <van-dialog wx:if="{{showid2==item.objectId}}" message='确定该订单已完成' data-item="{{item}}" show="{{ show2 }}" show-cancel-button bind:cancel="onClose2" bind:confirm="ordercom">
         </van-dialog>
         <!--申请退房 -->
         <view class="submitbox" style="display: flex;" wx:if="{{item.status==102}}">

project.private.config.json

@@ -1,7 +1,7 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "urlCheck": true
   },
   "condition": {