From a14471c7135fd6df767fd781fce00be169a0f837 Mon Sep 17 00:00:00 2001 From: rose Date: Fri, 30 Jun 2023 16:28:24 +0800 Subject: [PATCH] =?UTF-8?q?ui=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/evan-steps/evan-step.vue | 57 +-- pages/login.vue | 4 +- static/scss/custom.scss | 11 +- .../touristPortrait/touristPortrait.vue | 32 +- subPackMine/info/edit.vue | 30 +- subPackMine/info/index.vue | 75 ++-- subPackWork/emergencyPlan/emergencyPlan.vue | 2 +- subPackWork/myReport/reportDetail.vue | 337 +++++++++--------- 8 files changed, 289 insertions(+), 259 deletions(-) diff --git a/components/evan-steps/evan-step.vue b/components/evan-steps/evan-step.vue index c0e0012..bc65433 100644 --- a/components/evan-steps/evan-step.vue +++ b/components/evan-steps/evan-step.vue @@ -4,11 +4,11 @@ - + - + {{index+1}} @@ -111,21 +111,21 @@ switch (this.currentStatus) { case 'finish': return { - backgroundColor: '#fff', - borderColor: this.primaryColor, + backgroundColor: 'rgba(255,255,255,.1)', + borderColor: 'rgba(255,255,255,.1)', color: this.primaryColor } case 'process': return { - backgroundColor: this.primaryColor, - borderColor: this.primaryColor, + backgroundColor: 'rgba(255,255,255,.3)', + borderColor: 'rgba(255,255,255,1)', color: '#fff' } case 'wait': return { - backgroundColor: '#ccc', - borderColor: '#ccc', - color: '#fff' + backgroundColor: 'rgba(255,255,255,.1)', + borderColor: 'rgba(255,255,255,.1)', + color: 'rgba(255,255,255,.5)' } case 'error': return { @@ -135,66 +135,66 @@ } default: return { - backgroundColor: '#fff', - borderColor: this.primaryColor, - color: this.primaryColor + backgroundColor: 'rgba(255,255,255,.1)', + borderColor: 'rgba(255,255,255,.1)', + color: '#fff' } } }, titleColor() { switch (this.currentStatus) { case 'finish': - return 'rgba(0,0,0,0.65)' + return 'rgba(255,255,255,0.65)' case 'process': - return 'rgba(0,0,0,0.85)' + return 'rgba(255,255,255,0.85)' case 'wait': - return 'rgba(0,0,0,0.45)' + return 'rgba(255,255,255,0.45)' case 'error': return this.errorColor default: - return 'rgba(0,0,0,0.85)' + return 'rgba(255,255,255,0.85)' } }, descriptionColor() { switch (this.currentStatus) { case 'finish': - return 'rgba(0,0,0,0.45)' + return 'rgba(255,255,255,0.45)' case 'process': - return 'rgba(0,0,0,0.65)' + return 'rgba(255,255,255,0.65)' case 'wait': - return 'rgba(0,0,0,0.45)' + return 'rgba(255,255,255,0.45)' case 'error': return this.errorColor default: - return 'rgba(0,0,0,0.85)' + return 'rgba(255,255,255,0.85)' } }, customIconColor() { switch (this.currentStatus) { case 'finish': - return this.primaryColor + return 'rgba(255,255,255,0.85)' case 'process': - return this.primaryColor + return 'rgba(255,255,255,0.85)' case 'wait': return '#ccc' case 'error': return this.errorColor default: - return this.primaryColor + return 'rgba(255,255,255,0.85)' } }, lineColor() { switch (this.nextStatus) { case 'finish': - return this.primaryColor + return 'rgba(255,255,255,0.3)' case 'process': - return this.primaryColor + return 'rgba(255,255,255,0.3)' case 'wait': - return '#ddd' + return 'rgba(255,255,255,0.3)' case 'error': return this.errorColor default: - return this.primaryColor + return 'rgba(255,255,255,0.3)' } }, contentHeight() { @@ -464,4 +464,7 @@ .evan-step__content__description--horizontal { text-align: center; } + .step-items:first-child { + margin-left: 400rpx; + } diff --git a/pages/login.vue b/pages/login.vue index 2b0fd49..8b3037c 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -21,8 +21,8 @@ - - + + diff --git a/static/scss/custom.scss b/static/scss/custom.scss index d68cc70..a53753b 100644 --- a/static/scss/custom.scss +++ b/static/scss/custom.scss @@ -15,6 +15,9 @@ } .v-m-t10{ margin-top: 20rpx!important; +} + .v-m-t20{ + margin-top: 40rpx!important; } .v-m-p10{ padding-top: 20rpx!important; @@ -119,7 +122,7 @@ top:0;left: 0; width: 100%;background: linear-gradient(to right,rgba(54,127,255, background: #ffffff; box-shadow: 0 6rpx 20rpx 0 rgba(0,0,0,.05);} .v-card{ - + .uni-list--border-top{background-color: #fff!important;} .v-card-item{padding: 10rpx 0;} .v-card-content{overflow: hidden;} @@ -128,9 +131,11 @@ top:0;left: 0; width: 100%;background: linear-gradient(to right,rgba(54,127,255, } .v-card-image{ width: 120rpx; - height: 120rpx; + height: 120rpx;overflow: hidden; border: 1px solid rgba(0,0,0,.05); margin-right: 20px; + image{width: 120rpx; + height: 120rpx;} } .v-card-title{ font-size: 32rpx; @@ -325,8 +330,10 @@ button.v-btn-primary[disabled]{color: rgba(255,255,255,1)!important; opacity: .5 color: #fff; background-color:#367FFF; } + .v-form{ .tree-pick{width: 100%!important;} + .selected-area{display: inline-block!important;color: rgba(0, 0, 0, 0.3)!important; } .selected-list{display: inline-block!important;} .uni-date-x--border{border: none!important;} diff --git a/subPackDeatil/touristPortrait/touristPortrait.vue b/subPackDeatil/touristPortrait/touristPortrait.vue index 2302b70..ed78330 100644 --- a/subPackDeatil/touristPortrait/touristPortrait.vue +++ b/subPackDeatil/touristPortrait/touristPortrait.vue @@ -1,50 +1,50 @@ diff --git a/subPackMine/info/edit.vue b/subPackMine/info/edit.vue index c4d7b26..56f3b85 100644 --- a/subPackMine/info/edit.vue +++ b/subPackMine/info/edit.vue @@ -1,19 +1,21 @@