Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	.nuxt/dist/client/app~24120820.7cc900a.css
#	.nuxt/dist/client/app~24120820.b37eee6.js
#	.nuxt/dist/client/commons/default~b65b9db7.ce6d68a.js
#	.nuxt/dist/client/runtime.f91ff89.js
#	.nuxt/dist/server/108.js
#	.nuxt/dist/server/108.js.map
#	.nuxt/dist/server/126.js.map
#	.nuxt/dist/server/client.manifest.json
#	.nuxt/dist/server/index.spa.html
#	.nuxt/dist/server/pages/frontend/learn/add.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/add.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/cert_form.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/profile.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/ready_interview.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/resume_improve.js.map
#	.nuxt/dist/server/pages/frontend/skill_cert/start_interview.js.map
#	.nuxt/dist/server/pages/otherpage/kaifain/viewHistory.js.map
#	.nuxt/dist/server/pages/otherpage/money/uploadInvoice.js.map
#	.nuxt/dist/server/pages/otherpage/money/withdraw.js.map
#	.nuxt/dist/server/pages/sign/new.js.map
#	.nuxt/dist/server/server.js
#	.nuxt/dist/server/server.js.map

.nuxt/App.js

@@ -4,16 +4,16 @@ import { getMatchedComponentsInstances, getChildrenComponentInstancesUsingFetch,
 
 import NuxtLoading from './components/nuxt-loading.vue'
 
-import '..\\assets\\css\\common.css'
+import '../assets/css/common.css'
 
-import '..\\assets\\css\\special.css'
+import '../assets/css/special.css'
 
-import '..\\node_modules\\swiper\\dist\\css\\swiper.css'
+import '../node_modules/swiper/dist/css/swiper.css'
 
-import _6f6c098b from '..\\layouts\\default.vue'
-import _bd0fdcf8 from '..\\layouts\\noheader.vue'
-import _42906ebb from '..\\layouts\\opacity_header_kf_tmp.vue'
-import _77223ab7 from '..\\layouts\\opacity_header.vue'
+import _6f6c098b from '../layouts/default.vue'
+import _bd0fdcf8 from '../layouts/noheader.vue'
+import _42906ebb from '../layouts/opacity_header_kf_tmp.vue'
+import _77223ab7 from '../layouts/opacity_header.vue'
 
 const layouts = { "_default": sanitizeComponent(_6f6c098b),"_noheader": sanitizeComponent(_bd0fdcf8),"_opacity_header_kf_tmp": sanitizeComponent(_42906ebb),"_opacity_header": sanitizeComponent(_77223ab7) }
 

.nuxt/axios.js

@@ -92,10 +92,7 @@ const setupProgress = (axios) => {
     set: () => { }
   }
 
-  const $loading = () => {
-    const $nuxt = typeof window !== 'undefined' && window['$nuxt']
-    return ($nuxt && $nuxt.$loading && $nuxt.$loading.set) ? $nuxt.$loading : noopLoading
-  }
+  const $loading = () => (window.$nuxt && window.$nuxt.$loading && window.$nuxt.$loading.set) ? window.$nuxt.$loading : noopLoading
 
   let currentRequests = 0
 
@@ -173,13 +170,14 @@ export default (ctx, inject) => {
   }
 
   // Proxy SSR request headers headers
-  if (process.server && ctx.req && ctx.req.headers) {
-    const reqHeaders = { ...ctx.req.headers }
-    for (let h of ["accept","host","cf-ray","cf-connecting-ip","content-length","content-md5","content-type"]) {
-      delete reqHeaders[h]
-    }
-    axiosOptions.headers.common = { ...reqHeaders, ...axiosOptions.headers.common }
-  }
+  axiosOptions.headers.common = (ctx.req && ctx.req.headers) ? Object.assign({}, ctx.req.headers) : {}
+  delete axiosOptions.headers.common['accept']
+  delete axiosOptions.headers.common['host']
+  delete axiosOptions.headers.common['cf-ray']
+  delete axiosOptions.headers.common['cf-connecting-ip']
+  delete axiosOptions.headers.common['content-length']
+  delete axiosOptions.headers.common['content-md5']
+  delete axiosOptions.headers.common['content-type']
 
   if (process.server) {
     // Don't accept brotli encoding because Node can't parse it

.nuxt/components/nuxt-error.vue

@@ -7,7 +7,8 @@
 
       <div class="title">{{ message }}</div>
       <p v-if="statusCode === 404" class="description">
-        <NuxtLink class="error-link" to="/">Back to the home page</NuxtLink>
+        <a v-if="typeof $route === 'undefined'" class="error-link" href="/"></a>
+        <NuxtLink v-else class="error-link" to="/">Back to the home page</NuxtLink>
       </p>
 
       <div class="logo">

.nuxt/dist/client/152.52d9579.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[152],{1315:function(e,n,t){"use strict";t.r(n);var l={name:"SeoCompanyDetail"},o=t(17),component=Object(o.a)(l,(function(){var e=this.$createElement;return(this._self._c||e)("div",[this._v("详情页")])}),[],!1,null,null,null);n.default=component.exports}}]);

.nuxt/dist/client/LICENSES

@@ -12,7 +12,7 @@ object-assign
     */
 
 /*!
-  * vue-router v3.3.4
+  * vue-router v3.4.3
   * (c) 2020 Evan You
   * @license MIT
   */
@@ -49,14 +49,14 @@ object-assign
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
  * @license  MIT
  */
 
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <https://feross.org>
+ * @author   Feross Aboukhadijeh <http://feross.org>
  * @license  MIT
  */
 
@@ -165,6 +165,8 @@ object-assign
 
 /*! http://mths.be/fromcodepoint v0.1.0 by @mathias */
 
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
 /**
    * @license
    * 
@@ -312,9 +314,3 @@ object-assign
    * 
    * ====================================================================
    */
-
-//! moment.js
-
-//! moment.js language configuration
-
-//! moment.js locale configuration