Compare commits

..

No commits in common. "f452f3d8fb4a1ca1e277731684565f1b0c70dd8a" and "bcc9558a067d1fcec1c4a8412e54468c39f547bc" have entirely different histories.

5 changed files with 7 additions and 23 deletions

3
components.d.ts vendored
View File

@ -20,7 +20,6 @@ declare module 'vue' {
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElHeader: typeof import('element-plus/es')['ElHeader']
@ -34,8 +33,6 @@ declare module 'vue' {
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElStep: typeof import('element-plus/es')['ElStep']

4
env/.env.dev vendored
View File

@ -7,8 +7,8 @@ VITE_API_URL = '/proxyApi'
# 开发环境接口地址
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅
# VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅
# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅
VITE_proxyTarget = 'http://192.168.0.244:28580' # 马帅
# VITE_proxyTarget = 'http://192.168.2.129:18080' # 马帅
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)

View File

@ -18,13 +18,7 @@
</li>
<li>
<span>{{ company }}</span>
<el-button
:style="isType == 1 ? 'opacity:0.5' : ''"
class="lessee-btn"
:disabled="isType == 1"
@click.stop="onHandelLessee"
>立即承租</el-button
>
<el-button class="lessee-btn" @click.stop="onHandelLessee">立即承租</el-button>
</li>
</ul>
</div>
@ -35,7 +29,6 @@ import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
const router = useRouter()
const route = useRoute()
const isType = localStorage.getItem('rolesType')
const props: any = defineProps({
url: {
type: String,

View File

@ -9,7 +9,6 @@ import imgSrc from '@/assets/img/logo.png'
const store: any = mainStore()
const userStore = useStore()
const cart = cartStore()
const isType = localStorage.getItem('rolesType')
userStore.editMenuList(1)
@ -275,7 +274,7 @@ const onCarts = () => {
</a>
</div>
<div class="cart-icon" @click="onCarts" v-if="isType == 2">
<div class="cart-icon" @click="onCarts">
<el-badge :value="cartNum">
<svg class="icon" aria-hidden="true" style="width: 30px; height: 30px">
<use xlink:href="#icon-gouwuche2"></use>

View File

@ -71,7 +71,7 @@
<el-button
class="item_btn"
type="primary"
:disabled="pageData.isBookCar == 0 || isType == 1"
:disabled="pageData.isBookCar == 0"
@click="onAddCart"
>加入预约车</el-button
>
@ -80,12 +80,8 @@
<div>
<el-button
class="item_btn applyFor"
:disabled="pageData.isBookCar == 0 || isType == 1"
:style="
pageData.isBookCar == 0 || isType == 1
? 'opacity:0.5'
: ''
"
:disabled="pageData.isBookCar == 0"
:style="pageData.isBookCar == 0 ? 'opacity:0.5' : ''"
style="background-color: #1abc9c"
@click="onHandelLessee"
>
@ -384,7 +380,6 @@ const store = mainStore()
const ruleFormRef = ref()
const pageParams = route.params
const cart = cartStore()
const isType = localStorage.getItem('rolesType')
console.log(pageParams, 'pageParams')
const backPath = ref<any>('')