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

pages/album/albumIndex.vue

@@ -85,14 +85,13 @@
 					<view class="coupon-box" v-if="couponTip">
 						<view class="congra">恭喜您！</view>
 						<view class="get-coupon">
-							获得摄影抵用券
-							<text class="price">{{couponPrice}}</text>元
+							免费获得 2 寸照片
 						</view>
 						<image class="my-card" src="./static/album/myCard.png" mode="aspectFit"></image>
-						<view class="use-rule" @click="showUseRuleClick">
+						<!-- <view class="use-rule" @click="showUseRuleClick">
 							使用规则
 							<u-icon name="arrow-right"></u-icon>
-						</view>
+						</view> -->
 						<view class="address">（使用地址：长江索道南站观景台旁）</view>
 					</view>
 					<view class="rules" v-if="showUseRule">
@@ -190,10 +189,6 @@ export default {
       this.couponTip = false
       this.showUseRule = false
     },
-    showUseRuleClick() {
-      this.couponTip = false
-      this.showUseRule = true
-    },
     jumpToScanFaceClick() { //---跳转扫脸页面
       this.$request('wechatUser/pdFace/checkScanFace', {
         openid: this.openid
@@ -380,8 +375,9 @@ export default {
     this.options = options
     if (this.options.template === 'true') { // 从模板选择页进入
       this.show = true
-      this.getCoupon()
-      this.couponIsUse()
+			this.couponTip = true
+      // this.getCoupon()
+      // this.couponIsUse()
     }else if (this.options.channelId) { // 扫码进入本页
       this.handleWhetherToVotePage()
     } else if (this.options.index == 1) { // 从vlog首页进入
@@ -645,14 +641,6 @@ export default {
 				font-weight: 700;
 			}
 
-			.price {
-				margin: 0 6rpx;
-				font-size: 64rpx;
-				font-weight: 700;
-				color: #EE520E;
-			}
-
-			.use-rule,
 			.address {
 				font-size: 24rpx;
 			}