Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pagesHouse/Mine/ordersList/details/details.vue

@@ -6,13 +6,9 @@
 			<view class="head">
 				<text v-if="merchantType==10">{{FishJialeOcfg[infoMation.status]}}</text>
 				<text v-esle>{{FishJialeOcfg2[infoMation.orderStatus]}}</text>
-				<!-- <view class="time" v-if="merchantType==4">
-					有效期：{{infoMation.activityStartTime&&infoMation.activityStartTime.substring(0,10)}}至{{infoMation.activityEndTime&&infoMation.activityEndTime.substring(0,10)}}
-				</view> -->
 				<view class="time" v-if="merchantType==4">
-					有效期：{{infoMation.activityStartTime}}至{{infoMation.activityEndTime}}
+					有效期：{{infoMation.activityStartTime&&infoMation.activityStartTime.substring(0,10)}}至{{infoMation.activityEndTime&&infoMation.activityEndTime.substring(0,10)}}
 				</view>
-
 			</view>
 			<view class="ticketInfo">
 				<!-- <view class="hander-titles">
@@ -24,33 +20,37 @@
 					</view>
 				</view> -->
 				<view v-if="merchantType==10" class="dateAndType">
-					<u-icon name="calendar" size="40" color="#272636"
-						style="display: flex;align-items: center;"></u-icon>
-					<text>{{infoMation.payTime}}出发/{{infoMation.orderType==3?'拼船':'包船'}}</text>
+					<u-icon name="calendar" size="40" color="#272636" style="display: flex;align-items: center;"></u-icon>
+					<text>{{infoMation.playDate}} {{infoMation.playTime}}出发/{{infoMation.orderType==3?'拼船':'包船'}}</text>
 				</view>
 				<view class="ticketInfo-hander">
 					<view class="image">
-						<image :src="infoMation.productImg" mode="aspectFill"></image>
+						<image :src="infoMation.isFisheringGoodsDTO.coverImg" mode="aspectFill" v-if="merchantType==10"></image>
+						<image :src="infoMation.productImg&&infoMation.productImg.split(',')[0]" mode="aspectFill" v-else></image>
+						
 					</view>
 					<view class="right">
 						<view class="name">
-							{{infoMation.productName}}
+							{{merchantType==10?infoMation.goodsName:infoMation.productName}}
 						</view>
+						<template v-if="merchantType==10">
 						<view class="tip">
 							<text v-if='infoMation.orderType==3'>价格：￥{{infoMation.avePrice}}/人</text>
 							<text v-if='infoMation.orderType==2'>价格：￥{{infoMation.totalPrice}}/艘</text>
 							<text v-if='infoMation.orderType==1'>价格：￥{{infoMation.discountPrice}}/艘</text>
 						</view>
 						<view class="price">
-							<view class="" v-if="merchantType==10">
-								<text>数量：</text>X<text>{{infoMation.detailDto.length}}</text>
-							</view>
-							<view v-else>
-								<text>{{infoMation.notice}}</text>
-								<view style="font-size: 30rpx ;color: #111111; font-weight: bold;margin-top: 10rpx;">
-									￥{{infoMation.orderAmount}}</view>
-							</view>
+							<text style="font-size: 30rpx;">数量：</text>X<text>{{infoMation.detailDto&&infoMation.detailDto.length}}</text>
+						</view>
+						</template>
+						<template v-if="merchantType==4">
+						<view class="tip">
+							<text>周一至周日 · 无需预约</text>
+						</view>
+						<view class="price">
+							<text>￥</text><text>{{infoMation.realityPay}}</text>
 						</view>
+						</template>
 					</view>
 				</view>
 			</view>
@@ -60,7 +60,7 @@
 				</view>
 				<view class="li" v-for="(item,inex) in infoMation.productsDetail" :key="index">
 					<text>{{item.name}}</text>
-					<text>（{{item.number}}份）</text>
+					<text>{{item.number}}</text>
 					<text>￥{{item.price}}</text>
 				</view>
 			</view>
@@ -104,7 +104,7 @@
 					<u-cell :border="false">
 						<text slot="icon" class="txt">联系方式</text>
 						>
