From fb6e62d3f24c3c29ca19e57b9a8f459874cc9052 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 16 一月 2025 16:52:05 +0800
Subject: [PATCH] fix

---
 pages/home/home.wxml |   48 +++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 0eb9637..07b0aa5 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -116,8 +116,9 @@
             </view>
             <!--选择乘车人-->
             <view class="use_people" catchtap="changePeople" hidden="{{checkDown!==3}}">
-              {{changePeople}} >
+              {{changePeople}} > 222222222222
             </view>
+
             <!--预约原则时间-->
             <view class="use_people" catchtap="selecttime" hidden="{{checkDown!==2}}">
               {{yyTime=='现在'?'选择时间':yyTime}} >
@@ -149,8 +150,9 @@
             </view>
             <!--选择乘车人-->
             <view class="use_people" catchtap="changePeople" hidden="{{checkDown!==3}}">
-              {{changePeople}} >
+              {{changePeople}} > 1111111
             </view>
+
             <!--预约原则时间-->
             <view class="use_people" catchtap="selecttime" hidden="{{checkDown!==2}}">
               {{yyTime=='现在'?'选择时间':yyTime}} >
@@ -202,8 +204,13 @@
           <!--乘车人和消费-->
           <view class="car_change" hidden="{{checkDown==2}}">
             <view wx:if="{{busId==2}}" style="display: flex;align-items: center;justify-content: center;width: 100%;">
-              <view class="people_selsect" catchtap="changePeople">
+              <view class="people_selsect bor-R" catchtap="changePeople">
                 {{changePeople}}
+                <image src="../../img/icon_nav_open.png" class="jiantou"></image>
+              </view>
+
+              <view class="people_selsect" catchtap="changeModel">
+                {{payModel}}
                 <image src="../../img/icon_nav_open.png" class="jiantou"></image>
               </view>
             </view>
@@ -222,13 +229,18 @@
             <view wx:if="{{busId==1}}" class="people_selsect" catchtap="setSosPeople">紧急联系人<image src="../../img/icon_nav_open.png" class="jiantou"></image>
             </view>
           </view>
-          <view class="car_change" hidden="{{checkDown==1||checkDown==3}}">
-            <view class="people_selsect {{checkDown==2?'three':''}}" catchtap="selecttime">
+          <view class="car_change" style="display: flex;align-items: center;" hidden="{{checkDown==1||checkDown==3}}" wx:if="{{checkDown==2}}">
+            <view class="people_selsect bor-R  {{checkDown==2?'three':''}}" catchtap="selecttime">
               {{yyTime=='现在'?'选择时间':yyTime}}
               <image src="../../img/icon_nav_open.png" class="jiantou"></image>
             </view>
-            <view class="people_selsect {{checkDown==2?'three':''}}" catchtap="changePeople">
+            <view class="people_selsect bor-R  {{checkDown==2?'three':''}}" catchtap="changePeople">
               {{changePeople}}
+              <image src="../../img/icon_nav_open.png" class="jiantou"></image>
+            </view>
+
+            <view class="people_selsect {{checkDown==2?'three':''}}" catchtap="changeModel">
+              {{payModel}}
               <image src="../../img/icon_nav_open.png" class="jiantou"></image>
             </view>
             <!-- <view class="people_selsect {{checkDown==2?'three':''}}" catchtap="selecttip">
@@ -475,4 +487,26 @@
     <view class="contact" catchtap="serverPhone">去联系</view>
     <image catchtap="closeBlack" class="close" src="/img/icon_close@2x.png"></image>
   </view>
-</view>
\ No newline at end of file
+</view>
+
+<van-popup position="bottom" overlay="{{ true }}" show="{{showModel}}" bind:close="onClose">
+  <view class="van_top">
+    <view class="van_title" style="font-weight: 600;">选择计费方式</view>
+    <image src="../../img/icon_close.png" catchtap="onClose"></image>
+  </view>
+
+  <view class="van-content">
+    <view class="van-item" bindtap="changeTab1">
+      <image src="../../img/xuanzhong@2x.png" wx:if="{{changeModel=='线上计费'}}" class="check-icon-item" />
+      <image src="../../img/icon_raidobutton.png" wx:if="{{changeModel=='打表计费'}}" class="check-icon-item" />
+      <text style="font-weight: 600;"> 线上计费</text> (平台计费在线付款给平台)
+    </view>
+    <view class="van-item" bindtap="changeTab2">
+      <image src="../../img/icon_raidobutton.png" wx:if="{{changeModel=='线上计费'}}" class="check-icon-item" />
+      <image src="../../img/xuanzhong@2x.png" wx:if="{{changeModel=='打表计费'}}" class="check-icon-item" />
+     <text style="font-weight: 600;">打表计费</text> (司机打表计费)
+    </view>
+  </view>
+
+  <button disabled="{{btnDisabled}}" catchtap="changePayModel" class="sure-btn">确认</button>
+</van-popup>

--
Gitblit v1.7.1