change

nova-tourism/components/collect/index.less

@@ -18,40 +18,72 @@
         padding-top: 20rpx;
         .taps{
             width: 100%;
-            height: 220rpx;
+            height: 180rpx;
             display: flex;
             justify-content: space-around;
             border-bottom: solid 4rpx #99B6A0;
+            margin-top: 26rpx;
             .tap{
                 display: flex;
-                justify-content: center;
                 align-items: center;
                 flex-direction: column;
                 image{
-                    width: 100rpx;
-                    height: 100rpx;
+                    width: 104rpx;
+                    height: 102rpx;
                     border-radius: 50%;
                 }
                 .tap-tex{
-                    font-size: 26rpx;
-                    margin-top: 20rpx;
+                    font-size: 22rpx;
+                    margin-top: 22rpx;
+                    font-weight: 400;
                     color: #969696 ;
+                    height: 32rpx;
                 }
             }
         }
         .box-tex{
             font-size: 32rpx;
             color: #67806A;
-            margin-top: 10rpx;
-            margin-bottom: 20rpx;
+            margin-top: 16rpx;
+            margin-bottom: 12rpx;
         }
         .picturebox{
-            width: 100%;
-            height: 500rpx;
+            width: 700rpx;
+            height: 714rpx;
+            position: relative;
+            .img{
+                width: 100%;
+                height: 714rpx;
+                image{
+                    width: 100%;
+                    height: 100%;
+    
+                }
+            }
+            .numberbox{
+                position: absolute;
+                bottom: 40rpx;
+                right: 20rpx;
+                border-radius: 45%;
+                z-index: 10;
+                color: white;
+                width: 70rpx;
+                height: 45rpx;
+                font-size: 24rpx;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                background-color: rgba(12, 12, 12, 0.5);
+            }
+    
+        }
+        .picturebox2{
+            width: 702rpx;
+            height: 420rpx;
             position: relative;
             .img{
                 width: 100%;
-                height: 500rpx;
+                height: 420rpx;
                 image{
                     width: 100%;
                     height: 100%;
@@ -81,11 +113,11 @@
             justify-content: center;
             align-items: center;
             flex-direction: column;
-            margin-top: 40rpx;
-            margin-bottom: 20rpx;
+            margin-top: 60rpx;
+            margin-bottom: 28rpx;
             .wang{
-                width: 200rpx;
-                height: 60rpx;
+                width: 206rpx;
+                height: 46rpx;
                 font-size: 32rpx;
                 color: #67806A;
                 background-image: url(https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/dm1jj2032446503.png?imageView2/1/w/200/h/200);
@@ -97,7 +129,7 @@
                 align-items: center;
             }
             .wang2{
-                font-size: 28rpx;
+                font-size: 24rpx;
                 color: #969696;
             }
         }
@@ -110,7 +142,7 @@
             padding-right: 3%;
             padding-bottom: 40rpx;
             column-count: 2; /* 设置列数 */
-            column-gap: 20rpx; /* 设置列间距 */
+            column-gap: 16rpx; /* 设置列间距 */
             .wang-card{
                 break-inside: avoid; /* 防止卡片在列之间断裂 */
                 margin-bottom: 20rpx; /* 设置卡片底部间距 */
@@ -118,15 +150,16 @@
                 
                 image{
                     width: 100%;
-                    height: 275rpx;
-                    border-radius: 15rpx;
+                    height: 204rpx;
+                    border-radius: 4rpx;
                 }
                 .wang-catex{
-                    font-size: 28rpx;
+                    font-size: 26rpx;
+                    font-weight: 400;
+                    height: 76rpx;
                 }
                 .wang-numbox{
                     width: 100%;
-                    height: 80rpx;
                     display: flex;
                     align-items: center;
                     .wang-num{
@@ -139,16 +172,16 @@
                             font-size: 32rpx;
                         }
                         .wang-num2{
-                            font-size: 36rpx;
+                            font-size: 40rpx;
                         }
                     }
                     .wang-submit{
-                        width: 100rpx;
-                        height: 50rpx;
-                        font-size: 30rpx;
+                        width: 102rpx;
+                        height: 48rpx;
+                        font-size: 28rpx;
                         color: white;
                         background-color: #F8DA7F;
-                        border-radius: 40rpx;
+                        border-radius: 15rpx;
                         display: flex;
                         justify-content: center;
                         align-items: center;

nova-tourism/components/collect/index.wxml

@@ -11,7 +11,7 @@
         </view>
     </view>
     <view wx:if="{{currentTab == 0}}">
-        <!-- <view class="box">
+        <view class="box">
             <view class="taps">
                 <block wx:for="{{taps}}">
                     <view class="tap">
@@ -35,11 +35,11 @@
                 <view class="wang">望仙礼遇</view>
                 <view class="wang2">望日w望月w来望仙w</view>
             </view>
-            <view class="picturebox">
+            <view class="picturebox2" >
                 <swiper autoplay="{{true}}" indicator-dots='{{true}}' indicator-color='#D9D9D9' indicator-active-color='#F8DA7F' interval="{{3000}}" circular duration="{{500}}" class="img" bindchange="onSwiperChange">
                     <block wx:for="{{imageUrls}}" wx:key="index" wx:for-item="img">
-                        <swiper-item class="img">
-                            <image src="{{img}}" mode="aspectFill"></image>
+                        <swiper-item class="img" >
+                            <image src="{{img}}"  mode="aspectFill"></image>
                         </swiper-item>
                     </block>
                 </swiper>
@@ -70,7 +70,7 @@
             </view>
 
 
-        </view> -->
+        </view>
     </view>
     <view wx:if="{{currentTab == 1}}">
         <!-- 卡片 -->

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

@@ -7,13 +7,16 @@
         overflow-y: scroll;
         position: relative;
         background-color: #EEEEEE;
+        color: #727783;
+        font-family: "Microsoft YaHei", "PingFang SC", "Helvetica Neue", sans-serif; /* 添加后备字体 */
+        font-weight: 700;
         .picturebox{
             width: 100%;
-            height: 500rpx;
+            height: 550rpx;
             position: relative;
             .img{
                 width: 100%;
-                height: 500rpx;
+                height: 550rpx;
                 image{
                     width: 100%;
                     height: 100%;
@@ -42,9 +45,9 @@
             height: auto;
             background-color: #EEEEEE;
             position: absolute;
-            top: 490rpx;
+            top: 542rpx;
             left: 0;
-            border-radius: 20rpx;
+            border-radius: 12rpx;
             .infobox{
                 width: 100%;
                 height: auto;
@@ -53,18 +56,18 @@
                 background-color: white;
                 .title{
                     width: 100%;
-                    height: 90rpx;
-                    font-size: 30rpx;
+                    font-size: 26rpx;
         
                 }
                 .lebalbox{
                     width: 100%;
-                    height: 60rpx;
                     display: flex;
                     margin-top: 10rpx;
                     .lebal{
-                        font-size: 30rpx;
-                        border-radius: 15rpx;
+                        width: 174rpx;
+                        height: 50rpx;
+                        font-size: 28rpx;
+                        border-radius: 6rpx;
                         padding-left: 20rpx;
                         padding-right: 20rpx;
                         background-color: #FBF5E1;
@@ -78,15 +81,15 @@
                 .carbox{
                     width: 100%;
                     height: 60rpx;
-                    margin-top: 20rpx;
+                    margin-top: 24rpx;
                     display:flex ;
                     align-items: center;
                     image{
-                        width: 48rpx;
-                        height: 40rpx;
+                        width: 40rpx;
+                        height: 30rpx;
                     }
                     .car-tex{
-                        font-size: 28rpx;
+                        font-size: 26rpx;
                         color: #F8BB7F;
                         margin-left: 10rpx;
                     }
@@ -99,11 +102,11 @@
                     border-bottom: solid 2rpx #EEEEEE;
                     padding-bottom: 20rpx;
                     image{
-                        width: 45rpx;
-                        height: 45rpx;
+                        width: 40rpx;
+                        height: 40rpx;
                     }
                     .car-tex{
-                        font-size: 28rpx;
+                        font-size: 26rpx;
                         // color: #F8BB7F;
                         margin-left: 10rpx;
                     }
@@ -114,11 +117,11 @@
                     display:flex ;
                     
                     image{
-                        width: 45rpx;
-                        height: 45rpx;
+                        width: 40rpx;
+                        height: 40rpx;
                     }
                     .carbox3-tex{
-                        font-size:28rpx ;
+                        font-size:26rpx ;
                         margin-left: 10rpx;
                         .carbox3-tex2{
                             margin-top: 10rpx;
@@ -131,11 +134,11 @@
                     display:flex ;
                     align-items: center;
                     image{
-                        width: 45rpx;
-                        height: 45rpx;
+                        width: 40rpx;
+                        height: 40rpx;
                     }
                     .car-tex{
-                        font-size: 28rpx;
+                        font-size: 26rpx;
                         // color: #F8BB7F;
                         margin-left: 10rpx;
                     }
@@ -144,16 +147,17 @@
             .tipbox{
                 width: 100%;
                 height: auto;
-                margin-top: 20rpx;
+                margin-top: 16rpx;
                 padding-top: 20rpx;
                 padding-left: 30rpx;
                 padding-right: 30rpx;
                 background-color: white;
                 border-radius: 20rpx;
-                font-size: 28rpx;
+                padding-bottom: 40rpx;
+                font-size: 26rpx;
                 .dinggou{
                     width: 100%;
-                    font-size: 28rpx;
+                    font-size: 26rpx;
                     .dinggou-tex{
                         margin-left: 20rpx;
                         margin-top: 10rpx;
@@ -165,24 +169,25 @@
                     margin-bottom: 60rpx;
                     image{
                         width: 100%;
-                        height: 500rpx;
+                        height: 760rpx;
                     }
                 }
             }
             .tipbox2{
                 width: 100%;
                 height: auto;
-                margin-top: 20rpx;
+                margin-top: 16rpx;
                 padding-top: 20rpx;
                 padding-left: 30rpx;
                 padding-right: 30rpx;
+                padding-bottom: 40rpx;
                 background-color: white;
                 border-radius: 20rpx;
-                font-size: 28rpx;
+                font-size: 26rpx;
                 padding-bottom: 110rpx;
                 .dinggou{
                     width: 100%;
-                    font-size: 28rpx;
+                    font-size: 26rpx;
                     .dinggou-tex{
                         margin-left: 20rpx;
                         margin-top: 10rpx;
@@ -190,7 +195,7 @@
                 }
                 image{
                     width: 100%;
-                    height: 400rpx;
+                    height: 760rpx;
                     margin-top: 20rpx;
                     margin-bottom: 20rpx;
                 }
@@ -206,33 +211,33 @@
     .paybox{
         width: 100%;
         height: 90rpx;
-        padding-left: 40rpx;
         display: flex;
         position: absolute;
         bottom: 0;
         left: 0;
         background-color: white;
         .pay1{
-            width: 30%;
+            width: 288rpx;
             height: 100%;
             display: flex;
             align-items: center;
+            justify-content: center;
             image{
                 width: 50rpx;
-                height: 50rpx;
+                height: 44rpx;
             }
             .pay1-tex{
-                font-size: 30rpx;
+                font-size: 32rpx;
                 margin-left: 30rpx;
             }
         }
         .pay2{
-            width: 70%;
+            width: 462rpx;
             height: 100%;
             display: flex;
             justify-content: center;
             align-items: center;
-            font-size: 30rpx;
+            font-size: 32rpx;
             color: white;
             background-color: #F89B7F;
             .pay2-tex2{

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

@@ -21,25 +21,25 @@
                     </block>
                 </view>
                 <view class="carbox">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/5m1j14104029327.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241230/62pr1k034930486.png"></image>
                     <view class="car-tex">48小时内发货</view>
                 </view>
                 <view class="carbox2">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/60n1d2104029824.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241230/1st61g035044073.png"></image>
                     <view class="car-tex">紫色经典款</view>
-                    <van-icon name="arrow" size='15' style="margin-left: auto;" />
+                    <van-icon name="arrow" size='15' color='#727783' style="margin-left: auto;" />
                 </view>
                 <view class="carbox3">
-                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241212/1d4d8q104029153.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241230/2bp2t7035055633.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/20241212/hmsbb1104028656.png"></image>
+                    <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241230/j2sn43035105148.png"></image>
                     <view class="car-tex">确认收货地址</view>
-                    <van-icon name="arrow" size='15' style="margin-left: auto;" />
+                    <van-icon name="arrow" size='15' color='#727783' style="margin-left: auto;" />
                 </view>
             </view>
             <view class="tipbox">
@@ -72,7 +72,7 @@
     <!-- 按钮 -->
     <view class="paybox">
         <view class="pay1">
-            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241121/m1rt69104425214.png"></image>
+            <image src="https://file-cloud.fmode.cn/EbxZUK5lBI/20241230/rpl9a1024145457.png"></image>
             <view class="pay1-tex">首页</view>
         </view>
         <view class="pay2">

nova-tourism/pages/index/index.wxml

@@ -23,7 +23,7 @@
 <van-tabbar
  class="custom-tabbar" active="{{ active }}" bind:change="onChange" active-color="{{tabbarList.activeColor || '#000000'}}" inactive-color="{{tabbarList.inactiveColor || '#999'}}" z-index="99">
 	<block wx:for="{{tabbarList.list}}" wx:key="index">
-		<van-tabbar-item wx:if="{{item.open}}" name="{{index}}">
+		<van-tabbar-item wx:if="{{item.open}}" name="{{index}}" style="height: 108rpx;">
 			<image slot="icon" src="{{ item.iconPath }}" mode="aspectFit" style="width:56rpx;height:56rpx;" />
 			<image  slot="icon-active" src="{{ item.selectedIconPath }}" mode="aspectFit" style="width:56rpx;height:56rpx;" />
 			{{item.text}}

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

@@ -161,20 +161,20 @@
     }
     .box{
         width: 100%;
-        height: auto;
-        background-color: white;
-        margin-top: 20rpx;
+        padding-left: 30rpx;
+        padding-right: 30rpx;
+        padding-top: 20rpx;
         .wangbox{
             width: 100%;
             display: flex;
             justify-content: center;
             align-items: center;
             flex-direction: column;
-            margin-top: 40rpx;
-            margin-bottom: 20rpx;
+            margin-top: 60rpx;
+            margin-bottom: 28rpx;
             .wang{
-                width: 200rpx;
-                height: 60rpx;
+                width: 206rpx;
+                height: 46rpx;
                 font-size: 32rpx;
                 color: #67806A;
                 background-image: url(https://file-cloud.fmode.cn/EbxZUK5lBI/20241126/dm1jj2032446503.png?imageView2/1/w/200/h/200);
@@ -186,12 +186,12 @@
                 align-items: center;
             }
             .wang2{
-                font-size: 28rpx;
+                font-size: 24rpx;
                 color: #969696;
             }
         }
         .wang-cardbox{
-            margin-top: 20rpx;
+            margin-top: 40rpx;
             width: 100%;
             background-color: white;
             overflow-y: hidden;
@@ -199,7 +199,7 @@
             padding-right: 3%;
             padding-bottom: 40rpx;
             column-count: 2; /* 设置列数 */
-            column-gap: 20rpx; /* 设置列间距 */
+            column-gap: 16rpx; /* 设置列间距 */
             .wang-card{
                 break-inside: avoid; /* 防止卡片在列之间断裂 */
                 margin-bottom: 20rpx; /* 设置卡片底部间距 */
@@ -207,15 +207,16 @@
                 
                 image{
                     width: 100%;
-                    height: 275rpx;
-                    border-radius: 15rpx;
+                    height: 204rpx;
+                    border-radius: 4rpx;
                 }
                 .wang-catex{
-                    font-size: 28rpx;
+                    font-size: 26rpx;
+                    font-weight: 400;
+                    height: 76rpx;
                 }
                 .wang-numbox{
                     width: 100%;
-                    height: 80rpx;
                     display: flex;
                     align-items: center;
                     .wang-num{
@@ -228,16 +229,16 @@
                             font-size: 32rpx;
                         }
                         .wang-num2{
-                            font-size: 36rpx;
+                            font-size: 40rpx;
                         }
                     }
                     .wang-submit{
-                        width: 100rpx;
-                        height: 50rpx;
-                        font-size: 30rpx;
+                        width: 102rpx;
+                        height: 48rpx;
+                        font-size: 28rpx;
                         color: white;
                         background-color: #F8DA7F;
-                        border-radius: 40rpx;
+                        border-radius: 15rpx;
                         display: flex;
                         justify-content: center;
                         align-items: center;

project.private.config.json

@@ -1,63 +1,79 @@
 {
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "民宿详细",
-          "pathName": "nova-tourism/pages/homestay/homestay-detail/index",
-          "query": "",
-          "scene": null
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "setting": {},
+    "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": []
         },
-        {
-          "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
-        },
-        {
-          "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
+        "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
+                },
+                {
+                    "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
+                },
+                {
+                    "name": "物品详细",
+                    "pathName": "nova-tourism/pages/collect/collect-detail/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
     }
-  },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }