Merge branch 'develop' into electronicInvoice

manifest.json

@@ -75,7 +75,7 @@
             "enable" : false
         },
         "requiredPrivateInfos" : [ "getLocation" ],
-        "embeddedAppIdList" : [ "wx888e5ed62eb274db" ] //第一个途比达，第二个长江索道
+        "embeddedAppIdList" : [ "wx888e5ed62eb274db", "wx64134dba0cb21899" ] //第一个途比达，第二个长江索道
     },
     "mp-alipay" : {
         "usingComponents" : true,

pages/album/DIYDetails/DIYDetails.vue

@@ -681,7 +681,7 @@ export default {
 	.maskPreview-swiper{
 		width: 100%;
 	}
-	/deep/ swiper{
+	::v-deep swiper{
 		background-color: rgba(0, 0, 0, 0) !important;
 	}
 	.maskPreview-check {
@@ -689,7 +689,7 @@ export default {
 		height: 48rpx;
 		margin: 29rpx auto;
 	
-		/deep/ .u-checkbox__icon-wrap {
+		::v-deep .u-checkbox__icon-wrap {
 			width: 50rpx !important;
 			height: 50rpx !important;
 			color: #fff !important;

pages/album/albumIndex.vue

@@ -401,7 +401,7 @@ export default {
 			background: linear-gradient(to top, #f7f7f7, #f7f7f7 80%, transparent 100%);
 		}
 
-		/deep/.u-transition {
+		::v-deep.u-transition {
 			display: flex;
 			justify-content: center;
 			align-items: center;
@@ -503,8 +503,8 @@ export default {
 				width: 100%;
 			}
 
-			/deep/.u-wrap,
-			/deep/.u-lazy-item {
+			::v-deep.u-wrap,
+			::v-deep.u-lazy-item {
 				broder-radius: 16rpx 16rpx 0 0 !important;
 			}
 		}
@@ -572,7 +572,7 @@ export default {
 			width: 100%;
 			height: 100%;
 
-			/deep/.u-icon {
+			::v-deep.u-icon {
 				position: absolute;
 				top: -64rpx;
 				right: 24rpx;
@@ -674,7 +674,7 @@ export default {
 			}
 		}
 
-		/deep/.u-btn {
+		::v-deep .u-btn {
 			width: 304rpx;
 		}
 	}

pages/album/getPortrait.vue

@@ -367,7 +367,7 @@ export default {
 			font-weight: 700;
 			color: #3688FF;
 		}
-		/deep/.u-transition {
+		::v-deep.u-transition {
 			display: flex;
 			justify-content: center;
 			align-items: center;

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -537,7 +537,7 @@ export default {
 					margin-left: 8rpx;
 				}
 			}
-			/deep/ .u-popup{
+			::v-deep .u-popup{
 				position: absolute;
 				left: 0;
 				top: 0;
@@ -614,8 +614,8 @@ export default {
 			line-height: 46rpx;
 		}
 		.checkAll-allAct{
-			/deep/ .wx-checkbox-input,
-			/deep/ .uni-checkbox-input{
+			::v-deep .wx-checkbox-input,
+			::v-deep .uni-checkbox-input{
 				background-color: #3688FF !important;
 				border-color: #3688FF !important;
 				color: #ffffff !important;
@@ -679,25 +679,25 @@ export default {
 				position: absolute;
 				right: 0;
 				top: 24rpx;
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					border-radius: 100rpx;
 				}
 			}
 			.list-uCheckAct{
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					background-color: #3688FF !important;
 					border-color: #3688FF !important;
 					color: #ffffff !important;
 				}
 			}
-			/deep/ .u-checkbox__icon-wrap{
+			::v-deep .u-checkbox__icon-wrap{
 				color: #fff !important;
 				border: 1px solid #fff;
 				box-shadow: 0 0 16px 0 rgba(0, 0, 0, 0.1);
 			}
-			/deep/ .u-checkbox__icon-wrap--checked{
+			::v-deep .u-checkbox__icon-wrap--checked{
 				background-color: #2979ff !important;
 				border-color: #2979ff !important;
 			}
@@ -986,13 +986,13 @@ export default {
 			top: 152rpx;
 			left: 0;
 		}
-		/deep/ .u-swiper{
+		::v-deep .u-swiper{
 			width: 100%;
 			position: fixed;
 			top: 152rpx;
 			left: 0;
 		}
-		/deep/ swiper{
+		::v-deep swiper{
 			background-color: rgba(0, 0, 0, 0) !important;
 		}
 		.maskPreview-check {
@@ -1004,28 +1004,28 @@ export default {
 			left: 0;
 			right: 0;
 			.maskPreview-CheckBox{
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					border-radius: 100rpx;
 				}
 			}
 			.maskPreview-CheckBoxAct{
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					background-color: #3688FF !important;
 					border-color: #3688FF !important;
 					color: #ffffff !important;
 				}
 			}
 
-			// /deep/ .u-checkbox__icon-wrap {
+			// ::v-deep .u-checkbox__icon-wrap {
 			// 	width: 50rpx !important;
 			// 	height: 50rpx !important;
 			// 	color: #fff !important;
 			// 	border: solid 2px #fff;
 			// }
 		}
-		/deep/ .u-swiper-image::after {
+		::v-deep .u-swiper-image::after {
 			content: "";
 			display: block;
 			position: absolute;

pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue

@@ -362,7 +362,7 @@ export default {
 					margin-left: 8rpx;
 				}
 			}
-			/deep/ .u-popup{
+			::v-deep .u-popup{
 				position: absolute;
 				left: 0;
 				top: 0;
@@ -432,14 +432,14 @@ export default {
 				position: absolute;
 				right: 0;
 				top: 24rpx;
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					border-radius: 100rpx;
 				}
 			}
 			.list-uCheckAct{
-				/deep/ .wx-checkbox-input,
-				/deep/ .uni-checkbox-input{
+				::v-deep .wx-checkbox-input,
+				::v-deep .uni-checkbox-input{
 					background-color: #3688FF !important;
 					border-color: #3688FF !important;
 					color: #ffffff !important;
@@ -470,16 +470,16 @@ export default {
 				height: 98rpx;
 				padding: 0rpx 24rpx 0 0rpx;
 				overflow: hidden;
-				/deep/ .u-checkbox {
+				::v-deep .u-checkbox {
 					line-height: 34rpx !important;
 				}
 			
-				/deep/ .u-checkbox__label {
+				::v-deep .u-checkbox__label {
 					font-size: 24rpx !important;
 				}
 				.checkAll-allAct{
-					/deep/ .wx-checkbox-input,
-					/deep/ .uni-checkbox-input{
+					::v-deep .wx-checkbox-input,
+					::v-deep .uni-checkbox-input{
 						background-color: #3688FF !important;
 						border-color: #3688FF !important;
 						color: #ffffff !important;

pages/combination/combiChoose/combiChooseOld- 旅拍横向滚动版本.vue

@@ -981,10 +981,10 @@ export default {
 	width: 100%;
 	height: 100%;
 }
-.swiper-item /deep/ .u-waterfall{
+.swiper-item ::v-deep .u-waterfall{
 	padding-top:8rpx;
 }
-.swiper-item /deep/ .u-empty{
+.swiper-item ::v-deep .u-empty{
 	height: 300px;
 }
 </style>

pages/indexs/index/index.vue

@@ -140,7 +140,7 @@ export default {
 		    merchantName:'长江索道',
 		    pageUrl:this.suodaoUrl,
 		    imgUrl:'http://lx.pangdly.com/img/sodao.1cdf287.jpg',
-		    price:20
+		    price:30
 		  },
 		  {
 		    merchantName:'云端之眼',

pages/my/exchangeCode/exchangeChoose/exchangeChoose.vue

@@ -340,7 +340,7 @@ export default {
 		height: 400rpx;
 		.mask-ticketCodeIn{
 			height: 180rpx;
-			/deep/ .uni-input{
+			::v-deep .uni-input{
 				height: 100rpx;
 				margin-top: 40rpx;
 				text-align: center;

pages/my/exchangeCode/exchangeComplete/exchangeComplete.vue

@@ -33,11 +33,11 @@ export default {
 	background-color: #F7F8FA;
 	overflow-y: auto;
 }
-/deep/ .u-icon{
+::v-deep .u-icon{
 	margin-top: 272rpx;
 	margin-bottom: 46rpx;
 }
-/deep/ .u-icon__icon{
+::v-deep .u-icon__icon{
 	margin: 0 auto;
 	font-size: 112rpx !important;
 	line-height: 112rpx !important;

pages/my/exchangeCode/exchangePage/exchangePage.vue

@@ -577,7 +577,7 @@ export default {
 	.date-more-content {
 		margin-right:8rpx;
 	}
-	/deep/ .u-icon__icon{
+	::v-deep .u-icon__icon{
 		color: #333333;
 	}
 }
@@ -650,7 +650,7 @@ export default {
 			line-height: 98rpx;
 			text-align: right;
 		}
-		/deep/ .uni-input{
+		::v-deep .uni-input{
 			text-align: right;
 			flex: 1;
 			height: 98rpx;

pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue

@@ -484,7 +484,7 @@ export default {
 		}
 		
 	}
-	/deep/ .u-checkbox__label{
+	::v-deep .u-checkbox__label{
 		width: 160rpx;
 	}
 }
@@ -547,10 +547,10 @@ export default {
 }
 .apply-textarea{
 	padding: 24rpx;
-	/deep/ .u-border{
+	::v-deep .u-border{
 		border: none;
 	}
-	/deep/ .u-input__textarea{
+	::v-deep .u-input__textarea{
 		height: 248rpx !important;
 		background: #F6FAFF;
 		border-radius: 8rpx 8rpx 8rpx 8rpx;

pages/my/order/electronicTicket/electronicTicket-副本.vue

@@ -1362,11 +1362,11 @@ export default {
 		margin: 0 auto;
 	}
 	//#ifdef MP-ALIPAY
-	/deep/ .uqrcode-canvas-wrapper,/deep/ .uqrcode{
+	::v-deep .uqrcode-canvas-wrapper,::v-deep .uqrcode{
 		margin: 0 auto;
 		position: relative;
 	}
-	/deep/ .uqrcode-canvas{
+	::v-deep .uqrcode-canvas{
 		transform:(1,1)
 	}
 	//#endif

pages/my/order/electronicTicket/electronicTicket.vue

@@ -636,18 +636,20 @@ export default {
     }
   },
   onShow() {
-		  let _this=this
-		  uni.getScreenBrightness({
-		    success: function(res){
-		      // 这里是把获取到的手机屏幕亮度，存储到data里面，方便给到页面生命周期隐藏和卸载方法里面用
-					   _this.Brightness = res.value
-					   if(res.value != 1){
-		        uni.setScreenBrightness({
-		          value: 1
-		        })
-					   }
-		    }
-		  })
+    let _this=this
+    uni.getScreenBrightness({
+      success: function(res){
+        // 这里是把获取到的手机屏幕亮度，存储到data里面，方便给到页面生命周期隐藏和卸载方法里面用
+					 _this.Brightness = res.value
+					 if(res.value != 1){
+          uni.setScreenBrightness({
+            value: 1
+          })
+					 }
+      }
+    })
+    this.getDetail()
+			
   },
   onHide: function () {
     if(this.timer1) {
@@ -680,7 +682,7 @@ export default {
     //this.id = "z00167956572219584dc15634b62cf75"
     this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
     //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'  oroHZ5FaUQ_SOOC_uQQP92fJpBRE
-    this.getDetail()
+    //this.getDetail()
   },
   onUnload() {
     if(this.timer1) {  
@@ -1884,7 +1886,7 @@ export default {
 				.right-name{
 					margin-right: 5rpx;
 				}
-				/deep/ .u-icon__icon{
+				::v-deep .u-icon__icon{
 					top: 5rpx !important;
 				}
 			}
@@ -1927,7 +1929,7 @@ export default {
 					right: 0;
 					top: 12rpx;
 					z-index: 11;
-					/deep/ u-icon{
+					::v-deep u-icon{
 						position: absolute;
 						top: 0;
 						left: 0;

pages/my/order/jointElectronicTicket/jointElectronicTicket.vue

@@ -24,7 +24,7 @@
 							<text style="color: #FE6600;">{{item.playDate}}</text>
 						</view>
 						<view>
-							<text>入园时间</text>
+							<text>游玩时间</text>
 							<text>{{item.startPlayTime?item.startPlayTime.substr(0,5):''}}-{{item.endPlayTime?item.endPlayTime.substr(0,5):''}}</text>
 						</view>
 					</view>

pages/my/order/orderList/orderList.vue

@@ -834,7 +834,7 @@ page{
 	position: relative;
 	font-size: 32rpx;
 	font-weight: bold;
-	/deep/ .u-icon{
+	::v-deep .u-icon{
 		color: #c8c9cc;
 		position: absolute;
 		right: 16rpx;
@@ -866,7 +866,7 @@ page{
 }
 .confrim-btn{
 	margin: 64rpx 24rpx 40rpx 24rpx;
-	/deep/ .u-reset-button{
+	::v-deep .u-reset-button{
 		height: 80rpx;
 		line-height: 80rpx;
 		border-radius: 15rpx;

pages/my/suggestComplaint/complaintCommit/complaintCommit.vue

@@ -277,26 +277,26 @@ export default{
 		z-index: 1;
 	}
 	/*修改上传组件样式*/
-	.top-list /deep/ .uicon-camera-fill{
+	.top-list ::v-deep .uicon-camera-fill{
 		font-size: 36px !important;
 		line-height: 36px !important;
 	}
-	.top-list /deep/ .uicon-close{
+	.top-list ::v-deep .uicon-close{
 		font-size: 10px !important;
 		line-height: 10px !important;
 	}
-	.top-list /deep/ .uicon-checkmark{
+	.top-list ::v-deep .uicon-checkmark{
 		font-size: 12px !important;
 		line-height: 12px !important;
 	}
-	.top-list /deep/ .u-textarea{
+	.top-list ::v-deep .u-textarea{
 		background:#F7F8FA;
 		border: none;
 	}
-	.top-list /deep/ .u-upload__button{
+	.top-list ::v-deep .u-upload__button{
 		border-radius: 8rpx;
 	}
-	.top-list /deep/ .u-textarea__count{
+	.top-list ::v-deep .u-textarea__count{
 		background: #F7F8FA !important;
 	}
 </style>
\ No newline at end of file

pages/my/suggestComplaint/complaintDetail/complaintDetail.vue

@@ -437,26 +437,26 @@ export default{
 		}
 	}
 	/*修改上传组件样式*/
-	.pop-top /deep/ .uicon-camera-fill{
+	.pop-top ::v-deep .uicon-camera-fill{
 		font-size: 36px !important;
 		line-height: 36px !important;
 	}
-	.pop-top /deep/ .uicon-close{
+	.pop-top ::v-deep .uicon-close{
 		font-size: 10px !important;
 		line-height: 10px !important;
 	}
-	.pop-top /deep/ .uicon-checkmark{
+	.pop-top ::v-deep .uicon-checkmark{
 		font-size: 12px !important;
 		line-height: 12px !important;
 	}
-	.pop-top /deep/ .u-upload__button{
+	.pop-top ::v-deep .u-upload__button{
 		border-radius: 8rpx;
 	}
-	.pop-top /deep/ .u-textarea{
+	.pop-top ::v-deep .u-textarea{
 		background:#F7F8FA;
 		border: none;
 	}
-	.pop-top /deep/ .u-textarea__count{
+	.pop-top ::v-deep .u-textarea__count{
 		background: #F7F8FA !important;
 	}
 </style>
\ No newline at end of file

pages/my/suggestComplaint/suggestCommit/suggestCommit.vue

@@ -209,26 +209,26 @@ export default{
 		z-index: 1;
 	}
 	/*修改上传组件样式*/
-	.top-list /deep/ .uicon-camera-fill{
+	.top-list ::v-deep .uicon-camera-fill{
 		font-size: 36px !important;
 		line-height: 36px !important;
 	}
-	.top-list /deep/ .uicon-close{
+	.top-list ::v-deep .uicon-close{
 		font-size: 10px !important;
 		line-height: 10px !important;
 	}
-	.top-list /deep/ .uicon-checkmark{
+	.top-list ::v-deep .uicon-checkmark{
 		font-size: 12px !important;
 		line-height: 12px !important;
 	}
-	.top-list /deep/ .u-textarea{
+	.top-list ::v-deep .u-textarea{
 		background:#F7F8FA;
 		border: none;
 	}
-	.top-list /deep/ .u-upload__button{
+	.top-list ::v-deep .u-upload__button{
 		border-radius: 8rpx;
 	}
-	.top-list /deep/ .u-textarea__count{
+	.top-list ::v-deep .u-textarea__count{
 		background: #F7F8FA !important;
 	}
 </style>
\ No newline at end of file

pages/payment/orderPayment/orderPayment.vue

@@ -8,7 +8,9 @@
 
 						<text>
 							<text style="font-size:24rpx;">¥</text>{{ item.unitPrice }} <text>x</text> {{ item.orderNum }}
-							<text style="margin-top:10rpx;font-size:22rpx;display:block;color:#f45803;" v-if="item.depositReceived"> 押金：{{ item.depositReceived }} </text>
+							<text style="margin-top:10rpx;font-size:22rpx;display:block;color:#f45803;" v-if="item.depositReceived"> 
+								押金：{{ item.depositReceived }} 
+							</text>
 						</text>
 					</view>
 					<view class="coupon" v-if="item.pdDiscountMoney">
@@ -74,7 +76,6 @@ export default {
       orderId: '', //订单Id
       openid: '', //用户Id
       afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
-      ifyukuaiCode: '' ,//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
       albumOrderdetail:'',//是否跳影集订单详情
     }
   },
@@ -87,7 +88,6 @@ export default {
     this.payType = 33
     //#endif
     this.orderId=this.$commonjs.getKey(option,'orderId')
-    this.ifyukuaiCode = option.ifyukuaiCode||''
     this.albumOrderdetail=option.albumOrderdetail||''
     this.openid = uni.getStorageSync('openid') || ''
     if (this.openid) {
@@ -182,7 +182,7 @@ export default {
           this.pdOrderMoney = res.data.pdOrderMoney
           if (this.pdOrderMoney == 0 && res.data.subOrderType == -1){
             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
             })
           }
           this.errorMessage1 = res.data.errorMessage
@@ -239,7 +239,7 @@ export default {
         paySign: this.paySign,
         success:res=>{
           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
           })
         },
         fail: function(err) {
@@ -264,7 +264,7 @@ export default {
         orderInfo: this.orderInfo, // 支付宝订单号
         success: res=> {
           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
           })
         },
         fail: function(err) {
@@ -280,7 +280,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .bigBox {
 	height: 100%;
 	background: #fafafc;

pages/payment/paySuccess/paySuccess.vue

@@ -19,13 +19,11 @@ export default {
       timer: '', //计时器
       loadImg: true, //控制加载图片显示隐藏
       afterBuyUrl:'',//页面跳转地址
-      ifyukuaiCode: '' //是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
     }
   },
   onLoad(option) {
     this.orderId = option.orderId||''
     this.afterBuyUrl = option.afterBuyUrl||''
-    this.ifyukuaiCode=option.ifyukuaiCode||''
     this.ticketStatus()
     let  intFun=()=>{ //页面初始化
       this.timer = setTimeout(()=>{
@@ -34,7 +32,7 @@ export default {
         }
         this.ticketStatus()
         intFun()
-      }, 3000)
+      }, 5000)
     }
     intFun()
   },
@@ -74,7 +72,7 @@ export default {
               })
             }else{
               uni.reLaunch({
-								 url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
+								 url:this.afterBuyUrl+'?orderId=' + this.orderId
               })
             }
             return
@@ -96,7 +94,7 @@ export default {
               })
             }else{
               uni.reLaunch({
-								 url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
+								 url:this.afterBuyUrl+'?orderId=' + this.orderId
               })
             }
           }else{

pages/scenic/scenicComponents/orderPay.vue

+<template>
+	<u-popup :show="showPop" :round="20" @close="showPop = false" closeable>
+		<view class="son-wrap">
+			<view class="middle" v-show="orderList.length>0">
+				<view class="middle-wrap">
+					<view  v-for="item of orderList" :key="item.id" class="product">
+						<view>
+							<text> {{ item.merchantName }}（{{ item.productName }}） </text>
+		
+							<text>
+								<text style="font-size:24rpx;">¥</text>{{ item.unitPrice }} <text>x</text> {{ item.orderNum }}
+								<text style="margin-top:10rpx;font-size:22rpx;display:block;color:#f45803;" v-if="item.depositReceived"> 
+									押金：{{ item.depositReceived }} 
+								</text>
+							</text>
+						</view>
+						<view class="coupon" v-if="item.pdDiscountMoney">
+							<text> 券 </text> <text> <text style="font-size:24rpx;">-¥</text>{{ item.pdDiscountMoney }} </text>
+						</view>
+					</view>
+					<view class="middle-money">
+						<view> 实际支付 </view>
+						<view>
+							<text style="font-size:28rpx;">¥</text>
+							{{ pdOrderMoney }} 
+						</view>
+					</view>
+					<view class="middle-image">
+						<!-- #ifdef MP-WEIXIN -->
+						<image src="@/static/img/orderPayment/weixin.png" style="width:70rpx;height:62rpx;" /> <view> 微信支付 </view>
+						<!-- #endif -->
+		
+						<!-- #ifdef MP-ALIPAY -->
+						<image src="@/static/img/orderPayment/alipayLogo.png" style="width:70rpx;height:62rpx;" /> <view> 支付宝支付 </view>
+						<!-- #endif -->
+						<image src="@/static/img/orderPayment/input.png" style="width:32rpx;height: 32rpx;" />
+					</view>
+				</view>
+			</view>
+			<view v-show="errorMessage1||errorMessage2">
+				错误1：{{errorMessage1}}
+				错误2：{{errorMessage2}}
+			</view>
+			<view class="bottom">
+				<view class="bottom-left">
+					<text>实付款 </text>
+					<text v-show="pdOrderMoney"> 
+						<text style="font-size: 28rpx;">¥</text>
+						{{pdOrderMoney}}
+					</text>
+				</view>
+				<view class="bottom-right">
+					<u-icon name="chat" size="40" @click="makePhone()"></u-icon>
+					<text @click="goPay()" :style="{ background: background }">去支付</text>
+				</view>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script>
+export default {
+  props:['orderId'],
+  data() {
+    return {
+      showPop:false,//控制弹窗显示隐藏
+      orderList:[], //订单列表
+      pdOrderMoney: '', //实际总价
+      totalMoney: '', //原价总价
+      errorMessage1: '', //错误信息1，接口成功返回的错误信息
+      errorMessage2: '', //错误信息2，接口失败返回的错误信息
+      payType: '', //支付类型
+      timeStamp: '', //微信支付参数
+      nonceStr: '',//微信支付参数
+      package: '',//微信支付参数
+      signType: '',//微信支付参数
+      paySign: '',//微信支付参数
+      orderInfo: '', //支付宝订单号
+      background: '', //去支付的背景颜色
+      openid: '', //用户Id
+      afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
+      albumOrderdetail:'',//是否跳影集订单详情
+    }
+  },
+  created() {
+    //#ifdef MP-WEIXIN
+    this.payType = 42
+    //#endif
+
+    //#ifdef MP-ALIPAY
+    this.payType = 33
+    //#endif
+    this.openid = uni.getStorageSync('openid') || ''
+    this.initDetail()
+  },
+  methods: {
+    //---拨打电话
+    makePhone() {
+		  uni.makePhoneCall({
+		    phoneNumber:'400-072-0368'
+		  })
+    },
+    //---初始化产品信息，以及获取支付需要的参数
+    initDetail() {
+      let data = {
+        orderId: this.orderId, //订单Id
+        userId: this.openid, //用户Id
+        payType: this.payType //支付类型
+      }
+      uni.showLoading({
+        mask:true
+      })
+      this.$request('orderc/order/findOrderInfo', data).then(res => {
+        if (res.code == '00') {
+          if(this.albumOrderdetail==1){
+            //主要跳转影集订单详情，暂时是前端写死
+            this.afterBuyUrl='/pages/album/albumOrderdetail/albumOrderdetail'
+          }else{
+            if(res.data.orderType=='10'){
+						  //组合票和联票跳订单列表
+						  this.afterBuyUrl='/pages/my/order/orderList/orderList'
+            }
+          }
+          //支付参数开始
+          this.timeStamp = res.data.timestamp
+          this.nonceStr = res.data.noncestr
+          this.package = res.data.package
+          this.signType = res.data.signType
+          this.paySign = res.data.sign
+          //支付宝入参
+          this.orderInfo = res.data.payInfo || ''
+          //支付参数结束
+          this.pdOrderMoney = res.data.pdOrderMoney
+          if (this.pdOrderMoney == 0 && res.data.subOrderType == -1){
+            uni.navigateTo({
+              url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl
+            })
+          }
+          this.errorMessage1 = res.data.errorMessage
+          this.totalMoney = res.data.totalMoney
+          this.orderList = res.data.orderList||[]
+          if (this.orderList.length==0||res.data.orderPageShowFlag==0) {
+            this.orderList=[]
+            this.orderList.push({
+              merchantName:res.data.merchantName,
+              productName:res.data.productName,
+              unitPrice:res.data.unitPrice,
+              orderNum:res.data.orderNum,
+              depositReceived:res.data.depositReceived,
+              pdDiscountMoney:res.data.pdDiscountMoney,
+              endPlayDate:res.data.endPlayDate
+            })
+          }
+        } else {
+          uni.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+          this.errorMessage2=res.message
+        }
+      })
+    },
+    //----去支付
+    goPay() {
+      if (this.errorMessage1) {
+        uni.showToast({
+          title: this.errorMessage1,
+          icon: 'none'
+        })
+        return
+      }
+      this.background = '#E6E6E6'
+      setTimeout(() => {
+        this.background = '#3688FF'
+      }, 1000)
+      // #ifdef MP-WEIXIN
+      if(!this.timeStamp||!this.nonceStr||!this.package||!this.signType||!this.paySign){
+        uni.showToast({
+				  title: '缺少支付参数',
+				  icon: 'none'
+        })
+        return
+      }
+      uni.requestPayment({
+        provider: 'wxpay',
+        timeStamp: this.timeStamp,
+        nonceStr: this.nonceStr,
+        package: this.package,
+        signType: this.signType,
+        paySign: this.paySign,
+        success:res=>{
+          uni.navigateTo({
+					  url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl
+          })
+        },
+        fail: function(err) {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none'
+          })
+        }
+      })
+      //#endif
+
+      // #ifdef MP-ALIPAY
+      if(!this.orderInfo){
+			  uni.showToast({
+				  title: '缺少支付参数',
+				  icon: 'none'
+			  })
+			  return
+      }
+      uni.requestPayment({
+        provider: 'alipay', // 服务提供商 支付宝支付: alipay   微信支付: wxpay
+        orderInfo: this.orderInfo, // 支付宝订单号
+        success: res=> {
+          uni.navigateTo({
+            url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl
+          })
+        },
+        fail: function(err) {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none'
+          })
+        }
+      })
+      // #endif
+    }
+  }
+}
+</script>
+
+<style scoped>
+.son-wrap {
+	height:65vh;
+}
+.middle {
+	padding: 30rpx 24rpx 0 24rpx;
+}
+.middle-wrap {
+	padding: 10rpx 24rpx 20rpx 24rpx;
+	background: #ffffff;
+	border-radius: 20rpx;
+	box-shadow: 0 0 15rpx #e6e6e8;
+}
+.product {
+	border-bottom: 1px solid #e5e5e5;
+	padding: 25rpx 0;
+}
+.product view {
+	color: #000000;
+	padding-left: 10rpx;
+	display: flex;
+	align-items: center;
+	box-sizing: border-box;
+}
+.product view text:first-child {
+	flex: 1;
+}
+.product view text:nth-child(2) {
+	color: #666666;
+	font-size: 28rpx;
+	text-align: right;
+}
+.product view.coupon {
+	color: #f9690e;
+	margin-top: 10rpx;
+}
+.product view.coupon text {
+	font-size: 30rpx;
+}
+.middle-money {
+	height: 120rpx;
+	color: #000000;
+	border-bottom: 1px solid #e5e5e5;
+	padding: 25rpx 0 25rpx 10rpx;
+	display: flex;
+	align-items: center;
+	box-sizing: border-box;
+	justify-content: space-between;
+}
+.middle-money view:nth-child(2) {
+	font-size: 24rpx;
+	color: #666666;
+}
+.middle-money view:nth-child(2) {
+	font-size: 36rpx;
+	color: #f9690e;
+	font-weight: bold;
+}
+.middle-image {
+	margin-top: 50rpx;
+	display: flex;
+	align-items: center;
+}
+.middle-image > image:first-child {
+	margin: 0 20rpx 0 10rpx;
+}
+.middle-image > view {
+	flex: 1;
+}
+.bottom {
+	position: fixed;
+	bottom: 0;
+	height: 100rpx;
+	background: #ffffff;
+	border-top: 1px solid #e5e5e5;
+	width: 100%;
+	display: flex;
+	align-items: center;
+}
+.bottom-left {
+	border-right: 1px solid #cccccc;
+	padding-left: 40rpx;
+	width: 40%;
+}
+.bottom-left text:nth-child(2) {
+	font-size: 40rpx;
+	color: #f9690e;
+	margin-left: 10rpx;
+	font-weight: bold;
+}
+.bottom-right {
+	padding-left:30rpx;
+	display: flex;
+	width: 60%;
+	padding-right:30rpx;
+	align-items: center;
+}
+.bottom-right text:nth-child(2) {
+	flex: 1;
+	height: 70rpx;
+	display: inline-block;
+	text-align: center;
+	line-height: 70rpx;
+	background: #3688FF;
+	color: #ffffff;
+	margin-left: 30rpx;
+	border-radius: 20rpx;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+</style>
\ No newline at end of file

pages/scenic/scenicSingleOrder/scenicSingleOrder.vue

@@ -361,6 +361,7 @@
 			@contactListConfig='contactListConfig'
 		></contactList>
 		<orderCoupon :couponData="couponData" ref="orderCoupon" @couponChoose="couponChoose" :chooseCouponObj="chooseCouponObj"></orderCoupon>
+		<!-- <orderPay :orderId='orderId' ref="orderPay"></orderPay> -->
 		<!--一个站点时获取排队信息弹窗-->
 		<u-popup :show="sortInforPop" :round="10" closeable @close="sortInforPop = false">
 			<view style="padding: 40rpx 60rpx">
@@ -400,6 +401,7 @@ import chooseArea from '../scenicComponents/chooseArea' //选择站点
 import contactList from '../scenicComponents/contactList' //联系人弹窗
 import editContacts from '../scenicComponents/editContacts' //编辑联系人弹窗
 import times from '../scenicComponents/times' //更多时间弹窗
+import orderPay from '../scenicComponents/orderPay.vue' //支付弹窗
 
 export default {
   components: {
@@ -410,7 +412,8 @@ export default {
     editContacts,
     times,
     chooseArea,
-    orderCoupon
+    orderCoupon,
+    orderPay
   },
   data() {
     return {
@@ -470,6 +473,8 @@ export default {
       ableConpon: '', //没有可用优惠券时，达到一定条件可用，显示达到的条件
       timer:null,//时间函数
       sortStatus:true,//排号状态
+      orderId:'',//订单Id
+      productCompanyId:'',//产品公司Id
     }
   },
   onUnload() {
@@ -553,6 +558,7 @@ export default {
 		  this.$request('scenic/groupGood/loadProduct', data).then(res => {
 		    if (res.code == '00') {
 		      this.productIfo = res.data
+          this.productCompanyId=this.productIfo.merchantVo.productCompanyId
 		      this.defaultAreaCode = this.productIfo.defaultAreaCode || ''
 		      this.merchantCode = this.productIfo.merchantVo.code, //商户code
 		      this.productId = res.data.id//产品id变化，重新赋值产品id
@@ -582,7 +588,8 @@ export default {
     //---获取产品价格库存列表
     getPriceList() {
 		  let data = {
-		    productId: this.productId //产品id
+		    productId: this.productId, //产品id
+        companyId:this.productCompanyId
 		  }
 		  this.$request('scenic/user/product/priceStockList', data).then(res => {
 		    if (res.code == '00') {
@@ -1379,6 +1386,20 @@ export default {
             uni.navigateTo({
               url: '/pages/payment/orderPayment/orderPayment?orderId='+res.data.id
             })
+            // uni.openEmbeddedMiniProgram({
+            // 	appId: 'wx64134dba0cb21899', // 目标小程序的appid
+            // 	path: 'pages/payment/orderPayment/orderPayment?orderId='+res.data.id, // 打开的页面路径，可选
+            // 	success: (res) => {
+            // 		// 打开成功的回调
+            // 		console.log('打开嵌入的小程序成功', res)
+            // 	},
+            // 	fail: (err) => {
+            // 		// 打开失败的回调
+            // 		console.error('打开嵌入的小程序失败', err)
+            // 	}
+            // })
+            // this.orderId=res.data.id
+            // this.$refs.orderPay.showPop=true
           } else {
             uni.showToast({
 						  title: '下单失败',