@@ -2,6 +2,7 @@ var config = require("../../../config/config.js"); | |||||
var app = getApp(); | var app = getApp(); | ||||
const Http = require("../../../utils/HttpBasics"); | const Http = require("../../../utils/HttpBasics"); | ||||
const util = require("../../../utils/util"); | const util = require("../../../utils/util"); | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
data: {}, | data: {}, | ||||
@@ -13,6 +14,7 @@ Page({ | |||||
hour: "", | hour: "", | ||||
minute: "" | minute: "" | ||||
}, | }, | ||||
phone: function () { | phone: function () { | ||||
let that = this; | let that = this; | ||||
console.log(that.data); | console.log(that.data); | ||||
@@ -22,6 +24,7 @@ Page({ | |||||
}); | }); | ||||
} | } | ||||
}, | }, | ||||
onLoad(options) { | onLoad(options) { | ||||
let that = this; | let that = this; | ||||
console.log(options); | console.log(options); | ||||
@@ -1,23 +1,31 @@ | |||||
.container { | .container { | ||||
padding-bottom: 10rpx; | |||||
background: #fff; | |||||
width: 92%; | |||||
margin: 8% auto 6%; | |||||
border-radius:16rpx; | |||||
overflow: hidden; | |||||
} | |||||
page{ | |||||
background: #02C0FF; | |||||
} | } | ||||
.panel,.zhuangtai image{ | |||||
.panel, .zhuangtai image { | |||||
position: relative; | position: relative; | ||||
width: 510rpx; | |||||
height: 581rpx; | |||||
display: block; | |||||
width: 600rpx; | |||||
display: block; | |||||
border-radius: 10rpx; | border-radius: 10rpx; | ||||
background-color: #fff; | background-color: #fff; | ||||
margin: 22rpx auto 0; | margin: 22rpx auto 0; | ||||
padding: 30rpx 0 0; | padding: 30rpx 0 0; | ||||
z-index: 10000000000; | z-index: 10000000000; | ||||
} | } | ||||
.pane2{ | |||||
.pane2 { | |||||
background: #fff; | background: #fff; | ||||
opacity: .6; | |||||
opacity: 0.6; | |||||
} | } | ||||
.pane2 image{ | |||||
.pane2 image { | |||||
width: 500rpx; | width: 500rpx; | ||||
display: block; | display: block; | ||||
margin: 40rpx auto 0; | margin: 40rpx auto 0; | ||||
@@ -40,15 +48,26 @@ | |||||
} | } | ||||
.barnum { | .barnum { | ||||
font-size: 24rpx; | |||||
text-align: center; | |||||
letter-spacing: 2rpx; | |||||
white-space: nowrap; | |||||
color: #7f7f7f; | |||||
background: #fff; | |||||
height: 88rpx; | |||||
width: 100%; | |||||
margin: 60rpx auto 0; | |||||
line-height: 88rpx; | |||||
border: 2rpx solid #ccc; | |||||
border-radius: 10px; | |||||
font-size: 36rpx; | |||||
color: #333; | |||||
letter-spacing: 0; | |||||
text-align:center; | |||||
} | } | ||||
.barnum text { | .barnum text { | ||||
color: #767676; | |||||
display: inline-block; | |||||
vertical-align: top; | |||||
font-size: 24rpx; | |||||
color: #999; | |||||
letter-spacing: 0; | |||||
margin-right: 6rpx; | |||||
} | } | ||||
.barcode > canvas { | .barcode > canvas { | ||||
@@ -71,25 +90,32 @@ | |||||
width: 350rpx; | width: 350rpx; | ||||
height: 350rpx; | height: 350rpx; | ||||
} | } | ||||
.coupon_detail { | |||||
padding: 30rpx 20rpx 0; | |||||
} | |||||
.fl { | |||||
/* .fl { | |||||
float: left; | float: left; | ||||
} | } | ||||
.fr { | .fr { | ||||
float: right; | float: right; | ||||
} | |||||
} */ | |||||
.coupon_detail .wmfl{ | |||||
display: block; | |||||
width: 255rpx; | |||||
height: 184rpx; | |||||
border-radius: 16rpx; | |||||
..coupon_detail{ | |||||
position:relative; | |||||
} | |||||
.coupon_detail .wmfl { | |||||
position: absolute; | |||||
width: 120rpx; | |||||
height: 120rpx; | |||||
left: 0; | |||||
right: 0; | |||||
margin: auto; | |||||
top: 5rpx; | |||||
border-radius: 50%; | |||||
overflow: hidden; | overflow: hidden; | ||||
} | } | ||||
.coupon_detail image { | .coupon_detail image { | ||||
display: block; | display: block; | ||||
width: 100%; | width: 100%; | ||||
@@ -97,16 +123,26 @@ | |||||
} | } | ||||
.coupon_detail .fr { | .coupon_detail .fr { | ||||
width: 434rpx; | |||||
width: 100%; | |||||
text-align: center; | |||||
} | } | ||||
.coupon_detail .title { | .coupon_detail .title { | ||||
font-size: 36rpx; | |||||
font-size: 32rpx; | |||||
color: #1F2D3D; | |||||
letter-spacing: 0; | |||||
text-align: center; | |||||
display: block; | |||||
padding-top: 73rpx; | |||||
line-height: 45rpx; | |||||
} | } | ||||
.time { | .time { | ||||
font-size: 26rpx; | font-size: 26rpx; | ||||
color: #999; | |||||
color: #999999; | |||||
letter-spacing: 0; | |||||
text-align: center; | |||||
line-height: 37rpx; | |||||
} | } | ||||
.time text { | .time text { | ||||
@@ -135,8 +171,8 @@ | |||||
} | } | ||||
.timevalidity { | .timevalidity { | ||||
text-align: center; | |||||
margin-top: 20rpx; | margin-top: 20rpx; | ||||
text-indent: 20rpx; | |||||
} | } | ||||
.timevalidity text:nth-of-type(1) { | .timevalidity text:nth-of-type(1) { | ||||
@@ -184,7 +220,6 @@ | |||||
display: flex; | display: flex; | ||||
flex-direction: column; | flex-direction: column; | ||||
flex: 8; | flex: 8; | ||||
padding-top: 20rpx; | |||||
padding-left: 30rpx; | padding-left: 30rpx; | ||||
} | } | ||||
@@ -215,10 +250,9 @@ | |||||
margin: auto; | margin: auto; | ||||
width: 50rpx; | width: 50rpx; | ||||
height: 50rpx; | height: 50rpx; | ||||
z-index:1000000; | |||||
z-index: 1000000; | |||||
} | } | ||||
.notes view:nth-child(1) { | .notes view:nth-child(1) { | ||||
width: 92%; | width: 92%; | ||||
height: 87rpx; | height: 87rpx; | ||||
@@ -229,8 +263,9 @@ | |||||
} | } | ||||
.notes view:nth-child(1) text { | .notes view:nth-child(1) text { | ||||
font-size: 30rpx; | |||||
font-weight: bold; | |||||
font-size: 24rpx; | |||||
color: #919191; | |||||
letter-spacing: 0; | |||||
} | } | ||||
.notes view:nth-child(2) { | .notes view:nth-child(2) { | ||||
@@ -243,11 +278,15 @@ | |||||
} | } | ||||
.notes view:nth-child(2) > text { | .notes view:nth-child(2) > text { | ||||
font-size: 28rpx; | |||||
color: #a9a9a9; | |||||
line-height: 56rpx; | |||||
font-size: 24rpx; | |||||
color: #333333; | |||||
letter-spacing: 0; | |||||
line-height: 42rpx; | |||||
} | |||||
.notes{ | |||||
border-bottom-left-radius:16rpx; | |||||
border-bottom-right-radius: 16rpx; | |||||
} | } | ||||
.note view { | .note view { | ||||
height: 94rpx; | height: 94rpx; | ||||
line-height: 94rpx; | line-height: 94rpx; | ||||
@@ -5,10 +5,11 @@ | |||||
</i-tabs> | </i-tabs> | ||||
<view style='padding-top:90rpx;'> | <view style='padding-top:90rpx;'> | ||||
<view class="nocoupon" wx:if="{{list.length==0}}"> | <view class="nocoupon" wx:if="{{list.length==0}}"> | ||||
<image src="./../../../assets/img/cou.png" mode="widthFix" /> | |||||
<text>再忙,也要记得买点什么犒赏自己~</text> | |||||
<navigator url="/pages/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||||
<button>去领券</button> | |||||
<image src="./../../../assets/img/coupon.png" mode="widthFix" /> | |||||
<text class="txt001">请您敬请期待</text> | |||||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||||
<navigator class='nav' url="/pages/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||||
<button hover-class='active'>前往首页看看</button> | |||||
</navigator> | </navigator> | ||||
</view> | </view> | ||||
@@ -33,15 +33,16 @@ | |||||
} | } | ||||
.logo { | .logo { | ||||
width: 348rpx; | |||||
height: 184rpx; | |||||
width: 180rpx; | |||||
height: 180rpx; | |||||
border: 1px solid #f8f8f8; | border: 1px solid #f8f8f8; | ||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
display: block; | |||||
} | } | ||||
.logo image { | .logo image { | ||||
width: 100%; | |||||
height: 100%; | |||||
width: 180rpx; | |||||
height: 180rpx; | |||||
border-radius: 15rpx; | border-radius: 15rpx; | ||||
} | } | ||||
@@ -58,7 +59,7 @@ | |||||
.info view:nth-child(1) text { | .info view:nth-child(1) text { | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
margin-top: 10rpx; | margin-top: 10rpx; | ||||
color: #666; | |||||
color: #333; | |||||
} | } | ||||
.info view:nth-child(2) { | .info view:nth-child(2) { | ||||
@@ -74,7 +75,7 @@ | |||||
.btns { | .btns { | ||||
position: absolute; | position: absolute; | ||||
right: 20rpx; | |||||
right: 30rpx; | |||||
bottom: 39rpx; | bottom: 39rpx; | ||||
width: 180rpx; | width: 180rpx; | ||||
height: 60rpx; | height: 60rpx; | ||||
@@ -97,24 +98,36 @@ | |||||
} | } | ||||
.nocoupon image { | .nocoupon image { | ||||
width: 203rpx; | |||||
width: 300rpx; | |||||
display: block; | display: block; | ||||
margin: 200rpx auto 0; | |||||
margin: 3% auto 0; | |||||
} | } | ||||
.nocoupon text { | |||||
.txt001 { | |||||
display: block; | display: block; | ||||
line-height: 48rpx; | |||||
font-size: 34rpx; | |||||
color: #333; | |||||
letter-spacing: 0; | |||||
text-align: center; | |||||
} | |||||
.txt002 { | |||||
display: block; | |||||
margin-top: 1%; | |||||
font-size: 28rpx; | |||||
color: #999; | |||||
letter-spacing: 0; | |||||
line-height: 40rpx; | |||||
text-align: center; | text-align: center; | ||||
font-size: 30rpx; | |||||
color: #00c0ff; | |||||
} | } | ||||
.nocoupon button { | .nocoupon button { | ||||
background: #00c0ff; | background: #00c0ff; | ||||
color: #fff; | color: #fff; | ||||
font-style: 30rpx; | font-style: 30rpx; | ||||
width: 70%; | |||||
margin: 30rpx auto 0; | |||||
width: 100%; | |||||
border-radius:60rpx; | |||||
} | } | ||||
.loading { | .loading { | ||||
@@ -131,3 +144,20 @@ | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } | ||||
.active{ | |||||
opacity: .6; | |||||
} | |||||
.nav { | |||||
position: absolute; | |||||
bottom: 3.3%; | |||||
left: 0; | |||||
right: 0; | |||||
margin: auto; | |||||
width: 670rpx; | |||||
border-radius: 60rpx; | |||||
background: #02c0ff; | |||||
font-size: 32px; | |||||
color: #fff; | |||||
text-align: center; | |||||
line-height: 32px; | |||||
} |
@@ -4,7 +4,7 @@ | |||||
</view> | </view> | ||||
<view class="login-btn"> | <view class="login-btn"> | ||||
<!-- <i-button i-class="login-btn-login" bind:click="getPhoneNumber">微信登陆</i-button> --> | <!-- <i-button i-class="login-btn-login" bind:click="getPhoneNumber">微信登陆</i-button> --> | ||||
<button open-type="getPhoneNumber" 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> | ||||
</view> | </view> |
@@ -18,12 +18,15 @@ | |||||
.login-btn { | .login-btn { | ||||
padding-top: 120rpx; | padding-top: 120rpx; | ||||
width: 504rpx; | |||||
width: 670rpx; | |||||
} | |||||
.active{ | |||||
opacity: .6; | |||||
} | } | ||||
.login-btn .login-btn-login { | .login-btn .login-btn-login { | ||||
background: #00C0FF !important; | background: #00C0FF !important; | ||||
border-radius: 10rpx !important; | |||||
border-radius: 60rpx !important; | |||||
height: 88rpx !important; | height: 88rpx !important; | ||||
margin: 0 !important; | margin: 0 !important; | ||||
padding: 0 !important; | padding: 0 !important; | ||||
@@ -1,10 +1,12 @@ | |||||
<view class="login-body"> | <view class="login-body"> | ||||
<view class="login-logo"> | <view class="login-logo"> | ||||
<image src="{{mallImgUrl}}"></image> | <image src="{{mallImgUrl}}"></image> | ||||
<text class='txt'>我们需要获取您的授权 | |||||
以关联您的账号</text> | |||||
</view> | </view> | ||||
<view class="login-btn"> | <view class="login-btn"> | ||||
<!-- <i-button i-class="login-btn-login" bind:click="getPhoneNumber">微信登陆</i-button> --> | <!-- <i-button i-class="login-btn-login" bind:click="getPhoneNumber">微信登陆</i-button> --> | ||||
<button open-type="getUserInfo" wx:if="{{canIUse}}" 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,5 +1,5 @@ | |||||
.login-body { | .login-body { | ||||
padding-top: 200rpx; | |||||
padding-top: 106rpx; | |||||
display: flex; | display: flex; | ||||
flex-direction: column; | flex-direction: column; | ||||
align-items: center; | align-items: center; | ||||
@@ -7,8 +7,8 @@ | |||||
} | } | ||||
.login-logo { | .login-logo { | ||||
width: 283rpx; | |||||
height: 326rpx; | |||||
width: 320rpx; | |||||
height: 320rpx; | |||||
} | } | ||||
.login-logo>image { | .login-logo>image { | ||||
@@ -21,15 +21,33 @@ | |||||
width: 504rpx; | width: 504rpx; | ||||
} | } | ||||
.txt { | |||||
display: block; | |||||
width: 300rpx; | |||||
height: 108rpx; | |||||
margin-top: 5.8%; | |||||
font-size: 30rpx; | |||||
color: #999; | |||||
line-height: 54rpx; | |||||
text-align: center; | |||||
} | |||||
.active{ | |||||
opacity: .6; | |||||
} | |||||
.login-btn .login-btn-login { | .login-btn .login-btn-login { | ||||
background: #00C0FF !important; | |||||
border-radius: 10rpx !important; | |||||
width: 670rpx; | |||||
position: absolute; | |||||
bottom: 60rpx; | |||||
left: 0; | |||||
right: 0; | |||||
background: #00c0ff !important; | |||||
border-radius: 60rpx !important; | |||||
height: 88rpx !important; | height: 88rpx !important; | ||||
margin: 0 !important; | |||||
margin: auto; | |||||
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: #FFFFFF !important; | |||||
color: #fff !important; | |||||
letter-spacing: 0.75rpx !important; | letter-spacing: 0.75rpx !important; | ||||
text-align: center; | text-align: center; | ||||
} | |||||
} |
@@ -8,12 +8,25 @@ Page({ | |||||
// avatar: | // avatar: | ||||
// "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" | // "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" | ||||
// } | // } | ||||
flag:'hidden' | |||||
}, | }, | ||||
navigateTo() { | navigateTo() { | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: `/pages/login/index` | url: `/pages/login/index` | ||||
}); | }); | ||||
}, | }, | ||||
showVersion:function(){ | |||||
/** | |||||
* 长按显示版本号 | |||||
*/ | |||||
let that = this; | |||||
if(that.data.flag=='hidden'){ | |||||
that.setData({ | |||||
flag: 'show' | |||||
}); | |||||
} | |||||
console.log(that.data.flag) | |||||
}, | |||||
/** | /** | ||||
* 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
*/ | */ | ||||
@@ -1,59 +1,73 @@ | |||||
<view class="user"> | <view class="user"> | ||||
<view class='bannerbg'><image src='./../../assets/img/banner.png' mode="widthFix"></image></view> | |||||
<view class="user-title"> | |||||
<view class="user-avatar"> | |||||
<open-data class="open" type="userAvatarUrl"></open-data> | |||||
</view> | |||||
<view class="user-phone"> | |||||
<open-data type="userNickName"></open-data> | |||||
<view class='chengzhang'>微信用户</view> | |||||
</view> | |||||
<view class='chengzhang1'> | |||||
<view class="view">985<image src='./../../assets/img/shang.png' mode="widthFix"></image></view> | |||||
<text>成长值</text> | |||||
</view> | |||||
<view class='bannerbg'> | |||||
<image src='./../../assets/img/banner.png' mode="widthFix"></image> | |||||
</view> | |||||
<view class="user-title"> | |||||
<view class="user-avatar"> | |||||
<open-data class="open" type="userAvatarUrl"></open-data> | |||||
</view> | </view> | ||||
<view class="user-btns"> | |||||
<navigator url="/pages/order/index/index?id=all"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view><image class='icons' src="./../../assets/img/ding.png" mode='widthFix'></image>我的订单</view> | |||||
<view><text class='look'>查看全部</text><text class="iconfont icon-right"></text></view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/order/index/index?id=0"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view style='padding-left:50rpx;color:#666;'>待付款</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/order/index/index?id=1"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view style='padding-left:50rpx;color:#666;'>已完成</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/couponorder/index/index"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view><image class='icons' src="./../../assets/img/quans.png" mode='widthFix'></image>券包</view> | |||||
<view> | |||||
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/cartest/cartest" open-type="switchTab"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view><image class='icons' src="./../../assets/img/che.png" mode='widthFix'></image>智能停车</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<view class="user-phone"> | |||||
<open-data type="userNickName"></open-data> | |||||
<view class='chengzhang'>微信用户</view> | |||||
</view> | </view> | ||||
<view class="margin"></view> | |||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | |||||
<view class='chengzhang1'> | |||||
<view class="view">985 | |||||
<image src='./../../assets/img/shang.png' mode="widthFix"></image> | |||||
</view> | |||||
<text>成长值</text> | |||||
</view> | |||||
</view> | |||||
<view class="user-btns"> | |||||
<navigator url="/pages/order/index/index?id=all"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view> | |||||
<image class='icons' src="./../../assets/img/ding.png" mode='widthFix'></image>我的订单</view> | |||||
<view> | |||||
<text class='look'>查看全部</text> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/order/index/index?id=0"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view style='padding-left:50rpx;color:#666;'>待付款</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/order/index/index?id=1"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view style='padding-left:50rpx;color:#666;'>已完成</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/couponorder/index/index"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view> | |||||
<image class='icons' src="./../../assets/img/quans.png" mode='widthFix'></image>券包</view> | |||||
<view> | |||||
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
<navigator url="/pages/cartest/cartest" open-type="switchTab"> | |||||
<view class="user-btn app-border-bottom"> | |||||
<view> | |||||
<image class='icons' src="./../../assets/img/che.png" mode='widthFix'></image>智能停车</view> | |||||
<view> | |||||
<text class="iconfont icon-right"></text> | |||||
</view> | |||||
</view> | |||||
</navigator> | |||||
</view> | |||||
<view class="margin"></view> | |||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | |||||
<view bindlongtap='showVersion' class='version'> | |||||
<view wx:if="{{flag=='show'}}">版本号:1.6.1</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | |||||
</view> | |||||
</view> | </view> |
@@ -34,6 +34,15 @@ | |||||
overflow: hidden; | overflow: hidden; | ||||
border: 1px solid red; | border: 1px solid red; | ||||
} */ | } */ | ||||
.version{ | |||||
width: 600rpx; | |||||
height: 300rpx; | |||||
line-height: 300rpx; | |||||
text-align: center; | |||||
font-size: 30rpx; | |||||
color: #999; | |||||
margin: 0 auto; | |||||
} | |||||
.couponnum { | .couponnum { | ||||
display: inline-block; | display: inline-block; | ||||