From 51cca32d236262be90f2d39b8889fa343f1adfa1 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 08 五月 2025 16:13:37 +0800
Subject: [PATCH] 迭代
---
pages/home/home.wxml | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index a1fadcf..2f7850e 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -45,9 +45,17 @@
</view>
</view>
<!--滑动选择框-->
- <!-- <scroll-view scroll-x="true" style=" white-space: nowrap;height:40px">
- <view class="bus_style {{busId==item.id?'active_style':''}}" wx:key='index' catchtap="changCarID" wx:for="{{busStyle}}" data-id="{{item.id}}">{{item.name}}</view>
- </scroll-view> -->
+ <view style="display: flex;width: 100%;" wx:if="{{!chartered}}">
+ <view style="flex: 1;overflow: auto;">
+ <scroll-view scroll-x="true" style="white-space: nowrap; height:24px;margin-bottom: 20rpx;background-color: #fff;padding-bottom: 20rpx;">
+ <view class="bus_styles {{busId==item.id?'active_style':''}}" wx:key='index' catchtap="changCarID" wx:for="{{busStyle}}" data-id="{{item.id}}">{{item.name}}</view>
+ </scroll-view>
+ </view>
+ <view class="more-serve" bindtap="showgengduos" wx:if="{{visibleMoreServe}}">
+ <image src="https://cy-kuanzhai.oss-cn-shenzhen.aliyuncs.com/applet/static/img/gengduo.png"></image>
+ </view>
+ </view>
+
<!-- 普通与老人模式切换 -->
<view style="display: flex;justify-content: center; align-items: center;">
@@ -187,7 +195,7 @@
<view class="car_style" wx:if="{{busId==2}}">
<view class="car_name">出租车</view>
<image src="../../img/taxi.png" class="taxi_img"></image>
- <view class="car_driveText">打表计费</view>
+ <view class="car_driveText">预估{{changeModel=='线上计费'?priceObj.online:priceObj.offline}}元</view>
<!-- <view class="sosPeople" catchtap="setSosPeople">紧急联系人<image src="../../img/icon_nav_open.png" class="jiantou"></image>
</view> -->
</view>
@@ -476,9 +484,11 @@
</view>
<view wx:if="{{showNotice}}" class="overlay">
<view class="notice">
- <image src="{{noticeInfo.imgUrl}}" mode="aspectFill"></image>
- <view class="subTitle">
- <rich-text nodes="{{ noticeInfo.content }}"></rich-text>
+ <view bindtap="goWebView">
+ <image src="{{noticeInfo.imgUrl}}" mode="aspectFill"></image>
+ <view class="subTitle">
+ <rich-text nodes="{{ noticeInfo.content }}"></rich-text>
+ </view>
</view>
<image bindtap="closeNotice" class="close" src="/img/icon_close1.png"></image>
</view>
@@ -505,14 +515,21 @@
<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 style="width: 100%;">
+ <view style="font-weight: 600; display: flex; justify-content: space-between;width: 100%;"> <view>线上计费</view> <view>预估{{priceObj.online}}元</view></view>
+ <view>平台计费在线付款给平台</view>
+ </view>
+
</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 style="width: 100%;">
+ <view style="font-weight: 600; display: flex; justify-content: space-between;width: 100%;"> <view>打表计费</view> <view>预估{{priceObj.offline}}元</view></view>
+ <view>司机打表计费</view>
+ </view>
</view>
</view>
<button disabled="{{btnDisabled}}" catchtap="changePayModel" class="sure-btn">确认</button>
-</van-popup>
+</van-popup>
\ No newline at end of file
--
Gitblit v1.7.1