Merge remote-tracking branch 'origin/master'

.env.js

 ;
 (function() {
-	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境  
+	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {

src/components/photo/preview.vue

@@ -72,7 +72,7 @@
 						return
 					}
 					let path = ''
-					if(photo.tempPath.origin && photo.waterSetting.hasOrigin){
+					if(photo.tempPath.origin && photo?.waterSetting?.hasOrigin){
 						// 保存原图到本地
 						path = photo.tempPath.origin
 						let result =  await this.saveLocal(path)