diff --git a/common/api/url.js b/common/api/url.js index b321c93..6c2bd3f 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -2,6 +2,7 @@ export const host = 'http://47.102.220.189:58089/api/bizsvr' export default { + uploadFile: '/common/ossUpload', loginByApp: `/loginByApp`, // 登录 getInfoByApp: `/getInfoByApp`,// 获取用户基本信息 getEmisCountry: `/emis/emisCountry/list`, // 获取国家列表 diff --git a/common/manageServer.js b/common/manageServer.js index 5efa058..313c85e 100644 --- a/common/manageServer.js +++ b/common/manageServer.js @@ -1,9 +1,5 @@ -import { - goto -} from "./untool"; -import { - showToast -} from "./untool" +import { goto } from "./untool"; +import { showToast } from "./untool" // 请求接口 function dealRequest(def, url, param) { diff --git a/common/request.js b/common/request.js index f6b11cd..d808435 100644 --- a/common/request.js +++ b/common/request.js @@ -1,13 +1,8 @@ -import { - dealRequest -} from "./manageServer" -import { - showToast -} from "./untool" -import { - host -} from "./api" +import { dealRequest } from "./manageServer" +import { showToast } from "./untool" +import { host } from "./api" import { getSessionXToken } from "@/session" + const coreRequestBase = (url, reqParams, options = {}, methodType = "POST") => { const xToken = getSessionXToken() diff --git a/common/upload.js b/common/upload.js index 2319c87..791c6e6 100644 --- a/common/upload.js +++ b/common/upload.js @@ -1,6 +1,7 @@ import { handleResponse } from './manageServer.js' -import { apiUrls } from './api' //接口配置 +import { apiUrls, host } from './api' //接口配置 import { showToast } from "./untool" +import { getSessionXToken } from "@/session" const chooseFile = function (action = 'chooseImage', opt = {}) { @@ -32,23 +33,28 @@ const chooseFile = function (action = 'chooseImage', opt = {}) { const doRequest = function (file) { return new Promise((resolve, reject) => { + const xToken = getSessionXToken() uni.uploadFile({ - url: `${apiUrls.uploadFile}`, + url: `${host}${apiUrls.uploadFile}`, fileType: 'image', // TODO filePath: file, name: 'file', + header: { + "X-Token": xToken, + }, formData: { // 'user': 'test' }, success(res) { try { const data = JSON.parse(res.data) - handleResponse(data, resolve, reject) + handleResponse({ data, resolve, reject }) } catch (error) { reject() } }, fail() { + showToast("文件上传失败") reject() } }) @@ -64,7 +70,7 @@ const coreUploadFile = function (action = 'chooseImage', opt = {}) { } uni.showLoading() return doRequest(files[0]).then(res => { - return res + return res.url }).finally(()=> { uni.hideLoading() }) @@ -83,7 +89,7 @@ const coreMultiUploadFile = async (action = 'chooseImage', opt = {})=> { uni.showLoading() files.map(val=>{ const def = doRequest(val).then(res => { - return res + return res.url }) allDef.push(def) }) @@ -93,7 +99,7 @@ const coreMultiUploadFile = async (action = 'chooseImage', opt = {})=> { return resFiles }catch(e){ uni.hideLoading() - return files + throw Error(e) } } diff --git a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue index 91a3312..484a7d1 100644 --- a/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue +++ b/components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue @@ -1,60 +1,43 @@ + + - - - 供应商 - - - + + + - - - 自定义标记 - - - + + - + + +