From 4300b5c714bb7e09f53f7d722c953dec9c809d8e Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 04 Jan 2021 17:08:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/selectService/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hive-app/pages/workbench/selectService/index.vue b/hive-app/pages/workbench/selectService/index.vue
index a17d266..7fd66a9 100644
--- a/hive-app/pages/workbench/selectService/index.vue
+++ b/hive-app/pages/workbench/selectService/index.vue
@@ -64,7 +64,7 @@
</view>
<view class="flex justify-between font-12 mt-10">
<text>有效期至: {{item.invalidTime}}<text class="red" v-if="item.isInvalid==1">（{{item.isInvalid | formatIsInvalid}}）</text></text>
- <text>剩余总次数：{{item.count}}</text>
+ <text v-if="item.isCourse === 'Y'">剩余总次数：{{item.count}}</text>
</view>
</view>
<no-record :isShow="!comboList.length" size="mini" txt="暂无套餐" class="no-record"></no-record>
@@ -254,7 +254,7 @@
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
box-shadow:0 6px 6px rgba(237,234,244,0.5);
- padding-bottom: 5px;
+ padding:10px 0 1px;
}
.content{
padding: 10px 10px 65px;
@@ -328,6 +328,6 @@
font-size: 14px;
}
.no-record{
- margin: 20px 0;
+ margin: 20px 0!important;
}
</style>
--
Gitblit v1.9.1