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

新增功能

Browse Source
This commit is contained in:
tx 2024-12-09 09:51:54 +08:00
parent eff15b47dc
commit ce638a236f
4 changed files with 142 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
common/http.interceptor.js
View File

@ -22,18 +22,7 @@ const install = (Vue, vm) => {
// 俞山岛： wx4d178f8c80348214
// 请求拦截部分
Vue.prototype.$u.http.interceptor.request = (config) => {
// 引用token
// 方式一，存放在vuex的token，假设使用了uView封装的vuex方式
// 见：https://uviewui.com/components/globalVariable.html
// config.header.token = vm.token;
// 方式二，如果没有使用uView封装的vuex方法，那么需要使用$store.state获取
// config.header.token = vm.$store.state.token;
// 方式三，如果token放在了globalData，通过getApp().globalData获取
// 方式四，如果token放在了Storage本地存储中，拦截是每次请求都执行的
// 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
const token = uni.getStorageSync('token');
// const token = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ0ZDljYzBlLThjZjEtNGFkOC05OGFjLThlNThjMWIxYjQ3OSJ9.v-aMkp9t7Z_QfjfsZy6d_1Ng76hPYa0A--SWScMJY9to7UlNv9IxHQnTJylLKdYKGrr8fRZ47Bu12UPm1DgMQg"
@ -46,6 +35,8 @@ const install = (Vue, vm) => {
// #endif
// 可以对某个url进行特别处理，此url参数为this.$u.get(url)中的url值
if (config.url == '/user/login') config.header.noToken = true;
// 最后需要将config进行return
return config;
@ -55,50 +46,7 @@ const install = (Vue, vm) => {
// 响应拦截部分
Vue.prototype.$u.http.interceptor.response = (res) => {
// if(res.code == 10022 || res.code == 10023) {
// // res为服务端返回值，可能有code，result等字段
// // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到
// // 如果配置了originalData为true，请留意这里的返回值
// uni.redirectTo({
// url:"/pages/login/login",
// fail:function(mes){
// console.log(mes)
// },
// success:function(mes){
// console.log(mes)
// }
// })
// // return res.result;
// }
// if (res.code == 401) {
// wx.login({
// success(res) {
// if (res.code) {
// // console.log('登录！', res);
// let areaId = uni.getStorageSync('areaId');
// if (areaId) {
// vm.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
// res => {
// uni.hideLoading();
// if (res.code == 200) {
// uni.setStorageSync('token', res.token);
// } else if (res.code == 501) {
// uni.showToast({
// title: res.msg,
// icon: 'none',
// duration: 2000
// });
// } else {
// uni.navigateTo({
// url: '/pages/login/login'
// })
// }
// });
// }
// }
// },
// });
// }
return res;
}

8
page_user/jfgz.vue
View File

@ -7,7 +7,7 @@
骑行服务费
</view>
<view class="card">
<view class="li">
<view class="li" v-if="false">
<view class="left">
预约服务费
</view>
@ -16,17 +16,17 @@
</view>
</view>
<view class="li" style="margin-top: 38rpx;">
<view class="li" >
<view class="left">
押金
</view>
<view class="right">
{{areaInfo.vehicleManagementFee}}元
{{areaInfo.deposit}}元
</view>
</view>
</view>
<view class="tips" style="margin-top: 10rpx;margin-left: 5rpx;">
<view class="tips" style="margin-top: 10rpx;margin-left: 5rpx;" v-if="false">
<view class="yuan">
</view>
<view class="txt">

160
pages/index/index.vue
View File

@ -1440,67 +1440,127 @@ export default {
});
return;
}
// this.showmap = false
// 发送请求获取数据
this.areaInfo = {}
// console.log(this.qParam, 'qParamqParamqParamqParam');
this.polyline = []
// if(this.qParam){
// 重置数据
this.areaInfo = {}
this.polyline = []
// }
// console.log(this.sn,'this.gps.sn this.gps.sn this.gps.sn ');
// 处理设备编号
if (this.orderinfo.sn) {
this.gps.sn = this.orderinfo.sn
}
if (/^\d{7}$/.test(this.qParam)) {
this.gps.sn = this.qParam
}
if (this.deviceInfos.sn) {
this.gps.sn = this.deviceInfos.sn
}
if (this.qParam != '' && this.qParam != null) {
this.sn = this.getSNFromQRCode(this.qParam);
if (this.sn != 0 && this.sn != '' && this.sn != null) {
this.gps.sn = this.sn
// console.log(this.qParam,'qParamqParamqParamqParam');
if (/^\d{7}$/.test(this.qParam)) {
this.gps.sn = this.qParam
console.log(this.gps.sn, 'this.gps.sn this.gps.sn this.gps.sn ');
}
if (this.orderinfo.sn != '') {
this.gps.sn = this.orderinfo.sn
}
if (this.deviceInfos.sn) {
this.gps.sn = this.deviceInfos.sn
}
if (this.qParam != '' && this.qParam != null) {
this.sn = this.getSNFromQRCode(this.qParam);
if (this.sn != 0 && this.sn != '' && this.sn != null) {
this.gps.sn = this.sn
console.log(this.sn, 'qParamqParamqParamqParam');
}
}
}
setTimeout(() => {
this.$u.get('/app/area/info?', this.gps).then((res) => {
if (res.code === 200) {
const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
this.areaInfo = res.data
this.polyline.push(polylines)
uni.setStorageSync('areaId', res.data.areaId);
// this.showmap = true
if (res.code === 200) {
// 基础数据获取
this.getinfo()
this.getmarks()
this.getParking()
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
// 更新折线数据
this.areaInfo = res.data
setTimeout(() => {
let abb = this.cleanedText()
console.log(abb.length, 'cleanedTextcleanedTextcleanedText');
if (uni.getStorageSync('token') && this.islogin) {
this.getisInOrder()
}
// 计算滚动时间，基于文本宽度
this.duration = abb.length * 0.3; // 50 px/s 的速度
}, 200)
this.polyline.push(polylines)
console.log();
// console.log(this.areaInfo, 'areaInfoareaInfo');
uni.setStorageSync('areaId', res.data.areaId);
this.getinfo()
this.getmarks()
// this.getlist()
this.getParking()
if (uni.getStorageSync('token')&&this.islogin) {
this.getisInOrder()
// 处理设备信息
if (this.gps.sn && /^\d{7}$/.test(this.gps.sn) && !this.isqrcode) {
if (!this.deviceInfos.sn) {
this.deviceInfo(this.qParam ? 1 : 0)
this.qParam = null
}
const hasShownPopup = uni.getStorageSync('hasShownPopup');
console.log(hasShownPopup, 'hasShownPopup');
if (hasShownPopup === '' || hasShownPopup === null) {
console.log('1111111111');
this.showTips = true;
this.startCountdown();
uni.setStorageSync('hasShownPopup', true);
} else {
console.log('222');
this.showTips = uni.getStorageSync('hasShownPopup');
console.log(this.showTips, 'this.showTips');
this.startCountdown();
}
if (this.gps.sn && /^\d{7}$/.test(this.gps.sn)) {
setTimeout(() => {
if (this.orderinfo.status) {
// this.showtcs = true
} else {
// if(this.showdevice==false&&){
// console.log('进入的判断1');
// this.deviceInfo(1)
// this.qParam = null
// }
if (this.deviceInfos.sn) {
} else {
if (this.qParam) {
console.log('进入的判断2');
this.deviceInfo(1)
this.qParam = null
} else {
console.log('进入的判断3');
// if(this.de)
this.deviceInfo(0)
this.qParam = null
}
}
}
}, 200)
}
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
}, 500);
}).catch(error => {
console.error("Error fetching area data:", error);
});
},
deviceInfo(num) {
if (!this.sn) return;

60
pages_admin/admin_worke.vue
View File

@ -1,4 +1,4 @@
<template>
<template>
<view class="page">
<view class="toptit" @click="shows()">
{{areaInfo.areaName}}
@ -11,78 +11,62 @@
<image src="https://lxnapi.ccttiot.com/bike/img/static/uMlgu6j9jnDqP1ZFL7xj" mode=""></image>
应用入口
</view>
<view class="app_box">
<view class="cont" @click="topage(0)" v-if="deptId==100">
<view class="app_box" v-if="menuList.length>0">
<view class="cont" @click="topage(0)" v-if="hasMenuPermission('运营数据') ">
<image src="https://lxnapi.ccttiot.com/bike/img/static/unnmUkUif2eWNKFq9fdg" mode=""></image>
<view class="text">
运营数据
</view>
</view>
<!-- <view class="cont" @click="topage(1)">
<image src="https://lxnapi.ccttiot.com/bike/img/static/upJFJIIZ4hbSEuchNQi3" mode=""></image>
<view class="text">
收入对账
</view>
</view> -->
<view class="cont" @click="topage(8)" v-if="deptId==101">
<view class="cont" @click="topage(8)" v-if="hasMenuPermission('财务报表')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/upJFJIIZ4hbSEuchNQi3" mode=""></image>
<view class="text">
财务报表
</view>
</view>
<view class="cont" @click="topage(2)">
<view class="cont" @click="topage(2)" v-if="hasMenuPermission('设备管理')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uNfRjhtxYmMPKaX4DqTS" mode=""></image>
<view class="text">
设备管理
</view>
</view>
<!-- <view class="cont" @click="topage(3)">
<image src="https://lxnapi.ccttiot.com/bike/img/static/ugC3s7fvhckzJN9vqsHa" mode=""></image>
<view class="text">
用户管理
</view>
</view> -->
<view class="cont" @click="topage(4)">
<view class="cont" @click="topage(4)" v-if="hasMenuPermission('用户页面')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uM4rBBaXc7b3TmsqQTvz" mode=""></image>
<view class="text">
用户页面
</view>
</view>
<view class="cont" @click="topage(5)" v-if="userinfo.sysUserId==1">
<view class="cont" @click="topage(5)" v-if="hasMenuPermission('车辆绑定')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uM4rBBaXc7b3TmsqQTvz" mode=""></image>
<view class="text">
车辆绑定
</view>
</view>
<view class="cont" @click="topage(6)" v-if="(userinfo.role == 9 || userinfo.role == 4) && deptId == 100">
<view class="cont" @click="topage(6)" v-if="hasMenuPermission('账户明细')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/u47okd0YdEQBsyhLlQIt" mode="" style="width: 50rpx;height: 50rpx;"></image>
<view class="text">
账户明细
</view>
</view>
<view class="cont" @click="topage(7)" v-if="userinfo.role !=4">
<view class="cont" @click="topage(7)" v-if="hasMenuPermission('故障审核')" >
<image src="https://lxnapi.ccttiot.com/bike/img/static/u47okd0YdEQBsyhLlQIt" mode="" style="width: 50rpx;height: 50rpx;"></image>
<view class="text">
故障审核
</view>
</view>
<view class="cont" @click="topage(9)" v-if="userinfo.role !=4">
<view class="cont" @click="topage(9)" v-if="hasMenuPermission('车型管理')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/ufE1T9RDOm7OmhLgTzXi" mode="" style="width: 100%;height: 100%;"></image>
<!-- <view class="text">
故障审核
</view> -->
</view>
<view class="cont" @click="topage(10)" v-if="userinfo.role !=4">
<view class="cont" @click="topage(10)" v-if="hasMenuPermission('收费模版')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uqG3ZQWu986qU0gU9vbb" mode="" style="width: 100%;height: 100%;"></image>
<!-- <view class="text">
故障审核
</view> -->
</view>
<view class="cont" @click="topage(11)" style="width: 96rpx;height: 96rpx;" v-if="userinfo.role !=4">
<view class="cont" @click="topage(11)" style="width: 96rpx;height: 96rpx;" v-if="hasMenuPermission('运营设置')">
<image src="https://lxnapi.ccttiot.com/bike/img/static/uqCr4GrXEx6irmRNNsfM" mode="" style="width: 96rpx;height: 96rpx;"></image>
<!-- <view class="text">
故障审核
</view> -->
</view>
</view>
@ -108,8 +92,8 @@
show: false,
info:{},
userinfo:{},
deptId:null
deptId:null,
menuList:[]
}
},
onShow() {
@ -133,13 +117,17 @@
},
},
methods: {
hasMenuPermission(menuName) {
return this.menuList.some(item => item.menuName === menuName);
},
getinfo() {
this.$u.get("/getAppInfo").then((res) => {
if (res.code == 200) {
this.userinfo = res.user
this.menuList=res.menu
console.log(this.menuList,'menuListmenuListmenuListmenuList');
} else {
// setTimeout(() => {
// this.getinfo()