diff --git a/src/api/request.js b/src/api/request.js index 9b2f7a7..1a9bd69 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -3,6 +3,8 @@ import router from '@/router' import { showNotify } from 'vant'; const url = 'http://192.168.0.230'; +// const url = window.location.origin; + axios.defaults.baseURL = url; axios.defaults.withCredentials = false; axios.defaults.timeout = 200000; diff --git a/src/views/applyList/detail.vue b/src/views/applyList/detail.vue index fcf0848..ab009c6 100644 --- a/src/views/applyList/detail.vue +++ b/src/views/applyList/detail.vue @@ -120,7 +120,7 @@ const getDetail = async () => { }else{ info.value.steps = res.data?.apply_steps; } - console.log(info.value) + console.log(info.value); } finally { loading.value = false; } @@ -229,7 +229,8 @@ onMounted(() => { params?.type==='wait' && info?.status!=99 && params?.isMyself==='pending' && (info?.status==1 || info?.status==2 || info?.status==3 || info?.status==4) && (((info?.template_id==1 || info?.template_id==4) && (info?.current_step>=1 && info?.current_step<=3)) || - ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) + ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) || + info?.template_id==5 ">

同意

驳回

diff --git a/src/views/applyList/lockDetail.vue b/src/views/applyList/lockDetail.vue index 533ed37..3b9853f 100644 --- a/src/views/applyList/lockDetail.vue +++ b/src/views/applyList/lockDetail.vue @@ -180,7 +180,8 @@ onMounted(() => { params?.type==='wait' && info?.status!=99 && params?.isMyself==='pending' && (info?.status==1 || info?.status==2 || info?.status==3 || info?.status==4) && (((info?.template_id==1 || info?.template_id==4) && (info?.current_step>=1 && info?.current_step<=3)) || - ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) + ((info?.template_id==2 || info?.template_id)==3 && (info?.current_step>=1 && info?.current_step<=4))) || + info?.template_id==5 ">

同意

驳回

diff --git a/src/views/applyList/waitList.vue b/src/views/applyList/waitList.vue index ddde309..4efcab5 100644 --- a/src/views/applyList/waitList.vue +++ b/src/views/applyList/waitList.vue @@ -1,7 +1,7 @@