diff --git a/src/api/mine.js b/src/api/mine.js index 7bb59d68..ddac1cbf 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -5,11 +5,11 @@ export function supplierVehicleList(data){ return request({ url:'/supplierAppV2/dispatchApp/user/supplierVehicleList', method:'POST', - contentTye:'application/json', + contentType:'application/json', data }) } -//添加或修改车辆信息 +//编辑车辆信息 export function saveVehicle(data){ return request({ url:'/supplierAppV2/dispatchApp/user/saveVehicle', @@ -42,4 +42,22 @@ export function vehicleTypeList(){ url:'/supplierAppV2/dispatchApp/user/vehicleTypeList', method:'POST' }) +} + //司机列表 +export function driverList(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/driverList', + method:'POST', + contentType:'application/json', + data + }) +} +//编辑司机信息 +export function saveDriver(data){ + return request({ + url:'/supplierAppV2/dispatchApp/user/saveDriver', + method:'POST', + contentType:'application/json', + data + }) } \ No newline at end of file diff --git a/src/assets/addImg.png b/src/assets/addImg.png new file mode 100644 index 00000000..6f6fb041 Binary files /dev/null and b/src/assets/addImg.png differ diff --git a/src/assets/empty.png b/src/assets/empty.png new file mode 100644 index 00000000..9cc845b7 Binary files /dev/null and b/src/assets/empty.png differ diff --git a/src/components/cellGroup.vue b/src/components/cellGroup.vue index f7936447..be6c3898 100644 --- a/src/components/cellGroup.vue +++ b/src/components/cellGroup.vue @@ -55,12 +55,12 @@ export default { @include widHeiMar(6px,6px,3px); } ::v-deep .van-field__label{ - @include fontWeightSize(500,14px); + @include fontWeightSize(bold,14px); color: #323643; margin-left: 10px; } ::v-deep .van-field__control{ color: #323643; - @include fontWeightSize(500,13px); + @include fontWeightSize(bold,13px); } \ No newline at end of file diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue index b093f3bb..c3f1c2bc 100644 --- a/src/components/commonBtn.vue +++ b/src/components/commonBtn.vue @@ -29,7 +29,7 @@ border-radius: 5px; text-align: center; @include bgFontColor(#FFFFFF,#354D93); - @include fontWeightSize(500,15px); + @include fontWeightSize(bold,15px); @include whLin(88%,48px); } diff --git a/src/components/twoBtnCommon.vue b/src/components/twoBtnCommon.vue index 0bd70670..856578d7 100644 --- a/src/components/twoBtnCommon.vue +++ b/src/components/twoBtnCommon.vue @@ -38,7 +38,7 @@ export default { @include whLin(152px,39px); border-radius: 5px; color: #FFFFFF; - @include fontWeightSize(500,14px) + @include fontWeightSize(bold,14px) } .cancel{ background: #9EA7C0; diff --git a/src/router/index.js b/src/router/index.js index 6dd31325..d1b79357 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -39,10 +39,18 @@ const routes = [ title: '补结算单' } }, + { + path: "/workOrderReconciliation", + name: "workOrderReconciliation", + component:()=>import('@/views/workOrder/workOrderReconciliation.vue'), + meta: { + title: '工单对账' + } + }, { path: "/accounting", name: 'accountingView', - component: () => import('@/views/index/accounting'), + component: () => import('@/views/workOrder/accounting.vue'), meta: { title: '记账' } @@ -50,7 +58,7 @@ const routes = [ { path: "/reAccounting", name: 'reAccountingView', - component: () => import('@/views/index/reAccounting'), + component: () => import('@/views/workOrder/reAccounting.vue'), meta: { title: '重新记账' } diff --git a/src/styles/common.scss b/src/styles/common.scss index b50537de..2629b2d6 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -29,24 +29,24 @@ select{ overflow-y: auto; } ::v-deep .van-nav-bar__content{ - background-color: #354683 ; + background-color: #2C395F ; } ::v-deep .van-nav-bar__title{ color: #fff; opacity: .7; - font-weight: 500; - font-size: 15px; + font-weight: bolder; + font-size: 18px; } ::v-deep .van-nav-bar .van-icon{ color: #fff; opacity: .7; - font-size: 15px; + font-size: 18px; width: 6px; height: 13px; } ::v-deep .van-radio__label{ margin-left: 0; - font-weight: 400; + font-weight: normal; font-size: 14px; //@include fontWeightSize(400,14px); color: #000000; diff --git a/src/utils/http.js b/src/utils/http.js index 3a5344fd..f62f489f 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -14,8 +14,9 @@ service.interceptors.request.use( config => { config.data = config.contentType ? config.data : qs.stringify(config.data) config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded' - const urlParams = new URLSearchParams(window.location.search); - const token = urlParams.get('token'); + // const urlParams = new URLSearchParams(window.location.search); + // const token = urlParams.get('token'); + let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjE2ODQ3OCwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyMjU0ODc4LCJpYXQiOjE2OTIxNjg0Nzh9.yVreEsJqwcEy6jALrhqQ9tasuBKqEE-y3fq_TXfaspE' config.headers['Authorization'] = `${token}`; return config }, diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js index 42a77bf4..a1b7ef5b 100644 --- a/src/utils/myMixins.js +++ b/src/utils/myMixins.js @@ -22,6 +22,12 @@ export const myMixins = { document.execCommand('copy'); window.getSelection().removeAllRanges(); // 清除选择内容的高亮状态 this.$toast('复制成功') + }, + goBack(){//h5返回APP + window.android.sendMessage("goBack"); + }, + h5GoBack(){ + this.$router.back(); } } } diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue index 82b5523d..3c3b4a69 100644 --- a/src/views/index/driverAdd.vue +++ b/src/views/index/driverAdd.vue @@ -141,7 +141,7 @@ export default { box-sizing: border-box; padding-right: 25px; .titleType{ - @include fontWeightSize(500,14px); + @include fontWeightSize(bold,14px); color: #323643; } .isJoin{ @@ -160,7 +160,7 @@ export default { input{ border: none; text-align: right; - @include fontWeightSize(500,13px); + @include fontWeightSize(bold,13px); opacity: .5; } diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue index fe2a19b5..c4eff3b1 100644 --- a/src/views/index/driverManage.vue +++ b/src/views/index/driverManage.vue @@ -1,5 +1,23 @@ + + \ No newline at end of file