chuangte/smartswrtch-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页轮播图 添加订单管理 搜索 选择日期 分类 收支明细待定 提现待定

Browse Source
This commit is contained in:
3321822538@qq.com 2024-07-28 18:03:00 +08:00
parent 98c167ca59
commit 2312e57e82
8 changed files with 472 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
page_fenbao/statulist/myshop/index.vue
View File

@ -93,6 +93,7 @@
} }
}, },
onShow() { onShow() {
this.pagenum = 1
this.wateringList = [] this.wateringList = []
this.getlist() this.getlist()
}, },

5
page_user/order_detail.vue
View File

@ -24,10 +24,11 @@
支付中 支付中
</view> </view>
<view class="num" v-if="list.type == 1"> <view class="num" v-if="list.type == 1">
{{list.suitTime}} 分钟 <!-- {{list.suitTime}} 分钟 -->
{{list.money}}
</view> </view>
<view class="text" v-if="list.type == 1"> <view class="text" v-if="list.type == 1">
充值金额{{list.money}} 充值金额
</view> </view>
<view class="nums" v-if="list.type == 2"> <view class="nums" v-if="list.type == 2">
提现金额{{list.money}} 提现金额{{list.money}}

3
page_user/shouzhi.vue
View File

@ -13,7 +13,8 @@
</view> </view>
</view> </view>
<view class="card_right"> <view class="card_right">
<view class="top" v-if="item.type == 1">{{item.suitTime}}<text v-if="item.timeUnit == 1">日</text> <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text></view> <!-- <view class="top" v-if="item.type == 1">{{item.suitTime}}
<text v-if="item.timeUnit == 1">日</text> <text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text></view> -->
<view class="bot"> <view class="bot">
￥{{item.money}} ￥{{item.money}}
</view> </view>

270
page_user/switchs.vue
View File

