sunqiang/lanan-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ChuShiZ 2024-08-24 10:25:38 +08:00
commit a4ae5fa72c
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pages/Detain/Detain.vue
View File

@ -3,7 +3,7 @@
<template> <template>
<view class="content"> <view class="content">
<view style="background: #317dfa"> <view style="background: #317dfa">
<VNavigationBar title="扣车"></VNavigationBar> <VNavigationBar title="扣车管理"></VNavigationBar>
<view class="search-box"> <view class="search-box">
<view class="s-input"> <view class="s-input">
<uni-icons type="search" color=" #999999" size="16"></uni-icons> <uni-icons type="search" color=" #999999" size="16"></uni-icons>
@ -196,7 +196,7 @@
} }
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.one = res.total this.one = res.total || 0
} }
}) })
request({ request({
@ -210,7 +210,7 @@
} }
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.two = res.total this.two = res.total || 0
} }
}) })
@ -397,7 +397,7 @@
} }
.tap-box { .tap-box {
width: 33%; width: 50%;
font-size: 15px; font-size: 15px;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;

2
pages/login/login.vue
View File

@ -140,7 +140,7 @@
} }
}, },
}, },
created(){ mounted(){
getTenantIdByWebsite(this.tenantCode).then(res => { getTenantIdByWebsite(this.tenantCode).then(res => {
const tenantId = res.data; const tenantId = res.data;
if (tenantId && tenantId >= 0) { if (tenantId && tenantId >= 0) {

6
pages/my/carlist.vue
View File

@ -174,7 +174,7 @@
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.one = res.total this.one = res.total || 0
} }
}) })
@ -190,7 +190,7 @@
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.two = res.total this.two = res.total || 0
} }
}) })
@ -206,7 +206,7 @@
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.three = res.total this.three = res.total || 0
} }
}) })

14
pages/my/my.vue
View File

@ -380,9 +380,15 @@
}) })
}, },
gocarlist() { gocarlist() {
uni.navigateTo({ if(this.role === 'user'){
url: '/pages/my/carlist' uni.navigateTo({
}) url: '/pages/my/carlist'
})
}else {
uni.navigateTo({
url: '/pages/Detain/Detain'
})
}
}, },
goshang() { goshang() {
uni.navigateTo({ uni.navigateTo({
@ -531,7 +537,7 @@
.content { .content {
width: 100%; width: 100%;
height: calc(100vh); height: calc(100vh);
background-size: 100% 100%; background: #F6F7FC;
box-sizing: border-box; box-sizing: border-box;
} }

2
pages/rescue/trafficPolice.vue
View File

@ -236,7 +236,7 @@
// #endif // #endif
}, },
onShow() { onShow() {
this.Fourhammers() //this.Fourhammers()
this.timeWeekFormat() this.timeWeekFormat()
this.getsjlist() this.getsjlist()
this.getlist() this.getlist()