From 342c2c6093134ea3388d8651fb607210236ada29 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 17 Oct 2018 12:03:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD=EF=BC=8C=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85][=E5=A2=9E=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E3=80=82?= =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD=E5=A2=9E=E5=8A=A0=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 1 + assets/img/clock.png | Bin 0 -> 7377 bytes pages/coupon/detail/index.js | 74 +++++++++++++++++++---- pages/coupon/detail/index.wxml | 22 +++++-- pages/coupon/detail/index.wxss | 50 +++++++++++++++- pages/edit/edit.js | 100 +++++++++++++++++++++++++++++++ pages/edit/edit.json | 3 + pages/edit/edit.wxml | 28 +++++++++ pages/edit/edit.wxss | 66 ++++++++++++++++++++ pages/index/rushToBuy/index.wxss | 2 +- pages/rushToBuy/index.js | 17 +++--- pages/rushToBuy/index.wxml | 13 ++-- pages/rushToBuy/index.wxss | 11 +++- pages/user/index.js | 5 ++ pages/user/index.wxml | 9 +-- pages/user/index.wxss | 4 +- 16 files changed, 364 insertions(+), 41 deletions(-) create mode 100644 assets/img/clock.png create mode 100644 pages/edit/edit.js create mode 100644 pages/edit/edit.json create mode 100644 pages/edit/edit.wxml create mode 100644 pages/edit/edit.wxss diff --git a/app.json b/app.json index 783a32d..73cb302 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,7 @@ { "pages": [ "pages/index/index", + "pages/edit/edit", "pages/cartest/cartest", "pages/actdetail/actdetail", "pages/bannerdetail/index", diff --git a/assets/img/clock.png b/assets/img/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..31327e893e9a89bfe49a129f1cd1cbeef43dc97f GIT binary patch literal 7377 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 a)BtIccET^#jgo&Z88uXNl*<&Y!~O?kZ?2sH literal 0 HcmV?d00001 diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 69dad70..edf811f 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -16,7 +16,13 @@ Page({ tempFilePaths: '', userInfo: {}, hasUserInfo: false, - canIUse: wx.canIUse('button.open-type.getUserInfo') + canIUse: wx.canIUse('button.open-type.getUserInfo'), + + + id: '', + result: [], + end_time: '', + clock: '' }, phone: function () { @@ -29,6 +35,48 @@ Page({ } }, + countdown(end_time) { + let that = this; + var EndTime = end_time; + var NowTime = new Date().getTime(); + var total_micro_second = EndTime - NowTime || []; + // 渲染倒计时时钟 + let obj = that.dateformat(total_micro_second); + that.setData({ + clock: obj, + day: obj.a1, + hour: obj.b1, + min: obj.c1, + sec: obj.d1, + }); + if (total_micro_second <= 0) { + that.setData({ + clock: "已经截止" + }); + //return; + } + setTimeout(function () { + total_micro_second -= 1000; + that.countdown(end_time); + }, 1000) + }, + + // 时间格式化输出,如11:03 25:19 每1s都会调用一次 + dateformat(micro_second) { + // 总秒数 + var second = Math.floor(micro_second / 1000); + // 天数 + var day = Math.floor(second / 3600 / 24) < 10 ? "0" + Math.floor(second / 3600 / 24) : Math.floor(second / 3600 / 24); + // 小时 + var hr = Math.floor(second / 3600 % 24) < 10 ? "0" + Math.floor(second / 3600 % 24) : Math.floor(second / 3600 % 24); + // 分钟 + var min = Math.floor(second / 60 % 60) < 10 ? "0" + Math.floor(second / 60 % 60) : Math.floor(second / 60 % 60); + // 秒 + var sec = Math.floor(second % 60) < 10 ? "0" + Math.floor(second % 60): Math.floor(second % 60); + + // return day + "天" + hr + "小时" + min + "分钟" + sec + "秒"; + return { a1: day, b1: hr, c1: min, d1: sec} + }, onLoad(options) { let that = this; wx.showLoading({ @@ -50,17 +98,21 @@ Page({ }; Http.get(parmer).then(res => { console.log(res.data); - //当前时间与优惠券下架时间做计算 - var endTime = util.fmtDate(res.data.endTime); - if (util.timechuo(endTime).indexOf('-') == 0) { - that.setData({ - endtime: "活动已结束", - }); - } else { - that.setData({ - endtime: util.timechuo(endTime) - }); + if (res.data.endTime){ + that.countdown(res.data.endTime); + //当前时间与优惠券下架时间做计算 + var endTime = util.formatTime(res.data.endTime, "yyyy-MM-dddd hh:mm:ss"); + if (util.timechuo(endTime).indexOf('-') == 0) { + that.setData({ + endtime: "活动已结束", + }); + } else { + that.setData({ + endtime: util.timechuo(endTime) + }); + } } + wx.hideLoading(); that.setData({ data: res.data diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0083946..315221e 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -10,6 +10,22 @@ + + + + 距结束还剩 : + + 00天 + 00: + 00: + 00 + + {{day}}天 + {{hour}}: + {{min}}: + {{sec}} + + {{data.title}} {{data.subTitle}} @@ -21,10 +37,6 @@ 剩余{{data.remainInventory}}件 - - 距结束: - {{endtime}} - 有效期:自领取之日起 {{validDays}}天内有效 @@ -44,7 +56,6 @@ - \ No newline at end of file diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 7d2cecd..154d34a 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -12,6 +12,7 @@ page { } .banner { + position: relative; width: 750rpx; height: 534.5rpx; } @@ -40,7 +41,7 @@ page { } .fenxiang image { - width: 60rpx; + width: 50rpx; position: absolute; top: 0; right: 0; @@ -298,3 +299,50 @@ page { .txt { margin-right: 30rpx; } +.distance{ + border: none; + border-radius:16rpx; + width: 600rpx; + padding: 16rpx 6rpx 0 0; +} +.distance .txt01{ + display: block; + font-size: 26rpx; + color: #ff4949; +} +.clock{ + width: 116rpx!important; + vertical-align: middle; + margin-right: 10rpx; + margin-top: -4rpx; +} +.qiang{ + position: inline-block; + width: 60rpx; + height: 40rpx; + line-height: 40rpx; + color: #ff4949; + text-align: center; + font-size: 28rpx; + margin-right: 10rpx; +} +.times{ + display: inline-block; + color: #ff4949; + font-weight:bold; + font-size: 26rpx; + text-align:center; +} +.times text{ + display: inline-block; + margin: 6rpx; + width: 46rpx; + height: 56rpx; + text-align: center; + font-size: 28rpx; + line-height: 60rpx; + border-radius:12rpx; + color: #fff; + font-weight:bold; + background: #ff4949; +} \ No newline at end of file diff --git a/pages/edit/edit.js b/pages/edit/edit.js new file mode 100644 index 0000000..87f9139 --- /dev/null +++ b/pages/edit/edit.js @@ -0,0 +1,100 @@ +const app = getApp(); +Page({ + + /** + * 页面的初始数据 + */ + data: { + date: '1988-03-12', + flag:1, + items: [ + { name: 'male', value: '男' }, + { name: 'famale', value: '女' }, + ] + }, + /** + * 获得生日 + */ + bindDateChange: function (e) { + console.log('picker发送选择改变,携带值为', e.detail.value); + this.setData({ + date: e.detail.value, + flag:2 + }) + }, + address: function () { + let that = this; + wx.chooseLocation({ + success:function(res){ + console.log(res); + that.setData({ + name: res.name + }) + }, + fail:function(error){ + console.log(error) + }, + complete:function(data){ + console.log(data); + } + }) + }, + radioChange: function (e) { + console.log('radio发生change事件,携带value值为:', e.detail.value) + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + let that = this; + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/edit/edit.json b/pages/edit/edit.json new file mode 100644 index 0000000..137be15 --- /dev/null +++ b/pages/edit/edit.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "编辑资料" +} \ No newline at end of file diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml new file mode 100644 index 0000000..a66c2b9 --- /dev/null +++ b/pages/edit/edit.wxml @@ -0,0 +1,28 @@ +
+ + 姓名 + + + + 生日 + + + {{date}} + + + + 性别 + + + {{item.value}} + + + + + 地址 + + + + + +
\ No newline at end of file diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss new file mode 100644 index 0000000..d7c0a74 --- /dev/null +++ b/pages/edit/edit.wxss @@ -0,0 +1,66 @@ +input { + width:600rpx; + display: inline-block; + font-size: 32rpx; + vertical-align: middle; + margin-top: -3rpx; +} + +.radio-group { + display: inline-block; +} + +.section { + height: 100rpx; + line-height: 100rpx; + width: 710rpx; + margin: 0 auto; + border-bottom: 1px solid #eee; +} +.radio{ + margin-right: 30rpx; +} + +.section__title, .picker, picker { + display: inline-block; + font-size: 32rpx; +} + +radio { + transform:scale(0.8); +} +.section__title { + color: #999; +} + +.section > text:nth-of-type(1) { + font-size: 32rpx; + display: inline-block; + margin-right: 20rpx; +} +.btn{ + width: 360rpx; + color: #fff; + margin-top: 60rpx; + height: 86rpx; + line-height: 86rpx; + text-align: center; + border-radius:60rpx; + background: #d95f5a; + font-size: 32rpx; +} +.active{ + background: #f38580; +} +.sec{ + position: relative; +} +.input{ + position: absolute; + left: 84rpx; + z-index: 1000; + top: 0; + bottom: 0; + margin: auto; + background: #fff; +} \ No newline at end of file diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss index 033de98..2051832 100644 --- a/pages/index/rushToBuy/index.wxss +++ b/pages/index/rushToBuy/index.wxss @@ -34,13 +34,13 @@ display: inline-block; margin: 16rpx 30rpx 16rpx; margin-right: 0; - /* overflow: hidden; */ position: relative; background: #fff; /* border: 1rpx solid #dddee1; */ width: 355rpx; box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); border-radius: 10rpx; + overflow: hidden; } .index-scroll-view .commodity:last-child{ margin-right: 30rpx; diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js index 6a479a1..2f5162a 100644 --- a/pages/rushToBuy/index.js +++ b/pages/rushToBuy/index.js @@ -59,35 +59,34 @@ Page({ loading: false, }) }, 1400); - // if (pageNum == 2) { - // that.setData({ - // list: [] - // }) - // } var tmpArr = that.data.list; tmpArr.push.apply(tmpArr, res.data.list); that.setData({ list: tmpArr }) for (let i = 0; i < that.data.list.length; i++) { - var startTime = util.fmtDate(that.data.list[i].endTime); + var startTime = util.formatTime(that.data.list[i].endTime, "yyyy-MM-dddd hh:mm:ss"); + var alsell = Math.floor((that.data.list[i].inventory - (that.data.list[i].remainInventory))/(that.data.list[i].inventory)*100); util.timechuo(startTime); - console.log(util.timechuo(startTime)); + console.log(alsell); /** * 修改list的endtime * 渲染到页面 */ var endtime = 'list[' + i + '].endtime'; var flags = 'list[' + i + '].flags'; + var alsells = 'list[' + i + '].alsells'; if (util.timechuo(startTime).indexOf('-')==0){ that.setData({ [flags]: "end", - [endtime]: util.timechuo(startTime) + [endtime]: util.timechuo(startTime), + [alsells]: alsell }); } else{ that.setData({ - [endtime]: util.timechuo(startTime) + [endtime]: util.timechuo(startTime), + [alsells]: alsell }); } } diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml index 29a7578..7ddb4be 100644 --- a/pages/rushToBuy/index.wxml +++ b/pages/rushToBuy/index.wxml @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ - + 距结束: @@ -25,11 +25,12 @@ - 剩余: - {{item.remainInventory}}张 + 已售{{item.alsells}}% + - 购买 - 领取 + 马上购 + 立即领 + 已售罄 已结束 diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss index c542f9d..2ab5aa0 100644 --- a/pages/rushToBuy/index.wxss +++ b/pages/rushToBuy/index.wxss @@ -120,14 +120,15 @@ } .view1 { - width: 550rpx; + width: 350rpx; display: block; line-height: 33rpx; } .remainingNumber { - font-size: 28rpx; + font-size: 26rpx; color: #b4b4b4; + margin-right: 10rpx; } .realnumber { @@ -174,3 +175,9 @@ color: #ff4949; border: 2rpx solid #ff4949; } +progress{ + display: inline-block; + width: 200rpx; + border-radius:60rpx; + overflow: hidden; +} \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index cabeece..bc4afbd 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -65,6 +65,11 @@ Page({ } console.log(that.data.flag) }, + gotoedit:function(){ + wx.navigateTo({ + url: '/pages/edit/edit', + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 805d751..04952cf 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -6,15 +6,16 @@ - + - 等级:{{levelName}} + 点击编辑资料 + 当前成长值 {{score}} - 成长值 + {{levelName}} @@ -67,7 +68,7 @@ - 版本号:2.1.4 + 版本号:2.1.8 diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 3ee1eb1..13f6f34 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -87,7 +87,7 @@ } .chengzhang { - font-size: 28rpx; + font-size: 22rpx; color: #999; line-height: 40rpx; } @@ -96,7 +96,7 @@ position: absolute; right: 24rpx; bottom: 0; - top: 32rpx; + top: 19rpx; } .chengzhang1 text {