@ -7,19 +7,64 @@
时间范围 时间范围
</view> </view>
<view class="timert"> <view class="timert">
<view class="xztime"></view> - <view class="xztime"></view> <view class="xztime" @click="btnks(1)">{{endtime}}</view> - <view class="xztime" @click="btnks(2)">{{lasttime}}</view>
<view class="qinc">×</view> <view class="qinc" @click="btnqc">×</view>
</view> </view>
</view> </view>
<view class="serch"> <view class="serch">
<input type="text" placeholder="请输入SN码或手机号" /> <input type="text" v-model="type" placeholder="请输入SN码或手机号" />
<view class="">搜索</view> <view class="" @click="btnsear">搜索</view>
</view> </view>
<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs> <u-tabs :list="list" :is-scroll="false" :current="current" @change="change" active-color="#8883F0"></u-tabs>
<view class="orderlist" @scrolltolower="onReachBottom">
<view class="otderlist_item" v-for="(item,index) in wateringList" :key="index" @click="btnxq(item.billId)">
<view class="order_top">
<view class="">
订单编号：{{item.billNo == null ? '--' : item.billNo}}
</view>
<view class="">
<text style="color: #ccc;" v-if="item.status == 1"><text style="width: 10rpx;height: 10rpx;background-color: #ccc;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 未支付</text>
<text style="color: #00FF00;" v-if="item.status == 2"><text style="width: 10rpx;height: 10rpx;background-color: #00FF00;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 支付成功</text>
<text style="color: #ccc;" v-if="item.status == 3"><text style="width: 10rpx;height: 10rpx;background-color: #ccc;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 已退款</text>
<text style="color: red;" v-if="item.status == 4"><text style="width: 10rpx;height: 10rpx;background-color: red;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 用户取消</text>
<text style="color: red;" v-if="item.status == 5"><text style="width: 10rpx;height: 10rpx;background-color: red;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 系统超时取消</text>
<text style="color: #8892F1;" v-if="item.status == 6"><text style="width: 10rpx;height: 10rpx;background-color: #8892F1;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 未支付</text>
<text style="color: #ccc;" v-if="item.status == 7"><text style="width: 10rpx;height: 10rpx;background-color: #000;border-radius: 50%;display: inline-block;vertical-align: middle;margin-right: 5rpx;"></text> 退款中</text>
</view>
</view>
<view class="order_bd">
<view class="order_fu">
<view class="name">
用户手机：{{item.userName == null ? '--' : item.userName}}
</view>
<view class="">
订单费用：{{item.money == null ? '--' : item.money}}元
</view>
</view>
<view class="order_fu">
<view class="name">
设备编码：{{item.deviceNo == null ? '--' : item.deviceNo}}
</view>
<view class="">
设备名称：{{item.deviceName == null ? '--' : item.deviceName}}
</view>
</view>
<view class="order_fu">
<view class="name">
开始时间：{{item.suitStartTime == null ? '--' : item.suitStartTime}}
</view>
<view class="">
有无售后 ：{{item.status == 3 || item.status == 7 ? '有' : '无'}}
</view>
</view>
</view>
</view>
<view v-if="jlflag" class="" style="font-size: 28rpx;color: red;margin-top: 30rpx;width: 100%;text-align: center;">-没有更多订单记录-</view>
</view>
<u-picker mode="time" v-model="show" :params="params" @confirm="confirm"></u-picker>
</view> </view>
</template> </template>
@ -32,17 +77,46 @@
backgroundColor: "#8883F0", backgroundColor: "#8883F0",
}, },
list: [{ 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() { onLoad() {
},
onShow() {
this.getList()
}, },
// 分享到好友（会话） // 分享到好友（会话）
onShareAppMessage: function() { onShareAppMessage: function() {
@ -61,10 +135,141 @@
} }
}, },
methods: { 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) { change(index) {
this.jlflag = false
this.current = index; 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'
}
},
} }
</script> </script>
@ -76,7 +281,39 @@
/deep/ .u-icon__icon { /deep/ .u-icon__icon {
padding-bottom: 22rpx; 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 { .serch {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -91,7 +328,7 @@
width: 100%; width: 100%;
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
padding-left: 50rpx; padding-left: 30rpx;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 10rpx; border-radius: 10rpx;
} }
@ -150,6 +387,9 @@
page { page {
background-color: #F7FAFE !important; background-color: #F7FAFE !important;
// position: fixed;
// top: 0;
// left: 0;
} }
.pages { .pages {

18
page_user/yetx.vue
View File

@ -1,14 +1,14 @@
<template> <template>
<view> <view>
<u-navbar title="收款账户" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36' <u-navbar title="余额提现" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
height='50'></u-navbar> height='50'></u-navbar>
<view class="cont"> <view class="cont">
<view class="top_box"> <view class="top_box">
<view class="tip">账户余额(元)</view> <view class="tip">账户余额(元)</view>
<view class="txt"> <view class="txt">
{{userinfo.balance}} {{userinfo.balance == undefined ? '' : userinfo.balance}}
</view> </view>
<view class="tip">累计提现：{{userinfo.withDrawlAmount}}</view> <view class="tip">累计提现：{{userinfo.withDrawlAmount == undefined ? '' : userinfo.withDrawlAmount}}</view>
</view> </view>
<view class="tit"> <view class="tit">
<view class="" style="display: flex;"> <view class="" style="display: flex;">
@ -50,6 +50,18 @@
<span v-if="currentindex==0" style="color: #fff;"> <u-icon style="margin-top: 22rpx;" name="checkbox-mark" color="#fff" size="28"></u-icon> </span> <span v-if="currentindex==0" style="color: #fff;"> <u-icon style="margin-top: 22rpx;" name="checkbox-mark" color="#fff" size="28"></u-icon> </span>
</view> </view>
</view> </view>
<view class="type_box" @click="pay(1,'3')">
<view class="box_left">
<image style="border-radius: 50%;" src="https://api.ccttiot.com/smartmeter/img/static/umHaHtYaD540zBB7NXQ7" mode=""></image>
<view class="text">
银行卡提现
</view>
</view>
<view class="box_right" :class="currentindex==1?'act1':''">
<span v-if="currentindex==1" style="color: #fff;"> <u-icon style="margin-top: 22rpx;" name="checkbox-mark" color="#fff" size="28"></u-icon> </span>
</view>
</view>
<!-- <view class="type_box" @click="pay(1,'2')"> <!-- <view class="type_box" @click="pay(1,'2')">
<view class="box_left"> <view class="box_left">
<image src="https://api.ccttiot.com/smartmeter/img/static/uRsKrUoCa4XXCKyIMTwb" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uRsKrUoCa4XXCKyIMTwb" mode=""></image>

37
pages.json
View File

@ -88,6 +88,16 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "skzh",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3996FD",
"navigationBarTextStyle": "#FFFFFF",
"navigationStyle": "custom"
}
},
{ {
"path": "shouzhi", "path": "shouzhi",
"style": { "style": {
@ -97,6 +107,33 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "mapditu/bdcard",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "mapditu/bdAlipay",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "mapditu/orderxq",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#4473f6",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{ {
"path": "order_detail", "path": "order_detail",

229
pages/index/index.vue
View File

@ -83,16 +83,15 @@
<swiper class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange" <swiper class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange"
@touchstart="touchStart" @touchend="touchEnd"> @touchstart="touchStart" @touchend="touchEnd">
<swiper-item v-for="(item,index) in groupLists" :key="index"> <swiper-item v-for="(items,index) in groupLists" :key="index">
<view class="" v-if="shujuflag" <view class="" v-if="items.wateringList.length == 0"
style="width: 100%;height: 200rpx;margin: auto;margin-top: 230rpx;text-align: center;"> style="width: 100%;height: 200rpx;margin: auto;margin-top: 230rpx;text-align: center;">
<image style="width: 200rpx;height: 200rpx;" <image style="width: 200rpx;height: 200rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image> src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">该店铺暂无设备...</view> <view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">该店铺暂无设备...</view>
</view> </view>
<view class="swiper_item"> <view class="swiper_item">
<!-- <view class="" ref="targetBox" id="targetBox"></view> wateringList --> <view class="card_box" v-for="(item,index) in items.wateringList" :key="index">
<view class="card_box" v-for="(item,index) in wateringList" :key="index">
<view class="card"> <view class="card">
<view class="card_left"> <view class="card_left">
<view class="card_left_tit" @click="todetail(item.deviceId)"> <view class="card_left_tit" @click="todetail(item.deviceId)">
@ -211,7 +210,7 @@
storeId: '', storeId: '',
pagenum: 1, pagenum: 1,
wateringList: [], wateringList: [],
pagesize: 10, pagesize: 20,
isLoading: false, isLoading: false,
noMoreData: false, noMoreData: false,
total: 0, total: 0,
@ -302,11 +301,16 @@
// console.log("右滑") // console.log("右滑")
} }
} else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) { } else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
if (deltaY < 0) { if (deltaY < 100) {
// console.log("上滑") // console.log("上滑")
let sum = this.total / this.pagesize
// console.log(this.wateringList.length,this.total);
if (this.wateringList.length < this.total) {
this.getlist()
}
} else { } else {
console.log(deltaY) console.log(deltaY)
if(deltaY > 300){ if (deltaY > 250) {
this.shuaxin = true this.shuaxin = true
this.pagenum = 1 this.pagenum = 1
setTimeout(() => { setTimeout(() => {
@ -357,7 +361,7 @@
if (res.code == 200) { if (res.code == 200) {
that.$u.get( that.$u.get(
`/app/device/${id}/bySn` `/app/device/${id}/bySn`
).then((res) => { ).then((res) => {
if (res.code == if (res.code ==
200) { 200) {
uni.navigateTo({ uni.navigateTo({
@ -430,9 +434,9 @@
storeId: e[0].value storeId: e[0].value
} }
this.putdevice(data) this.putdevice(data)
setTimeout(() => { // setTimeout(() => {
this.getlist() // this.getlist()
}, 1000) // }, 1000)
}, },
putdevice(data) { putdevice(data) {
this.$u.put('/app/device', data).then((res) => { this.$u.put('/app/device', data).then((res) => {
@ -440,7 +444,7 @@
this.getlist() this.getlist()
uni.showToast({ uni.showToast({
title: '修改成功', title: '修改成功',
icon: 'none', icon: 'success',
duration: 2000 duration: 2000
}); });
@ -530,7 +534,7 @@
this.groupList = res.data.filter(item => { this.groupList = res.data.filter(item => {
return item.name === '全部' return item.name === '全部'
}) })
this.titlist = this.groupList[0].name // console.log(this.groupLists);
this.storeId = this.groupList[0].storeId this.storeId = this.groupList[0].storeId
this.getlist() this.getlist()
} }
@ -538,16 +542,13 @@
}, },
getlist() { getlist() {
this.shujuflag = false this.shujuflag = false
if (this.storeId == null) { // if (this.storeId == null) {
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.shuaxin = false this.shuaxin = false
this.total = res.total this.total = res.total
// this.wateringList = []
if (res.rows.length > 0) { if (res.rows.length > 0) {
// 有数据，追加到列表 // 有数据，追加到列表
// this.wateringList = this.wateringList.concat(res.rows)
// this.pagenum++
this.shujuflag = false this.shujuflag = false
uni.hideLoading() uni.hideLoading()
} else { } else {
@ -555,63 +556,129 @@
this.shujuflag = true this.shujuflag = true
uni.hideLoading() uni.hideLoading()
} }
if (this.pagesum > 1) { if (this.pagenum > 1) {
this.pagenum++
this.wateringList = this.wateringList.concat(res.rows) this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false this.shujuflag = false
console.log(this.wateringList);
this.groupLists.forEach(groupItem => {
groupItem.wateringList = []
})
this.wateringList.forEach(wateringItem => {
this.groupLists[0].wateringList.push(wateringItem);
})
this.wateringList.forEach(wateringItem => {
this.groupLists.forEach(groupItem => {
if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId === wateringItem.storeId) {
if (!groupItem.wateringList.some(item => item.storeId === wateringItem.storeId)) {
groupItem.wateringList.push(wateringItem);
}
}
})
})
// this.wateringList.forEach(wateringItem => {
// this.groupLists.forEach(groupItem => {
// if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId === wateringItem.storeId) {
// groupItem.wateringList.push(wateringItem)
// }
// })
// })
} else { } else {
this.wateringList = res.rows this.pagenum++
} this.wateringList = res.rows
this.pagenum++ // console.log(this.wateringList,'000');
this.groupLists.forEach(groupItem => {
groupItem.wateringList = []
})
this.wateringList.forEach(wateringItem => {
this.groupLists[0].wateringList.push(wateringItem);
})
this.wateringList.forEach(wateringItem => {
this.groupLists.forEach(groupItem => {
if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId === wateringItem.storeId) {
groupItem.wateringList.push(wateringItem)
}
})
})
// console.log(this.groupLists)
}
this.isLoading = false; this.isLoading = false;
} else { } else {
this.shuaxin = false this.shuaxin = false
} }
}) })
} else { // } else {
this.$u.get( // this.$u.get(
`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`) // `/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`)
.then((res) => { // .then((res) => {
if (res.code == 200) { // if (res.code == 200) {
this.shuaxin = false // this.shuaxin = false
this.total = res.total // this.total = res.total
// this.wateringList = [] // if (res.rows.length > 0) {
if (res.rows.length > 0) { // // 有数据，追加到列表
// 有数据，追加到列表 // this.shujuflag = false
// this.wateringList = this.wateringList.concat(res.rows) // uni.hideLoading()
// this.pagenum++ // } else {
this.shujuflag = false // // 没有更多数据
uni.hideLoading() // this.shujuflag = true
} else { // uni.hideLoading()
// 没有更多数据 // }
this.shujuflag = true // if (this.pagenum > 1) {
uni.hideLoading() // this.wateringList = this.wateringList.concat(res.rows)
} // this.shujuflag = false
if (this.pagesum > 1) {
this.wateringList = this.wateringList.concat(res.rows) // this.groupLists.forEach(groupItem => {
this.shujuflag = false // groupItem.wateringList = []
} else { // })
this.wateringList = res.rows // this.wateringList.forEach(wateringItem => {
} // this.groupLists[0].wateringList.push(wateringItem);
this.pagenum++ // })
this.isLoading = false; // this.wateringList.forEach(wateringItem => {
} else { // this.groupLists.forEach(groupItem => {
this.shuaxin = false // if (groupItem.storeId === wateringItem.storeId) {
} // groupItem.wateringList.push(wateringItem)
}) // }
} // })
}, // })
onReachBottom() {
let sum = this.total / this.pagesize // } else {
if (this.pagenum - 1 < sum) { // this.wateringList = res.rows
this.getlist(); // 上拉加载更多 // this.groupLists.forEach(groupItem => {
} else { // groupItem.wateringList = []
// uni.showToast({ // })
// title: '没有更多设备了', // this.wateringList.forEach(wateringItem => {
// icon: 'none', // this.groupLists[0].wateringList.push(wateringItem);
// duration: 1000 // })
// }); // this.wateringList.forEach(wateringItem => {
} // this.groupLists.forEach(groupItem => {
// if (groupItem.storeId === wateringItem.storeId) {
// groupItem.wateringList.push(wateringItem)
// }
// })
// })
// }
// this.pagenum++
// this.isLoading = false;
// } else {
// this.shuaxin = false
// }
// })
// }
}, },
// onReachBottom() {
// console.log(11);
// let sum = this.total / this.pagesize
// if (this.pagenum - 1 < sum) {
// this.getlist(); // 上拉加载更多
// } else {
// // uni.showToast({
// // title: '没有更多设备了',
// // icon: 'none',
// // duration: 1000
// // });
// }
// },
changeGp(item, index) { changeGp(item, index) {
// console.log(item); // console.log(item);
this.pagenum = 1 this.pagenum = 1
@ -622,7 +689,6 @@
if (item.storeId == null) { if (item.storeId == null) {
this.pagenum = 1 this.pagenum = 1
// this.wateringList = [] // this.wateringList = []
this.titlist = item.name
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => { this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -637,7 +703,7 @@
this.shujuflag = true this.shujuflag = true
uni.hideLoading() uni.hideLoading()
} }
if (this.pagesum > 1) { if (this.pagenum > 1) {
this.wateringList = this.wateringList.concat(res.rows) this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false this.shujuflag = false
} else { } else {
@ -650,10 +716,9 @@
} else { } else {
this.pagenum = 1 this.pagenum = 1
// this.wateringList = [] // this.wateringList = []
this.titlist = item.name
this.$u.get( this.$u.get(
`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}` `/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`
).then((res) => { ).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
// if(this.pagenum > 1){ // if(this.pagenum > 1){
@ -672,7 +737,7 @@
this.shujuflag = true this.shujuflag = true
uni.hideLoading() uni.hideLoading()
} }
if (this.pagesum > 1) { if (this.pagenum > 1) {
this.wateringList = this.wateringList.concat(res.rows) this.wateringList = this.wateringList.concat(res.rows)
this.shujuflag = false this.shujuflag = false
} else { } else {
@ -1413,16 +1478,23 @@
color: #FFFFFF; color: #FFFFFF;
} }
} }
@keyframes fadeIn {
from { opacity: 0; } @keyframes fadeIn {
to { opacity: 1; } from {
} opacity: 0;
}
to {
opacity: 1;
}
}
.fd { .fd {
margin-top: 20rpx; margin-top: 20rpx;
padding: 0 40rpx; padding: 0 40rpx;
padding-bottom: 200rpx; padding-bottom: 200rpx;
height: 100%; height: 100%;
.fz { .fz {
margin: 0 -40rpx; margin: 0 -40rpx;
position: fixed; position: fixed;
@ -1433,9 +1505,10 @@
border-radius: 30rpx 30rpx 0 0; border-radius: 30rpx 30rpx 0 0;
z-index: 10071; z-index: 10071;
opacity: 0; opacity: 0;
animation-name: fadeIn; animation-name: fadeIn;
animation-duration: 1s; animation-duration: 1s;
animation-fill-mode: forwards; animation-fill-mode: forwards;
.fz_top { .fz_top {
margin: 18rpx 0 auto; margin: 18rpx 0 auto;
display: flex; display: flex;

17
pages/my.vue
View File

@ -1,8 +1,7 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar :is-back="false" title="商户中心" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' <u-navbar :is-back="false" title="商户中心" :border-bottom="false" back-icon-color="#fff" :background="bgc" title-color='#fff' title-size='36'
height='36' height='36' id="navbar">
id="navbar">
</u-navbar> </u-navbar>
<view class="fdpage"> <view class="fdpage">
@ -38,14 +37,14 @@
钱包余额 钱包余额
</view> </view>
</view> </view>
<!-- <view class="cont" @click="topage(6)"> <view class="cont" @click="topage(6)">
<view class="top" > <view class="top" >
<image src="https://api.ccttiot.com/smartmeter/img/static/u9VRzUjhkZHj4ExkXC10" mode="" style="width: 61.83rpx;height: 46.35rpx;"></image> <image src="https://api.ccttiot.com/smartmeter/img/static/u9VRzUjhkZHj4ExkXC10" mode="" style="width: 61.83rpx;height: 46.35rpx;"></image>
</view> </view>
<view class="bot"> <view class="bot">
收款账户 收款账户
</view> </view>
</view> --> </view>
<view class="cont" @click="topage(7)"> <view class="cont" @click="topage(7)">
<view class="top" > <view class="top" >
<image src="https://api.ccttiot.com/smartmeter/img/static/utQedWhwW39J2qbeWvn8" mode="" style="width: 45rpx;height: 55rpx;"></image> <image src="https://api.ccttiot.com/smartmeter/img/static/utQedWhwW39J2qbeWvn8" mode="" style="width: 45rpx;height: 55rpx;"></image>
@ -163,12 +162,12 @@
url:'/page_fenbao/statulist/myshop/index' url:'/page_fenbao/statulist/myshop/index'
}) })
}else if(num==1){ }else if(num==1){
uni.navigateTo({
url:'/page_fenbao/statulist/myorder/index'
})
// uni.navigateTo({ // uni.navigateTo({
// url:'/page_user/switchs' // url:'/page_fenbao/statulist/myorder/index'
// }) // })
uni.navigateTo({
url:'/page_user/switchs'
})
}else if(num==2){ }else if(num==2){
uni.navigateTo({ uni.navigateTo({
url:'/page_fenbao/statulist/question/index' url:'/page_fenbao/statulist/question/index'