From 3ac33e0ea28357bac078ac93404ac02ad9a61738 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 七月 2024 18:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
wechat_staff/pages/userinfo/index.js | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/wechat_staff/pages/userinfo/index.js b/wechat_staff/pages/userinfo/index.js
index fd0231b..c67194e 100644
--- a/wechat_staff/pages/userinfo/index.js
+++ b/wechat_staff/pages/userinfo/index.js
@@ -45,12 +45,16 @@
const {
slogans,
costomerNum,
- userInfo
+ userInfo,
+ qrcodeImg,
+ companyQrcodeImg
} = this.data
editMember({
...userInfo,
slogans,
- costomerNum
+ costomerNum,
+ qrcodeImg: qrcodeImg || userInfo.qrcodeImg ,
+ companyQrcodeImg: companyQrcodeImg || userInfo.companyQrcodeImg
}).then(res => {
this.setData({
editFalg: false
@@ -96,13 +100,17 @@
wx.uploadFile({
url: uploadUrl,
filePath: e.detail.avatarUrl,
+ formData: {
+ folder: "users"
+ },
name: 'file',
success (res) {
console.log(JSON.parse(res.data))
- let data = JSON.parse(ress.data)
+ let data = JSON.parse(res.data)
userInfo.imgurl = data.data.imgaddr
userInfo.imgurlFull = data.data.url
- this.setData({userInfo})
+ that.setData({userInfo})
+ console.log('userInfo', userInfo);
}
})
}
@@ -127,7 +135,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: 'member'
+ folder: "member"
},
header: {
token: wx.getStorageSync('token')
@@ -169,7 +177,7 @@
filePath: res.tempFiles[0].tempFilePath,
name: 'file',
formData: {
- folder: 'member'
+ folder: "member"
},
header: {
token: wx.getStorageSync('token')
--
Gitblit v1.9.3