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

# Conflicts:
#	dist/200.html
#	dist/_nuxt/a582a8a9f10466ad2f20.js
#	dist/_nuxt/cbb1e38fe07cf05784ae.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/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/solution/index.html
#	dist/main/solution_detail/index.html
#	dist/main/user_bills/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/job.vue

dist/_nuxt/12df87d85ace02d76e09.css

@@ -0,0 +1 @@
+#error-page{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}

dist/_nuxt/21a570ae8088c3446187.css

@@ -0,0 +1 @@
+.table[data-v-2b5afdbc]{height:calc(100% - 40px)}.img[data-v-2b5afdbc]{width:100%;height:auto}

dist/_nuxt/33858bb63cc6418a64a7.css

@@ -0,0 +1 @@
+.table[data-v-6bbe31dc]{height:calc(100% - 80px)}

dist/_nuxt/3702813113cdaf9bdf45.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[5],{381:function(t,n,e){},423:function(t,n,e){"use strict";var r=e(381);e.n(r).a},504:function(t,n,e){"use strict";e.r(n);e(423);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}}]);

dist/_nuxt/3b4124777c0ce9d7a946.css

@@ -0,0 +1 @@
+.box-card[data-v-7b30f4c6]{margin-bottom:10px;width:100%}.header[data-v-7b30f4c6]{font-size:24px;color:#222;font-weight:600}.clearfix[data-v-7b30f4c6]:after,.clearfix[data-v-7b30f4c6]:before{display:table;content:""}.clearfix[data-v-7b30f4c6]:after{clear:both}.el-col[data-v-7b30f4c6]{padding-top:20px;padding-bottom:20px}.module-title[data-v-7b30f4c6]{font-weight:700}.module-content[data-v-7b30f4c6]{margin-top:17px;margin-left:14px}

dist/_nuxt/43207f177405f6005169.css

@@ -0,0 +1 @@
+.count-list[data-v-682cec70]{padding-bottom:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.count-item[data-v-682cec70]{margin-right:20px;font-size:16px}.content[data-v-682cec70]{white-space:nowrap;overflow-x:scroll;height:calc(100vh - 150px)}.btn[data-v-682cec70]{width:80px}.order-footer[data-v-682cec70]{margin-top:10px}

dist/_nuxt/4f2edf2ae45d3db19235.css

@@ -0,0 +1 @@
+.table[data-v-2ecade7c]{height:calc(100% - 40px)}

dist/_nuxt/5b56931f82aed94e429d.css

@@ -0,0 +1 @@
+.table[data-v-71bf4afc]{height:calc(100% - 40px)}.avatar-uploader .el-upload[data-v-71bf4afc]{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-71bf4afc]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-71bf4afc]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-71bf4afc]{width:178px;height:178px;display:block}

dist/_nuxt/6ce5c5e9ef294d26d1fa.css

@@ -0,0 +1 @@
+.user-info[data-v-f500349a],.user-name[data-v-f500349a]{margin-bottom:10px}.order-footer[data-v-f500349a]{position:absolute;bottom:10px;left:10px}.product_title[data-v-f500349a]{overflow:hidden;-webkit-line-clamp:1;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}#mainBody[data-v-f500349a]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 40px)}

dist/_nuxt/706619e892be8d88cec2.css

@@ -0,0 +1 @@
+#vip-setting{padding:20px}.table{height:100%;height:calc(100% - 80px)}.el-input{width:auto}.el-check-group,.el-form-item,.el-form-item__content{display:inline-block}.device-select{margin-bottom:20px}

dist/_nuxt/73c0fc507c876219291f.css

@@ -0,0 +1 @@
+.table[data-v-365687b0]{height:calc(100% - 80px)}

dist/_nuxt/771c4e6ada664c6ddcd2.css

@@ -0,0 +1 @@
+.header[data-v-20ac0479]{margin-top:20px;margin-bottom:30px}.tab-header[data-v-20ac0479]{margin-bottom:10px}.tab-content[data-v-20ac0479]{white-space:nowrap;overflow-x:scroll;height:calc(100vh - 300px)}.order-footer[data-v-20ac0479]{margin-top:10px}

dist/_nuxt/80c24d0fed0ae90c8d29.css

@@ -0,0 +1 @@
+.menu-title[data-v-a57350e4]{padding:0 16px}#main[data-v-f002cab2]{display:-webkit-box;display:-ms-flexbox;display:flex;height:calc(100vh - 70px);padding:10px}.main-content[data-v-f002cab2]{-webkit-box-flex:1;-ms-flex:1;flex:1}

dist/_nuxt/83d3f2c0cd49be24182b.css

@@ -0,0 +1 @@
+.count-list[data-v-0eb81e71]{padding-bottom:10px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.count-item[data-v-0eb81e71]{margin-right:20px;font-size:16px}.content[data-v-0eb81e71]{white-space:nowrap;overflow-x:scroll;height:calc(100vh - 150px)}.btn[data-v-0eb81e71]{width:80px}.order-footer[data-v-0eb81e71]{margin-top:10px}

dist/_nuxt/89e41759e3f52593362b.css

@@ -0,0 +1 @@
+.table[data-v-556c65be]{height:calc(100% - 40px)}

dist/_nuxt/a25ddccbef9b9ee5643e.css

@@ -0,0 +1 @@
+#login{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:200px}.ruleForm{width:550px}

dist/_nuxt/a79ab18d96b1681bc8db.css

@@ -0,0 +1 @@
+.el-row[data-v-28933b49]{margin-bottom:20px}.top[data-v-28933b49]{margin-top:10px}

dist/_nuxt/ba6da4775ac64462c635.css

@@ -0,0 +1 @@
+.box-card[data-v-396650a5]{margin-bottom:10px;width:100%}.header[data-v-396650a5]{font-size:24px;color:#222;font-weight:600}.clearfix[data-v-396650a5]:after,.clearfix[data-v-396650a5]:before{display:table;content:""}.clearfix[data-v-396650a5]:after{clear:both}.el-col[data-v-396650a5]{padding-top:20px;padding-bottom:20px}.module-title[data-v-396650a5]{font-weight:700}.module-content[data-v-396650a5]{margin-top:17px;margin-left:14px}