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

111

Browse Source
This commit is contained in:
Sliverber 2024-06-04 18:12:12 +08:00
parent c4bd835fff
commit ebbb4f3b69
11 changed files with 706 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/http.interceptor.js
View File

@ -124,9 +124,9 @@ const install = (Vue, vm) => {
uni.hideLoading(); uni.hideLoading();
if (res.code == 200) { if (res.code == 200) {
uni.setStorageSync('token', res.token); uni.setStorageSync('token', res.token);
uni.navigateTo({ // uni.navigateTo({
url:'/pages/index/index' // url:'/pages/index/index'
}) // })
}else if(res.code == 501){ }else if(res.code == 501){

8
components/tab-bar/tab-bar.vue
View File

@ -53,7 +53,7 @@
// this._switchTabbarPage(index) // this._switchTabbarPage(index)
if(index==0){ if(index==0){
uni.navigateTo({ uni.redirectTo({
url:'/pages_admin/admin_worke', url:'/pages_admin/admin_worke',
routeType: 'wx://modal', routeType: 'wx://modal',
success() { success() {
@ -62,7 +62,7 @@
}) })
console.log('点击了',index); console.log('点击了',index);
}else if(index==1){ }else if(index==1){
uni.navigateTo({ uni.redirectTo({
url:'/pages_admin/admin_index', url:'/pages_admin/admin_index',
routeType: 'wx://modal', routeType: 'wx://modal',
success() { success() {
@ -70,7 +70,7 @@
} }
}) })
}else if(index==2){ }else if(index==2){
uni.navigateTo({ uni.redirectTo({
url:'/pages_admin/admin_order', url:'/pages_admin/admin_order',
routeType: 'wx://modal', routeType: 'wx://modal',
success() { success() {
@ -100,7 +100,7 @@
// left: 60rpx; // left: 60rpx;
bottom: 0rpx; bottom: 0rpx;
width: 750rpx; width: 750rpx;
height: 118rpx; height: 150rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1); box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
// border-radius: 60rpx; // border-radius: 60rpx;

57
page_user/idcard_test.vue
View File

@ -2,25 +2,32 @@
<view class="page"> <view class="page">
<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='40'></u-navbar> height='40'></u-navbar>
<view class="tit">
为了防范身份信息被冒用，需进行身份认证以确保 是本人操作
</view>
<view class="imgbox">
<image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/uxAqR8zizZddzadit9ms" mode=""></image>
</view>
<view class="ipt_box"> <view class="ipt_box">
<view class="li"> <view class="li">
<view class="left"> <view class="left">
姓名 姓名
</view> </view>
<input type="text" v-model="name" placeholder="填写本人真实姓名" placeholder-style=''/> <input type="text" v-model="name" placeholder="填写本人真实姓名" placeholder-style='' />
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="li"> <view class="li">
<view class="left"> <view class="left">
身份证号 身份证号
</view> </view>
<input type="number" v-model="idnum" placeholder="填写本人身份证号"/> <input type="text" v-model="idnum" placeholder="填写本人身份证号" />
</view> </view>
</view> </view>
<view class="tips"> <view class="tips">
以上信息仅用于验证，我们将严格为您保密 以上信息仅用于验证，我们将严格为您保密
</view> </view>
<view class="btn" @click="test"> <view class="btn" :class="istrue?'act1':''" @click="test">
认证 认证
</view> </view>
</view> </view>
@ -34,7 +41,16 @@
backgroundColor: "#fff", backgroundColor: "#fff",
}, },
name: '', name: '',
idnum: '' idnum: null,
istrue:false
}
},
watch: {
idnum(newVal) {
// 正则表达式用于校验 15 位或 18 位身份证号码
const regex = /^\d{17}(\d|X|x)$/;
this.istrue = regex.test(newVal);
} }
}, },
computed: { computed: {
@ -48,7 +64,8 @@
return nameRegex.test(name); return nameRegex.test(name);
}, },
validateIdnum(idnum) { validateIdnum(idnum) {
const idnumRegex = /^(^[1-9]\d{7}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$)$/; const idnumRegex =
/^(^[1-9]\d{7}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$)$/;
return idnumRegex.test(idnum); return idnumRegex.test(idnum);
}, },
test() { test() {
@ -94,6 +111,15 @@
<style lang="scss"> <style lang="scss">
.page { .page {
width: 750rpx; width: 750rpx;
.tit{
margin: 20rpx auto;
width: 608rpx;
height: 76rpx;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
font-weight: 600;
font-size: 28rpx;
color: #3D3D3D;
}
.tips { .tips {
text-align: center; text-align: center;
margin: 10rpx auto; margin: 10rpx auto;
@ -102,6 +128,17 @@
font-size: 28rpx; font-size: 28rpx;
color: #3D3D3D; color: #3D3D3D;
} }
.imgbox{
width: 100%;
display: flex;
align-items: center;justify-content: center;
.img{
margin: 10rpx auto;
width: 428rpx;
height: 292.32rpx;
}
}
.btn { .btn {
display: flex; display: flex;
align-items: center; align-items: center;
@ -115,13 +152,17 @@
font-size: 40rpx; font-size: 40rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.act1{
background: #4C97E7;
}
.ipt_box { .ipt_box {
padding: 30rpx 12rpx; padding: 30rpx 12rpx;
margin: 48rpx auto; margin: 48rpx auto;
width: 610rpx; width: 610rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08); box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 12rpx; border-radius: 12rpx;
.line { .line {
margin-top: 34rpx; margin-top: 34rpx;
margin-bottom: 34rpx; margin-bottom: 34rpx;
@ -129,20 +170,24 @@
height: 2rpx; height: 2rpx;
background: #F3F3F3; background: #F3F3F3;
} }
.li { .li {
display: flex; display: flex;
align-items: center; align-items: center;
.left { .left {
width: 96rpx; width: 96rpx;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #979797; color: #979797;
} }
input { input {
margin-left: 44rpx; margin-left: 44rpx;
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;
color: #3D3D3D; color: #3D3D3D;
.input-placeholder { .input-placeholder {
font-weight: 400; font-weight: 400;
font-size: 24rpx; font-size: 24rpx;

8
page_user/yj.vue
View File

@ -229,7 +229,7 @@
money: this.areaInfo.deposit, money: this.areaInfo.deposit,
mark: "押金充值", mark: "押金充值",
type: '4', type: '4',
areaId:this.areaId areaId:id
} }
@ -246,10 +246,14 @@
paySign: res.data.paySign, paySign: res.data.paySign,
success(res) { success(res) {
// 支付成功逻辑 // 支付成功逻辑
uni.showLoading({
title:'加载中'
})
setTimeout(() => { setTimeout(() => {
uni.hideLoading()
that.getinfo() that.getinfo()
that.getlist() that.getlist()
}, 1000) }, 2000)
}, },
fail(err) { fail(err) {

6
pages.json
View File

@ -6,10 +6,10 @@
"pages": [{ "pages": [{
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "我的", "navigationBarTitleText": "",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3996FD", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "#FFFFFF", "navigationBarTextStyle": "black",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },

623
pages/index/index.vue
View File

@ -1,15 +1,25 @@
<template> <template>
<view class="page"> <view class="page">
<view class="tab_top">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uVcMTydm81zCMhHomXl1" mode="" @click="topage(6)">
</image>
<view class="txts">
创想出行
</view>
</view>
<!-- <u-navbar :is-back="false" title="共享电动车" :border-bottom="false" :background="bgc" title-color='#2E4975' <!-- <u-navbar :is-back="false" title="共享电动车" :border-bottom="false" :background="bgc" title-color='#2E4975'
title-size='36' height='36'></u-navbar> --> title-size='36' height='36'></u-navbar> -->
<map class="map" id="map" ref="map" :scale="zoomSize" show-location v-if="showmap" <map class="map" id="map" ref="map" :scale="zoomSize" show-location v-if="showmap" :latitude="latitude"
:latitude="latitude" :longitude="longitude" :show-location="true" :markers="markers" :polygons="polyline" :longitude="longitude" :show-location="true" :markers="markers" :polygons="polyline"
@markertap="onMarkerTap"> @markertap="onMarkerTap">
</map> </map>
<view class="my-location"> <view class="my-location">
<image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/u0Kyr2HWPvHq7CMHIv5r" <image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/u0Kyr2HWPvHq7CMHIv5r"
@click="getMyLocation"></image> @click="setMapScale"></image>
</view>
<view class="park" @click="toggleIconAndCallout">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uWxERJKYTzGp1MVqS6Rc" mode=""></image>
</view> </view>
<view class="botmbox2" v-if="showdevice"> <view class="botmbox2" v-if="showdevice">
<view class="close" @click="close()"> <view class="close" @click="close()">
@ -169,8 +179,8 @@
<view style="padding: 18rpx;"> <view style="padding: 18rpx;">
<view class="nmtxt text-ellipsis" v-for="(items, indexs) in item.ridingRuleJson.rule" <view class="nmtxt text-ellipsis" v-for="(items, indexs) in item.ridingRuleJson.rule"
:key="indexs" style="margin-top: 10rpx;" v-if="indexs<2"> :key="indexs" style="margin-top: 10rpx;" v-if="indexs<2">
<view class="left"></view>
<view class="right " style="font-size: 28rpx;"> <view class="left " style="font-size: 28rpx;">
{{items.start}}-{{items.end}}<span v-if="item.rentalUnit=='minutes'">分钟</span> {{items.start}}-{{items.end}}<span v-if="item.rentalUnit=='minutes'">分钟</span>
<span v-if="item.rentalUnit=='hours'">小时</span> <span v-if="item.rentalUnit=='hours'">小时</span>
<span v-if="item.rentalUnit=='day'">天</span>, <span v-if="item.rentalUnit=='day'">天</span>,
@ -179,6 +189,7 @@
<span v-if="item.rentalUnit=='day'">天</span>/{{items.fee}}元 <span v-if="item.rentalUnit=='day'">天</span>/{{items.fee}}元
<span v-if="indexs==1">...</span> <span v-if="indexs==1">...</span>
</view> </view>
<view class="right"></view>
</view> </view>
</view> </view>
@ -363,14 +374,30 @@
</view> </view>
</view> </view>
</view> </view>
<view class="guangggao">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uvHYQhuouHZQQL3qfLzP" mode=""></image>
</view> </view>
</view>
<view class="tipss_box">
<!-- <view class="tipss" v-if="orderinfo.status" @click="starTime"> -->
<view class="tipss" v-if="orderinfo.status" @click="starTime"> <view class="tipss" v-if="orderinfo.status" @click="starTime">
您有正在进行中的订单 <view class="iconfont icon-xiangyou1"> 您有正在进行中的订单 <view class="iconfont icon-xiangyou1" style="margin-left: 20rpx;">
</view> </view>
</view> </view>
<view class="tipss">
点击车辆可以预约用车
</view>
<view class="tipss" @click="changetips">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uJnO5qX8ggJvL1Nf7PQt" mode=""></image> 文明骑行,须知
<view class="iconfont icon-xiangyou1">
</view>
</view>
</view>
<u-mask :show="showtcs" @click="showtc = false" :z-index='100' /> <u-mask :show="showtcs" @click="showtc = false" :z-index='100' />
<u-mask :show="show" @click="show = false" :z-index='100' /> <u-mask :show="showTips" @click="show = false" :z-index='100' />
<view class="pops" v-if="showtcs"> <view class="pops" v-if="showtcs">
<view class="tit"> <view class="tit">
{{orderinfo.rule.name}} {{orderinfo.rule.name}}
@ -397,11 +424,11 @@
<view class="time" style="color:#3D3D3D ;font-size: 28rpx;"> <view class="time" style="color:#3D3D3D ;font-size: 28rpx;">
您将失去该套餐 您将失去该套餐
</view> </view>
<view class="btn" @click="showtcs=false"> <view class="btn" @click="showtcs=false" style="margin-bottom: 50rpx;">
我已知晓 我已知晓
</view> </view>
</view> </view>
<view class="pops" v-if="show"> <view class="pops" v-if="showTips" @click="changetips">
<view class="tit"> <view class="tit">
安全骑行 禁止超载 安全骑行 禁止超载
</view> </view>
@ -614,6 +641,7 @@
bgc: { bgc: {
backgroundColor: "#F7FAFE", backgroundColor: "#F7FAFE",
}, },
showIconAndCallout: false, // 控制是否显示iconPath和callout
showindex: 0, showindex: 0,
show: false, show: false,
latitude: '', latitude: '',
@ -645,7 +673,9 @@
// feeInfo:{}, // feeInfo:{},
showfeeDetail: false, showfeeDetail: false,
seeDetail: false, seeDetail: false,
showmap:true showmap: true,
userinfo: {},
parkingList: []
// userId:this.$store.getters.userId, // userId:this.$store.getters.userId,
} }
@ -718,7 +748,6 @@
} }
console.log(this.userId);
@ -731,12 +760,10 @@
that.gps.longitude = lb.longitude; that.gps.longitude = lb.longitude;
// that.gps.latitude = '26.940805', // that.gps.latitude = '26.940805',
// that.gps.longitude = '120.356157'; // that.gps.longitude = '120.356157';
that.latitude = Number( lb.latitude.toFixed(5)) - 0.005 that.latitude = Number(lb.latitude.toFixed(5)) - 0.005
that.longitude = Number( lb.longitude.toFixed(5)) + 0.005 that.longitude = Number(lb.longitude.toFixed(5)) + 0.005
console.log(that.areaInfo,'that.areaInfo'); console.log(that.areaInfo, 'that.areaInfo');
if(!that.areaInfo.areaId){
that.getArea() that.getArea()
}
// that.getmarks() // that.getmarks()
@ -753,6 +780,8 @@
} }
}) })
} else {
this.getinfo()
} }
@ -783,17 +812,79 @@
userId() { userId() {
return this.$store.getters.userId; return this.$store.getters.userId;
}, },
showTips() {
return this.$store.getters.showTips;
},
isMeal() { isMeal() {
return this.$store.getters.isMeal; return this.$store.getters.isMeal;
}, },
}, },
methods: { methods: {
changetips() {
if (this.showTips) {
this.$store.commit('SET_SHOWTIPS', false);
} else {
this.$store.commit('SET_SHOWTIPS', true);
}
},
toggleIconAndCallout() {
this.showIconAndCallout = !this.showIconAndCallout;
if (this.showIconAndCallout) {
const newMarkers = [];
this.parkingList.forEach(item => {
newMarkers.push({
id: parseFloat(item.parkingId),
latitude: parseFloat(item.latitude),
longitude: parseFloat(item.longitude),
width: 20,
height: 40,
iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
callout: {
content: item.parkingName, // 修改为你想要显示的文字内容
color: '#ffffff', // 修改为文字颜色
fontSize: 14, // 修改为文字大小
borderRadius: 10, // 修改为气泡圆角大小
bgColor: '#000000', // 修改为气泡背景颜色
padding: 6, // 修改为气泡内边距
display: 'ALWAYS' // 修改为气泡的显示策略
}
});
});
this.$set(this, 'markers', [...this.markers, ...newMarkers]);
} else {
const parkingIds = this.parkingList.map(item => parseFloat(item.parkingId));
this.$set(this, 'markers', this.markers.filter(marker => !parkingIds.includes(marker.id)));
}
},
getMyLocation() { getMyLocation() {
uni.createMapContext("map", this).moveToLocation({ uni.createMapContext("map", this).moveToLocation({
longitude: this.longitude, longitude: this.longitude,
latitude: this.latitude, latitude: this.latitude,
}); });
}, },
async setMapScale(e, val) {
let mapContext = uni.createMapContext('map', this);
let setScale = () => {
return new Promise((resolve, reject) => {
mapContext.getScale({
success: r => {
resolve()
}
})
})
};
await setScale();
mapContext.moveToLocation({
success: (res) => {
const timer = setTimeout(() => {
clearTimeout(timer);
}, 500);
},
})
},
// 查看费用详情 // 查看费用详情
tofeeDetail() { tofeeDetail() {
uni.navigateTo({ uni.navigateTo({
@ -944,8 +1035,10 @@
} }
this.$u.post('/appVerify/device/snSwitch', data).then((res) => { this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.getisInOrder() this.getisInOrder()
} else { } else {
this.getisInOrder()
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -1011,110 +1104,6 @@
} }
}) })
// if (this.orderinfo.ruleId != null && this.orderinfo.sn == '') {
// this.showdevice = false;
// this.deviceIndex = 0;
// this.showtc = true
// const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
// // 定义定时器
// this.timer = setInterval(() => {
// const currentTime = Date.now();
// // const timePassed = currentTime - createTimeTimestamp;
// const timeRemaining = ruleEndTimeTimestamp - currentTime;
// if (timeRemaining <= 0) {
// clearInterval(this.timer);
// this.timeString = "00:00:00";
// // 可以在这里添加时间结束后的逻辑
// return;
// }
// const secondsRemaining = Math.floor(timeRemaining / 1000);
// // 转换为时分秒格式
// const hours = Math.floor(secondsRemaining / 3600);
// const minutes = Math.floor((secondsRemaining % 3600) / 60);
// const seconds = secondsRemaining % 60;
// const timeString =
// `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
// const totalMinutes = hours * 60 + minutes;
// const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
// this.timeString = timeString;
// // console.log("剩余时间：" + timeString);
// }, 1000);
// } else if (this.orderinfo.status == 0 && this.orderinfo.ruleId != null) {
// this.showdevice = true;
// this.deviceIndex = 2;
// // const createTimeTimestamp = new Date(this.orderinfo.payTime).getTime();
// const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
// // 定义定时器
// this.timer = setInterval(() => {
// const currentTime = Date.now();
// // const timePassed = currentTime - createTimeTimestamp;
// const timeRemaining = ruleEndTimeTimestamp - currentTime;
// console.log(timeRemaining);
// if (timeRemaining <= 0) {
// clearInterval(this.timer);
// this.timeString = "00:00:00";
// // 可以在这里添加时间结束后的逻辑
// return;
// }
// const secondsRemaining = Math.floor(timeRemaining / 1000);
// // 转换为时分秒格式
// const hours = Math.floor(secondsRemaining / 3600);
// const minutes = Math.floor((secondsRemaining % 3600) / 60);
// const seconds = secondsRemaining % 60;
// const timeString =
// `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
// const totalMinutes = hours * 60 + minutes;
// const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
// this.timeString = timeString;
// // console.log("剩余时间：" + timeString);
// }, 1000);
// } else if (this.orderinfo.status == 2 && this.orderinfo.ruleId != null) {
// this.showdevice = true;
// this.deviceIndex = 2;
// // const createTimeTimestamp = new Date(this.orderinfo.payTime).getTime();
// const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
// // 定义定时器
// this.timer = setInterval(() => {
// const currentTime = Date.now();
// // const timePassed = currentTime - createTimeTimestamp;
// const timeRemaining = ruleEndTimeTimestamp - currentTime;
// console.log(timeRemaining);
// if (timeRemaining <= 0) {
// clearInterval(this.timer);
// this.timeString = "00:00:00";
// // 可以在这里添加时间结束后的逻辑
// return;
// }
// const secondsRemaining = Math.floor(timeRemaining / 1000);
// // 转换为时分秒格式
// const hours = Math.floor(secondsRemaining / 3600);
// const minutes = Math.floor((secondsRemaining % 3600) / 60);
// const seconds = secondsRemaining % 60;
// const timeString =
// `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
// const totalMinutes = hours * 60 + minutes;
// const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
// this.timeString = timeString;
// // console.log("剩余时间：" + timeString);
// }, 1000);
// }
// 预约中 // 预约中
if (this.orderinfo.status == 0) { if (this.orderinfo.status == 0) {
@ -1137,18 +1126,7 @@
const totalMinutes = hours * 60 + minutes; const totalMinutes = hours * 60 + minutes;
const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1; const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
this.money = tenMinuteIntervals * parseFloat(this.areaInfo.appointmentServiceFee) this.money = tenMinuteIntervals * parseFloat(this.areaInfo.appointmentServiceFee)
// console.log(this.money,'this.areaInfo.appointmentServiceFeethis.areaInfo.appointmentServiceFee');
// if (totalMinutes <= this.startingHowManyMinutes) {
// this.money = this.startingPrice;
// } else {
// const extraTime = totalMinutes - this.startingHowManyMinutes;
// const extraIntervals = Math.floor(extraTime / parseFloat(this.timeMinutes)) + 1;
// console.log(extraIntervals * this.timeFee, 'extraIntervalsextraIntervals');
// this.money = parseFloat(this.startingPrice) + (extraIntervals * parseFloat(this
// .timeFee));
// }
// console.log("已经过去了：" + timeString);
// console.log("增加了" +money+ "元费用");
// 每隔十分钟增加费用 // 每隔十分钟增加费用
if (minutes % 10 === 0 && seconds === 0) { if (minutes % 10 === 0 && seconds === 0) {
@ -1176,14 +1154,6 @@
const totalMinutes = hours * 60 + minutes; const totalMinutes = hours * 60 + minutes;
const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1; const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
// if (totalMinutes <= this.startingHowManyMinutes) {
// this.money = this.startingPrice;
// } else {
// const extraTime = totalMinutes - this.startingHowManyMinutes;
// const extraIntervals = Math.floor(extraTime / parseFloat(this.timeMinutes)) + 1;
// console.log(extraIntervals * this.timeFee, 'extraIntervalsextraIntervals');
// this.money = parseFloat(this.startingPrice) + (extraIntervals * parseFloat(this.timeFee));
// }
this.timeString = timeString this.timeString = timeString
// console.log("已经过去了：" + timeString); // console.log("已经过去了：" + timeString);
@ -1406,26 +1376,57 @@
wxOpenId: res.code, wxOpenId: res.code,
}; };
let areaId=uni.getStorageSync('areaId'); let areaId = uni.getStorageSync('areaId');
that.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{ that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
res => {
uni.hideLoading(); uni.hideLoading();
if (res.code == 200) { if (res.code == 200) {
uni.setStorageSync('token', res.token); uni.setStorageSync('token', res.token);
if (that.areaInfo.authentication == 1) {
that.$u.get("/getAppInfo").then((res) => {
console.log('进入跳转');
if (res.code == 200) {
that.userinfo = res.user
that.$store.commit('SET_USERID', res.user
.userId);
if (res.user.isAuthentication == 0) {
that.seeDetail = true
uni.navigateTo({
url: "/page_user/idcard_test"
})
} else {
uni.navigateTo({ uni.navigateTo({
url: '/page_user/yj' url: '/page_user/yj'
}) })
}
} else {
uni.showToast({
title: '未登录，请登录后尝试',
icon: 'none',
duration: 2000
});
}
});
} else {
uni.navigateTo({
url: '/page_user/yj'
})
}
}else if(res.code == 501){
} else if (res.code == 501) {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
}else { } else {
// console.log("老用户登录",res.data) // console.log("老用户登录",res.data)
uni.redirectTo({ uni.redirectTo({
url:'/pages/login/login' url: '/pages/login/login'
}) })
} }
}); });
@ -1452,9 +1453,74 @@
url: '/page_user/gzsb' url: '/page_user/gzsb'
}) })
} else if (num == 6) { } else if (num == 6) {
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);
if (that.areaInfo.authentication == 1) {
that.$u.get("/getAppInfo").then((res) => {
console.log('进入跳转');
if (res.code == 200) {
that.userinfo = res.user
that.$store.commit('SET_USERID', res.user
.userId);
if (res.user.isAuthentication == 0) {
that.seeDetail = true
uni.navigateTo({
url: "/page_user/idcard_test"
})
} else {
uni.navigateTo({ uni.navigateTo({
url: '/pages/my' url: '/pages/my'
}) })
}
} else {
uni.showToast({
title: '未登录，请登录后尝试',
icon: 'none',
duration: 2000
});
}
});
} else {
uni.navigateTo({
url: '/pages/my'
})
}
} 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 == 7) { } else if (num == 7) {
uni.navigateTo({ uni.navigateTo({
url: '/page_user/gzsb?sn=' + this.sn url: '/page_user/gzsb?sn=' + this.sn
@ -1542,6 +1608,14 @@
}, },
// 确认开锁 // 确认开锁
sub1() { sub1() {
if (this.areaInfo.authentication == 1) {
if (this.userinfo.isAuthentication == 0) {
this.seeDetail = true
uni.navigateTo({
url: "/page_user/idcard_test"
})
}
} else {
if (this.freeInfo.ruleId) { if (this.freeInfo.ruleId) {
let data = { let data = {
userId: this.userId, userId: this.userId,
@ -1573,6 +1647,8 @@
duration: 2000 duration: 2000
}); });
} }
}
}, },
// 开锁购买套餐 // 开锁购买套餐
@ -1637,6 +1713,13 @@
}, },
// 确认预约 // 确认预约
sub3() { sub3() {
if (this.areaInfo.authentication == 1) {
if (this.userinfo.isAuthentication == 0) {
this.seeDetail = true
uni.navigateTo({
url: "/page_user/idcard_test"
})
} else {
if (this.freeInfo.ruleId) { if (this.freeInfo.ruleId) {
let data = { let data = {
userId: this.userId, userId: this.userId,
@ -1649,7 +1732,8 @@
} }
this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn +
'&ruleId=' +
this this
.freeInfo.ruleId).then((res) => { .freeInfo.ruleId).then((res) => {
this.seeDetail = false this.seeDetail = false
@ -1679,6 +1763,54 @@
}); });
} }
}
}else{
if (this.freeInfo.ruleId) {
let data = {
userId: this.userId,
sn: this.sn,
ruleId: this.freeInfo.ruleId,
// isAppointment: true,
// money: this.freeInfo.fee,
mark: "预约购买套餐",
type: '2'
}
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) {
uni.showLoading({
title: '预约中...'
})
setTimeout(() => {
this.getisInOrder()
uni.hideLoading()
}, 1000)
// this.freList=res.rows
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
})
} else {
uni.showToast({
title: '请选择套餐',
icon: 'none',
duration: 2000
});
}
}
}, },
// 预约购买套餐 // 预约购买套餐
@ -1744,6 +1876,7 @@
}, },
getisInOrder() { getisInOrder() {
this.orderinfo = {}
if (this.userId) { if (this.userId) {
this.$u.post('/app/user/isInOrder?userId=' + this.userId, ).then((res) => { this.$u.post('/app/user/isInOrder?userId=' + this.userId, ).then((res) => {
if (res.code === 200) { if (res.code === 200) {
@ -1753,6 +1886,7 @@
this.starTime() this.starTime()
} else { } else {
this.orderinfo = {}
this.showdevice = false this.showdevice = false
this.deviceIndex = 0 this.deviceIndex = 0
} }
@ -1768,6 +1902,7 @@
this.freeListIndex = index this.freeListIndex = index
}, },
getlist() { getlist() {
this.freList = []
let data = { let data = {
areaId: this.areaInfo.areaId areaId: this.areaInfo.areaId
} }
@ -1818,25 +1953,7 @@
}, },
// 扫码用车
qrCode() {
if (this.$store.getters.userId == null) {
this.$u.get("/getAppInfo").then((res) => {
console.log('进入跳转');
if (res.code == 200) {
this.$store.commit('SET_USERID', res.user.userId);
this.scanQRCode()
} else {
uni.showToast({
title: '未登录，请登录后尝试',
icon: 'none',
duration: 2000
});
}
});
}
},
// 关闭弹出 // 关闭弹出
close() { close() {
this.showdevice = false this.showdevice = false
@ -1887,13 +2004,13 @@
}, },
deviceInfo() { deviceInfo() {
let that = this let that = this
if(uni.getStorageSync('token')){ if (uni.getStorageSync('token')) {
this.$u.get('/app/device/info?sn=' + this.sn).then((res) => { this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.deviceInfos = res.data this.deviceInfos = res.data
this.showindex = 0 this.showindex = 0
this.showdevice = true this.showdevice = true
}else{ } else {
this.showdevice = false this.showdevice = false
this.deviceIndex = 0 this.deviceIndex = 0
this.type = 0 this.type = 0
@ -1904,7 +2021,7 @@
}); });
} }
}) })
}else{ } else {
wx.login({ wx.login({
success(res) { success(res) {
if (res.code) { if (res.code) {
@ -1913,8 +2030,9 @@
wxOpenId: res.code, wxOpenId: res.code,
}; };
let areaId=uni.getStorageSync('areaId'); let areaId = uni.getStorageSync('areaId');
that.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{ that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
res => {
uni.hideLoading(); uni.hideLoading();
if (res.code == 200) { if (res.code == 200) {
uni.setStorageSync('token', res.token); uni.setStorageSync('token', res.token);
@ -1923,7 +2041,7 @@
that.deviceInfos = res.data that.deviceInfos = res.data
that.showindex = 0 that.showindex = 0
that.showdevice = true that.showdevice = true
}else{ } else {
that.showdevice = false that.showdevice = false
that.deviceIndex = 0 that.deviceIndex = 0
that.type = 0 that.type = 0
@ -1936,16 +2054,16 @@
}) })
}else if(res.code == 501){ } else if (res.code == 501) {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
}else { } else {
// console.log("老用户登录",res.data) // console.log("老用户登录",res.data)
uni.redirectTo({ uni.redirectTo({
url:'/pages/login/login' url: '/pages/login/login'
}) })
} }
}); });
@ -1963,7 +2081,8 @@
// // 这里可以根据需要处理点击地图非标记区域的逻辑 // // 这里可以根据需要处理点击地图非标记区域的逻辑
// }, // },
getmarks() { getmarks() {
this.listData = []
this.markers = []
let data = { let data = {
areaId: this.areaInfo.areaId areaId: this.areaInfo.areaId
} }
@ -2007,19 +2126,53 @@
if (res.code == 200) { if (res.code == 200) {
this.$store.commit('SET_USERID', res.user.userId); this.$store.commit('SET_USERID', res.user.userId);
// this.userinfo = res.user this.userinfo = res.user
// if (this.areaInfo.authentication == 1) {
// if (res.user.isAuthentication == 0) { } else {
// uni.navigateTo({ setTimeout(() => {
// url: "/page_user/idcard_test" this.getinfo()
}, )
// 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);
// that.$u.get('/app/device/info?sn=' + that.sn).then((res) => {
// if (res.code === 200) {
// } else {
// }
// })
// } 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 { // },
// setTimeout(()=>{
// this.getinfo() // });
// this.getlist()
// },1000)
} }
}); });
@ -2027,10 +2180,12 @@
} }
}, },
getArea() { getArea() {
this.showmap=false this.showmap = false
// 发送请求获取数据 // 发送请求获取数据
this.areaInfo = {}
this.polyline = []
this.$u.get('/app/area/info?', this.gps).then((res) => { this.$u.get('/app/area/info?', this.gps).then((res) => {
this.showmap=true this.showmap = true
if (res.code === 200) { if (res.code === 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构 // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr) const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
@ -2040,6 +2195,7 @@
// 更新折线数据 // 更新折线数据
this.areaInfo = res.data this.areaInfo = res.data
this.polyline.push(polylines) this.polyline.push(polylines)
console.log();
// console.log(this.areaInfo, 'areaInfoareaInfo'); // console.log(this.areaInfo, 'areaInfoareaInfo');
uni.setStorageSync('areaId', res.data.areaId); uni.setStorageSync('areaId', res.data.areaId);
this.getinfo() this.getinfo()
@ -2104,11 +2260,13 @@
strokeColor: "#558888", //描边颜色 strokeColor: "#558888", //描边颜色
strokeWidth: 2, //描边宽度 strokeWidth: 2, //描边宽度
zIndex: 1, //层级 zIndex: 1, //层级
}; };
}).filter(polyline => polyline !== null); // 过滤掉无效的折线数据 }).filter(polyline => polyline !== null); // 过滤掉无效的折线数据
}, },
getParking() { getParking() {
// 发送请求获取数据 // 发送请求获取数据
// this.polyline=[]
let data = { let data = {
areaId: this.areaInfo.areaId areaId: this.areaInfo.areaId
} }
@ -2121,6 +2279,8 @@
// 将处理后的数据添加到 this.polyline 中 // 将处理后的数据添加到 this.polyline 中
this.polyline = this.polyline.concat(polylines); this.polyline = this.polyline.concat(polylines);
this.parkingList = res.rows
// console.log(this.polyline); // console.log(this.polyline);
} }
}).catch(error => { }).catch(error => {
@ -2190,6 +2350,35 @@
.page { .page {
width: 750rpx; width: 750rpx;
.tab_top {
position: fixed;
top: 0rpx;
left: 0;
width: 750rpx;
height: 250rpx;
z-index: 1;
background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
image {
position: absolute;
left: 30rpx;
bottom: 90rpx;
width: 60rpx;
height: 60rpx;
}
.txts {
position: absolute;
left: 300rpx;
bottom: 90rpx;
font-weight: 500;
font-size: 36rpx;
color: #3D3D3D;
font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
}
}
.my-location { .my-location {
position: fixed; position: fixed;
@ -2197,12 +2386,32 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
right: 30rpx; right: 30rpx;
bottom: 300rpx; bottom: 450rpx;
background-color: #fff; background-color: #fff;
border-radius: 50%; border-radius: 50%;
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
z-index: 10; z-index: 10;
.img {
width: 50rpx;
height: 50rpx;
}
}
.park {
position: fixed;
display: flex;
align-items: center;
justify-content: center;
right: 30rpx;
bottom: 530rpx;
background-color: #fff;
border-radius: 50%;
width: 60rpx;
height: 60rpx;
z-index: 10;
.img { .img {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
@ -2276,24 +2485,37 @@
} }
} }
.tipss { .tipss_box {
position: fixed; position: fixed;
bottom: 450rpx;
left: 38rpx;
.tipss {
// position: fixed;
margin-top: 15rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-wrap: nowrap; flex-wrap: nowrap;
bottom: 304rpx;
left: 38rpx; image {
margin-right: 15rpx;
width: 24rpx;
height: 24rpx;
}
width: 350rpx; width: 350rpx;
height: 64rpx; height: 64rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3); box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3);
border-radius: 53rpx 53rpx 53rpx 53rpx; border-radius: 53rpx 53rpx 53rpx 53rpx;
} }
}
.map { .map {
width: 750rpx; width: 750rpx;
height: 84vh; height: 76vh;
} }
.botmbox2 { .botmbox2 {
@ -2310,7 +2532,7 @@
.close { .close {
position: absolute; position: absolute;
top: 20rpx; top: 20rpx;
right: 30rpx; right: 40rpx;
width: 35rpx; width: 35rpx;
height: 35rpx; height: 35rpx;
} }
@ -2709,7 +2931,7 @@
width: 750rpx; width: 750rpx;
height: 648rpx; height: 648rpx;
background: #F7F7F7; background: #fff;
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08); box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
@ -2901,10 +3123,20 @@
bottom: 0; bottom: 0;
padding: 40rpx 32rpx; padding: 40rpx 32rpx;
width: 750rpx; width: 750rpx;
height: 272rpx; // height: 272rpx;
background: #fff; background: #fff;
border-radius: 50rpx 50rpx 0 0; border-radius: 50rpx 50rpx 0 0;
.guangggao {
margin-top: 34rpx;
image {
width: 686rpx;
height: 116rpx;
border-radius: 10rpx 10rpx 10rpx 10rpx;
}
}
.top_btn { .top_btn {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -2962,7 +3194,7 @@
top: 400rpx; top: 400rpx;
left: 74rpx; left: 74rpx;
width: 604rpx; width: 604rpx;
height: 606rpx; // height: 606rpx;
background: #fff; background: #fff;
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
z-index: 110; z-index: 110;
@ -3033,6 +3265,7 @@
border-radius: 30rpx; border-radius: 30rpx;
padding: 48rpx 36rpx; padding: 48rpx 36rpx;
z-index: 30; z-index: 30;
.close { .close {
position: absolute; position: absolute;
right: 32rpx; right: 32rpx;

38
pages/my.vue
View File

@ -3,14 +3,17 @@
<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='36'></u-navbar>
<view class="topbg"> <view class="topbg">
<view class="topbox"> <view class="topbox">
<view class="info" v-if="false"> <view class="info" >
<image src="https://api.ccttiot.com/smartmeter/img/static/uZ5onboA1yozB2VFaCI2" mode=""></image> <image :src='item.avatar' mode=""></image>
<view class="cont"> <view class="cont">
<view class="name"> <view class="name" v-if="info.realName!=null">
微信用户 {{maskedName}}
</view>
<view class="name" v-if="info.realName==null" >
未实名
</view> </view>
<view class="phone"> <view class="phone">
138****1123 {{ maskedPhoneNumber }}
</view> </view>
</view> </view>
</view> </view>
@ -167,6 +170,16 @@
onShow() { onShow() {
this.getuserInfo() this.getuserInfo()
}, },
computed: {
maskedPhoneNumber() {
if (!this.info.phonenumber) return '';
return this.info.phonenumber.slice(0, 3) + '****' + this.info.phonenumber.slice(7);
},
maskedName() {
if (!this.info.realName) return '';
return this.info.realName.charAt(0) + '*'.repeat(this.info.realName.length - 1);
}
},
methods: { methods: {
topage(num){ topage(num){
if(num==0){ if(num==0){
@ -211,18 +224,21 @@
if (res.code == 200) { if (res.code == 200) {
this.$store.commit('SET_USERID', res.user.userId); this.$store.commit('SET_USERID', res.user.userId);
this.info=res.user this.info=res.user
uni.setStorageSync('role', res.user.role);
if( res.user.role==2){ // if( res.user.role==2){
uni.navigateTo({ // uni.navigateTo({
url:'/page_fix/fix_index' // url:'/page_fix/fix_index'
}) // })
} // }
} else { } else {
uni.showToast({ uni.showToast({
title: '未登录，请登录后尝试', title: '未登录，请登录后尝试',
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
setTimeout(()=>{
// if()
},300)
} }
}); });
} }

7
pages_admin/admin_index.vue
View File

@ -668,7 +668,7 @@
<style lang="scss"> <style lang="scss">
page { page {
background-color: #F7FAFE; background-color: #fff;
} }
.page { .page {
@ -739,6 +739,7 @@
.slider { .slider {
padding: 15rpx 0 0 15rpx; padding: 15rpx 0 0 15rpx;
margin-bottom: 20rpx;
.tit { .tit {
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
@ -748,13 +749,13 @@
width: 752rpx; width: 752rpx;
height:160rpx; height:160rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07); // box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
} }
.map { .map {
width: 750rpx; width: 750rpx;
height: 906rpx; height:850rpx;
} }

2
pages_admin/worke/worke_user.vue
View File

@ -56,7 +56,7 @@
</view> --> </view> -->
</view> </view>
<view class="info_li"> <view class="info_li">
<view class="txt">最近一笔订单：{{item.latestOrder.orderNo}}</view> <view class="txt" v-if="item.latestOrder.orderNo">最近一笔订单：{{item.latestOrder.orderNo}}</view>
<span style="color:#4C97E7 ;" v-if="item.latestOrder.status==0||item.latestOrder.status==2">（进行中）</span> <span style="color:#4C97E7 ;" v-if="item.latestOrder.status==0||item.latestOrder.status==2">（进行中）</span>
<span style="color:#4C97E7 ;" v-if="item.latestOrder.status==1||item.latestOrder.status==3">（待支付）</span> <span style="color:#4C97E7 ;" v-if="item.latestOrder.status==1||item.latestOrder.status==3">（待支付）</span>
<span style="color:#4C97E7 ;" v-if="item.latestOrder.status==4">（已完成）</span> <span style="color:#4C97E7 ;" v-if="item.latestOrder.status==4">（已完成）</span>

1
store/getters.js
View File

@ -16,5 +16,6 @@ const getters = {
userId: state => state.app.userId, userId: state => state.app.userId,
isMeal: state => state.app.isMeal, isMeal: state => state.app.isMeal,
deposit: state => state.app.deposit, deposit: state => state.app.deposit,
showTips: state => state.app.showTips,
} }
export default getters export default getters

7
store/modules/app.js
View File

@ -13,6 +13,7 @@ const state = {
userId:null, userId:null,
isMeal:null, isMeal:null,
deposit:null, deposit:null,
showTips:true,
}; };
const mutations = { const mutations = {
@ -50,6 +51,12 @@ const mutations = {
console.log(fee,'feefeefeefee'); console.log(fee,'feefeefeefee');
state.deposit = fee; state.deposit = fee;
},
SET_SHOWTIPS(state, fee) {
console.log(fee,'feefeefeefee');
state.showTips = fee;
} }
}; };