This commit is contained in:
Sliverber 2024-05-31 17:54:23 +08:00
parent fb18e8fd55
commit 55f3974337
9 changed files with 921 additions and 735 deletions

View File

@ -21,8 +21,9 @@ const install = (Vue, vm) => {
// }); // });
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://61.174.243.28:15861', // baseUrl: 'http://61.174.243.28:15861',
baseUrl: 'http://192.168.2.6:8080', // baseUrl: 'http://192.168.2.6:8080',
// baseUrl: 'https://dche.ccttiot.com/prod-api', // baseUrl: 'http://124.221.246.124:2289',
baseUrl: 'https://dche.ccttiot.com/prod-api',
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 800, loadingTime: 800,
// 设置自定义头部content-type // 设置自定义头部content-type
@ -128,7 +129,13 @@ const install = (Vue, vm) => {
}) })
} else { }else if(res.code == 501){
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}else {
// console.log("老用户登录",res.data) // console.log("老用户登录",res.data)
uni.redirectTo({ uni.redirectTo({
url:'/pages/login/login' url:'/pages/login/login'

View File

@ -1,115 +1,116 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar title="查看明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' <u-navbar title="费用明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='36'></u-navbar>
height='36'></u-navbar> <view class="tit">
<view class="tit"> <view class="left">电单车</view>
<view class="left">电单车</view> <!-- <view class="right">查看计费规则 ></view> -->
<view class="right">查看计费规则 ></view> </view>
<view class="data">
{{info.createTime}}
</view>
<view class="card">
<view class="card_tit">
账单信息
</view> </view>
<view class="data"> <view class="cont">
2023-12-31 <view class="cont_box">
</view> <view class="cont_left">
<view class="card"> 预约费
<view class="card_tit"> </view>
账单信息 <view class="cont_right">
{{info.appointmentFee}}
</view>
</view> </view>
<view class="cont"> <view class="cont_box" style="margin-top: 20rpx;">
<view class="cont_box"> <view class="cont_left">
<view class="cont_left"> 骑行费
起步价15分钟
</view>
<view class="cont_right">
2.00
</view>
</view> </view>
<view class="cont_box" style="margin-top: 20rpx;"> <view class="cont_right">
<view class="cont_left"> {{info.ridingFee}}
时长费16分钟
</view>
<view class="cont_right">
2.00
</view>
</view> </view>
<view class="tip">
已骑行30分9秒
</view>
</view> </view>
<view class="price"> <view class="cont_box" style="margin-top: 20rpx;">
<view class="zhanwei"> <view class="cont_left">
管理费
</view> </view>
<view class="prices"> <view class="cont_right">
实付 <span style="font-size:48rpx ;">4.00</span> {{info.manageFee}}
</view> </view>
</view> </view>
<view class="cont_box" style="margin-top: 20rpx;">
<view class="cont_left">
调度费
</view>
<view class="cont_right">
{{info.dispatchFee}}
</view>
</view>
<view class="tip">
已骑行{{ rideDuration }}
</view>
</view> </view>
<view class="card"> <view class="price">
<view class="card_tit"> <view class="zhanwei"></view>
账单信息 <view class="prices">
共计<span style="font-size:48rpx ;">{{info.totalFee}}</span>
</view> </view>
<view class="cont"> </view>
<view class="cont_box"> </view>
<view class="cont_left"> <view class="card" v-if="false">
起步价15分钟 <view class="card_tit">
</view> 账单信息
<view class="cont_right"> </view>
2.00 <view class="cont">
</view> <view class="cont_box">
<view class="cont_left">
起步价15分钟
</view> </view>
<view class="cont_right">
<view class="tip">
已骑行30分9秒
</view>
</view>
<view class="price">
<view class="zhanwei">
</view>
<view class="prices">
实付 <span style="font-size:48rpx ;">4.00</span>
</view>
</view>
<view class="price" style="margin-top: 0;">
<view class="zhanwei">
</view>
<view class="showmore">
查看支付方式
<view class="iconfont icon-xiangxia1">
</view>
<!-- <view class="iconfont icon-xiangshang1">
</view> -->
</view>
</view>
<view class="info_cont">
<view class="info_left">
微信支付
</view>
<view class="info_right">
2.00 2.00
</view> </view>
</view> </view>
<view class="info_cont"> <view class="tip">
<view class="info_left"> 已骑行30分9秒
支付时间
</view>
<view class="info_right">
2023-12-31 19:23:59
</view>
</view>
<view class="info_cont">
<view class="info_left">
订单号
</view>
<view class="info_right">
3915479812278489
</view>
</view> </view>
</view> </view>
<view class="price">
<view class="zhanwei"></view>
<view class="prices">
实付 <span style="font-size:48rpx ;">4.00</span>
</view>
</view>
<view class="price" style="margin-top: 0;">
<view class="zhanwei"></view>
<view class="showmore">
查看支付方式
<view class="iconfont icon-xiangxia1"></view>
</view>
</view>
<view class="info_cont">
<view class="info_left">
微信支付
</view>
<view class="info_right">
2.00
</view>
</view>
<view class="info_cont">
<view class="info_left">
支付时间
</view>
<view class="info_right">
2023-12-31 19:23:59
</view>
</view>
<view class="info_cont">
<view class="info_left">
订单号
</view>
<view class="info_right">
3915479812278489
</view>
</view>
</view>
</view> </view>
</template> </template>
@ -120,150 +121,42 @@
bgc: { bgc: {
backgroundColor: "", backgroundColor: "",
}, },
id: 0,
info: {},
rideDuration: '' //
} }
}, },
methods: { onLoad(e) {
this.id = e.orderId
if(this.id){
this.orderInfo()
}
},
methods: {
orderInfo() {
this.$u.get("/appVerify/order/" + this.id).then((res) => {
if (res.code == 200) {
this.info = res.data
this.calculateRideDuration(); //
}
});
},
calculateRideDuration() {
const createTime = new Date(this.info.createTime);
const returnTime = new Date(this.info.returnTime);
const duration = (returnTime - createTime) / 1000; //
const hours = Math.floor(duration / 3600);
const minutes = Math.floor((duration % 3600) / 60);
const seconds = Math.floor(duration % 60);
if (hours > 0) {
this.rideDuration = `${hours}小时${minutes}${seconds}`;
} else {
this.rideDuration = `${minutes}${seconds}`;
}
}
} }
} }
</script> </script>
<style lang="scss" >
page{
background-color: #F7FAFE;
}
.page{
// width: 750rpx;
width: 750rpx;
// height: 530rpx;
background: linear-gradient( 180deg, #4C97E7 0.1%, rgba(255,255,255,0) 40%), #FFFFFF;
border-radius: 0rpx 0rpx 0rpx 0rpx;
.tit{
margin-left: 86rpx;
margin-right: 86rpx;
margin-top: 30rpx;
display: flex;
flex-wrap: nowrap;
justify-content: space-between;
align-items: center;
.left{
font-weight: 700;
font-size: 40rpx;
color: #3D3D3D;
}
.right{
font-weight: 400;
font-size: 24rpx;
color: #3D3D3D;
}
}
.data{
margin-left: 86rpx;
font-weight: 400;
font-size: 24rpx;
color: #808080;
}
.card{
padding:34rpx 44rpx ;
margin: 68rpx auto;
width: 672rpx;
// height: 458rpx;
background: #FFFFFF;
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
border-radius: 32rpx 32rpx 32rpx 32rpx;
.card_tit{
width: 112rpx;
height: 38rpx;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 400;
font-size: 28rpx;
color: #3D3D3D;
background: linear-gradient( 0deg, #B1C3FF 0.1%, rgba(255,255,255,0) 40%), #FFFFFF;
}
.cont{
padding: 32rpx 28rpx;
margin-top: 26rpx;
width: 586rpx;
// height: 228rpx;
background: #F3F3F3;
border-radius: 26rpx 26rpx 26rpx 26rpx;
.cont_box{
display: flex;
flex-wrap: nowrap;
justify-content: space-between;
.cont_left{
font-weight: 400;
font-size: 28rpx;
color: #3D3D3D;
}
.cont_right{
font-weight: 400;
font-size: 28rpx;
color: #3D3D3D;
}
}
.tip{
margin-top: 32rpx;
font-weight: 400;
font-size: 24rpx;
color: #808080;
}
}
.price{
margin-top: 28rpx;
display: flex;
flex-wrap: nowrap;
.prices{
margin-left: auto;
font-weight: 400;
font-size: 24rpx;
color: #3D3D3D;
span{
margin-left: 2rpx;
margin-right: 2rpx;
}
}
.showmore{
margin-left: auto;
display: flex;
flex-wrap: nowrap;
align-items: center;
font-weight: 400;
font-size: 20rpx;
color: #3D3D3D;
.icon-xiangshang1{
font-size: 20rpx;
color: #3D3D3D;
}
.icon-xiangxia1{
font-size: 20rpx;
color: #3D3D3D;
}
}
}
.info_cont{
margin-top: 12rpx;
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-between;
.cont_left{
font-weight: 400;
font-size: 24rpx;
color: #3D3D3D;
}
.cont_right{
font-weight: 400;
font-size: 24rpx;
color: #3D3D3D;
}
}
}
}
</style>

View File

@ -261,8 +261,21 @@
onlyFromCamera: true, onlyFromCamera: true,
scanType: ['qrCode'], scanType: ['qrCode'],
success: res => { success: res => {
console.log('扫描结果:', res);
this.sn = res.sn let sn = null;
let queryParams = res.result.split('?')[1];
if (queryParams) {
let params = queryParams.split('&');
params.forEach(param => {
let [key, value] = param.split('=');
if (key === 'sn') {
sn = value;
}
});
}
this.sn = sn
}, },
fail: err => { fail: err => {

View File

@ -3,39 +3,144 @@
<u-navbar title="计费规则" :border-bottom="false" :background="bgc" title-color='#000' title-size='36' <u-navbar title="计费规则" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
height='36'></u-navbar> height='36'></u-navbar>
<view class="cont" style="margin-top: 50rpx;"> <view class="cont" style="margin-top: 50rpx;">
<view class="tit"> <view class="tit" style="margin-top: 50rpx;">
骑行服务费 骑行服务费
</view> </view>
<view class="card"> <view class="card">
<view class="li"> <view class="li">
<view class="left"> <view class="left">
起步价 预约服务费
</view> </view>
<view class="right"> <view class="right">
{{startingPrice}}{{startingHowManyMinutes}}分钟 {{areaInfo. appointmentServiceFee}}/10分钟
</view> </view>
</view> </view>
<view class="li" style="margin-top: 38rpx;"> <view class="li" style="margin-top: 38rpx;">
<view class="left"> <view class="left">
时长费 押金
</view> </view>
<view class="right"> <view class="right">
{{timeFee}}/{{timeMinutes}}分钟 {{areaInfo.vehicleManagementFee}}
</view> </view>
</view> </view>
<view class="tip">
超出起步价包含时长后收取
</view>
</view>
<view class="tips">
<view class="yuan">
</view>
<view class="txt">
骑行服务费以开始服务时刻所对应的计费规则为准时长 费不足1个计费周时按1个计费周期计算费用
</view>
</view> </view>
<view class="tips" style="margin-top: 10rpx;margin-left: 5rpx;">
<view class="yuan">
</view>
<view class="txt">
预约服务费是在使用预约服务时预约时段内的收费标准
</view>
</view>
<view class="tips" style="margin-top: 10rpx;margin-left: 5rpx">
<view class="yuan"></view>
<view class="txt">
押金是在使用车辆前的收费标准归还设备后可退
</view>
</view>
<view class="tit" style="margin-top: 50rpx;">
免费时长
</view>
<view class="card">
<view class="li">
<view class="left">
免费时长
</view>
<view class="right">
{{freeInfo.freeRideTime}}分钟
</view>
</view>
</view>
<view >
<view v-if="freeInfo.ridingRule==1">
<view class="tit" style="margin-top: 50rpx;">
{{freeInfo.name}}
</view>
<view class="card">
<view class="li">
<view class="left">
起步价
</view>
<view class="right">
{{freeInfo.ridingRuleJson.startingPrice}}{{freeInfo.ridingRuleJson.startingTime}}<span
v-if="freeInfo.rentalUnit=='minutes'">分钟</span><span
v-if="freeInfo.rentalUnit=='hours'">小时</span><span
v-if="freeInfo.rentalUnit=='day'"></span>
</view>
</view>
<view class="li" style="margin-top: 38rpx;">
<view class="left">
时长费
</view>
<view class="right">
{{freeInfo.ridingRuleJson.timeoutPrice}}/{{ freeInfo.ridingRuleJson.timeoutTime}}<span
v-if="freeInfo.rentalUnit=='minutes'">分钟</span><span
v-if="freeInfo.rentalUnit=='hours'">小时</span><span
v-if="freeInfo.rentalUnit=='day'"></span>
</view>
</view>
</view>
</view>
<view v-if="freeInfo.ridingRule==2">
<view class="tit" style="margin-top: 50rpx;">
{{freeInfo.name}}
</view>
<view class="card">
<view class="li" style="margin-top: 10rpx;" v-for="(items,index) in freeInfo.ridingRuleJson.rule"
v-if="index!=freeInfo.ridingRuleJson.rule.length-1">
<view class="left" v-if="index==0">
区间计费
</view>
<view class="left" v-if="index!=0">
</view>
<view class="right">
{{items.start}}-{{items.end}}<span v-if="freeInfo.rentalUnit=='minutes'">分钟</span>
<span v-if="freeInfo.rentalUnit=='hours'">小时</span>
<span v-if="freeInfo.rentalUnit=='day'"></span>,
{{items.eachUnit}}<span v-if="freeInfo.rentalUnit=='minutes'">分钟</span>
<span v-if="freeInfo.rentalUnit=='hours'">小时</span>
<span v-if="freeInfo.rentalUnit=='day'"></span>/{{items.fee}}
</view>
</view>
<view class="li" style="margin-top: 10rpx;" v-for="(items,index) in freeInfo.ridingRuleJson.rule"
v-if="index==freeInfo.ridingRuleJson.rule.length-1">
<view class="left">
</view>
<view class="right">
>{{items.start}}<span v-if="freeInfo.rentalUnit=='minutes'">分钟</span>
<span v-if="freeInfo.rentalUnit=='hours'">小时</span>
<span v-if="freeInfo.rentalUnit=='day'"></span>,
{{items.eachUnit}}<span v-if="freeInfo.rentalUnit=='minutes'">分钟</span>
<span v-if="freeInfo.rentalUnit=='hours'">小时</span>
<span v-if="freeInfo.rentalUnit=='day'"></span>/{{items.fee}}
</view>
</view>
</view>
<view class="tips">
<view class="yuan">
</view>
<view class="txt">
区间计费是在使用车辆时时不同时段内的收费标准
</view>
</view>
</view>
</view>
<view class="tit" style="margin-top: 50rpx;"> <view class="tit" style="margin-top: 50rpx;">
违规停车管理费 违规停车管理费
@ -46,7 +151,7 @@
调度费非停车点 调度费非停车点
</view> </view>
<view class="right"> <view class="right">
{{dispatchFee}} {{areaInfo. dispatchFee}}
</view> </view>
</view> </view>
<view class="tip" style="width: 440rpx;"> <view class="tip" style="width: 440rpx;">
@ -57,7 +162,7 @@
管理费费 管理费费
</view> </view>
<view class="right"> <view class="right">
{{vehicleManagementFee}} {{areaInfo.vehicleManagementFee}}
</view> </view>
</view> </view>
<view class="tip"> <view class="tip">
@ -85,35 +190,47 @@
bgc: { bgc: {
backgroundColor: "#fff", backgroundColor: "#fff",
}, },
areaInfo:{},
freeInfo:{}
} }
}, },
computed: { computed: {
appointmentServiceFee() {
return this.$store.getters.appointmentServiceFee;
},
dispatchFee() {
return this.$store.getters.dispatchFee;
},
vehicleManagementFee() {
return this.$store.getters.vehicleManagementFee;
},
startingPrice() {
return this.$store.getters.startingPrice;
},
timeFee() {
return this.$store.getters.timeFee;
},
timeMinutes() {
return this.$store.getters.timeMinutes;
},
startingHowManyMinutes() {
return this.$store.getters.startingHowManyMinutes;
},
userId() { userId() {
return this.$store.getters.userId; return this.$store.getters.userId;
}, },
},
onLoad(options) {
try {
if (options.item) {
this.freeInfo = JSON.parse(decodeURIComponent(options.item));
console.log( this.freeInfo,' this.freeInfo');
}
} catch (error) {
console.error('Error parsing item:', error);
}
},
onShow() {
this.getarea()
}, },
methods: { methods: {
getarea() {
let id = uni.getStorageSync('areaId');
this.$u.get("/app/area/"+id).then((res) => {
if (res.code == 200) {
this.areaInfo=res.data
// this.getlist()
} else {
uni.showToast({
title:res.msg,
icon: 'none',
duration: 2000
});
}
});
},
} }
} }
@ -130,6 +247,7 @@ page{
// justify-content: center; // justify-content: center;
.cont{ .cont{
margin: 0 58rpx; margin: 0 58rpx;
padding-bottom: 100rpx;
.tit{ .tit{
margin-left: 32rpx; margin-left: 32rpx;
font-weight: 700; font-weight: 700;

View File

@ -11,7 +11,7 @@
</view> </view>
<view class="tit" <view class="tit"
style="margin-top: 18rpx;font-weight: 700;font-size: 92rpx;color: #3D3D3D;line-height: 72rpx;"><span style="margin-top: 18rpx;font-weight: 700;font-size: 92rpx;color: #3D3D3D;line-height: 72rpx;"><span
style="font-size: 52rpx;"></span>{{deposit}}</view> style="font-size: 52rpx;"></span>{{areaInfo.deposit}}</view>
</view> </view>
<view class="card1"> <view class="card1">
<view class="cont"> <view class="cont">
@ -131,6 +131,7 @@
userinfo: {}, userinfo: {},
orderList:[], orderList:[],
total:0, total:0,
areaInfo:""
} }
@ -141,7 +142,7 @@
// // ... // // ...
// }); // });
this.getinfo() this.getinfo()
this.getarea()
}, },
watch: { watch: {
userId(newValue, oldValue) { userId(newValue, oldValue) {
@ -151,32 +152,28 @@
} }
}, },
computed: { computed: {
appointmentServiceFee() {
return this.$store.getters.appointmentServiceFee;
},
dispatchFee() {
return this.$store.getters.dispatchFee;
},
vehicleManagementFee() {
return this.$store.getters.vehicleManagementFee;
},
startingPrice() {
return this.$store.getters.startingPrice;
},
timeFee() {
return this.$store.getters.timeFee;
},
timeMinutes() {
return this.$store.getters.timeMinutes;
},
deposit() {
return this.$store.getters.deposit;
},
userId() { userId() {
return this.$store.getters.userId; return this.$store.getters.userId;
}, },
}, },
methods: { methods: {
getlist() {
this.$u.get("/appVerify/order/list?type=2&userId="+this.userId).then((res) => {
if (res.code == 200) {
this.orderList=res.rows
this.total=res.total
} else {
uni.showToast({
title:res.msg,
icon: 'none',
duration: 2000
});
}
});
},
tixian(){ tixian(){
this.$u.post("/appVerify/order/withdraw").then((res) => { this.$u.post("/appVerify/order/withdraw").then((res) => {
@ -193,12 +190,12 @@
} }
}); });
}, },
getlist() { getarea() {
this.$u.get("/appVerify/order/list?type=2&userId="+this.userId).then((res) => { let id = uni.getStorageSync('areaId');
this.$u.get("/app/area/"+id).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.orderList=res.rows this.areaInfo=res.data
this.total=res.total
} else { } else {
uni.showToast({ uni.showToast({
title:res.msg, title:res.msg,
@ -228,7 +225,7 @@
userId: this.userId, userId: this.userId,
// ruleId: this.freeInfo.ruleId, // ruleId: this.freeInfo.ruleId,
money: this.deposit, money: this.areaInfo.deposit,
mark: "押金充值", mark: "押金充值",
type: '4' type: '4'

File diff suppressed because it is too large Load Diff

View File

@ -80,7 +80,13 @@
// uni.switchTab({ // uni.switchTab({
// url: '/pages/index/index' // url: '/pages/index/index'
// }) // })
} }else{
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
}); });
}) })

