Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2

take-order/App.vue

@@ -109,6 +109,8 @@ export default {
 				classifyId: '', // 分类id
 				systemId: '', // 系统id
 			},
+			topIndex:0,
+			itemIndex:0,
 			currentItemLength: 0,//已拍摄照片张数
 			productList: [],
 			currentItem: null, // 选择的某一项

take-order/pages/photo/list.vue

@@ -102,7 +102,8 @@
 			handleTopItemChange: function(ikey, item) {
 				this.activeTop = ikey
 				this.rightList = item.list
-				const photo = getApp().globalData.photo
+				const photo = getApp().globalData.photo
+				photo.topIndex = ikey
 				photo.waterSetting = item.userWatermark
 				uni.pageScrollTo({
 					scrollTop: 0,
@@ -122,6 +123,7 @@
 			rightItemClick: function(item, ikey) {
 				const photo = getApp().globalData.photo
 				photo.currentItem = item
+				photo.itemIndex = ikey
 				uni.navigateTo({
 					url:'/pages/photo/take'
 				})

take-order/pages/photo/preview.vue

@@ -70,6 +70,16 @@
 						})
 					}
 				}
+				if(photo.currentItem){
+					photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
+				}
+				// if(photo.productList && photo.productList[photo.topIndex]){
+				// 	const topArr = photo.productList[photo.topIndex]
+				// 	if(topArr[photo.itemIndex]){
+				// 		topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
+				// 	}
+				// }
+				// photo.
 				if(photo.tempPath.mixWater){
 					// 保存水印处理图片到本地
 					path = photo.tempPath.mixWater

take-order/pages/photo/take.vue

@@ -112,7 +112,7 @@
 				let arr = []
 				// 包含经纬度
 				const waterInfo = this.waterInfo
-				arr = ['经度嘟嘟嘟激励大家了杰拉德杰拉德了大量聚集的决定立即登录： ' + waterInfo.longitude, '纬度： ' + waterInfo.latitude, '地址： ' + waterInfo.address, '时间： ' +
+				arr = ['经度： ' + waterInfo.longitude, '纬度： ' + waterInfo.latitude, '地址： ' + waterInfo.address, '时间： ' +
 					waterInfo.date
 				]
 				let settingTxtArr = []
@@ -199,6 +199,7 @@
 				this.cameraInfo[type] = val
 			},
 			initData() {
+				this.standardShow = true
 				const globalData = getApp().globalData
 				this.navHeight = globalData.navHeight
 				this.ratio = globalData.screenHeight / globalData.rpxScreenHeight