|
|
@@ -8,42 +8,30 @@
|
|
|
<view class="user-info order-card">
|
|
|
<view class="handle-user">
|
|
|
<view class="handle-user-left">
|
|
|
- <img
|
|
|
- src="/static/serverImg/mine/user.png"
|
|
|
- alt=""
|
|
|
- style="width: 96rpx; height: 96rpx; margin-right: 32rpx"
|
|
|
- />
|
|
|
+ <img :src="detaile.avatar" alt=""
|
|
|
+ style="width: 96rpx; height: 96rpx; margin-right: 32rpx" />
|
|
|
<view class="handle-user-info">
|
|
|
- <view class="user-name">{{ detaile.name }}</view>
|
|
|
- <view class="user-id" style="display: flex"
|
|
|
- >服务类别：<dict-tag
|
|
|
- :options="lrr_service_category"
|
|
|
- :value="detaile.serviceCategory"
|
|
|
- /></view>
|
|
|
+ <view class="user-name">{{ detaile.clientName }}</view>
|
|
|
+ <view class="user-id" style="display: flex">服务类别：{{ detaile.businessTireName }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="user-phone" @click="onPhone(detaile.telephone)">
|
|
|
+ <view class="user-phone" @click="onPhone(detaile.clientPhoneNumber)">
|
|
|
<up-icon name="phone" color="#fff" size="25"></up-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
<view class="handle-adress">
|
|
|
- <up-icon
|
|
|
- name="map"
|
|
|
- color="rgba(156, 163, 175, 1)"
|
|
|
- size="20"
|
|
|
- ></up-icon>
|
|
|
+ <up-icon name="map" color="rgba(156, 163, 175, 1)" size="20"></up-icon>
|
|
|
<view class="adress-text">{{ detaile.address }}</view>
|
|
|
- <up-icon
|
|
|
- name="pushpin"
|
|
|
- color="rgba(221, 94, 69, 1)"
|
|
|
- size="25"
|
|
|
- ></up-icon>
|
|
|
+ <!-- <up-icon name="pushpin" color="rgba(221, 94, 69, 1)" size="25"></up-icon> -->
|
|
|
</view>
|
|
|
<view>
|
|
|
- <view>服务次数：{{ detaile.singleQuantity }}次</view>
|
|
|
- <view>服务开始时间：{{ detaile.workStartTime }}</view>
|
|
|
- <view>服务结束时间：{{ detaile.workEndTime }}</view>
|
|
|
+ <view class="handle-remark">
|
|
|
+ <text class="remark-title">服务次数：{{detaile.singleQuantity }}次</text>
|
|
|
+ </view>
|
|
|
+ <view class="handle-remark">
|
|
|
+ <text class="remark-title">服务时间： {{ detaile.workDate + ' '+ detaile.workStartTime }}</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="handle-remark">
|
|
|
<view class="remark-title">备注</view>
|
|
|
@@ -52,7 +40,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="footer-g">
|
|
|
- <view class="handle-start" v-if="orderStatus && serveTimes">
|
|
|
+ <view class="handle-start" v-if="orderStatus && detaile.serviceStartTime && dateData">
|
|
|
服务已开始：<text class="handle-time">{{ dateData }}</text>
|
|
|
</view>
|
|
|
<Slide ref="verify" @change="change" :sliderText="slideData" />
|
|
|
@@ -183,15 +171,14 @@ const getOrderDetail = async () => {
|
|
|
secondOrderId: secondOrderId.value,
|
|
|
})
|
|
|
|
|
|
- // Update to match the actual data structure where properties are at the top level
|
|
|
- detaile.value = { ...res.data, serveTimes: res.data.updateTime || null }
|
|
|
+ detaile.value = res.data
|
|
|
|
|
|
if (res.data.orderStatus === '3') {
|
|
|
orderStatus.value = true
|
|
|
}
|
|
|
- if (res.data.updateTime) {
|
|
|
+ if (res.data.serviceStartTime) {
|
|
|
timer = setInterval(() => {
|
|
|
- const timeDiff = Math.abs(new Date() - new Date(res.data.updateTime))
|
|
|
+ const timeDiff = Math.abs(new Date() - new Date(res.data.serviceStartTime))
|
|
|
const units = {
|
|
|
day: Math.floor(timeDiff / (1000 * 60 * 60 * 24)),
|
|
|
hour: Math.floor(timeDiff / (1000 * 60 * 60)),
|
|
|
@@ -263,19 +250,7 @@ const change = async (e) => {
|
|
|
// uni.showLoading({
|
|
|
// title: '获取位置信息...'
|
|
|
// })
|
|
|
-
|
|
|
- // // 获取结束服务时的位置
|
|
|
- // const locationData = await getCurrentLocation().catch(err => {
|
|
|
- // uni.hideLoading()
|
|
|
- // verify.value.initialization()
|
|
|
- // throw new Error('无法获取位置信息，请确保已开启位置权限')
|
|
|
- // })
|
|
|
-
|
|
|
- // // 构建参数字符串
|
|
|
- // const params = `secondOrderId=${secondOrderId.value}&serviceFinishLongitude=${locationData.longitude.toString()}&serviceFinishLatitude=${locationData.latitude.toString()}`
|
|
|
-
|
|
|
- // // 调用结束服务接口，通过URL查询参数传递位置信息
|
|
|
- // await getVolunteerFinishSecondOrder(params)
|
|
|
+
|
|
|
uni.showToast({
|
|
|
title: '操作成功',
|
|
|
icon: 'success',
|
|
|
@@ -336,6 +311,9 @@ onUnload(() => {
|
|
|
bottom: 280rpx;
|
|
|
overflow-y: auto;
|
|
|
|
|
|
+ .service-info {
|
|
|
+ // height: 360px;
|
|
|
+ }
|
|
|
.order-card {
|
|
|
border-radius: 8px;
|
|
|
background: rgba(255, 255, 255, 1);
|
|
|
@@ -463,6 +441,9 @@ onUnload(() => {
|
|
|
flex: 1;
|
|
|
text-align: left;
|
|
|
padding-left: 24rpx;
|
|
|
+ font-size: 32rpx;
|
|
|
+ font-weight: 400;
|
|
|
+ color: rgba(75, 85, 99, 1);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -482,7 +463,6 @@ onUnload(() => {
|
|
|
padding: 32rpx;
|
|
|
font-size: 32rpx;
|
|
|
font-weight: 400;
|
|
|
- line-height: 48rpx;
|
|
|
color: rgba(75, 85, 99, 1);
|
|
|
}
|
|
|
}
|
jiayubo
