Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

components/buyKnow.vue

@@ -13,14 +13,15 @@
 					挂牌价：￥{{buyKnowData.originalPrice}}
 				</view>
 			</view>
-			
-			
-			
 			<view style="flex: 1;overflow-y: scroll;">
 				<view class="middle">
 					<view style="margin-top: 30rpx;">
-						<image style="width: 100%;" v-for="(item,index) in buyKnowData.productImgs" :key="index" :src="item.url"></image>
+						<!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 -->
+						<image style="width: 100%;" v-for="(item,index) in buyKnowData.productImgs||buyKnowData.imgResVos" :key="index" :src="item.url" mode="widthFix">
+							
+						</image>
 					</view>
+					<!-- 组合票页面和订单填写页面后端返回的字段不一致，所以取两个值 -->
 					<view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos||buyKnowData.productTitleData" :key="a">
 						<view class="middle-title">
 							{{item.title}}