Merge branch 'master' into 'pdfOrigen'

# Conflicts:
#   src/page/resume/resumeDetail.vue

package.json

@@ -17,7 +17,6 @@
     "js-cookie": "^2.2.0",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
-    "mammoth": "^1.4.8",
     "moment": "^2.24.0",
     "qs": "^6.7.0",
     "vue": "^2.5.2",

src/router/index.js

@@ -5,8 +5,8 @@ const home = r => require.ensure([], () => r(require('@/components/home.vue')),
 // const changepsd = r => require.ensure([], () => r(require('@/components/changepsd.vue')), 'changepsd');
 const login = r => require.ensure([], () => r(require('@/page/login/login.vue')), 'login');
 const update = r => require.ensure([], () => r(require('@/page/login/update.vue')), 'update');
-const resumeDetail = r =>require.ensure([], () => r(require('@/page/resume/resumeDetail.vue')),'resumeDetail')
 const pdfdetail = r =>require.ensure([], () => r(require('@/page/resume/pdfdetail.vue')),'pdfdetail')
+const resumeDetail = r =>require.ensure([], () => r(require('@/page/resume/resumeDetail.vue')),'resumeDetail')
 const interview = r => require.ensure([], () => r(require('@/page/interview/interview.vue')), 'interview');
 const allResume = r => require.ensure([], () => r(require('@/page/resume/allResume.vue')), 'allResume');
 const channel = r => require.ensure([], () => r(require('@/page/resume/channel.vue')), 'channel');
@@ -54,7 +54,8 @@ export default new Router({
       path: '/resumeDetail',
       name: 'resumeDetail',
       component: resumeDetail
-    },{
+    },
+    {
       path: '/pdfdetail',
       name: 'pdfdetail',
       component: pdfdetail