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

# Conflicts:
#	pages/jiuzhai/jz_SureOrder.vue

components/goods/style7.vue

@@ -32,7 +32,7 @@
 				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} </view>
 				<view class="sencond-title" v-if="item.subname">{{item.subname}}</view>
 				<view class="good-price-info">
-					<view>
+					<view style="display:none;">
 						<u-rate :current="item.courseScore!=null &&item.courseScore>0?item.courseScore:'5'" :active-color="mainColor"
 						 inactive-color="#DDDDDD" active-icon="star" inactive-icon="star-o" size="34" :disabled="true"></u-rate>
 						<text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text>

pages/guidecar/bookaCarList.vue

@@ -602,7 +602,7 @@
 		},
 		methods: {
 			getscroll(e){
-				console.log(e.detail.scrollLeft)
+				// console.log(e.detail.scrollLeft)
 			},
 			yuding(x){
 				this.u = uni.getStorageSync("mall_UserInfo");

pages/jiuzhai/jz_LineDetail.vue

@@ -297,6 +297,8 @@
 				<rich-text :nodes="dataList.feature.visaRemark"></rich-text>
 			</view>
 		</view>
+		<view class="jz_TripDays" style="width:100%;height:50rpx;background-color: transparent;">
+		</view>
 		<view class="jz_orderbox">
 			<view class="jz_OrderDiv">
 				<view style="color:#FF3166;font-weight:bold;">

pages/jiuzhai/jz_MyOrder.vue

@@ -88,7 +88,8 @@
 </style>
 <template>
 	<view class="jz_MyOrder">
-		<u-tabs :list="list" :is-scroll="false" :current="current" :active-color="mainColor" @change="change"></u-tabs>
+		<u-tabs :list="list" :is-scroll="false" :current="current" :active-color="mainColor" @change="change" bar-height='4'
+		 height="100"></u-tabs>
 		<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
 		<template v-else>
 			<view class="jz_MyOrderMain" style="height: calc(100vh - 44px);overflow: hidden;">
@@ -134,7 +135,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '我的订单',
+				pageTitle: '线路订单',
 				msg: {
 					pageIndex: 1,
 					pageSize: 15,
@@ -174,6 +175,19 @@
 			this.current = option.status || 0;
 			this.mainColor = this.$uiConfig.mainColor;
 
+			let currentPages = getCurrentPages();
+			let u = "/" + currentPages[currentPages.length - 1].route;
+			let pages = wx.getStorageSync("basedata") ?
+				wx.getStorageSync("basedata").bar_title : [];
+			pages.forEach((x) => {
+				if (x.value == u) {
+					this.pageTitle = x.new_name ? x.new_name : x.name;
+				}
+			});
+			uni.setNavigationBarTitle({
+				title: this.pageTitle,
+			});
+			
 		},
 		methods: {
 			goOrderDetail(item){

pages/jiuzhai/jz_SureOrder.vue

@@ -127,7 +127,7 @@
 			</view>
 			<view class="jz_PayDiv">
 				<view class="jz_CancleBtn">取消</view>
-				<view class="jz_CancleBtn" @click="goZhifu()" style="background-color: #111111;color:#fff;">去付款</view>
+				<view class="jz_CancleBtn" @click="goFukuan()" style="background-color: #111111;color:#fff;">去付款</view>
 			</view>
 		</view>
 	</view>
@@ -163,7 +163,24 @@
 			console.log(this.orderData,'this.orderData');
 		},
 		methods: {
-			
+			goFukuan(){
+				var that = this;
+				var tempObj = uni.getStorageSync('basedata').mall.wechatmessage;
+				var tmplIds = [];
+				if(tempObj&&tempObj.length>0){
+					tempObj.forEach(x=>{
+						if(x.Name=='下单成功提醒'||x.Name=='订单取消提醒'){
+							tmplIds.push(x.MessageId)
+						}
+					})
+				}
+				uni.requestSubscribeMessage({
+					tmplIds: tmplIds,
+					complete(res) {
+						that.goZhifu();
+					}
+				})
+			},
 			//支付
 			goZhifu(){
 				let url='/api/WeChatPay/GetTravlePayInfo'

pages/ticketCoupons/policyDetail.vue

 <template>
 	<!-- 政策详情 -->
 	<view class="policyDetail">
-		<u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler"
-			:active-color="mainColor" bg-color="#FFF" :bar-style="barStyle" height="100"></u-tabs>
+		<view class="tab-box">
+			<u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler"
+				:active-color="mainColor" bg-color="#FFF" :bar-style="barStyle" height="100"></u-tabs>
+		</view>
+		
 		<view class="officialNotice">
-			<view class="title">
+			<view class="title" id="notice">
 				官方公告信息
 			</view>
 			<view class="desc">
@@ -49,13 +52,13 @@
 
 				</view>
 			</view>
-			<view class="title">
+			<view class="title" id="buyTicket">
 				购票须知
 			</view>
 			<view class="desc">
 				<rich-text :nodes="details.BookingInfo"></rich-text>
 			</view>
-			<view class="title">
+			<view class="title" id="tip">
 				温馨提示
 			</view>
 			<view class="desc">
@@ -94,13 +97,25 @@
 
 		},
 		onLoad(options) {
-			console.log(options)
 			this.ID = options.id
 			this.getDetail()
 		},
 		methods: {
 			changeHandler(i) {
 				this.active = i;
+				let toID=""
+				if(i===0){
+					toID="#notice"
+				}else if(i==1){
+					toID="#buyTicket"
+				}else if(i==2){
+					toID="#tip"
+				}
+				uni.pageScrollTo({
+				    // scrollTop: 0,
+					selector:toID,
+				    duration: 300
+				});
 			},
 			//获取详情
 			getDetail() {
@@ -124,7 +139,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.tab-box{
+		width: 750rpx;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
 	.policyDetail {
+		margin-top: 100rpx;
 		.officialNotice {
 			padding: 0 45rpx 90rpx;
 

pages/user-center/user-center.vue

@@ -70,10 +70,10 @@
 							<text>{{couponsObj.name}}</text>
 						</view>
 					</view>
-					<view class="ReceiptAdder" v-if="IsEducation!=1&&setting.is_show_korea!=undefined&&setting.is_show_korea==0" @click="goUrl('/pages/address/address')" :style="{top:modelstype==0?'160rpx':(modelstype==1?'180rpx':'160rpx')}">
+					<!-- <view class="ReceiptAdder" v-if="IsEducation!=1&&setting.is_show_korea!=undefined&&setting.is_show_korea==0" @click="goUrl('/pages/address/address')" :style="{top:modelstype==0?'160rpx':(modelstype==1?'180rpx':'160rpx')}">
 						<u-icon name="location" color="#fff" size="23"></u-icon>
 						<Text style="color: #fff;font-size: 12px;margin-left: 20rpx;">收货地址</Text>
-					</view>
+					</view> -->
 					<view class="Receiptbalance" v-if="meueData.user_center&&meueData.user_center.is_account_status == 1">
 						<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url == '/pages/balance/balance'"
 						 @click="goUrl(item.link_url)">