支付页面跳转优化

pages.json

@@ -42,7 +42,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
 			"path": "pages/combination/sourceCombiChoose/sourceCombiChoose",
 			"style": {
@@ -64,7 +64,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
 			"path": "pages/common/coupon/coupon",
 			"style": {
@@ -94,7 +94,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
 			"path": "pages/indexs/hghgIndex/hghgIndex",
 			"style": {
@@ -102,7 +102,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		
+
 		{
 			"path": "pages/common/simpleProduct/simpleProduct",
 			"style": {
@@ -157,8 +157,7 @@
 	//分包加载配置，此配置为小程序的分包加载机制。
 	"subPackages": [{
 			"root": "pages/my", //个人中心分包
-			"pages": [
-				{
+			"pages": [{
 					"path": "order/electronicTicket/electronicTicket",
 					"style": {
 						"navigationBarTitleText": "电子门票",
@@ -205,56 +204,77 @@
 						"navigationBarTitleText": "购物车",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "commonInfo/commonInfo",
 					"style": {
 						"navigationBarTitleText": "常用信息",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "passCode/codeResult/codeResult",
 					"style": {
 						"navigationBarTitleText": "通行码",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "customerService/enterpriseWechat/enterpriseWechat",
 					"style": {
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "couponCenter/myCouponList/myCouponList",
 					"style": {
 						"navigationBarTitleText": "我的券列表",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "travelList/travelList/travelList",
 					"style": {
 						"navigationBarTitleText": "行程单",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "travelNotes/myTravelogue/myTravelogue",
 					"style": {
 						"navigationBarTitleText": "我的行记",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}, {
 					"path": "order/afterSale/afterSaleList/afterSaleList",
 					"style": {
 						"navigationBarTitleText": "售后列表",
 						"enablePullDownRefresh": false
 					}
-				
+
+				}, {
+					"path": "takeNumber/numberChoose/numberChoose",
+					"style": {
+						"navigationBarTitleText": "选择出发站点",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "takeNumber/numberIndex/numberIndex",
+					"style": {
+						"navigationBarTitleText": "取号",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "takeNumber/rowNumber/rowNumber",
+					"style": {
+						"navigationBarTitleText": "取号",
+						"enablePullDownRefresh": false
+					}
+
 				}
 			]
 		},
@@ -495,9 +515,6 @@
 		"selectedColor": "#007AFF", //选中时字体颜色
 		"borderStyle": "black", //底部的上边框线条
 		"backgroundColor": "#F8F8F8", //底部背景色
-		"fontSize": "18px", //字体大小
-		"spacing": "10px", //字体到图标的距离
-		"iconWidth": "16px",
 		"list": [{
 			"pagePath": "pages/indexs/index/index",
 			"iconPath": "static/img/index/home.png",

pages/indexs/index/index.vue

@@ -11,52 +11,10 @@
 		
 		<view class="middle">
 			<view class="tabbar">
-				<view @click="goScenic()">
-					<image src="@/static/img/index/classify1.png"></image>
+				<view @click="jumpPage(item.projectLinkUrl)" v-for="(item,index) in iconList" :key='index'>
+					<image :src="item.projectImgUrl"></image>
 					<view>
-						景区门票
-					</view>
-				</view>
-				<view @click="goHotel()">
-					<image src="@/static/img/index/classify2.png" ></image>
-					<view>
-						酒店民宿
-					</view>
-				</view>
-				<view @click="goScenic()">
-					<image src="@/static/img/index/classify4.png"></image>
-					<view>
-						周边游
-					</view>
-				</view>
-				<view @click="goScenic()">
-					<image src="@/static/img/index/classify5.png"></image>
-					<view>
-						跟团游
-					</view>
-				</view>
-				<view @click="goScenic()">
-					<image src="@/static/img/index/classify6.png"></image>
-					<view>
-						亲子游
-					</view>
-				</view>
-				<view @click="goTravelList()">
-					<image src="@/static/img/index/classify7.png"></image>
-					<view>
-						行程订制
-					</view>
-				</view>
-				<view @click="goAlbum()">
-					<image src="@/static/img/index/album.png"></image>
-					<view>
-						摄影/旅拍
-					</view>
-				</view>
-				<view @click="goVlog()">
-					<image src="@/static/img/index/video.png"></image>
-					<view>
-						欢乐影集
+						{{item.merchantExtendProjectName}}
 					</view>
 				</view>
 			</view>
@@ -223,6 +181,7 @@ export default {
 			    image: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
 			  }
       ],
+      iconList:[],//图标列表
     }
   },
   onLoad(option){
@@ -230,6 +189,7 @@ export default {
     if(!companyId){
       this.getCompanyId()
     }
+    this.loadIcon()
   },
   methods: {
     //---获取公司Id
@@ -259,36 +219,23 @@ export default {
         this.goGuoji()
       }
     },
-    //---跳转景区首页
-    goScenic(){
-      uni.navigateTo({
-        url:'/pages/scenic/scenicIndex/scenicIndex'
-      })
-    },
-    //---跳转酒店首页
-    goHotel(){
-      uni.navigateTo({
-        url:'/pages/hotel/hotelIndex/hotelIndex'
+    //---加载图标
+    loadIcon(){
+      let data={
+        merchantType:0,//商户类型，其他
+      }
+      this.$request('scenic/merchantExtendProject/loadList',data).then((res)=>{
+        if(res.code=='00'){
+				  this.iconList=res.data||[]
+        }
       })
     },
-    //跳转影集首页
-    goAlbum(){
-		  uni.navigateTo({
-		    url:'/pages/album/albumIndex?index=1'
-		  })
-    },
-    //---跳转vlog
-    goVlog(){
+    //---图片页面跳转
+    jumpPage(url){
       uni.navigateTo({
-        url:'/pages/vlog/vlogIndex/vlogIndex'
+			  url
       })
     },
-    //---跳转行程订制
-    goTravelList(){
-		  uni.navigateTo({
-		    url:'/pages/my/travelList/travelList/travelList'
-		  })
-    },
     //---跳转索道
     goSuodao(){
       uni.navigateTo({

pages/my/takeNumber/numberChoose/numberChoose.vue

+<template>
+	<view class="wrap">
+		<view class="top">
+			<view class="name">
+				长江索道
+			</view>
+			
+			<view class="tip">
+				请确认出行方向，选择对应的出发站点，确定后，无法更改，请谨慎选择！
+			</view>
+			
+			<view class="map">
+				<image src="@/pages/my/static/takeNumber/sdMap.jpg" mode="widthFix"></image>
+			</view>
+			
+			<view class="choose">
+				<view class="choose-content">
+					<view class="choose-name">
+						北站
+					</view>
+					
+					<view class="choose-add">
+						解放碑.新华路
+					</view>
+				</view>
+				
+				<view class="choose-content">
+					<view class="choose-name">
+						南站
+					</view>
+					
+					<view class="choose-add">
+						南岸区.上新街
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom">
+			<text class="btn" style="background: #fff;color: #999;margin-right: 80rpx;">
+				取消
+			</text>
+			<text class="btn">
+				确定
+			</text>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+				
+    }
+  },
+  methods: {
+			
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	height: 100%;
+	background: #ECF3FE;
+	padding: 24rpx;
+}
+.top{
+	background: #ffffff;
+	box-shadow: 0px 0px 16rpx 2rpx rgba(54,136,255,0.16);
+	border-radius: 16rpx;
+	padding: 48rpx 24rpx;
+	text-align: center;
+}
+.name{
+	font-size: 40rpx;
+	font-weight: bold;
+	color: #191919;
+}
+.tip{
+	font-size: 32rpx;
+	color: #FC771D;
+	line-height: 48rpx;
+	margin-top: 24rpx;
+}
+.map{
+	margin-top: 48rpx;
+	image{
+		width: 100%;
+	}
+}
+.choose{
+	margin-top: 48rpx;
+	display: flex;
+	justify-content: space-between;
+}
+.choose-content{
+	baackground: rgba(54,136,255,0);
+	border-radius: 8rpx;
+	border: 1px solid #BFD9FF;
+	padding:24rpx 0;
+	width: 280rpx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.choose-name{
+	font-size: 36rpx;
+	font-weight: bold;
+}
+.choose-add{
+	color:#999999;
+	font-size: 26rpx;
+	margin-top: 16rpx;
+}
+.bottom{
+	margin-top:48rpx;
+	display: flex;
+	justify-content: center;
+}
+.btn{
+	display: inline-block;
+	line-height: 60rpx;
+	width: 212rpx;
+	height: 80rpx;
+	background: #3688FF;
+	border-radius: 40rpx
+}
+</style>

pages/my/takeNumber/numberIndex/numberIndex.vue

+<template>
+	<view class="wrap">
+		<view>
+			<view class="first">
+				<input placeholder="请输入购票预留手机号/身份证号" />
+			</view>
+			<view class="query">
+				<text class="button">查询订单</text>
+			</view>
+		</view>
+
+		<view class="mark-box">
+			<view style="width: 100%;">
+				<view class="mark-content">
+					<view class="mark-title"> 获取失败 </view>
+					<view class="mark-tip"> 查无该订单，请咨询购票渠道！ </view>
+					<view class="mark-btn">
+						<text class="btn">重试</text>
+					</view>
+				</view>
+				
+				<!-- <view class="mark-content"> </view> -->
+				
+				<view class="mark-close">
+					<u-icon name="close-circle" size='60' color='#ffffff'></u-icon>
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      showMark: true //是否显示遮罩层
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: linear-gradient(180deg, #3688ff 0%, #2abbd7 100%);
+}
+.first input {
+	width: 600rpx;
+	height: 88rpx;
+	background: #fff;
+	border-radius: 8rpx;
+	padding: 0 24rpx;
+}
+.query {
+	margin-top: 48rpx;
+	display: flex;
+	justify-content: center;
+}
+.button {
+	display: inline-block;
+	width: 440rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	background: #3688ff;
+	border-radius: 40rpx;
+	text-align: center;
+	color: #fff;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+// 遮罩层
+.mark-box {
+	position: fixed;
+	z-index: 100;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.6);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.mark-content{
+	background: #ffffff;
+	margin: 0 48rpx;
+	border-radius: 16rpx;
+	padding: 64rpx 0;
+	text-align: center;
+}
+.mark-title{
+	font-size: 40rpx;
+	font-weight: bold;
+	color: #191919;
+}
+.mark-tip{
+	font-size: 32rpx;
+	margin-top: 24rpx;
+}
+.mark-btn{
+	margin-top: 48rpx;
+	.btn{
+		width: 212rpx;
+		height: 80rpx;
+		line-height: 60rpx;
+		font-size: 32rpx;
+		background: #3688FF;
+		border-radius: 40rpx;
+	}
+}
+.mark-close{
+	margin-top: 60rpx;
+	text-align: center;
+}
+</style>

pages/my/takeNumber/rowNumber/rowNumber.vue

+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/payment/orderPayment/orderPayment.vue

@@ -71,7 +71,7 @@ export default {
       background: '', //去支付的背景颜色
       orderId: '', //订单Id
       openid: '', //用户Id
-      afterBuyUrl: '', //支付成功后地址跳转
+      afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
       ifyukuaiCode: '' ,//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
       albumOrderdetail:'',//是否跳影集订单详情
     }
@@ -160,9 +160,6 @@ export default {
             if(res.data.orderType=='10'){
 						  //组合票和联票跳订单列表
 						  this.afterBuyUrl='/pages/my/order/orderList/orderList'
-            }else{
-						  //单票跳详情
-						  this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
             }
           }
           
@@ -177,8 +174,7 @@ export default {
           this.orderInfo = res.data.payInfo || ''
           //支付参数结束
           this.pdOrderMoney = res.data.pdOrderMoney
-          if (this.pdOrderMoney == 0 && res.data.subOrderType == -1) {
-            this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
+          if (this.pdOrderMoney == 0 && res.data.subOrderType == -1){
             uni.navigateTo({
               url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
             })