Commit 514025b4 authored by Damon's avatar Damon

Merge branch 'fix-photo-upload' into test

parents d7e7b4bf 57f0d510
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'http://deudn.c.pp.cc/', qn_asset_url: 'http://deudn.c.pp.cc/',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.4.7' version: 'v1.4.8'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
;(function() { ;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null let ENV_VAR = null
let VERSION_NUMBER = '1.4.7' //版本号 let VERSION_NUMBER = '1.4.8' //版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -10,7 +10,7 @@ const UNI_APP = { ...@@ -10,7 +10,7 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 0, argoDebugMode: 0,
version: 'v1.4.7' version: 'v1.4.8'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -11,6 +11,6 @@ const UNI_APP = { ...@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url: 'https://qn-static.banshouhui.com/self-support/', qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
qn_asset_url: 'https://qn-static.banshouhui.com', qn_asset_url: 'https://qn-static.banshouhui.com',
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.4.7' version: 'v1.4.8'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
// 拍照项张数目增加 等于10张 // 拍照项张数目增加 等于10张
photo.allImages.unshift( photo.allImages.unshift(
{ {
size: photo.tempPath.size,
path: photo.tempPath.mixWater, path: photo.tempPath.mixWater,
src: photo.tempPath.mixWater, src: photo.tempPath.mixWater,
key: this.fileMaps[0] ? this.fileMaps[0].key : '', key: this.fileMaps[0] ? this.fileMaps[0].key : '',
......
...@@ -44,6 +44,15 @@ ...@@ -44,6 +44,15 @@
</template> </template>
<script> <script>
const formatSize = function(size, pointLength, units) {
var unit;
units = units || [ 'B', 'K', 'M', 'G' ];
while ( (unit = units.shift()) && size > 1024 ) {
size = size / 1024;
}
return (unit === 'B' ? size : size.toFixed( pointLength === undefined ? 2 : pointLength)) + unit;
}
let r = require("@/libs/bmap-wx.min.js"); let r = require("@/libs/bmap-wx.min.js");
let h = new r.BMapWX({ let h = new r.BMapWX({
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG", // ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
...@@ -382,7 +391,7 @@ ...@@ -382,7 +391,7 @@
}) })
}, },
// 第二步:绘制画布 // 第二步:绘制画布
drawCanvas: function(tempPath) { drawCanvas: async function(tempPath) {
uni.showLoading({ uni.showLoading({
title: '数据处理中...', title: '数据处理中...',
icon: 'loading' icon: 'loading'
...@@ -449,9 +458,11 @@ ...@@ -449,9 +458,11 @@
width: canvasWidth, width: canvasWidth,
height: canvasHeight, height: canvasHeight,
canvasId: 'canvas', canvasId: 'canvas',
success: (res) => { success: async (res) => {
const size = await this.getImageSize(res.tempFilePath)
this.tempImgs.mixWater = res.tempFilePath this.tempImgs.mixWater = res.tempFilePath
globalTempPath.origin = this.tempImgs.origin globalTempPath.origin = this.tempImgs.origin
globalTempPath.size = formatSize(size) || ''
globalTempPath.mixWater = res.tempFilePath globalTempPath.mixWater = res.tempFilePath
let timer = setTimeout(()=>{ let timer = setTimeout(()=>{
//this.goPage('/pages/photo/preview') //this.goPage('/pages/photo/preview')
...@@ -483,7 +494,19 @@ ...@@ -483,7 +494,19 @@
fail() {} fail() {}
}) })
}, },
getImageSize(path) {
return new Promise((resolve, reject) => {
wx.getFileInfo({
filePath: path,
success (res) {
resolve(res.size)
},
fail() {
resolve(0)
}
})
})
},
showPreviewFn(img) { showPreviewFn(img) {
uni.previewImage({ uni.previewImage({
current: 0, current: 0,
......
import uploader from '@/plugins/uploader/index.js' import uploader from '@/plugins/uploader/index.js'
const globalUrl = process.uniEnv || {} const globalUrl = process.uniEnv || {}
const randomChar = function(l, url = "") { const randomChar = function(l, url = "") {
const x = "0123456789qwertyuioplkjhgfdsazxcvbnm"; const x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
let tmp = ""; let tmp = "";
...@@ -14,6 +15,16 @@ const randomChar = function(l, url = "") { ...@@ -14,6 +15,16 @@ const randomChar = function(l, url = "") {
tmp tmp
); );
} }
const formatSize = function(size, pointLength, units) {
var unit;
units = units || [ 'B', 'K', 'M', 'G' ];
while ( (unit = units.shift()) && size > 1024 ) {
size = size / 1024;
}
return (unit === 'B' ? size : size.toFixed( pointLength === undefined ? 2 : pointLength)) + unit;
}
export default { export default {
name: 'upload', name: 'upload',
components: {}, components: {},
...@@ -52,7 +63,8 @@ export default { ...@@ -52,7 +63,8 @@ export default {
return { return {
time: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd hh:MM:ss'), time: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd hh:MM:ss'),
key: key, key: key,
path: v, path: v.path,
size: formatSize(v.size) || '',
src: key, src: key,
...order ...order
} }
...@@ -79,7 +91,7 @@ export default { ...@@ -79,7 +91,7 @@ export default {
sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
sourceType: data.sourceType || ['album', 'camera'], //从相册选择 sourceType: data.sourceType || ['album', 'camera'], //从相册选择
success: function(res) { success: function(res) {
const lists = self.saveToTask(res.tempFilePaths, order) const lists = self.saveToTask(res.tempFiles, order)
resolve(lists) resolve(lists)
}, },
fail: err => { fail: err => {
......
...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
domain: 'http://upload.qiniup.com', // 七牛上传域名地址 domain: 'https://upload-z2.qiniup.com', // 七牛上传域名地址
uptokenURL: globalUrl.systemUrl.apiUrl + '/wxh-cloud-rest/rest/qiniu/token', // 上传token地址 uptokenURL: globalUrl.systemUrl.apiUrl + '/wxh-cloud-rest/rest/qiniu/token', // 上传token地址
files:[], // 上传文件 files:[], // 上传文件
fileMaps:[], // 上传文件返回对象 fileMaps:[], // 上传文件返回对象
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
initQiniu: function() { initQiniu: function() {
var defaulfs = { var defaulfs = {
// bucket所在区域,这里是华北区。ECN, SCN, NCN, NA, ASG,分别对应七牛云的:华东,华南,华北,北美,新加坡 5 个区域 // bucket所在区域,这里是华北区。ECN, SCN, NCN, NA, ASG,分别对应七牛云的:华东,华南,华北,北美,新加坡 5 个区域
region: 'ECN', region: 'SCN',
bucket: 'fa-cms', bucket: 'fa-cms',
qiniuBucketURLPrefix: 'uploads', qiniuBucketURLPrefix: 'uploads',
// 获取uptoken方法三选一即可,执行优先级为:uptoken > uptokenURL > uptokenFunc。三选一,剩下两个置空。推荐使用uptokenURL,详情请见 README.md // 获取uptoken方法三选一即可,执行优先级为:uptoken > uptokenURL > uptokenFunc。三选一,剩下两个置空。推荐使用uptokenURL,详情请见 README.md
......
import uploader from '@/plugins/uploader/index.js' import uploader from '@/plugins/uploader/index.js'
import { RUN, ERROR } from "@/common/log.js" import { RUN, ERROR } from "@/common/log.js"
const getNetworkType = function() {
return new Promise((resolve, reject) => {
uni.getNetworkType({
success (res) {
resolve(res.networkType)
},
fail (res) {
resolve('获取失败')
}
})
})
}
export default { export default {
/** /**
* 执行任务队列 * 执行任务队列
*/ */
async uploadImageTask(that) { async uploadImageTask(that) {
const uploadTask = JSON.parse(JSON.stringify(that.uploadTask)) const uploadTask = JSON.parse(JSON.stringify(that.uploadTask))
const networkType = await getNetworkType()
const options = { const options = {
files: uploadTask, // 必填 临时文件路径 格式: [{path: "图片地址"}] files: uploadTask, // 必填 临时文件路径 格式: [{path: "图片地址"}]
load: false, //(默认 true 说明:本接口是否提示加载动画) load: false, //(默认 true 说明:本接口是否提示加载动画)
...@@ -15,7 +29,8 @@ export default { ...@@ -15,7 +29,8 @@ export default {
const log = { const log = {
...res, ...res,
mobile: that.vuex_user.mobile mobile: that.vuex_user.mobile,
networkType: networkType
} }
delete log.files delete log.files
RUN('upload_photo_success', log) RUN('upload_photo_success', log)
...@@ -33,6 +48,7 @@ export default { ...@@ -33,6 +48,7 @@ export default {
err.mobile = that.vuex_user.mobile err.mobile = that.vuex_user.mobile
if(!err.key) err.files = uploadTask if(!err.key) err.files = uploadTask
if(!err.orderNumber) err.orderNumber = uploadTask[0].orderNumber if(!err.orderNumber) err.orderNumber = uploadTask[0].orderNumber
if(!err.networkType) err.networkType = networkType
ERROR('upload_photo_error', err) ERROR('upload_photo_error', err)
if (err.errMsg && (err.errMsg.indexOf('fail file not found') !== -1 || err.errMsg.indexOf('file doesn') !== -1)) { // 在任务中删除不存在的图片 if (err.errMsg && (err.errMsg.indexOf('fail file not found') !== -1 || err.errMsg.indexOf('file doesn') !== -1)) { // 在任务中删除不存在的图片
......
...@@ -5,6 +5,11 @@ ...@@ -5,6 +5,11 @@
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
"networkTimeout" : {
"connectSocket": 100000,
"uploadFile": 100000,
"downloadFile": 100000
},
"app-plus" : { "app-plus" : {
"optimization" : { "optimization" : {
"subPackages" : true "subPackages" : true
......
...@@ -1147,14 +1147,13 @@ export default { ...@@ -1147,14 +1147,13 @@ export default {
// 拍照回调 // 拍照回调
async closeTake(val) { async closeTake(val) {
if (val && val.length > 0) { if (val && val.length > 0) {
const files = val.map((v) => v.path)
const order = { const order = {
orderNumber: this.orderNumber, orderNumber: this.orderNumber,
fieldsName: this.photoItem.fieldsName, fieldsName: this.photoItem.fieldsName,
fieldsTitle: this.photoItem.fieldsTitle, fieldsTitle: this.photoItem.fieldsTitle,
uploadType: 'camera' uploadType: 'camera'
} }
const value = await this.saveToTask(files, order) const value = await this.saveToTask(val, order)
this.$refs[ this.$refs[
`fileChild${this.photoItem.groupIndex}${this.photoItem.itemIndex}` `fileChild${this.photoItem.groupIndex}${this.photoItem.itemIndex}`
][0].setTmpValue(value) ][0].setTmpValue(value)
......
...@@ -534,8 +534,7 @@ export default { ...@@ -534,8 +534,7 @@ export default {
// 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面, // 获取返回的图片 ,如果返回的图片存在则直接异常签约,成功后跳转到去完工页面,
if (img) { if (img) {
// 拍照完成 // 拍照完成
const files = img.map((v) => v.path) const value = await this.saveToTask(img)
const value = await this.saveToTask(files)
this.isErrorSign = true this.isErrorSign = true
this.errorSignUrl = value[0].key this.errorSignUrl = value[0].key
this.handleBtn() this.handleBtn()
......
...@@ -257,14 +257,13 @@ ...@@ -257,14 +257,13 @@
if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = [] if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = []
// 真实地址key // 真实地址key
let saveList = this.currentItemDate.key let saveList = this.currentItemDate.key
const files = img.map(v => v.path)
const order = { const order = {
orderNumber: this.orderNumber, orderNumber: this.orderNumber,
fieldsName: this.currentItemDate.fieldsName, fieldsName: this.currentItemDate.fieldsName,
fieldsTitle: this.currentItemDate.fieldsTitle, fieldsTitle: this.currentItemDate.fieldsTitle,
uploadType: 'camera' uploadType: 'camera'
} }
const value = await this.saveToTask(files, order) const value = await this.saveToTask(img, order)
value.forEach(item =>{ value.forEach(item =>{
// 文件key添加保存数组中 // 文件key添加保存数组中
saveList.push(item.key) saveList.push(item.key)
......
...@@ -41,7 +41,7 @@ uploader.getQnToken = function(params) { ...@@ -41,7 +41,7 @@ uploader.getQnToken = function(params) {
visitPrefix: data.host, visitPrefix: data.host,
token: data.data || '', token: data.data || '',
folderPath: data.folderPath || '', folderPath: data.folderPath || '',
region: "ECN" region: "SCN"
}) })
}).catch(() => { }).catch(() => {
let err = { let err = {
......
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
switch (code) { switch (code) {
case 'ECN': uploadURL = 'https://upload.qiniup.com'; break; case 'ECN': uploadURL = 'https://upload.qiniup.com'; break;
case 'NCN': uploadURL = 'https://up-z1.qbox.me'; break; case 'NCN': uploadURL = 'https://up-z1.qbox.me'; break;
case 'SCN': uploadURL = 'https://up-z2.qbox.me'; break; case 'SCN': uploadURL = 'https://upload-z2.qiniup.com'; break;
case 'NA': uploadURL = 'https://up-na0.qbox.me'; break; case 'NA': uploadURL = 'https://up-na0.qbox.me'; break;
case 'ASG': uploadURL = 'https://up-as0.qbox.me'; break; case 'ASG': uploadURL = 'https://up-as0.qbox.me'; break;
default: console.error('please make the region is with one of [ECN, SCN, NCN, NA, ASG]'); default: console.error('please make the region is with one of [ECN, SCN, NCN, NA, ASG]');
......
const qiniuUploader = require("./qiniuUploader"); const qiniuUploader = require("./qiniuUploader");
//七牛云上传文件命名 //七牛云上传文件命名
export const randomChar = function(l, url = "") { export const randomChar = function(l, url = "") {
const x = "0123456789qwertyuioplkjhgfdsazxcvbnm"; const x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
...@@ -69,7 +70,7 @@ export const chooseVideo = function(data) { ...@@ -69,7 +70,7 @@ export const chooseVideo = function(data) {
} }
// 七牛云上传 // 七牛云上传
export const qiniuUpload = function(requestInfo, qnRes) { export const qiniuUpload = function(requestInfo, qnRes) {
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
if (Array.isArray(requestInfo.files)) { if (Array.isArray(requestInfo.files)) {
let len = requestInfo.files.length; let len = requestInfo.files.length;
let fileList = new Array; let fileList = new Array;
...@@ -87,7 +88,6 @@ export const qiniuUpload = function(requestInfo, qnRes) { ...@@ -87,7 +88,6 @@ export const qiniuUpload = function(requestInfo, qnRes) {
qnRes.visitPrefix = qnRes.visitPrefix.substring(0, prefixLen - 1) qnRes.visitPrefix = qnRes.visitPrefix.substring(0, prefixLen - 1)
} }
uploadFile(0); uploadFile(0);
function uploadFile(i) { function uploadFile(i) {
let item = requestInfo.files[i]; let item = requestInfo.files[i];
let updateUrl = item.key //randomChar(10, qnRes.folderPath); let updateUrl = item.key //randomChar(10, qnRes.folderPath);
...@@ -114,10 +114,10 @@ export const qiniuUpload = function(requestInfo, qnRes) { ...@@ -114,10 +114,10 @@ export const qiniuUpload = function(requestInfo, qnRes) {
} else { } else {
resolve(fileList); resolve(fileList);
} }
}, (error) => { }, async (error) => {
const rejectMsg = { const rejectMsg = {
...error, ...error,
...item ...item,
} }
reject(rejectMsg); reject(rejectMsg);
}, { }, {
......
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