Merge branches 'dev' and 'master' of www.gitinn.com:proginn/boss

 Conflicts:

	.DS_Store

	dist/200.html

	dist/_nuxt/036d2618e75fb191899f.js

	dist/_nuxt/051c08f8f0f0ef226cad.js

	dist/_nuxt/09eee95aabc2217e487f.js

	dist/_nuxt/1a4cb61c01d7dcd90e07.js

	dist/_nuxt/1bbeace367c2f2f478b7.js

	dist/_nuxt/2378f322d8d983aa93d1.js

	dist/_nuxt/26899cdea62ffbd114be.js

	dist/_nuxt/26e059dfcca7c77364bd.js

	dist/_nuxt/279a48d699f97dbaf447.js

	dist/_nuxt/2b04a9afc8db3e9b4cd8.js

	dist/_nuxt/332db7ec311491405f2d.js

	dist/_nuxt/353f7ed8be72530e73ef.js

	dist/_nuxt/35eea6d5aaf8a65fe2b0.js

	dist/_nuxt/372f17b01c20a8d1e65b.js

	dist/_nuxt/3964a6f38555d75181ae.js

	dist/_nuxt/3aa7512538e08ba0b7a1.js

	dist/_nuxt/3c4a74e54d7bb2f70e2d.js

	dist/_nuxt/3e7e25006682b86b7ee0.js

	dist/_nuxt/3e89a02efc168f24bee7.js

	dist/_nuxt/478ae87a0e5610f85119.js

	dist/_nuxt/4ba673e45e35b8346f47.js

	dist/_nuxt/4bf6ab2bfcf74a8c0a79.js

	dist/_nuxt/52136cfdb2f6f8f87f64.js

	dist/_nuxt/540f7779ac7bf60a69b4.js

	dist/_nuxt/573ef76514b12380e6d1.js

	dist/_nuxt/5878e90e7b9a8520c4e7.js

	dist/_nuxt/5b55de11e53c7404681c.js

	dist/_nuxt/676eba227ede9d7ee5e1.js

	dist/_nuxt/68df94ab6c1e4b0271db.js

	dist/_nuxt/6cf2545838bd08907efc.js

	dist/_nuxt/70fdaac44e1ab61a79cf.js

	dist/_nuxt/71403128e7d91cbdfa4d.js

	dist/_nuxt/72d5bb1e4597f202eebd.js

	dist/_nuxt/73a63fccfd2cebc7299c.js

	dist/_nuxt/76de6da1c1a142bb4cde.js

	dist/_nuxt/7933d6fda852d8984374.js

	dist/_nuxt/7c0636bd0c3a1a1bdaf2.js

	dist/_nuxt/7db7e12e9586106cb91a.js

	dist/_nuxt/849cb7a7b59ec3b562b1.js

	dist/_nuxt/853e0f51a4b4c5629da9.js

	dist/_nuxt/86b01b3a7779744f2b9c.js

	dist/_nuxt/8933f782d1991cedfe1f.js

	dist/_nuxt/8ddcd61ebeef972658a8.js

	dist/_nuxt/929b81c39e5c4a177cb5.js

	dist/_nuxt/9c5415143a7ffdd30acc.js

	dist/_nuxt/9e8c947e9064d7862a24.js

	dist/_nuxt/9eb0782aab3a7a9735bf.js

	dist/_nuxt/aa7d690dfeadfe478920.js

	dist/_nuxt/ae3c53ffa7927dd2abe0.js

	dist/_nuxt/aec15629724283fc4705.js

	dist/_nuxt/af5b8d50d2595fb232d7.js

	dist/_nuxt/af5d99981fb4b0e2b297.js

	dist/_nuxt/b2d6faf5774d23f0970b.js

	dist/_nuxt/b8d9978fe586d60f7224.js

	dist/_nuxt/bb1cd517ee651b5db08b.js

	dist/_nuxt/bcfc4b66412a38786484.js

	dist/_nuxt/bf9943c4acf49b87c1a4.js

	dist/_nuxt/c7d48e2a99bc34c6fedc.js

	dist/_nuxt/d5db82448fd0e618b005.js

	dist/_nuxt/d64db91af6f4aefb1eea.js

	dist/_nuxt/de4ea4ddab6840e550de.js

	dist/_nuxt/e0c0e5094c86c89868dd.js

	dist/_nuxt/ec48ab4cff9461c79b66.js

	dist/_nuxt/f3940ae56bfdef9eb7e7.js

	dist/_nuxt/f3bc79cd63584ecfd46c.js

	dist/_nuxt/fdcec633d19c69388861.js

	dist/_nuxt/fe7f92a06f8eb82488e0.js

	dist/_nuxt/ff4e69aa7a98ad95c366.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/cloud_order copy/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/orders/index.html

	dist/main/orders_detail/index.html

	dist/main/orders_frozen/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

	pages/main/.DS_Store

dist/README.md

@@ -0,0 +1,10 @@
+# STATIC
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).

dist/_nuxt/LICENSES

@@ -0,0 +1,101 @@
+/*!
+ * Vue.js v2.6.10
+ * (c) 2014-2019 Evan You
+ * Released under the MIT License.
+ */
+
+/**
+ * vuex v3.1.1
+ * (c) 2019 Evan You
+ * @license MIT
+ */
+
+/*!
+ * JavaScript Cookie v2.2.0
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+
+/*!
+  * vue-router v3.0.6
+  * (c) 2019 Evan You
+  * @license MIT
+  */
+
+/**
+ * vue-meta v1.6.0
+ * (c) 2019 Declan de Wet & Sébastien Chopin (@Atinux)
+ * @license MIT
+ */
+
+/*
+	object-assign
+	(c) Sindre Sorhus
+	@license MIT
+	*/
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*!
+* screenfull
+* v4.2.1 - 2019-07-27
+* (c) Sindre Sorhus; MIT License
+*/
+
+/*!
+ * vue-no-ssr v1.1.1
+ * (c) 2018-present egoist <0x142857@gmail.com>
+ * Released under the MIT License.
+ */
+
+/*!
+ * Fuse.js v3.4.5 - Lightweight fuzzy-search (http://fusejs.io)
+ * 
+ * Copyright (c) 2012-2017 Kirollos Risk (http://kiro.me)
+ * All Rights Reserved. Apache Software License 2.0
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @license  MIT
+ */
+
+/*!
+ * Quill Editor v1.2.3
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * 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.6
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */