From 1daa00227f03bc3a370dc1311b7166df17368929 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 20 三月 2024 16:15:46 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/teacherCertification/index.js | 371 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 306 insertions(+), 65 deletions(-)
diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js
index c1b9a7e..812abdc 100644
--- a/packageDomain/pages/teacherCertification/index.js
+++ b/packageDomain/pages/teacherCertification/index.js
@@ -1,6 +1,7 @@
const app = getApp();
import tool from "../../../assets/js/toolClass.js";
-import { getTopicMsgCmsItemFile } from '../../../assets/js/middleGround/tool.js'
+import { getTopicMsgCmsItemFile } from '../../../assets/js/middleGround/tool.js';
+import FormData from '../../../utils/formdata/index.js';
Page({
/**
@@ -30,11 +31,14 @@
topicId: "",
worksInfo: [],
userId: '',
- fileList: [],
+ imgPics: [],
+ file: "",
+ imgs: [],
protocolTxt: '', //鏁欏笀鍗忚
protocolShow: false,
editState: true,
- reasonTxt: ""
+ reasonTxt: "",
+ reasonTxtShow: false,
},
/**
@@ -123,7 +127,7 @@
role: 'Student'
}
}
- wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
+ wx.setStorageSync(app.config.userInfoKey, JSON.stringify(defaultUser));
}
})
},
@@ -152,7 +156,7 @@
app.MG.ugc.getTopicMessageList(data).then((res) => {
try {
this.setData({
- fileList: [],
+ imgPics: [],
})
const resData = res.datas.find((i) => i.appUserCreator.userId === this.data.userId)
if (resData) {
@@ -166,9 +170,10 @@
})
}
let info = getTopicMsgCmsItemFile(this.data.worksInfo, resData.cmsItemDataList)
+ console.log(info)
this.setData({
'teacherInfo.fullName': info.fullName,
- 'teacherInfo.schoolName ': info.schoolName,
+ 'teacherInfo.schoolName': info.schoolName,
'teacherInfo.positionalTitle': info.positionalTitle,
'teacherInfo.courseName': info.courseName,
'teacherInfo.phone': info.phone,
@@ -179,7 +184,8 @@
'teacherInfo.agree': true,
'teacherInfo.state': resData.state,
topicId: resData.id,
- topicMessageList: resData.cmsItemDataList
+ topicMessageList: resData.cmsItemDataList,
+ teachText: info.positionalTitle,
})
if (resData.feedBack != null) {
this.setData({
@@ -187,15 +193,19 @@
})
}
if (this.data.teacherInfo.relevantCertificates.length > 0) {
+ let arr = [];
if (typeof this.data.teacherInfo.relevantCertificates == 'object') {
this.data.teacherInfo.relevantCertificates.forEach((ele) => {
let imgObj = {
md5: ele.file.md5,
linkType: 'LinkFile',
linkProtectType: 'Public',
- url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + ele.file.md5
+ url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + ele.md5
}
- this.data.fileList.push(imgObj)
+ arr.push(imgObj);
+ this.setData({
+ imgPics: arr,
+ });
})
} else {
let imgObj = {
@@ -205,9 +215,13 @@
url:
app.config.requestCtx + `/file/GetPreViewImage?md5=` + this.data.teacherInfo.relevantCertificates
}
- this.data.fileList.push(imgObj)
+ arr.push(imgObj);
+ this.setData({
+ imgPics: arr,
+ });
}
}
+
}
} catch (error) {
}
@@ -253,6 +267,31 @@
}
})
},
+ //瀛︽牎鍚嶇О
+ onSchoolNameInput(e) {
+ this.setData({
+ "teacherInfo.schoolName": e.detail.value,
+ });
+ },
+ //濮撳悕
+ onFullNameInput(e) {
+ this.setData({
+ "teacherInfo.fullName": e.detail.value,
+ });
+ },
+ // 浠绘暀璇剧▼
+ onCourseNameInput(e) {
+ this.setData({
+ "teacherInfo.courseName": e.detail.value,
+ });
+ },
+ //璇︾粏鍦板潃
+ onAddressInput(e) {
+ this.setData({
+ "teacherInfo.detailedAddress": e.detail.value,
+ });
+ },
+
//閫夋嫨鑱岀О
onTeachPicker() {
@@ -279,6 +318,7 @@
if (phoneError === isPhoneNumber) {
this.setData({
phoneError: !isPhoneNumber,
+ "teacherInfo.phone": e.detail.value,
});
}
},
@@ -289,6 +329,7 @@
if (telphoneError === isPhoneNumber) {
this.setData({
telphoneError: !isPhoneNumber,
+ "teacherInfo.telphone": e.detail.value,
});
}
},
@@ -298,69 +339,115 @@
if (emailError === isPhoneNumber) {
this.setData({
emailError: !isPhoneNumber,
+ "teacherInfo.email": e.detail.value,
});
}
},
- handleAdd(e) {
- const { fileList } = this.data;
- console.log(e)
- const { files } = e.detail;
- // 鏂规硶2锛氭瘡娆￠�夋嫨鍥剧墖閮戒笂浼狅紝灞曠ず姣忔涓婁紶鍥剧墖鐨勮繘搴�
- files.forEach(file => {
- this.onUpload(file)
- })
- },
- onUpload(file) {
- console.log(file, '123')
- const isLt2M = (0.5 * file.size) / 1024 / 1024 < 0.5
- if (!isLt2M) {
- wx.showToast({
- title: "涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 500KB!",
- icon: 'none',
- duration: 1000,
- })
- return reject()
- }
- const FileName = file.name.split('.')[0]
- const Extension = file.name.split('.')[1]
- const FileType = file.type
- let size = 1024
- tool.getFileMd5(file, size * 1024).then((e) => {
- if (!this.data.fileList.find((item) => item.md5 == e)) {
- const imgData = new FormData()
- imgData.append('Md5', e)
- imgData.append('FileName', FileName)
- imgData.append('Extension', Extension)
- imgData.append('FileType', FileType)
- imgData.append('MetaData', null)
- imgData.append('file', file)
- app.MG.file.upload(imgData).then(() => {
- this.data.fileList.push({
- md5: e,
- linkType: 'LinkFile',
- linkProtectType: 'Public',
- name: FileName,
- type: FileType,
- url: app.config.requestCtx + `/file/GetPreViewImage?md5=` + e
- })
+ // 涓婁紶鍥剧墖浜嬩欢
+ chooseImg(e) {
+ var that = this;
+ wx.chooseMedia({
+ // count: 1, // 榛樿9
+ sizeType: ['original', 'compressed'], // 鍙互鎸囧畾鏄師鍥捐繕鏄帇缂╁浘锛岄粯璁や簩鑰呴兘鏈�
+ 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]];
+
+ that.setData({
+ imgPics: arr,
+ });
+ }
+ } else {
+ reject('杩愯鏃堕敊璇�,璇风◢鍚庡啀璇�');
+ }
+ }
+ })
+ })
+ } else {
+ wx.showToast({
+ title: "褰撳墠鏂囦欢宸蹭笂浼狅紝璇峰嬁閲嶅鎿嶄綔锛�",
+ icon: 'none',
+ duration: 1000,
+ })
+ }
})
- } else {
- ElMessage.error('褰撳墠鏂囦欢宸蹭笂浼狅紝璇峰嬁閲嶅鎿嶄綔锛�')
}
- })
- .catch((e) => {
- console.error(e)
- })
- },
- handleRemove(e) {
- const { index } = e.detail;
- const { fileList } = this.data;
- fileList.splice(index, 1);
- this.setData({
- fileList,
});
},
+ // 鍒犻櫎鍥剧墖
+ deleteImg(e) {
+ var imgs = this.data.imgPics;
+ var index = e.currentTarget.dataset.index;
+ imgs.splice(index, 1);
+ this.setData({
+ imgPics: imgs
+ });
+ },
+ // 棰勮鐜板満鍥剧墖
+ previewImg(e) {
+ //鑾峰彇褰撳墠鍥剧墖鐨勪笅鏍�
+ var index = e.currentTarget.dataset.index;
+ //鎵�鏈夊浘鐗�
+ let imgs = [];
+ this.data.imgPics.forEach(item => {
+ imgs.push(item.url)
+ })
+ wx.previewImage({
+ //褰撳墠鏄剧ず鍥剧墖
+ current: imgs[index],
+ //鎵�鏈夊浘鐗�
+ urls: imgs
+ })
+ },
onChange() {
+ console.log(this.data.teacherInfo.agree, 12)
+ if (this.data.teacherInfo.agree) {
+ this.setData({
+ 'teacherInfo.agree': false,
+ });
+ } else {
+ this.setData({
+ 'teacherInfo.agree': true,
+ });
+ }
},
//鏌ョ湅鏁欏笀璁よ瘉鏈嶅姟
@@ -372,7 +459,161 @@
onVisibleChange(e) {
this.setData({
protocolShow: e.detail.visible,
+ reasonTxtShow: e.detail.visible
});
+ },
+
+ //鏌ョ湅涓洪�氳繃鍘熷洜
+ previewReason() {
+ this.setData({
+ reasonTxtShow: true,
+ });
+ },
+
+ submit() {
+ let that = this;
+ if (!that.data.teacherInfo.schoolName) {
+ wx.showToast({
+ title: "璇峰～鍐欏鏍″悕绉帮紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ if (!that.data.teacherInfo.fullName) {
+ wx.showToast({
+ title: "璇峰～鍐欑湡瀹炲鍚嶏紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ if (!that.data.teacherInfo.courseName) {
+ wx.showToast({
+ title: "璇峰～鍐欎换鏁欒绋嬶紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ if (!that.data.teacherInfo.phone) {
+ wx.showToast({
+ title: "璇峰～鍐欒仈绯荤數璇濓紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ if (!that.data.teacherInfo.email) {
+ wx.showToast({
+ title: "璇峰～鍐欓偖绠憋紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ if (that.data.teacherInfo.relevantCertificates.length == 0) {
+ wx.showToast({
+ title: "璇蜂笂浼犲伐浣滆瘉锛�",
+ icon: 'none',
+ duration: 1000,
+ })
+ return
+ }
+ console.log(that.data.teacherInfo.fullName)
+ if (that.data.teacherInfo.agree) {
+ if (that.data.topicMessageList.length > 0) {
+ let dataRequests = tool.UpdateworksDataBytool(
+ that.data.worksInfo,
+ that.data.topicMessageList,
+ that.data.teacherInfo,
+ that.data.imgPics
+ );
+ console.log(dataRequests, 4)
+ const data = {
+ description: '',
+ icon: '',
+ id: that.data.topicId,
+ topicIdOrRefCode: 'teacherRoleApproval',
+ name: that.data.teacherInfo.fullName + '',
+ content: '',
+ state: 'WaitAudit',
+ type: 'teacherRegister',
+ newDataRequests: dataRequests.newData,
+ updateDataRequests: dataRequests.updateData,
+ delDataRequest: {
+ ids: []
+ }
+ }
+ let basicInfo = JSON.parse(JSON.stringify(that.data.teacherInfo))
+ delete basicInfo.worksInfo
+ delete basicInfo.state
+ const userInfo = {
+ requests: [
+ {
+ data: JSON.stringify(basicInfo),
+ name: that.data.teacherInfo.fullName + '',
+ type: 'newTeacherInfo'
+ }
+ ]
+ }
+ app.MG.identity.setAppUserInfo(userInfo).then((res) => {
+ if (res) {
+ app.MG.ugc.updateTopicMessage(data).then(() => {
+ if (res !== false) {
+ wx.showToast({
+ title: "鎻愪氦鎴愬姛锛佽绛夊緟瀹℃牳...",
+ icon: 'none',
+ duration: 1000,
+ })
+ that.newGetTeacherInfo()
+ }
+ })
+ }
+ })
+ } else {
+ const data = {
+ topicIdOrRefCode: 'teacherRoleApproval',
+ name: that.data.teacherInfo.fullName + '',
+ content: '',
+ state: 'WaitAudit',
+ type: 'teacherRegister',
+ cmsTypeRefCode: 'jsek_teacherCertification',
+ newDataListRequest: tool.worksDataBytool(that.data.worksInfo, that.data.teacherInfo, that.data.imgPics)
+ }
+
+ let basicInfo = JSON.parse(JSON.stringify(that.data.teacherInfo))
+ delete basicInfo.worksInfo
+ delete basicInfo.state
+ const userInfo = {
+ requests: [
+ {
+ data: JSON.stringify(basicInfo),
+ name: that.data.teacherInfo.fullName + '',
+ type: 'teacherInfo'
+ }
+ ]
+ }
+ app.MG.identity.setAppUserInfo(userInfo).then((res) => {
+ app.MG.ugc.newTopicMessage(data).then(() => {
+ if (res !== false) {
+ wx.showToast({
+ title: "鎻愪氦鎴愬姛锛佽绛夊緟瀹℃牳...",
+ icon: 'none',
+ duration: 1000,
+ })
+ that.newGetTeacherInfo()
+ }
+ })
+ })
+ }
+ } else {
+ wx.showToast({
+ title: "璇峰悓鎰忋�婃暀甯堣璇佹湇鍔℃潯娆俱�嬶紒",
+ icon: 'none',
+ duration: 1000,
+ })
+ }
},
--
Gitblit v1.9.1