Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

# Conflicts:
#	components/coupon/index.vue

pages/jiuzhai/jz_LineDetail.vue

@@ -57,14 +57,13 @@
 						<text>原价：</text>
 						<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
 						<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
-						<!--
+						
 						<view class=""  v-if="stepNumber==0&&dataList.currentPriceInfo.teamType==0">
 							<text style="font-size: 13px;color:#111">
 								直客价：<text style="font-size: 20rpx;">¥</text>{{ currentPrice.b2CPrice}}
 							</text>
 						</view>
-						-->
-						<text style="font-size: 13px;color:#111;margin-left: 10px;">
+						<text style="font-size: 13px;color:#111;margin-left: 10px;" v-else>
 							直客价：<text style="font-size: 20rpx;">¥</text>{{ currentPrice.b2CPrice}}
 						</text>
 					</view>
@@ -1183,7 +1182,7 @@
 						fontSize: '14px',
 						margin: '0 auto',
 						width: '90vw',
-					}" @click="showSalePreviwe=false">确定</u-button>
+					}" @click="goReserce()">确定</u-button>
 			</view>
 		</u-popup>
 	</view>

pages/jiuzhai/jz_SureOrder.vue

@@ -366,7 +366,7 @@
 					<u-icon name="arrow" size="20" /> -->
 				</view>
 			</view>
-			<view class="jz_ReserTitle">
+			<view class="jz_ReserTitle" @click="goJzDetail">
 				{{ orderData.model.Title }}
 			</view>
 			<view class="jz_ReserIn" style="margin: 33rpx 0 18rpx 0">
@@ -597,6 +597,13 @@
 			}
 		},
 		methods: {
+			//跳转至详情
+			goJzDetail() {
+				let model = this.orderData.model;
+				uni.navigateTo({
+					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + model.TCID 
+				});
+			},
 			goback() {
 				uni.navigateBack({
 					delta: 1,

pages/visa/visaDetail.vue

@@ -218,7 +218,7 @@
 						fontSize: '14px',
 						margin: '0 auto',
 						width: '90vw',
-					}" @click="showSalePreviwe=false">确定</u-button>
+					}" @click="goReserce()">确定</u-button>
 			</view>
 		</u-popup>
 		<u-popup v-model="showDownload" mode="bottom" border-radius="50" length="60%" :safe-area-inset-bottom="true">

pages/visa/visa_SureOrder.vue

@@ -365,7 +365,7 @@
 					<u-icon name="arrow" size="20" /> -->
 				</view>
 			</view>
-			<view class="jz_ReserTitle">
+			<view class="jz_ReserTitle" @click="goDetail">
 				{{ orderData.ProductModel.Name }}
 			</view>
 			<view class="jz_ReserIn" style="margin: 33rpx 0 18rpx 0">
@@ -574,6 +574,11 @@
 			}
 		},
 		methods: {
+			goDetail() {
+				uni.navigateTo({
+					url: "/pages/visa/visaDetail?id="+this.orderData.ProductModel.Id
+				})
+			},
 			goback() {
 				uni.navigateBack({
 					delta: 1,