-						<text slot="title" class="val">{{infoMation.guestPhone}}</text>
+						<text slot="title" class="val">{{infoMation.phone}}</text>
 					</u-cell>
 				</template>
 				<template v-if="merchantType==10">
@@ -114,7 +114,7 @@
 						<text slot="title" class="val">{{infoMation.orderTime}}</text>
 					</u-cell>
 					<u-cell :border="false">
-						<text slot="icon" class="txt">下单时间</text>
+						<text slot="icon" class="txt">联系人</text>
 						>
 						<text slot="title" class="val">{{infoMation.linkName}}</text>
 					</u-cell>
@@ -212,7 +212,7 @@
 			}
 		},
 		methods: {
-			init() {
+			init(){
 				if (this.merchantType == 10) {
 					this.info()
 				} else {
@@ -265,13 +265,12 @@
 					content: '确定核销订单？',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.get('/scenic/order/orderWriteOff/' + this.infoMation.orderCode).then(
-								res => {
-									if (res.data.code === 0) {
-										that.$showToast('订单已核销');
-										that.init();
-									} else that.$showToast(res.data.msg)
-								})
+							that.$api.get('/scenic/order/orderWriteOff/'+this.infoMation.orderCode).then(res => {
+								if (res.data.code === 0) {
+									that.$showToast('订单已核销');
+									that.init();
+								} else that.$showToast(res.data.msg)
+							})
 						}
 					}
 				});
@@ -358,16 +357,15 @@
 				color: #111;
 
 				&:first-child {
-					width: 200rpx;
+					width: 160rpx;
 				}
 
 				&:nth-child(2) {
 					color: #999;
 					text-align: right;
-
 					display: inline-block;
 					flex: 1;
-					margin-right: 60rpx;
+					margin-right: 30rpx;
 				}
 			}
 		}
@@ -426,15 +424,8 @@
 			font-weight: Regular;
 			margin: 0 20rpx 0 30rpx;
 		}
-
-		&.yk {
-
-			.txt,
-			.icon,
-			.val {
-				font-size: 30rpx;
-				color: #333;
-			}
+		&.yk{
+			.txt,.icon,.val {font-size: 30rpx;color: #333;}
 		}
 
 	}

pagesHouse/Mine/ordersList/index.vue

@@ -50,7 +50,7 @@
 						<text :class="oscConfig2[item.orderStatus]||'textDcx'">{{FishJialeOcfg2[item.orderStatus]}}</text>
 					</view>
 					<view class="mainContent" @tap="navTo(item)">
-						<image class="image" :src="item.productImg||'../../../static/orderEg.png'" mode="aspectFill">
+						<image class="image" :src="item.productImg&&item.productImg.split(',')[0]||'../../../static/orderEg.png'" mode="aspectFill">
 						</image>
 						<view class="middle">
 							<view class="title" style="display: flex; justify-content: space-between;">

pagesHouse/Verification/record.vue

@@ -13,11 +13,11 @@
 			<view class="item" v-for="(item,index) in data" :key="index">
 				<image :src="item.goodsType==2?'../../static/bao.png':'../../static/pin.png'"></image>
 				<view class="mid">
-					<text>{{item.playDate}}{{item.playTime}}出发/{{i.goodsType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
+					<text>{{item.playDate}} {{item.playTime}}出发/{{item.goodsType==2?'包船':'拼船'}}/{{item.boatNo}}</text>
 					<text>{{item.num}}人 · 出游{{item.playLength}}小时</text>
 					<text>核销时间：{{item.updateDate}}</text>
 				</view>
-				<view class="price">¥1500</view>
+				<view class="price">¥{{item.realPrice}}</view>
 			</view>
 		</view>
 		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"

pagesHouse/Verification/success.vue

@@ -25,9 +25,9 @@
 			this.price=opt.price;
 		},
 		methods: {
-			goHome() {
+			goHome(){
 				uni.navigateTo({
-					url: '/pages/home/index'
+					url: '/pagesHouse/home/index'
 				})
 			}
 		}