From 5b03e7332e4e4d837a3d2d6c6c88150538832b68 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 11:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue   | 2 +-
 subpkg/personnel/personnel.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 9551f23..eae9791 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -18,7 +18,7 @@
 									</block>
 									<block
 										v-else-if="datas.extend&&datas.extend.transaction&&datas.extend.transaction.arr">
-										{{(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元/'+(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元'}}
+										{{(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
 									</block>
 									<block v-else>进行中</block>
 								</block>
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index c81537c..caa16ea 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -109,7 +109,7 @@
 				:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
 		</view>
 		<!-- <button class="new_btn" @click.stop="navTo('/subpkg/newPersonnel/newPersonnel')">创建账号</button> -->
-		<mybtn text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
+		<mybtn v-if="$store.state.app.userInfo.company && $store.state.app.userInfo.company.company_type==18" text="创建账号" @click="navTo('/subpkg/newPersonnel/newPersonnel')"></mybtn>
 	</view>
 </template>
 
@@ -213,7 +213,7 @@
 
 		.personnel_list {
 			padding: 28rpx 0;
-			margin-bottom: 130rpx;
+			margin-bottom: 30rpx;
 
 			.card {
 				margin: 0 auto;