Commit b76391a4 authored by 李超鹏's avatar 李超鹏

Merge remote-tracking branch 'origin/master'

parents 0afeadc7 1d817303
; ;
(function() { (function() {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null;
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
return return
} }
let path = '' let path = ''
if(photo.tempPath.origin && photo.waterSetting.hasOrigin){ if(photo.tempPath.origin && photo?.waterSetting?.hasOrigin){
// 保存原图到本地 // 保存原图到本地
path = photo.tempPath.origin path = photo.tempPath.origin
let result = await this.saveLocal(path) let result = await this.saveLocal(path)
......
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