代驾优化

pages.json

@@ -410,6 +410,20 @@
 						"navigationBarTitleText": "地址选择"
 					}
 				},
+				{
+					"path": "expense/question",
+					"style": {
+						"navigationBarTitleText": "常见问题",
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "expense/rules",
+					"style": {
+						"navigationBarTitleText": "计费规则",
+						"disableScroll": true
+					}
+				},
 				{
 					"path": "expense/index",
 					"style": {

pages/dev/index.vue

@@ -11,6 +11,9 @@
     <button @click="jscode">获取jscode</button>
     <button @click="fenxiang">研学分享</button>
     <button @click="daijia">代驾</button>
+    <button @click="guizhe">代驾规则</button>
+    <button @click="wenti">代驾问题</button>
+    <button @click="xq">代驾详情</button>
     <uni-calendar ref="calendar" :showMonth="false" style="z-index: 999;" :insert="false" @confirm="confirm"
       title="出发时间" :showCancelAndOk="false">
       <template v-slot:btn>
@@ -32,7 +35,22 @@ export default {
     };
   },
   methods: {
-    daijia(){
+    xq() {
+      uni.navigateTo({
+        url: '/trip/expense/index'
+      });
+    },
+    wenti() {
+      uni.navigateTo({
+        url: '/trip/expense/question'
+      });
+    },
+    guizhe() {
+      uni.navigateTo({
+        url: '/trip/expense/rules'
+      });
+    },
+    daijia() {
       uni.navigateTo({
         url: '/trip/index/index'
       });

trip/expense/index.vue

@@ -20,14 +20,14 @@
 			</view>
 		</view>
 		<view class="block">
-			<view class="item title">
+			<view class="item title" @click="go('/trip/expense/rules')">
 				<view class="label">
 					计费规则
 				</view>
 				<image class="jiantou" src="../../static/jiantou-icon.png" mode=""></image>
 			</view>
 
-			<view class="item title">
+			<view class="item title" @click="go('/trip/expense/question')">
 				<view class="label">
 					常见问题
 				</view>
@@ -45,6 +45,13 @@ export default {
 			priceItems: []
 		}
 	},
+	methods: {
+		go(path) {
+			uni.navigateTo({
+				url: path
+			});
+		}
+	},
 	onLoad({ priceItems }) {
 		if (priceItems) {
 			this.priceItems = JSON.parse(priceItems)

trip/expense/question.vue

@@ -0,0 +1,115 @@
+<template>
+  <view class="expense">
+    <view class="block">
+      <view class="item title ">
+        <view class="label">
+          为什么预估价格与实际价格不一样
+        </view>
+        <view class="value">
+
+        </view>
+      </view>
+
+      <view class="notice">
+        下单前的预估价格是根据单时的实时路况预估行驶里程，行驶时长计算得出，预估价格仅供参考。 实际支付价格是根据实际行驶里程，等候时长，下单区域，行驶时长等综合因素计算得出，是最终的订单价格。
+      </view>
+      <view class="item title ">
+        <view class="label">
+          路桥费、停车费、加油费等费用
+        </view>
+        <view class="value">
+
+        </view>
+      </view>
+
+      <view class="notice">
+        服务过程中产生的路桥费、停车费、加油费及其其他附加费由车主承担。 实际支付价格是根据实际行驶里程，等候时长，下单区域，行驶时长等综合因素计算得出，是最终的订单价格。
+      </view>
+      <!--       
+      <view class="notice">
+        预付费用是根据实时交通情况、预估行驶里程、时间等因素计算
+        得出，存在波动，仅供参考。（行程调整、路线修改、高速费等
+        将影响最终价格）
+      </view> -->
+    </view>
+
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+
+  },
+  onLoad() {
+
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.expense {
+  background: #f5f5f5;
+  height: 100vh;
+  padding-top: 20rpx;
+
+  .block {
+    margin-bottom: 20rpx;
+    background: #fff;
+    padding: 28rpx 34rpx;
+  }
+
+  .item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: #AAAAAA;
+    font-size: 28rpx;
+    line-height: 70rpx;
+    position: relative;
+
+    .jiantou {
+      position: absolute;
+      top: 50%;
+      right: 0%;
+      transform: translateY(-50%);
+      width: 20rpx;
+      height: 20rpx;
+    }
+  }
+
+  .item.title {
+    color: #222222;
+  }
+
+  .item.border {
+    border-bottom: 2rpx solid #F0F0F0;
+    padding-bottom: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .total {
+    text-align: right;
+    color: #222222;
+    font-size: 28rpx;
+    margin: 28rpx 0;
+
+    .num {
+      font-weight: bold;
+      font-size: 36rpx;
+    }
+  }
+
+  .notice {
+    color: #AAAAAA;
+    font-size: 24rpx;
+  }
+
+}
+</style>

trip/expense/rules.vue

@@ -0,0 +1,183 @@
+<template>
+  <view class="expense">
+    <view class="block">
+      <view class="label">
+        起步价
+      </view>
+      <view class="notice">
+        实际计费以下单时为准，超出部分加收里程费。
+      </view>
+      <view class="item title ">
+        <view class="label">
+          00:00-07:00
+        </view>
+        <view class="value">
+          18元（含3.0公里）
+        </view>
+      </view>
+      <view class="item title ">
+        <view class="label">
+          07:00-21:00
+        </view>
+        <view class="value">
+          18元（含3.0公里）
+        </view>
+      </view>
+      <view class="item title border">
+        <view class="label">
+          21:00-24:00
+        </view>
+        <view class="value">
+          18元（含3.0公里）
+        </view>
+      </view>
+
+      <view class="label">
+        里程费
+      </view>
+      <view class="notice">
+        起步超出里程后开始计算。
+      </view>
+      <view class="item title ">
+        <view class="label">
+          00:00-24:00
+        </view>
+        <view class="value">
+          2元（0.8公里）
+        </view>
+      </view>
+      <view class="label">
+        返程费
+      </view>
+      <view class="notice">
+        总里程超过一定公里数后，加收返程费。
+      </view>
+      <view class="item title border">
+        <view class="label">
+          00:00-24:00
+        </view>
+        <view class="value">
+          超过7公里，加收30%返程费
+        </view>
+      </view>
+      <view class="label">
+        等待费
+      </view>
+      <view class="notice">
+        司机到达后开始计算等待费。
+      </view>
+      <view class="item title border">
+        <view class="label">
+          00:00-24:00
+        </view>
+        <view class="value">
+          免费10分钟，超出后1元/分钟
+        </view>
+      </view>
+      <view class="label">
+        动态调价
+      </view>
+      <view class="notice border">
+        当恶劣天气、节假日、高峰期、周围司机较少时，为了鼓励司机更快接单，平台会临时调价以保障您的出行。
+      </view>
+
+      <view class="item title border">
+
+      </view>
+      <view class="label">
+        取消费
+      </view>
+      <view class="notice border">
+        因您的责任导致订单取消时，您可能需要支付一定的费用，用于补偿代驾师傅的空驶成本。
+      </view>
+
+      <view class="item title border">
+      </view>
+<!--       
+      <view class="notice">
+        预付费用是根据实时交通情况、预估行驶里程、时间等因素计算
+        得出，存在波动，仅供参考。（行程调整、路线修改、高速费等
+        将影响最终价格）
+      </view> -->
+    </view>
+
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+
+  },
+  onLoad() {
+
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.expense {
+  background: #f5f5f5;
+  height: 100vh;
+  padding-top: 20rpx;
+
+  .block {
+    margin-bottom: 20rpx;
+    background: #fff;
+    padding: 28rpx 34rpx;
+  }
+
+  .item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    color: #AAAAAA;
+    font-size: 28rpx;
+    line-height: 70rpx;
+    position: relative;
+
+    .jiantou {
+      position: absolute;
+      top: 50%;
+      right: 0%;
+      transform: translateY(-50%);
+      width: 20rpx;
+      height: 20rpx;
+    }
+  }
+
+  .item.title {
+    color: #222222;
+  }
+
+  .item.border {
+    border-bottom: 2rpx solid #F0F0F0;
+    padding-bottom: 20rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .total {
+    text-align: right;
+    color: #222222;
+    font-size: 28rpx;
+    margin: 28rpx 0;
+
+    .num {
+      font-weight: bold;
+      font-size: 36rpx;
+    }
+  }
+
+  .notice {
+    color: #AAAAAA;
+    font-size: 24rpx;
+  }
+
+}
+</style>

trip/index/index.vue

@@ -126,7 +126,7 @@
 								</u-avatar>
 							</view>
 							<view class="driver-info">
-								<view class="driver-name">{{ driver.driverName || '王师傅 编号D1002' }}</view>
+								<view class="driver-name">{{ driver.driverName + ' ' + driver.driverId || '' }}</view>
 								<view class="driver-car">秋香代驾</view>
 							</view>
 							<view class="driver-option">
@@ -172,7 +172,7 @@
 								</u-avatar>
 							</view>
 							<view class="driver-info">
-								<view class="driver-name">{{ driver.driverName || '王师傅 编号D1002' }}</view>
+								<view class="driver-name">{{ driver.driverName + ' ' + driver.driverId || '' }}</view>
 								<view class="driver-car">秋香代驾</view>
 							</view>
 							<view class="driver-option">
@@ -181,11 +181,11 @@
 										src="http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/65fe8e5874d67a7dbd842c5a/ext/GOODS_INFO/组 8090@2x.png/1.png"
 										mode=""></image>
 								</view>
-								<view class="call" @click='callPhone'>
+								<!-- <view class="call" @click='callPhone'>
 									<image
 										src="http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/65fe8e5874d67a7dbd842c5a/ext/GOODS_INFO/组 8089@2x.png/1.png"
 										mode=""></image>
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>