@@ -1,9 +1,11 @@ | |||||
<view class='bannerbg'><image src='./../../assets/img/banner.png' mode="widthFix"></image></view> | |||||
<view class="index-slide-view"> | |||||
<swiper class="index-slide" bindchange="swiperChange" circular="false" duration="500"> | |||||
<view wx:if="{{list.length!=0}}" class='bannerbg'> | |||||
<image src='./../../assets/img/banner.png' mode="widthFix"></image> | |||||
</view> | |||||
<view wx:if="{{list.length!=0}}" class="index-slide-view"> | |||||
<swiper class="index-slide" bindchange="swiperChange" autoplay="true" circular="false"> | |||||
<block wx:for="{{list}}" wx:key="unique"> | <block wx:for="{{list}}" wx:key="unique"> | ||||
<swiper-item> | <swiper-item> | ||||
<image data-id="{{item.id}}" bindtap='gotobannerdetail' src="{{item.coverImg}}" class="index-slide-image" /> | |||||
<image data-id="{{item.id}}" bindtap='gotobannerdetail' src="{{item.coverImg}}" class="index-slide-image" /> | |||||
</swiper-item> | </swiper-item> | ||||
</block> | </block> | ||||
</swiper> | </swiper> | ||||
@@ -6,7 +6,7 @@ | |||||
margin:-126rpx auto 0; | margin:-126rpx auto 0; | ||||
border-radius:16rpx; | border-radius:16rpx; | ||||
z-index: 10000; | z-index: 10000; | ||||
box-shadow: 0 6px 20px 0 rgba(0,0,0,0.30); | |||||
box-shadow: 0 6px 20px 0 rgba(0,0,0,0.15); | |||||
} | } | ||||
.index-slide, | .index-slide, | ||||
swiper-item | swiper-item | ||||
@@ -34,7 +34,7 @@ | |||||
margin: 0 8rpx; | margin: 0 8rpx; | ||||
width: 12rpx; | width: 12rpx; | ||||
height: 12rpx; | height: 12rpx; | ||||
background: #fff; | |||||
background: #b6b6b7; | |||||
border-radius: 50%; | border-radius: 50%; | ||||
transition: all .6s; | transition: all .6s; | ||||
} | } | ||||
@@ -1,8 +1,7 @@ | |||||
var config = { | var config = { | ||||
name: "富茂科技", | |||||
// url: "https://ciformall.youlane.cn/C/api", | // url: "https://ciformall.youlane.cn/C/api", | ||||
url:"https://c.malls.iformall.com/C/api", | url:"https://c.malls.iformall.com/C/api", | ||||
//url: "http://31adc9ce.ngrok.io/C/api", | |||||
// url: "http://31adc9ce.ngrok.io/C/api", | |||||
api: { | api: { | ||||
/** | /** | ||||
* 接口用途:login | * 接口用途:login | ||||
@@ -136,11 +135,17 @@ var config = { | |||||
/** | /** | ||||
* 获得成长值 | * 获得成长值 | ||||
*/ | */ | ||||
getScore:'/user/userinfo' | |||||
getScore:'/user/userinfo', | |||||
/** | |||||
* 小程序分享 | |||||
* title | |||||
* 描述 | |||||
*/ | |||||
getWeapNote:'/mall/getWeapNote' | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wx649b3be73c1afe47" | |||||
AppId: "wxea71200db93d756b" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
NICK_NOT_AUTH: 11004, | NICK_NOT_AUTH: 11004, | ||||
@@ -2,7 +2,7 @@ | |||||
<view class='coupons'> | <view class='coupons'> | ||||
<view class="coupons-body"> | <view class="coupons-body"> | ||||
<view class='banner'> | <view class='banner'> | ||||
<image src='{{data.coverImg}}' mode="widthFix"></image> | |||||
<image src='{{data.coverImg}}'></image> | |||||
</view> | </view> | ||||
<image class="orbg" src='./../../assets/img/orbg.png' mode="widthFix"></image> | <image class="orbg" src='./../../assets/img/orbg.png' mode="widthFix"></image> | ||||
<view class='act' bindtap='gotoactdetail'> | <view class='act' bindtap='gotoactdetail'> | ||||
@@ -22,8 +22,8 @@ page { | |||||
} | } | ||||
.banner image { | .banner image { | ||||
width: 100%; | |||||
display: block; | |||||
width: 750rpx; | |||||
height: 280rpx; | |||||
} | } | ||||
.act { | .act { | ||||
@@ -7,6 +7,8 @@ | |||||
page { | page { | ||||
background: #02c0ff; | background: #02c0ff; | ||||
height: auto !important; | |||||
padding-bottom: 20rpx; | |||||
} | } | ||||
.panel, .zhuangtai image { | .panel, .zhuangtai image { | ||||
@@ -134,7 +136,8 @@ page { | |||||
padding-top: 92rpx; | padding-top: 92rpx; | ||||
line-height: 45rpx; | line-height: 45rpx; | ||||
} | } | ||||
.line{ | |||||
.line { | |||||
height: 10rpx; | height: 10rpx; | ||||
display: block; | display: block; | ||||
width: 100%; | width: 100%; | ||||
@@ -202,7 +205,7 @@ page { | |||||
.posi_logo { | .posi_logo { | ||||
width: 92%; | width: 92%; | ||||
padding: 30rpx 4%; | |||||
padding: 30rpx 4% 0; | |||||
display: flex; | display: flex; | ||||
position: relative; | position: relative; | ||||
z-index: 100; | z-index: 100; | ||||
@@ -249,10 +252,15 @@ page { | |||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #b8b8b8; | color: #b8b8b8; | ||||
padding-top: 10rpx; | padding-top: 10rpx; | ||||
width: 386rpx; | |||||
white-space: wrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | |||||
height: 78rpx; | |||||
} | } | ||||
.tit { | .tit { | ||||
padding: 24rpx 0 0; | |||||
padding: 53rpx 0 0; | |||||
text-indent: 30rpx; | text-indent: 30rpx; | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #919191; | color: #919191; | ||||
@@ -73,8 +73,6 @@ Page({ | |||||
res.data.list.map(file => { | res.data.list.map(file => { | ||||
file.expiredTime = util.fmtDate(file.expiredTime); | file.expiredTime = util.fmtDate(file.expiredTime); | ||||
}); | }); | ||||
setTimeout(function () { | setTimeout(function () { | ||||
that.setData({ | that.setData({ | ||||
loading: false | loading: false | ||||
@@ -29,7 +29,7 @@ | |||||
height: 170rpx !important; | height: 170rpx !important; | ||||
background: #fff; | background: #fff; | ||||
padding: 30rpx 0 0; | padding: 30rpx 0 0; | ||||
margin: 0 auto 30rpx; | |||||
margin: 0 auto 40rpx; | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
border-top: 8rpx solid #02b7ff; | border-top: 8rpx solid #02b7ff; | ||||
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); | ||||
@@ -166,8 +166,8 @@ | |||||
} | } | ||||
.loading image { | .loading image { | ||||
width: 40rpx; | |||||
height: 40rpx; | |||||
width: 60rpx; | |||||
height: 60rpx; | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } | ||||
@@ -10,6 +10,7 @@ Page({ | |||||
onLoad: function(options) { | onLoad: function(options) { | ||||
var that = this; | var that = this; | ||||
console.log(options); | console.log(options); | ||||
that.setData({ | that.setData({ | ||||
couponChannelId: options.couponChannelId, | couponChannelId: options.couponChannelId, | ||||
couponId: options.couponId | couponId: options.couponId | ||||
@@ -25,8 +26,12 @@ Page({ | |||||
that.setData({ | that.setData({ | ||||
mallImgUrl: res.data.mallImgUrl | mallImgUrl: res.data.mallImgUrl | ||||
}); | }); | ||||
wx.setNavigationBarTitle({ | |||||
title: res.data.mallName | |||||
}) | |||||
}); | }); | ||||
}, | }, | ||||
getPhoneNumber: function(e) { | getPhoneNumber: function(e) { | ||||
var that = this; | var that = this; | ||||
var iv = e.detail.iv; | var iv = e.detail.iv; | ||||
@@ -50,8 +55,7 @@ Page({ | |||||
icon: "success", | icon: "success", | ||||
success: function(res) { | success: function(res) { | ||||
wx.redirectTo({ | wx.redirectTo({ | ||||
url: | |||||
"/pages/coupon/detail/index?couponChannelId=" + | |||||
url: "/pages/coupon/detail/index?couponChannelId=" + | |||||
that.data.couponChannelId + | that.data.couponChannelId + | ||||
"&couponId=" + | "&couponId=" + | ||||
that.data.couponId + | that.data.couponId + | ||||
@@ -68,4 +72,4 @@ Page({ | |||||
} | } | ||||
); | ); | ||||
} | } | ||||
}); | |||||
}); |
@@ -1,3 +1,3 @@ | |||||
{ | { | ||||
"navigationBarTitleText": "富茂链客" | |||||
"navigationBarTitleText": "" | |||||
} | } |
@@ -7,8 +7,8 @@ | |||||
} | } | ||||
.login-logo { | .login-logo { | ||||
width: 283rpx; | |||||
height: 326rpx; | |||||
width: 320rpx; | |||||
height: 320rpx; | |||||
} | } | ||||
.login-logo>image { | .login-logo>image { | ||||
@@ -17,6 +17,9 @@ Page({ | |||||
that.setData({ | that.setData({ | ||||
mallImgUrl: res.data.mallImgUrl | mallImgUrl: res.data.mallImgUrl | ||||
}); | }); | ||||
wx.setNavigationBarTitle({ | |||||
title: res.data.mallName | |||||
}) | |||||
}); | }); | ||||
}, | }, | ||||
@@ -1,3 +1,3 @@ | |||||
{ | { | ||||
"navigationBarTitleText": "富茂链客" | |||||
"navigationBarTitleText": "" | |||||
} | } |
@@ -4,7 +4,6 @@ | |||||
</i-tabs> | </i-tabs> | ||||
<c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" /> | <c-coupons wx:if="{{list.length!=0}}" wx:for="{{list}}" paramAtoB="{{loading}}" wx:key="unique" data="{{item}}" list="{{list}}" /> | ||||
<view class='dingdan' wx:if="{{list.length==0}}"> | <view class='dingdan' wx:if="{{list.length==0}}"> | ||||
<image src="../../../assets/img/act.png" mode="widthFix"></image> | <image src="../../../assets/img/act.png" mode="widthFix"></image> | ||||
<text>请您敬请期待</text> | <text>请您敬请期待</text> | ||||
<text>我们正在筹备一大波优惠活动</text> | <text>我们正在筹备一大波优惠活动</text> | ||||
@@ -1,5 +1,6 @@ | |||||
.index-coupons { | .index-coupons { | ||||
height: 820rpx; | height: 820rpx; | ||||
margin-top: 30rpx; | |||||
} | } | ||||
.loading { | .loading { | ||||
@@ -11,8 +12,8 @@ | |||||
} | } | ||||
.loading image { | .loading image { | ||||
width: 40rpx; | |||||
height: 40rpx; | |||||
width: 60rpx; | |||||
height: 60rpx; | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } | ||||
@@ -6,6 +6,8 @@ Page({ | |||||
market: app.globalData.market, | market: app.globalData.market, | ||||
list: [], | list: [], | ||||
swiperCurrent: 0, | swiperCurrent: 0, | ||||
title:'', | |||||
desc:'', | |||||
scrollTop: 0, | scrollTop: 0, | ||||
page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 | page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 | ||||
}, | }, | ||||
@@ -28,11 +30,26 @@ Page({ | |||||
var scene = decodeURIComponent(options.scene); | var scene = decodeURIComponent(options.scene); | ||||
that.setData({ | that.setData({ | ||||
scene:scene | scene:scene | ||||
}) | |||||
}); | |||||
console.log(that.data.scene) | console.log(that.data.scene) | ||||
console.log(scene); | console.log(scene); | ||||
app.getLocation(); | app.getLocation(); | ||||
that.userLogin(); | that.userLogin(); | ||||
Http.get({ | |||||
url: config.api.getWeapNote, | |||||
data: { | |||||
appId: config.weapp.AppId, | |||||
} | |||||
}) | |||||
.then(res=>{ | |||||
console.log(res.data.weapNote); | |||||
let weapNote = JSON.parse(res.data.weapNote); | |||||
console.log(weapNote.firstpage); | |||||
that.setData({ | |||||
desc: weapNote.firstpage.desc, | |||||
title: weapNote.firstpage.title | |||||
}) | |||||
}) | |||||
}, | }, | ||||
onShow:function(){ | onShow:function(){ | ||||
let num = wx.getStorageSync('couponNum'); | let num = wx.getStorageSync('couponNum'); | ||||
@@ -40,7 +57,7 @@ Page({ | |||||
wx.showTabBarRedDot({ | wx.showTabBarRedDot({ | ||||
index: 2 | index: 2 | ||||
}) | }) | ||||
} | |||||
}; | |||||
}, | }, | ||||
/** | /** | ||||
* 下拉刷新 | * 下拉刷新 | ||||
@@ -232,8 +249,8 @@ Page({ | |||||
// 用户点击右上角分享 | // 用户点击右上角分享 | ||||
onShareAppMessage: function() { | onShareAppMessage: function() { | ||||
return { | return { | ||||
title: "富茂链客", | |||||
desc: "分享个小程序,希望你喜欢", | |||||
title: this.data.title, | |||||
desc: this.data.desc, | |||||
success: function(res) { | success: function(res) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "分享成功", | title: "分享成功", | ||||
@@ -32,7 +32,7 @@ | |||||
.index-scroll-view .commodity { | .index-scroll-view .commodity { | ||||
display: inline-block; | display: inline-block; | ||||
margin: 16rpx 30rpx 30rpx; | |||||
margin: 16rpx 30rpx 0; | |||||
margin-right: 0; | margin-right: 0; | ||||
overflow: hidden; | overflow: hidden; | ||||
position: relative; | position: relative; | ||||
@@ -66,6 +66,6 @@ | |||||
</view> | </view> | ||||
<!-- 待付款 显示立即购买的按钮 --> | <!-- 待付款 显示立即购买的按钮 --> | ||||
<view wx:if="{{order.orderStatus==0}}" class="buy-view app-border-top"> | <view wx:if="{{order.orderStatus==0}}" class="buy-view app-border-top"> | ||||
<button bindtap='orderFunc' data-couponChannelId="{{order.id}}" class='buy'>立即支付</button> | |||||
<button bindtap='orderFunc' hover-class='active' data-couponChannelId="{{order.id}}" class='buy'>立即支付</button> | |||||
</view> | </view> | ||||
</view> | </view> |
@@ -67,7 +67,6 @@ | |||||
width: 100%; | width: 100%; | ||||
} | } | ||||
.info view:nth-child(1) text { | .info view:nth-child(1) text { | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
color: #000; | color: #000; | ||||
@@ -91,7 +90,6 @@ | |||||
color: #b8b8b8; | color: #b8b8b8; | ||||
} | } | ||||
.payment { | .payment { | ||||
width: 92%; | width: 92%; | ||||
height: 120rpx; | height: 120rpx; | ||||
@@ -358,19 +356,22 @@ radio { | |||||
background: #fff; | background: #fff; | ||||
position: fixed; | position: fixed; | ||||
padding-top: 10rpx; | padding-top: 10rpx; | ||||
height: 98rpx; | |||||
bottom: 0rpx; | |||||
height: 94rpx; | |||||
bottom: 30rpx; | |||||
left: 0; | left: 0; | ||||
right: 0; | right: 0; | ||||
} | } | ||||
.buy { | .buy { | ||||
background: #00c0ff; | background: #00c0ff; | ||||
height: 88rpx; | |||||
width: 98%; | |||||
height: 94rpx; | |||||
width: 670rpx; | |||||
margin: 0 auto; | margin: 0 auto; | ||||
color: #fff; | color: #fff; | ||||
font-size: 36rpx; | font-size: 36rpx; | ||||
line-height: 88rpx; | |||||
border-radius: 6rpx; | |||||
line-height: 94rpx; | |||||
border-radius: 61rpx; | |||||
} | } | ||||
.active{ | |||||
opacity: .6; | |||||
} |
@@ -116,11 +116,12 @@ Page({ | |||||
}); | }); | ||||
} | } | ||||
}); | }); | ||||
} else { | |||||
} | |||||
else { | |||||
console.log("加载完成allow_load设置成false"); | console.log("加载完成allow_load设置成false"); | ||||
that.setData({ | that.setData({ | ||||
loading: true, | loading: true, | ||||
ccontent: "——— 再拉裤子就掉了啦 ———" | |||||
content: "——— 再拉裤子就掉了啦 ———" | |||||
}) | }) | ||||
setTimeout(function () { | setTimeout(function () { | ||||
that.setData({ | that.setData({ | ||||
@@ -14,8 +14,8 @@ | |||||
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | <text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | ||||
<text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | <text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | ||||
<text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | <text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | ||||
<text class='sucess' wx:if="{{item.orderStatus==4}}">已退款</text> | |||||
<text class='sucess' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||||
<text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||||
<text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0}}">免费领取</text> | <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0}}">免费领取</text> | ||||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | <text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | ||||
</view> | </view> | ||||
@@ -47,9 +47,9 @@ | |||||
<!-- <view wx:if="{{item.orderStatus==3}}" style="background:#999;opacity: .6;color:#fff;" class="btn"> | <!-- <view wx:if="{{item.orderStatus==3}}" style="background:#999;opacity: .6;color:#fff;" class="btn"> | ||||
<text>待退款</text> | <text>待退款</text> | ||||
</view> --> | </view> --> | ||||
<view wx:if="{{item.orderStatus==4}}" style="background:#999;opacity: .6;" class="btn"> | |||||
<!-- <view wx:if="{{item.orderStatus==4}}" style="background:#999;opacity: .6;" class="btn"> | |||||
<text>已退款</text> | <text>已退款</text> | ||||
</view> | |||||
</view> --> | |||||
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | <view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | ||||
<text>退款失败</text> | <text>退款失败</text> | ||||
</view> | </view> | ||||
@@ -228,8 +228,8 @@ | |||||
} | } | ||||
.loading image { | .loading image { | ||||
width: 40rpx; | |||||
height: 40rpx; | |||||
width: 60rpx; | |||||
height: 60rpx; | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } |
@@ -11,9 +11,9 @@ | |||||
--> | --> | ||||
<view class="zhuangtai"> | <view class="zhuangtai"> | ||||
<image wx:if="{{couponorderstatus==1}}" src="./../../assets/img/wm01.jpg"></image> | |||||
<image wx:if="{{couponorderstatus==2}}" src="./../../assets/img/wm02.jpg"></image> | |||||
<image wx:if="{{couponorderstatus==3}}" src="./../../assets/img/wm03.jpg"></image> | |||||
<image wx:if="{{couponorderstatus==1}}" src="./../../assets/img/wm01.jpg" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==2}}" src="./../../assets/img/wm02.jpg" mode='widthFix'></image> | |||||
<image wx:if="{{couponorderstatus==3}}" src="./../../assets/img/wm03.jpg" mode='widthFix'></image> | |||||
<view class="panel" wx:if="{{couponorderstatus==0}}"> | <view class="panel" wx:if="{{couponorderstatus==0}}"> | ||||
<view class="barcode"> | <view class="barcode"> | ||||
<canvas canvas-id="barcode" /> | <canvas canvas-id="barcode" /> | ||||
@@ -37,12 +37,13 @@ page { | |||||
} | } | ||||
.panel, .zhuangtai image { | .panel, .zhuangtai image { | ||||
width: 600rpx; | |||||
background-color: #fff; | |||||
margin: 22rpx auto 0; | |||||
padding: 0; | |||||
position: relative; | |||||
z-index: 10000000000; | |||||
width:600rpx; | |||||
display:block; | |||||
border-radius:10rpx; | |||||
margin:38rpx auto 0; | |||||
padding:0; | |||||
z-index:10000000000; | |||||
} | } | ||||
.pane2 { | .pane2 { | ||||
@@ -10,7 +10,9 @@ Page({ | |||||
addCar: null, | addCar: null, | ||||
tcq: 2, | tcq: 2, | ||||
flag: "", | flag: "", | ||||
extraData: {} | |||||
extraData: {}, | |||||
desc:'', | |||||
title:'' | |||||
}, | }, | ||||
/*车牌动态样式 */ | /*车牌动态样式 */ | ||||
changeStyle: function() { | changeStyle: function() { | ||||
@@ -26,6 +28,21 @@ Page({ | |||||
onLoad: function(options) { | onLoad: function(options) { | ||||
var that = this; | var that = this; | ||||
that.getList(); | that.getList(); | ||||
Http.get({ | |||||
url: config.api.getWeapNote, | |||||
data: { | |||||
appId: config.weapp.AppId, | |||||
} | |||||
}) | |||||
.then(res => { | |||||
console.log(res.data.weapNote); | |||||
let weapNote = JSON.parse(res.data.weapNote); | |||||
console.log(weapNote.carpage); | |||||
that.setData({ | |||||
desc: weapNote.carpage.desc, | |||||
title: weapNote.carpage.title | |||||
}) | |||||
}) | |||||
}, | }, | ||||
onShow: function(options) { | onShow: function(options) { | ||||
@@ -331,8 +348,8 @@ Page({ | |||||
// 用户点击右上角分享 | // 用户点击右上角分享 | ||||
onShareAppMessage: function () { | onShareAppMessage: function () { | ||||
return { | return { | ||||
title: "富茂链客", | |||||
desc: "分享个小程序,希望你喜欢", | |||||
title: this.data.title, | |||||
desc: this.data.desc, | |||||
success: function (res) { | success: function (res) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "分享成功", | title: "分享成功", | ||||
@@ -14,8 +14,8 @@ | |||||
color: #999; | color: #999; | ||||
} | } | ||||
.loading image { | .loading image { | ||||
width: 40rpx; | |||||
height: 40rpx; | |||||
width: 60rpx; | |||||
height: 60rpx; | |||||
vertical-align: middle; | vertical-align: middle; | ||||
margin-right: 10rpx; | margin-right: 10rpx; | ||||
} | } | ||||
@@ -143,13 +143,14 @@ | |||||
bottom: 0; | bottom: 0; | ||||
right: 30rpx; | right: 30rpx; | ||||
width: 140rpx; | width: 140rpx; | ||||
height: 60rpx; | |||||
line-height: 60rpx; | |||||
height: 58rpx; | |||||
line-height: 58rpx; | |||||
text-align: center; | text-align: center; | ||||
background: #ff4949; | background: #ff4949; | ||||
border-radius: 60rpx; | border-radius: 60rpx; | ||||
color: #fff; | color: #fff; | ||||
font-size: 28rpx; | font-size: 28rpx; | ||||
border: 2rpx solid #ff4949; | |||||
} | } | ||||
.sale { | .sale { | ||||
@@ -167,5 +168,10 @@ | |||||
} | } | ||||
.active { | .active { | ||||
opacity: 0.6; | |||||
background: #fff; | |||||
width: 140rpx; | |||||
height: 58rpx; | |||||
line-height: 58rpx; | |||||
color: #ff4949; | |||||
border: 2rpx solid #ff4949; | |||||
} | } |
@@ -11,7 +11,7 @@ Page({ | |||||
// "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" | // "http://img02.tooopen.com/images/20150928/tooopen_sy_143912755726.jpg" | ||||
// } | // } | ||||
flag: 'hidden', | flag: 'hidden', | ||||
score:'' | |||||
score:'0' | |||||
}, | }, | ||||
navigateTo() { | navigateTo() { | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
@@ -67,7 +67,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:2.0.5</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:2.0.6</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> |
@@ -111,12 +111,13 @@ | |||||
} | } | ||||
.chengzhang1 .view { | .chengzhang1 .view { | ||||
font-size: 48rpx; | |||||
font-size: 44rpx; | |||||
color: #01bffe; | color: #01bffe; | ||||
line-height: 67rpx; | line-height: 67rpx; | ||||
} | } | ||||
.chengzhang1 text { | .chengzhang1 text { | ||||
text-align: center; | |||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #333; | color: #333; | ||||
line-height: 33rpx; | line-height: 33rpx; | ||||