diff --git a/aircraft/server/equipment/equipmentDetail.vue b/aircraft/server/equipment/equipmentDetail.vue index 31ff83d..2a959ec 100644 --- a/aircraft/server/equipment/equipmentDetail.vue +++ b/aircraft/server/equipment/equipmentDetail.vue @@ -452,6 +452,8 @@ export default { border-radius: 16rpx; display: flex; flex-direction: column; + box-shadow: 0rpx -6rpx 10rpx 0rpx rgba(226, 226, 226, 0.3), + 0rpx 6rpx 8rpx 0rpx rgba(218, 218, 218, 0.3); // gap: 16rpx; // box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05); @@ -475,9 +477,8 @@ export default { .maintenance-records { background-color: #ffffff; border-radius: 16rpx; - padding: 30rpx 20rpx calc(126rpx + env(safe-area-inset-bottom)); - margin: 24rpx; - margin-top: 0; + padding: 30rpx 20rpx 30rpx; + margin: 0rpx 24rpx 200rpx; .section-title { font-size: 36rpx; diff --git a/aircraft/server/my/child_pages/login.vue b/aircraft/server/my/child_pages/login.vue index 320478b..121b82f 100644 --- a/aircraft/server/my/child_pages/login.vue +++ b/aircraft/server/my/child_pages/login.vue @@ -196,6 +196,13 @@ export default { font-family: Roboto; font-size: 26rpx; text-align: center; + background: linear-gradient(90deg, #6B7280, #9CA3AF, #D1D5DB, #9CA3AF, #6B7280); + background-size: 200% auto; + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + animation: shine 3s linear infinite; + font-weight: 600; } &::v-deep .u-checkbox__icon-wrap{ margin-right: 14rpx; @@ -209,4 +216,9 @@ export default { } } } +@keyframes shine { + to { + background-position: -200% center; + } + } \ No newline at end of file diff --git a/aircraft/server/order/detail.vue b/aircraft/server/order/detail.vue index e9cab54..03021cf 100644 --- a/aircraft/server/order/detail.vue +++ b/aircraft/server/order/detail.vue @@ -21,7 +21,7 @@ 订单类型 - {{ orderDetail.orderType.slice(0, 2) }} + {{ getOrderType }} 景区 @@ -37,7 +37,7 @@ 附加费 - {{ orderDetail.surchargeAmount?orderDetail.surchargeAmount.toFixed(2):'-' }} + {{ getSurAmount }} @@ -256,6 +256,13 @@ export default { return !this.orderDetail.orderTaskDetailList||!this.orderDetail.orderTaskDetailList.some( item=>item.operatorId&&item.operatorId===this.userMessage.id&& (item.orderItemStatus === '未进行'|| item.orderItemStatus === '进行中')); + }, + getSurAmount(){ + const surAmount = this.orderDetail.surchargeAmount; + return (surAmount||surAmount===0)?surAmount.toFixed(2):'-'; + }, + getOrderType(){ + return this.orderDetail.orderType?this.orderDetail.orderType.slice(0, 2):'--'; } }, data(){