Merge branch 'fix-photo-upload' into test

.env.dev.js

@@ -11,6 +11,6 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'http://deudn.c.pp.cc/',
 	argoDebugMode: 1,
-	version: 'v1.4.8'
+	version: 'v1.4.9'
 }
 module.exports = UNI_APP;

.env.js

 ;(function() {
-  let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
+  let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境
   let ENV_VAR = null
-  let VERSION_NUMBER = '1.4.8' //版本号
+  let VERSION_NUMBER = '1.4.9' //版本号
   //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
   if (process.env.NODE_ENV === 'development') {
     if (NODE_ENV === 'dev') {

.env.prod.js

@@ -10,7 +10,7 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 0,
-	version: 'v1.4.8'
+	version: 'v1.4.9'
 }
 
 module.exports = UNI_APP;

.env.test.js

@@ -11,6 +11,6 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 1,
-	version: 'v1.4.8'
+	version: 'v1.4.9'
 }
 module.exports = UNI_APP;

src/components/upload/task.js

@@ -19,7 +19,7 @@ export default {
      * 执行任务队列
      */
     async uploadImageTask(that) {
-        const uploadTask = JSON.parse(JSON.stringify(that.uploadTask))
+        const uploadTask = JSON.parse(JSON.stringify(that.uploadTask)).reverse()
         const networkType = await getNetworkType()
         const options = {
             files: uploadTask, // 必填 临时文件路径 格式: [{path: "图片地址"}]
@@ -58,7 +58,7 @@ export default {
         })
     },
     refreshTask(that, result) {
-        const uploadTask = JSON.parse(JSON.stringify(that.uploadTask))
+        const uploadTask = JSON.parse(JSON.stringify(that.uploadTask)).reverse()
         let newTask = [] 
         uploadTask.forEach(v => {
             if (!result.includes(`/${v.key}`)) { // 删除已上传的图片

src/pages/order/complete.vue

@@ -1038,7 +1038,7 @@ export default {
           }
         } else {
           this.$refs.uToast.show({
-            title: res.data,
+            title: res.message,
             type: 'error',
           })
         }