湖广会馆购票须知修改

pages/indexs/hghgIndex/hghgIndex.vue

@@ -8,9 +8,9 @@
 			<view>
 				<text class="button" @click="goBuy()">立即购票</text>
 			</view>
-			<view>
+			<!-- <view>
 				<text class="button" @click="goOrder()">重庆市民免费游</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 购票须知 -->
 		<view class="buy-know" v-if="showKnow" @click="showKnow=false">
@@ -46,7 +46,7 @@
 					</text>
 					{{extendInfo.noticeOfrefund||''}}。
 				</view>
-				<view>
+				<!-- <view>
 					<text>重庆市民免费游门票优惠活动规则：</text>
 					<view style="margin-top: 12rpx;">
 						<text>活动时间：</text>
@@ -60,7 +60,7 @@
 						<text>领取方式：</text>
 						需在重庆湖广会馆公众号至少提前1天预约，活动期间免费优惠门票（限量420张/天，不含景区演出和其他经营性收费项目等费用），领完为止。预约成功后凭本人身份证原件或预约码直接到景区检票口核验入园（活动期内，每天每位游客仅限预约1次订单）。
 					</view>					
-				</view>
+				</view> -->
 				<view style="margin-top: 60rpx;display: flex;justify-content: center;">
 					<text class="button" @click.stop="goBuy()">立即购票</text>
 				</view>

pages/payment/orderPayment/orderPayment.vue

@@ -76,6 +76,7 @@ export default {
       afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
       ifyukuaiCode: '' ,//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
       albumOrderdetail:'',//是否跳影集订单详情
+      navigateBackMiniProgram:'',//是否返回上一个小程序
     }
   },
   onLoad(option) {
@@ -87,6 +88,7 @@ export default {
     this.payType = 33
     //#endif
     this.orderId=this.$commonjs.getKey(option,'orderId')
+    this.navigateBackMiniProgram=this.$commonjs.getKey(option,'navigateBackMiniProgram')
     this.ifyukuaiCode = option.ifyukuaiCode||''
     this.albumOrderdetail=option.albumOrderdetail||''
     this.openid = uni.getStorageSync('openid') || ''
@@ -238,8 +240,23 @@ export default {
         signType: this.signType,
         paySign: this.paySign,
         success:res=>{
+        //   if(this.navigateBackMiniProgram){
+        //     //如果是需要返回上一个小程序，直接返回上一个小程序
+        //     uni.navigateBackMiniProgram({
+						  // extraData: {
+						  //   pay: 'success'
+						  // },
+						  // success(res) {
+						  //   // 返回成功
+						  // }
+        //     })
+        //   }else{
+        //     uni.navigateTo({
+						  // url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
+        //     })
+        //   }
           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
           })
         },
         fail: function(err) {

pages/scenic/scenicJointOrder/scenicJointOrder - 副本.vue

-<template>
-	<view>
-		<web-view :src="outUrl"></web-view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      enterUrl:'',//进入页面路由
-      outUrl:'',//跳出页面路由
-    }
-  },
-  onLoad(option){
-    let merchantId=option.merchantId||''
-    let productId=option.productId||''
-    let companyId=this.$commonjs.getKey(option,'companyId')||''
-    let orderSource=option.orderSource||''
-    let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
-    let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-    let pdToken=uni.getStorageSync('token')
-    let pdCreateUserId=uni.getStorageSync('createUserId')
-    let pdUserId=uni.getStorageSync('userId')
-    let baseUrl=this.$wxurl+'scenicJointOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
-    let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
-    this.outUrl=baseUrl+url
-  },
-  methods: {
-			
-  }
-}
-</script>
-
-<style>
-
-</style>