Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

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 || item.images.length > 0}]">
+					<view :class="['rightContentView', {'active':item.imageList.length > 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 || item.images.length > 0">
-						<image class="rightImage" v-for="(image, index) in (item.imageList.length > 0 ? item.imageList : item.images)" :src="image" :key="image"
+					<view class="rightImageView" v-if="item.imageList.length > 0">
+						<image class="rightImage" v-for="(image, index) in item.imageList" :src="image" :key="image"
 							@click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
 					</view>
 				</view>
@@ -116,7 +116,7 @@
 			// 点击图片
 			handleClickImage(item, index) {
 				uni.previewImage({
-					urls: item.imageList.length > 0 ? item.imageList : item.images,
+					urls: item.imageList,
 					current:index
 				})
 			},
@@ -199,7 +199,8 @@
 		margin: 0rpx 30rpx 20rpx 30rpx;
 		padding: 36rpx 30rpx 18rpx 30rpx;
 		border-radius: 12rpx;
-		background-color: #FFFFFF;
+		background-color: #FFFFFF;
+		min-height: 108rpx;
 	}
 
 	.ph-lst-item-index {
@@ -212,12 +213,13 @@
 		text-align: center;
 		border-width: 1px;
 		border-style: solid;
-		margin-right: 10rpx;
+		margin-right: 10rpx;
+		margin-top: 4rpx;
 	}
 
 	.rightContentView {
 		display: flex;
-		align-items: center;
+		align-items: flex-start;
 		width: 100%;
 		font-size: 30rpx;
 		color: #2272FF;
@@ -231,9 +233,9 @@
 
 	.ph-list-item-arrow {
 		position: absolute;
-		width: 56rpx;
-		height: 56rpx;
-		right: 30rpx;
+		width: 40rpx;
+		height: 40rpx;
+		right: 38rpx;
 	}
 
 	.rightContent {
@@ -280,7 +282,6 @@
 		flex: 1;
 		background-color: #FFFFFF;
 		color: #999999;
-		
 	}
 	.topItemView.active {
 		color: #2272FF;

take-order/pages/photo/setting.vue

@@ -24,7 +24,7 @@
 			<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
 		</view>
 		<u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center"
-			width="690rpx" height="600rpx">
+			width="690rpx" height="600rpx" @close="handlePopClose">
 			<view class="popCenterView">
 				<text class="popTitle">设置自定义项</text>
 				<view class="inputBackView">
@@ -220,7 +220,12 @@
 				this.currenItem = {
 					'watemark_text': '',
 					'watemark_value': ''
-				}
+				}
+			},
+			
+			handlePopClose() {
+				this.showTipLeft = false,
+				this.showTipRight = false
 			},
 
 			//自定义弹窗 保存