add app.json infos

app.json

@@ -32,7 +32,8 @@
                 "pages/homestay/homestay-order2/index",
                 "pages/my/my-order/index",
                 "pages/my/my-order/order-detail/index",
-                "pages/my/my-order/my-refund/index"
+                "pages/my/my-order/my-refund/index",
+                "pages/my/my-order/my-refund/refund-detail/index"
             ]
         },
         {
@@ -56,6 +57,9 @@
             "desc": "你的位置信息将用于小程序位置接口的效果展示"
         }
     },
+    "requiredPrivateInfos": [
+      "chooseLocation"
+    ],
     "usingComponents": {
         "nav": "plugin://fm-plugin/fm-nav",
         "get-phone-number-btn": "components/getPhone/index",

nova-tourism/components/collect/index.js

@@ -22,19 +22,19 @@ Component({
         active: 0,
 
         taps: [{
-                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/511ua1025435972.png',
+                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/1eil1p104028966.png',
                 tex: '望仙礼遇',
             },
             {
-                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/opk1db025446786.png',
+                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/hb84u2104029067.png',
                 tex: '妆造旅拍',
             },
             {
-                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/f12978025423947.png',
+                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/8jb180104028856.png',
                 tex: '望仙果蔬',
             },
             {
-                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/365p16025500910.png',
+                url: 'https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/hjo5t1104029406.png',
                 tex: '房务服务',
             },
         ],

nova-tourism/components/collect/index.less

@@ -3,6 +3,7 @@
     width: 100vw;
     overflow-y: scroll;
     padding-bottom: 30rpx;
+    color: #382E2E;
     .img2{
         width: 100%;
         height: 430rpx;

nova-tourism/components/goods-list/index.less

@@ -3,7 +3,7 @@
 .title {
   font-weight: Medium;
   font-size: 36rpx; 
-  color: #222222;
+  color: #382E2E;
 }
 .text-large {
   font-size: 36rpx; 
@@ -48,7 +48,7 @@
           width: 100%;
           margin: 10rpx 0;
           font-size: 30rpx;
-          color:#222222; 
+          color:#382E2E; 
           overflow: hidden; //一定要写
           text-overflow: ellipsis; //超出省略号
           display: -webkit-box; //一定要写
@@ -98,6 +98,7 @@
               width: 180rpx;
             .btn-text {
               letter-spacing: 6rpx;
+              color:#382E2E; 
             }
           }
         }
@@ -146,7 +147,7 @@
           margin-top: 10rpx;
           min-height: 80rpx;
           font-size: 30rpx;
-          color:#222222;
+          color:#382E2E;
           overflow: hidden; //一定要写
           text-overflow: ellipsis; //超出省略号
           display: -webkit-box; //一定要写

nova-tourism/components/goods-list/index.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{list.length}}">
-    <view class="wrapper horizontal" wx:if="{{mode=='horizontal'}}">
+    <view class="wrapper horizontal" style="color: #382E2E;" wx:if="{{mode=='horizontal'}}">
         <block wx:for="{{list}}" wx:key="index">
             <view class="goods" data-item="{{item}}" bindtap="toDetail">
                 <view class="goods-image-wrapper">
@@ -35,7 +35,7 @@
             </view>
         </block>
     </view>
-    <view class="wrapper vertical" wx:elif="{{mode=='vertical'}}">
+    <view class="wrapper vertical" style="color: #382E2E;" wx:elif="{{mode=='vertical'}}">
         <block wx:for="{{list}}" wx:key="index">
             <view class="goods" data-item="{{item}}" bindtap="toDetail">
                 <view class="goods-image-wrapper">

nova-tourism/components/homestay/index.js

@@ -36,6 +36,7 @@ Component({
         loadedItems:0,
         pageSize:5,
         noMoreItems:false,
+
     },
     lifetimes: {
         detached: function () {},
@@ -311,13 +312,13 @@ Component({
 
         //搜索功能
         search(e) {
-            const value = e.detail;
+            const value = e.detail.value;
             console.log(value);
             this.getRooms(value)
         },
         //清零后
         change(e) {
-            const value = e.detail;
+            const value = e.detail.value;
             if (!value) {
                 console.log('运行');
                 this.clear()
@@ -382,6 +383,6 @@ Component({
             if(!this.data.noMoreItems){
                 await this.gethomestar()
             }
-        }
+        },
     }
 });

nova-tourism/components/homestay/index.json

@@ -4,6 +4,7 @@
         "van-icon": "@vant/weapp/icon/index",
         "van-calendar": "@vant/weapp/calendar/index",
         "van-search": "@vant/weapp/search/index",
-        "van-empty": "@vant/weapp/empty/index"
+        "van-empty": "@vant/weapp/empty/index",
+        "van-sticky": "@vant/weapp/sticky/index"
     }
 }

nova-tourism/components/homestay/index.less

@@ -3,82 +3,89 @@
 .all{
     width: 100vw;
     height: 100vh;
+    color: #382E2E;
+    position:relative;
     .picturebox{
         width: 100%;
-        height: 430rpx;
-        position: relative;
+        height: 438rpx;
         .img{
             width: 100%;
-            height: 430rpx;
+            height: 438rpx;
             image{
                 width: 100%;
                 height: 100%;
 
             }
         }
-        .infobox{
-            width: 94%;
-            height: 250rpx;
+
+    }
+    .infobox{
+        width: 94%;
+        height: 217rpx;
+        background-color: white;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+        border-radius: 20rpx;
+        position: absolute;
+        left: 3%;
+        top: 375rpx;
+        z-index: 10;
+        border: solid #e5e5e5 2rpx;
+        box-shadow: 0 2rpx 4rpx rgba(0,0,0,0.2);
+        .seach{
+            width: 80%;
+            height: 96rpx;
             background-color: white;
             display: flex;
             justify-content: center;
-            flex-direction: column;
             align-items: center;
-            border-radius: 20rpx;
-            position: absolute;
-            left: 3%;
-            bottom: -186rpx;
-            z-index: 10;
-            border: solid #e5e5e5 2rpx;
-            box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.2);
-            .seach{
-                width: 80%;
-                height: 110rpx;
-                background-color: white;
-                .a{
-                    background-color: white;
-                    padding: auto;
-                }
+
+            .input{
+                width: 358rpx;
+                height: 60rpx;
+                margin-left: 31rpx;
+            }
+        }
+        .datebox{
+            width: 90%;
+            height: 132rpx;
+            display: flex;
+            align-items: center;
+            font-size: 32rpx;
+            border-top: solid #e5e5e5 2rpx;
+            .today{
+                font-size: 28rpx;
+                color: gray;
+                margin-left: 10rpx;
+                display: flex;
+                justify-content: flex-end;
+            }
+            .start{
+                display: flex;
+                justify-content: flex-end;
             }
-            .datebox{
-                width: 90%;
-                height: 132rpx;
+            .day{
                 display: flex;
+                justify-content: center;
                 align-items: center;
-                font-size: 32rpx;
-                border-top: solid #e5e5e5 2rpx;
-                .today{
-                    font-size: 28rpx;
-                    color: gray;
-                    margin-left: 10rpx;
-                    display: flex;
-                    justify-content: flex-end;
-                }
-                .start{
-                    display: flex;
-                    justify-content: flex-end;
-                }
-                .day{
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    margin-left: auto;
-                    width: 90rpx;
-                    height: 42rpx;
-                    background-color: #ECECEC;
-                    font-size: 25rpx;
-                    color: black;
-                }
-                .end{
-                    margin-left: auto;
-                }
+                margin-left: auto;
+                width: 90rpx;
+                height: 42rpx;
+                background-color: #ECECEC;
+                font-size: 25rpx;
+                color: black;
+            }
+            .end{
+                margin-left: auto;
             }
-            
         }
+        
     }
 
     .Legendary-Information{
-        margin-top: 204rpx;
+        margin-top: 166rpx;
         width: 100%;
         background-color: white;
         overflow-y: hidden;
@@ -99,7 +106,6 @@
                 height: 280rpx;
                 width: 100%; /* 根据需要调整宽度 */
                 background-image: url('https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/01atf5032703958.png?imageView2/1/w/200/h/200');
-                margin-top: 20rpx;
                 margin-bottom: 20rpx;
                 break-inside: avoid;
                 float: left;
@@ -134,12 +140,13 @@
                 // float: left;
                 .pic{
                     width: 100%;
-                    height: 275rpx;
+                    height: 206rpx;
+                    border-radius: 10rpx;
                 }
                 .textobx{
                     width: 100%;
                     height: auto;
-                    padding-top: 10rpx;
+                    // padding-top: 6rpx;
                     padding-left: 20rpx;
                     padding-right: 20rpx;
                     .title{
@@ -148,7 +155,7 @@
                         display: flex;
                         align-items: center;
                         .til{
-                            font-size: 30rpx;
+                            font-size: 28rpx;
                             font-weight: 600;
                         }
                         .collect{
@@ -159,7 +166,7 @@
                     }
                     .miaosu{
                         width: 100%;
-                        height: 80rpx; /* 设置固定高度 */
+                        height: 72rpx; /* 设置固定高度 */
                         font-size: 28rpx;
                         overflow: hidden; /* 隐藏超出部分 */
                         display: -webkit-box; /* 使用弹性盒子布局 */
@@ -173,7 +180,7 @@
                     }
                     .bottom{
                         width: 100%;
-                        height: 80rpx;
+                        height: 68rpx;
                         display: flex;
                         align-items: center;
                         .qian{
@@ -184,9 +191,9 @@
                             }
                         }
                         .soucang{
-                            width: 104rpx;
-                            height: 48rpx;
-                            font-size: 26rpx;
+                            width: 110rpx;
+                            height: 46rpx;
+                            font-size: 25rpx;
                             background-color: #343027;
                             border-radius: 40rpx;
                             color: white;
@@ -202,10 +209,10 @@
 
 
     }
-    .bottom{
+    .bottom2{
         width: 100%;
         font-size: 26rpx;
-        margin-bottom: 20rpx;
+        margin-bottom: 40rpx;
         display: flex;
         align-items: center;
         justify-content: center;

nova-tourism/components/homestay/index.wxml

@@ -4,21 +4,25 @@
         <view class="img">
             <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/jc17lo114657420.jpg"></image>
         </view>
-        <!-- 日期 -->
-        <view class="infobox">
-            <view class="seach">
-                <van-search shape="round" model:value="{{ value }}" placeholder="请输入地点/门店名称/关键词" bind:search="search" bind:change="change" bind:clear='clear'/>
-            </view>
-            <view class="datebox" bindtap="onDisplay">
-                <view class="start">{{date_start}}</view>
-                <view class="today" wx:if="{{istoday}}">今天</view>
-                <view class="day">共{{daysBetween}}晚</view>
-                <view class="end">{{date_end}}</view>
-                <view class="today" wx:if="{{istoday}}">明天</view>
-            </view>
-            <van-calendar show="{{ show }}" show-confirm="{{ true }}" confirm-text="完成" confirm-disabled-text='完成' type="range" bind:close="onClose" bind:confirm="onConfirm" color='#46a9a4' position='top' />
+    </view>
+    <!-- 日期 -->
+    <view class="infobox">
+        <view class="seach">
+            <!-- <van-search input-class='a' shape="round" model:value="{{ value }}" placeholder="请输入地点/门店名称/关键词" bind:search="search" bind:change="change" bind:clear='clear' /> -->
+            <van-icon name="search" size='40rpx' />
+            <input class="input" bindinput='change' bindconfirm='search' model:value='{{value}}' type="text" placeholder="搜索地点/门店名称/关键词" placeholder-style="font-size: 26rpx;" />
         </view>
+        <view class="datebox" bindtap="onDisplay">
+            <view class="start">{{date_start}}</view>
+            <view class="today" wx:if="{{istoday}}">今天</view>
+            <view class="day">共{{daysBetween}}晚</view>
+            <view class="end">{{date_end}}</view>
+            <view class="today" wx:if="{{istoday}}">明天</view>
+        </view>
+        <van-calendar show="{{ show }}" show-confirm="{{ true }}" confirm-text="完成" confirm-disabled-text='完成' type="range" bind:close="onClose" bind:confirm="onConfirm" color='#46a9a4' position='top' />
     </view>
+
+
     <!-- 卡片 -->
     <view class="Legendary-Information" wx:if="{{storeList.length!=0}}">
         <block>
@@ -88,7 +92,7 @@
             </view>
         </block>
     </view>
-    <view class="bottom" wx:if="{{noMoreItems}}">没有更多民宿了...</view>
+    <view class="bottom2" wx:if="{{noMoreItems}}">没有更多民宿了...</view>
     <!-- 无搜索内容 -->
     <view class="Legendary-Information2" wx:if="{{storeList.length==0}}">
         <van-empty wx:if="{{storeList.length==0}}" image="network" description="暂无该店铺" />

nova-tourism/components/my/index.js

@@ -48,10 +48,10 @@ Component({
      */
     methods: {
         gourl(e) {
-            const url = e.currentTarget.dataset.url;
-            wx.navigateTo({
-                url: `${url}`,
-            });
+            // const url = e.currentTarget.dataset.url;
+            // wx.navigateTo({
+            //     url: `${url}`,
+            // });
         },
         //获取头像名称
         async getname(){
@@ -88,9 +88,9 @@ Component({
             });
         },
         gorefund(){
-            wx.navigateTo({
-                url: '../../pages/my/my-order/my-refund/index',
-            });
+            // wx.navigateTo({
+            //     url: '../../pages/my/my-order/my-refund/index',
+            // });
         }
     }
 })

nova-tourism/components/my/index.less

@@ -8,6 +8,7 @@
     background-repeat: no-repeat; /* 不重复背景图片 */
     padding-left: 20rpx;
     padding-right: 20rpx;
+    color: #382E2E;
     .infobox{
         width: 100%;
         display: flex;
@@ -86,10 +87,10 @@
         margin-top: 34rpx;
         padding-left: 30rpx;
         padding-right: 30rpx;
-        padding-top: 10rpx;
+        padding-top: 20rpx;
         border-radius: 15rpx;
         .my-name{
-            font-size: 30rpx;
+            font-size: 28rpx;
         }
         .or-box{
             width: 100%;
@@ -104,13 +105,13 @@
                 align-items: center;
                 justify-content: center;
                 image{
-                    width: 80rpx;
-                    height: 80rpx;
+                    width: 60rpx;
+                    height: 60rpx;
                     
                 }
                 .or-tex{
                     font-size: 28rpx;
-                    margin-top: 30rpx;
+                    margin-top: 25rpx;
                 }
             }
         }
@@ -133,7 +134,7 @@
             flex-direction: column;
             justify-content: center;
             .tui-title{
-                font-size: 32rpx;
+                font-size: 36rpx;
                 margin-bottom: 10rpx;
             }
             .tuiguang-tex{

nova-tourism/components/my/index.wxml

@@ -14,11 +14,11 @@
     </view>
     <view class="tatlebox">
         <view class="tatle" data-url="../../pages/my/my-card/index" bindtap="gourl">
-            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/jn1eq8050320499.png"></image>
+            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/nb541o104029705.png"></image>
             <view class="text">卡卷包</view>
         </view>
         <view class="tatle" data-url="../../pages/my/my-wallet/index" bindtap="gourl">
-            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/dor18o050338203.png"></image>
+            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/6u1kj2104029980.png"></image>
             <view class="text">钱包</view>
         </view>
     </view>
@@ -26,19 +26,19 @@
         <view class="my-name">我的订单</view>
         <view class="or-box">
             <view class="myorder" bindtap="goorder" data-url="../../pages/my/my-order/index" data-active="0" >
-                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/43b1ee050235369.png"></image>
+                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/t0nmv1104029230.png"></image>
                 <view class="or-tex">处理中</view>
             </view>
             <view class="myorder" bindtap="goorder" data-url="../../pages/my/my-order/index" data-active="1">
-                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/3f134m050312537.png"></image>
+                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/dums1u104029603.png"></image>
                 <view class="or-tex">进行中</view>
             </view>
             <view class="myorder" bindtap="goorder" data-url="../../pages/my/my-order/index" data-active="2">
-                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/n35s1s050408606.png"></image>
+                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/1ha691104644184.png"></image>
                 <view class="or-tex">已完成</view>
             </view>
             <view class="myorder" bindtap="gorefund">
-                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/5dhs3s050348761.png"></image>
+                <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/erk8bg104030058.png"></image>
                 <view class="or-tex" >退款/售后</view>
             </view>
         </view>
@@ -50,11 +50,11 @@
             <view class="tui-title">推广中心</view>
             <view class="tuiguang-tex">成为推广达人，获取佣金返利</view>
         </view>
-        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/rv1kfo050253663.png"></image>
+        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241211/i18ml9095731989.png"></image>
     </view>
     <view class="myshop" bindtap="merchant">我是商户</view>
     <view class="leavebox">
-        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/qc3aet050423378.png"></image>
+        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/0i1usn030423248.png"></image>
         <view class="leave-tex">退出登录</view>
     </view>
 </view>

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

@@ -21,23 +21,23 @@
                     </block>
                 </view>
                 <view class="carbox">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241127/3i680f113841258.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/5m1j14104029327.png"></image>
                     <view class="car-tex">48小时内发货</view>
                 </view>
                 <view class="carbox2">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241127/r801qv113859250.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/60n1d2104029824.png"></image>
                     <view class="car-tex">紫色经典款</view>
                     <van-icon name="arrow" size='15' style="margin-left: auto;" />
                 </view>
                 <view class="carbox3">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241127/asia61113937543.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/1d4d8q104029153.png"></image>
                     <view class="carbox3-tex">
                         <view class="carbox3-tex1">陶瓷工艺</view>
                         <view class="carbox3-tex2">直径5cm高7cm</view>
                     </view>
                 </view>
                 <view class="carbox4">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241127/r801qv113859250.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/hmsbb1104028656.png"></image>
                     <view class="car-tex">确认收货地址</view>
                     <van-icon name="arrow" size='15' style="margin-left: auto;" />
                 </view>
@@ -72,7 +72,7 @@
     <!-- 按钮 -->
     <view class="paybox">
         <view class="pay1">
-            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/m1rt69104425214.png?imageView2/1/w/200/h/200"></image>
+            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/m1rt69104425214.png"></image>
             <view class="pay1-tex">首页</view>
         </view>
         <view class="pay2">

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

@@ -38,7 +38,7 @@ Page({
         //
         show: false,
         date_start1: '',
-        date_end1:'',
+        date_end1: '',
 
     },
 
@@ -101,11 +101,11 @@ Page({
         console.log('istoday', this.data.istoday);
         this.hanshu()
     },
-    async hanshu(){
-      await  this.gethomestay()
-      await this.getroom()
-    //   await this.getpic()
-      await this.getcurrentdate()
+    async hanshu() {
+        await this.gethomestay()
+        await this.getroom()
+        //   await this.getpic()
+        await this.getcurrentdate()
     },
 
     /**
@@ -185,7 +185,7 @@ Page({
             storeList
         });
         this.setData({
-            imageUrls:storeList[0].image
+            imageUrls: storeList[0].image
         })
         this.Getlocation()
         console.log(this.data.storeList);
@@ -198,17 +198,17 @@ Page({
         room.equalTo('isEnabled', 'true');
         room.include('benefitMap');
         room.notEqualTo('isDeleted', 'true');
-    
+
         let room2 = await room.find();
         // 使用 Promise.all 来处理异步操作
         let roomList = await Promise.all(room2.map(async item => {
             let roomItem = item.toJSON();
             let count = await this.checkOrderCount(roomItem.objectId, this.data.start, this.data.end);
-            console.log(count, roomItem.total); 
+            console.log(count, roomItem.total);
             roomItem.isroom = count < roomItem.total; // 简化判断
             return roomItem;
         }));
-    
+
         // 对 roomList 进行排序
         roomList.sort((a, b) => {
             // 首先比较 isroom，true 排在前面
@@ -225,13 +225,13 @@ Page({
             }
             return a.isroom ? -1 : 1; // true 排在前面，false 排在后面
         });
-    
+
         this.setData({
             roomList
         });
         console.log('房间', this.data.roomList);
     },
-    async checkOrderCount(roomId,start,end) {
+    async checkOrderCount(roomId, start, end) {
         const startTime = new Date(start);
         const endTime = new Date(end);
         let now = dateServ.changeDateTime(new Date(), '14:00:00')
@@ -239,7 +239,7 @@ Page({
         Order.equalTo("room", roomId)
         Order.equalTo("company", company)
         Order.exists("status")
-        Order.notContainedIn('status',[100,400,601,700])
+        Order.notContainedIn('status', [100, 400, 601, 700])
         Order.greaterThanOrEqualTo("startTime", endTime) //20  23    21 22  
         Order.lessThanOrEqualTo("endTime", startTime)
         Order.select("startTime", "endTime")
@@ -288,57 +288,60 @@ Page({
     //获取当前位置信息
     Getlocation() {
         // 假设 this.storeList[0].location 是一个 Parse.GeoPoint 对象
-        const storeLocation = this.data.storeList[0].location;
-        console.log();
-        // 从 GeoPoint 对象中获取经纬度
-        const latitude = storeLocation.latitude; // 纬度
-        const longitude = storeLocation.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,
-                    latitude: latitude, // 保证 latitude 被设置
-                    longitude: longitude, // 保证 longitude 被设置
-                    markers: [{ // 设置 markers
-                        id: 1,
-                        latitude: latitude,
-                        longitude: longitude,
-                        iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
-                        width: 30,
-                        height: 30,
-                        callout: {
-                            content: this.data.storeList[0].storeName, // 可以显示解析出的地址
-                            color: '#ffffff',
-                            bgColor: '#7F56B2',
-                            padding: 10,
-                            borderRadius: 5,
-                            display: 'ALWAYS'
-                        }
-                    }]
-                });
-                console.log(this.data.address);
-            },
-            fail: function (resq) {
-                wx.showModal({
-                    title: '信息提示',
-                    content: '请求失败',
-                    showCancel: false,
-                    confirmColor: '#f37938'
-                });
-            },
-            complete: function () {}
-        });
+        if (this.data.storeList[0].location) {
+            const storeLocation = this.data.storeList[0].location;
+            console.log('地址存在');
+            // 从 GeoPoint 对象中获取经纬度
+            const latitude = storeLocation.latitude; // 纬度
+            const longitude = storeLocation.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,
+                        latitude: latitude, // 保证 latitude 被设置
+                        longitude: longitude, // 保证 longitude 被设置
+                        markers: [{ // 设置 markers
+                            id: 1,
+                            latitude: latitude,
+                            longitude: longitude,
+                            iconPath: 'https://file-cloud.fmode.cn/13WZ0W7u3l/20240724/7ebg0k104325941.png?imageView2/1/w/200/h/200', // 自定义标记图标
+                            width: 30,
+                            height: 30,
+                            callout: {
+                                content: this.data.storeList[0].storeName, // 可以显示解析出的地址
+                                color: '#ffffff',
+                                bgColor: '#7F56B2',
+                                padding: 10,
+                                borderRadius: 5,
+                                display: 'ALWAYS'
+                            }
+                        }]
+                    });
+                    console.log(this.data.address);
+                },
+                fail: function (resq) {
+                    wx.showModal({
+                        title: '信息提示',
+                        content: '请求失败',
+                        showCancel: false,
+                        confirmColor: '#f37938'
+                    });
+                },
+                complete: function () {}
+            });
+        }
+
     },
     //点击预定
     navigate(e) {
@@ -365,31 +368,31 @@ Page({
         //         url: `../homestay-order/index?${queryString}`
         //     })
         // } else {
-            // wx.showToast({
-            //     title: '请先进行实名认证',
-            //     icon: 'none'
-            // })
-            //实名
-            // wx.navigateTo({
-            //     url: `/common-page/pages/info/cauth/cauth?themeColor=#FFE300`
-            // })
-
-            // 构造要传递的信息
-            const info = {
-                objectId: objectId,
-                date_start: this.data.start,
-                date_end: this.data.end,
-            };
-            console.log('info', info);
-
-            // 将信息转为查询字符串
-            var queryString = Object.keys(info)
-                .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(info[key])}`)
-                .join('&');
-            console.log(queryString);
-            wx.navigateTo({
-                url: `../homestay-order2/index?${queryString}`
-            })
+        // wx.showToast({
+        //     title: '请先进行实名认证',
+        //     icon: 'none'
+        // })
+        //实名
+        // wx.navigateTo({
+        //     url: `/common-page/pages/info/cauth/cauth?themeColor=#FFE300`
+        // })
+
+        // 构造要传递的信息
+        const info = {
+            objectId: objectId,
+            date_start: this.data.start,
+            date_end: this.data.end,
+        };
+        console.log('info', info);
+
+        // 将信息转为查询字符串
+        var queryString = Object.keys(info)
+            .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(info[key])}`)
+            .join('&');
+        console.log(queryString);
+        wx.navigateTo({
+            url: `../homestay-order2/index?${queryString}`
+        })
         // }
 
     },
@@ -465,13 +468,17 @@ Page({
             phoneNumber: phone
         })
     },
-    callMap(){
-        const latitude = this.data.storeList[0].location.latitude
-        const longitude = this.data.storeList[0].location.longitude
-        wx.openLocation({
-          latitude,
-          longitude,
-          scale: 18
-        })
+    callMap() {
+        if (this.data.storeList[0].location) {
+            const latitude = this.data.storeList[0].location.latitude
+            const longitude = this.data.storeList[0].location.longitude
+            wx.openLocation({
+                name: this.data.storeList[0].storeName,
+                latitude,
+                longitude,
+                scale: 18
+            })
+        }
+
     }
 })

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

@@ -5,6 +5,7 @@
     background-color: #ECECEC;
     position: relative;
     overflow-y: scroll;
+    color: #382E2E;
     .picturebox{
         width: 100%;
         height: 480rpx;
@@ -70,6 +71,15 @@
                 height: auto;
                 margin-left: 10rpx;
             }
+            .info-intr2{
+                margin-top: 10rpx;
+                font-size: 30rpx;
+                width: 100%;
+                height: auto;
+                margin-left: 4rpx;
+                color: skyblue;
+                display: flex;
+            }
             .info-map{
                 width: 100%;
                 display: flex;

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

@@ -21,12 +21,13 @@
                 <image class="name-pic" wx:if="{{storeList[0].iscollect}}" src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/8mp9uj030058190.png?imageView2/1/w/200/h/200"></image>
             </view>
             <view class="info-intr">{{storeList[0].desc}}</view>
+            <view class="info-intr2" bindtap="callMap"><van-icon size='36rpx' name="location-o" /> {{storeList[0].storeAddress}}</view>
             <view class="info-map">
-                <view class="map" bindtap="callMap">
+                <view class="map" >
                     <map class="map" enable-zoom="ture" enable-scroll="true" id="map" longitude="{{longitude}}" latitude="{{latitude}}" scale="20" markers="{{markers}}"></map>
                 </view>
                 <view class="info-call" bindtap="phone" >
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241122/n7me1o092906284.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/e9muh5104028782.png"></image>
                     <view class="call-tex">联系望仙管家</view>
                 </view>
             </view>

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

@@ -26,10 +26,12 @@ Page({
         date2: '',
         name: '',
         mobile: '',
-        error_message:'',
-        activeOrder:null,//创建的订单
-        tradeNo:null,//订单号
-        showPayment:false,//显示支付组件
+        error_message: '',
+        activeOrder: null, //创建的订单
+        tradeNo: null, //订单号
+        showPayment: false, //显示支付组件
+        //显示日历选择
+        show:false,
     },
 
     /**
@@ -43,7 +45,7 @@ Page({
         const customHeight = custom.height + 10 + 2 || 0;
         const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
 
-        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+        const contentHeight = (screenHeight - bottomNavHeight -5- statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
 
         this.setData({
             contentHeight
@@ -87,7 +89,7 @@ Page({
             // priceInfoArr: dataAll,
             count: dataAll.length
         })
-        
+
         console.log('天数', this.data.count);
     },
     //修改时间格式
@@ -164,12 +166,12 @@ Page({
         Order.equalTo("room", this.data.roomId)
         Order.equalTo("company", company)
         Order.exists("status")
-        Order.notContainedIn('status',[100,400,601,700])
+        Order.notContainedIn('status', [100, 400, 601, 700])
         Order.greaterThanOrEqualTo("startTime", endTime) //20  23    21 22  
         Order.lessThanOrEqualTo("endTime", startTime)
         Order.select("startTime", "endTime")
         let count = await Order.count()
-        console.log('count',count);
+        console.log('count', count);
         return count
     },
     //生成订单号
@@ -236,7 +238,7 @@ Page({
     //获取住客姓名
     getname(e) {
         this.setData({
-            name:e.detail
+            name: e.detail
         })
         console.log(e.detail);
     },
@@ -244,21 +246,21 @@ Page({
     getmobile(e) {
         const mobileNumber = e.detail.value; // 假设手机号是通过 e.detail.value 传递的
         console.log(mobileNumber);
-    
+
         // 正则表达式：匹配中国大陆手机号
         const mobilePattern = /^1[3-9]\d{9}$/;
-    
+
         // 验证手机号格式
         if (mobilePattern.test(mobileNumber)) {
             this.setData({
-                error_message:'',
-                mobile:mobileNumber
+                error_message: '',
+                mobile: mobileNumber
             })
             console.log("手机号格式正确");
             // 这里可以执行其他操作，比如保存手机号或进行下一步操作
         } else {
             this.setData({
-                error_message:'手机号格式不正确'
+                error_message: '手机号格式不正确'
             })
             console.log("手机号格式不正确");
             // 这里可以提示用户手机号格式不正确
@@ -273,7 +275,7 @@ Page({
         //     })
         //     return
         // }
-        if (this.data.name.length==0||this.data.mobile.length==0) {
+        if (this.data.name.length == 0 || this.data.mobile.length == 0) {
             wx.showToast({
                 title: '请输入住人信息',
                 icon: 'none',
@@ -290,17 +292,17 @@ Page({
             return
         }
         let tradeNo = this.getTradeNo() //生成订单编号
-        let order = await this.setOrder(tradeNo)//生成订单
+        let order = await this.setOrder(tradeNo) //生成订单
         if (order) {
             this.setData({
                 activeOrder: order,
                 tradeNo,
-                showPayment: true,//展示支付组件
+                showPayment: true, //展示支付组件
             })
         }
     },
     //  返回首页
-    getback(){
+    getback() {
         wx.navigateTo({
             url: '../../../pages/index/index',
         });
@@ -397,5 +399,27 @@ Page({
      */
     onShareAppMessage: function () {
 
-    }
+    },
+    //开日历
+    onDisplay() {
+        this.setData({
+            show: true
+        });
+    },
+    //关日历
+    onClose() {
+        this.setData({
+            show: false
+        });
+    },
+    //选好日期点击完成后
+    onConfirm(event) {
+        const [start, end] = event.detail;
+        this.setData({
+            show: false,
+            startTime:start,
+            endTime:end,
+        });
+        this.getdate()
+    },
 })

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

@@ -2,6 +2,7 @@
   "usingComponents": {
     "van-divider": "@vant/weapp/divider/index",
     "van-field": "@vant/weapp/field/index",
-    "van-icon": "@vant/weapp/icon/index"
+    "van-icon": "@vant/weapp/icon/index",
+    "van-calendar": "@vant/weapp/calendar/index"
   }
 }

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

@@ -4,6 +4,7 @@
     padding-left: 30rpx;
     padding-right: 30rpx;
     position: relative;
+    color: #382E2E;
     .timebox{
         width: 100%;
         height: 50rpx;
@@ -48,7 +49,7 @@
         }
     }
     .lable{
-        color: black;
+        color: #382E2E;
     }
     .benefitbox{
         width: 100%;
@@ -97,32 +98,34 @@
         }
 
     }
-    .subbox{
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        width: 100%;
-        height: 90rpx;
+
+}
+.subbox{
+    position:fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 90rpx;
+    display: flex;
+    font-size: 30rpx;
+    color: #382E2E;
+    .subbox1{
+        width: 40%;
         display: flex;
-        font-size: 30rpx;
-        .subbox1{
-            width: 40%;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-        .subbox2{
-            width: 60%;
-            height: 100%;
-            background-color: #F89B7F;
-            color: white;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            .subbox2_2{
-                margin-left: 10rpx;
-            }
+        justify-content: center;
+        align-items: center;
+    }
+    .subbox2{
+        width: 60%;
+        height: 100%;
+        background-color: #F89B7F;
+        color: white;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        .subbox2_2{
+            margin-left: 10rpx;
         }
-        
     }
+    
 }

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

@@ -1,10 +1,12 @@
 <!--nova-tourism/pages/homestay/homestay-order2/index.wxml-->
 <nav type="back" background-color="#ffffff" frontColor="#000000" title="{{room.shop.storeName}}" />
 <view class="all" style="height: {{contentHeight}}rpx;">
-    <view class="timebox">
+    <view class="timebox" bindtap="onDisplay">
         <view class="time1">{{date}}</view>
         <view>{{count}}晚</view>
     </view>
+    <van-calendar show="{{ show }}" show-confirm="{{ true }}" confirm-text="完成" confirm-disabled-text='完成' type="range" bind:close="onClose" bind:confirm="onConfirm" color='#46a9a4' position='bottom' />
+
     <view class="roombox">
         <image src="{{room.images[0]}}"></image>
         <view class="room">
@@ -28,20 +30,20 @@
         <view class="benefitbox2">
             <view class="benefitbox2-text">优惠卷</view>
             <view class="benefitbox2-text2">
-                减￥1000
+                减￥0
                 <van-icon name="arrow" size='30rpx' color="gray" />
             </view>
         </view>
         <view class="benefitbox2">
             <view class="benefitbox2-text">促销福利</view>
             <view class="benefitbox2-text_2">
-                减￥1000
+                减￥0
             </view>
         </view>
         <view class="benefitbox2">
             <view class="benefitbox2-text">会员福利</view>
             <view class="benefitbox2-text_2">
-                减￥1000
+                减￥0
             </view>
         </view>
     </view>
@@ -53,15 +55,14 @@
         </view>
     </view>
 
-    <view class="subbox">
-        <view class="subbox1" bindtap="getback">首页</view>
-        <view class="subbox2" bindtap="submit">
-            <view class="subbox2_1">优惠100</view>
-            <view class="subbox2_2">实付款￥{{count*room.price}}</view>
-        </view>
+
+</view>
+<view class="subbox">
+    <view class="subbox1" bindtap="getback">首页</view>
+    <view class="subbox2" bindtap="submit">
+        <!-- <view class="subbox2_1">优惠0</view> -->
+        <view class="subbox2_2">实付款￥{{count*room.price}}</view>
     </view>
 </view>
-
 <!-- 支付组件 -->
-<payment style="z-index: 99999;" id='payMent' show="{{showPayment}}" tradeNo="{{tradeNo}}" price="{{count*room.price}}"
-	bind:payResult='acceptResult' showType="all" />
+<payment style="z-index: 99999;" id='payMent' show="{{showPayment}}" tradeNo="{{tradeNo}}" price="{{count*room.price}}" bind:payResult='acceptResult' showType="all" />

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

@@ -1 +1 @@
-.all{width:100vw;padding-left:30rpx;padding-right:30rpx;position:relative}.all .timebox{width:100%;height:50rpx;margin-top:10rpx;font-size:30rpx;display:flex}.all .timebox .time1{margin-right:40rpx}.all .roombox{width:100%;display:flex;margin-top:40rpx}.all .roombox image{width:170rpx;height:170rpx;border-radius:10rpx}.all .roombox .room{height:100%;margin-left:20rpx}.all .roombox .room .room-name{font-size:28rpx;font-weight:600;margin-bottom:24rpx}.all .roombox .room .room-tag{font-size:26rpx;width:480rpx;height:auto;color:#F37B40;margin-bottom:10rpx}.all .roombox .room .room-text{width:480rpx;height:auto;font-size:26rpx;color:#737373}.all .lable{color:black}.all .benefitbox{width:100%;height:auto;font-size:28rpx}.all .benefitbox .benefitbox1{margin-bottom:40rpx}.all .benefitbox .benefitbox2{width:100%;display:flex;margin-bottom:40rpx}.all .benefitbox .benefitbox2 .benefitbox2-text{width:120rpx}.all .benefitbox .benefitbox2 .benefitbox2-text2{display:flex;margin-left:auto;color:#F37B40}.all .benefitbox .benefitbox2 .benefitbox2-text_2{display:flex;margin-left:auto;margin-right:30rpx;color:#F37B40}.all .benefitbox .benefitbox2 .benefitbox2-text_22{display:flex;margin-left:auto;margin-right:30rpx}.all .benefitbox2{width:100%;display:flex;margin-bottom:40rpx}.all .benefitbox2 .benefitbox2-text{width:120rpx}.all .benefitbox2 .benefitbox2-text_22{display:flex;margin-left:auto;margin-right:30rpx}.all .subbox{position:absolute;bottom:0;left:0;width:100%;height:90rpx;display:flex;font-size:30rpx}.all .subbox .subbox1{width:40%;display:flex;justify-content:center;align-items:center}.all .subbox .subbox2{width:60%;height:100%;background-color:#F89B7F;color:white;display:flex;justify-content:center;align-items:center}.all .subbox .subbox2 .subbox2_2{margin-left:10rpx}
+.all{width:100vw;padding-left:30rpx;padding-right:30rpx;position:relative;color:#382E2E}.all .timebox{width:100%;height:50rpx;margin-top:10rpx;font-size:30rpx;display:flex}.all .timebox .time1{margin-right:40rpx}.all .roombox{width:100%;display:flex;margin-top:40rpx}.all .roombox image{width:170rpx;height:170rpx;border-radius:10rpx}.all .roombox .room{height:100%;margin-left:20rpx}.all .roombox .room .room-name{font-size:28rpx;font-weight:600;margin-bottom:24rpx}.all .roombox .room .room-tag{font-size:26rpx;width:480rpx;height:auto;color:#F37B40;margin-bottom:10rpx}.all .roombox .room .room-text{width:480rpx;height:auto;font-size:26rpx;color:#737373}.all .lable{color:#382E2E}.all .benefitbox{width:100%;height:auto;font-size:28rpx}.all .benefitbox .benefitbox1{margin-bottom:40rpx}.all .benefitbox .benefitbox2{width:100%;display:flex;margin-bottom:40rpx}.all .benefitbox .benefitbox2 .benefitbox2-text{width:120rpx}.all .benefitbox .benefitbox2 .benefitbox2-text2{display:flex;margin-left:auto;color:#F37B40}.all .benefitbox .benefitbox2 .benefitbox2-text_2{display:flex;margin-left:auto;margin-right:30rpx;color:#F37B40}.all .benefitbox .benefitbox2 .benefitbox2-text_22{display:flex;margin-left:auto;margin-right:30rpx}.all .benefitbox2{width:100%;display:flex;margin-bottom:40rpx}.all .benefitbox2 .benefitbox2-text{width:120rpx}.all .benefitbox2 .benefitbox2-text_22{display:flex;margin-left:auto;margin-right:30rpx}.subbox{position:fixed;bottom:0;left:0;width:100%;height:90rpx;display:flex;font-size:30rpx;color:#382E2E}.subbox .subbox1{width:40%;display:flex;justify-content:center;align-items:center}.subbox .subbox2{width:60%;height:100%;background-color:#F89B7F;color:white;display:flex;justify-content:center;align-items:center}.subbox .subbox2 .subbox2_2{margin-left:10rpx}

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

@@ -30,56 +30,56 @@ Page({
         address: '',
         locations: null,
     },
-    getHtml(e) { //从组件获取值
-        let html = e.detail.content.html
-        console.log(html);
-        // this.setData({ html: html })
-        // let field = event.currentTarget.dataset.field;
-        // let html = event.detail.content.html;
-        this.setData({
-            html: html
-        })
-    },
+    // getHtml(e) { //从组件获取值
+    //     let html = e.detail.content.html
+    //     console.log(html);
+    //     // this.setData({ html: html })
+    //     // let field = event.currentTarget.dataset.field;
+    //     // let html = event.detail.content.html;
+    //     this.setData({
+    //         html: html
+    //     })
+    // },
 
-    insertImage() { //图片上传插入示例
-        let that = this
-        wx.chooseImage({
-            count: 1,
-            success(res) {
-                // 本地测试图片插入
-                // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
-                // console.log(res.tempFilePaths[0]);
-                let tempFilePaths = res.tempFilePaths[0];
-                console.log(tempFilePaths);
+    // insertImage() { //图片上传插入示例
+    //     let that = this
+    //     wx.chooseImage({
+    //         count: 1,
+    //         success(res) {
+    //             // 本地测试图片插入
+    //             // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
+    //             // console.log(res.tempFilePaths[0]);
+    //             let tempFilePaths = res.tempFilePaths[0];
+    //             console.log(tempFilePaths);
 
 
-                qiniuUploader.upload(
-                    tempFilePaths,
-                    (res) => {
-                        let img = res.imageURL;
-                        that.selectComponent('#hf_editor').insertSrc(img); //调用组件insertSrc方法
-                    },
-                    (error) => {
-                        console.log("error: " + error);
-                    }, {
-                        region: "SCN",
-                        uploadURL: that.data.uploadURL,
-                        domain: that.data.domain,
-                        uptoken: that.data.uptokenURL,
-                    }
-                );
-            }
-        })
-    },
+    //             qiniuUploader.upload(
+    //                 tempFilePaths,
+    //                 (res) => {
+    //                     let img = res.imageURL;
+    //                     that.selectComponent('#hf_editor').insertSrc(img); //调用组件insertSrc方法
+    //                 },
+    //                 (error) => {
+    //                     console.log("error: " + error);
+    //                 }, {
+    //                     region: "SCN",
+    //                     uploadURL: that.data.uploadURL,
+    //                     domain: that.data.domain,
+    //                     uptoken: that.data.uptokenURL,
+    //                 }
+    //             );
+    //         }
+    //     })
+    // },
 
     changeFile(e) {
         if (e.detail && e.detail.length > 0) {
             this.setData({
-                cover: [e.detail[0].url]
+                cover:`${e.detail[0].url}`
             })
         } else {
             this.setData({
-                cover: []
+                cover: ''
                 // cover:this.data.imageList[0].url
             })
         }
@@ -138,8 +138,9 @@ Page({
         ShopStore.set("name", this.data.name)
         ShopStore.set("cover", this.data.cover)
         ShopStore.set("image", image)
-        if (this.data.locations) {
+        if (this.data.locations&&this.data.address) {
             ShopStore.set("location", this.data.locations)
+            ShopStore.set("storeAddress", this.data.address)
         } else {
             wx.showToast({
                 title: '请选择民宿地址',
@@ -159,7 +160,7 @@ Page({
         }
         ShopStore.set("desc", this.data.desc)
         ShopStore.set("workingTime", this.data.workingTime)
-        ShopStore.set("content", this.data.html)
+        // ShopStore.set("content", this.data.html)
         ShopStore.save().then(res => {
             console.log(res)
             wx.showToast({
@@ -220,7 +221,7 @@ Page({
         })
         console.log('首页', this.data.locations);
         this.Getlocation()
-        this.selectComponent('#hf_editor').setHtml(this.data.html);
+        // this.selectComponent('#hf_editor').setHtml(this.data.html);
         this.getQiniuOption()
     },
     async getQiniuOption() {
@@ -300,21 +301,23 @@ Page({
                     address,
                     name
                 } = res;
-                let locations = new Parse.GeoPoint(latitude, longitude)
+                let locations = new Parse.GeoPoint(latitude, longitude);
                 this.setData({
                     locations,
                     address: address
-                })
+                });
                 console.log(locations);
                 console.log(address + name);
-                // this.data.formData[field] = locations
-                // this.data.formData['address'] = address + name
-                //   this.data.formData['address'] = address
-                // this.setData({
-                //     formData: this.data.formData,
-                // })
+            },
+            fail: (error) => {
+                // 处理选择位置失败的情况
+                console.error('选择位置失败:', error);
+                wx.showToast({
+                    title: '选择位置失败，请重试',
+                    icon: 'none'
+                });
             }
-        })
+        });
     },
     //解析地理位置
     Getlocation() {

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

@@ -29,7 +29,7 @@
                 .input {
                     width: 500rpx;
                     text-align: right;
-    
+                    color: #382E2E;
                 }
     
                 .name {

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

@@ -1,7 +1,7 @@
 <nav type="back" background-color="#46a9a4" title="账户管理" />
 
 
-<view class="top">
+<view class="top" style="color: #382E2E;">
     <view class="top-figure">店铺首图</view>
     <upload bind:onChangeFile="changeFile" fileList="{{imageList}}" accept="image" maxCount="1" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}"></upload>
     <view class="top-deails">
@@ -73,6 +73,6 @@
 </view>
 <!-- <diy-editor width="100%" height="600rpx" insertPicture="{{true}}" placeholder="开始输入..." bind:Content="getHtml" bind:insertImage="insertImage" id="hf_editor" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}" /> -->
 <!-- <diy-editor width="100%" height="600rpx" insertPicture="{{true}}" placeholder="编写文章..." data-field="{{field.key}}" bind:Content="getHtml" bind:insertImage="insertImage" id="editor{{field.key}}" /> -->
-<view class="bommon">
+<view class="bommon" style="color: #382E2E;">
     <view class="bommon-name" bindtap="determine">确定</view>
 </view>

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

@@ -1 +1 @@
-page{background:#f6f6f6;padding-bottom:148rpx}.top{padding:20rpx 30rpx;background:#ffffff}.top .top-figure{margin:20rpx 0}.top .top-deails{display:flex;justify-content:space-between;border-bottom:1rpx solid #adabab}.top .top-deails .top-name{display:flex;justify-content:space-between;margin:30rpx 0 0 0;padding-bottom:30rpx;width:93%}.top .top-deails .top-name .input{width:500rpx;text-align:right}.top .top-deails .top-name .name{width:200rpx;margin:auto 0}.top .top-deails .top-name .content{text-align:right}.top .top-deails .top-names{margin:30rpx 0 0 0;padding-bottom:30rpx;width:93%}.top .top-deails .top-names .input{margin-top:20rpx}.top .top-deails .top-names .name{width:200rpx}.bommon{position:fixed;bottom:0;width:100%;background:#ffffff;text-align:center;z-index:999;padding:10rpx 0}.bommon .bommon-name{background:#46a9a4;padding:30rpx 60rpx;border-radius:30rpx;width:500rpx;margin:0 auto}
+page{background:#f6f6f6;padding-bottom:148rpx}.top{padding:20rpx 30rpx;background:#ffffff}.top .top-figure{margin:20rpx 0}.top .top-deails{display:flex;justify-content:space-between;border-bottom:1rpx solid #adabab}.top .top-deails .top-name{display:flex;justify-content:space-between;margin:30rpx 0 0 0;padding-bottom:30rpx;width:93%}.top .top-deails .top-name .input{width:500rpx;text-align:right;color:#382E2E}.top .top-deails .top-name .name{width:200rpx;margin:auto 0}.top .top-deails .top-name .content{text-align:right}.top .top-deails .top-names{margin:30rpx 0 0 0;padding-bottom:30rpx;width:93%}.top .top-deails .top-names .input{margin-top:20rpx}.top .top-deails .top-names .name{width:200rpx}.bommon{position:fixed;bottom:0;width:100%;background:#ffffff;text-align:center;z-index:999;padding:10rpx 0}.bommon .bommon-name{background:#46a9a4;padding:30rpx 60rpx;border-radius:30rpx;width:500rpx;margin:0 auto}

nova-tourism/pages/my/merchant/merchant-home/account/password/index.less

@@ -10,7 +10,7 @@
 }
 
 .phone {
-    color: #333;
+    color: #382E2E;
     margin-right: 60rpx;
     font-size: 28rpx;
     width: 200rpx;
@@ -18,7 +18,7 @@
 }
 
 .number {
-    color: #333;
+    color: #382E2E;
     font-size: 28rpx;
     width: 200rpx;
 }

nova-tourism/pages/my/merchant/merchant-home/account/password/index.wxml

@@ -1,5 +1,5 @@
 <nav type="back" background-color="#46a9a4" title="修改密码" />
-<form bindsubmit="formSubmit">
+<form bindsubmit="formSubmit" style="color: #382E2E;">
     <view class='phone-box'>
         <text class='phone'>验证码</text>
         <input name="phoneCode" placeholder="请输入验证码" class='number' placeholder-style='color:#bbb' bindinput="yanLoveInput" />

nova-tourism/pages/my/merchant/merchant-home/account/password/index.wxss

@@ -1 +1 @@
-.phone-box{height:89rpx;border-bottom:1rpx solid #efefef;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;margin:30rpx}.phone{color:#333;margin-right:60rpx;font-size:28rpx;width:200rpx;text-align:right}.number{color:#333;font-size:28rpx;width:200rpx}.getNum{width:210rpx;height:48rpx;background:#f87039;border-radius:8rpx;font-size:28rpx;font-family:PingFang-SC-Medium;color:#fff;line-height:48rpx;margin-right:36rpx;text-align:center}.submit{width:480rpx;height:80rpx;background:#f87039;border-radius:8rpx;margin-top:80rpx;color:#fff;font-size:32rpx}
+.phone-box{height:89rpx;border-bottom:1rpx solid #efefef;display:flex;flex-direction:row;justify-content:flex-start;align-items:center;margin:30rpx}.phone{color:#382E2E;margin-right:60rpx;font-size:28rpx;width:200rpx;text-align:right}.number{color:#382E2E;font-size:28rpx;width:200rpx}.getNum{width:210rpx;height:48rpx;background:#f87039;border-radius:8rpx;font-size:28rpx;font-family:PingFang-SC-Medium;color:#fff;line-height:48rpx;margin-right:36rpx;text-align:center}.submit{width:480rpx;height:80rpx;background:#f87039;border-radius:8rpx;margin-top:80rpx;color:#fff;font-size:32rpx}

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

@@ -300,7 +300,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-
+        this.getShopStore()
     },
 
     /**

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

@@ -1,5 +1,5 @@
 <nav type="back" url="/nova-tourism/pages/index/index?active=4" background-color="#46a9a4" title="商户端" />
-<view class="box">
+<view class="box" style="color: #382E2E;">
     <view class="store">
         <image class="store-img" src="{{store.cover}}" />
         <view class="store-box">
@@ -147,8 +147,8 @@
         </block>
     </view>
 </view>
-<view class="bommon" bind:tap="codeVerify">扫码核销</view>
-<view class="bommon" bind:tap="logout">退出登录</view>
+<view class="bommon" bind:tap="codeVerify" style="color: #382E2E;">扫码核销</view>
+<view class="bommon" bind:tap="logout" style="color: #382E2E;">退出登录</view>
 <!-- <block wx:if="{{store.type=='catering'}}">
     <view class="bommon" bind:tap="code">扫码核销</view>
 </block> -->

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

@@ -1,6 +1,6 @@
 <nav type="back" background-color="#46a9a4" title="订单列表" />
-<block wx:for="{{list}}" wx:key="index">
-    <view class="box" data-item="{{item}}" bindtap="orderdeils">
+<block wx:for="{{list}}" wx:key="index" >
+    <view class="box" data-item="{{item}}" bindtap="orderdeils" style="color: #382E2E;">
         <view class="order-number">
             <view class="number">订单号：{{item.orderNum}}</view>
             <block wx:if="{{item.status==100}}">

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

@@ -1,5 +1,5 @@
 <nav type="back" background-color="#46a9a4" title="订单详情" />
-<view class="box">
+<view class="box" style="color: #382E2E;">
     <view class="order-txt" data-item="{{item}}">
         <image class="order-image" src="{{order.shopStore.cover}}" />
         <view class="order-name">
@@ -9,7 +9,7 @@
         </view>
     </view>
 </view>
-<view class="box">
+<view class="box" style="color: #382E2E;">
  <view class="order-number">
         <view class="order-title">订单编号:</view>
         <view class="order-txts"bindtap="copywxtap">{{order.orderNum}} 复制</view>
@@ -20,7 +20,7 @@
     </view>
     <view class="order-number">
         <view class="order-title">客户名称:</view>
-        <view class="order-txts">{{order.user.realname}}</view>
+        <view class="order-txts">{{order.name}}</view>
     </view>
     <view class="order-number">
         <view class="order-title">联系电话:</view>

nova-tourism/pages/my/merchant/merchant-home/store-withdraw/index.wxml

@@ -1,13 +1,13 @@
 <nav type="back" background-color="#46a9a4" frontColor="{{titleColor ? titleColor : '#000000'}}" title="申请提现"></nav>
 <view class="earnings">￥{{earnings ? earnings:'0'}}</view>
-<view class="apply">
+<view class="apply" style="color: #382E2E;">
     <view class="title">提现金额</view>
     <view class="string">
         ￥
         <input bindblur="blur" type="text" data-name="price" type="number" value="{{price}}" class="input" placeholder="请输入提现金额,最低1000起提现"></input>
     </view>
 </view>
-<view class="apply">
+<view class="apply" style="color: #382E2E;">
     <view class="way">提现方式</view>
     <view class='box'>
         <view class='box-container' wx:for="{{list}}" wx:key="list">

nova-tourism/pages/my/merchant/room-manage/index.wxml

@@ -1,10 +1,10 @@
 <nav type="back" background-color="#46a9a4" title="房型管理" />
-<view class="page-section">
+<view class="page-section" >
     <view class="add-customer" bind:tap="addRoom">
         <van-icon class="add-icon" name="https://file-cloud.fmode.cn/sHNeVwSaAg/20220418/qn1d5i021341.png?imageView2/1/w/200/h/200" color="#3d88ff" />
         <text class="text" style="color:#3d88ff;">添加房型</text>
     </view>
 </view>
-<scroll-view scroll-y="true" style="height:calc(100% - {{navigationBarHeight}}rpx);" bindscrolltolower="loadMore">
+<scroll-view scroll-y="true" style="height:calc(100% - {{navigationBarHeight}}rpx); color: #382E2E;" bindscrolltolower="loadMore">
     <goods-list list="{{rooms}}" mode="horizontal" navigateBtn="编辑详情" btnModel="plain" bind:btnTap="edit"></goods-list>
 </scroll-view>

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

@@ -119,7 +119,7 @@ Page({
         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.selectComponent(`#editor${field["key"]}`).setHtml(room[field["key"]] || '');
                 }
             })
         }
@@ -255,39 +255,39 @@ Page({
             }
         })
     },
-    getHtml(event) {
-        let field = event.currentTarget.dataset.field;
-        let html = event.detail.content.html;
-        this.data.formData[field] = html;
-    },
-    insertImage(event) {
-        let field = event.currentTarget.dataset.field;
-        let that = this;
-        wx.chooseImage({
-            count: 1,
-            success(res) {
-                // 本地测试图片插入
-                // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
-                // that.selectComponent(`#editor${field}`).insertSrc(res.tempFilePaths[0])
-                let tempFilePaths = res.tempFilePaths[0];
-                qiniuUploader.upload(
-                    tempFilePaths,
-                    (res) => {
-                        let img = res.imageURL;
-                        that.selectComponent(`#editor${field}`).insertSrc(img); //调用组件insertSrc方法
-                    },
-                    (error) => {
-                        console.log("error: " + error);
-                    }, {
-                        region: "SCN",
-                        uploadURL: that.data.uploadURL,
-                        domain: that.data.domain,
-                        uptoken: that.data.uptokenURL,
-                    }
-                );
-            }
-        })
-    },
+    // getHtml(event) {
+    //     let field = event.currentTarget.dataset.field;
+    //     let html = event.detail.content.html;
+    //     this.data.formData[field] = html;
+    // },
+    // insertImage(event) {
+    //     let field = event.currentTarget.dataset.field;
+    //     let that = this;
+    //     wx.chooseImage({
+    //         count: 1,
+    //         success(res) {
+    //             // 本地测试图片插入
+    //             // this.selectComponent('#hf_editor').insertSrc(res.tempFilePaths[0]);
+    //             // that.selectComponent(`#editor${field}`).insertSrc(res.tempFilePaths[0])
+    //             let tempFilePaths = res.tempFilePaths[0];
+    //             qiniuUploader.upload(
+    //                 tempFilePaths,
+    //                 (res) => {
+    //                     let img = res.imageURL;
+    //                     that.selectComponent(`#editor${field}`).insertSrc(img); //调用组件insertSrc方法
+    //                 },
+    //                 (error) => {
+    //                     console.log("error: " + error);
+    //                 }, {
+    //                     region: "SCN",
+    //                     uploadURL: that.data.uploadURL,
+    //                     domain: that.data.domain,
+    //                     uptoken: that.data.uptokenURL,
+    //                 }
+    //             );
+    //         }
+    //     })
+    // },
     async submit() {
         let checked = await this.checkForm()
         if (!checked) {

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

@@ -12,6 +12,7 @@ page {
 .form-item {
     width: 100%;
     margin: 20rpx 0;
+    color:#382E2E;
     .form-label {
         font-size: 28rpx;
         margin:20rpx;
@@ -39,6 +40,7 @@ page {
 .tag-wrapper{
     display: flex;
     align-items: center;
+    color:#382E2E;
     .add-btn {
         width: auto;
     }

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

@@ -1,5 +1,5 @@
 <nav type="back" background-color="#46a9a4" title="{{pageType == 'add'?'添加房型':'编辑详情'}}" />
-<view class="page-section form">
+<view class="page-section form" style="color:#382E2E; ">
     <block wx:for="{{route['editFields']}}" wx:key="index" wx:for-item="field">
         <!-- <block wx:if="{{route.editTabs}} " wx:key="index" wx:for-item="tab">{{tab==field['editTab']}} -->
             <!-- <block wx:if="{{tab==field['editTab']}}"> -->

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

@@ -1 +1 @@
-.red{color:#F01740}.grey{color:#666666}.black{color:#000000}.title{font-weight:Medium;font-size:36rpx;color:#222222}.text-large{font-size:36rpx}.text{font-size:30rpx}.text-left{text-align:left}.text-center{text-align:center}.text-small{font-size:24rpx}.flex{display:flex}.justify-between{justify-content:space-between}.flex-aligin-center{display:flex;align-items:center}.flex-justify-between{display:flex;justify-content:space-between}.flex-1{flex:1}.flex-grow-1{flex-grow:1}.fixed-bottom{position:fixed;bottom:0;left:0;right:0}.w-100{width:100%}.h-100{height:100%}.page-section{margin:20rpx;border-radius:20rpx;background-color:#ffffff}.page-section-spacing{padding:20rpx}.spacing-small{padding:10rpx}.border-trans{border:1px solid transparent}.ellipsis{width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}.ellipsis-2{width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.form{display:flex;flex-wrap:wrap}.form .col-12{width:50%}.form-item{width:100%;margin:20rpx 0}.form-item .form-label{font-size:28rpx;margin:20rpx;color:#666666}.form-item .form-label .required{font-size:40rpx;vertical-align:middle}.form-item .form-field{padding:10rpx}.form-item .form-field .form-input{padding:10rpx;border:.5px solid #eee;border-radius:10rpx}.form-item .form-field .form-input-num{width:200rpx}.tag-wrapper{display:flex;align-items:center}.tag-wrapper .add-btn{width:auto}.tag-wrapper .tags{flex:1;display:flex;flex-wrap:wrap}.tag-wrapper .tags .tag{margin:10rpx}.footer{margin-bottom:100rpx;padding:20rpx}
+.red{color:#F01740}.grey{color:#666666}.black{color:#000000}.title{font-weight:Medium;font-size:36rpx;color:#222222}.text-large{font-size:36rpx}.text{font-size:30rpx}.text-left{text-align:left}.text-center{text-align:center}.text-small{font-size:24rpx}.flex{display:flex}.justify-between{justify-content:space-between}.flex-aligin-center{display:flex;align-items:center}.flex-justify-between{display:flex;justify-content:space-between}.flex-1{flex:1}.flex-grow-1{flex-grow:1}.fixed-bottom{position:fixed;bottom:0;left:0;right:0}.w-100{width:100%}.h-100{height:100%}.page-section{margin:20rpx;border-radius:20rpx;background-color:#ffffff}.page-section-spacing{padding:20rpx}.spacing-small{padding:10rpx}.border-trans{border:1px solid transparent}.ellipsis{width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}.ellipsis-2{width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.form{display:flex;flex-wrap:wrap}.form .col-12{width:50%}.form-item{width:100%;margin:20rpx 0;color:#382E2E}.form-item .form-label{font-size:28rpx;margin:20rpx;color:#666666}.form-item .form-label .required{font-size:40rpx;vertical-align:middle}.form-item .form-field{padding:10rpx}.form-item .form-field .form-input{padding:10rpx;border:.5px solid #eee;border-radius:10rpx}.form-item .form-field .form-input-num{width:200rpx}.tag-wrapper{display:flex;align-items:center;color:#382E2E}.tag-wrapper .add-btn{width:auto}.tag-wrapper .tags{flex:1;display:flex;flex-wrap:wrap}.tag-wrapper .tags .tag{margin:10rpx}.footer{margin-bottom:100rpx;padding:20rpx}

nova-tourism/pages/my/my-order/index.less

@@ -4,6 +4,7 @@
     background-color: #F4F4F4;
     overflow-y: scroll;
     padding-bottom: 20rpx;
+    color: #382E2E;
     .tabbos{
         width: 100%;
         background-color: white;

nova-tourism/pages/my/my-order/index.wxml

@@ -35,7 +35,7 @@
                     </view>
                 </view>
             </block>
-            <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
+            <!-- <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
                 <view class="cardbox">
                     <view class="title">望仙礼遇</view>
                     <view class="roombox">
@@ -54,7 +54,7 @@
                         <view class="sumbit" bindtap="gourl" data-url="../my-order/order-detail/index" data-id="{{item.objectId}}">订单详细</view>
                     </view>
                 </view>
-            </block>
+            </block> -->
             <van-empty wx:if="{{value=='民宿'&&roomList.length==0}}" description="暂无订单" />
         </van-tab>
 
@@ -84,7 +84,7 @@
                     </view>
                 </view>
             </block>
-            <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
+            <!-- <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
                 <view class="cardbox">
                     <view class="title">望仙礼遇</view>
                     <view class="roombox">
@@ -103,7 +103,7 @@
                         <view class="sumbit" bindtap="gourl" data-url="../my-order/order-detail/index" data-id="{{item.objectId}}">查看物流</view>
                     </view>
                 </view>
-            </block>
+            </block> -->
             <van-empty wx:if="{{value=='民宿'&&roomList.length==0}}" description="暂无订单" />
         </van-tab>
 
@@ -133,7 +133,7 @@
                     </view>
                 </view>
             </block>
-            <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
+            <!-- <block wx:if="{{value=='物品'}}" wx:for="{{3}}">
                 <view class="cardbox">
                     <view class="title">望仙礼遇</view>
                     <view class="roombox">
@@ -152,12 +152,12 @@
                         <view class="sumbit" bindtap="gourl" data-url="../my-order/order-detail/index" data-id="{{item.objectId}}">订单详细</view>
                     </view>
                 </view>
-            </block>
+            </block> -->
             <van-empty wx:if="{{value=='民宿'&&roomList.length==0}}" description="暂无订单" />
         </van-tab>
     </van-tabs>
     <!-- 望仙礼遇 -->
-    <view class="box">
+    <!-- <view class="box">
         <view class="wangbox">
             <view class="wang">望仙礼遇</view>
         </view>
@@ -176,6 +176,6 @@
                 </view>
             </block>
         </view>
-    </view>
+    </view> -->
 
 </view>

nova-tourism/pages/my/my-order/my-refund/index.js

@@ -33,6 +33,7 @@ Page({
         });
     },
 
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
@@ -80,5 +81,14 @@ Page({
      */
     onShareAppMessage: function () {
 
-    }
+    },
+    gourl(e) {
+        const url = e.currentTarget.dataset.url;
+        // const id = e.currentTarget.dataset.id;
+
+        // 使用查询字符串跳转
+        wx.navigateTo({
+            url: `${url}`,
+        });
+    },
 })

nova-tourism/pages/my/my-order/my-refund/index.less

@@ -4,6 +4,7 @@
     overflow-y: scroll;
     background-color: #F4F4F4;
     padding-bottom: 20rpx;
+    color: #382E2E;
     .title{
         width: 100%;
         font-size: 36rpx;
@@ -24,7 +25,13 @@
         .title2{
             width: 100%;
             font-size: 30rpx;
-            font-weight: 600;
+            display: flex;
+            .title2-1{
+                font-weight: 600;
+            }
+            .title2-2{
+                margin-left: auto;
+            }
         }
         .roombox{
             width: 100%;

nova-tourism/pages/my/my-order/my-refund/index.wxml

@@ -4,7 +4,10 @@
     <view class="title">订单已完成</view>
     <block wx:for="{{3}}">
         <view class="cardbox">
-            <view class="title2">望仙礼遇</view>
+            <view class="title2">
+                <view class="title2-1">望仙礼遇</view>
+                <view class="title2-2">已完成</view>
+            </view>
             <view class="roombox">
                 <image src="https://file-cloud.fmode.cn//tmp/mqHkA2qV3Q8nca3dc59bad49de6e5ae57afa81d78ae8.jpeg?imageView2/1/w/200/h/200"></image>
                 <view class="room">
@@ -18,7 +21,7 @@
                 <view class="price">实付款￥19999.99</view>
             </view>
             <view class="sumbitbox">
-                <view class="sumbit" bindtap="gourl" data-url="../my-order/order-detail/index" data-id="{{item.objectId}}">退换</view>
+                <view class="sumbit" bindtap="gourl" data-url="../my-refund/refund-detail/index">退换</view>
             </view>
         </view>
     </block>

nova-tourism/pages/my/my-order/my-refund/refund-detail/index.js

@@ -0,0 +1,117 @@
+// nova-tourism/pages/my/my-order/my-refund/refund-detail/index.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        statusBarHeight: 0,
+        screenHeight: 0,
+        customHeight: 0,
+        bottomNavHeight: 0,
+        contentHeight: 0,
+
+        text: '',
+        // 图片
+        fileList: [],
+        uptokenURL: '',
+        domain: '',
+        uploadURL: '',
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const systemInfo = wx.getSystemInfoSync();
+        const statusBarHeight = systemInfo.statusBarHeight || 0;
+        const screenHeight = systemInfo.screenHeight || 0;
+        const custom = wx.getMenuButtonBoundingClientRect();
+        const customHeight = custom.height + 10 + 2 || 0;
+        const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
+
+        const contentHeight = (screenHeight - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
+        this.setData({
+            statusBarHeight,
+            screenHeight,
+            customHeight,
+            bottomNavHeight,
+            contentHeight
+        });
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+    // 添加本地图片
+    async getUptoken() {
+        let res = await Parse.Cloud.run('qiniu_uptoken', {
+            company: company
+        })
+        this.setData({
+            uptokenURL: res.uptoken,
+            domain: res.domain,
+            uploadURL: res.zoneUrl
+        })
+        console.log(this.data.uptokenURL, this.data.domain, this.data.uploadURL);
+    },
+    //获取图片数组
+    picture(event) {
+        console.log('event', event);
+        let FileList = event.detail
+        let url = []
+        for (let i = 0; i < FileList.length; i++) {
+            url.push(FileList[i].url)
+        }
+        this.setData({
+            fileList: url
+        })
+        console.log('图片', this.data.fileList);
+    },
+})

nova-tourism/pages/my/my-order/my-refund/refund-detail/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-divider": "@vant/weapp/divider/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}

nova-tourism/pages/my/my-order/my-refund/refund-detail/index.less

@@ -0,0 +1,149 @@
+/* nova-tourism/pages/my/my-order/my-refund/refund-detail/index.wxss */
+.all{
+    width: 100vw;
+    color: #382E2E;
+    background-color: #F4F4F4;
+    padding-bottom: 20rpx;
+    overflow-y: scroll;
+    .title{
+        width: 100%;
+        font-size: 36rpx;
+        background-color: white;
+        display: flex;
+        justify-content: center;
+        padding-bottom: 25rpx;
+    }
+    .cardbox{
+        width: 100%;
+        height: auto;
+        padding-left: 30rpx;
+        padding-right: 30rpx;
+        padding-top: 20rpx;
+        padding-bottom: 10rpx;
+        margin-top: 20rpx;
+        background-color: white;
+        .title2{
+            width: 100%;
+            font-size: 30rpx;
+            font-weight: 600;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-bottom: 30rpx;
+        }
+        .roombox{
+            width: 100%;
+            display: flex;
+            margin-top: 20rpx;
+            image{
+                width: 170rpx;
+                height: 170rpx;
+                border-radius: 10rpx;
+            }
+            .room{
+                height: 100%;
+                margin-left: 20rpx;
+                .room-name{
+                    width: 460rpx;
+                    font-size: 28rpx;
+                    margin-bottom: 10rpx;
+                    color: #000000;
+    
+                }
+                .room-tag{
+                    font-size: 26rpx;
+                    width: 460rpx;
+                    height: auto;
+                    color: #F37B40;
+                    margin-bottom: 10rpx;
+                }
+                .room-text{
+                    width: 460rpx;
+                    height: auto;
+                    font-size: 26rpx;
+                    color: #737373;
+                }
+                .room-text2{
+                    width: 460rpx;
+                    height: auto;
+                    font-size: 26rpx;
+                    margin-top: 100rpx;
+                    color: #737373;
+                }
+            }
+        }
+        .text1{
+            width: 100%;
+            font-size: 28rpx;
+            display: flex;
+            color: #000000;
+            margin-bottom: 20rpx;
+            .tex1{
+                display: flex;
+                .tex1-1{
+                    color: #E22525;
+                    margin-left: 4rpx;
+                }
+
+            }
+            .tex2{
+                margin-left: auto;
+                font-size: 30rpx;
+                color: #F05C14;
+               
+            }
+            .tex3{
+                margin-left: auto;
+                font-size: 28rpx;
+                display: flex;
+            }
+
+        }
+        .areabox{
+            width: 100%;
+            height: auto;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            position: relative;
+            textarea{
+                background-color: #F4F4F4;
+                padding: 15rpx;
+                border-radius: 15rpx;
+                min-height: 200rpx;
+            }
+            .number{
+                color: gray;
+                position: absolute;
+                bottom: 0;
+                right: 46rpx;
+                font-size: 26rpx;
+            }
+        }
+        .uploadbox{
+            width: 100%;
+            height: 528rpx;
+            margin-top: 20rpx;
+        }
+    }
+    .submitbox{
+        width: 100%;
+        height: 110rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: white;
+        padding-bottom: 30rpx;
+        .submit{
+            background-color: #F05C14;
+            color: white;
+            width: 50%;
+            height: 100%;
+            border-radius: 20rpx;
+            font-size: 30rpx;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
+}

nova-tourism/pages/my/my-order/my-refund/refund-detail/index.wxml

@@ -0,0 +1,49 @@
+<!--nova-tourism/pages/my/my-order/my-refund/refund-detail/index.wxml-->
+<nav type="back" background-color="#ffffff" frontColor="#000000" title="退款/售后" />
+<view class="all" style="height: {{contentHeight}}rpx;">
+    <view class="title">订单已完成</view>
+    <view class="cardbox">
+        <view class="title2">确认退换信息</view>
+        <view class="roombox">
+            <image src="https://file-cloud.fmode.cn//tmp/mqHkA2qV3Q8nca3dc59bad49de6e5ae57afa81d78ae8.jpeg?imageView2/1/w/200/h/200"></image>
+            <view class="room">
+                <view class="room-name">房间描述房间描述</view>
+                <view class="room-text2">紫色经典款</view>
+            </view>
+        </view>
+        <van-divider customStyle="margin: 20rpx;border-color:'#B1B1B1' " />
+        <view class="text1">
+            <view class="tex1">退换方式</view>
+            <view class="tex3">
+                退货退款
+                <van-icon name="arrow" custom-style='margin-left:10rpx' />
+            </view>
+        </view>
+        <view class="text1">
+            <view class="tex1">退货退款的原因</view>
+            <view class="tex3">
+                商品瑕疵
+                <van-icon name="arrow" custom-style='margin-left:10rpx' />
+            </view>
+        </view>
+        <view class="text1">
+            <view class="tex1">
+                描述和凭证
+                <view class="tex1-1">*</view>
+            </view>
+            <view class="tex2">
+                上传有助于处理问题
+            </view>
+        </view>
+        <view class="areabox">
+            <textarea auto-height model:value='{{text}}' bindinput='' maxlength='200'></textarea>
+            <view class="number">{{text.length}}/200</view>
+        </view>
+        <view class="uploadbox">
+            <upload bind:onChangeFile="picture" accept="image" uploadURL="{{uploadURL}}" domain="{{domain}}" uptokenURL="{{uptokenURL}}" maxCount="9" />
+        </view>
+    </view>
+    <view class="submitbox">
+        <view class="submit">提交</view>
+    </view>
+</view>

nova-tourism/pages/my/my-order/order-detail/index.js

@@ -131,6 +131,30 @@ Page({
             });
         }
     },
+    //续住
+    gourl() {
+        const start = new Date(this.data.roomList.endTime);
+        const end = new Date(start); // 复制 start 日期
+        end.setDate(start.getDate() + 1); // 将 end 设置为 start 的后一天
+    
+        // 构造要传递的信息
+        const info = {
+            objectId: this.data.roomList.room.objectId,
+            date_start: start.toISOString(), // 转换为 ISO 格式字符串
+            date_end: end.toISOString(), // 转换为 ISO 格式字符串
+        };
+        console.log('info', info);
+    
+        // 将信息转为查询字符串
+        var queryString = Object.keys(info)
+            .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(info[key])}`)
+            .join('&');
+        console.log(queryString);
+        
+        wx.navigateTo({
+            url: `../../../homestay/homestay-order2/index?${queryString}`
+        });
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

nova-tourism/pages/my/my-order/order-detail/index.less

@@ -4,6 +4,7 @@
     overflow-y: scroll;
     background-color: #F4F4F4;
     padding-bottom: 20rpx;
+    color: #382E2E;
     .title{
         width: 100%;
         font-size: 36rpx;

nova-tourism/pages/my/my-order/order-detail/index.wxml

@@ -57,7 +57,7 @@
                     </view>
                 </view>
                 <view class="sumbitbox" wx:if="{{roomList.status==200}}">
-                    <view class="sumbit">我要续住</view>
+                    <view class="sumbit" bindtap="gourl">我要续住</view>
                 </view>
             </view>
         </block>
@@ -126,7 +126,7 @@
     </view>
 
     <!-- 望仙礼遇 -->
-    <view class="box">
+    <!-- <view class="box">
         <view class="wang-cardbox">
             <block wx:for="{{4}}">
                 <view class="wang-card" bindtap="gourl2">
@@ -142,5 +142,5 @@
                 </view>
             </block>
         </view>
-    </view>
+    </view> -->
 </view>

nova-tourism/pages/my/my-wallet/index.wxml

@@ -2,15 +2,15 @@
 <nav type="back" background-color="#ffffff" frontColor="#000000" title="钱包" />
 <view class="all" style="height: {{contentHeight}}rpx;">
     <view class="textbox">
-        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241125/jbv41d032141490.png?imageView2/1/w/200/h/200"></image>
+        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/qjtn9s104029899.png"></image>
         <view class="text">零钱</view>
     </view>
     <view class="textbox">
-        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241125/mbd741032155770.png?imageView2/1/w/200/h/200"></image>
+        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/mv1h6v104029521.png"></image>
         <view class="text">经营账户</view>
     </view>
     <view class="textbox">
-        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241125/rv8b0o032217262.png?imageView2/1/w/200/h/200"></image>
+        <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/t1b1t1105307191.png"></image>
         <view class="text">银行卡</view>
     </view>
 </view>

project.private.config.json

@@ -37,6 +37,7 @@
           "query": "",
           "scene": null
         },
+<<<<<<< HEAD
         {
           "name": "商户端首页",
           "pathName": "nova-tourism/pages/my/merchant/merchant-home/index",
@@ -54,6 +55,53 @@
           "pathName": "nova-tourism/pages/my/my-order/my-refund/index",
           "query": "",
           "scene": null
+=======
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "民宿详细",
+                    "pathName": "nova-tourism/pages/homestay/homestay-detail/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "卡卷包",
+                    "pathName": "nova-tourism/pages/my/my-card/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "商品详细",
+                    "pathName": "nova-tourism/pages/collect/collect-detail/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "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
+                },
+                {
+                    "name": "退款详细",
+                    "pathName": "nova-tourism/pages/my/my-order/my-refund/refund-detail/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
+>>>>>>> e906246ee957ca55189981dd4211e974770fab17
         }
       ]
     }