From 54d0ee164041c2d5f48d3f9c227c07605250c3ba Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Wed, 27 Nov 2024 18:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/work/user/create-user.vue | 4 +++-
 pages/work/user/device.vue      | 7 -------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pages/work/user/create-user.vue b/pages/work/user/create-user.vue
index f51daef..a82acd8 100644
--- a/pages/work/user/create-user.vue
+++ b/pages/work/user/create-user.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="create-container">
 		<u--form labelPosition="left" :model="userForm" :rules="rules" ref="form">
-			<u--image class="avatar" @click="onAvatarClick" :src="userForm.avatar" width="80px" height="80px"
+			<u--image class="avatar" @click="onAvatarClick" :src="userForm.avatar?userForm.avatar:avatar" width="80px" height="80px"
 				shape="circle" />
 			<u-line color="#D2D2D2"></u-line>
 			<u-form-item class="form-item" label="所属公司" prop="companyShortName" labelWidth="100px" required>
@@ -80,6 +80,7 @@
 				rolesActions: [],
 				userForm: {},
 				companyObj:{},
+				avatar:"",
 				rules: {
 					avatar: {
 						type: "string",
@@ -153,6 +154,7 @@
 			this.getRolesList();
 		},
 		onLoad(options) {
+			this.avatar = avatar;
 			uni.$on("setAvatar", function(options) {
 				user.value.avatar = options
 			})
diff --git a/pages/work/user/device.vue b/pages/work/user/device.vue
index 84e71dd..f105836 100644
--- a/pages/work/user/device.vue
+++ b/pages/work/user/device.vue
@@ -207,13 +207,6 @@ export default {
       margin-right: 10px;
     }
   }
-  .list {
-    height: calc(100vh - 150px - env(safe-area-inset-bottom));
-    margin: 0px 10px;
-    work-user-index-item {
-      background-color: #f6f3f3;
-    }
-  }
   .button {
     padding: 10px 20px;
     display: flex;