无网络 订单详情修改

This commit is contained in:
Sliverber 2024-07-22 17:47:13 +08:00
parent 39d758070e
commit 88b39cea1c
6 changed files with 520 additions and 113 deletions

View File

@ -27,7 +27,7 @@
</view>
<view class="btn" @click="sub" :class='videoUrl!="" ? "act1": ""'>
提交
下一步
</view>
</view>
</view>
@ -60,20 +60,36 @@
},
methods: {
sub(){
let data={
orderNo:this.orderinfo.orderNo,
videoUrl:this.videoUrl
}
this.$u.put('/appVerify/order/saveVideoUrl',data ).then((res) => {
// uni.hideLoading()
if (res.code === 200) {
uni.navigateBack({
delta: 1 // delta1
});
} else {
if(this.videoUrl!=''){
let data={
orderNo:this.orderinfo.orderNo,
videoUrl:this.videoUrl
}
})
this.$u.put('/appVerify/order/saveVideoUrl',data ).then((res) => {
// uni.hideLoading()
if (res.code === 200) {
uni.redirectTo({
url:'/pages/index/index?isupload=true'
})
// uni.navigateBack({
// delta: 1 // delta1
// });
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
})
}else{
uni.showToast({
title:'请上传录像',
icon: 'none',
duration: 2000
});
}
},
getisInOrder() {
// uni.showLoading({

View File

@ -2,7 +2,7 @@
<view class="page">
<u-navbar title="押金" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
height='45'></u-navbar>
<view class="norecord" v-if="userinfo.balance==0">
<view class="norecord" v-if="userinfo.balance==0&&showList==false">
<view class="card">
<view class="tit">充值押金</view>
<view class="tit">还车后<span style="color: #1E807A ;">随时可退</span></view>
@ -31,17 +31,21 @@
立即充值
</view>
</view>
<view class="record" v-if="userinfo.balance!=0">
<view class="record" v-if="userinfo.balance!=0||showList==true">
<view class="card" style="padding-top: 80rpx;">
<view class="tit" style="font-size: 32rpx;color: #808080;">
押金余额
</view>
<view class="tit"
style="margin-top: 18rpx;font-weight: 700;font-size: 92rpx;color: #3D3D3D;line-height: 72rpx;"><span
style="font-size: 52rpx;"></span>{{userinfo.balance}}</view>
<view class="btn " v-if="false">
充值
</view>
<view class="btn" @click="show=true">
<view class="btn" v-if="userinfo.balance!=0">
提现
</view>
<view class="btn " v-else="false" @click="sub4">
充值押金
</view>
</view>
<view class="card2" style="padding-bottom: 30rpx;">
<view class="card_top">
@ -200,7 +204,8 @@
showBack:false,
loadingmask:false,
ispaid:false,
showtxtip:false
showtxtip:false,
showList:false
}
@ -224,6 +229,9 @@
}
if(e.showList){
this.showList=true
}
},
@ -676,7 +684,7 @@
}
.btn {
margin-top: 100rpx;
margin-top: 40rpx;
display: flex;
align-items: center;
justify-content: center;

View File

@ -42,6 +42,18 @@
<view class="iconfont icon-xiangzuo" v-if="isCollapsed" @click="toggleOrderTips"></view>
</view>
<view class="swiper_tips" style="background: rgba(255, 197, 197, 0.7);" v-if="netonlines==false">
<view class="cont">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uJ4bst6OYzPYD8iEtyCJ" mode=""></image>
<view class="scroll-container" ref="scrollContainer">
<text class="txt"
style="font-weight: 400;font-size: 28rpx;color: #444444;">当前网络不可用请检查你的网络设置</text>
<!-- Duplicate the text for seamless scrolling -->
</view>
</view>
<!-- <view class="iconfont icon-xiangyou1" style="color: #444444;"></view> -->
</view>
</view>
@ -284,11 +296,11 @@
<image src="https://api.ccttiot.com/smartmeter/img/static/uHTCZOVUbmBkKW4G0wuF" mode="">
</image>
</view>
</view>
<view class="changebiketip" @click="tochange()">
换车骑行 <view class="iconfont icon-xiangyou1">
</view>
</view>
</view>
@ -308,8 +320,8 @@
<view class="bot" style="margin-top: 20rpx;" v-if="orderinfo.status==2">
<view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.status==3||OrderdeviceInfos.status==6"
@click="taploadmask (2)">
<view class="btn" style=" margin-right: 16rpx;"
v-if="OrderdeviceInfos.status==3||OrderdeviceInfos.status==6" @click="taploadmask (2)">
临时锁车
</view>
<view class="btn" style=" margin-right: 16rpx;" v-if="OrderdeviceInfos.status==4"
@ -857,6 +869,20 @@
</view>
</view>
</view>
<view class="bottom_park" v-if="showparkinfo">
<view class="tit">
{{parkinfo.parkingName}}
</view>
<view class="tip">
请根据手机引导将车辆有序停入停车点
</view>
<image class="close" src="https://lxnapi.ccttiot.com/bike/img/static/uVLkXSwvcYGioehd7dxn" mode=""
@click="showparkinfo=false"></image>
<image class="parkimg" :src="parkinfo.picture" mode="" v-if="parkinfo.picture!=null"></image>
<view class="gobtn" @click="mapFun(parkinfo.latitude,parkinfo.longitude,parkinfo.parkingName)">
导航去这里
</view>
</view>
<view class="fixdivce" v-if="showdevice&&false">
<view class="scrollable-content">
<view class="divce_li" v-for="(item,index) in nearbyMarkers" :key="index" @click="tapsn(item.sn)">
@ -893,6 +919,7 @@
export default {
data() {
return {
bgc: {
backgroundColor: "#F7FAFE",
},
@ -1021,7 +1048,11 @@
showordertxt: true,
orderwidth: 688,
isCollapsed: false
isCollapsed: false,
isupload: false,
showparkinfo: false,
parkinfo: {},
netonlines:false
}
},
watch: {
@ -1069,6 +1100,12 @@
this.qParam = e.qParam
}
if (e.isupload) {
this.isupload = true
setTimeout(() => {
this.taploadmask(4)
}, 1000)
}
if (this.gps.deptId == 101) {
if (this.showagre) {
@ -1140,82 +1177,102 @@
});
if (this.seeDetail == false) {
let that = this
uni.getLocation({
type: 'gcj02',
success: function(lb) {
// that.latitude = 23.440359
// that.longitude = 117.074552
// that.gps.latitude = 23.440359
// that.gps.longitude = 117.074552;
that.gps.latitude = lb.latitude;
that.gps.longitude = lb.longitude;
that.latitude = lb.latitude;
that.longitude = lb.longitude;
console.log(that.areaInfo, 'that.areaInfo');
that.getArea()
if (that.qParam != 'null' && that.showagre == false) {
let qParam = that.qParam
console.log(qParam, 'qParamqParamqParam');
// 2: URLq
let decodedUrl = decodeURIComponent(qParam);
// 3: 使URL
let sn = null;
let queryParams = decodedUrl.split('?')[1];
if (queryParams) {
let params = queryParams.split('&');
params.forEach(param => {
let [key, value] = param.split('=');
if (key === 'sn') {
sn = value;
let that = this
uni.getNetworkType({
success: function(res) {
console.log(res.networkType); // "wifi", "4g", "3g", "2g", "none"
if (res.networkType == 'none') {
that.netonlines = false
} else {
that.netonlines = true
uni.getLocation({
type: 'gcj02',
success: function(lb) {
// that.latitude = 23.440359
// that.longitude = 117.074552
// that.gps.latitude = 23.440359
// that.gps.longitude = 117.074552;
that.gps.latitude = lb.latitude;
that.gps.longitude = lb.longitude;
that.latitude = lb.latitude;
that.longitude = lb.longitude;
console.log(that.areaInfo, 'that.areaInfo');
that.getArea()
if (that.qParam != 'null' && that.showagre == false) {
let qParam = that.qParam
console.log(qParam, 'qParamqParamqParam');
// 2: URLq
let decodedUrl = decodeURIComponent(qParam);
// 3: 使URL
let sn = null;
let queryParams = decodedUrl.split('?')[1];
if (queryParams) {
let params = queryParams.split('&');
params.forEach(param => {
let [key, value] = param.split('=');
if (key === 'sn') {
sn = value;
}
});
}
that.sn = sn
if (that.sn != '') {
setTimeout(() => {
if (!that.orderinfo.status) {
that.deviceInfo(1)
that.qParam = null
// this.showdevice = true
// this.deviceIndex = 1
// this.type = 1
} else {
// this.showtcs=true
}
}, 700)
}
}
});
}
that.sn = sn
if (that.sn != '') {
setTimeout(() => {
if (!that.orderinfo.status) {
that.deviceInfo(1)
that.qParam = null
// this.showdevice = true
// this.deviceIndex = 1
// this.type = 1
} else {
// this.showtcs=true
}
}, 700)
}
// that.getmarks()
//
},
fail: function(error) {
uni.showToast({
title: '未获取到定位信息,请点击设置勾选允许位置信息,即可使用全部功能',
icon: 'none',
duration: 2000
});
// that.getmarks()
//
}
})
// console.log('');\
}
// that.getmarks()
//
},
fail: function(error) {
uni.showToast({
title: '未获取到定位信息,请点击设置勾选允许位置信息,即可使用全部功能',
icon: 'none',
duration: 2000
});
// that.getmarks()
//
}
});
})
} else {
this.getinfo()
}
@ -1274,7 +1331,18 @@
},
},
methods: {
tochange(){
mapFun() {
console.log('点击了');
uni.openLocation({
latitude: parseFloat(this.parkinfo.latitude),
// - /
longitude: parseFloat(this.parkinfo.longitude),
// - /
// name: "",
address: this.parkinfo.parkingName
});
},
tochange() {
uni.navigateTo({
url: '/page_user/changeCar'
})
@ -1402,6 +1470,7 @@
closemaske() {
this.maskloading = false
this.backfalse = 0
this.isupload = false
},
onMapTap(event) {
@ -1412,6 +1481,8 @@
this.freeInfo = {}
this.freeListIndex = 0
this.mappolyline = []
// this.showparkinfo=false
// this.parkinfo={}
// this.lastClickedMarkerId=null
// const {
// latitude,
@ -1473,9 +1544,18 @@
this.type = 0;
this.freeInfo = {};
this.freeListIndex = 0;
this.parkinfo = {}
this.showparkinfo = false
if (e.type === 'markertap') {
console.log('Clicked marker:', e.markerId);
let parkmark = this.parkingList.some(item => item.parkingId == e.markerId);
if (parkmark) {
const matchingItem = this.parkingList.find(item => item.parkingId == e.markerId);
this.showparkinfo = true
this.parkinfo = matchingItem
console.log(matchingItem, 'parkmarkparkmark');
e.stopPropagation();
}
const markerExists = this.listData.some(item => item.sn == e.markerId);
@ -1860,11 +1940,11 @@
this.maskepage = 0
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/uRxPPoVoqmnmng6wKlij'
if (num == 1) {
if (!this.checkBeforeUnlock()) {
return;
}
if (this.showxy) {
this.maskloading = true;
let percentage = 0;
@ -1925,11 +2005,14 @@
}, 2100);
} else if (num == 4) {
if (this.areaInfo.returnVerify == 1 && !this.orderinfo.videoUrl) {
if (this.areaInfo.returnVerify == 1 && this.isupload == false) {
this.maskloading = true
this.maskepage = 8
} else {
//
this.isupload = false
//
this.maskloading = true;
let percentage = 0;
const interval = setInterval(() => {
@ -1950,6 +2033,7 @@
}
},
Binddevice() {
uni.getBluetoothAdapterState({
success: function(res) {
@ -4936,6 +5020,63 @@
.page {
width: 750rpx;
.bottom_park {
padding: 40rpx 42rpx;
position: fixed;
bottom: 0;
left: 0;
z-index: 100;
width: 750rpx;
// height: 674rpx;
background: #FFFFFF;
border-radius: 40rpx 40rpx 0 0;
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
.gobtn {
margin-top: 30rpx;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 80rpx;
font-weight: 500;
font-size: 40rpx;
color: #FFFFFF;
background: #64B6A7;
border-radius: 30rpx;
}
.tit {
width: 100%;
font-weight: 600;
font-size: 36rpx;
color: #3D3D3D;
}
.tip {
margin-top: 12rpx;
width: 100%;
font-weight: 500;
font-size: 28rpx;
color: #808080;
}
.parkimg {
margin-top: 40rpx;
width: 672rpx;
height: 388rpx;
}
.close {
position: absolute;
right: 34rpx;
top: 50rpx;
width: 32rpx;
height: 32rpx;
}
}
.fixdivce {
padding: 12rpx 22rpx 12rpx 22rpx;
position: fixed;
@ -6024,7 +6165,8 @@
font-size: 36rpx;
color: #3D3D3D;
}
.changebiketip{
.changebiketip {
bottom: 20rpx;
left: 280rpx;
position: absolute;
@ -6035,6 +6177,7 @@
font-size: 28rpx;
color: #3D3D3D;
}
.cont {
margin-top: 30rpx;
display: flex;

View File

@ -310,7 +310,7 @@
// })
} else if (num == 1) {
uni.navigateTo({
url: '/page_user/yj'
url: '/page_user/yj?showList=true'
})
} else if (num == 2) {
uni.navigateTo({

View File

@ -48,7 +48,7 @@
车辆绑定
</view>
</view>
<view class="cont" @click="topage(6)" v-if="userId==info.appUserId">
<view class="cont" @click="topage(6)" >
<image src="https://lxnapi.ccttiot.com/bike/img/static/u47okd0YdEQBsyhLlQIt" mode="" style="width: 50rpx;height: 50rpx;"></image>
<view class="text">
账户明细

View File

@ -119,7 +119,7 @@
</view>
<view class="lines"></view>
<view class="info_tit" v-if="orderInfo.videoUrl!=''">
<view class="info_tit" v-if="orderInfo.videoUrl!=null">
视频审核
<view class="vadio_type" v-if="orderInfo.status==5">
待审核
@ -134,7 +134,7 @@
待官方审核
</view>
</view>
<view class="vadio_box" v-if="orderInfo.videoUrl!=''">
<view class="vadio_box" v-if="orderInfo.videoUrl!=null">
<video :src="orderInfo.videoUrl" controls="controls" style="width: 100%;"
@fullscreenchange="handleFullscreenChange"></video>
@ -251,10 +251,18 @@
退款
</view>
</view> -->
<view class="bot_btn">
<view class="btn" @click="backfee()">
<view class="btn" @click="backfee()" v-if='orderInfo.paid==1'>
退款
</view>
<view class="btn" @click="showfzhc=true" v-if=' orderInfo.status==0||orderInfo.status==2'>
辅助还车
</view>
<view class="btn" @click="showgj=true" v-if=' orderInfo.status==1||orderInfo.status==3'>
改价
</view>
<view class="btn" @click="pass()" v-if="orderInfo.status==5">
审核通过
</view>
@ -274,6 +282,83 @@
</view>
<u-mask :show="showload" :z-index='100' />
<u-mask :show="show" @click="show = false" :z-index='100' />
<u-mask :show="showfzhc" @click="show = false" :z-index='100' />
<u-mask :show="showgj" :z-index='100' />
<view class="tip_box1" v-if="showgj">
<view class="top1">
<view class="tip">
改价
</view>
<view class="ipt_box">
<view class="text">
运营区外调度费
</view>
<view class="ipt">
<input type="text" v-model="orderInfo.dispatchFee" placeholder="0.00" class="input"
placeholder-style="color:#C7CDD3">
</view>
</view>
<view class="ipt_box">
<view class="text">
停车点外调度费
</view>
<view class="ipt">
<input type="text" v-model="orderInfo.manageFee" placeholder="0.00" class="input"
placeholder-style="color:#C7CDD3">
</view>
</view>
<view class="ipt_box">
<view class="text">
骑行费
</view>
<view class="ipt">
<input type="text" v-model="orderInfo.ridingFee" placeholder="0.00" class="input"
placeholder-style="color:#C7CDD3">
</view>
</view>
<view class="ipt_box">
<view class="text">
预约费
</view>
<view class="ipt">
<input type="text" v-model="orderInfo.appointmentFee" placeholder="0.00" class="input"
placeholder-style="color:#C7CDD3">
</view>
</view>
</view>
<view class="bot1">
<view class="bot_left" @click="showgj=false">
取消
</view>
<view class="bot_right" @click="changeMoney()">
确定
</view>
</view>
</view>
<view class="tip_box1" v-if="showfzhc">
<view class="top1">
<view class="tip">
提示
</view>
<view class="txt">
确定要辅助还车吗
</view>
</view>
<view class="bot1">
<view class="bot_left" @click="closefz()">
取消
</view>
<view class="bot_right" @click="backDevice()">
确定
</view>
</view>
</view>
<view class="tip_box" v-if="showtk">
<view class="top" v-if="showtk">
<view class="tip">
@ -404,7 +489,8 @@
money: '',
areaNum: 1,
showload:false,
showfzhc:false,
showgj:false
}
},
@ -456,6 +542,57 @@
},
methods: {
//
changeMoney() {
let data = {
orderNo: this.orderInfo.orderNo,
dispatchFee: this.orderInfo.dispatchFee,
manageFee: this.orderInfo.manageFee,
ridingFee: this.orderInfo.ridingFee,
appointmentFee: this.orderInfo.appointmentFee,
}
this.$u.put('/appVerify/order/editPrice', data).then((res) => {
if (res.code === 200) {
// 线
this.showgj = false
this.getOrderDetail()
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
},
closefz() {
// this.show = false
this.showfzhc = false
// this.orderInfo = {}
},
backDevice() {
this.$u.post('/appVerify/device/return?orderNo=' + this.orderInfo.orderNo + '&returnType=2').then((
res) => {
if (res.code === 200) {
// 线
// this.show = false
this.showfzhc = false
this.getOrderDetail()
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
},
ckmoney() {
uni.showLoading({
title:'加载中...'
@ -970,7 +1107,110 @@
color: #3D3D3D;
}
}
.tip_box1 {
position: fixed;
left: 72rpx;
top: 628rpx;
width: 610rpx;
// height: 282rpx;
background: #FFFFFF;
border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 110;
padding-bottom: 100rpx;
.top1 {
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;
}
}
.bot1 {
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;
}
}
}
.tip_box {
position: fixed;
left: 72rpx;