湖广会馆购票须知修改

App.vue

@@ -42,6 +42,8 @@ export default {
     //#endif
     //清除之前的companyId
     uni.removeStorageSync('companyId')
+  },
+  onShow: function() {
     /* 版本自动更新代码 */
     const updateManager = uni.getUpdateManager()
     updateManager.onCheckForUpdate(function (res) {
@@ -64,13 +66,10 @@ export default {
       // 新的版本下载失败
       uni.showModal({
         title: '更新提示',
-        content: '新版本下载失败',
+        content: '新版小程序下载失败,请自行退出程序,手动卸载本程序,再运行',
         showCancel: false
       })
     })
-  },
-  onShow: function() {
-    
   },
   onHide: function() {
   }

pages/indexs/hghgIndex/hghgIndex-old.vue

-<template>
-	<view class="wrap">
-		<image src="../../../static/img/hghg/hghgBg.jpg" class="bgImage"></image>
-		<view class="btn-wrap">
-			<view>
-				<text class="button" @click="goKnow()">购票须知</text>
-			</view>
-			<view style="margin-top: 100rpx;">
-				<text class="button" @click="goBuy()">立即购票</text>
-			</view>
-		</view>
-		<!-- 购票须知 -->
-		<view class="buy-know" v-if="showKnow" @click="showKnow=false">
-			<view class="box">
-				<view class="title">
-					告游客书
-				</view>
-				<view>
-					尊敬的游客、广大市民：
-				</view>
-				<view>
-					<text>
-						开放时间：
-					</text>
-					{{openTime}}
-				</view>
-				<view>
-					<text>
-						博物馆开放日多功能设备运行时间：
-					</text>
-					09:30 - 12:30；14:30 - 17:30，（根据景区当天实际情况为准）
-				</view>
-				<view>
-					<text>
-						免费人群：
-					</text>
-					需出示身份证及有效证件原件前往检票处登记入园。
-				</view>
-				<view>
-					<text>
-						退票须知：
-					</text>
-					随时可退，过期未核销自动退。
-				</view>
-				<view style="margin-top: 48rpx;display: flex;justify-content: center;">
-					<text class="button" @click.stop="goBuy()">立即购票</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      urlQuery:'',
-      showKnow:false,
-      openTime:'',//开放时间
-      merchantId:'',//商户Id
-    }
-  },
-  onLoad(option) {
-    let channelId=option.channelId||''
-    let companyId=option.companyId||''
-    let groupId=option.groupId||''
-    let groupChannelId=option.groupChannelId||''
-    this.merchantId=option.merchantId||''
-    this.urlQuery=channelId+'&merchantId='+this.merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
-  },
-  methods: {
-    //---购票
-    goBuy(){
-      uni.navigateTo({
-        url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId='+this.urlQuery
-      })
-    },
-    //---购票须知
-    goKnow(){
-      this.showKnow=true
-      this.initDetail()
-    },
-    //---初始化详情
-    initDetail(){
-		  let data={
-		    userId:uni.getStorageSync('userId')||'',
-		    openid:uni.getStorageSync('openid')||'',
-		    id:this.merchantId,
-		    isDetail:1,//商户详情
-		  }
-		  this.$request('scenic/user/merchant/findDetailInfo',data).then((res)=>{
-		    if(res.code=='00'){
-		      let data=res.data.merchantTitleData||[]
-          console.log(data)
-		      data.forEach(item => {
-		        if (item.titleCode == 'scenic_base_info') {
-		          //基本信息
-		          item.merchantChildTitleData.forEach(item2=> {
-		            if (item2.childTitleCode == '101001') {
-		              //开放时间
-		              this.openTime = item2.contentList[0].content
-		            }
-		          })
-		        }
-          })
-		    }else{
-		      uni.showToast({
-		        title: res.message,
-		        icon: 'none'
-		      })
-		    }
-		  })
-    },
-  }
-}
-</script>
-
-<style scoped>
-.wrap{
-	height: 100%;
-	font-size: 40rpx;
-	display: flex;
-	align-items: center;
-	justify-content:center;
-}
-.bgImage{
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: -1;
-}
-.btn-wrap{
-	position: relative;
-	top: -160rpx;
-}
-.button{
-	width: 520rpx;
-	height: 112rpx;
-	display:flex;
-	align-items: center;
-	justify-content: center;
-	background: url('../../../static/img/hghg/bigBtn.png') no-repeat;
-	background-size: 100% 100%;
-}
-.buy-know{
-	padding: 0 48rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.3);
-}
-.box{
-	padding: 60rpx 40rpx;
-	background: url('../../../static/img/hghg/dialog.png') no-repeat;
-	background-size: 100% 100%;
-	color: #000000;
-	font-size: 28rpx;
-}
-.box>view{
-	margin-top: 10rpx;
-}
-.box view text{
-	font-weight: bold;
-}
-.title{
-	font-weight: bold;
-	font-size: 40rpx;
-	text-align: center;
-}
-.button{
-	display: flex;
-	width: 244rpx;
-	height: 96rpx;
-	background: url('../../../static/img/hghg/smallBtn.png') no-repeat;
-	background-size: 100% 100%;
-	align-items: center;
-	justify-content: center;
-	font-size: 32rpx;
-}
-</style>

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

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>