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

2

Browse Source
This commit is contained in:
Sliverber 2024-08-12 08:48:46 +08:00
parent c9456a3b85
commit 56322153aa
2 changed files with 85 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pages/index/index.vue
View File

@ -280,7 +280,7 @@
</view> </view>
<view class="cont"> <view class="cont">
<view class="left"> <view class="left">
<view class="text"> <view class="text" v-if="OrderdeviceInfos.sn!='' ">
可继续行驶{{OrderdeviceInfos.remainingMileage}}公里 可继续行驶{{OrderdeviceInfos.remainingMileage}}公里
</view> </view>
<view class="speed" style="background: #ccc; "> <view class="speed" style="background: #ccc; ">
@ -288,9 +288,12 @@
</view> </view>
</view> </view>
<view class="mac"> <view class="mac" v-if="OrderdeviceInfos.sn ">
NO.{{orderinfo.sn}} NO.{{orderinfo.sn}}
</view> </view>
<view class="mac" v-if="!OrderdeviceInfos.sn " style="color: red;">
换车开锁失败，请点击换车按钮重新换车
</view>
</view> </view>
<view class="right"> <view class="right">
<image src="https://api.ccttiot.com/smartmeter/img/static/uHTCZOVUbmBkKW4G0wuF" mode=""> <image src="https://api.ccttiot.com/smartmeter/img/static/uHTCZOVUbmBkKW4G0wuF" mode="">
@ -321,16 +324,22 @@
</view> </view>
</view> </view>
<view class="btn" style=" margin-right: 16rpx;" <view class="btn" style=" margin-right: 16rpx;"
v-if="OrderdeviceInfos.sn!='' && (OrderdeviceInfos.status == 3 || OrderdeviceInfos.status == 6)" @click="taploadmask (2)"> v-if="OrderdeviceInfos.sn && (OrderdeviceInfos.status == 3 || OrderdeviceInfos.status == 6)" @click="taploadmask (2)">
临时锁车 临时锁车
</view> </view>
<view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.status==4" <view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.status==4"
@click=" taploadmask(3)"> @click=" taploadmask(3)">
解锁用车 解锁用车
</view> </view>
<view class="btn1" @click=" taploadmask(4)"> <view class="btn" style=" margin-right: 16rpx;" @click="tochange()" v-if="!OrderdeviceInfos.sn">
继续换车
</view>
<view class="btn1" @click=" taploadmask(4)" v-if="OrderdeviceInfos.sn">
还车 还车
</view> </view>
<view class="btn1" @click=" taploadmask(4)" v-if="!OrderdeviceInfos.sn">
结束订单
</view>
</view> </view>
</view> </view>
@ -1669,6 +1678,7 @@
if (res.code === 200) { if (res.code === 200) {
this.isqrcode=false this.isqrcode=false
this.mac = this.OrderdeviceInfos.mac; this.mac = this.OrderdeviceInfos.mac;
// this.OrderdeviceInfos.onlineStatus = '1' // this.OrderdeviceInfos.onlineStatus = '1'
if (this.OrderdeviceInfos.onlineStatus !== res.data.onlineStatus) { if (this.OrderdeviceInfos.onlineStatus !== res.data.onlineStatus) {
this.OrderdeviceInfos = res.data; this.OrderdeviceInfos = res.data;
@ -2605,7 +2615,10 @@
let data = { let data = {
longitude: this.deviceGps.longitude, longitude: this.deviceGps.longitude,
latitude: this.deviceGps.latitude, latitude: this.deviceGps.latitude,
deptId :uni.getStorageSync('deptId')
} }
this.$u.get(`/app/vehicleLocalization?`, data).then((res) => { this.$u.get(`/app/vehicleLocalization?`, data).then((res) => {
if (res.code === 200) { if (res.code === 200) {
@ -4245,7 +4258,9 @@
clearInterval(this.timer) clearInterval(this.timer)
this.starTime() this.starTime()
} }
// if (this.areaInfo.areaId != res.data[0].areaId) {
// this.getArea()
// }
} else { } else {
clearInterval(this.timer) clearInterval(this.timer)
this.orderinfo = {} this.orderinfo = {}

90
pages_admin/worke/AccountDetails.vue
View File

@ -4,12 +4,23 @@
back-icon-color='#000'></u-navbar> back-icon-color='#000'></u-navbar>
<view class="account_box"> <view class="account_box">
<view class="txt"> <view class="li_box">
账户余额 <view class="txt">
</view> 账户总余额
<view class="num"> </view>
{{info.balance}}元 <view class="num">
{{info.balance}}元
</view>
</view>
<view class="li_box">
<view class="txt">
待结算金额
</view>
<view class="num">
{{info.settlementAmount}}元
</view>
</view> </view>
</view> </view>
<view class="ipt_box"> <view class="ipt_box">
<view class="ipt"> <view class="ipt">
@ -21,6 +32,11 @@
元 元
</view> </view>
</view> </view>
<view class="" style="margin: 0 auto;
margin-top: 38rpx;
width: 676rpx;color: #ccc;" >
可提现金额：{{info.withdrawableAmount}}元
</view>
<view class="info_card"> <view class="info_card">
<view class="info_li"> <view class="info_li">
<view class="text">提现金额：{{price}}元</view> <view class="text">提现金额：{{price}}元</view>
@ -97,7 +113,8 @@
realprice: 0, realprice: 0,
Quantity: 0, Quantity: 0,
border: false, border: false,
isThrottled: false isThrottled: false,
moneyInfo:{}
} }
}, },
onLoad(e) { onLoad(e) {
@ -119,10 +136,10 @@
methods: { methods: {
ckinpt() { ckinpt() {
if (parseFloat(this.amount) > parseFloat(this.info.balance)) { if (parseFloat(this.amount) > parseFloat(this.info.withdrawableAmount)) {
uni.showToast({ uni.showToast({
title: '提现金额不能大于账户余额', title: '提现金额不能大于可提现金额',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
@ -201,10 +218,19 @@
}); });
return; return;
} }
// 设置节流标志位 // 设置节流标志位
this.isThrottled = true; this.isThrottled = true;
if (parseFloat(this.realprice) > parseFloat(this.info.withdrawableAmount)) {
uni.showToast({
title: '提现金额不能大于可提现金额',
icon: 'none',
duration: 2000
});
}
let data = { let data = {
amount: this.realprice, amount: this.realprice,
areaId: this.areaId areaId: this.areaId
@ -252,13 +278,21 @@
let data = { let data = {
areaId: this.areaId areaId: this.areaId
} }
this.$u.get('/appVerify/getDept', data).then((res) => { this.$u.get('/appVerify/getDept?', data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.info = res.data this.info = res.data
} }
}).catch(error => { }).catch(error => {
console.error("Error fetching area data:", error); console.error("Error fetching area data:", error);
}); });
this.$u.get('index/statistics?', data).then((res) => {
if (res.code == 200) {
this.moneyInfo = res.data
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
}, },
getlist() { getlist() {
let data = { let data = {
@ -351,21 +385,27 @@
height: 196rpx; height: 196rpx;
background: #12D2AC; background: #12D2AC;
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
display: flex;
.txt { flex-wrap: nowrap;
width: 100%; align-items: center;
font-weight: 400; justify-content: space-between;
font-size: 32rpx; .li_box{
color: #FFFFFF; .txt {
} width: 100%;
font-weight: 400;
.num { font-size: 32rpx;
margin-top: 10rpx; color: #FFFFFF;
width: 100%; }
font-weight: 400;
font-size: 48rpx; .num {
color: #FFFFFF; margin-top: 10rpx;
width: 100%;
font-weight: 400;
font-size: 48rpx;
color: #FFFFFF;
}
} }
} }
.patBtn { .patBtn {