diff --git a/page_fenbao/statulist/myshop/index.vue b/page_fenbao/statulist/myshop/index.vue index 1f890d9..f08df22 100644 --- a/page_fenbao/statulist/myshop/index.vue +++ b/page_fenbao/statulist/myshop/index.vue @@ -93,6 +93,7 @@ } }, onShow() { + this.pagenum = 1 this.wateringList = [] this.getlist() }, diff --git a/page_user/order_detail.vue b/page_user/order_detail.vue index 487d840..6284bec 100644 --- a/page_user/order_detail.vue +++ b/page_user/order_detail.vue @@ -24,10 +24,11 @@ 支付中 - {{list.suitTime}} 分钟 + + {{list.money}} - 充值金额{{list.money}} + 充值金额 提现金额{{list.money}} diff --git a/page_user/shouzhi.vue b/page_user/shouzhi.vue index 42d5d5e..7c22bfc 100644 --- a/page_user/shouzhi.vue +++ b/page_user/shouzhi.vue @@ -13,7 +13,8 @@ - {{item.suitTime}}日 时 分钟 秒 + ￥{{item.money}} diff --git a/page_user/switchs.vue b/page_user/switchs.vue index 9747b13..6237b01 100644 --- a/page_user/switchs.vue +++ b/page_user/switchs.vue @@ -7,19 +7,64 @@ 时间范围 - - - × + {{endtime}} - {{lasttime}} + × - - 搜索 + + 搜索 - - - + + + + + + 订单编号：{{item.billNo == null ? '--' : item.billNo}} + + + 未支付 + 支付成功 + 已退款 + 用户取消 + 系统超时取消 + 未支付 + 退款中 + + + + + + 用户手机：{{item.userName == null ? '--' : item.userName}} + + + 订单费用：{{item.money == null ? '--' : item.money}}元 + + + + + 设备编码：{{item.deviceNo == null ? '--' : item.deviceNo}} + + + 设备名称：{{item.deviceName == null ? '--' : item.deviceName}} + + + + + 开始时间：{{item.suitStartTime == null ? '--' : item.suitStartTime}} + + + 有无售后 ：{{item.status == 3 || item.status == 7 ? '有' : '无'}} + + + + + -没有更多订单记录- + + + @@ -32,17 +77,46 @@ backgroundColor: "#8883F0", }, list: [{ - name: '待收货' + name: '全部' }, { - name: '待付款' + name: '未支付' }, { - name: '待评价', + name: '已支付', + }, { + name: '已完成', + }, { + name: '已售后', }], - current: 0 + current: 0, + pagenum: 1, + wateringList: [], + pagesize: 10, // 一页多少数据 + isLoading: false, // 是否正在加载数据 + noMoreData: false, // 是否没有更多数据 + total: 0, + showflag: false, + jlflag:false, + statusList:'', + type:'', + endtime:'', + lasttime:'', + params: { + year: true, + month: true, + day: true, + hour: false, + minute: false, + second: false + }, + show: false, + num:'' } }, onLoad() { - + + }, + onShow() { + this.getList() }, // 分享到好友（会话） onShareAppMessage: function() { @@ -61,10 +135,141 @@ } }, methods: { + btnks(num) { + this.show = true + if (num == 1) { + this.num = 1 + } else { + this.num = 2 + } + }, + btnqc(){ + this.endtime = '' + this.lasttime = '' + this.wateringList = [] + this.pagenum = 1 + this.statusList = '' + this.getList() + }, + confirm(e) { + if (this.num == 1) { + this.endtime = e.year + '-' + e.month + '-' + e.day + if(this.lasttime != ''){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '' + this.getList() + } + } else { + this.lasttime = e.year + '-' + e.month + '-' + e.day + if(this.endtime != ''){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '' + this.getList() + } + } + }, + btnxq(billId){ + uni.navigateTo({ + url:'/page_user/mapditu/orderxq?billId=' + billId + }) + }, + change(index) { + this.jlflag = false this.current = index; + if(index == 0){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '' + this.getList() + }else if(index == 1){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = 1 + this.getList() + }else if(index == 2){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = 2 + this.getList() + }else if(index == 3){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '2,3,7' + this.getList() + }else if(index == 4){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '3,7' + this.getList() + } + }, + btnsear(){ + this.wateringList = [] + this.pagenum = 1 + this.statusList = '' + this.getList() + }, + + getList(){ + this.$u.get(`/app/bill/incomeList?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.type}&startDate=${this.endtime}&endDate=${this.lasttime}`).then((res) => { + if (res.code == 200) { + this.total = res.total + if (res.rows.length > 0) { + // 有数据，追加到列表 + this.wateringList = this.wateringList.concat(res.rows) + this.pagenum++ + } else { + // 没有更多数据 + this.noMoreData = true; + setTimeout(()=>{ + this.jlflag = true + }) + } + this.isLoading = false; + } + }); + }, + + onReachBottom() { + let sum = this.total / this.pagesize + if (this.pagenum-1 < sum) { + this.getList(); // 上拉加载更多 + } else { + this.jlflag = true + // uni.showToast({ + // title: '没有更多记录了', + // icon: 'none', + // duration: 1000 + // }) + } + }, + // 点击查询详情 + btndetail(id){ + uni.navigateTo({ + url:'/page_user/order_detail?id=' + id + }) } - } + + }, + // 分享到好友（会话） + onShareAppMessage: function () { + return { + title: '创想物联', + path: '/pages/shouye/index' + } + }, + + // 分享到朋友圈 + onShareTimeline: function () { + return { + title: '创想物联', + query: '', + path: '/pages/shouye/index' + } + }, } @@ -76,7 +281,39 @@ /deep/ .u-icon__icon { padding-bottom: 22rpx; } - + .orderlist{ + width: 100%; + height: 100%; + overflow: scroll; + .otderlist_item{ + margin-top: 30rpx; + background-color: #fff; + height: 230rpx; + .order_top{ + color: #000; + font-size: 28rpx; + display: flex; + justify-content: space-between; + border-bottom: 1px solid #ccc; + padding: 0 30rpx; + box-sizing: border-box; + height: 80rpx; + line-height: 80rpx; + } + .order_fu{ + display: flex; + color: #ccc; + font-size: 26rpx; + padding: 20rpx 30rpx; + box-sizing: border-box; + height: 40rpx; + line-height: 40rpx; + .name{ + width: 440rpx; + } + } + } + } .serch { display: flex; justify-content: space-between; @@ -91,7 +328,7 @@ width: 100%; height: 60rpx; line-height: 60rpx; - padding-left: 50rpx; + padding-left: 30rpx; border: 1px solid #ccc; border-radius: 10rpx; } @@ -150,6 +387,9 @@ page { background-color: #F7FAFE !important; + // position: fixed; + // top: 0; + // left: 0; } .pages { diff --git a/page_user/yetx.vue b/page_user/yetx.vue index b6e03c8..11f3eaa 100644 --- a/page_user/yetx.vue +++ b/page_user/yetx.vue @@ -1,14 +1,14 @@