Commit 8a808686 authored by zhengke's avatar zhengke

no message

parent 37bfab8e
...@@ -131,45 +131,53 @@ ...@@ -131,45 +131,53 @@
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api' host = 'http://192.168.10.36:8082/api'
// host = 'http://192.168.10.65:8085/api'
} else { } else {
host = 'https://eduapi.oytour.com/api' host = 'https://eduapi.oytour.com/api'
} }
const { file } = event.detail; const { file } = event.detail;
if(file[0].url.indexOf('xls')==-1||file[0].url.indexOf('xlsx')==-1){
uni.showToast({
title:'请上传xls、xlsx格式的文件',
icon:'none',
duration: 500
})
return
}
let params = { let params = {
// Uid: data.params.Uid,
// CourseId: data.params.CourseId,
// ExamName: data.params.ExamName,
Uid: 1, Uid: 1,
CourseId: null, CourseId: 1,
ExamName: '' ExamName: '',
} }
uni.uploadFile({ uni.uploadFile({
url: host + '/Upload/UploadStuExamScore?Files='+file+'&params='+JSON.stringify(params), url: host + '/Upload/UploadStuExamScore',
filePath: file[0].url, filePath: file[0].url,
name: 'file', name: 'file',
formData: { formData: {
'myfile': file[0] 'myfile': file[0],
'params': JSON.stringify(params)
}, },
success(res) { success(res) {
uni.hideLoading(); uni.hideLoading();
let jsonObj = JSON.parse(res.data) uni.showToast({
let index = jsonObj.FilePath.indexOf(".") title:res.Message,
let suffix = jsonObj.FilePath.slice(index + 1) icon:'none',
let uploadResult = { duration: 500
name: fileObj.name, })
url: uploadConfig.CustomDomain + '/' + jsonObj.FilePath,
type: fileObj.type,
suffix: suffix,
// VideoCoverImg: uploadConfig.CustomDomain + jsonObj.VideoCoverImg,
}
successCall(uploadResult);
}, },
fail(err) { fail(err) {
console.log("uploadErr", err) console.log("uploadErr", err)
} }
}); });
return // uploadFile(params, file, (res) => {
uploadFile("stueave", file, (res) => { // uni.showModal({
console.log(res,'----') // title:res.Message
}); // })
// });
// return
} }
}; };
......
...@@ -8,9 +8,9 @@ export let desensitization = (str, beginLen, endLen) => { ...@@ -8,9 +8,9 @@ export let desensitization = (str, beginLen, endLen) => {
return tempStr; return tempStr;
} }
export let uploadFile = (path, file, successCallback) => { export let uploadFile = (params,file, successCallback) => {
for (let i = 0; i < file.length; i++) { for (let i = 0; i < file.length; i++) {
UploadSelfFile(path, file[i], successCallback) UploadSelfFile(JSON.stringify(params),file[i], successCallback)
} }
} }
...@@ -31,64 +31,66 @@ export let urlTobase64 = (file, suc) => { ...@@ -31,64 +31,66 @@ export let urlTobase64 = (file, suc) => {
/** /**
* 上传文件 * 上传文件
*/ */
export function UploadSelfFile(path, file, callback, configObj) { export function UploadSelfFile(params, file, callback, configObj) {
if (file.url.indexOf('.xls') == -1||file.url.indexOf('.xlsx')==-1) { if(file.url.indexOf('xls')==-1&&file.url.indexOf('xlsx')==-1){
uni.showToast({ uni.showModal({
title: '请上传 excel 格式文件', title:'请上传xls、xlsx格式的文件'
icon:'none', })
duration: 2000 return
});
return false;
} }
uni.showLoading({ uni.showLoading({
title: '文件上传中...' title: '文件上传中...'
}); });
UploadFileToSystem(uploadConfig, newPath, file, callback, configObj); UploadFileToSystem(params, file, callback, configObj);
return
if (uploadConfig) {
switch (uploadConfig.StoreType) {
//上传文件到腾讯云
case 1:
newPath += "/" + timestamp1 + "" + suffix;
UploadFileToTencent(uploadConfig, newPath, file, callback);
break;
//上传文件到阿里云
case 2:
newPath += "/" + timestamp1 + "" + suffix;
UploadFileToALi(uploadConfig, newPath, file, callback);
break;
//上传文件到自己文件服务器
case 3:
UploadFileToSystem(uploadConfig, newPath, file, callback, configObj);
break;
}
}
} }
/** /**
* 上传文件到本地文件系统 * 上传文件到本地文件系统
*/ */
export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, successCall, configObj) { export function UploadFileToSystem(paramsObj, fileObj, successCall, configObj) {
// let url = uploadConfig.UploadDomain + "/Upload?filePath=" + fileFullPath; console.log(paramsObj,'-----paramsObj')
console.log(fileFullPath,'------===')
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.36:8082/api' host = 'http://192.168.10.36:8082/api'
} else { } else {
host = 'https://eduapi.oytour.com/api' host = 'https://eduapi.oytour.com/api'
} }
let params = {
Uid:1,
CourseId:1,
ExamName:''
}
let url = host + "/Upload/UploadStuExamScore?Files=" + fileObj +'&params=' + JSON.stringify(params) ;
uni.uploadFile({ uni.uploadFile({
url: url, url: host+'/Upload/UploadStuExamScore',
filePath: fileObj.url, filePath: fileObj.url,
name: 'file', name: 'file',
formData: { formData: {
'myfile': fileObj 'myfile': fileObj,
params: paramsObj
}, },
success(res) { success(res) {
uni.hideLoading();
return
uni.hideLoading(); uni.hideLoading();
let jsonObj = JSON.parse(res.data) let jsonObj = JSON.parse(res.data)
let index = jsonObj.FilePath.indexOf(".")
let suffix = jsonObj.FilePath.slice(index + 1)
let uploadResult = { let uploadResult = {
name: fileObj.name, Message: jsonObj.Message
url: uploadConfig.CustomDomain + '/' + jsonObj.FilePath,
type: fileObj.type,
suffix: suffix,
// VideoCoverImg: uploadConfig.CustomDomain + jsonObj.VideoCoverImg,
} }
successCall(uploadResult); successCall(uploadResult);
}, },
fail(err) { fail(err) {
uni.hideLoading();
console.log("uploadErr", err) console.log("uploadErr", err)
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment