change bug page

nova-tourism/components/homestay/index.wxml

@@ -33,7 +33,7 @@
 
             </view>
             <view class="cardbox">
-                <image class="pic" src="{{item.image[0]}}" data-id="{{item.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl"></image>
+                <image class="pic" src="{{item.cover}}" data-id="{{item.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl"></image>
                 <view class="textobx">
                     <view class="title" data-id="{{item.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl">
                         <view class="til">{{item.storeName}}</view>

nova-tourism/pages/homestay/homestay-detail/index.js

@@ -182,7 +182,7 @@ Page({
         this.setData({
             storeList
         });
-        this.Getlocation()
+        // this.Getlocation()
         console.log(this.data.storeList);
     },
     //获取房间信息
@@ -190,7 +190,7 @@ Page({
         let room = new Parse.Query('ShopRoom');
         room.equalTo('company', company);
         room.equalTo('shop', this.data.objectId);
-        room.equalTo('isEnabled', 'true');
+        // room.equalTo('isEnabled', 'true');
         room.include('benefitMap')
         room.notEqualTo('isDeleted', 'true');
 

nova-tourism/pages/homestay/homestay-detail/index.wxml

@@ -48,7 +48,7 @@
                 <van-calendar show="{{ show }}" show-confirm="{{ true }}" confirm-text="完成" confirm-disabled-text='完成' type="range" bind:close="onClose" bind:confirm="onConfirm" color='#46a9a4' position='bottom' />
             </van-sticky>
             <block wx:for="{{roomList}}" wx:key="index">
-                <view class="room-card" wx:if="{{item.remaining>0}}">
+                <view class="room-card" wx:if="{{item.remaining>0||item.remaining=== undefined}}">
                     <view class="room-card1">
                         <image src="{{item.images[0]}}"></image>
                         <view class="room-card-textbox">

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

@@ -102,43 +102,44 @@ Page({
         })
     },
     async getShopOrder() {
-
-        let ShopOrder = new Parse.Query('RoomOrder')
-        ShopOrder.equalTo('company', company)
-        ShopOrder.include('room')
-        ShopOrder.equalTo('shopStore', this.data.storeId)
+        let ShopOrder = new Parse.Query('RoomOrder');
+        ShopOrder.equalTo('company', company);
+        ShopOrder.include('room');
+        ShopOrder.equalTo('shopStore', this.data.storeId);
+        
         if (this.data.active == 1) {
-            ShopOrder.equalTo('status', 100)
+            ShopOrder.equalTo('status', 100);
         }
         if (this.data.active == 2) {
-            ShopOrder.equalTo('status', 200)
+            ShopOrder.equalTo('status', 200);
         }
         if (this.data.active == 3) {
-            console.log(this.data.active)
-            ShopOrder.equalTo('status', 400)
+            console.log(this.data.active);
+            ShopOrder.equalTo('status', 400);
         }
-
-        ShopOrder.include('room')
-        ShopOrder.exists('status')
+    
+        ShopOrder.include('room');
+        ShopOrder.exists('status');
+        
         ShopOrder.find().then(res => {
-            let list = []
+            let list = [];
             res.forEach(item => {
-                let activitys = item.toJSON()
-                activitys.orderTime = dateF.formatTime("mm-dd", activitys.startTime.iso)
-                activitys.Time = dateF.formatTime("mm-dd", activitys.endTime.iso)
-                activitys.a = dateF.formatTime("YYYY-mm-dd HH:MM:SS", activitys.startTime.iso)
-                activitys.e = dateF.formatTime("YYYY-mm-dd HH:MM:SS", activitys.endTime.iso)
-                    //计算天数
-                activitys.day = parseInt((new Date(activitys.e.replace(/-/g, '/')).getTime() - new Date(activitys.a.replace(/-/g, '/')).getTime()) / (1000 * 60 * 60 * 24));
-                list.push(activitys)
-            })
-
-
+                let activitys = item.toJSON();
+                activitys.orderTime = dateF.formatTime("mm-dd", activitys.startTime.iso);
+                activitys.Time = dateF.formatTime("mm-dd", activitys.endTime.iso);
+                activitys.a = dateF.formatTime("YYYY-mm-dd", activitys.startTime.iso); // 只保留日期部分
+                activitys.e = dateF.formatTime("YYYY-mm-dd", activitys.endTime.iso); // 只保留日期部分
+                
+                // 计算天数，只考虑日期部分
+                activitys.day = parseInt((new Date(activitys.e).getTime() - new Date(activitys.a).getTime()) / (1000 * 60 * 60 * 24));
+                list.push(activitys);
+            });
+    
             this.setData({
-                    list
-                }),
-                console.log(this.data.list)
-        })
+                list
+            });
+            console.log(this.data.list);
+        });
     },
 
     orderdeils(e) {

nova-tourism/pages/my/merchant/room-manage/room-edit/index.js

@@ -13,55 +13,61 @@ Page({
         routeId: '0ePMS1OGU7',
         roomId: null,
         storeId: null,
+        oldimages:[]
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        let {roomId,storeId} = options
-        if(!storeId && !roomId){
+        let {
+            roomId,
+            storeId
+        } = options
+        console.log(roomId);
+        if (!storeId && !roomId) {
             wx.navigateTo({
                 url: `/nova-tourism/pages/index/index`
-              })
+            })
         }
-        if(!storeId && roomId){
+        if (!storeId && roomId) {
             let pageType = 'edit'
+            let store = wx.getStorageSync('store')
             this.setData({
                 roomId,
-                storeId,
+                storeId: store.objectId,
                 pageType
             })
-        }else {
+        } else {
             this.setData({
                 roomId,
                 storeId
             })
         }
-        this.initData()  
-        
-        
+        this.initData()
+
+
     },
-    async initData(){
+    async initData() {
         let store;
         let room;
         let formData;
         let route = await this.getRoute()
-        if(this.data.pageType == 'add'){
+        if (this.data.pageType == 'add') {
             store = await this.getStore()
-        }else if(this.data.pageType == 'edit') {
+        } else if (this.data.pageType == 'edit') {
             room = await this.getRoom()
         }
-        if(!store && !room){
+        if (!store && !room) {
             wx.showToast({
-              title: '该店铺/房型不存在',
-              icon:'none'
+                title: '该店铺/房型不存在',
+                icon: 'none'
             })
-            setTimeout(()=>{
+            setTimeout(() => {
                 wx.navigateTo({
                     url: `/nova-tourism/pages/my/merchant/room-manage/room-edit/index`
-                  })
-            },1000)
+                })
+            }, 1000)
         }
         this.setData({
             store,
@@ -72,59 +78,60 @@ Page({
             // obj[cur["key"]] = cur;
             switch (cur["type"]) {
                 case 'String':
-                    obj[cur["key"]] = room?room[cur["key"]] : '';     
+                    obj[cur["key"]] = room ? room[cur["key"]] : '';
+                    break;
+                case 'Number':
+                    obj[cur["key"]] = room ? room[cur["key"]] : 0;
                     break;
-                    case 'Number':
-                        obj[cur["key"]] = room?room[cur["key"]] : 0;     
-                        break;
-                        case 'Boolean':
-                            obj[cur["key"]] = room?room[cur["key"]] : false;     
-                            break;
-                        case 'Array':
-                    obj[cur["key"]] = room?room[cur["key"]] : [];     
-                    if(cur["view"] == 'edit-filemanager'){
-                        obj[cur["key"]] = [];   
-                        if(room){
+                case 'Boolean':
+                    obj[cur["key"]] = room ? room[cur["key"]] : false;
+                    break;
+                case 'Array':
+                    obj[cur["key"]] = room ? room[cur["key"]] : [];
+                    if (cur["view"] == 'edit-filemanager') {
+                        obj[cur["key"]] = [];
+                        if (room) {
                             room[cur["key"]].forEach(item => {
-                                obj[cur["key"]].push({"url":item})
+                                obj[cur["key"]].push({
+                                    "url": item
+                                })
                             })
                         }
                     }
                     break;
-                    case 'GeoPoint':
-                    obj[cur["key"]] = room?room[cur["key"]] : null;     
+                case 'GeoPoint':
+                    obj[cur["key"]] = room ? room[cur["key"]] : null;
                     break;
-                    case 'Pointer':
-                            obj[cur["key"]] = room?room[cur["key"]] : null;  
-                       
+                case 'Pointer':
+                    obj[cur["key"]] = room ? room[cur["key"]] : null;
+
                     break;
                 default:
                     break;
             }
-            
+
             return obj;
-          }, {});
+        }, {});
         this.setData({
             formData
         })
         // 富文本回显
-        if(this.data.room ){
-            this.data.route['editFields'].forEach(field =>{
-                if(field["view"] == 'editor-tinymce'){
-                        this.selectComponent(`#editor${field["key"]}`).setHtml(room[field["key"]] || '');
+        if (this.data.room) {
+            this.data.route['editFields'].forEach(field => {
+                if (field["view"] == 'editor-tinymce') {
+                    this.selectComponent(`#editor${field["key"]}`).setHtml(room[field["key"]] || '');
                 }
             })
         }
         // 获取七牛参数
         this.getQiniuOption()
-       
+
     },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady: function () {
-    },
-    async getQiniuOption(){
+    onReady: function () {},
+    async getQiniuOption() {
         let uploadData = await this.getUptoken()
         if (uploadData) {
             this.setData({
@@ -135,122 +142,130 @@ Page({
         }
     },
     getUptoken() {
-        return Parse.Cloud.run('qiniu_uptoken', { company: company })
+        return Parse.Cloud.run('qiniu_uptoken', {
+            company: company
+        })
     },
-    async getStore(){
+    async getStore() {
         let Store = new Parse.Query('ShopStore')
         let store = await Store.get(this.data.storeId)
-        if(store&&store.id){
+        if (store && store.id) {
             store = store.toJSON()
             return store;
-        }else {
+        } else {
             return false;
         }
     },
-    async getRoom(){
+    async getRoom() {
         let Room = new Parse.Query('ShopRoom')
         let room = await Room.get(this.data.roomId)
-        if(room&&room.id){
+        if (room && room.id) {
             room = room.toJSON()
+            console.log('房间', room);
             return room;
-        }else {
+        } else {
             return false;
         }
     },
-    async getRoute(){
+    async getRoute() {
         let DevRoute = new Parse.Query('DevRoute')
         let route = await DevRoute.get(this.data.routeId)
-        if(route&&route.id){
+        if (route && route.id) {
             route = route.toJSON()
-        return route;
-        }else {
+            return route;
+        } else {
             return false;
         }
     },
-    onChange(event){
+    onChange(event) {
         let field = event.currentTarget.dataset.field;
         let type = event.currentTarget.dataset.type;
         let value = event.detail.value;
         switch (type) {
             case 'String':
-            this.data.formData[field] = value;
+                this.data.formData[field] = value;
                 break;
             case 'Number':
-            this.data.formData[field] = +value;
+                this.data.formData[field] = +value;
                 break;
             case 'Boolean':
-            this.data.formData[field] = event.detail;
+                this.data.formData[field] = event.detail;
                 this.setData({
-                    formData:this.data.formData
+                    formData: this.data.formData
                 });
                 break;
             default:
                 break;
         }
     },
-    showTagEdit(event){
+    showTagEdit(event) {
         let field = event.currentTarget.dataset.field;
         let name = event.currentTarget.dataset.name;
         let that = this;
         wx.showModal({
             title: `添加${name}`,
             content: ``,
-            editable:true,
-            success (res) {
-            if (res.confirm) {
-                that.data.formData[field].push(res.content)
-                that.setData({
-                    formData: that.data.formData
-                })
-            console.log('用户点击确定')
-            } else if (res.cancel) {
-            console.log('用户点击取消')
-            }
+            editable: true,
+            success(res) {
+                if (res.confirm) {
+                    that.data.formData[field].push(res.content)
+                    that.setData({
+                        formData: that.data.formData
+                    })
+                    console.log('用户点击确定')
+                } else if (res.cancel) {
+                    console.log('用户点击取消')
+                }
             }
         })
     },
-    tagClose(event){
+    tagClose(event) {
         let field = event.currentTarget.dataset.field;
         let index = event.currentTarget.dataset.index;
-        this.data.formData[field].splice(index,1)
+        this.data.formData[field].splice(index, 1)
         this.setData({
-            formData:this.data.formData
+            formData: this.data.formData
         })
     },
     changeFile(event) {
         let field = event.currentTarget.dataset.field;
         let fileList = event.detail
-        fileList = fileList.map(file =>  file.url)
+        fileList = fileList.map(file => file.url)
         this.data.formData[field] = fileList;
     },
-    chooseGeoPoint(event){
+    chooseGeoPoint(event) {
         let field = event.currentTarget.dataset.field;
         wx.chooseLocation({
             latitude: 0,
             longitude: 0,
-            success: (res)=>{
-              let {latitude,longitude,address,name} = res;
-              let locations = new Parse.GeoPoint(latitude,longitude)
-              this.data.formData[field] = locations
-              this.data.formData['address'] = address + name
-            //   this.data.formData['address'] = address
+            success: (res) => {
+                let {
+                    latitude,
+                    longitude,
+                    address,
+                    name
+                } = res;
+                let locations = new Parse.GeoPoint(latitude, longitude)
+                this.data.formData[field] = locations
+                this.data.formData['address'] = address + name
+                //   this.data.formData['address'] = address
                 this.setData({
-                    formData:this.data.formData,
+                    formData: this.data.formData,
                 })
             }
-          })
+        })
     },
-    getHtml(event){
+    getHtml(event) {
         let field = event.currentTarget.dataset.field;
         let html = event.detail.content.html;
         this.data.formData[field] = html;
     },
-    insertImage(event){
+    insertImage(event) {
         let field = event.currentTarget.dataset.field;
         let that = this;
         wx.chooseImage({
             count: 1,
-            success (res) {
+            success(res) {
                 // 本地测试图片插入
                 // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
                 // that.selectComponent(`#editor${field}`).insertSrc(res.tempFilePaths[0])
@@ -273,54 +288,72 @@ Page({
             }
         })
     },
-    async submit(){
+    async submit() {
         let checked = await this.checkForm()
-        if(!checked){
+        if (!checked) {
             return
         }
+        //当没有更新图片时执行
+        this.data.formData.images.forEach((img)=>{
+            if(img.url){
+                this.data.oldimages.push(img.url)
+            }
+        })
+        if (this.data.oldimages.length != 0) {
+            this.data.formData['images'] = this.data.oldimages; // 保持原有图片
+        }
         let room = await this.setRoom()
         console.log(room);
-        if(room&&room.id){
+        if (room && room.id) {
             wx.showToast({
-              title: '操作成功',
-              icon:'none'
+                title: '操作成功',
+                icon: 'none'
             })
             setTimeout(()=>{
-                wx.navigateTo({
-                    url: `/nova-tourism/pages/my/merchant/room-manage/index`
-                  })
+                wx.navigateBack({
+                    delta: 1 // 返回上一页
+                });
             },1000)
         }
     },
-    async checkForm(){
+    async checkForm() {
         let formData = this.data.formData;
         let editFields = this.data.route.editFields;
         for (let index = 0; index < editFields.length; index++) {
             const field = editFields[index];
-            if(field.required && (!formData[field.key] || formData[field.key]== '' ||  formData[field.key]== []) ){
+            if (field.required && (!formData[field.key] || formData[field.key] == '' || formData[field.key] == [])) {
                 wx.showToast({
-                  title: `请填写${field.name}`,
-                  icon:'none'
+                    title: `请填写${field.name}`,
+                    icon: 'none'
                 })
                 return false;
             }
         }
-      
+
         return true;
     },
-    async setRoom(){
-        let ShopRoom =  Parse.Object.extend("ShopRoom");
-        let Room = new ShopRoom()
+    async setRoom() {
+        let Room
+        if (this.data.roomId) {
+            let ShopRoom1 = new Parse.Query('ShopRoom');
+            ShopRoom1.equalTo('company', company);
+            ShopRoom1.equalTo('objectId', this.data.roomId);
+            Room = await ShopRoom1.first();
+        } else {
+            let ShopRoom = Parse.Object.extend("ShopRoom");
+            Room = new ShopRoom()
+        }
+
         Room.set(this.data.formData)
-        Room.set("shop",{
-            "__type":"Pointer",
-            "className":"ShopStore",
-            "objectId":this.data.storeId
+        Room.set("shop", {
+            "__type": "Pointer",
+            "className": "ShopStore",
+            "objectId": this.data.storeId
         })
-        Room.set("company",{
-            "__type":"Pointer",
-            "className":"Company",
-            "objectId":company
+        Room.set("company", {
+            "__type": "Pointer",
+            "className": "Company",
+            "objectId": company
         })
         return await Room.save()
     },