| @@ -48,5 +48,4 @@ Page({ | |||||
| url: '/pages/main/index', | url: '/pages/main/index', | ||||
| }) | }) | ||||
| }, | }, | ||||
| }); | }); | ||||
| @@ -159,7 +159,7 @@ | |||||
| </view> | </view> | ||||
| <!-- 问卷调查 --> | <!-- 问卷调查 --> | ||||
| <view class="b1" style="opacity:{{opacity}};display: {{display}};" animation="{{queueData}}"> | |||||
| <view class="b1" style="opacity:{{opacity}};display: {{display}};position: fixed;top:{{navigationBarHeight}};bottom: 0px;left: 0px;right: 0px;background: rgba(0, 0, 0, 0.8);overflow: hidden;z-index: 10;" animation="{{queueData}}"> | |||||
| <view id='con' class='con'> | <view id='con' class='con'> | ||||
| <image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image> | <image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image> | ||||
| <image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image> | <image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image> | ||||
| @@ -450,16 +450,6 @@ button::after { | |||||
| background: #ff4949; | background: #ff4949; | ||||
| } | } | ||||
| .b1 { | |||||
| position: fixed; | |||||
| bottom: 0px; | |||||
| left: 0px; | |||||
| right: 0px; | |||||
| top:170rpx; | |||||
| background: rgba(0, 0, 0, 0.8); | |||||
| overflow: hidden; | |||||
| z-index: 10; | |||||
| } | |||||
| .con { | .con { | ||||
| position: absolute; | position: absolute; | ||||
| @@ -1,8 +1,10 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| var config = require("../../config/config.js"); | var config = require("../../config/config.js"); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| var app = getApp(); | var app = getApp(); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| canIUse: wx.canIUse("button.open-type.getPhoneNumber"), | canIUse: wx.canIUse("button.open-type.getPhoneNumber"), | ||||
| couponChannelId: "", | couponChannelId: "", | ||||
| path:null, | path:null, | ||||
| @@ -136,7 +138,7 @@ Page({ | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| title: err.message, | |||||
| title: "请授权手机号", | |||||
| icon: 'none', | icon: 'none', | ||||
| duration: 2000, | duration: 2000, | ||||
| mask: false | mask: false | ||||
| @@ -1,3 +1,5 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "" | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,9 +1,13 @@ | |||||
| <navbar home text="微信授权手机号" style="padding-top:200rpx;"></navbar> | |||||
| <view class="login-body"> | <view class="login-body"> | ||||
| <view class="login-logo"> | <view class="login-logo"> | ||||
| <image src="{{mallImgUrl}}"></image> | |||||
| <image src="{{mallImgUrl}}" mode="widthFix"></image> | |||||
| </view> | |||||
| <view class="title"> | |||||
| <text>Hi , 请登录~</text> | |||||
| <text>授权后,可以更好的体验我们哦~</text> | |||||
| </view> | </view> | ||||
| <view class="login-btn"> | <view class="login-btn"> | ||||
| <!-- <i-button i-class="login-btn-login" bind:click="getPhoneNumber">微信登陆</i-button> --> | |||||
| <button open-type="getPhoneNumber" hover-class='active' wx:if="{{canIUse}}" class="login-btn-login" bindgetphonenumber="getPhoneNumber">授权手机号</button> | <button open-type="getPhoneNumber" hover-class='active' wx:if="{{canIUse}}" class="login-btn-login" bindgetphonenumber="getPhoneNumber">授权手机号</button> | ||||
| <view wx:else>请升级微信版本</view> | <view wx:else>请升级微信版本</view> | ||||
| </view> | </view> | ||||
| @@ -1,3 +1,6 @@ | |||||
| page{ | |||||
| background: #fbfbfb; | |||||
| } | |||||
| .login-body { | .login-body { | ||||
| padding-top: 200rpx; | padding-top: 200rpx; | ||||
| display: flex; | display: flex; | ||||
| @@ -8,25 +11,27 @@ | |||||
| .login-logo { | .login-logo { | ||||
| width: 320rpx; | width: 320rpx; | ||||
| height: 320rpx; | |||||
| /* height: 320rpx; */ | |||||
| padding-top: 70rpx; | |||||
| } | } | ||||
| .login-logo>image { | .login-logo>image { | ||||
| width: 100%; | width: 100%; | ||||
| height: 100%; | height: 100%; | ||||
| border-radius: 16rpx; | |||||
| } | } | ||||
| .login-btn { | .login-btn { | ||||
| padding-top: 120rpx; | padding-top: 120rpx; | ||||
| width: 670rpx; | |||||
| width: 600rpx; | |||||
| } | } | ||||
| .active{ | .active{ | ||||
| opacity: .6; | opacity: .6; | ||||
| } | } | ||||
| .login-btn .login-btn-login { | .login-btn .login-btn-login { | ||||
| background: #00C0FF !important; | |||||
| border-radius: 60rpx !important; | |||||
| background: #1faf0c; | |||||
| border-radius: 15rpx !important; | |||||
| height: 94rpx !important; | height: 94rpx !important; | ||||
| line-height: 94rpx; | line-height: 94rpx; | ||||
| margin: 0 !important; | margin: 0 !important; | ||||
| @@ -36,4 +41,19 @@ | |||||
| color: #FFFFFF !important; | color: #FFFFFF !important; | ||||
| letter-spacing: 0.75rpx !important; | letter-spacing: 0.75rpx !important; | ||||
| text-align: center; | text-align: center; | ||||
| } | |||||
| .title{ | |||||
| margin-top: 30rpx; | |||||
| } | |||||
| .title text{ | |||||
| display: block; | |||||
| text-align: center; | |||||
| } | |||||
| .title text:nth-of-type(1){ | |||||
| font-size: 38rpx; | |||||
| font-weight: bold; | |||||
| } | |||||
| .title text:nth-of-type(2){ | |||||
| font-size: 30rpx; | |||||
| margin-top: 25rpx; | |||||
| } | } | ||||
| @@ -1,8 +1,10 @@ | |||||
| const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||||
| var config = require("../../config/config.js"); | var config = require("../../config/config.js"); | ||||
| var app = getApp(); | var app = getApp(); | ||||
| const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | |||||
| canIUse: wx.canIUse("button.open-type.getUserInfo"), | canIUse: wx.canIUse("button.open-type.getUserInfo"), | ||||
| path:null, | path:null, | ||||
| couponChannelId: null, | couponChannelId: null, | ||||
| @@ -1,3 +1,5 @@ | |||||
| { | { | ||||
| "navigationBarTitleText": "" | |||||
| "usingComponents": { | |||||
| "navbar": "../../components/navbar/navbar" | |||||
| } | |||||
| } | } | ||||
| @@ -1,11 +1,14 @@ | |||||
| <view class="login-body"> | |||||
| <navbar text="微信授权"></navbar> | |||||
| <view class="login-body" style="padding-top:200rpx;"> | |||||
| <view class="login-logo"> | <view class="login-logo"> | ||||
| <image src="{{mallImgUrl}}" mode='widthFix'></image> | <image src="{{mallImgUrl}}" mode='widthFix'></image> | ||||
| <text class='txt'>我们需要获取您的授权 | |||||
| 以关联您的账号</text> | |||||
| </view> | |||||
| <view class="title"> | |||||
| <text>Hi , 请登录~</text> | |||||
| <text>授权后,可以更好的体验我们哦~</text> | |||||
| </view> | </view> | ||||
| <view class="login-btn"> | <view class="login-btn"> | ||||
| <button open-type="getUserInfo" wx:if="{{canIUse}}" hover-class='active' class="login-btn-login" bindgetuserinfo="bindGetUserInfo">获取微信授权</button> | <button open-type="getUserInfo" wx:if="{{canIUse}}" hover-class='active' class="login-btn-login" bindgetuserinfo="bindGetUserInfo">获取微信授权</button> | ||||
| <view wx:else>请升级微信版本</view> | |||||
| <view wx:else>微信用户登录</view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -1,3 +1,6 @@ | |||||
| page{ | |||||
| background: #fbfbfb; | |||||
| } | |||||
| .login-body { | .login-body { | ||||
| padding-top: 106rpx; | padding-top: 106rpx; | ||||
| display: flex; | display: flex; | ||||
| @@ -9,11 +12,13 @@ | |||||
| .login-logo { | .login-logo { | ||||
| width: 320rpx; | width: 320rpx; | ||||
| /* height: 320rpx; */ | /* height: 320rpx; */ | ||||
| padding-top: 70rpx; | |||||
| } | } | ||||
| .login-logo>image { | .login-logo>image { | ||||
| display: block; | display: block; | ||||
| width: 320rpx; | width: 320rpx; | ||||
| border-radius: 16rpx; | |||||
| } | } | ||||
| .login-btn { | .login-btn { | ||||
| @@ -35,20 +40,30 @@ | |||||
| opacity: .6; | opacity: .6; | ||||
| } | } | ||||
| .login-btn .login-btn-login { | .login-btn .login-btn-login { | ||||
| width: 670rpx; | |||||
| position: absolute; | |||||
| bottom: 60rpx; | |||||
| left: 0; | |||||
| right: 0; | |||||
| background: #00c0ff !important; | |||||
| border-radius: 60rpx !important; | |||||
| background: #1faf0c; | |||||
| border-radius: 15rpx !important; | |||||
| height: 94rpx !important; | height: 94rpx !important; | ||||
| line-height: 94rpx; | line-height: 94rpx; | ||||
| margin: auto; | |||||
| margin: 0 !important; | |||||
| padding: 0 !important; | padding: 0 !important; | ||||
| font-family: PingFangSC-Semibold !important; | font-family: PingFangSC-Semibold !important; | ||||
| font-size: 36rpx !important; | font-size: 36rpx !important; | ||||
| color: #fff !important; | |||||
| color: #FFFFFF !important; | |||||
| letter-spacing: 0.75rpx !important; | letter-spacing: 0.75rpx !important; | ||||
| text-align: center; | text-align: center; | ||||
| } | } | ||||
| .title{ | |||||
| margin-top: 30rpx; | |||||
| } | |||||
| .title text{ | |||||
| display: block; | |||||
| text-align: center; | |||||
| } | |||||
| .title text:nth-of-type(1){ | |||||
| font-size: 38rpx; | |||||
| font-weight: bold; | |||||
| } | |||||
| .title text:nth-of-type(2){ | |||||
| font-size: 30rpx; | |||||
| margin-top: 25rpx; | |||||
| } | |||||
| @@ -39,24 +39,8 @@ | |||||
| <view class="content"> | <view class="content"> | ||||
| <template is="wxParse" data="{{wxParseData:article.nodes}}" /> | <template is="wxParse" data="{{wxParseData:article.nodes}}" /> | ||||
| </view> | </view> | ||||
| <button wx:if="{{status == 0}}" disabled class='signUpHr' hover-class='opacity'>报名未开始</button> | |||||
| <button wx:if="{{status == 1}}" class='signUp' data-activityId="{{activityId}}" bindtap='goSignUp' hover-class='opacity'>我要报名</button> | |||||
| <button wx:if="{{status == 2}}" disabled class='signUpHr' hover-class='opacity'>活动已结束</button> | |||||
| <button wx:if="{{status == 3}}" disabled class='signUpHr' hover-class='opacity'>已报名</button> | |||||
| <!-- 分享弹框 --> | |||||
| <view class='modal' wx:if="{{isshowposter}}" bindtap='hidemodal'> | |||||
| <view class='modal-content'> | |||||
| <view> | |||||
| <button class='share user-motto' data-id='{{data.id}}' data-couponId='{{data.couponId}}' data-title='{{data.title}}' id="shareBtn" open-type="share" hover-class="other-button-hover"></button> | |||||
| <image src='../../assets/images/wechat.png' mode='aspectFit'></image> | |||||
| <text>微信好友</text> | |||||
| </view> | |||||
| <view bindtap='showPoster'> | |||||
| <image src='../../assets/images/picture.png' mode='aspectFit'></image> | |||||
| <text>生成海报</text> | |||||
| </view> | |||||
| </view> | |||||
| </view> | |||||
| </view> | </view> | ||||
| <button wx:if="{{status == 0}}" disabled class='signUpHr' hover-class='opacity'>报名未开始</button> | |||||
| <button wx:if="{{status == 1}}" class='signUp' data-activityId="{{activityId}}" bindtap='goSignUp' hover-class='opacity'>我要报名</button> | |||||
| <button wx:if="{{status == 2}}" disabled class='signUpHr' hover-class='opacity'>活动已结束</button> | |||||
| <button wx:if="{{status == 3}}" disabled class='signUpHr' hover-class='opacity'>已报名</button> | |||||