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

pages/jiuzhai/components/sign/index.vue

@@ -313,8 +313,16 @@
 						const price = this.priceList.find(p => p.startDate == ds)
 						if (price) {
 							isexsit = true
-							if (price.remainNum > 0)
-								days.push(this.$utils.getretailer() ? price.b2BPrice : price.b2CPrice)
+							if (price.remainNum > 0){
+								let priceNum = 0
+								// #ifdef MP-DI
+									priceNum = price.b2CPrice
+								/// #endif
+								// #ifdef MP-AG
+									priceNum = price.b2BPrice
+								/// #endif
+								days.push(priceNum)
+							}
 							else if (price.isSubstitution == 1)
 								days.push(-2)
 							else
@@ -334,7 +342,14 @@
 						//          if (x.startDate == `${year}-${m}-${d}`) {
 						//            isexsit = true;
 						//            if (x.remainNum > 0) {
-						//              days.push(this.$utils.getretailer() ? x.b2BPrice : x.b2CPrice);
+						//					let priceNum = 0
+						//					// #ifdef MP-DI
+						//						priceNum = x.b2CPrice
+						//					// #endif
+						//					// #ifdef MP-AG
+						//  					priceNum = x.b2BPrice
+						//					// #endif
+						//              days.push(priceNum);
 						// 	//days.push(x.b2CPrice);
 						//            } else {
 						//              days.push(-1);

pages/jiuzhai/jz_Line.vue

@@ -498,7 +498,14 @@
 										</view>
 										<view class="price" style="text-align: unset;">
 											<text>￥</text>
-											<text class="money">{{parseFloat($utils.getretailer()?item.b2BPrice:item.b2CPrice).toFixed(2)}}</text>
+											<text class="money">
+												<!-- #ifdef MP-DI -->
+													{{parseFloat(item.b2CPrice).toFixed(2)}}
+												<!-- #endif -->
+												<!-- #ifdef MP-AG -->
+													{{parseFloat(item.b2BPrice).toFixed(2)}}
+												<!-- #endif -->
+											</text>
 										</view>
 									</view>
 								</view>

pages/jiuzhai/jz_LineDetail.vue

@@ -54,10 +54,20 @@
 					<view class="col">
 						<!-- <text>同业价：</text>
 						<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ discountPrice }}</text> -->
+						<!-- #ifdef MP-AG -->
 							<text>原价：</text>
-						<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</text>
+						<!-- #endif -->
+							<text class="jz_renmin">¥</text>
+							<text class="jz_B2bPrice">
+								<!-- #ifdef MP-DI -->
+									{{currentPrice.b2CPrice}}
+								<!-- #endif -->
+								<!-- #ifdef MP-AG -->
+									{{currentPrice.b2BPrice}}
+								<!-- #endif -->
+							</text>
 						<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
-						
+						<!-- #ifdef MP-AG -->
 							<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}}
@@ -66,8 +76,9 @@
 							<text style="font-size: 13px;color:#111;margin-left: 10px;" v-else>
 								直客价：<text style="font-size: 20rpx;">¥</text>{{ currentPrice.b2CPrice}}
 							</text>
+						<!-- #endif -->
 					</view>
-
+					<!-- #ifdef MP-AG -->
 						<view v-if="stepNumber==0&&dataList.currentPriceInfo.teamType==0" class="row items-center jz_LineDetaCZ" style="border-radius: 4px;overflow: hidden;font-size: 12px;" >
 							<view class="jz_LineDetaCZL">
 								<view style="opacity: 0;">1</view>
@@ -77,11 +88,18 @@
 								<template v-else>30</template>元/人
 							</view>
 						</view>
+					<!-- #endif -->
+					
 				</view>
 				<view v-if="TotalDiscount>0" class="jz_LineDetaYJDKQ" style="padding: 0rpx 0 0 0;">
 					<view class="jz_LineDetaYJ">
 						<view class="jz_LineDetaYJL">
-							<!-- 原价 ¥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}/人起 -->
+							<!-- #ifdef MP-DI -->
+								<!-- 原价 ¥{{ currentPrice.b2CPrice }}/人起 -->
+							<!-- #endif -->
+							<!-- #ifdef MP-AG -->
+								<!-- 原价 ¥{{ currentPrice.b2BPrice }}/人起 -->
+							<!-- #endif -->
 						</view>
 						<view class="jz_LineDetaYJR">最高可减{{TotalDiscount}}</view>
 					</view>
@@ -92,7 +110,8 @@
 				</view>
 				<view class="jz_LineDetaYJDKQ" v-if="stepNumber>0 && dataList.currentPriceInfo.teamType==0">
 					<view class="jz_LineDetaFL">
-						<view v-if="" class="row items-center jz_LineDetaCZ" 
+						<!-- #ifdef MP-AG -->
+							<view class="row items-center jz_LineDetaCZ" 
 							style="border-radius: 4px;overflow: hidden;font-size: 12px;margin-right: 15rpx;" >
 								<view class="jz_LineDetaCZL">
 									<view style="opacity: 0;">1</view>
@@ -102,6 +121,7 @@
 									<template v-else>30</template>元/人
 								</view>
 							</view>
+						<!-- #endif -->
 						<!-- <view class="jz_LineDetaFLJf" >
 							预计：{{}}积分
 						</view> -->
@@ -272,7 +292,14 @@
 								<text style="font-size: 28rpx; font-weight: 600">可候补</text>
 							</view>
 							<view v-if="item.remainNum > 0 || item.isSubstitution==1" style="color: #ff3166; font-size: 26rpx">
-								￥{{ $utils.getretailer()?item.b2BPrice:item.b2CPrice}}</view>
+								￥
+								<!-- #ifdef MP-DI -->
+									{{ item.b2CPrice }}
+								<!-- #endif -->
+								<!-- #ifdef MP-AG -->
+									{{ item.b2BPrice }}
+								<!-- #endif -->
+							</view>
 							<view v-if="item.remainNum <= 0 && item.isSubstitution!=1" style="padding: 20rpx 0">
 								<text style="font-size: 32rpx; font-weight: 600">已售罄</text>
 							</view>
@@ -291,7 +318,14 @@
 							<text style="font-size: 28rpx; font-weight: 600">可候补</text>
 						</view>
 						<view style="color: #ff3166; font-size: 26rpx" v-if="customerDate.b2BPrice">
-							￥{{ $utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice }}</view>
+							￥
+							<!-- #ifdef MP-DI -->
+								{{ currentPrice.b2CPrice }}
+							<!-- #endif -->
+							<!-- #ifdef MP-AG -->
+								{{ currentPrice.b2BPrice }}
+							<!-- #endif -->
+						</view>
 						<view v-if="!customerDate.startDate" style="height: 100%;width: 100%; display: flex; align-items: center;justify-content: center;">
 							<view style="font-size: 24rpx; color: #999999">更多<br />班期</view>
 						</view>
@@ -934,7 +968,8 @@
 					<rich-text :nodes="dataList.feature.shopRemark"></rich-text>
 				</view>
 			</view>
-			<view class="jz_TripDays" v-if="dataList.feature && dataList.feature.b2BRemark && $utils.getretailer()">
+			<!-- #ifdef MP-AG -->
+				<view class="jz_TripDays" v-if="dataList.feature && dataList.feature.b2BRemark">
 					<span style="
 				display: inline-block;
 				position: relative;
@@ -962,6 +997,7 @@
 						<rich-text :nodes="dataList.feature.b2BRemark"></rich-text>
 					</view>
 				</view>
+			<!-- #endif -->
 			<view class="jz_TripDays" v-if="dataList.feature && dataList.feature.visaRemark">
 				<span style="
             display: inline-block;
@@ -1106,7 +1142,14 @@
 					<text style="font-size: 22rpx">¥</text>
 					<!-- 原b2b -->
 					<!--<text style="font-size: 40rpx;font-family: nav-font;">{{discountPrice}}</text>-->
-					<text style="font-size: 40rpx;font-family: nav-font;">{{$utils.getretailer()?currentPrice.b2BPrice:currentPrice.b2CPrice}}</text>
+					<text style="font-size: 40rpx;font-family: nav-font;">
+						<!-- #ifdef MP-DI -->
+							{{ currentPrice.b2CPrice }}
+						<!-- #endif -->
+						<!-- #ifdef MP-AG -->
+							{{ currentPrice.b2BPrice }}
+						<!-- #endif -->
+					</text>
 					<text style="font-size: 22rpx">/起</text>
 				</view>
 				<view style="display: flex; align-items: center">
@@ -1145,7 +1188,14 @@
 							</view>
 							<view style="color: #ff3166;">
 								<text class="jz_renmin">¥</text>
-								<text class="jz_B2bPrice">{{ $utils.getretailer()?(currentPrice.originalB2BPrice+x.BackAddPrice+x.GoAddPrice):(currentPrice.originalB2CPrice+x.BackAddPrice+x.GoAddPrice) }}</text>
+								<text class="jz_B2bPrice">
+									<!-- #ifdef MP-DI -->
+										{{currentPrice.originalB2CPrice+x.BackAddPrice+x.GoAddPrice}}
+									<!-- #endif -->
+									<!-- #ifdef MP-AG -->
+										{{ currentPrice.originalB2BPrice+x.BackAddPrice+x.GoAddPrice }}
+									<!-- #endif -->
+								</text>
 								<text style="color: #999999; font-size: 28rpx; font-weight: 400">/人起</text>
 							</view>
 						</view>
@@ -1220,6 +1270,7 @@
 					tcnum: "",
 					cityId: 0,
 					customerId: 0,
+					directCustomerId: 0,//直客Id
 				},
 				d: {},
 				scenicNum: 0, // 景点数量
@@ -1364,7 +1415,9 @@
 				},
 			},
 		},
-		created() {},
+		created() {
+			
+		},
 		onLoad(option) {
 			this.mc = this.$uiConfig.mainColor;
 			if(!uni.getStorageSync("b2b_user")){
@@ -1462,7 +1515,6 @@
 			SelectSales(item){
 				this.SaleName = item.EmName
 				this.SaleId = item.CreateBy
-				console.log("SaleId--------444444", this.SaleId);
 			},
 			getUserCouponList() {
 				let couponParams = {
@@ -1474,6 +1526,12 @@
 					"CustomerType": 0, //客户类型 0-同行，1-直客
 					"TCID": this.currentPrice.tcid,
 				}
+				// #ifdef MP-DI
+					couponParams.CustomerType = 1
+				// #endif
+				// #ifdef MP-AG
+					couponParams.CustomerType = 0
+				// #endif
 				if (this.currentPrice.teamType == "0") {
 					//跟团游
 					couponParams.CouponsUseScope = 2;
@@ -1500,7 +1558,13 @@
 									this.maxCouponDiscount = this.maxCouponDiscount<disMoney?disMoney:this.maxCouponDiscount
 								}
 							})
-							let money = this.$utils.getretailer()?this.currentPrice.b2BPrice:this.currentPrice.b2CPrice
+							let money = 0
+							//#ifdef MP-DI
+								money = this.currentPrice.b2CPrice
+							//#endif
+							//#ifdef MP-AG
+								money = this.currentPrice.b2BPrice
+							//#endif
 							let maxCouponDiscount = this.maxCouponDiscount
 							this.TotalDiscount = this.maxCouponDiscount
 							if(this.stepNumber<5){
@@ -1728,7 +1792,9 @@
 								this.stepNumber = this.dataList.orderNum
 								this.UnfOddNumber = (Number(this.stepNumber)-5)*-1
 								if(this.stepNumber>4) this.Discounts +=  1
+								// #ifdef MP-AG
 									if(this.dataList.currentPriceInfo.teamType==0) this.Discounts += 1
+								// #endif
 								try {
 									this.formatDay();
 								} catch (e) {