111
This commit is contained in:
parent
55f3974337
commit
00cb6ab410
|
|
@ -98,7 +98,7 @@
|
|||
.cont {
|
||||
position: fixed;
|
||||
// left: 60rpx;
|
||||
bottom: 10rpx;
|
||||
bottom: 0rpx;
|
||||
width: 750rpx;
|
||||
height: 118rpx;
|
||||
background: #FFFFFF;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'height='36'></u-navbar>
|
||||
<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'height='40'></u-navbar>
|
||||
<view class="cont">
|
||||
<view class="tit">
|
||||
输入编号开锁
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
</view>
|
||||
<view class="ipt">
|
||||
|
||||
<input type="text" class="ips" v-model="code" placeholder="请输入车辆二维码下方编号" placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
|
||||
<input type="text" class="ips" v-model="sn" placeholder="请输入车辆二维码下方编号" placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
|
||||
</view>
|
||||
<view class="btn" @click="sub">
|
||||
确认开锁
|
||||
|
|
@ -27,21 +27,84 @@
|
|||
bgc: {
|
||||
backgroundColor: "#fff",
|
||||
},
|
||||
code:''
|
||||
sn:''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
sub(){
|
||||
if(this.code==''){
|
||||
if(this.sn==''){
|
||||
uni.showToast({
|
||||
title: '请输入设备编号',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}else{
|
||||
let that = this
|
||||
if(uni.getStorageSync('token')){
|
||||
this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/index/index?sn='+this.code
|
||||
})
|
||||
}else{
|
||||
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
})
|
||||
}else{
|
||||
wx.login({
|
||||
success(res) {
|
||||
if (res.code) {
|
||||
console.log('登录！', res);
|
||||
let data = {
|
||||
wxOpenId: res.code,
|
||||
|
||||
};
|
||||
let areaId=uni.getStorageSync('areaId');
|
||||
that.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{
|
||||
uni.hideLoading();
|
||||
if (res.code == 200) {
|
||||
uni.setStorageSync('token', res.token);
|
||||
that.$u.get('/app/device/info?sn=' + that.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/index/index?sn='+this.code
|
||||
})
|
||||
}else{
|
||||
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
}else if(res.code == 501){
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}else {
|
||||
// console.log("老用户登录",res.data)
|
||||
uni.redirectTo({
|
||||
url:'/pages/login/login'
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="费用明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='36'></u-navbar>
|
||||
<u-navbar title="费用明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='40'></u-navbar>
|
||||
<view class="tit">
|
||||
<view class="left">电单车</view>
|
||||
<!-- <view class="right">查看计费规则 ></view> -->
|
||||
|
|
@ -160,3 +160,140 @@
|
|||
}
|
||||
}
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="查看停车点" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
|
||||
<view class="bottom_box">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline">
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="card" v-for="(item, index) in computedList" :key="index">
|
||||
<view class="top_li">
|
||||
<view class="left">
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="info">
|
||||
时间：{{ item.payTime }}
|
||||
时间：{{ item.createTime }}
|
||||
</view>
|
||||
<view class="info">
|
||||
时长：{{ item.duration }}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="故障上报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="cardbox">
|
||||
<view class="tip">
|
||||
<view class="ipnt">*</view>故障车编号
|
||||
|
|
@ -290,7 +290,7 @@
|
|||
btn() {
|
||||
let _this = this
|
||||
let math = 'static/' + _this.$u.guid(20)
|
||||
uni.chooseMessageFile({
|
||||
uni.chooseImage({
|
||||
count: 9,
|
||||
type: 'all',
|
||||
success(res) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="认证" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="ipt_box">
|
||||
<view class="li">
|
||||
<view class="left">
|
||||
|
|
@ -75,7 +75,9 @@
|
|||
};
|
||||
this.$u.get('/appVerify/user/authentication?', data).then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.getisInOrder()
|
||||
uni.navigateBack({
|
||||
delta: 1 // delta值为1时表示返回的页面层数
|
||||
});
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="计费规则" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="cont" style="margin-top: 50rpx;">
|
||||
<view class="tit" style="margin-top: 50rpx;">
|
||||
骑行服务费
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
|
||||
<view class="bot_btn">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="确认开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
|
||||
<view class="bot_btn">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="问题上报详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="cont">
|
||||
<view class="cont_top">
|
||||
<view class="tit">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="问题上报记录" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="card" v-for="(item,index) in list" :key="index" @click="topage(item)" v-if="list.length>=0">
|
||||
<view class="top_li">
|
||||
<view class="left">
|
||||
|
|
@ -11,8 +11,10 @@
|
|||
处理完成 <view class="iconfont icon-xiangyou1"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="info">
|
||||
<view class="info" v-if="!item.address">
|
||||
反馈地点：--
|
||||
</view>
|
||||
<view class="info" v-if="item.address">
|
||||
反馈地点：{{item.address}}
|
||||
</view>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="行程结束" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
|
||||
<view class="bot_btn" v-if="false">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="用车指南" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="cont">
|
||||
<view class="tit">
|
||||
请在运营区内骑行，否则将断电
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<view class="page">
|
||||
<u-navbar title="押金" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
|
||||
height='36'></u-navbar>
|
||||
height='40'></u-navbar>
|
||||
<view class="norecord" v-if="userinfo.balance==0">
|
||||
<view class="card">
|
||||
<view class="tit">充值押金</view>
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
data() {
|
||||
return {
|
||||
bgc: {
|
||||
backgroundColor: "#7bb2ec",
|
||||
backgroundColor: "#F7FAFE",
|
||||
},
|
||||
show: false,
|
||||
bindDeviceNum: null,
|
||||
|
|
@ -221,13 +221,15 @@
|
|||
});
|
||||
},
|
||||
sub4() {
|
||||
let id = uni.getStorageSync('areaId');
|
||||
let data = {
|
||||
userId: this.userId,
|
||||
|
||||
// ruleId: this.freeInfo.ruleId,
|
||||
money: this.areaInfo.deposit,
|
||||
mark: "押金充值",
|
||||
type: '4'
|
||||
type: '4',
|
||||
areaId:this.areaId
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,15 @@
|
|||
<view class="page">
|
||||
<!-- <u-navbar :is-back="false" title="共享电动车" :border-bottom="false" :background="bgc" title-color='#2E4975'
|
||||
title-size='36' height='36'></u-navbar> -->
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap">
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" show-location v-if="showmap"
|
||||
:latitude="latitude" :longitude="longitude" :show-location="true" :markers="markers" :polygons="polyline"
|
||||
@markertap="onMarkerTap">
|
||||
|
||||
</map>
|
||||
<view class="my-location">
|
||||
<view class="img" src="https://course.jchen.art/static/images/icon-location.png"
|
||||
@click="getMyLocation"></view>
|
||||
</view>
|
||||
<view class="botmbox2" v-if="showdevice">
|
||||
<view class="close" @click="close()">
|
||||
<image src="https://lxnapi.ccttiot.com/bike/img/static/uBeBBKwQu2K2ZBdT7iN7" mode=""></image>
|
||||
|
|
@ -317,8 +323,7 @@
|
|||
</view>
|
||||
<view class="botmbox" v-if="showindex==0">
|
||||
<view class="top_btn" @click="qecodelock()">
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/un6Wi8CefEjy04qzvn67" mode=""
|
||||
></image>
|
||||
<image src="https://api.ccttiot.com/smartmeter/img/static/un6Wi8CefEjy04qzvn67" mode=""></image>
|
||||
扫码开锁
|
||||
</view>
|
||||
|
||||
|
|
@ -639,7 +644,8 @@
|
|||
areaInfo: {},
|
||||
// feeInfo:{},
|
||||
showfeeDetail: false,
|
||||
seeDetail:false
|
||||
seeDetail: false,
|
||||
showmap:true
|
||||
|
||||
// userId:this.$store.getters.userId,
|
||||
}
|
||||
|
|
@ -706,14 +712,7 @@
|
|||
},
|
||||
onShow() {
|
||||
if (this.seeDetail == false) {
|
||||
if (uni.getStorageSync('token')) {
|
||||
this.$store.dispatch('userInfo', this.$u).then(() => {
|
||||
|
||||
// 执行其他操作...
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
if (uni.getStorageSync('role')) {
|
||||
let abb = uni.getStorageSync('role')
|
||||
|
||||
|
|
@ -732,10 +731,14 @@
|
|||
that.gps.longitude = lb.longitude;
|
||||
// that.gps.latitude = '26.940805',
|
||||
// that.gps.longitude = '120.356157';
|
||||
that.latitude= lb.latitude
|
||||
that.longitude= lb.longitude
|
||||
// that.getmarks()
|
||||
that.latitude = Number( lb.latitude.toFixed(5)) - 0.005
|
||||
that.longitude = Number( lb.longitude.toFixed(5)) + 0.005
|
||||
console.log(that.areaInfo,'that.areaInfo');
|
||||
if(!that.areaInfo.areaId){
|
||||
that.getArea()
|
||||
}
|
||||
// that.getmarks()
|
||||
|
||||
|
||||
//
|
||||
},
|
||||
|
|
@ -785,6 +788,12 @@
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
getMyLocation() {
|
||||
uni.createMapContext("map", this).moveToLocation({
|
||||
longitude: this.longitude,
|
||||
latitude: this.latitude,
|
||||
});
|
||||
},
|
||||
// 查看费用详情
|
||||
tofeeDetail() {
|
||||
uni.navigateTo({
|
||||
|
|
@ -1390,9 +1399,44 @@
|
|||
// url:''
|
||||
// })
|
||||
} else if (num == 1) {
|
||||
let that = this
|
||||
wx.login({
|
||||
success(res) {
|
||||
if (res.code) {
|
||||
console.log('登录！', res);
|
||||
let data = {
|
||||
wxOpenId: res.code,
|
||||
|
||||
};
|
||||
let areaId=uni.getStorageSync('areaId');
|
||||
that.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{
|
||||
uni.hideLoading();
|
||||
if (res.code == 200) {
|
||||
uni.setStorageSync('token', res.token);
|
||||
uni.navigateTo({
|
||||
url: '/page_user/yj'
|
||||
})
|
||||
|
||||
|
||||
}else if(res.code == 501){
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}else {
|
||||
// console.log("老用户登录",res.data)
|
||||
uni.redirectTo({
|
||||
url:'/pages/login/login'
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
|
||||
} else if (num == 2) {
|
||||
uni.navigateTo({
|
||||
url: '/page_user/jfgz'
|
||||
|
|
@ -1468,7 +1512,8 @@
|
|||
},
|
||||
sub5() {
|
||||
if (this.orderinfo.ruleId) {
|
||||
this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
|
||||
this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' +
|
||||
this
|
||||
.orderinfo.ruleId + '&type=2' + '&orderNo=' + this.orderinfo.orderNo).then((res) => {
|
||||
if (res.code === 200) {
|
||||
uni.showLoading({
|
||||
|
|
@ -1606,7 +1651,8 @@
|
|||
|
||||
|
||||
}
|
||||
this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
|
||||
this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' +
|
||||
this
|
||||
.freeInfo.ruleId).then((res) => {
|
||||
this.seeDetail = false
|
||||
if (res.code === 200) {
|
||||
|
|
@ -1824,7 +1870,7 @@
|
|||
findBike() {
|
||||
this.$u.post('/app/device/ring?sn=' + this.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.deviceInfos = res.data
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
@ -1832,21 +1878,87 @@
|
|||
if (e.type === 'markertap') {
|
||||
console.log('点击了标记：', e.markerId);
|
||||
// 这里可以根据需要处理点击标记的逻辑
|
||||
// 阻止事件冒泡
|
||||
this.showindex = 0
|
||||
this.showdevice = true
|
||||
// 阻止事件冒泡\
|
||||
this.sn = e.markerId
|
||||
this.deviceInfo()
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
deviceInfo() {
|
||||
let that = this
|
||||
if(uni.getStorageSync('token')){
|
||||
this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
this.deviceInfos = res.data
|
||||
this.showindex = 0
|
||||
this.showdevice = true
|
||||
}else{
|
||||
this.showdevice = false
|
||||
this.deviceIndex = 0
|
||||
this.type = 0
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
})
|
||||
}else{
|
||||
wx.login({
|
||||
success(res) {
|
||||
if (res.code) {
|
||||
console.log('登录！', res);
|
||||
let data = {
|
||||
wxOpenId: res.code,
|
||||
|
||||
};
|
||||
let areaId=uni.getStorageSync('areaId');
|
||||
that.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{
|
||||
uni.hideLoading();
|
||||
if (res.code == 200) {
|
||||
uni.setStorageSync('token', res.token);
|
||||
that.$u.get('/app/device/info?sn=' + that.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
that.deviceInfos = res.data
|
||||
that.showindex = 0
|
||||
that.showdevice = true
|
||||
}else{
|
||||
that.showdevice = false
|
||||
that.deviceIndex = 0
|
||||
that.type = 0
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
}else if(res.code == 501){
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
}else {
|
||||
// console.log("老用户登录",res.data)
|
||||
uni.redirectTo({
|
||||
url:'/pages/login/login'
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
// onMapTap(e) {
|
||||
// console.log('点击了地图非标记区域：', e);
|
||||
|
|
@ -1878,7 +1990,7 @@
|
|||
longitude: parseFloat(item.longitude),
|
||||
// title: item.deviceName,
|
||||
width: 40,
|
||||
height: 40,
|
||||
height: 28,
|
||||
iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uF9qLejuAZErNTrRuHq7',
|
||||
})
|
||||
})
|
||||
|
|
@ -1891,9 +2003,36 @@
|
|||
// 处理接口请求失败的情况
|
||||
});
|
||||
},
|
||||
getinfo() {
|
||||
if (uni.getStorageSync('token')) {
|
||||
this.$u.get("/getAppInfo").then((res) => {
|
||||
|
||||
if (res.code == 200) {
|
||||
this.$store.commit('SET_USERID', res.user.userId);
|
||||
// this.userinfo = res.user
|
||||
// if (this.areaInfo.authentication == 1) {
|
||||
// if (res.user.isAuthentication == 0) {
|
||||
// uni.navigateTo({
|
||||
// url: "/page_user/idcard_test"
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
} else {
|
||||
// setTimeout(()=>{
|
||||
// this.getinfo()
|
||||
// this.getlist()
|
||||
// },1000)
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
getArea() {
|
||||
this.showmap=false
|
||||
// 发送请求获取数据
|
||||
this.$u.get('/app/area/info?', this.gps).then((res) => {
|
||||
this.showmap=true
|
||||
if (res.code === 200) {
|
||||
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
|
||||
const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
|
||||
|
|
@ -1905,6 +2044,7 @@
|
|||
this.polyline.push(polylines)
|
||||
// console.log(this.areaInfo, 'areaInfoareaInfo');
|
||||
uni.setStorageSync('areaId', res.data.areaId);
|
||||
this.getinfo()
|
||||
this.getmarks()
|
||||
this.getlist()
|
||||
this.getParking()
|
||||
|
|
@ -2052,6 +2192,25 @@
|
|||
.page {
|
||||
width: 750rpx;
|
||||
|
||||
.my-location {
|
||||
|
||||
position: fixed;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
right: 30rpx;
|
||||
bottom: 300rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 50%;
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
z-index: 10;
|
||||
.img {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.feeDetail {
|
||||
padding: 36rpx 22rpx;
|
||||
position: fixed;
|
||||
|
|
@ -2071,7 +2230,7 @@
|
|||
.close {
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
right: 40rpx;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
}
|
||||
|
|
@ -2153,9 +2312,9 @@
|
|||
.close {
|
||||
position: absolute;
|
||||
top: 20rpx;
|
||||
right: 20rpx;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
right: 30rpx;
|
||||
width: 35rpx;
|
||||
height: 35rpx;
|
||||
}
|
||||
|
||||
.page1 {
|
||||
|
|
@ -2195,8 +2354,8 @@
|
|||
|
||||
.cent_bot {
|
||||
font-weight: 500;
|
||||
font-size: 20rpx;
|
||||
color: #808080;
|
||||
font-size: 24rpx;
|
||||
color: #ccc;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2205,6 +2364,7 @@
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-left: auto;
|
||||
margin-right: 35rpx;
|
||||
width: 160rpx;
|
||||
height: 60rpx;
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
|
|
@ -2282,6 +2442,7 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-bottom: 2rpx;
|
||||
width: 338rpx;
|
||||
height: 90rpx;
|
||||
border-radius: 45rpx 45rpx 45rpx 45rpx;
|
||||
|
|
@ -2295,6 +2456,7 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-bottom: 2rpx;
|
||||
width: 338rpx;
|
||||
height: 90rpx;
|
||||
background: #4C97E7;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,28 @@
|
|||
<template>
|
||||
<view class="page" >
|
||||
|
||||
|
||||
<u-navbar title="地图" :is-back='false' :border-bottom="false" :background="bgc" title-color='#2E4975'
|
||||
title-size='36' height='36'></u-navbar>
|
||||
<view @touchmove.stop.prevent="() => {}">
|
||||
<view class="slider">
|
||||
<view class="tit">
|
||||
电量区间
|
||||
</view>
|
||||
<view style="width: 650rpx;">
|
||||
<slider-range :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :block-size="20"
|
||||
background-color="#EEEEF6" active-color="#4C97E7" :format="format" :decorationVisible="true"
|
||||
@change="handleRangeChange"></slider-range>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
|
||||
:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap" >
|
||||
</map>
|
||||
|
||||
<view @touchmove.stop.prevent="() => {}">
|
||||
<view class="btn_box">
|
||||
<view class="btn1">
|
||||
车辆扫码
|
||||
|
|
@ -97,6 +105,8 @@
|
|||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<tab-bar :indexs='1' style=""></tab-bar>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -641,7 +651,7 @@
|
|||
|
||||
.cont {
|
||||
margin-top: 18rpx;
|
||||
margin-right: 10rpx;
|
||||
margin-right: 9rpx;
|
||||
// display: flex;
|
||||
width: 130rpx;
|
||||
|
||||
|
|
@ -693,6 +703,7 @@
|
|||
}
|
||||
|
||||
.slider {
|
||||
padding: 15rpx 0 0 15rpx;
|
||||
.tit {
|
||||
font-weight: 500;
|
||||
font-size: 28rpx;
|
||||
|
|
@ -700,7 +711,7 @@
|
|||
}
|
||||
|
||||
width: 752rpx;
|
||||
height: 150rpx;
|
||||
height:160rpx;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@
|
|||
console.error("Error fetching area data:", error);
|
||||
});
|
||||
}else if(num==4){
|
||||
this.$u.post('/appVerify/device/ring?sn='+this.sn).then((res) => {
|
||||
this.$u.get('/appVerify/device/ring?sn='+this.sn).then((res) => {
|
||||
if (res.code === 200) {
|
||||
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
|
||||
this.deviceInfo()
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
<view class="iconfont icon-xiangxia1"></view>
|
||||
</view>
|
||||
<view class="stause_li" style="margin-left: 50rpx;" @click="showdsc=true">
|
||||
{{sctit}} <view class="iconfont icon-xiangxia1"></view>
|
||||
{{sctit}}
|
||||
<view class="iconfont icon-xiangxia1"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -399,13 +400,27 @@
|
|||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #808080;
|
||||
|
||||
white-space: nowrap;
|
||||
/* 禁止换行 */
|
||||
overflow: hidden;
|
||||
/* 超出部分隐藏 */
|
||||
text-overflow: ellipsis;
|
||||
span {
|
||||
color: #3D3D3D;
|
||||
white-space: nowrap;
|
||||
/* 禁止换行 */
|
||||
overflow: hidden;
|
||||
/* 超出部分隐藏 */
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.input {
|
||||
width: 30%;
|
||||
white-space: nowrap;
|
||||
/* 禁止换行 */
|
||||
overflow: hidden;
|
||||
/* 超出部分隐藏 */
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -246,7 +246,9 @@
|
|||
if (this.typeindex == 1) {
|
||||
this.operatingData()
|
||||
} else {
|
||||
|
||||
this.infoList = []
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user