订单详情 新增短信接口

pages/my/order/electronicTicket/electronicTicket.vue

@@ -405,6 +405,7 @@
 		},
 		data() {
 			return {
+				orderDataType:false,
 				openId:'',//用户信息
 				id:'',//订单ID
 				companyId:'',//公司ID
@@ -436,6 +437,7 @@
 				qrCodeType:false,//是否是多个二维码
 				btnRefundType:false,//是否可退款
 				ifyukuaiCode:'',
+				visitorIndex:'',//短信特殊字段
 			}
 		},
 		onShow() {
@@ -458,11 +460,21 @@
 		  })
 		},
 		onLoad(option) {
+			console.log(option.orderId)
+			console.log("-----------------------")
+			if(option.orderId!=undefined){
 				this.id = option.orderId
+				this.orderDataType = true
+			}else{
+				this.id = option.thirdOrderId
+				this.visitorIndex = option.visitorIndex
+				this.orderDataType = false
+			}
+
 			this.ifyukuaiCode = option.ifyukuaiCode||''
 			//this.id = "z00167956572219584dc15634b62cf75"
-			//this.openId = uni.getStorageSync("openid") //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
-			this.openId = "oh2UV1lyYABHMZ1rMlgjhVHyyYDQ"
+			this.openId = uni.getStorageSync("openid") //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
+			//this.openId = "oh2UV1lyYABHMZ1rMlgjhVHyyYDQ"
 			this.getDetail();
 			
 		},
@@ -481,11 +493,23 @@
 		},
 		methods: {
 			getDetail(){//*-----------------加载订单
-				let data={
+				var postHttpUrl = '';
+				let data = {}
+				if(this.orderDataType == true){//为小程序
+					data={
 						orderId:this.id,//订单ID
 						userId:this.openId,//用户Id
 					}
-				this.$request('order/userOrder/findOrderDetail',data).then((res)=>{
+					postHttpUrl = 'order/userOrder/findOrderDetail'
+				}else{//为短信
+					data={
+						thirdOrderId:this.id,//订单ID
+						userId:this.openId,//用户Id
+					}
+					postHttpUrl = 'order/userOrder/findOrderDetailByThirdOrderId'
+				}
+				
+				this.$request(postHttpUrl,data).then((res)=>{
 					if(res.code=="00"){
 						this.orderInfo = res.data
 						this.orderExtendList = res.data.orderExtendList
@@ -626,10 +650,16 @@
 					// 	height: 180,
 					// 	text:this.verifyCode
 					// })
+					let verifyCode=""
+					if(this.visitorIndex!==""){
+						verifyCode=this.verifyCode+":"+this.visitorIndex
+					}else{
+						verifyCode=this.verifyCode
+					}
 					uQRCode.make({
 						canvasId: 'qrcode',
 						componentInstance: this,
-						text: this.verifyCode,
+						text: verifyCode,
 						size: 180,
 						margin: 10,
 						backgroundColor: '#ffffff',
@@ -677,10 +707,16 @@
 					// 	height: 180,
 					// 	text:this.codeNo
 					// })
+					let verifyCode=""
+					if(this.visitorIndex!==""){
+						verifyCode=this.codeNo+":"+this.visitorIndex
+					}else{
+						verifyCode=this.codeNo
+					}
 					uQRCode.make({
 						canvasId: 'qrcode',
 						componentInstance: this,
-						text: this.codeNo,
+						text: verifyCode,
 						size: 180,
 						margin: 10,
 						backgroundColor: '#ffffff',