Skip to content

U
uni-pdtravel
Commit 44d77aff authored by qipeng's avatar qipeng
Browse files
Options

还原版本

parent 415542f1
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 84 deletions
pages/my/applyUnsubscription/applyUnsubscription.vue
View file @ 44d77aff
...@@ -40,12 +40,15 @@ ...@@ -40,12 +40,15 @@
退改原因（必填） 退改原因（必填）
</view> </view>
<view class="cause-list"> <view class="cause-list">
<view class="list-case" v-for="(item,index) in causeList" :key="index"> <view class="list-case" v-for="(item,index) in causeList" :key="index" @click="clickNewFun(item.labelNum)">
<view class="case-name">{{item.name}}</view> <view class="case-name">{{item.name}}</view>
<view class="case-click" :class="causeNum==item.labelNum?'case-clickAct':''" @click="clickNewFun(item.labelNum)"></view> <view class="case-click" :class="causeNum==item.labelNum?'case-clickAct':''"></view>
</view> </view>
</view> </view>
</view> </view>
<view class="apply-textarea general-Box">
<u-input v-model="causeInput" type="textarea" placeholder="补充详细退改原因以便商家更快帮您处理" maxlength="200" />
</view>
</view> </view>
</template> </template>
...@@ -87,6 +90,7 @@ export default { ...@@ -87,6 +90,7 @@ export default {
}, },
],//退订原因 ],//退订原因
causeNum:null, causeNum:null,
causeInput:'',//其他原因
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -242,10 +246,25 @@ export default { ...@@ -242,10 +246,25 @@ export default {
border: 2rpx solid #3688FF; border: 2rpx solid #3688FF;
border-radius: 50%; border-radius: 50%;
} }
.case-clickAct{
border: 12rpx solid #3688FF;
}
} }
.list-case:nth-last-child(1){ .list-case:nth-last-child(1){
margin-bottom: 0; margin-bottom: 0;
} }
} }
} }
.apply-textarea{
padding: 24rpx;
/deep/ .u-border{
border: none;
}
/deep/ .u-input__textarea{
height: 248rpx !important;
background: #F6FAFF;
border-radius: 8rpx 8rpx 8rpx 8rpx;
padding: 24rpx !important;
}
}
</style> </style>
pages/my/order/electronicTicket/electronicTicket-副本.vue
View file @ 44d77aff
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<view class="page-box"> <view class="page-box">
<view class="order-status"> <view class="order-status">
<view class="status-box"> <view class="status-box">
<template v-if="channelType==1"> <template v-if="orderInfo.channelType==8">
<view class="status-type"> <view class="status-type">
携程<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text> {{orderInfo.channelName}}<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text>
</view> </view>
</template> </template>
...@@ -47,7 +47,9 @@ ...@@ -47,7 +47,9 @@
</view> </view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5"> <view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码：{{ticketCode}}</view> <view class="box-verificationCode">验证码：{{ticketCode}}</view>
<canvas class="box-QRcode" canvas-id="qrcode"/> <!-- <uqrcode ref="uqrcode" canvas-id="qrcode" size="200" class="box-QRcode" :value="uqrcodeVal" :options="{ margin: 10 }" ></uqrcode> -->
<!--后端生成-->
<!-- <image :src="imgUrlList" style="width: 180px;height: 180px;margin: 0 auto;display: block;" v-if="imgUrlListType"></image> -->
<view class="progress-box" v-if="qrCodeType==true"> <view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" /> <progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view> </view>
...@@ -251,7 +253,7 @@ ...@@ -251,7 +253,7 @@
<view class="case-list"> <view class="case-list">
<view class="list-name">订单编号</view> <view class="list-name">订单编号</view>
<view class="list-text list-text2">{{orderInfo.id}}</view> <view class="list-text list-text2">{{orderInfo.id}}</view>
<image class="list-btn" @click="copyText(orderInfo.id)" src="../../../../static/img/my/icon01.png"></image> <image class="list-btn" @click="copyText(orderInfo.id)" src="../../static/orderList/icon01.png"></image>
<!-- <view class="list-btn" @click="copyText(orderInfo.id)">复制</view> --> <!-- <view class="list-btn" @click="copyText(orderInfo.id)">复制</view> -->
</view> </view>
<view class="case-list"> <view class="case-list">
...@@ -343,7 +345,7 @@ ...@@ -343,7 +345,7 @@
</template> </template>
<script> <script>
import uQRCode from '@/common/js/uqrcode.js' import uQRCode from '@/common/uqrcode4.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue' import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
...@@ -507,6 +509,7 @@ export default { ...@@ -507,6 +509,7 @@ export default {
}, },
data() { data() {
return { return {
uqrcodeVal:'',
orderDataType:false, orderDataType:false,
openId:'',//用户信息 openId:'',//用户信息
id:'',//订单ID id:'',//订单ID
...@@ -541,10 +544,11 @@ export default { ...@@ -541,10 +544,11 @@ export default {
btnRefundType:false,//是否可退款 btnRefundType:false,//是否可退款
ifyukuaiCode:'', ifyukuaiCode:'',
visitorIndex:'',//短信特殊字段 visitorIndex:'',//短信特殊字段
channelType:0,//渠道状态channelType==0 订单列表跳转 ==1 OTA取票跳转
photoType:false,//是否显示优惠券 photoType:false,//是否显示优惠券
claimStatus:1,//领取状态 0未领取 1已领取 claimStatus:1,//领取状态 0未领取 1已领取
findCouponPhoto:{},//相册优惠券 findCouponPhoto:{},//相册优惠券
imgUrlList:'',
imgUrlListType:false,
} }
}, },
onShow() { onShow() {
...@@ -581,9 +585,7 @@ export default { ...@@ -581,9 +585,7 @@ export default {
this.ifyukuaiCode = option.ifyukuaiCode||'' this.ifyukuaiCode = option.ifyukuaiCode||''
//this.id = "z00167956572219584dc15634b62cf75" //this.id = "z00167956572219584dc15634b62cf75"
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
this.channelType = option.channelType||0 this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
this.getDetail() this.getDetail()
}, },
onUnload() { onUnload() {
...@@ -746,8 +748,9 @@ export default { ...@@ -746,8 +748,9 @@ export default {
var orderNum = this.orderInfo.orderNum var orderNum = this.orderInfo.orderNum
var userId = this.openId var userId = this.openId
var orderId = this.orderInfo.id var orderId = this.orderInfo.id
var verifyCode = this.ticketCode // var verifyCode = this.ticketCode
let data={areaCode,orderNum,userId,orderId,verifyCode,'againNumber':0} var thirdId = this.orderInfo.thirdOrderId
let data={areaCode,orderNum,userId,orderId,thirdId,'againNumber':0}
this.$request('distribution/distribution/getNewFetchInfo',data).then((res)=>{ this.$request('distribution/distribution/getNewFetchInfo',data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
if(res.data.length>0){ if(res.data.length>0){
...@@ -845,17 +848,22 @@ export default { ...@@ -845,17 +848,22 @@ export default {
}else{ }else{
verifyCode=this.verifyCode verifyCode=this.verifyCode
} }
uQRCode.make({ // uQRCode.make({
canvasId: 'qrcode', // canvasId: 'qrcode',
componentInstance: this, // componentInstance: this,
text: verifyCode, // text: verifyCode,
size: 180, // size: 180,
margin: 10, // margin: 10,
backgroundColor: '#ffffff', // backgroundColor: '#ffffff',
foregroundColor: '#000000', // foregroundColor: '#000000',
fileType: 'jpg', // fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H // errorCorrectLevel: uQRCode.errorCorrectLevel.H
}) // })
// this.uqrcodeVal=verifyCode
//后端生成
// var verifyCodeURL = encodeURI(verifyCode)
// this.imgUrlList = 'http://pay.tuyoyoo.com/distribution/c/'+verifyCodeURL+'?width=180&height=180&frontColor=0&backColor=16777215'
// this.imgUrlListType = true
} }
}, },
signOverFun(item){//过号遮罩显示 signOverFun(item){//过号遮罩显示
...@@ -896,17 +904,23 @@ export default { ...@@ -896,17 +904,23 @@ export default {
// height: 180, // height: 180,
// text:this.codeNo // text:this.codeNo
// }) // })
uQRCode.make({ // uQRCode.make({
canvasId: 'qrcode', // canvasId: 'qrcode',
componentInstance: this, // componentInstance: this,
text: this.codeNo, // text: this.codeNo,
size: 180, // size: 180,
margin: 10, // margin: 10,
backgroundColor: '#ffffff', // backgroundColor: '#ffffff',
foregroundColor: '#000000', // foregroundColor: '#000000',
fileType: 'jpg', // fileType: 'jpg',
errorCorrectLevel: uQRCode.errorCorrectLevel.H // errorCorrectLevel: uQRCode.errorCorrectLevel.H
}) // })
// this.uqrcodeVal=this.codeNo
//后端生成
// this.imgUrlListType = false
// var verifyCodeURL = 'http://pay.tuyoyoo.com/distribution/c/'+this.codeNo+'?width=180&height=180&frontColor=0&backColor=16777215'
// this.imgUrlList = encodeURI(verifyCodeURL)
// this.imgUrlListType = true
} }
this.percentage+=1 this.percentage+=1
if(this.percentage>=100){ if(this.percentage>=100){
...@@ -1330,8 +1344,8 @@ export default { ...@@ -1330,8 +1344,8 @@ export default {
.order-certificate .certificate-box .box-QRcode { .order-certificate .certificate-box .box-QRcode {
display: block; display: block;
width: 180px; width: 200px;
height: 180px; height: 200px;
margin: 0 auto; margin: 0 auto;
} }
.order-certificate .certificate-box .box-QRcode2{ .order-certificate .certificate-box .box-QRcode2{
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 44d77aff
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="status-box"> <view class="status-box">
<template v-if="orderInfo.channelType==8"> <template v-if="orderInfo.channelType==8">
<view class="status-type"> <view class="status-type">
{{orderInfo.channelName}}<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text> 携程<text style="font-size: 28rpx;margin-left: 10rpx;">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</text>
</view> </view>
</template> </template>
...@@ -47,9 +47,7 @@ ...@@ -47,9 +47,7 @@
</view> </view>
<view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5"> <view class="certificate-box" v-else-if="orderInfo.exchangeMode==1||orderInfo.exchangeMode==4||orderInfo.exchangeMode==5">
<view class="box-verificationCode">验证码：{{ticketCode}}</view> <view class="box-verificationCode">验证码：{{ticketCode}}</view>
<uqrcode ref="uqrcode" canvas-id="qrcode" size="200" class="box-QRcode" :value="uqrcodeVal" :options="{ margin: 10 }" ></uqrcode> <canvas class="box-QRcode" canvas-id="qrcode"/>
<!--后端生成-->
<!-- <image :src="imgUrlList" style="width: 180px;height: 180px;margin: 0 auto;display: block;" v-if="imgUrlListType"></image> -->
<view class="progress-box" v-if="qrCodeType==true"> <view class="progress-box" v-if="qrCodeType==true">
<progress :percent="percentage" activeColor="#3688FF" stroke-width="3" /> <progress :percent="percentage" activeColor="#3688FF" stroke-width="3" />
</view> </view>
...@@ -253,7 +251,7 @@ ...@@ -253,7 +251,7 @@
<view class="case-list"> <view class="case-list">
<view class="list-name">订单编号</view> <view class="list-name">订单编号</view>
<view class="list-text list-text2">{{orderInfo.id}}</view> <view class="list-text list-text2">{{orderInfo.id}}</view>
<image class="list-btn" @click="copyText(orderInfo.id)" src="../../static/orderList/icon01.png"></image> <image class="list-btn" @click="copyText(orderInfo.id)" src="../../../../static/img/my/icon01.png"></image>
<!-- <view class="list-btn" @click="copyText(orderInfo.id)">复制</view> --> <!-- <view class="list-btn" @click="copyText(orderInfo.id)">复制</view> -->
</view> </view>
<view class="case-list"> <view class="case-list">
...@@ -345,7 +343,7 @@ ...@@ -345,7 +343,7 @@
</template> </template>
<script> <script>
import uQRCode from '@/common/uqrcode4.js' import uQRCode from '@/common/js/uqrcode.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue' import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
...@@ -509,7 +507,6 @@ export default { ...@@ -509,7 +507,6 @@ export default {
}, },
data() { data() {
return { return {
uqrcodeVal:'',
orderDataType:false, orderDataType:false,
openId:'',//用户信息 openId:'',//用户信息
id:'',//订单ID id:'',//订单ID
...@@ -547,8 +544,6 @@ export default { ...@@ -547,8 +544,6 @@ export default {
photoType:false,//是否显示优惠券 photoType:false,//是否显示优惠券
claimStatus:1,//领取状态 0未领取 1已领取 claimStatus:1,//领取状态 0未领取 1已领取
findCouponPhoto:{},//相册优惠券 findCouponPhoto:{},//相册优惠券
imgUrlList:'',
imgUrlListType:false,
} }
}, },
onShow() { onShow() {
...@@ -748,9 +743,8 @@ export default { ...@@ -748,9 +743,8 @@ export default {
var orderNum = this.orderInfo.orderNum var orderNum = this.orderInfo.orderNum
var userId = this.openId var userId = this.openId
var orderId = this.orderInfo.id var orderId = this.orderInfo.id
// var verifyCode = this.ticketCode var verifyCode = this.ticketCode
var thirdId = this.orderInfo.thirdOrderId let data={areaCode,orderNum,userId,orderId,verifyCode,'againNumber':0}
let data={areaCode,orderNum,userId,orderId,thirdId,'againNumber':0}
this.$request('distribution/distribution/getNewFetchInfo',data).then((res)=>{ this.$request('distribution/distribution/getNewFetchInfo',data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
if(res.data.length>0){ if(res.data.length>0){
...@@ -848,22 +842,17 @@ export default { ...@@ -848,22 +842,17 @@ export default {
}else{ }else{
verifyCode=this.verifyCode verifyCode=this.verifyCode
} }
// uQRCode.make({ uQRCode.make({
// canvasId: 'qrcode', canvasId: 'qrcode',
// componentInstance: this, componentInstance: this,
// text: verifyCode, text: verifyCode,
// size: 180, size: 180,
// margin: 10, margin: 10,
// backgroundColor: '#ffffff', backgroundColor: '#ffffff',
// foregroundColor: '#000000', foregroundColor: '#000000',
// fileType: 'jpg', fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H errorCorrectLevel: uQRCode.errorCorrectLevel.H
// }) })
this.uqrcodeVal=verifyCode
//后端生成
//var verifyCodeURL = verifyCode.encodeURI()
// this.imgUrlList = 'http://pay.tuyoyoo.com/distribution/c/'+verifyCodeURL+'?width=180&height=180&frontColor=0&backColor=16777215'
// this.imgUrlListType = true
} }
}, },
signOverFun(item){//过号遮罩显示 signOverFun(item){//过号遮罩显示
...@@ -904,23 +893,17 @@ export default { ...@@ -904,23 +893,17 @@ export default {
// height: 180, // height: 180,
// text:this.codeNo // text:this.codeNo
// }) // })
// uQRCode.make({ uQRCode.make({
// canvasId: 'qrcode', canvasId: 'qrcode',
// componentInstance: this, componentInstance: this,
// text: this.codeNo, text: this.codeNo,
// size: 180, size: 180,
// margin: 10, margin: 10,
// backgroundColor: '#ffffff', backgroundColor: '#ffffff',
// foregroundColor: '#000000', foregroundColor: '#000000',
// fileType: 'jpg', fileType: 'jpg',
// errorCorrectLevel: uQRCode.errorCorrectLevel.H errorCorrectLevel: uQRCode.errorCorrectLevel.H
// }) })
this.uqrcodeVal=this.codeNo
//后端生成
// this.imgUrlListType = false
//var verifyCodeURL = this.codeNo.encodeURI()
// this.imgUrlList = 'http://pay.tuyoyoo.com/distribution/c/'+verifyCodeURL+'?width=180&height=180&frontColor=0&backColor=16777215'
// this.imgUrlListType = true
} }
this.percentage+=1 this.percentage+=1
if(this.percentage>=100){ if(this.percentage>=100){
...@@ -1344,8 +1327,8 @@ export default { ...@@ -1344,8 +1327,8 @@ export default {
.order-certificate .certificate-box .box-QRcode { .order-certificate .certificate-box .box-QRcode {
display: block; display: block;
width: 200px; width: 180px;
height: 200px; height: 180px;
margin: 0 auto; margin: 0 auto;
} }
.order-certificate .certificate-box .box-QRcode2{ .order-certificate .certificate-box .box-QRcode2{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment