From 1fd211c2528c8ba7fff173c60b31acbc5807c809 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 25 三月 2024 18:17:37 +0800
Subject: [PATCH] 图标，首页
---
packageDomain/pages/teacherCertification/index.js | 115 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index 812abdc..c245a0a 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -1,4 +1,5 @@
const app = getApp();
+import SparkMD5 from 'spark-md5'
import tool from "../../../assets/js/toolClass.js";
import { getTopicMsgCmsItemFile } from '../../../assets/js/middleGround/tool.js';
import FormData from '../../../utils/formdata/index.js';
@@ -119,7 +120,7 @@
} else if (studentInfo) {
defaultUser = {
...studentInfo,
- nickName: wechatInfo.name,
+ nickName: wechatInfo.name ? wechatInfo.name : studentInfo.nickName,
avatarUrl: wechatInfo.icon,
userId: res.userId,
phoneNumber: phoneInfo?.credential,
@@ -352,63 +353,72 @@
sourceType: ['album', 'camera'], // 鍙互鎸囧畾鏉ユ簮鏄浉鍐岃繕鏄浉鏈猴紝榛樿浜岃�呴兘鏈�
success: function (res) {
// 杩斿洖閫夊畾鐓х墖鐨勬湰鍦版枃浠惰矾寰勫垪琛紝tempFilePath涔熷彲浠ヤ綔涓篿mg鏍囩鐨剆rc灞炴�ф樉绀哄浘鐗�
- console.log(res.tempFiles[0])
- tool.getFileMd5(res.tempFiles[0]).then((e) => {
- console.log(e, 4)
- if (!that.data.imgPics.find((item) => item.md5 == 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) {
- let arr = [];
- let imgObj = {
- md5: e,
- linkType: 'LinkFile',
- linkProtectType: 'Public',
- url:
- app.config.requestCtx + `/file/GetPreViewImage?md5=` + e
- }
- arr = [...that.data.imgPics, ...[imgObj]];
+ console.log(res.tempFiles[0], 12);
+ 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);
+ if (!that.data.imgPics.find((item) => item.md5 == md5)) {
+ 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(res1) {
+ if (res1.statusCode == 200) {
+ resolve(res1.data); if (res1.data) {
+ let arr = [];
+ let imgObj = {
+ md5: md5,
+ linkType: 'LinkFile',
+ linkProtectType: 'Public',
+ url:
+ app.config.requestCtx + `/file/GetPreViewImage?md5=` + md5,
+ imgUrl: res.tempFiles[0].tempFilePath
+ }
+ arr = [...that.data.imgPics, ...[imgObj]];
- that.setData({
- imgPics: arr,
- });
+ that.setData({
+ imgPics: arr,
+ });
+ }
+ } else {
+ reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- } else {
- reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
}
- }
+ })
})
- })
- } else {
- wx.showToast({
- title: "褰撳墠鏂囦欢宸蹭笂浼狅紝璇峰嬁閲嶅鎿嶄綔锛�",
- icon: 'none',
- duration: 1000,
- })
+ } else {
+ wx.showToast({
+ title: "褰撳墠鏂囦欢宸蹭笂浼狅紝璇峰嬁閲嶅鎿嶄綔锛�",
+ icon: 'none',
+ duration: 1000,
+ })
+ }
}
})
+
}
});
},
@@ -520,7 +530,6 @@
})
return
}
- console.log(that.data.teacherInfo.fullName)
if (that.data.teacherInfo.agree) {
if (that.data.topicMessageList.length > 0) {
let dataRequests = tool.UpdateworksDataBytool(
--
Gitblit v1.9.1