Commit 3d14258b authored by Facius's avatar Facius

页面UI微调

parent 6afaa34e
......@@ -203,8 +203,7 @@
<style lang="scss" scoped>
.con-box {
margin-top: 30rpx;
padding: 30rpx 30rpx 20rpx;
padding: 30rpx 30rpx 10rpx 30rpx;
border-radius: 12rpx;
background-color: #FFFFFF;
......
......@@ -39,7 +39,7 @@
<view>
<view v-if="showCountTime" class="bottom-left-view">
<view :class="['bottom-tag-view', {'timeout': timeout}]"><text>{{tagText}}</text></view>
<u-count-down :timestamp="timestamp" font-size="40" show-days separator="zh" hide-zero-day
<u-count-down :timestamp="timestamp" font-size="40" show-days separator="zh"
:color="timeout ? '#FA5A49' : '#FF930D'" @change="handleChange" separator-color="#666666" ref="order-count-down"></u-count-down>
</view>
<view v-else-if="showTime">
......
<template>
<view class="order-wrap">
<u-navbar :title="title" title-color="#FFFFFF" title-size="32" back-icon-color="#FFFFFF" :background="background" :border-bottom="false" title-bold></u-navbar>
<view class="header" v-if="showCountTime || (order.currentOverTime && showTimeOut)">
<image class="bottom-tag-view" :src="tagImage"></image>
<!-- 倒计时 -->
<view class="title">
<u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40" hide-zero-day
:color="countColor" separator-color="#FFFFFF" @change="timeOutChange" ref="order-count-down" bg-color="#FFFFFF"></u-count-down>
<view class="header-content">
<!-- 抓紧时间提示 -->
<view class="tip-text">{{tipText}}</view>
<!-- 拒单 -->
<view v-show="allowRejection" class="reject-button" @click="$u.throttle(rejectOrder, 500)">拒单</view>
<view class="content">
<view class="header" v-if="showCountTime || (order.currentOverTime && showTimeOut)">
<image class="bottom-tag-view" :src="tagImage"></image>
<!-- 倒计时 -->
<view class="title">
<u-count-down :timestamp="timestamp" font-size="28" show-days separator="zh" separator-size="32" height="40"
:color="countColor" separator-color="#FFFFFF" @change="timeOutChange" ref="order-count-down" bg-color="#FFFFFF"></u-count-down>
<view class="header-content">
<!-- 抓紧时间提示 -->
<view class="tip-text">{{tipText}}</view>
<!-- 拒单 -->
<view v-show="allowRejection" class="reject-button" @click="$u.throttle(rejectOrder, 500)">拒单</view>
</view>
</view>
</view>
</view>
<view class="content">
<!-- 订单详情 -->
<view class="card base-item">
<Detail :order="order" :readMore.sync="readMore" :operate="isAllowDianhuaAndDaohang"></Detail>
......@@ -871,7 +871,7 @@
flex-direction: column;
.header {
padding: 4rpx 32rpx 20rpx 32rpx;
padding: 4rpx 2rpx 24rpx 2rpx;
display: flex;
align-items: center;
.bottom-tag-view {
......@@ -912,7 +912,7 @@
height: 100%;
border-radius: 12rpx;
overflow: auto;
margin: 6rpx 30rpx 30rpx 30rpx;
margin: 0rpx 30rpx 30rpx 30rpx;
.card {
background-color: #FFFFFF;
......
......@@ -72,7 +72,7 @@
}
let res = await this.$u.api.fileLabel(param)
if (res && res.code == 200) {
this.labels = res.data || []
this.labels = res.data || []
}
},
......@@ -93,10 +93,11 @@
align-items: center;
overflow: auto;
flex-wrap: wrap;
padding: 0 10rpx 44rpx 30rpx;
padding: 0 10rpx 14rpx 30rpx;
.label-item {
padding-right: 20rpx;
padding-right: 20rpx;
padding-bottom: 30rpx;
flex-shrink: 0;
.label-normal {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment