修改联运，和部分BUG

pages.json

@@ -574,6 +574,15 @@
 					"enablePullDownRefresh": false
 				}
 			}
+                ,{
+                    "path" : "modify_password",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
             ]
 		},
 

pages/jiuzhai/components/sign/index.vue

@@ -328,8 +328,8 @@ export default {
             if (x.startDate == `${year}-${m}-${d}`) {
               isexsit = true;
               if (x.remainNum > 0) {
-                // days.push(this.$utils.getretailer() ? x.b2BPrice : x.b2CPrice);
-				days.push(x.b2CPrice);
+                days.push(this.$utils.getretailer() ? x.b2BPrice : x.b2CPrice);
+				//days.push(x.b2CPrice);
               } else {
                 days.push(-1);
               }

pages/jiuzhai/jz_Line.vue

@@ -421,7 +421,7 @@
 			<template v-else>
 				<view style="height: calc(100vh - 120px);overflow: hidden;">
 					<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
-						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index" @click="goJzDetail(item.tcid,item.configId)">
+						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index" @click="goJzDetail(item)">
 							<view class="jz_List">
 								<view class="jz_TuDiv">
 									<img class="jz_TuBigImg" mode="aspectFill" :src="getImgs(item.imgCover)" alt="" v-if="item.imgCover && item.imgCover.length>0 && getImgs(item.imgCover)!=''" />
@@ -436,6 +436,9 @@
 										<view class="start-city" style="margin-right: 20rpx;" v-if="item.startCityName">
 											<text>{{item.startCityName}}出发</text>
 										</view>
+										<view style="margin-right: 20rpx;" v-if="item.companyUnions && item.companyUnions.length>1">
+											<u-tag border-color="#DFBE6E" color="#FFF" bg-color="#DFBE6E" text="多个出发城市" size="mini"></u-tag>
+										</view>
 										<view>
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" :text="`${item.dayNum}天`" size="mini"></u-tag>
 										</view>
@@ -486,7 +489,7 @@
 					startDate: '',
 					endDate: '',
 					startCityId: -1,
-					companyId: -1,
+					companyId: 0,
 					searchKey: '', //搜索数据
 					priceOrderByField:2,
 					PlaceIds: '',
@@ -579,12 +582,10 @@
 			};
 		},
 		created() {
-			this.getLineQuery();
+			
 			uni.setNavigationBarTitle({
 				title: "精品旅游线路"
 			})
-			
-			
 		},
 		onLoad(option) {
 		  if(option&&option.LineTeamIds){			  
@@ -602,7 +603,8 @@
 		  if(option&&option.PlaceIds){
 		    this.msg.PlaceIds = option.PlaceIds
 		  }
-		  this.research();
+		  this.getLineQuery();
+		  
 		},
 		methods: {
 			allTeamsChangeHandler(e){
@@ -619,6 +621,7 @@
 			},
 			//获取查询条件
 			getLineQuery() {
+				let customerInfo = uni.getStorageSync("b2b_user")
 				this.apipost(
 					"b2b_get_GetMiniAppTravelQuery", {},
 					res => {
@@ -642,6 +645,14 @@
 							}else{
 								this.currentLineId = this.lineList[0]
 							}
+							if(customerInfo && customerInfo.salesBaseInfo){
+								let tempCompany = this.branchList.find(x=>x.BId == customerInfo.salesBaseInfo.rB_Branch_id)
+								console.log(tempCompany)
+								if(tempCompany && tempCompany.BId){
+									this.msg.companyId=tempCompany.BId
+									this.currentBrachName = tempCompany.BName
+								}
+							}
 							//let temp = ''
 							// if(this.msg.team.length>0){
 							// 	if(this.lineList.length>0){
@@ -656,6 +667,7 @@
 							// 	}
 							// }
 						}
+						this.research();
 					},
 					null
 				);
@@ -830,7 +842,8 @@
 					this.msg,
 					res => {
 						if (res.resultCode == 1) {
-							this.dataList = this.dataList.concat(res.data.pageData);
+							let format = this.getFormatUnionStartCityHandler(res.data.pageData)
+							this.dataList = this.dataList.concat(format);
 							this.page_count = res.data.pageCount;
 						}
 						this.loading=false
@@ -841,6 +854,30 @@
 					}
 				);
 			},
+			getFormatUnionStartCityHandler(data){
+				data.forEach(x=>{
+					if(x.unionList && x.unionList.length>0){
+						let companyUnions = x.unionList.filter(y=>y.unionBranchId==this.msg.companyId)
+						if(companyUnions && companyUnions.length>0){
+							if(companyUnions[0].unionCityId>0){
+								x.startCityId = companyUnions[0].unionCityId
+								x.startCityName = companyUnions[0].startCityName
+							}else{
+								let tempCity = this.branchList.find(y=>y.BId==this.msg.companyId)
+								if(tempCity && tempCity.CityId){
+									x.startCityId = tempCity.CityId
+									x.startCityName = tempCity.BName.replace('站','')
+								}
+							}
+							
+							// x.b2BPrice = x.b2BPrice + companyUnions[0].goAddPrice + companyUnions[0].backAddPrice
+							// x.b2CPrice = x.b2CPrice + companyUnions[0].goAddPrice + companyUnions[0].backAddPrice
+							x.companyUnions = companyUnions
+						}
+					}
+				})
+				return data
+			},
 			//获取日期
 			getStratDate(val) {
 				console.log(val, 'val');
@@ -855,9 +892,9 @@
 				}
 			},
 			//跳转至详情
