水印针对系统区分

take-order/pages/photo/list.vue

@@ -188,7 +188,6 @@
 						a.list.forEach(b => {
 							const row = photoLists.find(v => v._id === b._id)
 							if (row && row.imageList.length > 0) {
-								
 								b.imageList = row.imageList
 							}
 						})
@@ -224,7 +223,7 @@
 				this.rightList = item.list
 				const photo = getApp().globalData.photo
 				photo.topIndex = ikey
-				photo.waterSetting = item.userWatermark
+				// photo.waterSetting = item.userWatermark
 				uni.pageScrollTo({
 					scrollTop: 0,
 					duration: 0

take-order/pages/photo/preview.vue

@@ -175,7 +175,6 @@
 				const photo = getApp().globalData.photo
 				if (photo.currentItemLength < 10) photo.currentItemLength = photo.currentItemLength + 1
 				uni.hideLoading()
-				console.log(photo)
 				// 当前项的图片显示
 				// 拍照项张数目增加 等于10张
 				if(photo.currentItemLength<10){

take-order/pages/photo/setting.vue

@@ -160,7 +160,7 @@
 				this.loading = false
 				const photo = getApp().globalData.photo
 				const data = cache.getCache(this.systemId)
-				this.result = data.result[photo.topIndex].userWatermark
+				this.result = data.result[0].userWatermark
 			},
 			saveUserWatermark: function() {
 				// this.loading = true
@@ -181,9 +181,10 @@
 				// 离线处理方案
 				const photo = getApp().globalData.photo
 				const data = cache.getCache(this.systemId)
-				data.result[photo.topIndex].userWatermark = this.result
+				data.result[0].userWatermark = this.result
+				data.result[1].userWatermark = this.result
+				photo.waterSetting = this.result
 				cache.setCache(this.systemId, data)
-				photo.waterSetting = this.result
 			},
 
 			//保存原图 开关

take-order/pages/photo/take.vue

@@ -92,7 +92,6 @@
 		},
 		onLoad(e) {
 			const photo = getApp().globalData.photo
-			console.log(photo, 'global-photo')
 			getApp().trackPage('拍照页')
 			// this.ctx = uni.createCameraContext();
 			this.updateTime()
@@ -153,7 +152,7 @@
 		watch: {},
 		onShow() {
 			// 默认开启弹窗
-			const photo = getApp().globalData.photo
+			const photo = getApp().globalData.photo
 			this.waterSetting =  photo.waterSetting
 			this.standardShow = this.shadowInitShow
 			this.cameraChange = true
@@ -223,7 +222,7 @@
 				// console.log(this.cameraHeight,'this.cameraHeight')
 				// console.log(globalData.navHeight,'globalData.navHeight')
 				this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
-				// console.log(globalData.screenHeight,globalData.rpxScreenHeight,this.ratio)
+				// console.log(globalData.screenHeight,globalData.rpxScreenHeight,this.ratio)
 				this.waterSetting = globalData.photo.waterSetting
 				// this.cameraHeight = globalData.rpxScreenHeight
 			},
@@ -436,7 +435,8 @@
 							success: (res) => {
 								this.tempImgs.mixWater = res.tempFilePath
 								globalTempPath.origin = this.tempImgs.origin
-								globalTempPath.mixWater = res.tempFilePath
+								globalTempPath.mixWater = res.tempFilePath
+								this.goPage('/pages/photo/preview')
 								let timer = setTimeout(()=>{
 									this.goPage('/pages/photo/preview')
 								},0)