订单支付修改

App.vue

@@ -95,7 +95,6 @@ export default {
 		background: #F7F7F7;
 		height:100vh;
 	}
-
 	view,
 	text,
 	image,
@@ -110,7 +109,6 @@ export default {
 	textarea {
 		box-sizing: border-box;
 	}
-
 	.btn {
 		background: linear-gradient(132deg, #ED400C 0%, #FB862C 100%);
 		display: inline-block;

pages/payment/orderPayment/orderPayment.vue

@@ -73,7 +73,8 @@ export default {
       orderId: '', //订单Id
       openid: '', //用户Id
       afterBuyUrl: '', //支付成功后地址跳转
-      ifyukuaiCode: '' //是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
+      ifyukuaiCode: '' ,//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
+      albumOrderdetail:'',//是否跳影集订单详情
     }
   },
   onLoad(option) {
@@ -92,6 +93,7 @@ export default {
       this.orderId = option.orderId||''
     }
     this.ifyukuaiCode = option.ifyukuaiCode||''
+    this.albumOrderdetail=option.albumOrderdetail||''
     this.openid = uni.getStorageSync('openid') || ''
     if (this.openid) {
       this.initDetail()
@@ -158,13 +160,19 @@ export default {
       }
       this.$request('orderc/order/findOrderInfo', data).then(res => {
         if (res.code == '00') {
-          if(res.data.orderType=='10'){
-            //组合票和联票跳订单列表
-            this.afterBuyUrl='/pages/my/order/orderList/orderList'
+          if(this.albumOrderdetail=1){
+            //主要跳转影集订单详情，暂时是前端写死
+            this.afterBuyUrl='/pages/album/albumOrderdetail/albumOrderdetail'
           }else{
-            //单票跳详情
-            this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
+            if(res.data.orderType=='10'){
+						  //组合票和联票跳订单列表
+						  this.afterBuyUrl='/pages/my/order/orderList/orderList'
+            }else{
+						  //单票跳详情
+						  this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
+            }
           }
+          
           this.bodyShow = true
           //支付参数开始
           this.timeStamp = res.data.timestamp
@@ -179,7 +187,7 @@ export default {
           if (this.pdOrderMoney == 0 && res.data.subOrderType == -1) {
             this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
             uni.navigateTo({
-              url: '/pages/payment/paySuccess/paySuccess?orderId=' + _this.orderId+'&afterBuyUrl=' + _this.afterBuyUrl + '&ifyukuaiCode=' + _this.ifyukuaiCode
+              url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
             })
           }
           this.errorMessage = res.data.errorMessage

pages/scenic/scenicChooseProduct/scenicChooseProduct.vue

@@ -155,7 +155,8 @@ export default {
   data() {
     return {
       merchantId:'',//商户Id
-      tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
+      // tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
+      tabbar:['热门景点','一日游','摄影/旅拍'],//tabbar标题列表
       active:0,//导航栏下标
       imgList:[],//图片列表
       scenicList:[],//景区数据