From 29658de29b2eb5292bf0c2fad7427b374b769ebc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 10 五月 2023 20:29:31 +0800
Subject: [PATCH] 样式修改,引入字体，修改逻辑
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 469 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 324 insertions(+), 145 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index b34a2f0..f4d80ff 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -1,72 +1,102 @@
<template>
<view class="freightForwarder-index">
<view class="freightForwarder-index-body">
- <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
- <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick(item)" backgroundType="1">
- <template v-slot:left>
- <view class="card-left__top">
- <text>{{ item.carNum }}</text>
- 寮�
- </view>
- <view class="card-left__utils"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button></view>
- </template>
- <template v-slot:right-top>
- <view class="right-top">
- <view class="card-right-top-row">
- <view>
- <text>杞彂鍓╀綑锛歿{ item.carNumSurplusHuodai || 0 }}</text>
+ <view class="wait-collection" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain"></view>
+ <view style="position: relative;top: -120px;">
+ <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
+ </view>
+ <view class="collection-form">
+ <view class="collection-form-item" v-for="(item, index) in orderPlanData" :key="index" @click="cardBodyClick(item)">
+ <view class="first-line">
+ <view class="dispatch-receive">
+ <view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container">
+ <view class="dispatch">{{ item.deptName }}</view>
+ <view class="receive-icon"></view>
+ <view class="receive">{{ item.customerName }}</view>
</view>
- <view>
- <text>{{ item.coalName || '' }}</text>
+ <view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
+ <view class="dispatch">{{ item.customerName }}</view>
+ <view class="receive-icon"></view>
+ <view class="receive">{{ item.deptName }}</view>
</view>
</view>
- </view>
- </template>
- <template v-slot:right-bottom>
- <view class="code">
- <text>缂栧彿锛歿{ item.orderCode || '' }}</text>
- </view>
- </template>
- </card>
- </view>
- <view class="history-numbers">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
- <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
- <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
- <view class="history-sendate">
- <text>鍙戣繍鏃ユ湡 {{ item.sendDate || '' }}</text>
- <view class="view-more">
- <text style="color: #449cfc;">璇︽儏</text>
- <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view>
+ <view class="point-number">
+ <text class="residue">{{ item.carNumSurplusHuodai || 0 }}</text>
+ <text>/{{ item.carNum }}</text>
</view>
</view>
- <view class="history-main">
- <view class="main-left">
- <view class="history-body">
- <text>鎵�灞炲崟浣� {{ item.deptName || '' }}</text>
- </view>
- <view class="history-body">
- <text>鐓ゅ満鍚嶇О {{ item.filedName || '' }}</text>
- </view>
- <view class="history-body">
- <text>鐓ょ鍚嶇О {{ item.coalName || '' }}</text>
- </view>
+ <view class="second-line">
+ <view class="coal-name">
+ <view class="">{{ item.coalName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
</view>
- <view class="main-right">
- <view class="history-body">
- <text style="word-break: break-all;">璁㈠崟缂栧彿 {{ item.orderCode || '' }}</text>
- </view>
- <view class="history-body">
- <text>璁㈠崟鍓╀綑閲� {{ item.carNumSurplus || '' }}</text>
- </view>
- <view class="history-body">
- <text>鎻愮叅鍗曚釜鏁� {{ item.tmCount || '' }}</text>
- </view>
+ </view>
+ <view class="third-line">
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
</view>
+ <view class="send-date">{{ item.sendDate }}</view>
+ </view>
+ <view class="fourth-line">
+ <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">杞彂</view></view>
</view>
</view>
- <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
- </scroll-view>
+ </view>
+ <!-- <view class="transparent">
+ <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
+ </view> -->
+ <view class="history-numbers">
+ <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
+ <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="historyCoalData.length === 0"></u-empty>
+ <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
+ <view class="first">
+ <view class="">{{ item.deptName || '' }}</view>
+ <view class=""><u-icon name="arrow-right" color="#999999" size="40"></u-icon></view>
+ </view>
+ <view class="second">
+ <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="order-type" v-if="item.orderType">{{ item.orderType || '' }}</view>
+ </view>
+ <view class="third">
+ <view class="third-line">
+ <view class="third-line_text">棰嗗彇鏁帮細</view>
+ <view class="third-line_num">{{ item.cars2 }}</view>
+ </view>
+ <view class="third-line">
+ <view class="third-line_text">鍓╀綑鏁帮細</view>
+ <view class="third-line_num" v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
+ <view class="third-line_num" v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
+ </view>
+ <view class="third-line">
+ <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細锛�</view>
+ <view class="third-line_num">{{ item.tmCount }}</view>
+ </view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
+ <view class="senddate">{{ item.sendDate }}</view>
+ </view>
+ <view class="fourth">
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
+ <view class="senddate">{{ item.orderCode }}</view>
+ </view>
+ </view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ <view class="white-block"></view>
+ </scroll-view>
+ </view>
</view>
</view>
</template>
@@ -131,16 +161,18 @@
methods: {
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
- this.loading = true;
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
- this.loading = false;
+ uni.hideLoading();
} else {
this.historyCoalData = res.data.records;
- this.loading = false;
+ uni.hideLoading();
}
}
});
@@ -198,105 +230,252 @@
</script>
<style lang="scss" scoped>
+@mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
.scroll-Y {
height: 900rpx;
- background-color: #e2e2e2;
- border-radius: vww(10);
- .history-information {
- width: 94%;
- display: flex;
- flex-direction: column;
- border: 1px solid #e2e2e2;
- background-color: #fff;
- border-radius: vww(10);
- margin: vww(10);
- .history-sendate {
- height: vww(40);
- border-bottom: 1px solid #e2e2e2;
- line-height: vww(40);
- padding-left: vww(8);
- position: relative;
- .view-more {
- display: flex;
- width: vww(80);
- position: absolute;
- right: vww(10);
- top: vww(-1);
- .arrow-right {
- position: absolute;
- right: vww(27);
- top: vww(12);
- }
- }
- }
- .history-main {
- min-height: vww(120);
- display: flex;
- justify-content: space-between;
- .main-left,
- .main-right {
- width: 45%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- padding: vww(4) vww(4);
- }
- }
- }
.more_text {
color: #333;
font-size: 24rpx;
text-align: center;
}
}
-::v-deep.freightForwarder-index {
- width: 94%;
- margin: 0 auto;
- // 涓讳綋
- .freightForwarder-index-body {
- margin-bottom: vww(10);
-
- // 鍗＄墖鏍峰紡
- .card-left__top {
- margin-top: vww(26);
- text-align: center;
- color: #ffffff;
- text {
- font-size: vww(48);
- font-weight: 800;
- }
+.history-numbers {
+ width: 100%;
+ position: relative;
+ top: vww(-110);
+ .history-information {
+ width: 690rpx;
+ height: 398rpx;
+ margin: vww(10) vww(15);
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex flex-direction: column;
+ align-items: flex-start;
+ justify-content: space-evenly;
+ overflow: hidden;
+ .first {
+ width: 96%;
+ height: 34rpx;
+ font-size: 32rpx;
+ font-weight: 300;
+ color: #303030;
+ @include flex;
+ margin: vww(10) vww(10) 0;
}
- .card-left__utils {
- display: flex;
- padding: 0 vww(15) 0 vww(15);
- .u-button {
- width: vww(55);
- height: vww(24);
- background-color: #fff;
- color: #1987ff;
+ .second {
+ width: 100%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ justify-content: flex-start;
+ .coal-name {
+ min-width: vww(30);
+ height: vww(20);
+ margin-right: vww(21);
}
- }
- .right-top {
- display: flex;
- flex-flow: column nowrap;
- align-content: space-around;
- .card-right-top-row {
- margin-top: vww(26);
+ .order-type {
+ color: #035cfb;
+ border: 2px solid #035cfb;
+ border-radius: 4rpx;
+ padding: vww(2) vww(4);
text-align: center;
- &:nth-child(1) {
- display: flex;
- justify-content: space-between;
- view {
- text-align: center;
- width: 50%;
- }
+ }
+ }
+ .third {
+ width: 96%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ .third-line {
+ @include flex;
+ &_text {
+ color: #919090;
+ }
+ &_num {
+ color: #035cfb;
}
}
}
-
- .code {
- margin-top: vww(2);
- text-align: center;
+ .fourth {
+ width: 50%;
+ height: 31rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ margin: vww(10) vww(10) 0;
+ @include flex;
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+ .senddate {
+ flex: 1;
+ }
+ }
+ }
+}
+::v-deep.freightForwarder-index {
+ width: 100%;
+ margin: 0 auto;
+ // 涓讳綋
+ .freightForwarder-index-body {
+ .wait-collection {
+ width: 100%;
+ height: 600rpx;
+ position: relative;
+ top: vww(-10);
+ z-index: 0;
+ }
+ .collection-form {
+ width: vww(345);
+ margin: 0 vww(15);
+ position: relative;
+ top: vww(-144);
+ .collection-form-item {
+ width: 690rpx;
+ height: 300rpx;
+ background: #ffffff;
+ box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
+ border-radius: 20rpx;
+ overflow: hidden;
+ @include flex flex-direction: column;
+ position: relative;
+ align-items: flex-start;
+ margin-top: vww(10);
+ .first-line {
+ width: 94%;
+ height: vww(30);
+ margin: vww(10) vww(16) 0 vww(16);
+ display: flex;
+ justify-content: space-between;
+ .dispatch-receive {
+ width: 70%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .container {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .receive-icon {
+ width: 62rpx;
+ height: 14rpx;
+ border-bottom: 3px solid #275fa5;
+ position: relative;
+ &:after {
+ content: '';
+ position: absolute;
+ width: 3px;
+ height: 10px;
+ background-color: #275fa5;
+ right: 0;
+ transform: rotate(-45deg);
+ }
+ }
+ }
+ .point-number {
+ width: 15%;
+ text {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #c78a64;
+ }
+ .residue {
+ font-size: 40rpx;
+ font-weight: 400;
+ color: #f81414;
+ }
+ }
+ }
+ .second-line {
+ width: 100%;
+ height: vww(30);
+ margin-left: vww(12);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .coal-name {
+ flex-grow: 1;
+ height: 30rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ position: relative;
+ display: flex;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+ }
+ .third-line {
+ width: 40%;
+ height: vww(30);
+ margin-left: vww(15);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .send-date {
+ width: 148rpx;
+ height: 24rpx;
+ margin-left: vww(14);
+ line-height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #515151;
+ }
+ }
+ .fourth-line {
+ width: 40%;
+ height: vww(30);
+ @include flex;
+ position: relative;
+ left: 60%;
+ bottom: vww(10);
+ .forward {
+ width: vww(123);
+ height: vww(48);
+ left: vww(140);
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/button.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #fff;
+ text-align: center;
+ line-height: vww(45);
+ }
+ }
+ }
+ }
}
}
}
--
Gitblit v1.9.1