diff --git a/page_user/vadio_back.vue b/page_user/vadio_back.vue
index 350975a..b0edac6 100644
--- a/page_user/vadio_back.vue
+++ b/page_user/vadio_back.vue
@@ -19,7 +19,7 @@
-
+
提交
@@ -36,7 +36,11 @@
videoPath: '',
imglist:[],
token: '',
- upurl:''
+ upurl:'',
+ orderinfo:{},
+ userId:'',
+ videoUrl:''
+
}
},
onLoad(e) {
@@ -45,9 +49,69 @@
},
onShow() {
this.getQiniuToken()
+ this.getuserInfo()
},
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 // delta值为1时表示返回的页面层数
+ });
+ } else {
+
+ }
+ })
+ },
+ getisInOrder() {
+ // uni.showLoading({
+ // })
+ this.orderinfo = {}
+ if (this.userId) {
+ this.$u.post('/app/user/isInOrder?userId=' + this.userId, ).then((res) => {
+ // uni.hideLoading()
+ if (res.code === 200) {
+ // this.freList=res.rows
+ this.orderinfo=res.data
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ }
+
+ },
+ getuserInfo() {
+
+ this.$u.get("/getAppInfo").then((res) => {
+
+ if (res.code == 200) {
+
+ this.$store.commit('SET_USERID', res.user.userId);
+ this.info = res.user
+ this.userId=res.user.userId
+ this.getisInOrder()
+ // if( res.user.role==2){
+ // uni.navigateTo({
+ // url:'/page_fix/fix_index'
+ // })
+ // }
+ } else {
+
+
+
+ }
+ });
+ },
getQiniuToken() {
console.log('diaou');
this.$u.get("/common/qiniu/uploadInfo").then((res) => {
@@ -97,7 +161,7 @@
console.log(res,'resres');
let str = JSON.parse(res.data)
console.log(str.key)
- _this.userImgs = _this.upurl +'/'+ str.key
+ _this.videoUrl = _this.upurl +'/'+ str.key
console.log(_this.userImgs)
// _this.imglist.push(_this.userImgs)
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 99fa823..a3501c2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -823,6 +823,30 @@
+
+
+
+
+ 还车提示
+
+
+
+ 还车前需前往拍照确保车辆是否完好，还车成功且审核通过 将退还押金
+
+
+
+
+
+
+
+ 返回
+
+
+
+ 去拍照
+
+
+
@@ -954,9 +978,9 @@
maskloading: false,
toploadtxt: "开锁中0%",
- loadimg: 'https://lxnapi.ccttiot.com/bike/img/static/urJQJnOI1DEjWatFqHYh',
+ loadimg: 'https://lxnapi.ccttiot.com/bike/img/static/uRxPPoVoqmnmng6wKlij',
tiptxt: '请定点停放，规范用车',
- maskepage: 0,
+ maskepage:0 ,
backgps: {},
buletxt: '',
@@ -1241,6 +1265,14 @@
},
},
methods: {
+ tovadio(){
+ // this.seeDetail=true
+ this.maskepage=0
+ this.maskloading=false
+ uni.navigateTo({
+ url:'/page_user/vadio_back'
+ })
+ },
toggleOrderTips() {
this.isCollapsed = !this.isCollapsed;
},
@@ -1766,7 +1798,7 @@
if (res.code === 200) {
this.opencar()
this.backfalse = 0
- this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '开锁成功';
this.buletxt = '开锁成功';
this.lastClickedMarkerId = null
@@ -1812,7 +1844,7 @@
},
taploadmask(num) {
this.maskepage = 0
- this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/urJQJnOI1DEjWatFqHYh'
+ this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/uRxPPoVoqmnmng6wKlij'
if (num == 1) {
if (!this.checkBeforeUnlock()) {
return;
@@ -1880,22 +1912,28 @@
}, 2100);
} else if (num == 4) {
- //还车校验
- this.maskloading = true;
- let percentage = 0;
- const interval = setInterval(() => {
- if (percentage < 98) {
- percentage += 2; // 每次增加的百分比，可以调整
- this.toploadtxt = `还车地点校验中${percentage}%`;
- } else {
- clearInterval(interval);
- this.toploadtxt = "还车地点校验中98%";
- }
- }, 40); // 每40毫秒更新一次，可以调整
- setTimeout(() => {
- this.cheackgps();
- }, 2100);
-
+ if(this.areaInfo.returnVerify==0&&this.orderinfo.videoUrl!=''){
+ this.maskloading = true
+ this.maskepage=8
+ }else{
+ //还车校验
+ this.maskloading = true;
+ let percentage = 0;
+ const interval = setInterval(() => {
+ if (percentage < 98) {
+ percentage += 2; // 每次增加的百分比，可以调整
+ this.toploadtxt = `还车地点校验中${percentage}%`;
+ } else {
+ clearInterval(interval);
+ this.toploadtxt = "还车地点校验中98%";
+ }
+ }, 40); // 每40毫秒更新一次，可以调整
+ setTimeout(() => {
+ this.cheackgps();
+ }, 2100);
+
+ }
+
}
},
@@ -1983,8 +2021,6 @@
}, 5000)
},
-
-
cheackgps() {
let that = this
uni.getLocation({
@@ -2037,7 +2073,7 @@
// that.close()
// that.getisInOrder()
that.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
that.toploadtxt = '还车成功！';
setTimeout(() => {
that.maskloading = false;
@@ -2091,7 +2127,7 @@
that.backfalse = 0
that.isbackdevice = false
that.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
that.toploadtxt = '还车成功！';
setTimeout(() => {
that.maskloading = false;
@@ -2137,7 +2173,7 @@
// // that.reboot()
// // that.isbackdevice = false
- // // that.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ // // that.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
// // that.toploadtxt = '还车成功！';
// // setTimeout(() => {
// // that.maskloading = false;
@@ -2214,7 +2250,7 @@
// res.code=500
if (res.code === 200) {
this.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '还车成功!';
this.backfalse = 0
setTimeout(() => {
@@ -2270,7 +2306,7 @@
this.backfalse = 0
this.isbackdevice = false
this.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '还车成功！';
this.buletxt = '还车成功！';
setTimeout(() => {
@@ -2319,7 +2355,7 @@
res) => {
if (res.code === 200) {
- this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '还车成功!';
this.backfalse = 0
setTimeout(() => {
@@ -2400,7 +2436,7 @@
// res.code=500
// res.msg='低电量不得骑行'
if (res.code === 200) {
- this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '开锁成功';
this.lastClickedMarkerId = null
this.mappolyline = []
@@ -2671,7 +2707,7 @@
if (res.code === 200) {
this.backfalse = 0
this.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '开锁成功';
this.buleopen = false
setTimeout(() => {
@@ -2730,7 +2766,7 @@
// console.log('发送了离线开锁请求');
// that.getisInOrder()
that.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
that.buletxt = '解锁成功';
that.toploadtxt = '解锁成功'
that.backfalse = 0
@@ -2803,7 +2839,7 @@
// this.getisInOrder()
this.backfalse = 0
this.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
this.toploadtxt = '锁车成功';
this.buleclose = false
setTimeout(() => {
@@ -2868,7 +2904,7 @@
that.buleclose = false
that.backfalse = 0
that.loadimg =
- 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ 'https://lxnapi.ccttiot.com/bike/img/static/ukD735zCS1yQXw2aGun8';
that.buletxt = '锁车成功';
that.toploadtxt = '锁车成功'
setTimeout(() => {
diff --git a/pages/my.vue b/pages/my.vue
index 969efc4..9a41d21 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -360,10 +360,18 @@
url: '/page_user/khfw/khfw'
})
} else if (num == 11) {
-
- uni.navigateTo({
- url: '/page_user/idcard_test'
- })
+ if(info.idCard==''){
+ uni.navigateTo({
+ url: '/page_user/idcard_test'
+ })
+ }else{
+ uni.showToast({
+ title: '实名授权已完成',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+
}
},
diff --git a/pages_admin/admin_order.vue b/pages_admin/admin_order.vue
index 6edf98a..ec21199 100644
--- a/pages_admin/admin_order.vue
+++ b/pages_admin/admin_order.vue
@@ -45,9 +45,13 @@
待支付
+
已完成
+
+ 待审核
+
@@ -430,7 +434,104 @@
-
+
+
+
+
+
+
+ 订单编号：{{item.orderNo}}
+
+
+
+ 进行中
+
+
+
+ 待支付
+
+
+
+ 已完成
+
+
+
+
+
+
+
+
+ 租赁用户：{{item.phonenumber}}
+
+
+ 用户姓名：{{item.realName}}
+
+
+ 用户姓名：--
+
+
+
+
+ 车辆编号：{{item.sn}}
+
+
+ 租赁时长：{{computedList(item)}}
+
+
+
+
+
+ 订单费用：{{item.totalFee}}元
+
+
+
+ 有无退款：无
+ 有
+
+
+
+
+
+ 开始时间：{{formatDate(item.createTime)}}
+
+
+ 车牌号：{{item.vehicleNum}}
+
+
+ 车牌号：--
+
+
+
+ 开关时间：{{item.unlock_time}} {{ item.return_time ? item.return_time : '--' }}
+
+
+
+
+
+ 辅助还车
+
+
+ 改价
+
+
+ 退款
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
@@ -631,6 +732,8 @@
],
typeidx: '2',
+ areainfo:{},
+ passList:[]
}
},
@@ -643,6 +746,7 @@
if (uni.getStorageSync('adminAreaid')) {
this.areaId = uni.getStorageSync('adminAreaid')
this.orderList()
+ this.getArea()
}
},
@@ -670,6 +774,24 @@
},
methods: {
+ getArea() {
+
+ let id = this.areaId
+ this.$u.get("/app/area/" + id).then((res) => {
+
+ if (res.code == 200) {
+
+ this.areainfo=res.data
+
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
+ },
formatDate(value) {
if (!value) return '';
let date = new Date(value);
@@ -983,6 +1105,41 @@
}).catch(error => {
console.error("Error fetching area data:", error);
});
+
+ },
+ orderList4() {
+ let data = {};
+ if (this.typeidx == 1) {
+ data = {
+ phonenumber: this.searchKeyword,
+ type: '1',
+ statusList: '5,6',
+ startTime: this.firsTime,
+ endTime: this.lasTime,
+ areaId: this.areaId
+ };
+ } else if (this.typeidx == 2) { // 修改条件为 this.typeidx == 2
+ data = {
+ vehicleNum: this.searchKeyword,
+ type: '1',
+ statusList: '5,6',
+ startTime: this.firsTime,
+ endTime: this.lasTime,
+ areaId: this.areaId
+ };
+ }
+ this.loading = false
+ this.$u.get('/appVerify/order/list?', data).then((res) => {
+ if (res.code === 200) {
+ // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
+ this.passList = res.rows
+ this.loading = true
+ this.curtitidx = 4
+ // console.log(this.polyline);
+ }
+ }).catch(error => {
+ console.error("Error fetching area data:", error);
+ });
},
orderList3() {
let data = {};
@@ -1028,7 +1185,10 @@
this.orderList2()
} else if (idx == 3) {
this.orderList3()
+ } else if (idx == 4) {
+ this.orderList4()
}
+
},
swiperchange(e) {
this.curtitidx = e.detail.current
@@ -1045,6 +1205,8 @@
this.orderList2()
} else if (this.curtitidx == 3) {
this.orderList3()
+ }else if (this.curtitidx ==4 ) {
+ this.orderList4()
}
},
@@ -1058,8 +1220,11 @@
this.orderList2()
} else if (this.curtitidx == 3) {
this.orderList3()
+ }else if (this.curtitidx ==4 ) {
+ this.orderList4()
}
+
},
search() {
clearTimeout(timerId1);
@@ -1072,8 +1237,11 @@
this.orderList2()
} else if (this.curtitidx == 3) {
this.orderList3()
+ }else if (this.curtitidx ==4 ) {
+ this.orderList4()
}
+
}, 500);
// 根据关键字过滤 this.classlist
diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue
index 36072c8..3a421cc 100644
--- a/pages_admin/order/device_detail.vue
+++ b/pages_admin/order/device_detail.vue
@@ -1771,110 +1771,112 @@
}
}
- .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;
+ // .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;
+ // .top {
+ // padding: 52rpx 38rpx 42rpx 36rpx;
- .ipt_box {
- margin-top: 22rpx;
- display: flex;
- flex-wrap: nowrap;
- align-items: center;
+ // .ipt_box {
+ // margin-top: 22rpx;
+ // display: flex;
+ // flex-wrap: nowrap;
+ // align-items: center;
- .text {
- width: 96rpx;
- font-weight: 400;
- font-size: 32rpx;
- color: #3D3D3D;
- }
+ // .text {
+ // width: 96rpx;
+ // 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;
+ // .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%;
- }
- }
- }
+ // .input {
+ // width: 80%;
+ // }
+ // }
+ // }
- .tip {
- width: 100%;
- text-align: center;
- font-weight: 700;
- font-size: 32rpx;
- color: #3D3D3D;
- }
+ // .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;
- }
- }
+ // .txt {
+ // margin-top: 32rpx;
+ // width: 100%;
+ // text-align: center;
+ // font-weight: 500;
+ // font-size: 32rpx;
+ // color: #3D3D3D;
+ // }
+ // }
- .bot {
- position: absolute;
+ // .bot {
+ // position: absolute;
- width: 610rpx;
- // border-top: 2rpx solid #D8D8D8;
- display: flex;
- flex-wrap: nowrap;
- // height: 100%;
- bottom: -20rpx;
+ // 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_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;
+ // .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;
- }
+ // }
- }
- }
+ // }
+ // }
+
+
.bot_btn {
position: fixed;
bottom: 0;
diff --git a/pages_admin/order/order_detail.vue b/pages_admin/order/order_detail.vue
index 57d183d..4e36810 100644
--- a/pages_admin/order/order_detail.vue
+++ b/pages_admin/order/order_detail.vue
@@ -3,8 +3,7 @@
-
+
视频审核
-
+
待审核
-
+
设备损坏
-
+
审核通过
-
-
-
-
-
-
-
-
-
- 提交时间：02-11 15:06:45
-
-
-
-
-
-
-
-
- 通过
-
-
- 有损坏
-
+
+
+
+
+
+
+
+
+
+ 提交时间：02-11 15:06:45
+
+
+
+
+
+
+
+
+ 通过
+
+
+ 有损坏
+
电话沟通
-
-
-
-
+
+
+
+
-
+
@@ -310,6 +310,32 @@
+
+
+
+
+ 押金扣款
+
+
+
+
+ 扣款金额
+
+
+ 元
+
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
@@ -343,7 +369,10 @@
showtk: false,
show: false,
_mapContext: null,
- showpark:true
+ showpark: true,
+ showck:true,
+ money:'',
+ areaNum:1
}
@@ -352,21 +381,21 @@
this._mapContext = uni.createMapContext("map", this); //map为map组件id
},
mounted() {
- // this.onRegionChange();
- },
+ // this.onRegionChange();
+ },
onLoad(e) {
this.orderId = e.id
this.getOrderDetail()
-
-
-
+
+
+
// this.getParking()
},
// onReady() {
// // 确保地图组件已加载完成
// console.log(this._mapContext, 'this._mapContext');
-
+
// this._mapContext.addGroundOverlay({
// id: 11,
// src: `https://lxnapi.ccttiot.com/bike/img/static/uXRz2sbToNsqckQQjnLo`, // 手绘地图素材路径
@@ -389,23 +418,52 @@
// console.log("显示失败", e);
// },
// });
-
+
// // this.getParking();
// },
components: {
},
methods: {
- handleFullscreenChange(e) {
- // 这里可以通过 e.detail 来获取全屏状态的信息（如果有的话）
- // 但请注意，不同平台和浏览器可能返回的信息不同
- console.log('全屏状态变化', e.detail);
- if(e.detail.fullScreen){
- this.showpark=false
- }else{
- this.showpark=true
- }
- },
+ ckmoney(){
+
+ },
+ unpass(){
+ let data ={
+ orderNo:this.orderId,
+ "status": "6"
+ }
+ this.$u.put("/appVerify/order/damaged" ,data ).then((res) => {
+ if (res.code === 200) {
+ // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
+ this.getOrderDetail()
+
+ }
+ }).catch(error => {
+ console.error("Error fetching area data:", error);
+ });
+ },
+ pass() {
+ this.$u.post("/appVerify/passAudit/" + this.orderId).then((res) => {
+ if (res.code === 200) {
+ // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
+ this.getOrderDetail()
+
+ }
+ }).catch(error => {
+ console.error("Error fetching area data:", error);
+ });
+ },
+ handleFullscreenChange(e) {
+ // 这里可以通过 e.detail 来获取全屏状态的信息（如果有的话）
+ // 但请注意，不同平台和浏览器可能返回的信息不同
+ console.log('全屏状态变化', e.detail);
+ if (e.detail.fullScreen) {
+ this.showpark = false
+ } else {
+ this.showpark = true
+ }
+ },
displayAmount(amount) {
return amount ? amount : '--';
},
@@ -721,7 +779,11 @@
if (res.code === 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
this.orderInfo = res.data
- this.getArea()
+ this.areaNum=this.areaNum+1
+ if(this.areaNum!=0){
+ this.getArea()
+ }
+
this.loading = true
this.latitude = parseFloat(this.orderInfo.latitude)
@@ -782,7 +844,7 @@
padding-bottom: 200rpx;
width: 750rpx;
-
+
.tip_box {
position: fixed;
left: 72rpx;
@@ -845,7 +907,7 @@
}
}
- .bot {
+ .bots {
position: absolute;
width: 610rpx;
@@ -854,7 +916,7 @@
flex-wrap: nowrap;
// height: 100%;
bottom: -20rpx;
- z-index: 99;
+
.bot_left {
border-radius: 0rpx 0rpx 0rpx 30rpx;
width: 50%;
@@ -932,13 +994,14 @@
font-size: 32rpx;
color: #4C97E7;
}
- .vadio_type{
+
+ .vadio_type {
margin-left: auto;
padding: 5rpx 34rpx;
-
+
background: #FFFAE6;
border-radius: 8rpx 8rpx 8rpx 8rpx;
-
+
font-weight: 400;
font-size: 28rpx;
color: #FFCC00;
@@ -950,25 +1013,29 @@
// height: 2rpx;
border-bottom: 2rpx solid #E7E7E7;
}
-
- .vadio_box{
+
+ .vadio_box {
padding: 26rpx 28rpx;
- .vadio_li{
+
+ .vadio_li {
display: flex;
flex-wrap: nowrap;
+
// justify-content: space-between;
- .vadio_info{
+ .vadio_info {
margin-left: auto;
font-weight: 400;
font-size: 24rpx;
color: #979797;
}
- .btn_box{
+
+ .btn_box {
display: flex;
flex-wrap: nowrap;
align-items: center;
- margin-left: auto;
- .vadio_btn{
+ margin-left: auto;
+
+ .vadio_btn {
margin-left: 10rpx;
padding: 6rpx 44rpx;
background: #4C97E7;
@@ -978,9 +1045,10 @@
color: #FEFFFE;
}
}
-
+
}
}
+
.cont {
padding: 26rpx 28rpx;