@@ -33,9 +33,7 @@ Page({ | |||||
scaleData: null, | scaleData: null, | ||||
skewData: null, | skewData: null, | ||||
matrixData: null, | matrixData: null, | ||||
// flag: false, | |||||
scale01:0, | |||||
opacity01:0, | |||||
opacity:0, | |||||
queueData:null, | queueData:null, | ||||
zIndex:11, | zIndex:11, | ||||
display:null | display:null | ||||
@@ -96,13 +94,16 @@ Page({ | |||||
closeQuestion: function () { | closeQuestion: function () { | ||||
let that = this; | let that = this; | ||||
that.setData({ | |||||
display:"none", | |||||
zIndex: 11, | |||||
}) | |||||
setTimeout(function(){ | |||||
that.setData({ | |||||
display: "none", | |||||
zIndex: 11, | |||||
opacity: 0 | |||||
}) | |||||
},500) | |||||
setTimeout(function () { | setTimeout(function () { | ||||
that.orderFunc(); | that.orderFunc(); | ||||
}, 300) | |||||
}, 500) | |||||
}, | }, | ||||
/** | /** | ||||
* gotopay | * gotopay | ||||
@@ -128,7 +129,7 @@ Page({ | |||||
} else if (res.data) { | } else if (res.data) { | ||||
var animation = wx.createAnimation({}); | var animation = wx.createAnimation({}); | ||||
animation.translate((that.data.widthScreen - that.data.widthScreen), 0).scale(1).opacity(1).step({ | animation.translate((that.data.widthScreen - that.data.widthScreen), 0).scale(1).opacity(1).step({ | ||||
duration: 1000 | |||||
duration: 500 | |||||
}) | }) | ||||
that.setData({ | that.setData({ | ||||
@@ -4,7 +4,7 @@ | |||||
<view class='banner'> | <view class='banner'> | ||||
<image src='{{data.coverImg}}'></image> | <image src='{{data.coverImg}}'></image> | ||||
</view> | </view> | ||||
<view class='coupons_info'> | |||||
<view class='coupons_info' style='position:relative;z-index:{{zIndex}}'> | |||||
<view class='fenxiang'> | <view class='fenxiang'> | ||||
<image class="fenxiang" src='./../../../assets/img/fenxiang.png' mode="widthFix"></image> | <image class="fenxiang" src='./../../../assets/img/fenxiang.png' mode="widthFix"></image> | ||||
<button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' | <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' | ||||
@@ -67,7 +67,7 @@ | |||||
<text>{{data.merchantName}}</text> | <text>{{data.merchantName}}</text> | ||||
<text>{{data.addr}}{{data.buildingName}}{{data.floorName}}</text> | <text>{{data.addr}}{{data.buildingName}}{{data.floorName}}</text> | ||||
</view> | </view> | ||||
<image bindtap='phone' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" /> | |||||
<image style='position:absolute;z-index:{{zIndex}}' bindtap='phone' class="tel" src="./../../../assets/img/tel.jpg" mode="widthFix" /> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='notes'> | <view class='notes'> | ||||
@@ -89,7 +89,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 问卷调查 --> | <!-- 问卷调查 --> | ||||
<view class="b1" style="opacity:0;display: {{display}}" animation="{{queueData}}"> | |||||
<view class="b1" style="opacity:{{opacity}};display: {{display}}" animation="{{queueData}}"> | |||||
<view id='con' class='con'> | <view id='con' class='con'> | ||||
<image class='close' mode='widthFix' src="./../../../assets/img/closed.png" bindtap="closeQuestion"></image> | <image class='close' mode='widthFix' src="./../../../assets/img/closed.png" bindtap="closeQuestion"></image> | ||||
<image class='ques_gou' mode='widthFix' src="./../../../assets/img/ques_gou.png"></image> | <image class='ques_gou' mode='widthFix' src="./../../../assets/img/ques_gou.png"></image> | ||||
@@ -23,14 +23,12 @@ page { | |||||
} | } | ||||
.coupons_info { | .coupons_info { | ||||
position: relative; | |||||
width: 92%; | width: 92%; | ||||
padding: 0 4%; | padding: 0 4%; | ||||
background: #fff; | background: #fff; | ||||
border-top-left-radius: 20rpx; | border-top-left-radius: 20rpx; | ||||
border-top-right-radius: 20rpx; | border-top-right-radius: 20rpx; | ||||
margin-top: -25rpx; | margin-top: -25rpx; | ||||
z-index: 3; | |||||
} | } | ||||
.fenxiang { | .fenxiang { | ||||
@@ -48,7 +46,7 @@ page { | |||||
} | } | ||||
.user-motto { | .user-motto { | ||||
width: 100%; | |||||
width: 100rpx; | |||||
border: 0; | border: 0; | ||||
background: none; | background: none; | ||||
height: 60rpx; | height: 60rpx; | ||||
@@ -286,14 +284,12 @@ page { | |||||
} | } | ||||
.tel { | .tel { | ||||
position: absolute; | |||||
right: 0; | right: 0; | ||||
top: 0; | top: 0; | ||||
bottom: 0; | bottom: 0; | ||||
margin: auto; | margin: auto; | ||||
width: 50rpx; | width: 50rpx; | ||||
height: 50rpx; | height: 50rpx; | ||||
z-index: 3; | |||||
} | } | ||||
.txt { | .txt { | ||||