From 4b74ae71c84d7c3a2fcc83d1ef75f11f8f8c05e0 Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期二, 30 五月 2023 10:28:28 +0800 Subject: [PATCH] 增加新功能,修复bug --- pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 204 +++++++++++++++++++++++++++----------------------- 1 files changed, 110 insertions(+), 94 deletions(-) diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue index bd64aac..837d437 100644 --- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue +++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue @@ -57,7 +57,8 @@ </view> </view> </view> - <view class="origin-info" v-if="yyDailyList.orderType == '澶栬喘' || yyDailyList.orderType == '鍐呰喘' || yyDailyList.orderType == '杞嚭'"> + <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"> @@ -71,7 +72,7 @@ <view class="">{{ yyDailyList.hairTwo || 0 }}</view> </view> </view> - <view class="body-container"> + <view class="body-container last"> <view class="container-block"> <view class="">鍑�閲�</view> <view class="">{{ yyDailyList.cleanTwo || 0 }}</view> @@ -83,106 +84,121 @@ </template> <script> -import combinedTitle from '@/components/combined-title/combined-title.vue'; + import combinedTitle from '@/components/combined-title/combined-title.vue'; -export default { - components: { - combinedTitle - }, - onLoad(params) { - this.id = params.id; - }, - onShow() { - this.GetOrderPlanDetail(); - }, - data() { - return { - id: '', - yyDailyList: {}, - orderPlanDetail: {}, - coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'], - index: '' - }; - }, - methods: { - GetOrderPlanDetail() { - uni.showLoading({ - title: '鍔犺浇涓�...' - }); - this.$reqGet('getTakeCoal', { takeCoalId: this.id }).then(res => { - if (res.code == 0) { - this.orderPlanDetail = res.data; - this.yyDailyList = res.data; - console.log(this.yyDailyList); - uni.hideLoading(); - } else { - this.$u.toast('鍔犺浇澶辫触'); - } - }); + export default { + components: { + combinedTitle + }, + onLoad(params) { + this.id = params.id; + }, + onShow() { + this.GetOrderPlanDetail(); + }, + data() { + return { + id: '', + yyDailyList: {}, + orderPlanDetail: {}, + coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', + '杩涘叆鍦洪櫌' + ], + index: '' + }; + }, + methods: { + GetOrderPlanDetail() { + uni.showLoading({ + title: '鍔犺浇涓�...' + }); + this.$reqGet('getTakeCoal', { takeCoalId: this.id }).then(res => { + if (res.code == 0) { + this.orderPlanDetail = res.data; + this.yyDailyList = res.data; + console.log(this.yyDailyList); + uni.hideLoading(); + } else { + this.$u.toast('鍔犺浇澶辫触'); + } + }); + } } - } -}; + }; </script> -<style scoped lang="scss"> -@mixin flex { - display: flex; - justify-content: space-between; - align-items: center; -} -.main { - width: 100%; - margin-top: vww(10); - color: #303030; - @include flex; - flex-direction: column; - .main-body { - width: 690rpx; - height: 1062rpx; - 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 { - color: #303030; - width: 100%; - height: vww(56); - border-bottom: vww(1) solid #d6d6d6; - @include flex; - justify-content: center; - .container-block { - width: 96%; - height: vww(56); - @include flex; - } - } - .last { - border-bottom: none; - } +<style scoped + lang="scss"> + @mixin flex { + display: flex; + justify-content: space-between; + align-items: center; } - .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; + + .main { + width: 100%; + margin-top: vww(10); + color: #303030; @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%; + + .main-body { + width: 690rpx; + height: 1062rpx; + 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 { + color: #303030; + width: 100%; + height: vww(56); + border-bottom: vww(1) solid #d6d6d6; @include flex; + justify-content: center; + + .container-block { + width: 96%; + height: vww(56); + @include flex; + } + } + + .last { + border-bottom: none; + } + } + + .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; + } + } + + .last { + border-bottom: none; } } } -} -</style> +</style> \ No newline at end of file -- Gitblit v1.9.1