From 04acf6421dded7b6f6eef9d2cf41d0b4a0e8dd0d Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期日, 28 四月 2024 09:23:10 +0800
Subject: [PATCH] 设置表单的bug
---
packagePersonal/pages/userSetting/index.js | 249 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 76 deletions(-)
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index eefb2a4..1bbd3e3 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({
@@ -9,7 +10,7 @@
data: {
userInfo: {},
defaultAvatarUrl: 'https://cdn-we-retail.ym.tencent.com/miniapp/usercenter/icon-user-center-avatar@2x.png',
- userInfoBox: false,
+
editType: '',
userInfoForm: {
icon: '',
@@ -23,6 +24,9 @@
emailError: false,
imgCode: '',
countDown: 0,
+ mailCountDown: 0,
+ userInfoBox: false,
+ height: '', //灞忓箷楂樺害
},
/**
@@ -45,7 +49,15 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
-
+ var that = this;
+ // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+ wx.getSystemInfo({
+ success: (result) => {
+ that.setData({
+ height: result.windowHeight
+ });
+ },
+ })
},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
@@ -63,7 +75,7 @@
if (teacherRole && teacherInfos) {
defaultUser = {
...teacherInfos,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : teacherInfos.name,
+ nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo ? WeChatInfo.name : '',
icon: nickNameData ? JSON.parse(nickNameData.data).icon : WeChatInfo ? WeChatInfo.icon : '',
userId: res.userId,
role: 'Teacher',
@@ -74,8 +86,8 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
phoneNumber: phoneInfo?.credential,
Email: emailInfo?.credential
@@ -106,7 +118,7 @@
editType: info,
"userInfoForm.captcha": "",
"userInfoForm.code": "",
- "userInfoForm.nickName": ''
+ "userInfoForm.nickName": this.data.userInfo.nickName,
});
}
this.getImgCapcha()
@@ -115,77 +127,84 @@
this.setData({
userInfoBox: e.detail.visible,
countDown: 0,
+ mailCountDown:0
});
},
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
- }),
- 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,
- });
+ 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,
+ })
+ that.getUserInfo()
+ that.setData({
+ userInfoBox: false,
+ });
+ }
+ })
+ }
+ } else {
+ reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- } else {
- reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- }
+ })
})
- })
-
+ }
})
}
});
@@ -200,11 +219,17 @@
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) {
+ if (e.detail.value) {
+ 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({
+ phoneError: !isPhoneNumber,
+ "userInfoForm.phone": e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- "userInfoForm.phone": e.detail.value,
+ phoneError: false,
});
}
},
@@ -213,11 +238,19 @@
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) {
+ if (e.detail.value) {
+ 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({
+ emailError: !isPhoneNumber,
+ });
+ }
this.setData({
- emailError: !isPhoneNumber,
"userInfoForm.email": e.detail.value,
+ });
+ } else {
+ this.setData({
+ emailError: false,
});
}
},
@@ -280,14 +313,14 @@
getSecond(time) {
let timer = null
if (!timer) {
- let countDown = time;
this.setData({
countDown: time,
});
+ let conut = this.data.countDown;
timer = setInterval(() => {
- countDown--
+ conut--
this.setData({
- countDown: countDown,
+ countDown: conut,
});
if (this.data.countDow == 0) {
clearInterval(timer)
@@ -313,7 +346,7 @@
duration: 1000
})
// 寮�鍚煭淇￠獙璇佸�掕鏃�
- this.getSecond(60)
+ this.getSecondEmail(60)
} else {
wx.showToast({
title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -331,9 +364,35 @@
})
}
},
+ getSecondEmail(time) {
+ if (this.data.mailCountDown <= 0) {
+ this.setData({
+ mailCountDown: time,
+ });
+
+ let timer = setInterval(() => {
+ let count = this.data.mailCountDown - 1;
+ this.setData({
+ mailCountDown: count,
+ });
+
+ if (count === 0) {
+ clearInterval(timer);
+ }
+ }, 1000);
+ }
+ },
confirmInfo() {
if (this.data.editType == 'nickName') {
+ if (!this.data.userInfoForm.nickName) {
+ wx.showToast({
+ title: '璇疯緭鍏ユ樀绉�',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let userTypeInfo = {
"requests": [{
data: JSON.stringify({
@@ -359,6 +418,22 @@
})
} else if (this.data.editType == 'phone') {
+ if (!this.data.userInfoForm.phone) {
+ wx.showToast({
+ title: '璇疯緭鍏ユ墜鏈哄彿',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
+ if (!this.data.userInfoForm.code) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ獙璇佺爜',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let query = {
phoneNumber: this.data.userInfoForm.phone,
phoneCaptcha: this.data.userInfoForm.code
@@ -390,6 +465,22 @@
}
})
} else if (this.data.editType == 'email') {
+ if (!this.data.userInfoForm.email) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ偖绠�',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
+ if (!this.data.userInfoForm.code) {
+ wx.showToast({
+ title: '璇疯緭鍏ラ獙璇佺爜',
+ icon: 'none',
+ duration: 1000
+ })
+ return false;
+ }
let query = {
eMail: this.data.userInfoForm.email,
captcha: this.data.userInfoForm.code
@@ -430,6 +521,12 @@
}
},
+
+ onCloseProtocol() {
+ this.setData({
+ userInfoBox: false,
+ });
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
--
Gitblit v1.9.1