Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

http/yskApi/http.js

@@ -207,13 +207,16 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
 				url: baseUrl + uri,
 				formData: data,
 				name: "file",
-				filePath: file.path,
+				filePath: file.path||file.url,
 								header: getHeader()
 			}, extParams)
 		).then((httpData) => {
 			// uni.upload 返回bodyData 的是 string类型。 需要解析。 
 			httpData.data = JSON.parse(httpData.data)
 			return Promise.resolve(httpData)
+		}).catch(err=>{
+			uni.hideLoading()
+			infoBox.showErrorToast(`上传失败`)
 		})
 	})
 }