调整样式

This commit is contained in:
ChuShiZ 2024-08-23 23:17:22 +08:00
parent a4180eed1b
commit 0b42763e9d
5 changed files with 508 additions and 295 deletions

View File

@ -7,6 +7,9 @@
</view> </view>
<view class="orderCardStatus"> <view class="orderCardStatus">
<view class="orderCardStatusData"> <view class="orderCardStatusData">
<view v-if="orderData.rescueStatus == 2" class="orderCardSendOrders">
系统正在派单中...
</view>
<template v-if="orderData.rescueStatus == 3"> <template v-if="orderData.rescueStatus == 3">
<image src="@/static/icons/homeOrderCard/dhjl.png" class="orderCardDistanceIcon" mode="aspectFit"></image> <image src="@/static/icons/homeOrderCard/dhjl.png" class="orderCardDistanceIcon" mode="aspectFit"></image>
<text class="orderCardDistanceValue">{{orderData.distance / 1000 || 0}}KM</text> <text class="orderCardDistanceValue">{{orderData.distance / 1000 || 0}}KM</text>
@ -23,9 +26,6 @@
</text> </text>
</view> </view>
<view class="orderCardProcess"> <view class="orderCardProcess">
<view v-if="orderData.rescueStatus == 2" class="orderCardSendOrders">
系统正在派单中...
</view>
<view v-if="orderData.rescueStatus > 2"> <view v-if="orderData.rescueStatus > 2">
<text class="orderCardDriver">{{ orderData.driverName || "" }}</text> <text class="orderCardDriver">{{ orderData.driverName || "" }}</text>
驾驶 驾驶
@ -254,11 +254,12 @@
.orderCardProcess { .orderCardProcess {
.orderCardSendOrders,
.orderCardDriver, }
.orderCardCarNo { .orderCardSendOrders,
color: #317DFA; .orderCardDriver,
} .orderCardCarNo {
color: #317DFA;
} }
.orderCardFooter { .orderCardFooter {

View File

@ -3,15 +3,15 @@
<view class="box" :class="{active: aindex == 1}" @click="getgogo(1)" v-if="role == 'user' "> <view class="box" :class="{active: aindex == 1}" @click="getgogo(1)" v-if="role == 'user' ">
<view class="imgs"> <view class="imgs">
<image src="@/static/icons/tabbar/home.png" v-show="aindex != 1"></image> <image mode="aspectFit" src="@/static/icons/tabbar/home.png" v-show="aindex != 1"></image>
<image src="@/static/icons/tabbar/home-checked.png" v-show="aindex == 1"></image> <image mode="aspectFit" src="@/static/icons/tabbar/home-checked.png" v-show="aindex == 1"></image>
</view> </view>
<view class="">首页</view> <view class="">首页</view>
</view> </view>
<view class="box" :class="{active: aindex == 8}" @click="getgogo(8)" v-if="role == 'police' "> <view class="box" :class="{active: aindex == 8}" @click="getgogo(8)" v-if="role == 'police' ">
<view class="imgs"> <view class="imgs">
<image src="@/static/icons/tabbar/home.png" v-show="aindex != 8"></image> <image mode="aspectFit" src="@/static/icons/tabbar/home.png" v-show="aindex != 8"></image>
<image src="@/static/icons/tabbar/home-checked.png" v-show="aindex == 8"></image> <image mode="aspectFit" src="@/static/icons/tabbar/home-checked.png" v-show="aindex == 8"></image>
</view> </view>
<view class="">首页</view> <view class="">首页</view>
</view> </view>
@ -31,8 +31,8 @@
<!-- #ifdef APP-PLUS || H5 --> <!-- #ifdef APP-PLUS || H5 -->
<view class="box" :class="{active: aindex == 3}" @click="getgogo(3)"> <view class="box" :class="{active: aindex == 3}" @click="getgogo(3)">
<view class="imgs"> <view class="imgs">
<image src="@/static/icons/tabbar/car.png" v-show="aindex != 3"></image> <image mode="aspectFit" src="@/static/icons/tabbar/car.png" v-show="aindex != 3"></image>
<image src="@/static/icons/tabbar/car-checked.png" v-show="aindex == 3"></image> <image mode="aspectFit" src="@/static/icons/tabbar/car-checked.png" v-show="aindex == 3"></image>
</view> </view>
<view class="">运力</view> <view class="">运力</view>
</view> </view>
@ -40,8 +40,8 @@
<view class="box" :class="{active: aindex == 4}" @click="getgogo(4)"> <view class="box" :class="{active: aindex == 4}" @click="getgogo(4)">
<view class="imgs"> <view class="imgs">
<image src="@/static/icons/tabbar/my.png" v-show="aindex != 4"></image> <image mode="aspectFit" src="@/static/icons/tabbar/my.png" v-show="aindex != 4"></image>
<image src="@/static/icons/tabbar/my-checked.png" v-show="aindex == 4"></image> <image mode="aspectFit" src="@/static/icons/tabbar/my-checked.png" v-show="aindex == 4"></image>
</view> </view>
<view class="">个人中心</view> <view class="">个人中心</view>
</view> </view>

View File

@ -54,7 +54,7 @@
<image :src=" baseUrl + detailsinfo.driverInfo.avatar " mode=""></image> <image :src=" baseUrl + detailsinfo.driverInfo.avatar " mode=""></image>
</view> </view>
<view class="box-bs" v-if="detailsinfo.driverInfo != '' "> <view class="box-bs" v-if="detailsinfo.driverInfo != '' ">
<view class="orderCardStatusData" v-if="detailsinfo.rescueInfo.rescueStatus > 2"> <view class="orderCardStatusData" v-if="detailsinfo.rescueInfo.rescueStatus == 3">
<image src="@/static/icons/homeOrderCard/dhjl.png" class="orderCardDistanceIcon" mode="aspectFit"></image> <image src="@/static/icons/homeOrderCard/dhjl.png" class="orderCardDistanceIcon" mode="aspectFit"></image>
<text class="orderCardDistanceValue">{{detailsinfo.rescueInfo.distance / 1000 || 0}}KM</text> <text class="orderCardDistanceValue">{{detailsinfo.rescueInfo.distance / 1000 || 0}}KM</text>
&nbsp; &nbsp;
@ -75,8 +75,8 @@
</view> </view>
<view class="box-bs-footer"> <view class="box-bs-footer">
<view class="box-bs-footer-btn cancelOrderBtn">取消订单</view> <view v-if="detailsinfo.rescueInfo.rescueStatus <= 2" class="box-bs-footer-btn cancelOrderBtn">取消订单</view>
<view class="box-bs-footer-btn callDriverBtn" @click="gettel(detailsinfo.driverInfo.phonenumber)">联系司机 <view v-if="detailsinfo.rescueInfo.rescueStatus > 2" class="box-bs-footer-btn callDriverBtn" @click="gettel(detailsinfo.driverInfo.phonenumber)">联系司机
</view> </view>
</view> </view>
</view> </view>

View File

@ -236,6 +236,7 @@
const jyJPush = uni.requireNativePlugin('JY-JPush'); const jyJPush = uni.requireNativePlugin('JY-JPush');
// #endif // #endif
import OrderCard from '@/components/orderCard/OrderCard.vue' import OrderCard from '@/components/orderCard/OrderCard.vue'
import {getWXStatusHeight} from '@/utils/utils.js'
// import { getWeather } from'../../utils/Weather' // import { getWeather } from'../../utils/Weather'
export default { export default {
data() { data() {

File diff suppressed because it is too large Load Diff