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

pages/my/exchangeCode/exchangeIndex/exchangeIndex.vue

@@ -51,8 +51,9 @@ export default {
   onLoad(option) {
     //this.userId = ''//uni.getStorageSync('openid')
     //this.productId = option.productId||'z001700015788731bfffd2581156dcfa'
-    this.ticketCode = this.$commonjs.getKey(option.ticketCode)||'85729040864674'
-    this.merchantId = this.$commonjs.getKey(option.merchantId)||'z001666149446146aaaf63f524961e53'
+    this.ticketCode = this.$commonjs.getKey(option.ticketCode)||''
+    this.merchantId = this.$commonjs.getKey(option.merchantId)||''
+    console.log(this.merchantId)
     this.loadMerchantInfo()
   },
   methods: {
@@ -230,17 +231,20 @@ export default {
 		left: 0;
 		.mask-list{
 			height: 600rpx;
+			padding: 20rpx 0 0 0;
 			overflow-y: auto;
 			.list-box{
 				width: 680rpx;
-				margin: 0 auto;
+				margin: 0 auto 20rpx auto;
 				padding: 30rpx 20rpx;
 				border: solid 1px #EEEFF0;
+				border-radius: 8rpx;
 				line-height: 30rpx;
 				font-size: 26rpx;
 				color: #333333;
 			}
 			.list-boxAct{
+				color: #FE6600;
 				border: 1px solid #FE6600;
 			}
 		}