From ae06c7d10e92e0cc9252ba9a6ff540f24708afe3 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 31 May 2024 18:01:02 +0800
Subject: [PATCH] aaa
---
page_user/daili/cjdaili.vue | 5 +-
page_user/daili/index.vue | 10 ++--
page_user/listshu/index.vue | 18 ++++++-
page_user/shuju/index.vue | 9 ++--
.../devicemanagement/chargepallist/index.vue | 2 +-
.../chargepallist/listdetail/index.vue | 37 ++++++++++++--
.../devicemanagement/failure/index.vue | 15 +++++-
.../devicemanagement/xiajilist/index.vue | 2 +-
.../shopguanli/discipleshop/index.vue | 44 +++++++++++------
pages/agentpages/shopguanli/myshop/index.vue | 48 +++++++++++++------
pages/myorder/index.vue | 2 +-
pages/nearbystores/index.vue | 14 +++++-
12 files changed, 157 insertions(+), 49 deletions(-)
diff --git a/page_user/daili/cjdaili.vue b/page_user/daili/cjdaili.vue
index 1a930e8..6c44584 100644
--- a/page_user/daili/cjdaili.vue
+++ b/page_user/daili/cjdaili.vue
@@ -18,8 +18,9 @@
手机号码
-
- 省市区
+
+ 省市区
+
diff --git a/page_user/daili/index.vue b/page_user/daili/index.vue
index 43e6171..5b7fb47 100644
--- a/page_user/daili/index.vue
+++ b/page_user/daili/index.vue
@@ -21,7 +21,7 @@
店铺>
-
+
-
+
@@ -120,10 +120,10 @@
.shuju {
display: flex;
justify-content: space-between;
- padding: 40rpx 60rpx;
+ padding: 40rpx 135rpx;
box-sizing: border-box;
width: 680rpx;
- height: 172rpx;
+ height: 200rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/page_user/listshu/index.vue b/page_user/listshu/index.vue
index 2e45917..0a4be01 100644
--- a/page_user/listshu/index.vue
+++ b/page_user/listshu/index.vue
@@ -43,6 +43,12 @@
{{item.createTime}}
+
+
+ 暂无更多代理人员...
+
@@ -60,7 +66,8 @@
isLoading: false, // 是否正在加载数据
noMoreData: false, // 是否没有更多数据
total: 0,
- keyword:''
+ keyword:'',
+ showflag: false
}
},
onShow() {
@@ -79,6 +86,11 @@
this.$u.get("/agent/agent/list?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword).then(res => {
if (res.code == 200) {
this.total = res.total
+ if (this.total > 0) {
+ this.showflag = false
+ } else {
+ this.showflag = true
+ }
if (res.rows.length > 0) {
// 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows)
@@ -130,6 +142,7 @@
background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
padding-bottom: 200rpx;
+ margin-top: 170rpx;
.list{
width: 680rpx;
height: 336rpx;
@@ -159,7 +172,8 @@
background: #FFFFFF;
padding: 32rpx 36rpx;
box-sizing: border-box;
-
+ position: fixed;
+ top: 200rpx;
/deep/ .u-content {
border: 1px solid #ccc;
border-radius: 50rpx 0 0 50rpx !important;
diff --git a/page_user/shuju/index.vue b/page_user/shuju/index.vue
index ae9af94..c9a972c 100644
--- a/page_user/shuju/index.vue
+++ b/page_user/shuju/index.vue
@@ -79,19 +79,22 @@
box-sizing: border-box;
margin: auto;
.lisy_val{
- width: 94rpx;
- text-align: center;
- margin-right: 60rpx;
+ width: 40%;
+ // text-align: center;
+ // margin-right: 60rpx;
image{
width: 48rpx;
height: 48rpx;
display: block;
margin-left: 24rpx;
margin-bottom: 10rpx;
+ vertical-align: middle;
}
text{
font-size: 24rpx;
color: #3D3D3D;
+ width: 120rpx;
+ display: inline-block;
}
}
}
diff --git a/pages/agentpages/devicemanagement/chargepallist/index.vue b/pages/agentpages/devicemanagement/chargepallist/index.vue
index a9b552a..b25d973 100644
--- a/pages/agentpages/devicemanagement/chargepallist/index.vue
+++ b/pages/agentpages/devicemanagement/chargepallist/index.vue
@@ -326,7 +326,7 @@
}
.cdblist{
width: 680rpx;
- height: 450rpx;
+ height:100%;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue b/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
index 65219c7..c7bfc07 100644
--- a/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
+++ b/pages/agentpages/devicemanagement/chargepallist/listdetail/index.vue
@@ -30,7 +30,7 @@
@click="btntcsy">弹出所有卡位({{xqobj.modelName}})
-
+
{{item.sn == null ? '空闲' : item.sn + '/'}}{{item.currentPower == null ? '' : item.currentPower + '%'}}
@@ -62,7 +62,7 @@
最近登录时间： {{xqobj.lastLoginTime}}
- 最近断线时长： --
+ 最近断线时长： {{duration.days + '天' + duration.hours + '时' + duration.minutes + '分' + duration.seconds + '秒'}}
@@ -83,6 +83,7 @@
bgc: {
background: '#25CE88'
},
+ duration:''
}
},
onLoad(option) {
@@ -164,7 +165,6 @@
})
} else {
this.list = this.xqobj.slotNum
- console.log(this.list)
}
let dateTime = new Date(this.xqobj.createTime);
@@ -175,9 +175,40 @@
let now = new Date().getTime();
let differenceInMilliseconds = now - dateTime.getTime();
this.differenceInDays = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24))
+
+ // 计算断线时长
+ let lastLoginTimeStr = this.xqobj.lastLoginTime
+ let lastOfflineTimeStr = this.xqobj.lastOfflineTime
+ let nows = new Date()
+ let lastLoginTime = this.parseDateString(lastLoginTimeStr)
+ let lastOfflineTime = this.parseDateString(lastOfflineTimeStr)
+ if (lastLoginTime && lastLoginTime > lastOfflineTime) {
+ let diff = lastLoginTime - lastOfflineTime
+ this.duration = this.formatDuration(diff)
+ // console.log(` ${duration.days} '天', ${duration.hours} '小时', ${duration.minutes} '分钟'`)
+ } else {
+ let diff = nows - lastOfflineTime
+ this.duration = this.formatDuration(diff)
+ // console.log(` ${duration.days} 天, ${duration.hours} 小时, ${duration.minutes} 分钟`)
+ }
+
}
})
},
+ parseDateString(dateStr) {
+ return dateStr ? new Date(dateStr) : null
+ },
+ formatDuration(durationMs) {
+ let duration = new Date(durationMs)
+ let days = Math.floor(durationMs / (1000 * 60 * 60 * 24))
+ durationMs -= days * (1000 * 60 * 60 * 24)
+ let hours = Math.floor((durationMs % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+ durationMs -= hours * (1000 * 60 * 60)
+ let minutes = Math.floor((durationMs % (1000 * 60 * 60)) / (1000 * 60))
+ let seconds = Math.floor((durationMs % (1000 * 60)) / 1000)
+ return { days, hours, minutes,seconds}
+ },
+
copybtn(text) {
uni.setClipboardData({
data: text,
diff --git a/pages/agentpages/devicemanagement/failure/index.vue b/pages/agentpages/devicemanagement/failure/index.vue
index e28a3f3..97d484b 100644
--- a/pages/agentpages/devicemanagement/failure/index.vue
+++ b/pages/agentpages/devicemanagement/failure/index.vue
@@ -29,6 +29,13 @@
+
+
+ 暂无更多记录...
+
+
@@ -59,7 +66,8 @@
type:'',
bgc:{
background:'#25CE88'
- }
+ },
+ showflag: false
}
},
onLoad() {
@@ -98,6 +106,11 @@
this.$u.get('/agent/abnormal/list?pageNum=' + this.pagenum + '&pageSize=' + this.pagesize +'&type=' +this.type + '&keyword=' + this.keyword).then(res => {
if (res.code == 200) {
this.total = res.total
+ if (this.total > 0) {
+ this.showflag = false
+ } else {
+ this.showflag = true
+ }
if (res.rows.length > 0) {
// 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows)
diff --git a/pages/agentpages/devicemanagement/xiajilist/index.vue b/pages/agentpages/devicemanagement/xiajilist/index.vue
index b5ec4d9..fccf044 100644
--- a/pages/agentpages/devicemanagement/xiajilist/index.vue
+++ b/pages/agentpages/devicemanagement/xiajilist/index.vue
@@ -308,7 +308,7 @@
.cdblist {
width: 680rpx;
- height: 450rpx;
+ height: 100%;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto;
diff --git a/pages/agentpages/shopguanli/discipleshop/index.vue b/pages/agentpages/shopguanli/discipleshop/index.vue
index 5f904ac..7da5b02 100644
--- a/pages/agentpages/shopguanli/discipleshop/index.vue
+++ b/pages/agentpages/shopguanli/discipleshop/index.vue
@@ -34,11 +34,11 @@
日收月收上月收在线离线
- {{item.todayIncome}}￥
- {{item.monthIncome}}￥
- {{item.lastMonthIncome}}￥
- {{item.onlineCount}}台
- {{item.offlineCount}}台
+ {{item.todayIncome == null ? 0 :item.todayIncome}}￥
+ {{item.monthIncome == null ? 0 :item.monthIncome}}￥
+ {{item.lastMonthIncome == null ? 0 :item.lastMonthIncome}}￥
+ {{item.onlineCount == null ? 0 :item.onlineCount}}台
+ {{item.offlineCount == null ? 0 :item.offlineCount}}台
@@ -56,7 +56,13 @@
已运营{{item.daysDifference + 1}}天 {{item.createTime}}
-
+
+
+
+ 暂无更多店铺...
+
@@ -74,7 +80,11 @@
noMoreData: false, // 是否没有更多数据
total: 0,
agentId:'',
- keyword:''
+ keyword:'',
+ bgc: {
+ background: '#25CE88'
+ },
+ showflag: false
}
},
onLoad() {
@@ -91,6 +101,11 @@
this.$u.get("/agent/store/listChildren?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize +'&excludeAgents=' +this.agentId + '&keyword=' + this.keyword).then(res => {
if (res.code == 200) {
this.total = res.total
+ if (this.total > 0) {
+ this.showflag = false
+ } else {
+ this.showflag = true
+ }
if (res.rows.length > 0) {
// 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows)
@@ -156,24 +171,22 @@
}
page {
- background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+ // background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
}
.page {
width: 750rpx;
- position: fixed;
- top: 0;
- left: 0;
+
.box{
width: 750rpx;
- height: 1440rpx;
+ height: 100%;
background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
.list{
overflow-y: scroll;
- height: 100vh;
+ height: 100%;
padding-bottom: 400rpx;
- margin-top: 26rpx;
+ margin-top: 170rpx;
.listitem{
margin-bottom: 28rpx !important;
padding: 12rpx 38rpx;
@@ -280,6 +293,9 @@
background: #FFFFFF;
padding: 32rpx 36rpx;
box-sizing: border-box;
+ position: fixed;
+ top: 200rpx;
+ z-index: 99;
/deep/ .u-content{
border: 1px solid #ccc;
border-radius: 50rpx 0 0 50rpx !important;
diff --git a/pages/agentpages/shopguanli/myshop/index.vue b/pages/agentpages/shopguanli/myshop/index.vue
index 1e845ae..ae02f3c 100644
--- a/pages/agentpages/shopguanli/myshop/index.vue
+++ b/pages/agentpages/shopguanli/myshop/index.vue
@@ -34,16 +34,16 @@
日收月收上月收在线离线
- {{item.todayIncome}}￥
- {{item.monthIncome}}￥
- {{item.lastMonthIncome}}￥
- {{item.onlineCount}}台
- {{item.offlineCount}}台
+ {{item.todayIncome == null ? 0 :item.todayIncome}}￥
+ {{item.monthIncome == null ? 0 :item.monthIncome}}￥
+ {{item.lastMonthIncome == null ? 0 :item.lastMonthIncome}}￥
+ {{item.onlineCount == null ? 0 :item.onlineCount}}台
+ {{item.offlineCount == null ? 0 :item.offlineCount}}台
- 计费规则：{{item.feePrice == null ? 0 : item.feePrice}}元/小时，前{{item.feeFreeTime == null ? 0 : item.feeFreeTime}}分钟免费，封顶{{item.feeMaxPrice}}元
+ 计费规则：{{item.feePrice == null ? 0 : item.feePrice}}元/小时，前{{item.feeFreeTime == null ? 0 : item.feeFreeTime}}分钟免费，封顶{{item.feeMaxPrice == null ? '0' : item.feeMaxPrice}}元
联系电话：{{item.contactMobile}}
@@ -56,6 +56,13 @@
已运营{{item.daysDifference + 1}}天 {{item.createTime}}
+
+
+
+ 暂无更多店铺...
+
@@ -73,7 +80,11 @@
noMoreData: false, // 是否没有更多数据
total: 0,
agentId:'',
- keyword:''
+ keyword:'',
+ bgc: {
+ background: '#25CE88'
+ },
+ showflag: false
}
},
onLoad() {
@@ -89,6 +100,11 @@
this.$u.get("/agent/store/listChildren?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize +'&agentId=' +this.agentId + '&keyword=' + this.keyword).then(res => {
if (res.code == 200) {
this.total = res.total
+ if (this.total > 0) {
+ this.showflag = false
+ } else {
+ this.showflag = true
+ }
if (res.rows.length > 0) {
// 有数据，追加到列表
this.wateringList = this.wateringList.concat(res.rows)
@@ -152,26 +168,26 @@
padding-bottom: 40rpx;
}
page {
- background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
+ // background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%);
}
.page {
width: 750rpx;
- position: fixed;
- top: 0;
- left: 0;
+ // position: fixed;
+ // top: 0;
+ // left: 0;
.box {
width: 750rpx;
- height: 1440rpx;
+ height: 100%;
background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
.list {
overflow-y: scroll;
- height: 100vh;
+ height: 100%;
padding-bottom: 400rpx;
- margin-top: 26rpx;
+ margin-top: 170rpx;
.listitem {
margin-bottom: 28rpx !important;
@@ -297,7 +313,9 @@
background: #FFFFFF;
padding: 32rpx 36rpx;
box-sizing: border-box;
-
+ position: fixed;
+ top: 200rpx;
+ z-index: 99;
/deep/ .u-content {
border: 1px solid #ccc;
border-radius: 50rpx 0 0 50rpx !important;
diff --git a/pages/myorder/index.vue b/pages/myorder/index.vue
index d47399a..547496f 100644
--- a/pages/myorder/index.vue
+++ b/pages/myorder/index.vue
@@ -48,7 +48,7 @@
v-if="showflag">
- 暂无更多记录...
+ 暂无更多订单记录...
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index b69fc22..54a3a2d 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -31,6 +31,12 @@
{{String(item.distance).split('.')[0]}}m
+
+
+ 附近暂无店铺...
+
@@ -54,6 +60,7 @@
dingobj: '',
mapContext: null,
mapScaleInterval: null,
+ showflag: false
}
},
onLoad() {
@@ -166,7 +173,12 @@
this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(res => {
if (res.code == 200) {
this.gxlist = res.data;
- this.listmap = res.data
+ if (this.gxlist.length > 0) {
+ this.showflag = false
+ } else {
+ this.showflag = true
+ }
+ this.listmap = res.data
this.gxlist.forEach(item => {
// 计算距离
const distance = this.getDistance(this.latitude, this.longitude, item.lat, item.lng);