邹能昇 4 maanden geleden
bovenliggende
commit
dda051e98e

+ 1 - 1
nova-tourism/components/homestay/index.wxml

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

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

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

+ 44 - 11
nova-tourism/pages/homestay/homestay-order2/index.less

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

+ 17 - 2
nova-tourism/pages/homestay/homestay-order2/index.wxml

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

File diff suppressed because it is too large
+ 0 - 1
nova-tourism/pages/homestay/homestay-order2/index.wxss


+ 19 - 57
project.private.config.json

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

Some files were not shown because too many files changed in this diff