Bladeren bron

上传按钮一直显示,添加判断逻辑

zhangxike 2 weken geleden
bovenliggende
commit
6aa5c62286
3 gewijzigde bestanden met toevoegingen van 19 en 10 verwijderingen
  1. 13 3
      config.uts
  2. 2 2
      utils/auth.uts
  3. 4 5
      utils/dataProcessor.uts

+ 13 - 3
config.uts

@@ -14,7 +14,11 @@ export type AppInfo ={
 export type GlobalConfig= {
   baseUrl: string;
   appInfo: AppInfo;
-  apiUrl: string;
+  host: string;
+  tokenURL: string;
+  downloadURL: string;
+  uploadURL: string;
+  getImgURL: string;
 }
 
 export const globalConfig  = {
@@ -41,6 +45,12 @@ export const globalConfig  = {
       }
     ]
   },
- 
-  apiUrl: "http://192.168.5.124:4523/m1/7190626-6915798-default"
+  // host: "http://192.168.43.62:4523/m1/7190626-6915798-default",
+  host: "http://10.122.15.8",
+  tokenURL: '/paas/RestService/d800.paas.app.LoginImpl/caLogin?username=',
+  downloadURL: '/qm/RestService/d800.qm.QmImpl/loadQmImagetask?prodcode=',
+  getImgURL: 'http://10.122.15.8/qm/Rest/download?fileid=',
+  // getImgURL: 'http://192.168.43.62:8080/qm/Rest/download?fileid=',
+  uploadURL: 'http://10.122.15.8/qm/Rest/upload'
+  // uploadURL: 'http://192.168.43.62:8080/qm/Rest/upload'
 } as GlobalConfig;

+ 2 - 2
utils/auth.uts

@@ -17,11 +17,11 @@ export function removeToken():void {
 
 
 export function getTokenFromApi():Promise<string> {
-	console.log(`${globalConfig.apiUrl}/getToken?username=${storage.getString(constant.name)}`)
+	console.log(`${globalConfig.host}${globalConfig.tokenURL}${storage.getString(constant.name)}`)
 	
 	return new Promise<string>((resolve) =>{
 		uni.request({
-			url: `${globalConfig.apiUrl}/getToken?username=${storage.getString(constant.name)}`,
+			url: `${globalConfig.host}${globalConfig.tokenURL}${storage.getString(constant.name)}`,
 			method: "GET",
 			timeout: 30000,
 			success: (res) => {

+ 4 - 5
utils/dataProcessor.uts

@@ -1,7 +1,6 @@
 import { getToken, getTokenFromApi } from './auth'
 import { saveMediaInfo, saveMediaRecord, getLatestRecord, removeInfoAndRecord, getJoinList } from '@/api/work'
 import { globalConfig } from '@/config'
-import upload from '@/utils/upload.uts'
 
 
 // 类型定义保持不变
@@ -141,7 +140,7 @@ export const downloadDataFromAPI = async (productCode : string, callback ?: () =
 		// 使用Promise处理HTTP请求,避免嵌套Promise
 		return new Promise<boolean>((resolve) => {
 			uni.request({
-				url: `${globalConfig.apiUrl}/loadQmImagetask?prodcode=${productCode}`,
+				url: `${globalConfig.host}${globalConfig.downloadURL}${productCode}`,
 				method: 'GET',
 				header: {
 					'token': apiToken
@@ -219,7 +218,7 @@ export const downloadDataFromAPI = async (productCode : string, callback ?: () =
 																			await new Promise<void>((resolve, reject) => {
 																				// 使用uni.downloadFile下载图片
 																				uni.downloadFile({
-																					url: `http://192.168.43.62:8080/api/images/getImage?fileId=${example._id}`,
+																					url: `${globalConfig.getImgURL}${example._id}`,
 																					header: {
 																						'token': apiToken
 																					},
@@ -350,7 +349,7 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 			console.log(dataList);
 			if (dataList != null && dataList.length > 0) {
 				let doneRecordList = dataList.filter(item => item.getString("status") == '3')
-				// console.log("uploadFiles", uploadFiles);
+				console.log(doneRecordList);
 				if (doneRecordList.length === 0) {
 					uni.showToast({ title: '上传图片数据为空', icon: 'error' });
 					return;
@@ -376,7 +375,7 @@ export const uploadDataToAPI = async (productCode : string, callback ?: () => vo
 						await new Promise<void>((resolve, reject) => {
 							// 使用uni.uploadFile进行文件上传
 							uni.uploadFile({
-								url: 'http://192.168.43.62:8080/api/images/upload',
+								url: `${globalConfig.uploadURL}`,
 								filePath: fullFilePath,
 								name: 'file', // 文件参数名
 								header: {