From 29bc231cdc87cbedc455cbf8ab17299a29770b36 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 18 Aug 2025 10:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/panel/formItem.vue | 63 ++++++++++++++++++++++---------------------
 pages/person/index.vue        | 21 +++++++++------
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/components/panel/formItem.vue b/components/panel/formItem.vue
index ae04cd2..129a7ad 100644
--- a/components/panel/formItem.vue
+++ b/components/panel/formItem.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="g-components-item">
-		<view class="m-set g_bg_f g_radius_8">
+		<view class="m-set g_bg_f g_radius_8 u-skeleton ">
 			<view
 				class="item g_flex_row_start"
 				v-for="(item, index) in list"
@@ -14,41 +14,42 @@
 					'padding-right': (item.pRow ? item.pRow : 10) + 'px',
 				}"
 			>
-				<view class=" g_pl_10 g_pr_10 g_flex_column_center">
-					<view class="g_flex_1 g_flex_row_start flex_center" :class="item.require ? 'labelRequire' : ''">
-						<view class="t-icon g_h_22 g_w_22 g_pl_7 g_mr_5" 
-							 style="width: 22px; height: 22px;background-repeat:no-repeat" 
-							 :style="{
-								 'width':item.icon == 'icon-wodetuandui' ? '24px' : '22px',
-								 'height':item.icon == 'icon-wodetuandui' ? '24px' : '22px',
-							 }"
-							 v-if="item.icon && item.itype != 'icon'" 
-							 :class="'t-' + item.icon"
+				<view class="g_pl_10 g_pr_10 g_flex_column_center ">
+					<view class="g_flex_1 g_flex_row_start flex_center u-skeleton-fillet" :class="item.require ? 'labelRequire' : ''">
+						<view
+							class="t-icon g_h_22 g_w_22 g_pl_7 g_mr_5"
+							style="width: 22px; height: 22px; background-repeat: no-repeat"
+							:style="{
+								width: item.icon == 'icon-wodetuandui' ? '24px' : '22px',
+								height: item.icon == 'icon-wodetuandui' ? '24px' : '22px',
+							}"
+							v-if="item.icon && item.itype != 'icon'"
+							:class="'t-' + item.icon"
 						></view>
-						<view class="g_flex_c g_h_22 g_w_22 g_mr_5" 
-							 v-if="item.icon && item.itype == 'icon'" 
-						>
-							<i class="iconfont" :class="item.icon" 
+						<view class="g_flex_c g_h_22 g_w_22 g_mr_5" v-if="item.icon && item.itype == 'icon'">
+							<i
+								class="iconfont"
+								:class="item.icon"
 								:style="{
-									'font-size':'24px',
+									'font-size': '24px',
 								}"
 							></i>
 						</view>
-						<view class="g_flex_column_center g_c_3 g_fs_16">{{ item.label }}</view>
+						<view class="g_flex_column_center g_c_3 g_fs_16 ">{{ item.label }}</view>
 					</view>
 				</view>
-				<view class="g_flex_1 g_flex_column_center">
+				<view class="g_flex_1 g_flex_column_center u-skeleton-fillet">
 					<view class="g_flex_row_end">
 						<view class="g_flex_row_end flex_center">
 							<!-- 通用类型 -->
-							<view class="g_fs_16 g_ell_1 g_lh_1_2 g_c_8" style="max-width:45vw" :class="item.fontColor" v-if="item.result">{{ item.result }}</view>
+							<view class="g_fs_16 g_ell_1 g_lh_1_2 g_c_8" style="max-width: 45vw" :class="item.fontColor" v-if="item.result">{{ item.result }}</view>
 							<!-- 迷你二维码 -->
 							<view class="g_flex_rowRight_columnCenter" v-if="item.tip == 'code'">
 								<i class="iconfont icon-a-erweimabeifen2 g_fs_21 g_c_c" style="font-size: 21px"></i>
 							</view>
 							<!-- 头像类 -->
 							<view class="g_flex_rowRight_columnCenter" v-if="item.tip == 'avatar'">
-								<img :src="item.value" alt="" class="g_w_48 g_h_48" style="border-radius: 13px;" />
+								<img :src="item.value" alt="" class="g_w_48 g_h_48" style="border-radius: 13px" />
 							</view>
 							<!-- 右箭头 -->
 							<view class="g_flex_column_center flex_center" v-if="item.type != 'slot'">
@@ -60,6 +61,7 @@
 			</view>
 		</view>
 	</view>
+	<u-skeleton :loading="loading" :animation="true" bgColor="#fff"></u-skeleton>
 </template>
 
 <script>
@@ -79,6 +81,10 @@ export default {
 				return [];
 			},
 		},
+		loading: {
+			type: Boolean,
+			default: false,
+		}
 	},
 	created() {
 		this.localBaseImg = this.G.store().localBaseImg;
@@ -91,7 +97,6 @@ export default {
 				index: $index,
 			});
 		},
-
 	},
 };
 </script>
@@ -103,24 +108,22 @@ export default {
 		margin: 0 auto;
 
 		.item {
-			position:relative;
+			position: relative;
 			// border-bottom: 1rpx solid #eee;
-			&:after{
-				content:'';
+			&:after {
+				content: "";
 				position: absolute;
-				bottom:0;
-				left:16px;
+				bottom: 0;
+				left: 16px;
 				border-bottom: 1rpx solid #eee;
 				height: 1rpx solid #eee;
 				width: calc(100vw - 52px);
-				
 			}
-			
 
 			&:last-child {
 				border-bottom: none;
-				&:after{
-					content:none;
+				&:after {
+					content: none;
 				}
 			}
 		}
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 2c9b49e..628b1b6 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -1,21 +1,21 @@
 <template>
 	<view class="p-person-inedx g_w_all g_bg_f_5 g_kuaishou">
 		<view :class="isLogin ? 'g_h_36' : 'g_h_10'"></view>
-		<view class="m-info g_p_16 g_bg_f g_m_10 g_radius_8 g_position_rela" v-if="isLogin" hover-class="none" style="margin-top: 0">
+		<view class="m-info g_p_16 g_bg_f g_m_10 g_radius_8 g_position_rela u-skeleton" v-if="isLogin" hover-class="none" style="margin-top: 0">
 			<view class="g_flex_row_start">
 				<view class="g_w_71">
-					<view class="g_position_abso g_p_4 g_radius_13 g_bg_f" style="top: -20px">
+					<view class="g_position_abso g_p_4 g_radius_13 g_bg_f u-skeleton-fillet" style="top: -20px">
 						<g-panel-image :radius="13" :size="134" :url="userInfo.avatar" />
 					</view>
 				</view>
 				<view class="g_flex_1 g_ml_11">
 					<view class="g_flex_row_between flex_center">
 						<view class="g_flex_row_start flex_center" style="line-height: 22px">
-							<view class="g_flex_none g_ell_1 g_fs_20 g_fw_bold g_c_3" style="max-width: 240rpx">
+							<view class="g_flex_none g_ell_1 g_fs_20 g_fw_bold g_c_3 u-skeleton-fillet" style="max-width: 240rpx">
 								{{ userInfo.name ? userInfo.name : "-" }}
 							</view>
 						</view>
-						<view class="g_flex_row_start flex_center g_fs_14 g_border_d g_radius_4 g_c_8 g_p_4" hover-class="thover" @click="goPage('/root/person/info?active=0')">
+						<view class="g_flex_row_start flex_center g_fs_14 g_border_d g_radius_4 g_c_8 g_p_4 u-skeleton-fillet" hover-class="thover" @click="goPage('/root/person/info?active=0')">
 							<i class="iconfont icon-edit g_fs_12 g_mr_4"></i>
 							编辑资料
 						</view>
@@ -32,12 +32,12 @@
 				</view>
 			</view>
 		</view>
-		<view v-else @click="goPage" class="g_text_c g_pt_24 g_pb_24 g_c_f g_radius_8 g_bg_main g_ml_10 g_mr_10">
+		<view v-else @click="goPage" class="g_text_c g_pt_24 g_pb_24 g_c_f g_radius_8 g_bg_main g_ml_10 g_mr_10 u-skeleton">
 			<view class="g_mb_12">
-				<image class="g_w_64 g_h_64 g_radius_50" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/defaultAva.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""> </image>
+				<image class="g_w_64 g_h_64 g_radius_50 u-skeleton-fillet" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/defaultAva.svg" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""> </image>
 			</view>
-			<view class="g_fs_18 g_fw_600 g_mb_4"> 登录/注册 </view>
-			<view class="g_fs_14"> 劳务上下游收发单工具 </view>
+			<view class="g_fs_18 g_fw_600 g_mb_4 g_ml_12 g_mr_12 u-skeleton-fillet"> 登录/注册 </view>
+			<view class="g_fs_14 g_ml_12 g_mr_12 u-skeleton-fillet"> 劳务上下游收发单工具 </view>
 		</view>
 		<view class="g_mt_10" v-if="agencyInfo.supplierAccount == 1">
 			<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
@@ -104,6 +104,7 @@
 		</view>
 		<view class="g_mt_10">
 			<g-panel-form-item
+				:loading="loading"
 				:list="[
 					{
 						icon: 'icon-setting',
@@ -144,6 +145,7 @@
 				</view>
 			</scroll-view>
 		</u-popup>
+		<u-skeleton :loading="loading" :animation="true" bgColor="#fff"></u-skeleton>
 	</view>
 </template>
 
@@ -173,6 +175,7 @@ export default {
 			waitNus: 0,
 			agencyInfo: {},
 			addMemberShow: false,
+			loading: true, // 骨架屏的显示处理
 			scrollTop: 0,
 			defaultTop: 0,
 			pageSpeed: -1,
@@ -349,6 +352,7 @@ export default {
 					// if (uni.getStorageSync("apply-userinfo").agencyStatus == 1) {
 					this.getCompanyInfo();
 				}
+				that.loading = false;
 			});
 			that.G.watchUserPage("pages/person/index");
 			// that.userInfo = uni.getStorageSync("apply-userinfo");
@@ -362,6 +366,7 @@ export default {
 			that.userInfo.agencyName = "";
 			that.userInfo.teamType = 0;
 			that.speed = 0;
+			that.loading = false;
 		}
 	},
 	onTabItemTap(e) {