-			goJzDetail(tcid, configId) {
+			goJzDetail(item) {
 				uni.navigateTo({
-					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId + '&cityId=' + this.CityId
+					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + item.tcid + '&configId=' + item.configId + '&cityId=' + (item.startCityId?item.startCityId:this.CityId)
 				});
 			},
 			//获取第一张图

pages/jiuzhai/jz_Reserve.vue

@@ -295,7 +295,7 @@
         {{ ltName }}
       </view>
       <view class="big-title">
-        <text>{{ currentPriceInfo.startCityName }}出发</text>
+        <text>{{ realCurrentPriceInfo.priceUnion && realCurrentPriceInfo.priceUnion.startCityName?realCurrentPriceInfo.priceUnion.startCityName:currentPriceInfo.startCityName }}出发</text>
       </view>
       <view class="jz_ReseQue">
         <img
@@ -628,7 +628,8 @@ export default {
 	  currentCoupon:{
 		  discountMoney:0
 	  },
-	  mainColor:''
+	  mainColor:'',
+	  realCurrentPriceInfo:{}
     };
   },
   created() {
@@ -651,7 +652,7 @@ export default {
       this.calcMoney();
     }
     if (option.tcid) {
-      this.getDetails(option.tcid);
+      this.getDetails(option.tcid,option.cityId);
     }
 	if(option.lineId){
 		this.lineId=option.lineId
@@ -697,16 +698,17 @@ export default {
       }
     },
     //获取详情
-    getDetails(id) {
+    getDetails(id,cityId) {
 	  uni.showLoading({
 		title: '加载中'
 	  });
       this.apipost(
         "b2b_get_GetB2BTravelInfoNoDesV1",
-        { tcid: id },
+        { tcid: id,cityId },
         (res) => {
 			uni.hideLoading();
           if (res.resultCode == 1) {
+			this.realCurrentPriceInfo = res.data.currentPriceInfo
             this.tips = res.data.feature.importantTipText;
             this.ltName = res.data.ltName;
 			this.currentPriceInfo.visaPrice = res.data.currentPriceInfo.visaPrice
@@ -861,7 +863,7 @@ export default {
         ContactName: ContactName,
         ContactMobile: ContactMobile,
         CustomerId: CustomerId,
-        DepartureCityId: 262,
+        DepartureCityId: 0,
         IsIntermodal: 2,
         Unit_Price: price,
         TC_Price: price,
@@ -898,7 +900,7 @@ export default {
         VisaNum: this.orderMsg.ManNum + this.orderMsg.ChirdNum,
         SafeNum: this.orderMsg.ManNum + this.orderMsg.ChirdNum,
         AirticketNum: 0,
-        ReturnArriveCityId: 262,
+        ReturnArriveCityId: 0,
         IsReturnIntermodal: 2,
         GoCityTime: "",
         BackCityTime: "",
@@ -915,6 +917,12 @@ export default {
         Remarks: this.Remarks, //备注
         //GuestList: newobj,
       };
+	  if(this.realCurrentPriceInfo.priceUnion){
+		msg.DepartureCityId = this.realCurrentPriceInfo.priceUnion.unionCityId
+		msg.IsIntermodal = 1
+		msg.ReturnArriveCityId = this.realCurrentPriceInfo.priceUnion.unionCityId
+		msg.IsReturnIntermodal=1
+	  }
       this.apipost(
         "sellorder_post_SetOrderInfoForB2B",
         msg,

pages/jiuzhai/modify_password.vue

+<template>
+	<view class="modify-page">
+		<!-- <view class="logo-head">
+			<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1695262844000_280.png" mode="widthFix"></image>
+			<view class="logo-text">旅小友</view>
+		</view> -->
+		<view class="modify-form">
+			<view class="modify-title">修改密码</view>
+			<view class="modify-item">
+				<input type="password" v-model="msg.currentPwd" placeholder="请输入你的当前密码" :class="{'focus':currentFocus=='account'}" @blur="changeCurrentFocus('')" @focus="changeCurrentFocus('account')">
+			</view>
+			<view class="modify-item">
+				<input type="password" v-model="msg.newPwd" placeholder="请输入你的新密码" :class="{'focus':currentFocus=='newPwd'}" @blur="changeCurrentFocus('')" @focus="changeCurrentFocus('newPwd')">
+				<view style="margin-top: 5px;font-size: 12px;color:#ccc">
+					提示：密码应是长度不小于8位的字母和数字组合
+				</view>
+			</view>
+			<view class="modify-item">
+				<input type="password" v-model="msg.secondPwd" placeholder="请再次输入你的新密码" :class="{'focus':currentFocus=='secondPwd'}" @blur="changeCurrentFocus('')" @focus="changeCurrentFocus('secondPwd')">
+				
+			</view>
+			<view class="modify-item">
+				<view class="modify-btn" @click="modifyPasswordHandler" :class="{'disable':msg.currentPwd==''||msg.newPwd==''||msg.secondPwd==''}">保存修改</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				msg:{
+					currentPwd:'',
+					newPwd:'',
+					secondPwd:''
+				},
+				currentFocus:'',
+				modifyLoading:false
+			}
+		},
+		methods: {
+			changeCurrentFocus(val){
+				this.currentFocus=val
+			},
+			modifyPasswordHandler(){
+				if(this.msg.currentPwd==''||this.msg.newPwd==''||this.msg.secondPwd=='') return;
+				if(!this.modifyLoading){
+					let regNumber = /\d+/
+					let regString = /[a-zA-Z]+/
+					this.modifyLoading=true
+					if(this.msg.currentPwd==0){
+						this.showErrorMsg('请输入当前登录密码')
+					}else if(this.msg.newPwd.length<8){
+						this.showErrorMsg('密码的长度不应该低于8位')
+					}else if((!regNumber.test(this.msg.newPwd))||(!regString.test(this.msg.newPwd))){
+						this.showErrorMsg('新密码应该为字母和数字组合')
+					}else if(this.msg.newPwd!=this.msg.secondPwd){
+						this.showErrorMsg('两次输入的密码不一致')
+					}else{
+						uni.showLoading()
+						let params={
+							newPassword:this.msg.newPwd,
+							oldPassword:this.msg.currentPwd
+						}
+						this.apipost("b2b_post_ModifyAccountPassowrd",params,(res) => {
+						    if (res.resultCode == 1) {
+								uni.showToast({
+									title:'密码修改成功',
+									icon:'none'
+								})
+								setTimeout(()=>{
+									uni.redirectTo({
+										url:'/pages/user-center/user-center'
+									})
+								},1000)
+							}
+							// else{
+							// 	this.showErrorMsg('密码修改失败，请重试或联系销售专员')
+							// }
+							uni.hideLoading()
+							this.modifyLoading=false
+						},(error)=>{
+							this.modifyLoading=false
+							uni.hideLoading()
+						})
+					}
+				}
+			},
+			showErrorMsg(msg){
+				uni.showToast({
+					title:msg,
+					icon:'error'
+				})
+				this.modifyLoading=false
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 修改密码保存。 */
+	@font-face {
+	  font-family: "modify-font";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/T24Rhfe1qmDx.woff2") format("woff2"),
+	  url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/yAHhA3kgong1.woff") format("woff");
+	  font-display: swap;
+	}
+	.modify-page{
+		padding:20px;
+	}
+	.modify-page .modify-form{
+		margin-top:50px;
+		padding:20px;
+	}
+	.modify-page .modify-form .modify-title{
+		font-size: 20px;
+		font-weight: 700;
+		font-family: modify-font;
+		margin-bottom: 30px;
+	}
+	.modify-page .modify-form  .modify-item{
+		margin-top: 30px;
+	}
+	.modify-page .modify-form  .modify-item input{
+		background-color: rgba(0,0,0,.05);
+		padding:0 12px;
+		height: 46px;
+		line-height: 46px;
+		border-radius: 8px;
+		color:#1d1d1d;
+		font-family: nav-font;
+	}
+	.modify-page .modify-form  .modify-item input.focus{
+		background: #1d1d1d;
+		color:#FFF;
+	}
+	.modify-page .modify-form .modify-btn {
+	  height: 80rpx;
+	  background-color: #111111;
+	  text-align: center;
+	  line-height: 80rpx;
+	  color: #fff;
+	 /* font-weight: 600; */
+	  font-size: 28rpx;
+	  border-radius: 16rpx;
+	  font-family: modify-font;
+	  font-size: 16px;
+	}
+	
+	.modify-page .modify-form .modify-btn.disable {
+	  /* background-color: #ecf1f4;
+	  color: #111; */
+	      opacity: 0.5;
+	}
+</style>
\ No newline at end of file

plugin/api.js

@@ -5,7 +5,7 @@ export default {
 
 		// Vue.prototype.host2 = "http://192.168.20.17:8020"
 		Vue.prototype.host2 = "https://erpmallapi.oytour.com"
-		// Vue.prototype.host3 = "http://192.168.20.17:8015"
+		//Vue.prototype.host3 = "http://192.168.10.128"
 		Vue.prototype.host3 = "https://reborn.oytour.com"
 		Vue.prototype.host4 = "https://upload.oytour.com"