diff --git a/components/configureDevice_2/configureDevice_2.wxml b/components/configureDevice_2/configureDevice_2.wxml index 3dc4153..f6e06f6 100644 --- a/components/configureDevice_2/configureDevice_2.wxml +++ b/components/configureDevice_2/configureDevice_2.wxml @@ -37,12 +37,31 @@ - + + + + + + + + + + + + + {{item.realname}} - + + + + + + + + {{item.age}} diff --git a/components/configureDevice_2/configureDevice_2.wxss b/components/configureDevice_2/configureDevice_2.wxss index 89de309..e293764 100644 --- a/components/configureDevice_2/configureDevice_2.wxss +++ b/components/configureDevice_2/configureDevice_2.wxss @@ -116,13 +116,15 @@ input { .userAvatar { width: 90rpx; height: 90rpx; + box-sizing: border-box; + overflow: hidden; border-radius: 50%; margin-right: 24rpx; - border: 2rpx solid #FF8FB5; } .userInfo { flex: 1; + margin-right: 24rpx; } .userInfo_1 { @@ -163,6 +165,8 @@ input { .userInfo_1>view:nth-of-type(2)>view:nth-of-type(1) { width: 20rpx; height: 20rpx; + display: flex; + align-items: center; margin-right: 4rpx; } diff --git a/components/configureDevice_2_addUser/configureDevice_2_addUser.js b/components/configureDevice_2_addUser/configureDevice_2_addUser.js index 59f3666..6b8a7bb 100644 --- a/components/configureDevice_2_addUser/configureDevice_2_addUser.js +++ b/components/configureDevice_2_addUser/configureDevice_2_addUser.js @@ -91,7 +91,11 @@ Component({ }) return; } - $.ajax("weighingScale/v2/getUserInfoByWkno", { workNo }, "GET", true, "正在查询...").then(res => { + let sn = app.globalData.ppScale.device.mac.replace(/:/g, ''); + $.ajax("weighingScale/v2/getUserInfoByWkno", { + workNo: workNo, + sn: sn + }, "GET", true, "正在查询...").then(res => { if (res.result) { this.setData({ userInfo: res.result }); } else { diff --git a/images/configureDevice/man.png b/images/configureDevice/man.png new file mode 100644 index 0000000..dc04314 Binary files /dev/null and b/images/configureDevice/man.png differ diff --git a/images/configureDevice/userAvatarMan.png b/images/configureDevice/userAvatarMan.png new file mode 100644 index 0000000..fd9351a Binary files /dev/null and b/images/configureDevice/userAvatarMan.png differ diff --git a/images/configureDevice/userAvatarWoman.png b/images/configureDevice/userAvatarWoman.png new file mode 100644 index 0000000..e3f0ceb Binary files /dev/null and b/images/configureDevice/userAvatarWoman.png differ diff --git a/images/configureDevice/woman.png b/images/configureDevice/woman.png new file mode 100644 index 0000000..b694515 Binary files /dev/null and b/images/configureDevice/woman.png differ diff --git a/pages/configureDevice/configureDevice.js b/pages/configureDevice/configureDevice.js index 3e44934..3416eb3 100644 --- a/pages/configureDevice/configureDevice.js +++ b/pages/configureDevice/configureDevice.js @@ -1,6 +1,5 @@ const app = getApp(); const ppScale = app.globalData.ppScale; -import $ from "../../utils/request"; Page({ data: {