From 6a734d758720185f538e672c879121adb6732274 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 02 四月 2024 09:20:45 +0800
Subject: [PATCH] 代码合并，问题修改，学习
---
packagePersonal/pages/userSetting/index.js | 155 +++++++++++++++++++++++++++++----------------------
1 files changed, 88 insertions(+), 67 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index ef9ce44..1fcc0ea 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -1,4 +1,5 @@
const app = getApp()
+import SparkMD5 from 'spark-md5'
import tool from "../../../assets/js/toolClass.js";
import FormData from '../../../utils/formdata/index.js';
Page({
@@ -64,7 +65,7 @@
defaultUser = {
...teacherInfos,
nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
- icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
+ icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
role: 'Teacher',
roleId: teacherRole.role.id,
@@ -97,7 +98,9 @@
},
//淇敼鐢ㄦ埛绫诲瀷
editUserInfo(e) {
- let { info } = e.currentTarget.dataset
+ let {
+ info
+ } = e.currentTarget.dataset
if (!this.data.userInfoBox) {
this.setData({
userInfoBox: true,
@@ -118,71 +121,78 @@
editIconInfo(e) {
var that = this;
wx.chooseMedia({
- // count: 1, // 榛樿9
+ count: 1, // 榛樿9
sizeType: ['original', 'compressed'], // 鍙互鎸囧畾鏄師鍥捐繕鏄帇缂╁浘锛岄粯璁や簩鑰呴兘鏈�
sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�
success: function (res) {
- // 杩斿洖閫夊畾鐓х墖鐨勬湰鍦版枃浠惰矾寰勫垪琛紝tempFilePath涔熷彲浠ヤ綔涓篿mg鏍囩鐨剆rc灞炴�ф樉绀哄浘鐗�
- tool.getFileMd5(res.tempFiles[0]).then((e) => {
- let formData = new FormData();
- formData.append('Md5', e);
- formData.append('FileName', e);
- formData.append('FileType', res.tempFiles[0].fileType);
- formData.appendFile("file", res.tempFiles[0].tempFilePath);
- const data = formData.getData();
- let _token = wx.getStorageSync(app.config.tokenKey);
- let header = {};
- if (_token == null) {
- header["Authorization"] = `Basic ${Base64.encode(website.clientId + ":" + website.clientSecret)}`;
- } else {
- header["Authorization"] = `Bearer ` + _token;
- }
- new Promise((resolve, reject) => {
- wx.request({
- url: app.config.requestCtx + '/file/api/ApiUpload',
- method: 'POST',
- header: {
- 'content-type': data.contentType,
- ...header
- },
- data: data.buffer,
- success(res) {
- if (res.statusCode == 200) {
- resolve(res.data);
- if (res.data) {
- that.setData({
- 'userInfoForm.icon': app.config.requestCtx + `/file/GetPreViewImage?md5=` + e,
- });
- let userTypeInfo = {
- requests: [
- {
- data: JSON.stringify({ nickName: that.data.userInfo.nickName, icon: that.data.userInfoForm.icon }),
+ wx.getFileSystemManager().readFile({
+ filePath: res.tempFiles[0].tempFilePath, //閫夋嫨鍥剧墖杩斿洖鐨勭浉瀵硅矾寰�
+ // encoding: 'binary', //缂栫爜鏍煎紡
+ success: ress => {
+ //鎴愬姛鐨勫洖璋�
+ let spark = new SparkMD5.ArrayBuffer();
+ spark.append(ress.data);
+ let md5 = spark.end(false);
+ let formData = new FormData();
+ formData.append('Md5', md5);
+ formData.append('FileName', md5);
+ formData.append('FileType', res.tempFiles[0].fileType);
+ formData.appendFile("file", res.tempFiles[0].tempFilePath);
+ const data = formData.getData();
+ let _token = wx.getStorageSync(app.config.tokenKey);
+ let header = {};
+ if (_token == null) {
+ header["Authorization"] = `Basic ${Base64.encode(website.clientId + ":" + website.clientSecret)}`;
+ } else {
+ header["Authorization"] = `Bearer ` + _token;
+ }
+ new Promise((resolve, reject) => {
+ wx.request({
+ url: app.config.requestCtx + '/file/api/ApiUpload',
+ method: 'POST',
+ header: {
+ 'content-type': data.contentType,
+ ...header
+ },
+ data: data.buffer,
+ success(res) {
+ if (res.statusCode == 200) {
+ resolve(res.data);
+ if (res.data) {
+ that.setData({
+ 'userInfoForm.icon': app.config.requestCtx + `/file/GetPreViewImage?md5=` + md5,
+ });
+ let userTypeInfo = {
+ "requests": [{
+ data: JSON.stringify({
+ nickName: that.data.userInfo.nickName,
+ icon: that.data.userInfoForm.icon
+ }),
name: '鐢ㄦ埛鏄电О澶村儚',
type: 'nickName'
- }
- ]
- }
- app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
- if (res) {
- wx.showToast({
- title: "淇敼鎴愬姛",
- icon: 'success',
- duration: 1000,
- })
- this.getUserInfo()
- this.setData({
- userInfoBox: false,
- });
+ }]
}
- })
+ app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
+ if (res) {
+ wx.showToast({
+ title: "淇敼鎴愬姛",
+ icon: 'success',
+ duration: 1000,
+ })
+ that.getUserInfo()
+ that.setData({
+ userInfoBox: false,
+ });
+ }
+ })
+ }
+ } else {
+ reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- } else {
- reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- }
+ })
})
- })
-
+ }
})
}
});
@@ -194,7 +204,9 @@
},
//杈撳叆鎵嬫満鍙�
onPhoneInput(e) {
- const { phoneError } = this.data;
+ const {
+ phoneError
+ } = this.data;
const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
if (phoneError === isPhoneNumber) {
this.setData({
@@ -205,7 +217,9 @@
},
onEmailInput(e) {
- const { emailError } = this.data;
+ const {
+ emailError
+ } = this.data;
const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
if (emailError === isPhoneNumber) {
this.setData({
@@ -328,13 +342,14 @@
confirmInfo() {
if (this.data.editType == 'nickName') {
let userTypeInfo = {
- requests: [
- {
- data: JSON.stringify({ nickName: this.data.userInfoForm.nickName, icon: this.data.userInfo.icon }),
- name: '鐢ㄦ埛鏄电О澶村儚',
- type: 'nickName'
- }
- ]
+ "requests": [{
+ data: JSON.stringify({
+ nickName: this.data.userInfoForm.nickName,
+ icon: this.data.userInfo.icon
+ }),
+ name: '鐢ㄦ埛鏄电О澶村儚',
+ type: 'nickName'
+ }]
}
app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
if (res) {
@@ -422,6 +437,12 @@
}
},
+
+ onCloseProtocol() {
+ this.setData({
+ userInfoBox: false,
+ });
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
--
Gitblit v1.9.1