From def1555c03170364976746edee6d1e07965f428a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 26 Aug 2023 17:05:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dios=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=E9=94=AE=E7=9B=98=E9=97=AA?=
 =?UTF-8?q?=E7=83=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/company/company.vue       | 12 ++++++++----
 pages/oaLogin/oaLogin.vue            | 14 ++++++++++----
 subpkg/withdrawList/withdrawList.vue |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/components/company/company.vue b/components/company/company.vue
index ecdb9a5..308da64 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="item">
-			<u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%"
+			<u-skeleton :loading="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="1" rows-width="100%"
 				rowsHeight="56"></u-skeleton>
 			<!-- <block v-if="!skeleton">
 				<view class="title">公司基本信息</view>
@@ -101,7 +101,7 @@
 		<!-- 合同 -->
 		<view class="item" v-show="skeleton||contract.status">
 
-			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
+			<u-skeleton :loading="skeleton" :class="{'loading': skeleton}" :animate="true" title rows="2" rows-width="100%"
 				rowsHeight="56"></u-skeleton>
 
 			<!-- 
@@ -246,7 +246,7 @@
 		</view>
  -->
 		<view class="item">
-			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
+			<u-skeleton :loading="skeleton"  :class="{'loading': skeleton}" :animate="true" title rows="2" rows-width="100%"
 				rowsHeight="56"></u-skeleton>
 
 			<!-- 
@@ -614,7 +614,11 @@
 			}
 		}
 	}
-
+  
+  .loading{
+    padding: 28rpx;
+  }
+  
 	.item {
 		padding-top: 0;
 
diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index ed7fb2e..1f2cb6c 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -13,18 +13,20 @@
 						<u-tabs :list="tabList" @click="changeTabs" lineColor="#0122c7"
 							itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"></u-tabs>
 					</view>
-					<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.account" type="tel"
+					<input @click="getId" class="mobile item" v-model="formData.account" type="tel"
 						placeholder="输入账号" />
-					<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.password"
+          <input style="width: 0;height: 0;opacity: 0;margin: 0;padding: 0;" v-model="formData.account" type="tel"
+            	placeholder="输入账号" />
+					<input @click="getId" class="mobile item" v-model="formData.password"
 						maxlength="26" placeholder="输入密码" password type="safe-password" />
-					<input v-if="current == 1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
+					<!-- <input v-if="current == 1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
 					<view v-if="current == 1" class="code item">
 						<input placeholder="输入验证码" v-model="formData.code" maxlength="6" />
 						<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
 						<view class="get-code" @click="getCode">{{ tips }}</view>
 					</view>
 					<view class="btn">
-					</view>
+					</view> -->
 				</view>
 				<button class="submit_btn" @click="login">登录</button>
 			</view>
@@ -233,6 +235,10 @@
 				line-height: 68rpx;
 				-webkit-background-clip: text;
 			}
+      
+      ::v-deep uni-input{
+        min-height: 0 !important;
+      }
 
 			.login-card {
 				width: 694rpx;
diff --git a/subpkg/withdrawList/withdrawList.vue b/subpkg/withdrawList/withdrawList.vue
index 886731b..46de810 100644
--- a/subpkg/withdrawList/withdrawList.vue
+++ b/subpkg/withdrawList/withdrawList.vue
@@ -108,7 +108,7 @@ export default {
         .tips{
           width: 137rpx;
           height: 49rpx;
-          background: #3274F9;
+          background: #0122c7;
           border-radius: 26rpx 26rpx 26rpx 26rpx;
           font-size: 25rpx;
           font-weight: 400;