View File

@ -24,7 +24,7 @@
<view class="text"> <view class="text">
押金 押金
</view> </view>
<view class="tip" v-if="info.bindDeviceNum==null"> <view class="tip" v-if="info.balance==null">
未充值 未充值
</view> </view>
</view> </view>
@ -68,7 +68,7 @@
</view> </view>
</view> </view>
<view class="card_li" style="border-bottom:2rpx solid #fff ;" @click="topage(5)"> <!-- <view class="card_li" style="border-bottom:2rpx solid #fff ;" @click="topage(5)">
<view class="card_left"> <view class="card_left">
<image src="https://api.ccttiot.com/smartmeter/img/static/uJFhEFoioikjCQqqWW3c" mode=""></image> <image src="https://api.ccttiot.com/smartmeter/img/static/uJFhEFoioikjCQqqWW3c" mode=""></image>
<view class="text"> <view class="text">
@ -79,7 +79,7 @@
<view class="iconfont icon-xiangyou1" > <view class="iconfont icon-xiangyou1" >
</view> </view>
</view> </view> -->
<view class="card_li" @click="topage(8)" v-if="info.role==3||info.role==2"> <view class="card_li" @click="topage(8)" v-if="info.role==3||info.role==2">
<view class="card_left"> <view class="card_left">
<image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode=""></image> <image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode=""></image>

