Merge branch 'dev' into dev-majunjie

* dev: (21 commits)
  4.36.3
  4.36.3
  构建发布
  倒计时结束或者活动结束，隐藏活动内容
  构建发布
  修复bug
  构建发布
  修改技术认证以及个人开发者首页页面
  发布测试环境
  切换node版本，发布测试环境
  发布测试环境
  1.修改技术认证页，跳转方式 2.技术等级，去除等级>1显示逻辑
  技术认证
  技术认证
  处理倒计时文案换行
  修改等级标签 添加活动倒计时 添加cert_type字段 修改开发者页面，提示定位
  技术认证
  技术认证
  修改文案
  处理标题响应式 处理轮播，移动端不显示
  ...

# Conflicts:
#	pages/frontend/developer/index.vue

.nuxt/defaultRouter.js

@@ -23,6 +23,7 @@ const _d4291248 = () => interopDefault(import('..\\pages\\frontend\\account\\cha
 const _151bf70b = () => interopDefault(import('..\\pages\\frontend\\name_cert\\index.vue' /* webpackChunkName: "" */))
 const _3d7b2d08 = () => interopDefault(import('..\\pages\\frontend\\name_cert\\success.vue' /* webpackChunkName: "" */))
 const _71654416 = () => interopDefault(import('..\\pages\\frontend\\name_cert\\fail.vue' /* webpackChunkName: "" */))
+const _31d82711 = () => interopDefault(import('..\\pages\\frontend\\personal\\index.vue' /* webpackChunkName: "" */))
 const _5bc25b59 = () => interopDefault(import('..\\pages\\frontend\\developer\\index.vue' /* webpackChunkName: "" */))
 const _439d8949 = () => interopDefault(import('..\\pages\\404.vue' /* webpackChunkName: "pages/404" */))
 const _971d4282 = () => interopDefault(import('..\\pages\\cert\\index.vue' /* webpackChunkName: "pages/cert/index" */))
@@ -97,6 +98,7 @@ const _512eb777 = () => interopDefault(import('..\\pages\\type\\vip\\index copy.
 const _7a2a037b = () => interopDefault(import('..\\pages\\type\\vip\\orderRateDetail.vue' /* webpackChunkName: "pages/type/vip/orderRateDetail" */))
 const _b6e21e24 = () => interopDefault(import('..\\pages\\user\\index\\article.vue' /* webpackChunkName: "pages/user/index/article" */))
 const _130885f3 = () => interopDefault(import('..\\pages\\user\\index\\video.vue' /* webpackChunkName: "pages/user/index/video" */))
+const _680a43c2 = () => interopDefault(import('..\\pages\\frontend\\developer\\component\\level-introduce.vue' /* webpackChunkName: "pages/frontend/developer/component/level-introduce" */))
 const _21ffc5c9 = () => interopDefault(import('..\\pages\\frontend\\learn\\detail\\copy.vue' /* webpackChunkName: "pages/frontend/learn/detail/copy" */))
 const _7291c750 = () => interopDefault(import('..\\pages\\frontend\\requirements\\components\\Form_recommend.vue' /* webpackChunkName: "pages/frontend/requirements/components/Form_recommend" */))
 const _6f3734dc = () => interopDefault(import('..\\pages\\frontend\\requirements\\components\\Form_xuqiu.vue' /* webpackChunkName: "pages/frontend/requirements/components/Form_xuqiu" */))
@@ -105,6 +107,8 @@ const _274d6e34 = () => interopDefault(import('..\\pages\\frontend\\requirements
 const _bc848e9e = () => interopDefault(import('..\\pages\\frontend\\requirements\\components\\FormFirstStep.vue' /* webpackChunkName: "pages/frontend/requirements/components/FormFirstStep" */))
 const _0254cf75 = () => interopDefault(import('..\\pages\\frontend\\requirements\\components\\Loading.vue' /* webpackChunkName: "pages/frontend/requirements/components/Loading" */))
 const _cdcbb9b0 = () => interopDefault(import('..\\pages\\frontend\\requirements\\components\\StepEnd.vue' /* webpackChunkName: "pages/frontend/requirements/components/StepEnd" */))
+const _6d891810 = () => interopDefault(import('..\\pages\\frontend\\skill_cert\\components\\job-member-list.vue' /* webpackChunkName: "pages/frontend/skill_cert/components/job-member-list" */))
+const _3f736333 = () => interopDefault(import('..\\pages\\frontend\\skill_cert\\components\\skill-cert-activity.vue' /* webpackChunkName: "pages/frontend/skill_cert/components/skill-cert-activity" */))
 const _069caefb = () => interopDefault(import('..\\pages\\frontend\\skill_cert\\components\\skills.vue' /* webpackChunkName: "pages/frontend/skill_cert/components/skills" */))
 const _7d2e06ae = () => interopDefault(import('..\\pages\\frontend\\consult\\detail\\_id.vue' /* webpackChunkName: "pages/frontend/consult/detail/_id" */))
 const _290bc10a = () => interopDefault(import('..\\pages\\otherpage\\kaifain\\myKaifainData\\_type.vue' /* webpackChunkName: "pages/otherpage/kaifain/myKaifainData/_type" */))
@@ -278,6 +282,10 @@ export const routerOptions = {
     component: _71654416,
     name: "NameCertFail"
   }, {
+    path: "/frontend/personal",
+    component: _31d82711,
+    name: "PersonalIndex"
+  }, {
     path: "/frontend/requirements",
     component: _10880341,
     name: "requirements"
@@ -350,6 +358,10 @@ export const routerOptions = {
     component: _151bf70b,
     name: "frontend-name_cert"
   }, {
+    path: "/frontend/personal",
+    component: _31d82711,
+    name: "frontend-personal"
+  }, {
     path: "/frontend/requirements",
     component: _10880341,
     name: "frontend-requirements"
@@ -630,6 +642,10 @@ export const routerOptions = {
     component: _130885f3,
     name: "user-index-video"
   }, {
+    path: "/frontend/developer/component/level-introduce",
+    component: _680a43c2,
+    name: "frontend-developer-component-level-introduce"
+  }, {
     path: "/frontend/learn/detail/copy",
     component: _21ffc5c9,
     name: "frontend-learn-detail-copy"
@@ -662,6 +678,14 @@ export const routerOptions = {
     component: _cdcbb9b0,
     name: "frontend-requirements-components-StepEnd"
   }, {
+    path: "/frontend/skill_cert/components/job-member-list",
+    component: _6d891810,
+    name: "frontend-skill_cert-components-job-member-list"
+  }, {
+    path: "/frontend/skill_cert/components/skill-cert-activity",
+    component: _3f736333,
+    name: "frontend-skill_cert-components-skill-cert-activity"
+  }, {
     path: "/frontend/skill_cert/components/skills",
     component: _069caefb,
     name: "frontend-skill_cert-components-skills"

.nuxt/dist/client/pages/404~0a67e54a.b208a47.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[34],{1281:function(n,t,e){"use strict";e.r(t);var l={},c=e(16),component=Object(c.a)(l,(function(){var n=this.$createElement;return(this._self._c||n)("div",[this._v("目前SSR未有页面 ")])}),[],!1,null,null,null);t.default=component.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[36],{1292:function(n,t,e){"use strict";e.r(t);var l={},c=e(16),component=Object(c.a)(l,(function(){var n=this.$createElement;return(this._self._c||n)("div",[this._v("目前SSR未有页面 ")])}),[],!1,null,null,null);t.default=component.exports}}]);