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

111

Browse Source
This commit is contained in:
Sliverber 2024-07-08 18:01:44 +08:00
parent 28e2b40b8d
commit 2827ba4dcf
7 changed files with 488 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/http.interceptor.js
View File

@ -9,8 +9,8 @@ const install = (Vue, vm) => {
// // 设置为json，返回后会对数据进行一次JSON.parse() // // 设置为json，返回后会对数据进行一次JSON.parse()
// dataType: 'json', // dataType: 'json',
// showLoading: true, // 是否显示请求中的loading // showLoading: true, // 是否显示请求中的loading
// loadingText: '...', // 请求loading中的文字提示 // loadingText: '请求加载中...', // 请求loading中的文字提示
loadingTime: 10000, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms // loadingTime: 10000, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
// originalData: false, // 是否在拦截器中返回服务端的原始数据 // originalData: false, // 是否在拦截器中返回服务端的原始数据
// loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 // loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
// // 配置请求头信息 // // 配置请求头信息
@ -27,7 +27,8 @@ const install = (Vue, vm) => {
// baseUrl: 'https://dianche.chuantewulian.cn/prod-api', // baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
baseUrl: 'https://dche.ccttiot.com/prod-api', baseUrl: 'https://dche.ccttiot.com/prod-api',
loadingText: '努力加载中~', loadingText: '努力加载中~',
// loadingTime: 2000, loadingTime: 50000,
// 设置自定义头部content-type // 设置自定义头部content-type
header: { header: {
'content-type': 'application/json;charset=UTF-8', 'content-type': 'application/json;charset=UTF-8',

2
manifest.json
View File

@ -51,7 +51,7 @@
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"libVersion" : "latest", "libVersion" : "latest",
"appid" : "wx4d178f8c80348214", "appid" : "wx3428c498d5061192",
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },

47
page_user/yj.vue
View File

@ -122,6 +122,29 @@
</view> --> </view> -->
</view>
<u-mask :show="showtxtip" @click="showtxtip = false" :z-index='100' duration='0' />
<view class="pops" v-if="showtxtip">
<view class="tit" style="font-weight: 600;">
提现成功
</view>
<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
充值押金将在10分钟内按原路退还，是否返回？
</view>
<view class="btn_box">
<view class="btn1" @click="showtxtip = false">
取消
</view>
<view class="btn2"@click="topage()">
确定
</view>
</view>
<!-- <view class="btn" @click="showtcs=false" style="margin-bottom: 0rpx;">
点击查看
</view> -->
</view> </view>
<u-mask :show="show" @click="show = false" :z-index='100' /> <u-mask :show="show" @click="show = false" :z-index='100' />
<view class="tip_box" v-if="show"> <view class="tip_box" v-if="show">
@ -143,6 +166,7 @@
</view> </view>
</view> </view>
<u-mask :show="loadingmask" :z-index='100' duration='0' /> <u-mask :show="loadingmask" :z-index='100' duration='0' />
<view class="pops" v-if="loadingmask" style="width: 500rpx;left:124rpx"> <view class="pops" v-if="loadingmask" style="width: 500rpx;left:124rpx">
<view class="tit" style="font-weight: 600;"> <view class="tit" style="font-weight: 600;">
@ -175,7 +199,8 @@
isback:false, isback:false,
showBack:false, showBack:false,
loadingmask:false, loadingmask:false,
ispaid:false ispaid:false,
showtxtip:false
} }
@ -223,11 +248,11 @@
}); });
}, },
getlist() { getlist() {
uni.showLoading({ // uni.showLoading({
title:'加载中...' // title:'加载中...'
}) // })
this.$u.get("/appVerify/order/list?type=2&userId=" + this.userId).then((res) => { this.$u.get("/appVerify/order/list?type=2&userId=" + this.userId).then((res) => {
uni.hideLoading() // uni.hideLoading()
if (res.code == 200) { if (res.code == 200) {
this.orderList = res.rows this.orderList = res.rows
this.total = res.total this.total = res.total
@ -242,17 +267,17 @@
}, },
tixian() { tixian() {
uni.showLoading({ this.show = false
title:'加载中...' this.loadingmask=true
})
this.$u.post("/appVerify/order/withdraw").then((res) => { this.$u.post("/appVerify/order/withdraw").then((res) => {
if (res.code == 200) { if (res.code == 200) {
setTimeout(() => { setTimeout(() => {
uni.hideLoading() this.loadingmask=false
this.getinfo() this.getinfo()
this.getlist() this.getlist()
this.show = false
this.showtxtip=true
}, 500) }, 500)
} else { } else {
@ -296,7 +321,7 @@
console.log('进入判断了',this.isback); console.log('进入判断了',this.isback);
if(this.isback==true){ if(this.isback==true){
console.log('进入判断了1'); console.log('进入判断了1');
this.showBack=true // this.showBack=true
} }

101
pages/index/index.vue
View File

@ -17,6 +17,9 @@
嵛你出行 嵛你出行
</view> </view>
</view> </view>
<view class="" style="width: 100%;height: 50rpx;">
</view>
</view> </view>
@ -252,7 +255,7 @@
<view class="page3" v-if="deviceIndex==2"> <view class="page3" v-if="deviceIndex==2">
<view class="bot_btns"> <view class="bot_btns">
<view class="info"> <view class="infoss">
<view class="left"> <view class="left">
预估金额：{{ parseFloat(money).toFixed(2) }}<span>元</span> 预估金额：{{ parseFloat(money).toFixed(2) }}<span>元</span>
</view> </view>
@ -1530,8 +1533,8 @@
id: sn, id: sn,
latitude: latitude, latitude: latitude,
longitude: longitude, longitude: longitude,
width: 10, width: 5,
height: 10, height: 5,
iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u4D2g8B76trqZLhIiNWN' iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u4D2g8B76trqZLhIiNWN'
}; };
this.markers.push(specificDeviceMarker); this.markers.push(specificDeviceMarker);
@ -1689,9 +1692,12 @@
this.seeDetail = false; this.seeDetail = false;
if (res.code === 200) { if (res.code === 200) {
this.opencar() this.opencar()
this.backfalse=0
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功'; this.toploadtxt = '开锁成功';
this.buletxt = '开锁成功'; this.buletxt = '开锁成功';
this.lastClickedMarkerId=null
this.mappolyline=[]
setTimeout(() => { setTimeout(() => {
this.maskloading = false; this.maskloading = false;
this.getisInOrder(); this.getisInOrder();
@ -1952,6 +1958,7 @@
if (res.code === 200) { if (res.code === 200) {
that.reboot() that.reboot()
that.backfalse=0
that.isbackdevice = false that.isbackdevice = false
// that.close() // that.close()
// that.getisInOrder() // that.getisInOrder()
@ -2007,6 +2014,7 @@
if (res.code === 200) { if (res.code === 200) {
that.reboot() that.reboot()
that.backfalse=0
that.isbackdevice = false that.isbackdevice = false
that.loadimg = that.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
@ -2109,7 +2117,7 @@
}) })
}, },
payback() { payback() {
console.log(this.OrderdeviceInfos.onlineStatus, 'this.OrderdeviceInfosthis.OrderdeviceInfos');
if (this.OrderdeviceInfos.onlineStatus == 1 && this.backfalse < 1) { if (this.OrderdeviceInfos.onlineStatus == 1 && this.backfalse < 1) {
// 设备未离线 // 设备未离线
console.log('在线还车'); console.log('在线还车');
@ -2126,7 +2134,37 @@
} }
}, 40); // 每40毫秒更新一次，可以调整 }, 40); // 每40毫秒更新一次，可以调整
setTimeout(() => { setTimeout(() => {
this.backDevice() this.$u.post('/appVerify/device/return?returnType=1&orderNo=' + this.orderinfo.orderNo +
'&isInParkingArea=' + this.isInParkingArea).then((
res) => {
if (res.code === 200) {
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '还车成功!';
this.backfalse=0
setTimeout(() => {
this.close()
this.maskloading = false;
this.getisInOrder();
}, 800);
} else {
this.backfalse = this.backfalse + 1
this.payback()
// this.cheackgps()
// this.toploadtxt = '还车失败';
// setTimeout(() => {
// this.maskloading = false;
// uni.showToast({
// title: res.msg,
// icon: 'none',
// duration: 2000
// });
// }, 1000);
}
})
}, 2100); }, 2100);
} else if (this.OrderdeviceInfos.onlineStatus == 0 || this.backfalse >= 1) { } else if (this.OrderdeviceInfos.onlineStatus == 0 || this.backfalse >= 1) {
@ -2154,6 +2192,7 @@
if (res.code === 200) { if (res.code === 200) {
this.reboot() this.reboot()
this.backfalse=0
this.isbackdevice = false this.isbackdevice = false
this.loadimg = this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
@ -2207,14 +2246,18 @@
if (res.code === 200) { if (res.code === 200) {
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '还车成功!'; this.toploadtxt = '还车成功!';
this.backfalse=0
setTimeout(() => { setTimeout(() => {
this.close() this.close()
this.maskloading = false; this.maskloading = false;
this.getisInOrder(); this.getisInOrder();
}, 800); }, 800);
} else { } else {
this.backfalse = this.backfalse + 1 this.backfalse = this.backfalse + 1
this.cheackgps()
this.toploadtxt = '还车失败'; this.toploadtxt = '还车失败';
setTimeout(() => { setTimeout(() => {
this.maskloading = false; this.maskloading = false;
@ -2411,6 +2454,8 @@
if (res.code === 200) { if (res.code === 200) {
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功'; this.toploadtxt = '开锁成功';
this.lastClickedMarkerId=null
this.mappolyline=[]
setTimeout(() => { setTimeout(() => {
this.maskloading = false; this.maskloading = false;
this.getisInOrder(); this.getisInOrder();
@ -2676,6 +2721,7 @@
.orderNo).then((res) => { .orderNo).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.backfalse=0
this.loadimg = this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功'; this.toploadtxt = '开锁成功';
@ -2687,10 +2733,11 @@
} else { } else {
this.backfalse = this.backfalse + 1 this.backfalse = this.backfalse + 1
this.toploadtxt = '开锁失败'; this.unloackdevices()
setTimeout(() => { // this.toploadtxt = '开锁失败';
this.maskloading = false; // setTimeout(() => {
}, 1000); // this.maskloading = false;
// }, 1000);
// if (res.msg == '10500-----') { // if (res.msg == '10500-----') {
// uni.showToast({ // uni.showToast({
@ -2738,6 +2785,7 @@
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
that.buletxt = '解锁成功'; that.buletxt = '解锁成功';
that.toploadtxt = '解锁成功' that.toploadtxt = '解锁成功'
that.backfalse=0
setTimeout(() => { setTimeout(() => {
that.maskloading = false; that.maskloading = false;
that.getisInOrder(); that.getisInOrder();
@ -2805,6 +2853,7 @@
if (res.code === 200) { if (res.code === 200) {
// this.getisInOrder() // this.getisInOrder()
this.backfalse=0
this.loadimg = this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '锁车成功'; this.toploadtxt = '锁车成功';
@ -2815,15 +2864,16 @@
}, 1000); }, 1000);
} else { } else {
this.backfalse = this.backfalse + 1 this.backfalse = this.backfalse + 1
this.toploadtxt = '锁车失败'; this.loackdevice()
setTimeout(() => { // this.toploadtxt = '锁车失败';
this.maskloading = false; // setTimeout(() => {
uni.showToast({ // this.maskloading = false;
title: res.msg, // uni.showToast({
icon: 'none', // title: res.msg,
duration: 2000 // icon: 'none',
}); // duration: 2000
}, 1000); // });
// }, 1000);
// if (res.msg == '10500-----') { // if (res.msg == '10500-----') {
// uni.showToast({ // uni.showToast({
@ -2868,6 +2918,7 @@
// console.log('发送了离线锁车请求'); // console.log('发送了离线锁车请求');
// that.getisInOrder() // that.getisInOrder()
that.buleclose = false that.buleclose = false
that.backfalse=0
that.loadimg = that.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z'; 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
that.buletxt = '锁车成功'; that.buletxt = '锁车成功';
@ -5070,7 +5121,10 @@
.navBarBox { .navBarBox {
position: fixed; position: fixed;
z-index: 10; z-index: 10;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent); // background:#fff;
// background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9) 70%, transparent);
background: linear-gradient(to bottom, rgba(255, 255, 255, 1) 50%, rgba(255, 255, 255, 0.5) 75%, transparent 100%);
// background: linear-gradient( 180deg, #FFFFFF 58%, rgba(255,255,255,0) 52%);
.navBar { .navBar {
width: 100vw; width: 100vw;
@ -5741,7 +5795,10 @@
} }
.page3 { .page3 {
.bot_btns { .bot_btns {
// position: relative;
// display: flex; // display: flex;
// justify-content: center; // justify-content: center;
width: 750rpx; width: 750rpx;
@ -5749,13 +5806,13 @@
// background: #fff; // background: #fff;
// box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08); // box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
// padding-left: 8rpx;
padding-left: 10rpx; padding-left: 10rpx;
.infoss {
.info {
// margin-top: 20rpx; // margin-top: 20rpx;
padding: 0 60rpx; padding: 0 55rpx;
// margin-right: 20rpx; // margin-right: 20rpx;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;

411
pages_admin/order/device_detail.vue
View File

@ -55,11 +55,11 @@
<view class="half_infoli"> <view class="half_infoli">
车辆状态：<span>{{status()}}</span> 车辆状态：<span>{{status()}}</span>
</view> </view>
<view class="half_infoli"> <view class="half_infoli" v-if="deviceInfos.onlineStatus==0">
续航里程： 网络状态：<span >离线</span>
<span v-if="deviceInfos.remainingMileage">{{deviceInfos.remainingMileage}} KM</span> </view>
<span v-else>--</span> <view class="half_infoli" v-if="deviceInfos.onlineStatus==1">
网络状态：<span >在线</span>
</view> </view>
</view> </view>
<view class="info_li"> <view class="info_li">
@ -68,6 +68,12 @@
<span v-if="deviceInfos.remainingPower">{{deviceInfos.remainingPower}}%</span> <span v-if="deviceInfos.remainingPower">{{deviceInfos.remainingPower}}%</span>
<span v-else>--</span> <span v-else>--</span>
</view> </view>
<view class="half_infoli">
续航里程：
<span v-if="deviceInfos.remainingMileage">{{deviceInfos.remainingMileage}} KM</span>
<span v-else>--</span>
</view>
</view> </view>
<!-- <view class="info_li"> <!-- <view class="info_li">
@ -149,12 +155,8 @@
<view class="btn" @click="btn(1)"> <view class="btn" @click="btn(1)">
关锁 关锁
</view> </view>
<view class="btn" @click="btn(2)">
车辆禁用
</view>
<view class="btn" @click="btn(3)">
车辆解禁
</view>
<view class="btn" @click="btn(4)"> <view class="btn" @click="btn(4)">
响铃寻车 响铃寻车
</view> </view>
@ -167,9 +169,24 @@
<view class="btn" @click="bulebtn(3)"> <view class="btn" @click="bulebtn(3)">
蓝牙关锁 蓝牙关锁
</view> --> </view> -->
<view class="btn" @click="bulebtn(4)"> <view class="btn" @click="btn(8)">
设备重启 设备重启
</view> </view>
<view class="btn" @click="btn(2)" v-if="deviceInfos.status!=8">
车辆禁用
</view>
<view class="btn" @click="btn(3)" v-if="deviceInfos.status==8" >
车辆解禁
</view>
<view class="btn" @click="btn(5)" v-if="deviceInfos.status!=0" >
车辆回仓
</view>
<view class="btn" @click="btn(6)" v-if="deviceInfos.status==0" >
车辆出仓
</view>
<view class="btn" @click="btn(7)">
车牌修改
</view>
<!-- <view class="btn" @click="tipshow=true" v-if="info.type==1"> <!-- <view class="btn" @click="tipshow=true" v-if="info.type==1">
维修处理 维修处理
</view> </view>
@ -178,33 +195,7 @@
</view> --> </view> -->
</view> </view>
<u-mask :show="false" @click="show = false" :z-index='100' /> <u-mask :show="false" @click="show = false" :z-index='100' />
<view class="tip_box" v-if="false">
<view class="top">
<view class="tip">
修改车牌号
</view>
<view class="ipt_box">
<view class="text">
车牌号
</view>
<view class="ipt">
<input type="text" v-model="searchKeyword" placeholder="0.00" class="input"
placeholder-style="color:#C7CDD3">
元
</view>
</view>
</view>
<view class="bot">
<view class="bot_left" @click="show=false">
取消
</view>
<view class="bot_right">
确定
</view>
</view>
</view>
<!-- <view class="bot"> <!-- <view class="bot">
<view class="btn"> <view class="btn">
退款 退款
@ -259,7 +250,34 @@
</view> </view>
</view> </view>
</view> </view>
<u-mask :show="showvehicle" @click="closevehicle()" :z-index='100' />
<view class="tip_box" v-if="showvehicle">
<view class="top" v-if="showvehicle">
<view class="tip">
退款
</view>
<view class="ipt_box">
<view class="text">
车牌号
</view>
<view class="ipt">
<input type="text" v-model="vehicleNum" placeholder=" " class="input"
placeholder-style="color:#C7CDD3" >
</view>
</view>
</view>
<view class="bots">
<view class="bot_left" @click="closevehicle()">
取消
</view>
<view class="bot_right" @click="putvehicle()">
确定
</view>
</view>
</view>
</view> </view>
</template> </template>
@ -331,6 +349,8 @@
bulering: false, bulering: false,
bulerebort: false, bulerebort: false,
getnum:0, getnum:0,
showvehicle:false,
vehicleNum:''
} }
@ -365,6 +385,25 @@
}, },
methods: { methods: {
putvehicle(){
this.$u.put('/appVerify/device/edit?sn=' + this.sn+'&vehicleNum='+this.vehicleNum).then((res) => {
if (res.code == 200) {
this.deviceInfo()
this.showvehicle=false
uni.showToast({
title: '修改成功',
icon: 'none',
duration: 2000
});
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
})
},
closemask(){ closemask(){
this.maskloading=false this.maskloading=false
}, },
@ -384,6 +423,9 @@
} }
}, },
closevehicle(){
this.showvehicle=false
},
bulebtn(num) { bulebtn(num) {
if (num == 1) { if (num == 1) {
if (this.carstause) { if (this.carstause) {
@ -420,9 +462,14 @@
this.$u.post('/appVerify/admin/unlocking?sn=' + this.sn).then((res) => { this.$u.post('/appVerify/admin/unlocking?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code == 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
this.deviceInfo() this.deviceInfo()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
}else{ }else{
this.bulebtn(2) this.bulebtn(2)
} }
@ -432,9 +479,14 @@
} else if (num == 1) { } else if (num == 1) {
this.$u.post('/appVerify/admin/lock?sn=' + this.sn).then((res) => { this.$u.post('/appVerify/admin/lock?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code == 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
this.deviceInfo() this.deviceInfo()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
}else{ }else{
this.bulebtn(3) this.bulebtn(3)
} }
@ -444,9 +496,20 @@
} else if (num == 2) { } else if (num == 2) {
this.$u.post('/appVerify/device/offline?sn=' + this.sn).then((res) => { this.$u.post('/appVerify/device/offline?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code == 200) {
uni.showToast({
title: '解禁成功',
icon: 'none',
duration: 2000
});
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
this.deviceInfo() this.deviceInfo()
}else{
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
} }
}).catch(error => { }).catch(error => {
console.error("Error fetching area data:", error); console.error("Error fetching area data:", error);
@ -454,9 +517,20 @@
} else if (num == 3) { } else if (num == 3) {
this.$u.post('/appVerify/device/online?sn=' + this.sn).then((res) => { this.$u.post('/appVerify/device/online?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code == 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
uni.showToast({
title: '解禁成功',
icon: 'none',
duration: 2000
});
this.deviceInfo() this.deviceInfo()
}else{
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
} }
}).catch(error => { }).catch(error => {
console.error("Error fetching area data:", error); console.error("Error fetching area data:", error);
@ -464,8 +538,13 @@
} else if (num == 4) { } else if (num == 4) {
uni.showLoading({}) uni.showLoading({})
this.$u.post('/app/device/ring?sn=' + this.sn).then((res) => { this.$u.post('/app/device/ring?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code == 200) {
uni.hideLoading() uni.hideLoading()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
} else { } else {
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
@ -477,6 +556,63 @@
} }
}) })
} else if (num == 5) {
this.$u.put('/appVerify/device/edit?status=0&sn=' + this.sn).then((res) => {
if (res.code == 200) {
uni.showToast({
title: '回仓成功',
icon: 'none',
duration: 2000
});
this.deviceInfo()
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
})
} else if (num == 6) {
this.$u.put('/appVerify/device/edit?status=1&sn=' + this.sn).then((res) => {
if (res.code == 200) {
this.deviceInfo()
uni.showToast({
title: '出仓成功',
icon: 'none',
duration: 2000
});
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
})
} else if (num == 7) {
this.showvehicle=true
} else if (num == 8) {
this.$u.put('/appVerify/device/reboot' + this.sn).then((res) => {
if (res.code == 200) {
this.deviceInfo()
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
});
} else {
this.bulebtn(4)
}
})
} }
}, },
@ -909,46 +1045,7 @@
// } // }
// } // }
}, },
// 点击重新搜索
Search() {
if (this.status) {
xBlufi.notifyStartDiscoverBle({
'isStart': true
});
// 重新搜索清空蓝牙数组
this.bluthlist = []
this.devicesList = []
// 重新搜索
// this.startBluetoothDevicesDiscovery()
this.statusflag = true
this.status = false
this.texts = '正在扫描蓝牙设备...'
setTimeout(() => {
this.statusflag = false
this.status = true
if (this.searching) {
xBlufi.notifyStartDiscoverBle({
'isStart': false
});
// 判断是否存在浇花器设备
if (this.devicesList.length == 0) {
uni.showToast({
title: '暂无发现对应设备,请靠近设备',
icon: 'none'
});
} else {
this.texts = '扫描到以下设备，请点击连接！'
}
} else {
xBlufi.notifyStartDiscoverBle({
'isStart': true
});
}
}, 5000)
}
},
funListenDeviceMsgEvents: function(options) { funListenDeviceMsgEvents: function(options) {
let that = this; let that = this;
switch (options.type) { switch (options.type) {
@ -1009,22 +1106,23 @@
status() { status() {
if (this.deviceInfos.onlineStatus == 0) { // if (this.deviceInfos.onlineStatus == 0) {
return '离线' // return '离线'
} else { // } else {
if (this.deviceInfos.status == 0) {
return '未上架' // }
} else if (this.deviceInfos.status == 1) { if (this.deviceInfos.status == 0) {
return '待租' return '仓库中'
} else if (this.deviceInfos.status == 2) { } else if (this.deviceInfos.status == 1) {
return '预约中' return '待租'
} else if (this.deviceInfos.status == 3) { } else if (this.deviceInfos.status == 2) {
return '骑行中' return '预约中'
} else if (this.deviceInfos.status == 4) { } else if (this.deviceInfos.status == 3) {
return '临时锁车中' return '骑行中'
} else if (this.deviceInfos.status == 8) { } else if (this.deviceInfos.status == 4) {
return '下线' return '临时锁车中'
} } else if (this.deviceInfos.status == 8) {
return '下线'
} }
}, },
@ -1036,7 +1134,7 @@
this.getArea() this.getArea()
} }
this.getnum=1 this.getnum=1
this.vehicleNum=res.vehicleNum
this.mac = res.data.mac this.mac = res.data.mac
// this.deviceInfos.onlineStatus=0 // this.deviceInfos.onlineStatus=0
// if (this.deviceInfos.onlineStatus == 0) { // if (this.deviceInfos.onlineStatus == 0) {
@ -1179,8 +1277,9 @@
display: 'ALWAYS', // 修改为气泡的显示策略 display: 'ALWAYS', // 修改为气泡的显示策略
} }
}) })
} }
this.$forceUpdate()
} }
}) })
}, },
@ -1400,7 +1499,111 @@
.page { .page {
padding-bottom: 400rpx; padding-bottom: 400rpx;
width: 750rpx; width: 750rpx;
.tip_box {
position: fixed;
left: 72rpx;
top: 628rpx;
width: 610rpx;
// height: 282rpx;
background: #FFFFFF;
border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 110;
padding-bottom: 100rpx;
.top {
padding: 52rpx 38rpx 42rpx 36rpx;
.ipt_box {
margin-top: 22rpx;
display: flex;
flex-wrap: nowrap;
align-items: center;
.text {
width: 350rpx;
font-weight: 400;
font-size: 32rpx;
color: #3D3D3D;
}
.ipt {
padding: 10rpx 18rpx;
display: flex;
align-items: center;
justify-content: space-between;
margin-left: 26rpx;
width: 420rpx;
height: 64rpx;
border-radius: 0rpx 0rpx 0rpx 0rpx;
border: 2rpx solid #979797;
.input {
width: 80%;
}
}
}
.tip {
width: 100%;
text-align: center;
font-weight: 700;
font-size: 32rpx;
color: #3D3D3D;
}
.txt {
margin-top: 32rpx;
width: 100%;
text-align: center;
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
}
}
.bots {
position: absolute;
width: 610rpx;
// border-top: 2rpx solid #D8D8D8;
display: flex;
flex-wrap: nowrap;
// height: 100%;
bottom: -20rpx;
.bot_left {
border-radius: 0rpx 0rpx 0rpx 30rpx;
width: 50%;
height: 86rpx;
display: flex;
align-items: center;
justify-content: center;
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
background: #EEEEEE;
}
.bot_right {
border-radius: 0rpx 0rpx 30rpx 0rpx;
width: 50%;
height: 86rpx;
background: #4C97E7;
display: flex;
align-items: center;
justify-content: center;
color: #FFFFFF;
// border-left: 2rpx solid #D8D8D8;
font-weight: 500;
font-size: 32rpx;
// color: #4C97E7;
}
}
}
.maskloadpage { .maskloadpage {
position: fixed; position: fixed;

32
pages_admin/order/order_detail.vue
View File

@ -726,6 +726,7 @@
padding-bottom: 200rpx; padding-bottom: 200rpx;
width: 750rpx; width: 750rpx;
.tip_box { .tip_box {
position: fixed; position: fixed;
left: 72rpx; left: 72rpx;
@ -736,23 +737,23 @@
border-radius: 30rpx 30rpx 30rpx 30rpx; border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 110; z-index: 110;
padding-bottom: 100rpx; padding-bottom: 100rpx;
.top { .top {
padding: 52rpx 38rpx 42rpx 36rpx; padding: 52rpx 38rpx 42rpx 36rpx;
.ipt_box { .ipt_box {
margin-top: 22rpx; margin-top: 22rpx;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;
.text { .text {
width: 350rpx; width: 350rpx;
font-weight: 400; font-weight: 400;
font-size: 32rpx; font-size: 32rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.ipt { .ipt {
padding: 10rpx 18rpx; padding: 10rpx 18rpx;
display: flex; display: flex;
@ -763,13 +764,13 @@
height: 64rpx; height: 64rpx;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
border: 2rpx solid #979797; border: 2rpx solid #979797;
.input { .input {
width: 80%; width: 80%;
} }
} }
} }
.tip { .tip {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -777,7 +778,7 @@
font-size: 32rpx; font-size: 32rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.txt { .txt {
margin-top: 32rpx; margin-top: 32rpx;
width: 100%; width: 100%;
@ -787,17 +788,17 @@
color: #3D3D3D; color: #3D3D3D;
} }
} }
.bots { .bot {
position: absolute; position: absolute;
width: 610rpx; width: 610rpx;
// border-top: 2rpx solid #D8D8D8; // border-top: 2rpx solid #D8D8D8;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
// height: 100%; // height: 100%;
bottom: -20rpx; bottom: -20rpx;
.bot_left { .bot_left {
border-radius: 0rpx 0rpx 0rpx 30rpx; border-radius: 0rpx 0rpx 0rpx 30rpx;
width: 50%; width: 50%;
@ -810,7 +811,7 @@
color: #3D3D3D; color: #3D3D3D;
background: #EEEEEE; background: #EEEEEE;
} }
.bot_right { .bot_right {
border-radius: 0rpx 0rpx 30rpx 0rpx; border-radius: 0rpx 0rpx 30rpx 0rpx;
width: 50%; width: 50%;
@ -824,12 +825,13 @@
font-weight: 500; font-weight: 500;
font-size: 32rpx; font-size: 32rpx;
// color: #4C97E7; // color: #4C97E7;
} }
} }
} }
.map { .map {

46
pages_admin/worke/woke_deviceMgmt.vue
View File

@ -122,8 +122,14 @@
<view class="btn" @click="pick()"> <view class="btn" @click="pick()">
车辆解禁 车辆解禁
</view> </view>
<view class="btn" @click="gohome()">
车辆回仓
</view>
<view class="btn" @click="livehome()">
车辆出仓
</view>
</view> </view>
</view> </view>
</view> </view>
@ -260,6 +266,42 @@
this.getDevice() this.getDevice()
} else {
// 处理接口返回错误的情况
}
}).catch(error => {
// 处理接口请求失败的情况
});
},
gohome(){
let data = {
disableType: 'inStash',
sns: this.selectedItems.join(',')
}
this.$u.post(`/appVerify/device/disable?sns=` + data.sns + '&disableType=enable').then((res) => {
if (res.code == 200) {
this.closestep()
this.getDevice()
} else {
// 处理接口返回错误的情况
}
}).catch(error => {
// 处理接口请求失败的情况
});
},
livehome(){
let data = {
disableType: 'outStash',
sns: this.selectedItems.join(',')
}
this.$u.post(`/appVerify/device/disable?sns=` + data.sns + '&disableType=enable').then((res) => {
if (res.code == 200) {
this.closestep()
this.getDevice()
} else { } else {
// 处理接口返回错误的情况 // 处理接口返回错误的情况
} }