From 491249bdf736a5f7d50417c889ad2db734b12383 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 07 九月 2023 10:22:07 +0800
Subject: [PATCH] 操作指引修改
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 120 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 48 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index a416b90..b66045c 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -10,7 +10,7 @@
</view>
<view class="body-container">
<view class="container-block">
- <view class="">鎻愮叅鍗曠姸鎬�</view>
+ <view class="">閫氱煡鍗曠姸鎬�</view>
<view class="">{{ coalStatus[yyDailyList.statusWeigh]||'' }}</view>
</view>
</view>
@@ -46,7 +46,7 @@
</view>
<view class="body-container">
<view class="container-block">
- <view class="">鎻愮叅鍗曠紪鍙�</view>
+ <view class="">閫氱煡鍗曠紪鍙�</view>
<view class="">{{ yyDailyList.code || '' }}</view>
</view>
</view>
@@ -57,38 +57,19 @@
</view>
</view>
</view>
- <view class="origin-info"
- v-if="yyDailyList.orderType == '澶栬喘' || yyDailyList.orderType == '鍐呰喘' || yyDailyList.orderType == '杞叆'">
- <combined-title title="鍘熷彂淇℃伅"></combined-title>
- <view class="body-container">
- <view class="container-block">
- <view class="">鐨噸</view>
- <view class="">{{ yyDailyList.skinTwo || 0 }}</view>
- </view>
- </view>
- <view class="body-container">
- <view class="container-block">
- <view class="">姣涢噸</view>
- <view class="">{{ yyDailyList.hairTwo || 0 }}</view>
- </view>
- </view>
- <view class="body-container last">
- <view class="container-block">
- <view class="">鍑�閲�</view>
- <view class="">{{ yyDailyList.cleanTwo || 0 }}</view>
- </view>
- </view>
- </view>
+ <weigh-item :list="showWeigh"></weigh-item>
</view>
</view>
</template>
<script>
import combinedTitle from '@/components/combined-title/combined-title.vue';
-
+ import weighItem from '@/components/weighItem.vue'
+ import { onlineurl } from '@/api/request.js'
export default {
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
onLoad(params) {
this.id = params.id;
@@ -101,9 +82,16 @@
id: '',
yyDailyList: {},
orderPlanDetail: {},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
- index: ''
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
+ index: '',
+ onlineurl,
};
+ },
+ computed: {
+ // 灞曠ず鐨瘺鍑�
+ showWeigh() {
+ return this.orderPlanDetail.tmTaskCoalItems ? this.orderPlanDetail.tmTaskCoalItems : []
+ }
},
methods: {
GetOrderPlanDetail() {
@@ -114,7 +102,6 @@
if (res.code == 0) {
this.orderPlanDetail = res.data;
this.yyDailyList = res.data;
- console.log(this.yyDailyList);
uni.hideLoading();
} else {
this.$u.toast('鍔犺浇澶辫触');
@@ -169,33 +156,70 @@
}
}
- .origin-info {
+ .weigh-history {
width: 690rpx;
- min-height: 300rpx;
+ height: 100%;
+ min-height: 420rpx;
+ margin: vww(40) auto;
margin-top: 20rpx;
- margin-bottom: 20rpx;
background: #ffffff;
- box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
border-radius: 20rpx;
- @include flex;
- flex-direction: column;
- align-items: flex-start;
+ position: relative;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #303030;
+ overflow: hidden;
- .body-container {
- width: 100%;
- height: vww(56);
- border-bottom: vww(1) solid #d6d6d6;
- @include flex;
- justify-content: center;
- .container-block {
- width: 94%;
+ .block-main {
+ display: grid;
+ grid-template-columns: auto;
+ grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
+ gap: auto 5rpx;
+ width: 94%;
+ height: 100%;
+ min-height: 380rpx;
+ margin: vww(18) vww(7) vww(11) vww(17);
+ gap: 10rpx 20rpx;
+
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
@include flex;
- }
- }
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
- .last {
- border-bottom: none;
+ .item-block {
+ width: 100%;
+ height: vww(36);
+ @include flex;
+ justify-content: space-around;
+
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
+ }
+ }
}
}
}
--
Gitblit v1.9.1