Merge branch 'master' of http://git.fmode.cn:3000/bin/tourism-wxapp

nova-tourism/components/homestay/index.js

@@ -30,13 +30,13 @@ Component({
         price: 211,
         //搜索
         value: '',
-        start:'',
-        end:'',
+        start: '',
+        end: '',
 
         //触底加载
-        loadedItems:0,
-        pageSize:5,
-        noMoreItems:false,
+        loadedItems: 0,
+        pageSize: 3,
+        noMoreItems: false,
 
     },
     lifetimes: {
@@ -76,8 +76,8 @@ Component({
                 date_end: this.formatDate(tomorrow),
                 date_start1: this.formatDate(today),
                 date_end1: this.formatDate(tomorrow),
-                start:today,
-                end:tomorrow
+                start: today,
+                end: tomorrow
             });
             console.log(this.data.start, this.data.end);
         },
@@ -107,7 +107,7 @@ Component({
             return `${date.getMonth() + 1}月${date.getDate()}日`;
         },
         //选好日期点击完成后
-     async   onConfirm(event) {
+        async onConfirm(event) {
             const [start, end] = event.detail;
             const daysBetween = this.calculateDaysBetween(start, end); // 计算天数差
             this.setData({
@@ -130,11 +130,11 @@ Component({
                 console.log(this.data.istoday);
             }
             this.setData({
-                loadedItems:0,
-                noMoreItems:false,
-                storeList:[]
+                loadedItems: 0,
+                noMoreItems: false,
+                storeList: []
             })
-          await  this.gethomestar()
+            await this.gethomestar()
             console.log(`入住日期: ${this.data.date_start}, 离店日期: ${this.data.date_end}, 天数差: ${daysBetween}天`);
         },
         gourl(e) {
@@ -148,8 +148,8 @@ Component({
                 date_end: this.data.date_end,
                 daysBetween: this.data.daysBetween,
                 istoday: this.data.istoday,
-                start:this.data.start,
-                end:this.data.end
+                start: this.data.start,
+                end: this.data.end
             };
 
             // 将信息转为查询字符串
@@ -177,6 +177,7 @@ Component({
             ShopStore.limit(this.data.pageSize);
             ShopStore.skip(this.data.loadedItems);
             let store = await ShopStore.find();
+
             let storeListPromises = store.map(async item => {
                 let storeItem = item.toJSON();
                 // 为每一项添加价格属性
@@ -186,18 +187,29 @@ Component({
             });
 
             let storeList = await Promise.all(storeListPromises); // 等待所有的Promise完成
-            if(storeList.length<this.data.pageSize){
+            
+            // 收藏提前-----------------------
+            // 合并新加载的商店和已存在的商店列表
+            let updatedStoreList = this.data.storeList.concat(storeList);
+
+            // 按照iscollect排序，true的排在前面
+            updatedStoreList.sort((a, b) => {
+                return (b.iscollect === true) - (a.iscollect === true);
+            });
+            // 收藏提前-----------------------
+            if (storeList.length < this.data.pageSize) {
                 this.setData({
-                    noMoreItems:true
-                })
-            }else{
+                    noMoreItems: true
+                });
+            } else {
                 this.setData({
-                    noMoreItems:false
-                })
+                    noMoreItems: false
+                });
             }
+
             this.setData({
-                storeList:this.data.storeList.concat(storeList),
-                loadedItems:this.data.loadedItems+storeList.length,
+                storeList: updatedStoreList,//storeList: this.data.storeList.concat(storeList),
+                loadedItems: this.data.loadedItems + storeList.length,//loadedItems: this.data.loadedItems + storeList.length,
             });
 
             console.log(this.data.storeList);
@@ -331,11 +343,11 @@ Component({
                 this.clear()
             }
         },
-        clear(){
+        clear() {
             this.setData({
-                loadedItems:0,
-                noMoreItems:false,
-                storeList:[]
+                loadedItems: 0,
+                noMoreItems: false,
+                storeList: []
             })
             this.gethomestar()
         },
@@ -386,8 +398,8 @@ Component({
             }
         },
         //触底加载
-      async  loadMoreData(){
-            if(!this.data.noMoreItems){
+        async loadMoreData() {
+            if (!this.data.noMoreItems) {
                 await this.gethomestar()
             }
         },

nova-tourism/components/homestay/index.wxml

@@ -38,7 +38,7 @@
                                 <image class="collect" wx:if="{{item.iscollect}}" src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/8mp9uj030058190.png?imageView2/1/w/200/h/200"></image>
                             </view>
 
-                            <view class="miaosu" wx:if="{{item.desc}}" data-id="{{item.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl">
+                            <view class="miaosu"  data-id="{{item.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl">
                                 {{item.desc}}
                             </view>
                             <view class="bottom">

nova-tourism/components/my/index.less

@@ -15,8 +15,8 @@
         height: auto;
         padding-top: 20rpx;
         image{
-            width: 150rpx;
-            height: 150rpx;
+            width: 134rpx;
+            height: 140rpx;
             border-radius: 15rpx;
         }
         .info{
@@ -24,28 +24,28 @@
             height: 100rpx;
             margin-left: 40rpx;
             .name{
-                font-size: 34rpx;
+                font-size: 36rpx;
                 font-weight: 600;
                 margin-bottom: 10rpx;
             }
             .uid{
-                font-size: 30rpx;
+                font-size: 28rpx;
             }
             .labelbox{
                 height: 40rpx;
                 display: flex;
                 margin-top: 10rpx;
                 .label{
-                    width: 90rpx;
-                    height: 40rpx;
-                    font-size: 24rpx;
+                    width: 71rpx;
+                    height: 37rpx;
+                    font-size: 19rpx;
                     display: flex;
                     justify-content: center;
                     align-items: center;
                     background-color: #39362D;
                     color: white;
                     margin-left: 10rpx;
-                    border-radius: 15rpx;
+                    border-radius: 10rpx;
                 }
                 .label:nth-child(1){
                     margin-left: 0rpx;
@@ -55,7 +55,7 @@
     }
     .tatlebox{
         width: 100%;
-        height: 260rpx;
+        height: 278rpx;
         margin-top: 40rpx;
         background-color: #B2CEB9;
         border-radius: 15rpx;

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

@@ -316,19 +316,20 @@ Page({
                             latitude: latitude,
                             longitude: longitude,
                             iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
-                            width: 30,
-                            height: 30,
+                            width: 20,
+                            height: 20,
                             callout: {
                                 content: this.data.storeList[0].storeName, // 可以显示解析出的地址
                                 color: '#ffffff',
                                 bgColor: '#7F56B2',
-                                padding: 10,
+                                padding: 2,
+                                fontSize:12,
                                 borderRadius: 5,
                                 display: 'ALWAYS'
                             }
                         }]
                     });
-                    console.log(this.data.address);
+                    // console.log(this.data.address);
                 },
                 fail: function (resq) {
                     wx.showModal({

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

@@ -12,7 +12,7 @@
         position: relative;
         .img{
             width: 100%;
-            height: 480rpx;
+            height: 454rpx;
             image{
                 width: 100%;
                 height: 100%;
@@ -21,14 +21,13 @@
         }
         .numberbox{
             position: absolute;
-            bottom: 40rpx;
+            bottom: 60rpx;
             right: 20rpx;
-            border-radius: 45%;
             z-index: 10;
             color: white;
-            width: 70rpx;
-            height: 45rpx;
-            font-size: 24rpx;
+            width: 82rpx;
+            height: 48rpx;
+            font-size: 28rpx;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -40,15 +39,15 @@
         width: 100%;
         height: auto;
         position: absolute;
-        top: 450rpx;
+        top: 432rpx;
         .Legendary-Information{
             width: 100%;
             height: auto;
             background-color: white;
             border-radius: 20px; /* 左上角圆角 */
-            padding-top: 20rpx;
-            padding-left: 35rpx;
-            padding-right: 35rpx;
+            padding-top: 35rpx;
+            padding-left: 40rpx;
+            padding-right: 40rpx;
             padding-bottom: 20rpx;
             .info-name{
                 width: 100%;
@@ -56,7 +55,7 @@
                 display: flex;
                 align-items: center;
                 .name-tex{
-                    font-size: 30rpx;
+                    font-size: 34rpx;
                     font-weight: 600;
                 }
                 .name-pic{
@@ -87,16 +86,16 @@
                 margin-top: 20rpx;
                 .map{
                     width: 480rpx;
-                    height: 270rpx;
+                    height: 180rpx;
                 }
                 .info-call{
                     width: 156rpx;
-                    height: 250rpx;
+                    height: auto;
                     display: flex;
                     justify-content: center;
                     align-items: center;
                     flex-direction: column;
-                    margin-left: 40rpx;
+                    margin-left: 35rpx;
                     image{
                         width: 60rpx;
                         height: 60rpx;
@@ -126,7 +125,7 @@
             align-items: flex-end;
             position: relative;
             padding-left: 10rpx;
-            margin-bottom: 20rpx;
+            margin-bottom: 16rpx;
             padding-bottom: 20rpx;
             padding-top: 20rpx;
             .time{
@@ -158,14 +157,13 @@
             padding-top: 40rpx;
             border-radius: 30rpx;
             margin-bottom: 20rpx;
-            padding-bottom: 20rpx;
             .room-card1{
                 width: 100%;
                 height: auto;
                 display: flex;
                 image{
-                    width: 200rpx;
-                    height: 270rpx;
+                    width: 175rpx;
+                    height: 223rpx;
                     margin-right: 20rpx;
                     border-radius: 15rpx;
                 }
@@ -175,7 +173,7 @@
                     .room-card-textbox-titlebox{
                         display: flex;
                         .room-card-textbox-title{
-                            font-size: 34rpx;
+                            font-size: 32rpx;
                             font-weight: 600;
                         }
                     }
@@ -213,7 +211,6 @@
                 height: 100rpx;
                 display: flex;
                 justify-content: flex-end;
-                margin-top: 20rpx;
                 .no{
                     width: 200rpx;
                     height: 80rpx;

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

@@ -24,7 +24,7 @@
             <view class="info-intr2" bindtap="callMap"><van-icon size='36rpx' name="location-o" /> {{storeList[0].storeAddress}}</view>
             <view class="info-map">
                 <view class="map" >
-                    <map class="map" enable-zoom="ture" enable-scroll="true" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="20" markers="{{markers}}"></map>
+                    <map class="map" enable-zoom="ture" enable-scroll="true" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="14" markers="{{markers}}"></map>
                 </view>
                 <view class="info-call" bindtap="phone" >
                     <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/e9muh5104028782.png"></image>

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

@@ -26,7 +26,6 @@ Page({
         date2: '',
         name: '',
         mobile: '',
-        error_message: '',
         activeOrder: null, //创建的订单
         tradeNo: null, //订单号
         showPayment: false, //显示支付组件
@@ -238,9 +237,9 @@ Page({
     //获取住客姓名
     getname(e) {
         this.setData({
-            name: e.detail
+            name: e.detail.value
         })
-        console.log(e.detail);
+        console.log(this.data.name);
     },
     //获取住客电话
     getmobile(e) {
@@ -253,14 +252,15 @@ Page({
         // 验证手机号格式
         if (mobilePattern.test(mobileNumber)) {
             this.setData({
-                error_message: '',
                 mobile: mobileNumber
             })
             console.log("手机号格式正确");
             // 这里可以执行其他操作，比如保存手机号或进行下一步操作
         } else {
-            this.setData({
-                error_message: '手机号格式不正确'
+            
+            wx.showToast({
+                title: '手机号格式不正确',
+                icon: 'none',
             })
             console.log("手机号格式不正确");
             // 这里可以提示用户手机号格式不正确

nova-tourism/pages/homestay/homestay-order2/index.less

@@ -8,8 +8,8 @@
     .timebox{
         width: 100%;
         height: 50rpx;
-        margin-top: 10rpx;
-        font-size: 30rpx;
+        margin-top: 30rpx;
+        font-size: 28rpx;
         display: flex;
         .time1{
             margin-right: 40rpx;
@@ -18,17 +18,17 @@
     .roombox{
         width: 100%;
         display: flex;
-        margin-top: 40rpx;
+        margin-top: 38rpx;
         image{
-            width: 170rpx;
-            height: 170rpx;
+            width: 165rpx;
+            height: 156rpx;
             border-radius: 10rpx;
         }
         .room{
             height: 100%;
-            margin-left: 20rpx;
+            margin-left: 26rpx;
             .room-name{
-                font-size: 28rpx;
+                font-size: 26rpx;
                 font-weight: 600;
                 margin-bottom: 24rpx;
 
@@ -43,20 +43,47 @@
             .room-text{
                 width: 480rpx;
                 height: auto;
-                font-size: 26rpx;
+                font-size: 24rpx;
                 color: #737373;
             }
         }
     }
-    .lable{
-        color: #382E2E;
+    .inputbox{
+        width: 100%;
+        font-size: 26rpx;
+        .inputbox2{
+            width: 100%;
+            display: flex;
+            margin-bottom: 30rpx;
+            align-items: center;
+            .in-tex{
+                display: flex;
+                font-weight: 600;
+                margin-right: 30rpx;
+                width: 185rpx;
+                .red{
+                    color: red;
+                    font-weight: 500;
+                    margin-left: 4rpx;
+                    margin-right: 10rpx;
+                }
+            }
+            .input{
+                font-size: 28rpx;
+                font-weight: 600;
+            }
+        }
     }
+
+
     .benefitbox{
         width: 100%;
         height: auto;
-        font-size: 28rpx;
+        font-size: 26rpx;
         .benefitbox1{
             margin-bottom: 40rpx;
+            font-size: 26rpx;
+            font-weight: 600;
         }
         .benefitbox2{
             width: 100%;
@@ -69,12 +96,14 @@
                 display: flex;
                 margin-left: auto;
                 color:#F37B40;
+                font-size: 28rpx;
             }
             .benefitbox2-text_2{
                 display: flex;
                 margin-left: auto;
                 margin-right: 30rpx;
                 color:#F37B40;
+                font-size: 28rpx;
             }
             .benefitbox2-text_22{
                 display: flex;
@@ -90,11 +119,15 @@
         margin-bottom: 40rpx;
         .benefitbox2-text{
             width: 120rpx;
+            font-size: 26rpx;
+            font-weight: 600;
         }
         .benefitbox2-text_22{
             display: flex;
             margin-left: auto;
             margin-right: 30rpx;
+            font-size: 26rpx;
+            font-weight: 600;
         }
 
     }

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

@@ -21,8 +21,23 @@
     </view>
     <van-divider customStyle="margin: 20rpx;border-color:'#B1B1B1' " />
     <van-cell-group>
-        <van-field label-class='lable' value="{{ name }}" required label="住客姓名" placeholder="请输入姓名" bind:change='getname' border="{{ false }}" />
-        <van-field label-class='lable' value="{{ mobile }}" error-message="{{error_message}}" required label="联系电话" placeholder="请输入电话" border="{{ false }}" bind:blur='getmobile' />
+        <!-- <van-field  label-class='lable' placeholder-style='font-weight: 500;' custom-style='padding-top:0rpx;padding-bottom:0rpx;' input-class='input' value="{{ name }}" required label="住客姓名" placeholder="请输入姓名" custom-style='padding-top:0rpx;padding-bottom:0rpx' bind:change='getname' border="{{ false }}" />
+        <van-field label-class='lable' placeholder-style='font-weight: 500;'  custom-style='padding-top:0rpx;padding-bottom:0rpx;' input-class='input' value="{{ mobile }}" error-message="{{error_message}}" required label="联系电话" placeholder="请输入电话" border="{{ false }}" bind:blur='getmobile' /> -->
+        <view class="inputbox">
+            <view class="inputbox2">
+                <view class="in-tex">住客姓名
+                    <view class="red">*</view>
+                </view>
+                <input model:value="{{ name }}" bindinput='getname' class="input" type="text" placeholder-style="font-weight:500" placeholder="请输入住客姓名" />
+            </view>
+            <view class="inputbox2">
+                <view class="in-tex">联系电话
+                    <view class="red">*</view>
+                    +86
+                </view>
+                <input model:value="{{ mobile }}" bindblur='getmobile' class="input" type="text"  placeholder-style="font-weight:500" placeholder="请输入联系电话" />
+            </view>
+        </view>
     </van-cell-group>
     <van-divider customStyle="margin: 20rpx;border-color:'#B1B1B1' " />
     <view class="benefitbox">

nova-tourism/pages/my/merchant/merchant-home/account/index.js

@@ -217,10 +217,11 @@ Page({
             html: store.content,
             id: store.objectId,
             licenseList: licenseList,
-            locations: store.location
+            locations: store.location,
+            address:store.storeAddress
         })
         console.log('首页', this.data.locations);
-        this.Getlocation()
+        // this.Getlocation()
         // this.selectComponent('#hf_editor').setHtml(this.data.html);
         this.getQiniuOption()
     },
@@ -292,8 +293,8 @@ Page({
     //选择地理位置
     chooseGeoPoint() {
         wx.chooseLocation({
-            latitude: 0,
-            longitude: 0,
+            // latitude: 28.8025354729244,
+            // longitude: 115.921421511343,
             success: (res) => {
                 let {
                     latitude,
@@ -322,41 +323,41 @@ Page({
     //解析地理位置
     Getlocation() {
         // 假设 this.storeList[0].location 是一个 Parse.GeoPoint 对象
-        if (this.data.locations) {
-            const storeLocation = this.data.locations;
+        // if (this.data.locations) {
+        //     const storeLocation = this.data.locations;
 
-            // 从 GeoPoint 对象中获取经纬度
-            const latitude = storeLocation.latitude; // 纬度
-            const longitude = storeLocation.longitude; // 经度
+        //     // 从 GeoPoint 对象中获取经纬度
+        //     const latitude = storeLocation.latitude; // 纬度
+        //     const longitude = storeLocation.longitude; // 经度
 
-            console.log('获取到的经纬度:', latitude, longitude); // 添加日志
+        //     console.log('获取到的经纬度:', latitude, longitude); // 添加日志
 
-            // 调用 API 解析地址
-            wx.request({
-                url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
-                data: {},
-                header: {
-                    'Content-Type': 'application/json'
-                },
-                success: (ops) => { // 使用箭头函数
-                    console.log(ops);
-                    const address = ops.data.result.formatted_address;
-                    this.setData({
-                        address: address,
-                    });
-                    console.log(this.data.address);
-                },
-                fail: function (resq) {
-                    wx.showModal({
-                        title: '信息提示',
-                        content: '请求失败',
-                        showCancel: false,
-                        confirmColor: '#f37938'
-                    });
-                },
-                complete: function () {}
-            });
-        }
+        //     // 调用 API 解析地址
+        //     wx.request({
+        //         url: 'https://api.map.baidu.com/reverse_geocoding/v3/?ak=sHZTomd7grslfP7sPKB8tRgT49FK9TEu&output=json&coordtype=gcj02&location=' + latitude + ',' + longitude,
+        //         data: {},
+        //         header: {
+        //             'Content-Type': 'application/json'
+        //         },
+        //         success: (ops) => { // 使用箭头函数
+        //             console.log(ops);
+        //             const address = ops.data.result.formatted_address;
+        //             this.setData({
+        //                 address: address,
+        //             });
+        //             console.log(this.data.address);
+        //         },
+        //         fail: function (resq) {
+        //             wx.showModal({
+        //                 title: '信息提示',
+        //                 content: '请求失败',
+        //                 showCancel: false,
+        //                 confirmColor: '#f37938'
+        //             });
+        //         },
+        //         complete: function () {}
+        //     });
+        // }
 
     },
 })

project.private.config.json

@@ -1,61 +1,14 @@
 {
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "setting": {
-    "compileHotReLoad": false,
-    "urlCheck": true,
-    "preloadBackgroundData": false
-  },
-  "game": {
-    "list": []
-  },
-  "gamePlugin": {
-    "list": []
-  },
-  "miniprogram": {
-    "list": []
-  },
-  "libVersion": "2.27.3",
-  "projectname": "nova-wapp",
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "民宿详细",
-          "pathName": "nova-tourism/pages/homestay/homestay-detail/index",
-          "query": "",
-          "scene": null
+    "condition": {
+        "plugin": {
+            "list": []
         },
-        {
-          "name": "卡卷包",
-          "pathName": "nova-tourism/pages/my/my-card/index",
-          "query": "",
-          "scene": null
+        "game": {
+            "list": []
         },
-        {
-          "name": "商品详细",
-          "pathName": "nova-tourism/pages/collect/collect-detail/index",
-          "query": "",
-          "scene": null
+        "gamePlugin": {
+            "list": []
         },
-<<<<<<< HEAD
-        {
-          "name": "商户端首页",
-          "pathName": "nova-tourism/pages/my/merchant/merchant-home/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "我的订单",
-          "pathName": "nova-tourism/pages/my/my-order/index",
-          "query": "active=0",
-          "scene": null
-        },
-        {
-          "name": "退款售后",
-          "pathName": "nova-tourism/pages/my/my-order/my-refund/index",
-          "query": "",
-          "scene": null
-=======
         "miniprogram": {
             "list": [
                 {
@@ -99,11 +52,20 @@
                     "pathName": "nova-tourism/pages/my/my-order/my-refund/refund-detail/index",
                     "query": "",
                     "scene": null
+                },
+                {
+                    "name": "民宿订单",
+                    "pathName": "nova-tourism/pages/homestay/homestay-order2/index",
+                    "query": "objectId=vhyskK4oxw&date_start=Fri%2520Dec%252013%25202024%252016%253A28%253A58%2520GMT%252B0800%2520(%25E4%25B8%25AD%25E5%259B%25BD%25E6%25A0%2587%25E5%2587%2586%25E6%2597%25B6%25E9%2597%25B4)&date_end=Sat%2520Dec%252014%25202024%252016%253A28%253A58%2520GMT%252B0800%2520(%25E4%25B8%25AD%25E5%259B%25BD%25E6%25A0%2587%25E5%2587%2586%25E6%2597%25B6%25E9%2597%25B4)",
+                    "scene": null
+                },
+                {
+                    "name": "民宿订单",
+                    "pathName": "nova-tourism/pages/homestay/homestay-order2/index",
+                    "query": "objectId=vhyskK4oxw&date_start=Fri%2520Dec%252013%25202024%252016%253A28%253A58%2520GMT%252B0800%2520(%25E4%25B8%25AD%25E5%259B%25BD%25E6%25A0%2587%25E5%2587%2586%25E6%2597%25B6%25E9%2597%25B4)&date_end=Sat%2520Dec%252014%25202024%252016%253A28%253A58%2520GMT%252B0800%2520(%25E4%25B8%25AD%25E5%259B%25BD%25E6%25A0%2587%25E5%2587%2586%25E6%2597%25B6%25E9%2597%25B4)",
+                    "scene": null
                 }
             ]
->>>>>>> e906246ee957ca55189981dd4211e974770fab17
         }
-      ]
     }
-  }
 }