diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue
index 4c72410..60ea619 100644
--- a/page_fenbao/storedlist/trueorder.vue
+++ b/page_fenbao/storedlist/trueorder.vue
@@ -499,7 +499,10 @@
{{wenbentxt}}
-
+
+ 骑行前请检查车轿刹车是否灵敏，安全骑行
+
+
diff --git a/page_fenbao/tousu/shlist.vue b/page_fenbao/tousu/shlist.vue
index b1ecda9..9b4b739 100644
--- a/page_fenbao/tousu/shlist.vue
+++ b/page_fenbao/tousu/shlist.vue
@@ -108,10 +108,12 @@
list: [],
loading: false,
finished: false,
- statusParam: ''
+ statusParam: '',
+ areaId:''
}
},
- onLoad() {
+ onLoad(option) {
+ this.areaId = option.areaId
this.getlist()
},
computed: {
@@ -206,7 +208,7 @@
getlist() {
if (this.loading) return;
this.loading = true;
- const base = `/bst/complaint/list?pageNum=${this.pageNum}&pageSize=${this.pageSize}&orderByColumn=createTime&isAsc=desc`;
+ const base = `/bst/complaint/list?pageNum=${this.pageNum}&pageSize=${this.pageSize}&orderByColumn=createTime&isAsc=desc&areaId=${this.areaId}`;
const url = this.statusParam ? `${base}&statusList=${encodeURIComponent(this.statusParam)}` : base;
this.$u.get(url).then((res) => {
if (!res) return;
diff --git a/page_shanghu/admin_index.vue b/page_shanghu/admin_index.vue
index 57ca0e5..634425c 100644
--- a/page_shanghu/admin_index.vue
+++ b/page_shanghu/admin_index.vue
@@ -162,7 +162,6 @@ let pollIntervalId = null; // 轮询interval
let rangeDebounceId = null; // 滑动筛选debounce
var appMap = null;
export default {
-
data() {
return {
bgc: {
@@ -199,8 +198,7 @@ let rangeDebounceId = null; // 滑动筛选debounce
showdevList: false,
circles: [], // 用于存储圆形区域的数据
qbobj:{},
- sn:''
-
+ sn:'',
}
},
components: {
@@ -305,8 +303,6 @@ let rangeDebounceId = null; // 滑动筛选debounce
return '禁用中'
}
},
-
-
onMapRegionChange(event) {
if (event.detail.type == 'end') {
this.getCenterLocation()
@@ -333,8 +329,8 @@ let rangeDebounceId = null; // 滑动筛选debounce
fail: (err) => {
console.error('获取中心点定位失败：', err)
}
- })
- },
+ })
+ },
getCenter: function() {
var _that = this
appMap.getCurrentCenter(
@@ -455,7 +451,7 @@ let rangeDebounceId = null; // 滑动筛选debounce
this.sn = getQueryParam(decodedValue, 's')
console.log(this.sn,'....')
if (this.sn != '') {
- this.$u.get('/bst/device?sn=' + this.sn).then((res) => {
+ this.$u.get('/bst/device?sn=' + this.sn + '&supportLocation=true').then((res) => {
if (res.code === 200) {
console.log(res, 'rererer')
if (res.data.areaId == this.areaId) {
@@ -836,7 +832,7 @@ let rangeDebounceId = null; // 滑动筛选debounce
// return
// }
if (this.statusidx != 7 && this.statusidx != 20 && this.statusidx != 10) {
- this.$u.get(`/bst/device/all?areaId=${this.areaId}&status=${this.statusidx}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true`).then((res) => {
+ this.$u.get(`/bst/device/all?areaId=${this.areaId}&status=${this.statusidx}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true&supportLocation=true`).then((res) => {
if (res.code == 200) {
this.showmap = true
this.allDeviceData = res.data // 保存所有数据
@@ -865,7 +861,7 @@ let rangeDebounceId = null; // 滑动筛选debounce
}
})
} else if (this.statusidx == 7) {
- this.$u.get(`/bst/device/all?areaId=${this.areaId}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true`).then((res) => {
+ this.$u.get(`/bst/device/all?areaId=${this.areaId}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true&supportLocation=true`).then((res) => {
if (res.code == 200) {
this.showmap = true
this.allDeviceData = res.data // 保存所有数据
@@ -894,7 +890,7 @@ let rangeDebounceId = null; // 滑动筛选debounce
}
})
} else if (this.statusidx == 20 || this.statusidx == 10) {
- this.$u.get(`/bst/device/all?areaId=${this.areaId}&onlineStatus=${this.statusidx == 20 ? 0 : 1}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true`).then((res) => {
+ this.$u.get(`/bst/device/all?areaId=${this.areaId}&onlineStatus=${this.statusidx == 20 ? 0 : 1}&powerRange=${this.rangeValue[0] + ',' + this.rangeValue[1]}&refresh=true&supportLocation=true`).then((res) => {
if (res.code == 200) {
this.showmap = true
this.allDeviceData = res.data // 保存所有数据
diff --git a/page_shanghu/gongzuotai/ParkIngList.vue b/page_shanghu/gongzuotai/ParkIngList.vue
index 933348f..e082baa 100644
--- a/page_shanghu/gongzuotai/ParkIngList.vue
+++ b/page_shanghu/gongzuotai/ParkIngList.vue
@@ -173,15 +173,15 @@ export default {
content: '确定要删除该记录吗？',
success: (res) => {
if (res.confirm) {
- this.deleteParking(item.parkingId);
+ this.deleteParking(item.id);
}
}
});
},
// 删除停车区域
- deleteParking(parkingId) {
- this.$u.delete(`/appVerify/parking/${parkingId}`).then(res => {
+ deleteParking(id) {
+ this.$u.delete(`/bst/areaSub/${id}`).then(res => {
if (res.code === 200) {
uni.showToast({
title: '删除成功',
@@ -239,6 +239,8 @@ page {
.content {
padding: 20rpx;
background-color: #f5f5f5;
+ height: 68vh;
+ overflow: scroll;
}
.list {
diff --git a/page_shanghu/gongzuotai/woke_deviceMgmt.vue b/page_shanghu/gongzuotai/woke_deviceMgmt.vue
index 245ffd8..3f643c1 100644
--- a/page_shanghu/gongzuotai/woke_deviceMgmt.vue
+++ b/page_shanghu/gongzuotai/woke_deviceMgmt.vue
@@ -303,7 +303,8 @@ export default {
areaId: this.areaId,
orderByColumn: this.typeSort,
refresh: true,
- Keyword: this.searchKeyword
+ Keyword: this.searchKeyword,
+ supportLocation:true
}
this.selectedItems = []
@@ -537,7 +538,8 @@ export default {
areaId: this.areaId,
// orderByColumn: this.typeSort,
// refresh:true,
- Keyword:this.searchKeyword
+ Keyword:this.searchKeyword,
+ supportLocation:true
}
this.selectedItems = []
this.$u.get(`/bst/device/all`, data).then((res) => {
diff --git a/page_shanghu/guanli/admin_worke.vue b/page_shanghu/guanli/admin_worke.vue
index 705a515..09b6a7a 100644
--- a/page_shanghu/guanli/admin_worke.vue
+++ b/page_shanghu/guanli/admin_worke.vue
@@ -85,11 +85,12 @@
会员中心
-
+
用户投诉
+ {{weinum}}
@@ -230,7 +231,8 @@ export default {
announcements: {},
yyqid:'',
userId:'',
- fuwuewm:false
+ fuwuewm:false,
+ weinum:0
}
},
onLoad(option) {
@@ -253,6 +255,7 @@ export default {
console.log(this.areaId);
// this.getArea()
this.getinfo()
+ this.getweicl()
// this.getareaList()
}
@@ -267,6 +270,15 @@ export default {
}
},
methods: {
+ // 查询商户未处理订单
+ getweicl(){
+ this.$u.get(`/dashboard/complaint/statusMap?areaId=${this.areaId}`).then(res => {
+ if (res.code== 200) {
+ const key = "1";
+ this.weinum = res.data[key]
+ }
+ })
+ },
// 点击绑定服务号
btnfuwuewm(){
let that = this
@@ -291,7 +303,7 @@ export default {
// 点击跳转到投诉列表
btnts(){
uni.navigateTo({
- url:'/page_fenbao/tousu/shlist'
+ url:'/page_fenbao/tousu/shlist?areaId='+this.areaId
})
},
// 点击跳转到会员列表
diff --git a/page_shanghu/guanli/bike_track.vue b/page_shanghu/guanli/bike_track.vue
index 8514701..9032776 100644
--- a/page_shanghu/guanli/bike_track.vue
+++ b/page_shanghu/guanli/bike_track.vue
@@ -206,7 +206,7 @@ export default {
},
methods: {
getDeviceInfo() {
- this.$u.get(`/bst/device?id=${this.id}`).then((res) => {
+ this.$u.get(`/bst/device?id=${this.id}&supportLocation=true`).then((res) => {
if (res.code === 200) {
this.vehicleNum = res.data.vehicleNum
this.deviceNumber = res.data.sn
diff --git a/page_shanghu/guanli/device_detail.vue b/page_shanghu/guanli/device_detail.vue
index 55c2b19..f1b2440 100644
--- a/page_shanghu/guanli/device_detail.vue
+++ b/page_shanghu/guanli/device_detail.vue
@@ -1841,7 +1841,7 @@
},
deviceInfo() {
this.markers = []
- this.$u.get(`/bst/device?id=${this.sn}&refresh=true`).then((res) => {
+ this.$u.get(`/bst/device?id=${this.sn}&refresh=true&supportLocation=true`).then((res) => {
console.log(res, 'rererer')
if (res.code === 200) {
if (res.data.music == 0) {
diff --git a/page_shanghu/guanli/order_detail.vue b/page_shanghu/guanli/order_detail.vue
index 03992fa..985f03b 100644
--- a/page_shanghu/guanli/order_detail.vue
+++ b/page_shanghu/guanli/order_detail.vue
@@ -1635,8 +1635,6 @@
icon: 'none',
duration: 2000
})
- // uni.hideLoading()
- // this.bulebtn(4)
}
})
} else if (num == 9) {
@@ -1883,7 +1881,7 @@
if (this.buleclose == false && this.buleopen == false && this.bulerebort == false &&
this.bulering == false) {
if (this.buletxt == '蓝牙连接中') {
- this.buletxt = '蓝牙连接成功！'
+ this.buletxt = '蓝牙连接成功!'
}
}
if (this.buleclose) {
@@ -2022,7 +2020,7 @@
deviceInfo() {
this.markers = [];
this.polygon = []; // 初始化polygon数组
- this.$u.get(`/bst/device?sn=${this.sn}`).then((res) => {
+ this.$u.get(`/bst/device?sn=${this.sn}&supportLocation=true`).then((res) => {
console.log(res, 'rererer');
if (res.code === 200) {
this.deviceInfos = res.data;
@@ -2229,18 +2227,15 @@
},
convertBoundaryToPolylines(boundaries, num) {
if (!boundaries || !Array.isArray(boundaries)) return [];
-
return boundaries.map(boundary => {
if (!boundary) return null;
try {
const coords = JSON.parse(boundary);
if (!Array.isArray(coords)) return null;
-
const points = coords.map(coord => ({
latitude: coord[1],
longitude: coord[0]
- }));
-
+ }))
let style = {};
if (num === 1) {
style = {
@@ -2270,7 +2265,6 @@
borderColor: "#FFC107"
};
}
-
return {
points: points,
...style
@@ -2293,8 +2287,7 @@
width: 20,
height: 28.95,
iconPath: item.type == 1 ?
- 'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3' : item
- .type == 2 ?
+ 'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3' : item.type == 2 ?
'https://lxnapi.ccttiot.com/bike/img/static/uDNY5Q4zOiZTCBTA2Jdq' :
'https://lxnapi.ccttiot.com/bike/img/static/u53BAQcFIX3vxsCzEZ7t',
callout: {
@@ -2302,8 +2295,7 @@
color: '#ffffff',
fontSize: 14,
borderRadius: 10,
- bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FF473E' :
- '#FFC107',
+ bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FF473E' : '#FFC107',
padding: 6,
display: 'ALWAYS'
},
@@ -2335,7 +2327,6 @@
return null;
}
},
-
convertBoundaryToPolygons(boundaries, num) {
if (!boundaries || !boundaries.length) return [];
const colors = {
@@ -2353,28 +2344,27 @@
}
};
return boundaries.map(boundary => {
- if (!boundary) return null;
+ if (!boundary) return null
try {
- const coords = JSON.parse(boundary);
- if (!Array.isArray(coords)) return null;
+ const coords = JSON.parse(boundary)
+ if (!Array.isArray(coords)) return null
const points = coords.map(coord => ({
latitude: coord[1],
longitude: coord[0]
- }));
-
+ }))
return {
points: points,
fillColor: colors[num].fill,
strokeColor: colors[num].stroke,
strokeWidth: 1,
zIndex: 1
- };
+ }
} catch (error) {
- console.error("Error converting boundary to polygons:", error);
- return null;
+ console.error("Error converting boundary to polygons:", error)
+ return null
}
- }).filter(Boolean);
+ }).filter(Boolean)
},
getParking() {
@@ -2383,32 +2373,29 @@
};
this.$u.get('/bst/areaSub/listByAreaId', data).then((res) => {
if (res.code === 200) {
- const filteredData = res.data.filter(item => item.status != 1);
- const type1Data = [];
- const type2Data = [];
- const type3Data = [];
+ const filteredData = res.data.filter(item => item.status != 1)
+ const type1Data = []
+ const type2Data = []
+ const type3Data = []
filteredData.forEach(row => {
- if (row.type == 1) type1Data.push(row);
- else if (row.type == 2) type2Data.push(row);
- else if (row.type == 3) type3Data.push(row);
- });
-
+ if (row.type == 1) type1Data.push(row)
+ else if (row.type == 2) type2Data.push(row)
+ else if (row.type == 3) type3Data.push(row)
+ })
// 处理 type1 数据
const validBoundaries = type1Data.map(row => row.boundaryStr).filter(boundary =>
- typeof boundary === 'string' && boundary.trim() !== '');
- const polygons = this.convertBoundaryToPolygons(validBoundaries, 1);
+ typeof boundary === 'string' && boundary.trim() !== '')
+ const polygons = this.convertBoundaryToPolygons(validBoundaries, 1)
if (polygons && polygons.length > 0) {
- this.polygon = this.polygon.concat(polygons);
+ this.polygon = this.polygon.concat(polygons)
}
-
// 处理 type2 数据
const validBoundaries1 = type2Data.map(row => row.boundaryStr).filter(boundary =>
- typeof boundary === 'string' && boundary.trim() !== '');
- const polygons1 = this.convertBoundaryToPolygons(validBoundaries1, 2);
+ typeof boundary === 'string' && boundary.trim() !== '')
+ const polygons1 = this.convertBoundaryToPolygons(validBoundaries1, 2)
if (polygons1 && polygons1.length > 0) {
- this.polygon = this.polygon.concat(polygons1);
+ this.polygon = this.polygon.concat(polygons1)
}
-
// 处理 type3 数据
const validBoundaries2 = type3Data.map(row => row.boundaryStr).filter(boundary =>
typeof boundary === 'string' && boundary.trim() !== '');
diff --git a/page_user/huanbike.vue b/page_user/huanbike.vue
index 68436bf..49fe6f5 100644
--- a/page_user/huanbike.vue
+++ b/page_user/huanbike.vue
@@ -259,7 +259,7 @@ export default {
name: this.devicename
})
uni.reLaunch({
- url:'/pages/myorder/returned/index'
+ url:'/pages/index/index'
})
},1000)
}else{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 20cd9b6..98a2011 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,26 +13,11 @@
-
+
-
-
-
-
-
-
+
@@ -161,13 +146,13 @@
{{orderobj.deviceRemainingPower == null ? '--' : orderobj.deviceRemainingPower}}%
{{orderobj.deviceRemainingPower == null ? '--' : orderobj.deviceRemainingPower}}%
-
+
可骑行约{{orderobj.deviceRemainEndurance == null ? '--' : orderobj.deviceRemainEndurance}}km
-
- 故障上报
-
+
+ 联系客服
+
@@ -189,7 +174,7 @@
- {{orderobj.orderDistance == null ? '0.00' : orderobj.orderDistance}} km
+ {{orderobj.orderDistance == null ? '0.0' : (orderobj.orderDistance / 1000).toFixed(1)}} km
骑行距离
@@ -204,6 +189,7 @@
+
{{orderobj.deviceLockStatus == 1 ? '临时锁车' : '开锁'}}
@@ -212,11 +198,16 @@
-
- 换车骑行 〉
-
-
- 车牌：{{orderobj.deviceVehicleNum == null ? '--' : orderobj.deviceVehicleNum}} SN：{{orderobj.deviceSn == null ? '--' : orderobj.deviceSn}}
+
+
+
+ 车牌：{{orderobj.deviceVehicleNum == null ? '--' : orderobj.deviceVehicleNum}} SN：{{orderobj.deviceSn == null ? '--' : orderobj.deviceSn}}
+
+
+ 故障上报
+
@@ -250,8 +241,8 @@
需额外支付{{fajinobj.manageFee > 0 ? fajinobj.manageFee : fajinobj.dispatchFee > 0 ? fajinobj.dispatchFee : ''}}元，查看最近停车点 请规范还车
-
-
+
+
缴纳罚金还车
@@ -266,9 +257,14 @@
- {{wenbentxt}} {{Math.floor(percentage)}}%
+
+ {{wenbentxt}} {{Math.floor(percentage)}}%
-
+
+ {{caozuotext}}
+
+
+
@@ -288,7 +284,8 @@
还是不行查看教程
-
+
+
联系客服
@@ -394,6 +391,7 @@
daohangflag:false,
distance:0,
chexq:{},
+ caozuotext:''
}
},
onLoad() {
@@ -1232,6 +1230,7 @@
},
// 点击结束订单
btnjsdd() {
+ this.caozuotext = '还车前请将车辆停放于运营区和停车区内'
if(this.jieshuflag == true){
this.jieshuflag = false
this.$u.get("/app/order/mineProcessing").then((res) => {
@@ -1653,6 +1652,7 @@
},
// 点击去进行换车
btnghbike() {
+ this.caozuotext = '换车前请将车辆停放于运营区和停车区内'
if(this.jiance == true){
xBlufi.initXBlufi(1)
xBlufi.notifyStartDiscoverBle({
@@ -1676,7 +1676,7 @@
}
})
let that = this
- that.wenbentxt = '车辆连接中...'
+ that.wenbentxt = '车辆锁车中...'
that.wenbentxtflag = true
let query = {
orderId: that.orderobj.orderId,
@@ -1690,7 +1690,7 @@
that.wenbentxt = ''
that.wenbentxtflag = false
uni.showToast({
- title: '临时锁车成功',
+ title: '锁车成功',
icon: 'success',
duration: 2000
})
@@ -1742,7 +1742,7 @@
url: '/page_user/huanbike?sn=' + that.orderobj.deviceSn + '&orderid=' + that.orderobj.orderId + '&deviceid=' + that.deviceid + '&devicename=' + that.devicename
})
}else{
- that.wenbentxt = '蓝牙连接中...'
+ that.wenbentxt = '车辆锁车中...'
const findDevice = () =>{
that.ver_dataflag = 2
const matchedDevice = that.devicesarr.find(device => {
@@ -1871,6 +1871,7 @@
},
// 点击启动and关闭
btnqd() {
+ this.caozuotext = '骑行前请检查车轿刹车是否灵敏，安全骑行'
if(this.jiance == true){
xBlufi.initXBlufi(1)
xBlufi.notifyStartDiscoverBle({
@@ -3186,7 +3187,7 @@
.conts_box {
width: 100%;
- height: 560rpx;
+ height: 500rpx;
margin: 0 auto;
margin-top: 38rpx;
background: #FFFFFF;
@@ -3221,7 +3222,6 @@
font-weight: 600;
font-size: 32rpx;
color: #3D3D3D;
- margin-top: 10rpx;
display: flex;
align-items: center;
image{
@@ -3280,7 +3280,7 @@
height: 88rpx;
}
.jsdd{
- width: 210rpx;
+ width: 190rpx;
height: 88rpx;
background: rgba(76,151,231,0);
border-radius: 20rpx 20rpx 20rpx 20rpx;
@@ -3295,7 +3295,7 @@
font-weight: 600;
font-size: 36rpx;
color: #FFFFFF;
- width: 300rpx;
+ width: 240rpx;
height: 88rpx;
text-align: center;
line-height: 88rpx;
@@ -3308,7 +3308,7 @@
width: 100%;
justify-content: space-between;
margin-top: 30rpx;
- padding: 0 54rpx;
+ padding: 0 30rpx;
}
.imgpic{
display: flex;
@@ -3776,29 +3776,24 @@
color: #0D75E5;
margin-right: 20rpx;
}
-
.dizhi {
font-size: 28rpx;
color: #808080;
}
}
-
.top {
display: flex;
justify-content: space-between;
-
.name {
font-size: 32rpx;
color: #3D3D3D;
font-weight: 600;
}
-
.zu {
font-size: 24rpx;
color: #3D3D3D;
display: flex;
align-items: center;
-
image {
width: 22rpx;
height: 22rpx;
@@ -3806,7 +3801,6 @@
}
}
}
-
.rticon {
position: fixed;
right: 28rpx;
@@ -3819,12 +3813,10 @@
margin-top: 32rpx;
}
}
-
.lticon {
position: fixed;
- left: 28rpx;
- top: 200rpx;
-
+ right: 20rpx;
+ bottom: 940rpx;
image {
width: 88rpx;
height: 88rpx;
@@ -3832,7 +3824,6 @@
margin-top: 32rpx;
}
}
-
.map {
width: 100%;
height: 130vh;
diff --git a/pages/my.vue b/pages/my.vue
index bc471ff..f3ea0bf 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -268,9 +268,8 @@
return label.includes(searchValue) || deptName.includes(searchValue);
});
}
- },
+ },
selectItem(item) {
- this.confirm(item)
this.show = false
this.searchKey = '' // 选择后清空搜索框
this.displayList = this.list // 重置显示列表
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 5c5025a..5004f51 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -103,7 +103,7 @@
- {{announcements.noticeTitle == null ? '暂无最新公告！！！' : announcements.noticeTitle}}
+ {{announcements.noticeTitle == null ? '欢迎使用小鹿骑行！！！' : announcements.noticeTitle}}
@@ -139,11 +139,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -423,8 +423,6 @@
uni.setStorageSync('token', res.token)
taht.getinfo()
taht.getlunbo()
- }else{
- taht.getinfo()
}
})
}
@@ -1730,7 +1728,7 @@
margin-top: 32rpx;
image{
width: 96rpx;
- height: 116rpx;
+ height: 96rpx;
}
}
}