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

# Conflicts:
#	take-order/pages/photo/list.vue

take-order/components/photo/standard.vue

@@ -16,7 +16,7 @@
 				</view>
 			</swiper-item>
 			<swiper-item class="swiper-item" v-for="(src, index) in swiperList" :key="index">
-				<cover-image @click="previewImage(index)" class="icon" mode="aspectFit" :src="src"></cover-image>
+				<image @click="previewImage(index)" class="icon" mode="aspectFit" :src="src"></image>
 				
 			</swiper-item>
 		</swiper>
@@ -171,6 +171,10 @@
 			color:#333;
 			font-size: 36rpx;
 		}
+		&>image{
+			width:630rpx;
+			min-height: 630rpx;
+		}
 		.txt-box{
 			max-height: 560rpx;
 			overflow: auto;

take-order/pages/photo/list.vue

@@ -12,14 +12,14 @@
 			<view class="right-view-title">拍照项有：</view>
 			<template v-for="(item,ikey) in rightList">
 				<view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey">
-					<view :class="['rightContentView', {'active':item.imageList.length > 0}]">
+					<view :class="['rightContentView', {'active':item.imageList[0]}]">
 						<text class="ph-lst-item-index">{{ ikey + 1 }}</text>
 						<text class="">{{item.name}}</text>
 						<image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image>
 						<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
 					</view>
 					<view class="rightImageView" v-if="item.imageList.length > 0">
-						<image class="rightImage" v-for="(image, index) in item.imageList" :src="image" :key="image"
+						<image class="rightImage" v-for="(image, index) in item.imageList.slice(0 , 10)" :src="image" :key="index"
 							@click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
 					</view>
 				</view>

take-order/pages/photo/preview.vue

@@ -121,10 +121,13 @@
 				})
 			},
 			finishPhoto(){
+				const photo = getApp().globalData.photo
+				photo.currentItemLength = 10
+				this.continuePhoto()
 				// 完成本项
-				uni.navigateBack({
-					delta:2
-				})
+				// uni.navigateBack({
+				// 	delta:2
+				// })
 			},
 			// 确认图片
 			continuePhoto() {
@@ -149,7 +152,7 @@
 							if(res.result.code) {
 								// TODO 参数是否要来回传递
 								const photo = getApp().globalData.photo
-								photo.currentItemLength++
+								photo.currentItemLength = photo.currentItemLength + 1
 								// photo.currentItem.
 								// 当前项的图片显示
 								// 拍照项张数目增加 等于10张
@@ -159,8 +162,8 @@
 											delta:1
 										})
 									}else{
-										uni.redirectTo({
-											url:"pages/photo/list"
+										uni.navigateBack({
+											delta:2
 										})
 									}
 								},2000)

take-order/pages/photo/take.vue

@@ -10,7 +10,7 @@
 					src="/static/photo/icon-setting.png"></cover-image>
 			</cover-view>
 		</cover-view>
-		<camera class="camera-box" v-if="cameraChange&&!standardShow" :device-position="cameraInfo.devicePosition"
+		<camera class="camera-box" v-if="cameraChange&&!standardShow" v-show="" :device-position="cameraInfo.devicePosition"
 			:flash="cameraInfo.flash" :style="{'height':cameraHeight/2 + 'px','top':parseInt(navHeight/2) + 'px'}"
 			@error="cameraError">
 			<cover-view class="mark-box">
@@ -142,6 +142,8 @@
 		watch: {},
 		onShow() {
 			// 默认开启弹窗
+			const photo = getApp().globalData.photo
+			this.waterSetting =  photo.waterSetting
 			this.standardShow = this.shadowInitShow
 			// this.initData()
 		},