Skip to content

U
uni-pdtravel
Commit 1c0a3499 authored by 潘永坪's avatar 潘永坪
Browse files
Options

Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

parents 3c31caed c2c86fb7
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
pages/my/exchangeCode/exchangeIndex/exchangeIndex.vue
View file @ 1c0a3499
...@@ -51,8 +51,9 @@ export default { ...@@ -51,8 +51,9 @@ export default {
onLoad(option) { onLoad(option) {
//this.userId = ''//uni.getStorageSync('openid') //this.userId = ''//uni.getStorageSync('openid')
//this.productId = option.productId||'z001700015788731bfffd2581156dcfa' //this.productId = option.productId||'z001700015788731bfffd2581156dcfa'
this.ticketCode = this.$commonjs.getKey(option.ticketCode)||'85729040864674' this.ticketCode = this.$commonjs.getKey(option.ticketCode)||''
this.merchantId = this.$commonjs.getKey(option.merchantId)||'z001666149446146aaaf63f524961e53' this.merchantId = this.$commonjs.getKey(option.merchantId)||''
console.log(this.merchantId)
this.loadMerchantInfo() this.loadMerchantInfo()
}, },
methods: { methods: {
...@@ -230,17 +231,20 @@ export default { ...@@ -230,17 +231,20 @@ export default {
left: 0; left: 0;
.mask-list{ .mask-list{
height: 600rpx; height: 600rpx;
padding: 20rpx 0 0 0;
overflow-y: auto; overflow-y: auto;
.list-box{ .list-box{
width: 680rpx; width: 680rpx;
margin: 0 auto; margin: 0 auto 20rpx auto;
padding: 30rpx 20rpx; padding: 30rpx 20rpx;
border: solid 1px #EEEFF0; border: solid 1px #EEEFF0;
border-radius: 8rpx;
line-height: 30rpx; line-height: 30rpx;
font-size: 26rpx; font-size: 26rpx;
color: #333333; color: #333333;
} }
.list-boxAct{ .list-boxAct{
color: #FE6600;
border: 1px solid #FE6600; border: 1px solid #FE6600;
} }
} }
......
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