Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages.json

@@ -270,7 +270,16 @@
 					}
 
 				}
-			]
+			    ,{
+                    "path" : "applyUnsubscription/applyUnsubscription",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "退订",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 		},
 		{
 			"root": "pages/scenic", //景区分包

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -178,6 +178,7 @@ export default {
     this.companyId = this.$commonjs.getCompanyId(option)||''
     //this.companyId = '6da527f930be4aa1904fe17fcb41874f'
     this.openid = uni.getStorageSync('openid') //获取openid
+    //this.openid = 'oroHZ5B455jLw_BqDmVpr7W13NLY' //获取openid
     this.faceIds = JSON.parse(option.faceIds)
     this.location = JSON.parse(uni.getStorageSync('location'))
     this.merchantId = option.merchantId||'z0015605022691a5945bbe463141668c'// 'z0015605022691a5945bbe463141668c'

pages/my/applyUnsubscription/applyUnsubscription.vue

+<template>
+	<view class="apply-box">
+		<!--提示-->
+		<view class="apply-tips">
+			同一身份证退票当日仅再购1次，同一身份证一个月累计可购3次
+		</view>
+		<view class="apply-ticket general-Box">
+			<view class="ticket-title">
+				<view class="title-name">长江索道（往返票/成人票）</view>
+				<view class="title-num">x2</view>
+			</view>
+			<view class="ticket-timer">游玩当日17:00之前未使用可退</view>
+		</view>
+		<view class="apply-user general-Box">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+				
+    }
+  },
+  onLoad(option) {
+			
+  },
+  methods: {
+			
+  }
+}
+</script>
+
+<style scoped="scoped" lang="scss">
+.apply-box{
+	height: 100vh;
+	background-color: #ECF3FE;
+	padding: 0rpx 0rpx 122rpx 0rpx;
+	overflow: auto;
+}
+.apply-tips{
+	padding: 12rpx 32rpx 12rpx 32rpx;
+	font-size: 24rpx;
+	color: #FC771D;
+	line-height: 42rpx;
+	background: #FFF1E8;
+	margin-bottom: 16rpx;
+}
+.general-Box{
+	width: 702rpx;
+	padding: 0 24rpx 0 24rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 16rpx 2rpx rgba(0,0,0,0.08);
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	margin: 0 auto 16rpx auto;
+}
+.apply-ticket{
+	padding: 32rpx 24rpx 32rpx 24rpx;
+	.ticket-title{
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 16rpx;
+		.title-name{
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #191919;
+			line-height: 40rpx;
+		}
+		.title-num{
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+			line-height: 40rpx;
+		}
+	}
+	.ticket-timer{
+		font-size: 28rpx;
+		color: #3688FF;
+		line-height: 40rpx;
+	}
+}
+.apply-user{
+	
+}
+</style>