From a12ac4f4388672c62c6fb59c5ef975e5dff5fc06 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 11:08:45 +0800
Subject: [PATCH] 修改部分问题
---
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index b4388cb..bd64aac 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -23,25 +23,25 @@
<view class="body-container">
<view class="container-block">
<view class="">鐨噸</view>
- <view class="">{{ yyDailyList.skin || '' }}</view>
+ <view class="">{{ yyDailyList.skin || 0 }}</view>
</view>
</view>
<view class="body-container">
<view class="container-block">
<view class="">姣涢噸</view>
- <view class="">{{ yyDailyList.hair || '' }}</view>
+ <view class="">{{ yyDailyList.hair || 0 }}</view>
</view>
</view>
<view class="body-container">
<view class="container-block">
<view class="">鍑�閲�</view>
- <view class="">{{ yyDailyList.clean || '' }}</view>
+ <view class="">{{ yyDailyList.clean || 0 }}</view>
</view>
</view>
<view class="body-container">
<view class="container-block">
<view class="">璁㈠崟鍓╀綑閲�</view>
- <view class="">{{ yyDailyList.allowance || '' }}</view>
+ <view class="">{{ yyDailyList.allowance || 0 }}</view>
</view>
</view>
<view class="body-container">
@@ -57,6 +57,27 @@
</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">
+ <view class="container-block">
+ <view class="">鍑�閲�</view>
+ <view class="">{{ yyDailyList.cleanTwo || 0 }}</view>
+ </view>
+ </view>
+ </view>
</view>
</view>
</template>
@@ -69,15 +90,14 @@
combinedTitle
},
onLoad(params) {
- this.orderPlanId = params.orderPlanId;
- this.index = params.index;
+ this.id = params.id;
},
onShow() {
this.GetOrderPlanDetail();
},
data() {
return {
- orderPlanId: '',
+ id: '',
yyDailyList: {},
orderPlanDetail: {},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'],
@@ -89,10 +109,10 @@
uni.showLoading({
title: '鍔犺浇涓�...'
});
- this.$reqGet('xiangqingList', { orderPlanId: this.orderPlanId }).then(res => {
+ this.$reqGet('getTakeCoal', { takeCoalId: this.id }).then(res => {
if (res.code == 0) {
this.orderPlanDetail = res.data;
- this.yyDailyList = res.data.yyDailyList.filter((v, i) => i == this.index)[0];
+ this.yyDailyList = res.data;
console.log(this.yyDailyList);
uni.hideLoading();
} else {
@@ -113,7 +133,9 @@
.main {
width: 100%;
margin-top: vww(10);
- @include flex justify-content: center;
+ color: #303030;
+ @include flex;
+ flex-direction: column;
.main-body {
width: 690rpx;
height: 1062rpx;
@@ -123,6 +145,7 @@
@include flex flex-direction: column;
align-items: flex-start;
.body-container {
+ color: #303030;
width: 100%;
height: vww(56);
border-bottom: vww(1) solid #d6d6d6;
@@ -138,27 +161,27 @@
border-bottom: none;
}
}
-}
-.uni-table {
- .uni-table-tr {
- padding: 0;
- border: vww(1) solid #c6c6c6;
- .uni-table-th {
- font-size: vww(14);
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- font-weight: 500;
- background: #e2e2e2;
- }
- .uni-table-td {
- font-size: vww(14);
- font-weight: 400;
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
+ .origin-info {
+ width: 690rpx;
+ min-height: 300rpx;
+ 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);
+ border-radius: 20rpx;
+ @include flex;
+ flex-direction: column;
+ align-items: flex-start;
+ .body-container {
+ width: 100%;
+ height: vww(56);
+ border-bottom: vww(1) solid #d6d6d6;
+ @include flex;
+ justify-content: center;
+ .container-block {
+ width: 94%;
+ @include flex;
+ }
}
}
}
--
Gitblit v1.9.1