diff --git a/assets/img/coupon.png b/assets/img/coupon.png
new file mode 100644
index 0000000..3660dfa
Binary files /dev/null and b/assets/img/coupon.png differ
diff --git a/assets/img/line.png b/assets/img/line.png
new file mode 100644
index 0000000..d93cec0
Binary files /dev/null and b/assets/img/line.png differ
diff --git a/assets/img/logo.png b/assets/img/logo.png
index a24e56e..f4d3142 100644
Binary files a/assets/img/logo.png and b/assets/img/logo.png differ
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 4fe43a3..a36c1eb 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -2,6 +2,7 @@ var config = require("../../../config/config.js");
var app = getApp();
const Http = require("../../../utils/HttpBasics");
const util = require("../../../utils/util");
+
Page({
data: {
data: {},
@@ -13,6 +14,7 @@ Page({
hour: "",
minute: ""
},
+
phone: function () {
let that = this;
console.log(that.data);
@@ -22,6 +24,7 @@ Page({
});
}
},
+
onLoad(options) {
let that = this;
console.log(options);
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 3a666e6..5b48ea4 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -1,23 +1,31 @@
.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;
- width: 510rpx;
- height: 581rpx;
- display: block;
+ width: 600rpx;
+ display: block;
border-radius: 10rpx;
background-color: #fff;
margin: 22rpx auto 0;
padding: 30rpx 0 0;
z-index: 10000000000;
}
-.pane2{
+
+.pane2 {
background: #fff;
- opacity: .6;
+ opacity: 0.6;
}
-.pane2 image{
+
+.pane2 image {
width: 500rpx;
display: block;
margin: 40rpx auto 0;
@@ -40,15 +48,26 @@
}
.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 {
- color: #767676;
+ display: inline-block;
+ vertical-align: top;
+ font-size: 24rpx;
+ color: #999;
+ letter-spacing: 0;
+ margin-right: 6rpx;
}
.barcode > canvas {
@@ -71,25 +90,32 @@
width: 350rpx;
height: 350rpx;
}
-.coupon_detail {
- padding: 30rpx 20rpx 0;
-}
-.fl {
+
+
+/* .fl {
float: left;
}
.fr {
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;
}
+
.coupon_detail image {
display: block;
width: 100%;
@@ -97,16 +123,26 @@
}
.coupon_detail .fr {
- width: 434rpx;
+ width: 100%;
+ text-align: center;
}
.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 {
font-size: 26rpx;
- color: #999;
+color: #999999;
+letter-spacing: 0;
+text-align: center;
+line-height: 37rpx;
}
.time text {
@@ -135,8 +171,8 @@
}
.timevalidity {
+ text-align: center;
margin-top: 20rpx;
- text-indent: 20rpx;
}
.timevalidity text:nth-of-type(1) {
@@ -184,7 +220,6 @@
display: flex;
flex-direction: column;
flex: 8;
- padding-top: 20rpx;
padding-left: 30rpx;
}
@@ -215,10 +250,9 @@
margin: auto;
width: 50rpx;
height: 50rpx;
- z-index:1000000;
+ z-index: 1000000;
}
-
.notes view:nth-child(1) {
width: 92%;
height: 87rpx;
@@ -229,8 +263,9 @@
}
.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) {
@@ -243,11 +278,15 @@
}
.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 {
height: 94rpx;
line-height: 94rpx;
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 12266df..85a615f 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -5,10 +5,11 @@
-
- 再忙,也要记得买点什么犒赏自己~
-
-
+
+ 请您敬请期待
+ 我们正在筹备一大波优惠活动
+
+
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index 0089719..c8e71f8 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -33,15 +33,16 @@
}
.logo {
- width: 348rpx;
- height: 184rpx;
+ width: 180rpx;
+ height: 180rpx;
border: 1px solid #f8f8f8;
border-radius: 15rpx;
+ display: block;
}
.logo image {
- width: 100%;
- height: 100%;
+ width: 180rpx;
+ height: 180rpx;
border-radius: 15rpx;
}
@@ -58,7 +59,7 @@
.info view:nth-child(1) text {
font-size: 30rpx;
margin-top: 10rpx;
- color: #666;
+ color: #333;
}
.info view:nth-child(2) {
@@ -74,7 +75,7 @@
.btns {
position: absolute;
- right: 20rpx;
+ right: 30rpx;
bottom: 39rpx;
width: 180rpx;
height: 60rpx;
@@ -97,24 +98,36 @@
}
.nocoupon image {
- width: 203rpx;
+ width: 300rpx;
display: block;
- margin: 200rpx auto 0;
+ margin: 3% auto 0;
}
-.nocoupon text {
+.txt001 {
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;
- font-size: 30rpx;
- color: #00c0ff;
}
.nocoupon button {
background: #00c0ff;
color: #fff;
font-style: 30rpx;
- width: 70%;
- margin: 30rpx auto 0;
+ width: 100%;
+ border-radius:60rpx;
}
.loading {
@@ -131,3 +144,20 @@
vertical-align: middle;
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;
+}
diff --git a/pages/getphoneInfo/index.wxml b/pages/getphoneInfo/index.wxml
index dacfea7..9cc7825 100755
--- a/pages/getphoneInfo/index.wxml
+++ b/pages/getphoneInfo/index.wxml
@@ -4,7 +4,7 @@
-
+
请升级微信版本
\ No newline at end of file
diff --git a/pages/getphoneInfo/index.wxss b/pages/getphoneInfo/index.wxss
index e4c5d9b..fe59a73 100755
--- a/pages/getphoneInfo/index.wxss
+++ b/pages/getphoneInfo/index.wxss
@@ -18,12 +18,15 @@
.login-btn {
padding-top: 120rpx;
- width: 504rpx;
+ width: 670rpx;
+}
+.active{
+ opacity: .6;
}
.login-btn .login-btn-login {
background: #00C0FF !important;
- border-radius: 10rpx !important;
+ border-radius: 60rpx !important;
height: 88rpx !important;
margin: 0 !important;
padding: 0 !important;
diff --git a/pages/getuserinfo/index.wxml b/pages/getuserinfo/index.wxml
index a92d189..efb4857 100755
--- a/pages/getuserinfo/index.wxml
+++ b/pages/getuserinfo/index.wxml
@@ -1,10 +1,12 @@
+ 我们需要获取您的授权
+以关联您的账号
-
+
请升级微信版本
\ No newline at end of file
diff --git a/pages/getuserinfo/index.wxss b/pages/getuserinfo/index.wxss
index e4c5d9b..8665792 100755
--- a/pages/getuserinfo/index.wxss
+++ b/pages/getuserinfo/index.wxss
@@ -1,5 +1,5 @@
.login-body {
- padding-top: 200rpx;
+ padding-top: 106rpx;
display: flex;
flex-direction: column;
align-items: center;
@@ -7,8 +7,8 @@
}
.login-logo {
- width: 283rpx;
- height: 326rpx;
+ width: 320rpx;
+ height: 320rpx;
}
.login-logo>image {
@@ -21,15 +21,33 @@
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 {
- 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;
- margin: 0 !important;
+ margin: auto;
padding: 0 !important;
font-family: PingFangSC-Semibold !important;
font-size: 36rpx !important;
- color: #FFFFFF !important;
+ color: #fff !important;
letter-spacing: 0.75rpx !important;
text-align: center;
-}
\ No newline at end of file
+}
diff --git a/pages/user/index.js b/pages/user/index.js
index 9181f47..b1bd5f2 100644
--- a/pages/user/index.js
+++ b/pages/user/index.js
@@ -8,12 +8,25 @@ Page({
// avatar:
// "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg"
// }
+ flag:'hidden'
},
navigateTo() {
wx.navigateTo({
url: `/pages/login/index`
});
},
+ showVersion:function(){
+ /**
+ * 长按显示版本号
+ */
+ let that = this;
+ if(that.data.flag=='hidden'){
+ that.setData({
+ flag: 'show'
+ });
+ }
+ console.log(that.data.flag)
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index c9bb8a3..a9bba1d 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -1,59 +1,73 @@
-
-
-
-
-
-
-
- 微信用户
-
-
- 985
- 成长值
-
+
+
+
+
+
+
-
-
-
- 我的订单
- 查看全部
-
-
-
-
- 待付款
-
-
-
-
-
-
-
- 已完成
-
-
-
-
-
-
-
- 券包
-
-
-
-
-
-
-
-
- 智能停车
-
-
-
-
-
+
+
+ 微信用户
-
-
+
+ 985
+
+
+ 成长值
+
+
+
+
+
+
+ 我的订单
+
+ 查看全部
+
+
+
+
+
+
+ 待付款
+
+
+
+
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+ 券包
+
+
+
+
+
+
+
+
+
+ 智能停车
+
+
+
+
+
+
+
+
+
+ 版本号:1.6.1
+
+
\ No newline at end of file
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index 9797686..5ac88d7 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -34,6 +34,15 @@
overflow: hidden;
border: 1px solid red;
} */
+.version{
+ width: 600rpx;
+ height: 300rpx;
+ line-height: 300rpx;
+ text-align: center;
+ font-size: 30rpx;
+ color: #999;
+ margin: 0 auto;
+}
.couponnum {
display: inline-block;