Merge branch 'dev'

# Conflicts:
#	dist/200.html
#	dist/_nuxt/7e68731.js
#	dist/index.html
#	dist/login/index.html
#	dist/main/404/index.html
#	dist/main/account_manager/index.html
#	dist/main/admin_user/index.html
#	dist/main/artificial_order/index.html
#	dist/main/artificial_orders/index.html
#	dist/main/artificial_payment_add/index.html
#	dist/main/balance_change/index.html
#	dist/main/cancel_account/index.html
#	dist/main/card_conf/index.html
#	dist/main/cash_form/index.html
#	dist/main/cats/index.html
#	dist/main/cert_check/index.html
#	dist/main/cert_edit/index.html
#	dist/main/cert_pro/index.html
#	dist/main/chat_users/index.html
#	dist/main/cloud_balance/index.html
#	dist/main/cloud_developer/index.html
#	dist/main/cloud_job/index.html
#	dist/main/company_vip/index.html
#	dist/main/cps_manage/index.html
#	dist/main/cunxinbao/index.html
#	dist/main/dev_check/index.html
#	dist/main/dev_check_detail/index.html
#	dist/main/dev_show/index.html
#	dist/main/free_work/index.html
#	dist/main/freework_level/index.html
#	dist/main/freework_level_info/index.html
#	dist/main/gongmall/index.html
#	dist/main/group/index.html
#	dist/main/group_list/index.html
#	dist/main/index.html
#	dist/main/invoice_audit/index.html
#	dist/main/jishuquan/index.html
#	dist/main/job/index.html
#	dist/main/jobs/index.html
#	dist/main/jobs_behalf_post/index.html
#	dist/main/jobs_publish_company/index.html
#	dist/main/js/admin_user/index.html
#	dist/main/js/group/index.html
#	dist/main/js/nav_list/index.html
#	dist/main/js/sale/index.html
#	dist/main/js/sale_order/index.html
#	dist/main/js/user_workfile_list/index.html
#	dist/main/kaifabao/index.html
#	dist/main/kaifawu_contact/index.html
#	dist/main/nav_add/index.html
#	dist/main/nav_list/index.html
#	dist/main/occupation_setting/index.html
#	dist/main/orders/index.html
#	dist/main/orders_detail/index.html
#	dist/main/orders_frozen/index.html
#	dist/main/outsource_bill/index.html
#	dist/main/page_item/index.html
#	dist/main/page_manage/index.html
#	dist/main/persona/index.html
#	dist/main/present_job_apply/index.html
#	dist/main/project_form/index.html
#	dist/main/publish_present/index.html
#	dist/main/publish_recruit/index.html
#	dist/main/qingtuanbao/index.html
#	dist/main/quick_manage/index.html
#	dist/main/recruit_manage/index.html
#	dist/main/recuit_purchase_conf/index.html
#	dist/main/remark_list/index.html
#	dist/main/report_business/index.html
#	dist/main/report_cash/index.html
#	dist/main/sale/index.html
#	dist/main/sale_detail/index.html
#	dist/main/sale_order/index.html
#	dist/main/sale_vod_edit/index.html
#	dist/main/sale_vod_manage/index.html
#	dist/main/sale_vod_publish/index.html
#	dist/main/send/index.html
#	dist/main/send_add/index.html
#	dist/main/solution/index.html
#	dist/main/solution_detail/index.html
#	dist/main/solution_manage/index.html
#	dist/main/stats/index.html
#	dist/main/user_bills/index.html
#	dist/main/user_cards_list/index.html
#	dist/main/user_credit_item/index.html
#	dist/main/user_credit_list/index.html
#	dist/main/user_credit_setting/index.html
#	dist/main/user_homepwd/index.html
#	dist/main/user_namecard/index.html
#	dist/main/user_search/index.html
#	dist/main/user_workfile_list/index.html
#	dist/main/user_workfile_remark/index.html
#	dist/main/vip_info/index.html
#	dist/main/vip_manager/index.html
#	dist/main/vip_order/index.html
#	dist/main/vip_setting/index.html
#	dist/main/wage_details/index.html
#	dist/main/wage_settlement/index.html
#	dist/main/wait_expend/index.html
#	dist/main/weight_restore/index.html
#	dist/main/withdraw/index.html
#	dist/main/work_bill/index.html
#	dist/main/work_statistics/index.html
#	dist/main/workorder/index.html

dist/_nuxt/cca0c1d.js

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{427:function(n,t,e){},510:function(n,t,e){"use strict";e(427)},693:function(n,t,e){"use strict";e.r(t);e(510);var r=e(2),component=Object(r.a)({},(function(){var n=this,t=n.$createElement;n._self._c;return n._m(0)}),[function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("section",{attrs:{id:"error-page"}},[e("span",[n._v("页面飞了……")])])}],!1,null,null,null);t.default=component.exports}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[6],{427:function(n,t,e){},510:function(n,t,e){"use strict";e(427)},696:function(n,t,e){"use strict";e.r(t);e(510);var r=e(2),component=Object(r.a)({},(function(){var n=this,t=n.$createElement;n._self._c;return n._m(0)}),[function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("section",{attrs:{id:"error-page"}},[e("span",[n._v("页面飞了……")])])}],!1,null,null,null);t.default=component.exports}}]);