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

take-order/components/photo/standard.vue

@@ -4,11 +4,11 @@
 			<swiper class="swiper-box" :current="swiperCurrent" @transition="transition"
 				@animationfinish="animationfinish">
 				<swiper-item class="swiper-item">
-					<view class="inner">
+					<view class="inner txt-inner" :style="{'background-image':'url(/static/photo/shadow-bg.png)'}">
 						<view class="title">
 							拍照要求
 						</view>
-						<view class="txt-box">
+						<view class="txt-box" >
 							<view class="txt" v-for="(txt,index) in currentItem.main_point" :key="index">
 								{{index+1}}. {{txt}}
 							</view>
@@ -141,9 +141,14 @@
 	.swiper-item .inner {
 		padding: 30rpx;
 		background-color: #fff;
+		width:690rpx;
 		height: 690rpx;
 		overflow: hidden;
-
+		&.txt-inner{
+			background-position: bottom right;
+			background-size: 340rpx 380rpx;
+			background-repeat: no-repeat;
+		}
 		.title {
 			margin-top: 20rpx;
 			font-weight: bold;
@@ -161,8 +166,10 @@
 		}
 
 		.txt-box {
-			max-height: 560rpx;
+			// max-height: 560rpx;
 			overflow: auto;
+			width:100%;
+			height: 560rpx;
 		}
 
 		.txt {