修改拍照时页面

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/preview.vue

@@ -152,18 +152,18 @@
 								// TODO 参数是否要来回传递
 								self.saveTempToLocal()
 								const photo = getApp().globalData.photo
-								photo.currentItemLength++
+								photo.currentItemLength = photo.currentItemLength + 1
 								// photo.currentItem.
 								// 当前项的图片显示
 								// 拍照项张数目增加 等于10张
 								let timer = setTimeout(()=>{
 									if(photo.currentItemLength<10){
 										uni.navigateBack({
-											delta:2
+											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()
 		},