Merge branch 'web' of www.gitinn.com:proginn/boss into web

 Conflicts:

	dist/200.html

	dist/_nuxt/d0357446cf5654e4039e.js

	dist/index.html

	dist/login/index.html

	dist/main/404/index.html

	dist/main/artificial_order/index.html

	dist/main/artificial_orders/index.html

	dist/main/balance_change/index.html

	dist/main/cats copy/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/cloud_balance/index.html

	dist/main/cloud_developer/index.html

	dist/main/cloud_job/index.html

	dist/main/dev_check/index.html

	dist/main/dev_check_detail/index.html

	dist/main/dev_show/index.html

	dist/main/gongmall/index.html

	dist/main/group_list/index.html

	dist/main/index.html

	dist/main/jishuquan/index.html

	dist/main/job/index.html

	dist/main/jobs/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/present_job_apply/index.html

	dist/main/publish_present/index.html

	dist/main/qingtuanbao/index.html

	dist/main/solution/index.html

	dist/main/solution_detail/index.html

	dist/main/user_bills/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/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/withdraw/index.html

	dist/main/work_bill/index.html

	pages/main/index/solution_detail.vue

.npmrc

@@ -0,0 +1,10 @@
+phantomjs_cdnurl=hhttps://cdn.npm.taobao.org/dist/phantomjs/
+chromedriver_cdnurl=https://cdn.npm.taobao.org/dist/chromedriver/
+operadriver_cdnurl=https://cdn.npm.taobao.org/dist/operadriver
+SASS_BINARY_SITE=https://cdn.npm.taobao.org/dist/node-sass
+ELECTRON_MIRROR=https://cdn.npm.taobao.org/dist/electron/
+ELECTRON_BUILDER_BINARIES_MIRROR=https://cdn.npm.taobao.org/dist/electron-builder-binaries/
+sass_binary_site=https://cdn.npm.taobao.org/dist/node-sass
+electron_mirror=https://cdn.npm.taobao.org/dist/electron/
+electron_builder_binaries_mirror=https://cdn.npm.taobao.org/dist/electron-builder-binaries/
+registry=https://registry.npm.taobao.org/

dist/_nuxt/LICENSES

@@ -1,29 +1,9 @@
 /*!
- * Vue.js v2.6.11
- * (c) 2014-2019 Evan You
- * Released under the MIT License.
- */
-
-/*!
-  * vue-router v3.1.3
-  * (c) 2019 Evan You
+  * vue-router v3.1.6
+  * (c) 2020 Evan You
   * @license MIT
   */
 
-/**
- * vuex v3.1.2
- * (c) 2019 Evan You
- * @license MIT
- */
-
-/*!
- * JavaScript Cookie v2.2.1
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-
 /*!
  * Determine if an object is a Buffer
  *
@@ -32,13 +12,7 @@
  */
 
 /*!
- * vue-client-only v2.0.0
- * (c) 2019-present egoist <0x142857@gmail.com>
- * Released under the MIT License.
- */
-
-/*!
- * Fuse.js v3.4.6 - Lightweight fuzzy-search (http://fusejs.io)
+ * Fuse.js v3.6.1 - Lightweight fuzzy-search (http://fusejs.io)
  * 
  * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)
  * All Rights Reserved. Apache Software License 2.0
@@ -47,10 +21,11 @@
  */
 
 /*!
- * The buffer module from node.js, for the browser.
+ * JavaScript Cookie v2.2.1
+ * https://github.com/js-cookie/js-cookie
  *
- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
- * @license  MIT
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
  */
 
 /*!
@@ -60,23 +35,8 @@
  * Copyright (c) 2013, salesforce.com
  */
 
-/**
- * Checks if an event is supported in the current execution environment.
- *
- * NOTE: This will not work correctly for non-generic events such as `change`,
- * `reset`, `load`, `error`, and `select`.
- *
- * Borrows from Modernizr.
- *
- * @param {string} eventNameSuffix Event name, e.g. "click".
- * @param {?boolean} capture Check if the capture phase is supported.
- * @return {boolean} True if the event is supported.
- * @internal
- * @license Modernizr 3.0.0pre (Custom Build) | MIT
- */
-
 /*!
- * Quill Editor v1.3.7
+ * Quill Editor v1.3.6
  * https://quilljs.com/
  * Copyright (c) 2014, Jason Chen
  * Copyright (c) 2013, salesforce.com
@@ -85,18 +45,58 @@
 /*!
  * The buffer module from node.js, for the browser.
  *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
  * @author   Feross Aboukhadijeh <http://feross.org>
  * @license  MIT
  */
 
 /*!
-* screenfull
-* v4.2.1 - 2019-07-27
-* (c) Sindre Sorhus; MIT License
-*/
+ * Vue.js v2.6.11
+ * (c) 2014-2019 Evan You
+ * Released under the MIT License.
+ */
+
+/*!
+ * vue-client-only v2.0.0
+ * (c) 2019-present egoist <0x142857@gmail.com>
+ * Released under the MIT License.
+ */
 
 /*!
  * vue-no-ssr v1.1.1
  * (c) 2018-present egoist <0x142857@gmail.com>
  * Released under the MIT License.
  */
+
+/*!
+* screenfull
+* v4.2.1 - 2019-07-27
+* (c) Sindre Sorhus; MIT License
+*/
+
+/**
+ * Checks if an event is supported in the current execution environment.
+ *
+ * NOTE: This will not work correctly for non-generic events such as `change`,
+ * `reset`, `load`, `error`, and `select`.
+ *
+ * Borrows from Modernizr.
+ *
+ * @param {string} eventNameSuffix Event name, e.g. "click".
+ * @param {?boolean} capture Check if the capture phase is supported.
+ * @return {boolean} True if the event is supported.
+ * @internal
+ * @license Modernizr 3.0.0pre (Custom Build) | MIT
+ */
+
+/**
+ * vuex v3.1.3
+ * (c) 2020 Evan You
+ * @license MIT
+ */

dist/_nuxt/5c213bdbf4c241f7cc44.js

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