拍照工具3.1优化

take-order/pages/photo/take.vue

@@ -20,7 +20,7 @@
 				<cover-view class="txt u-m-t-10">地址：{{waterInfo.address || '正在获取中...'}}</cover-view>
 				<cover-view class="txt u-m-t-10">时间：{{waterInfo.date || '正在获取中...'}}</cover-view> -->
 			</cover-view>
-			<cover-image class="mark-water" mode="aspectFit" :src="waterInfo.markImage"></cover-image>
+			<cover-image v-if="waterSetting.mid_text" class="mark-water" mode="aspectFit" :src="waterInfo.markImage"></cover-image>
 		</camera>
 		<cover-view class="bottom-box" v-if="!standardShow">
 			<cover-image class="icon" src='/static/photo/icon-back.png' mode="" @click="goBack"></cover-image>
@@ -421,7 +421,7 @@
 					}
 					canvas.fillText(title.substr(0, 14), 10, canvasHeight - txtHeight * h++ - titleHeight / 2 + 10);
 				}
-				if (this.waterSetting) { // if (this.waterSetting && this.waterSetting.mid_text) {
+				if (this.waterSetting && this.waterSetting.mid_text) { // if (this.waterSetting && this.waterSetting.mid_text) {
 					//加入 水印图片
 					canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
 				}