Commit d7e7b4bf authored by Damon's avatar Damon

Merge branch 'fix-photo-upload' into test

parents 26c47c98 adc87381
...@@ -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.3.9' version: 'v1.4.7'
} }
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.6' //版本号 let VERSION_NUMBER = '1.4.7' //版本号
//小程序是否审核通过,参数配置在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.6' version: 'v1.4.7'
} }
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.3.9' version: 'v1.4.7'
} }
module.exports = UNI_APP; module.exports = UNI_APP;
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
let lists = files.map(v => { let lists = files.map(v => {
const key = randomChar(10) const key = randomChar(10)
return { return {
time: this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd hh:MM:ss'),
key: key, key: key,
path: v, path: v,
src: key, src: key,
...@@ -61,7 +62,7 @@ export default { ...@@ -61,7 +62,7 @@ export default {
// const row = await this.saveFiles(path) // const row = await this.saveFiles(path)
// lists.push(row) // lists.push(row)
// } // }
const data = this.uploadTask const data = JSON.parse(JSON.stringify(this.uploadTask))
const saveLists = data.concat(lists) const saveLists = data.concat(lists)
this.$u.vuex('uploadTask', saveLists) this.$u.vuex('uploadTask', saveLists)
return lists return lists
......
...@@ -32,9 +32,10 @@ export default { ...@@ -32,9 +32,10 @@ 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
ERROR('upload_photo_error', err) ERROR('upload_photo_error', err)
if (err.errMsg && err.errMsg.indexOf('fail file not found') !== -1) { // 在任务中删除不存在的图片 if (err.errMsg && (err.errMsg.indexOf('fail file not found') !== -1 || err.errMsg.indexOf('file doesn') !== -1)) { // 在任务中删除不存在的图片
const newTask = uploadTask.filter(v => v.key !== err.key) const newTask = uploadTask.filter(v => v.key !== err.key)
that.$u.vuex('uploadTask', newTask) that.$u.vuex('uploadTask', newTask)
} }
......
...@@ -166,6 +166,7 @@ import Record from '@/components/order/performanceRecord.vue' ...@@ -166,6 +166,7 @@ import Record from '@/components/order/performanceRecord.vue'
import Detail from '@/components/order/detail.vue' import Detail from '@/components/order/detail.vue'
import BottomButtons from '@/components/order/bottomButtons.vue' import BottomButtons from '@/components/order/bottomButtons.vue'
import FeedbackContent from '@/components/order/feedback.vue' import FeedbackContent from '@/components/order/feedback.vue'
import upload from '@/components/upload/task.js'
// import ApplyList from "@/components/parts/applyList.vue" // import ApplyList from "@/components/parts/applyList.vue"
let now = new Date(new Date().toLocaleDateString()).getTime() let now = new Date(new Date().toLocaleDateString()).getTime()
...@@ -450,6 +451,10 @@ export default { ...@@ -450,6 +451,10 @@ export default {
} }
}, },
onShow() { onShow() {
if (this.uploadTask.length > 0) {
upload.uploadImageTask(this)
}
// 从过程反馈回来,需要刷新数据 // 从过程反馈回来,需要刷新数据
let pages = getCurrentPages() let pages = getCurrentPages()
let page = pages[pages.length - 1] let page = pages[pages.length - 1]
......
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