diff --git a/src/api/mine.js b/src/api/mine.js index 7b1b4d6a..a4874cde 100644 --- a/src/api/mine.js +++ b/src/api/mine.js @@ -162,7 +162,7 @@ export function notifyInvoiceDetail(data){ data }) } -// 获取培训材料列表 +// 调度app获取新签列表 export function pageList(data){ return request({ url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList', @@ -171,7 +171,14 @@ export function pageList(data){ data }) } - +// 司机app获取新签列表 +export function driverTrainList(key){ + return request({ + url:'/supplier/supplierTraining/trainingTask', + method:'GET', + params:key + }) +} //获取普通材料 export function getNormalList(key) { diff --git a/src/router/index.js b/src/router/index.js index 18ffaf22..7e6fc065 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -135,6 +135,14 @@ const routes = [ title:'培训文档' } }, + { + path: '/diverTrainDocment', + name: 'diverTrainDocment', + component:()=>import('@/views/documentView/diverTrainDocment.vue'), + meta: { + title:'培训文档' + } + }, { path: '/docmentList', name: 'docmentList', @@ -180,7 +188,15 @@ const routes = [ name: 'newTrainingList', component:()=>import('@/views/newcomerTraining/newTrainingList.vue'), meta: { - title:'新人培训' + title:'新服务商培训' + } + }, + { + path: '/driverTrainingList', + name: 'driverTrainingList', + component:()=>import('@/views/newcomerTraining/driverTrainingList.vue'), + meta: { + title:'新师傅培训' } }, { diff --git a/src/styles/docment.scss b/src/styles/docment.scss index dc8e988c..417c6adb 100644 --- a/src/styles/docment.scss +++ b/src/styles/docment.scss @@ -1,4 +1,7 @@ @import "@/styles/mixin.scss"; +::v-deep .van-nav-bar__content{ + background-color: #3A3A3A !important; +} .wrap{ @include wh(100%,100%); background-color: #F4F5F7; diff --git a/src/styles/driverDocment.scss b/src/styles/driverDocment.scss new file mode 100644 index 00000000..6adefed8 --- /dev/null +++ b/src/styles/driverDocment.scss @@ -0,0 +1,103 @@ +@import "@/styles/mixin.scss"; +.wrap{ + @include wh(100%,100%); + background-color: #F4F5F7; + +} +.navBar{ + margin-bottom: 46px; +} +.search{ + color: #AAADB3 !important; + font-weight: bolder; + margin-right: 10px; +} +.navLeft{ + display: flex; + flex-direction: column; + color: #9C9C9C; + font-size: 8px; + .icon{ + font-size: 10px; + font-weight: bold; + margin-right: 5px; + margin-top: 5px; + } +} +.statisticContainer{ + box-sizing: border-box; + padding: 8px; +} +.statisticWrap{ + @include wh(100%,100px); + background: #FFFFFF; + box-sizing: border-box; + padding: 8px 8px 15px; + border-radius: 8px; + border: 1px solid #c7c1c1; + display: flex; + flex-direction: column; + justify-content: space-between; + .line1{ + display: flex; + justify-content: space-between; + span:first-child{ + font-weight: bolder; + } + span:last-child{ + opacity: .7; + //font-size: 12px; + } + } + .numWrap{ + display: flex; + justify-content: space-around; + div{ + display: flex; + flex-direction: column; + align-items: center; + font-size: 14px; + font-weight: 500; + span:first-child{ + margin-bottom: 3px; + font-size: 18px; + } + } + } +} +.rightWrap { + @include flexCenter; + .img2 { + @include wh(17px, 17px); + } +} +.driver_tab_wrap { + font-size: 12px; + display: flex; + justify-content: space-around; + padding: 5px 0 5px 0; + div { + padding-top: 8px; + } + .active { + position: relative; + } + .active:after { + content: ''; + display: block; + @include wh(100px,2px); + background-color: #E8A524; + border-radius: 2px; + position: absolute; + margin-top: 3px; + left: 50%; + transform: translateX(-50%); + } +} +.empty{ + margin-top: 14px; + +} +.contentWrap{ + height: calc(100% - 180px) !important; +} \ No newline at end of file diff --git a/src/utils/http.js b/src/utils/http.js index 0c3f15d8..8b3813c8 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -16,18 +16,20 @@ localStorage.setItem('token', token); service.interceptors.request.use( config => { let reqUrl=config.url + // console.log("reqUrl",reqUrl) config.data = config.contentType ? config.data : qs.stringify(config.data) config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded' let token = localStorage.getItem('token'); - // alert(token); // let token='4099761587129c46b03c9316c9e866c9' // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw' - // console.log("tokentokentoken",token) if (reqUrl.includes("/driverApp")) { + // console.log("司机app") config.headers['token'] = `${token}`; - } else { - console.log("调度app") + } else if(reqUrl.includes("/supplierApp")){ + // console.log("调度app") config.headers['Authorization'] = `${token}`; + }else{ + config.headers['token'] = `${token}`; } return config }, diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js index 0aee548a..e2f76c62 100644 --- a/src/utils/myMixins.js +++ b/src/utils/myMixins.js @@ -34,12 +34,12 @@ export const myMixins = { window.android.sendMessage("goBack"); } }, - goH5Detail(item,type){//h5传参到app文档资料,培训文档 + goH5Detail(item){//h5传参到app文档资料,培训文档 let data = { "action": "goTraining", "params": { "id": item.id, - "docType" : type=='培训文档' ? 1 : 2, + // "docType" : type=='培训文档' ? 1 : 2, } }; @@ -48,7 +48,7 @@ export const myMixins = { if(isiOS){ window.webkit.messageHandlers.nativeObject.postMessage(data); }else { - window.android.sendMessage("articleId=" + item.id+','+'docType='+(type=='培训文档' ? 1 : 2)); + window.android.sendMessage("articleId=" +'#'+ item.id); } }, h5GoBack(){ diff --git a/src/views/documentView/diverTrainDocment.vue b/src/views/documentView/diverTrainDocment.vue new file mode 100644 index 00000000..2cfc5afc --- /dev/null +++ b/src/views/documentView/diverTrainDocment.vue @@ -0,0 +1,163 @@ + + + + \ No newline at end of file diff --git a/src/views/documentView/docmentList.vue b/src/views/documentView/docmentList.vue index 6b4cf7e9..48bbedee 100644 --- a/src/views/documentView/docmentList.vue +++ b/src/views/documentView/docmentList.vue @@ -1,28 +1,58 @@