From 53ab2f38ff1cc05e9d7c55578ddcb81bd6f5d430 Mon Sep 17 00:00:00 2001 From: Lijianheng <ljh@bronet.cn> Date: Mon, 25 Mar 2019 20:39:28 +0800 Subject: [PATCH] 更新我的订单和收藏模块 --- pages/mine/collect/collect.js | 2 +- pages/mine/collect/collect.wxml | 84 ++++++------------------------------------------------------------------------------ pages/mine/collect/collect.wxss | 4 ++++ pages/mine/myOrder/myOrder.js | 145 ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------- pages/mine/myOrder/myOrder.wxml | 19 +++++++++++-------- 5 files changed, 68 insertions(+), 186 deletions(-) diff --git a/pages/mine/collect/collect.js b/pages/mine/collect/collect.js index e733164..039b4e0 100644 --- a/pages/mine/collect/collect.js +++ b/pages/mine/collect/collect.js @@ -55,7 +55,7 @@ Page({ console.log(res); // 列表值 that.setData({ - collectList: res.data.list + collectList: res.date.list }) console.log(that.data.collectList) diff --git a/pages/mine/collect/collect.wxml b/pages/mine/collect/collect.wxml index ec89f5f..f71fbb7 100644 --- a/pages/mine/collect/collect.wxml +++ b/pages/mine/collect/collect.wxml @@ -1,6 +1,9 @@ <view class='container'> <view class='mid'> + + <view class="nodata" wx:if='{{collectList.length==0}}'>暂无数据</view> + <block wx:else> <view class='mid_item' wx:for="{{collectList}}" wx:key=""> <!-- 顶部 --> <view class='mid_item_top'> @@ -58,7 +61,7 @@ {{item.text_content}} </view> </view> - <!-- 右下 --> + <!-- 右下右 --> <view class='right_bottom_rig'> 立即参团 </view> @@ -79,83 +82,8 @@ </view> </view> </view> + </block> - <!-- <view class='mid_item'> - <!-- 顶部 --> - <view class='mid_item_top'> - <!-- 左边 --> - <view class='mid_item_top_left'> - <view class='top_left_pic'> - <image src='../../../img/goods_1.png'></image> - - - </view> - <view class='text_color'> - 距开始2时22分距结束2时22分 - </view> - </view> - <!-- 右边 --> - <view class='mid_item_top_right'> - <!-- 右上 --> - <view class='right_top'> - <view class='right_top_lef'> - 纯进口有机菜花 - </view> - <view class='right_top_rig'> - 产地:罗利 - </view> - </view> - <!-- 右中1 --> - <view class='right_mid'> - <view class='right_mid_lef'> - <view class='right_mid_lef_color'></view> - </view> - <view class='right_mid_rig'> - 42% - </view> - </view> - <!-- 右中2 --> - <view class='right_text'> - 已拼300份,目标500份 - </view> - <!-- 右下 --> - <view class='right_bottom'> - <!-- 右下左 --> - <view class='right_bottom_lef'> - <span class='RBM'>¥</span> - <span class='number'>52/</span> - <span class='text'>1磅1份1磅1份</span> - - </view> - <!-- 右下中 --> - <view class='right_bottom_mid'> - <view class='right_bottom_mid_t'> - 40mm-50m - </view> - <view class='right_bottom_mid_b'> - 番茄果径 番茄果径番茄果径 - </view> - </view> - <!-- 右下右 --> - <view class='right_bottom_rig'> - 立即参团 - </view> - </view> - </view> - - - </view> - <view class='mid_item_bottom'> - <view class='mid_item_bottom_left'> - 经典推荐 - </view> - <!-- 竖线 --> - <view class='mid_line'></view> - <!-- 底部文本 --> - <view class='mid_item_bottom_bot'> - 智利进口,绿色健康,硕大饱满 - </view> - </view> - <!-- </view> --> + </view> </view> \ No newline at end of file diff --git a/pages/mine/collect/collect.wxss b/pages/mine/collect/collect.wxss index 7f44140..4f3c2a3 100644 --- a/pages/mine/collect/collect.wxss +++ b/pages/mine/collect/collect.wxss @@ -248,4 +248,8 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} +.nodata{ + margin-top: 20rpx; + font-size: 30rpx; } \ No newline at end of file diff --git a/pages/mine/myOrder/myOrder.js b/pages/mine/myOrder/myOrder.js index 1997349..08d8974 100644 --- a/pages/mine/myOrder/myOrder.js +++ b/pages/mine/myOrder/myOrder.js @@ -4,6 +4,8 @@ Page({ * 页面的初始数据 */ data: { + + orderList:[], navbar: [{ name: '全部' }, @@ -30,7 +32,7 @@ Page({ } ], currentTab: 0, - orderList: '', + // orderList: '', page: 1, status: 0, toCancel: false, @@ -38,21 +40,16 @@ Page({ //倒计时 - countDownList: [], - actEndTimeList: [] + // countDownList: [], + // actEndTimeList: [] }, - + /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - // let endTimeList = []; - // // 将活动的结束时间参数提成一个单独的数组,方便操作 - // goodsList.forEach(o => { endTimeList.push(o.actEndTime) }) - // this.setData({ actEndTimeList: endTimeList }); - // // 执行倒计时函数 - // this.countDown(); + @@ -80,12 +77,11 @@ Page({ }) } }, - - - timeFormat(param) {//小于10的格式化函数 + timeFormat(param) { //小于10的格式化函数 return param < 10 ? '0' + param : param; }, + // 我的订单 myOrder() { @@ -105,107 +101,58 @@ Page({ // 列表值 that.setData({ - orderList: res.data.list + orderList: res.data.list, + now_time: res.data.now_time }) - - - - - + that.countDown() }).catch((err) => { }) }, - countDown() {//倒计时函数 - // 获取当前时间,同时得到活动结束时间数组 - let newTime = new Date().getTime(); - let endTimeList = this.data.actEndTimeList; - let countDownArr = []; - - // 对结束时间进行处理渲染到页面 - endTimeList.forEach(o => { - let endTime = new Date(o).getTime(); - let obj = null; - // 如果活动未结束,对时间进行处理 - if (endTime - newTime > 0) { - let time = (endTime - newTime) / 1000; - // 获取天、时、分、秒 + //团购倒计时 + countDown() { + let that = this + let objs = Object.assign([], that.data.orderList) + let now_time = parseInt(new Date().getTime()) + // console.log('现在的时间:'+now_time) + + for (let obj of objs) { + + let end_time = obj.end_time * 1000 + // console.log(end_time) + let open_time = obj.open_time * 1000 + if (now_time < open_time) { + // console.log(333) + //活动未开始 + } else if (now_time > end_time) { + // console.log(222) + //活动结束 + } else { + // console.log(1111) + let time = (end_time - now_time) / 1000; let day = parseInt(time / (60 * 60 * 24)); let hou = parseInt(time % (60 * 60 * 24) / 3600); let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); - obj = { - day: this.timeFormat(day), - hou: this.timeFormat(hou), - min: this.timeFormat(min), - sec: this.timeFormat(sec) - } - } else {//活动已结束,全部设置为'00' - obj = { - day: '00', - hou: '00', - min: '00', - sec: '00' - } + + obj.day = that.timeFormat(day), + obj.hou = that.timeFormat(hou), + obj.min = that.timeFormat(min), + obj.sec = that.timeFormat(sec) + + // console.log(obj.day, obj.hou, obj.min, obj.sec) } - countDownArr.push(obj); + } + that.setData({ + orderList: objs }) - // // 渲染,然后每隔一秒执行一次倒计时函数 - // this.setData({ countDownList: countDownArr }) - // setTimeout(this.countDown, 1000); + console.log(that.data.orderList) + setTimeout(that.countDown, 1000); }, - // 倒计时功能 - // timeFunc(num) { - // //let number = res.compare.surplus_time; - // // 时间戳处理 - // var totalSecond = num; - // var interval = setInterval(function () { - // // 秒数 - // var second = totalSecond; - // // 天数位 - // var day = Math.floor(second / 3600 / 24); - // var dayStr = day.toString(); - // if (dayStr.length == 1) dayStr = '0' + dayStr; - // // 小时位 - // var hr = Math.floor((second - day * 3600 * 24) / 3600); - // var hrStr = hr.toString(); - // if (hrStr.length == 1) hrStr = '0' + hrStr; - // // 分钟位 - // var min = Math.floor((second - day * 3600 * 24 - hr * 3600) / 60); - // var minStr = min.toString(); - // if (minStr.length == 1) minStr = '0' + minStr; - // // 秒位 - // var sec = second - day * 3600 * 24 - hr * 3600 - min * 60; - // var secStr = sec.toString(); - // if (secStr.length == 1) secStr = '0' + secStr; - - // that.setData({ - // days: dayStr, - // hours: hrStr, - // minutes: minStr, - // seconds: secStr, - // }); - // totalSecond--; - // if (totalSecond <= 0) { - // clearInterval(interval); - // wx.showToast({ - // title: '活动已结束', - // }); - // // 倒计时结束 - // that.countDown(); - // that.setData({ - // days: '00', - // hours: '00', - // minutes: '00', - // seconds: '00', - // }); - // } - // }.bind(this), 1000); - // }, - + navbarTap: function (e) { diff --git a/pages/mine/myOrder/myOrder.wxml b/pages/mine/myOrder/myOrder.wxml index 8cdae71..7af81d6 100644 --- a/pages/mine/myOrder/myOrder.wxml +++ b/pages/mine/myOrder/myOrder.wxml @@ -41,8 +41,10 @@ <image src='{{item.thumb}}'></image> </view> <!-- 文字 --> - <view class='mid_left_text'> - 距结束23时52分 + <view class='mid_left_text' > + <!-- 距结束23时52分 --> + <!-- 距结束{{item.day}}天{{item.hou}}时{{item.min}}分{{item.sec}}秒 --> + 距结束{{item.hou}}小时{{item.min}}分{{item.sec}}秒 </view> </view> <!-- 中——右边 --> @@ -82,8 +84,8 @@ <!-- 下 --> <view class='mid_item_bottom'> <view class='mid_item_bottom_lef'> - 共2件商品,实付 - <span class='color_red'>¥52</span> + 共{{item.goods_numb}}件商品,实付 + <span class='color_red'>¥{{item.goods_pay}}</span> </view> <view class='mid_item_bottom_rig' wx:if="{{item.goods_status==2}}"> <view class='bottom_btn_left' bindtap='cancelOrder'>取消订单</view> @@ -135,7 +137,7 @@ </view> <!-- 文字 --> <view class='mid_left_text'> - 距结束23时52分 + 距结束{{item.hou}}小时{{item.min}}分{{item.sec}}秒 </view> </view> <!-- 中——右边 --> @@ -150,13 +152,14 @@ </view> <!-- 百分比 --> <view class='mid_right_m'> - <view class='right_m_left'> + <!-- <view class='right_m_left'> <view class='right_m_left_content'></view> </view> <view class='right_m_right'> 42% - </view> + </view> --> + <progress percent="{{item.percent}}" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" /> </view> <!-- 拼团份数 --> <view class='mid_right_bottom'> @@ -211,7 +214,7 @@ </view> <!-- 文字 --> <view class='mid_left_text'> - 距结束23时52分 + 距结束{{item.hou}}小时{{item.min}}分{{item.sec}}秒 </view> </view> <!-- 中——右边 --> -- libgit2 0.24.0