View File

@ -49,7 +49,7 @@
车辆编号<span>{{orderInfo.device.areaName}}</span> 车辆编号<span>{{orderInfo.device.areaName}}</span>
</view> --> </view> -->
<view class="half_infoli"> <view class="half_infoli">
运营区域<span>{{orderInfo.device.areaName}}</span> 运营区域<span>{{orderInfo.area}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -139,7 +139,7 @@
</view> </view>
<view class="lines"></view> <view class="lines"></view>
<view class="cont" v-if="orderInfo.etRefund!=''"> <view class="cont" v-if="orderInfo.etRefund">
<view class="info_li"> <view class="info_li">
@ -183,8 +183,8 @@
bgc: { bgc: {
backgroundColor: "#F7FAFE", backgroundColor: "#F7FAFE",
}, },
latitude: 39.916527, latitude: 0,
longitude: 116.397128, longitude: 0,
isMap: false, isMap: false,
zoomSize: 15, zoomSize: 15,
markers: [], markers: [],
@ -355,8 +355,8 @@
// 线 // 线
this.orderInfo=res.data this.orderInfo=res.data
this.loading=true this.loading=true
this.latitude= parseFloat(this.orderInfo.device.latitude) this.latitude= parseFloat(this.orderInfo.latitude)
this.longitude= parseFloat(this.orderInfo.device.longitude ) this.longitude= parseFloat(this.orderInfo.longitude )
this.polyline[0].points = JSON.parse(res.data.tripRouteStr).map(coord => ({ this.polyline[0].points = JSON.parse(res.data.tripRouteStr).map(coord => ({
latitude: coord[1], latitude: coord[1],
longitude: coord[0] longitude: coord[0]