Merge branch 'master' into dev

# Conflicts:
#	dist/200.html
#	dist/_nuxt/079a17529e879ceb9d51.js
#	dist/_nuxt/108c3debf69162e3b5dc.js
#	dist/_nuxt/11da6a1c10b629eb1ea4.js
#	dist/_nuxt/1258e90d2d6944be950b.js
#	dist/_nuxt/1582eb6da06ef0c7737d.js
#	dist/_nuxt/162a2c2f51ef475cdf92.js
#	dist/_nuxt/1731f3e6e1ce66659011.js
#	dist/_nuxt/1b88b7f2b5ca5d0578b9.js
#	dist/_nuxt/209900c836558432f5b3.js
#	dist/_nuxt/212a4c89d974a4401cbb.js
#	dist/_nuxt/23f84aedb5fa7517ec5d.js
#	dist/_nuxt/26e68379d3d983e45d0e.js
#	dist/_nuxt/277eedd8c65b5ba01326.js
#	dist/_nuxt/2b5c5a8162402aac3e9b.js
#	dist/_nuxt/3aba010ccdf7fcfd7899.js
#	dist/_nuxt/4255226e5135f2239f71.js
#	dist/_nuxt/4263c4a18b48db9c4166.js
#	dist/_nuxt/43cfa1b3afd925af7ce5.js
#	dist/_nuxt/446492ce5f1061b98bc6.js
#	dist/_nuxt/4a7f4afd13ea9cac5edf.js
#	dist/_nuxt/4acd80cf2c9f5ff3bf28.js
#	dist/_nuxt/4b91267252cbeb6c1ae0.js
#	dist/_nuxt/4ba2c98f27f845ac5b43.js
#	dist/_nuxt/4d8c73939866179aa72b.js
#	dist/_nuxt/5276766d2bccfa160aa1.js
#	dist/_nuxt/5997322a968bb385635b.js
#	dist/_nuxt/5fd2f7ae2a5671886be6.js
#	dist/_nuxt/72b1f040d55e664adaa9.js
#	dist/_nuxt/73b3e037706faca9fd89.js
#	dist/_nuxt/793c0801ff56fd217dc8.js
#	dist/_nuxt/7e2a1239a41df34afbd6.js
#	dist/_nuxt/8261cbb25d5ae1d35775.js
#	dist/_nuxt/839b7b319ed98288df09.js
#	dist/_nuxt/8c733a9251b696a9d9f9.js
#	dist/_nuxt/8e00b305332d6646e357.js
#	dist/_nuxt/935cbc8b4ecba63234c1.js
#	dist/_nuxt/946e81a3d32ab7249022.js
#	dist/_nuxt/94cf933ddbb1d792fc90.js
#	dist/_nuxt/9572e3c646d68431c5f6.js
#	dist/_nuxt/969372dab02727e798ab.js
#	dist/_nuxt/978ab16d347cc6a6f6f6.js
#	dist/_nuxt/9795c3132fc4c6b3869c.js
#	dist/_nuxt/99120c403483719b2de1.js
#	dist/_nuxt/9b632d22aa324c65fe99.js
#	dist/_nuxt/9c8c16075d27b338ec0e.js
#	dist/_nuxt/9f0285b250480d0b9d94.js
#	dist/_nuxt/a64435d46846e130d244.js
#	dist/_nuxt/ae79fb1f7083c40a1aed.js
#	dist/_nuxt/b01ba2991c72301a2118.js
#	dist/_nuxt/b6c39710302d5eae377b.js
#	dist/_nuxt/b93a5ef1a1cac445cfeb.js
#	dist/_nuxt/bbb4ea37a5353b76d20d.js
#	dist/_nuxt/c66954589160b70ff44f.js
#	dist/_nuxt/c6f68f50b7f49d839396.js
#	dist/_nuxt/c988325ce3d230e725a7.js
#	dist/_nuxt/d37629b5ee725f2b7af3.js
#	dist/_nuxt/d6a14499ebad58ce27ab.js
#	dist/_nuxt/d7e1c583a48e0b900c3e.js
#	dist/_nuxt/dc3aa6f50ce7efc4f25b.js
#	dist/_nuxt/e8614e00902bbe6d3ce1.js
#	dist/_nuxt/ec36410ec804ae1b28af.js
#	dist/_nuxt/ed881176416e3da6a248.js
#	dist/_nuxt/ee004d8b709a38dd9f1f.js
#	dist/_nuxt/f0558d2dca29bc75664c.js
#	dist/_nuxt/f09c09743dadf2a72d6c.js
#	dist/_nuxt/f13e1ae766ae6169272a.js
#	dist/_nuxt/f5472d7ea2fa7e8b420c.js
#	dist/_nuxt/f656c0725ecee59fbcc1.js
#	dist/_nuxt/f76248cbed7ce5336d6c.js
#	dist/_nuxt/f832e8bb27a3cce72028.js
#	dist/_nuxt/f84ad55f1e4a8b506c2a.js
#	dist/_nuxt/f8b2ac312a74070aaa50.js
#	dist/_nuxt/fa1d3ec4e3ca6f429c7a.js
#	dist/index.html
#	dist/login/index.html
#	dist/main/404/index.html
#	dist/main/account_manager/index.html
#	dist/main/artificial_order/index.html
#	dist/main/artificial_orders/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/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/gongmall/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/kaifabao/index.html
#	dist/main/kaifawu_contact/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/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/remark_list/index.html
#	dist/main/report_business/index.html
#	dist/main/report_cash/index.html
#	dist/main/solution/index.html
#	dist/main/solution_detail/index.html
#	dist/main/solution_manage/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_search/index.html
#	dist/main/user_workfile_list/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/_nuxt/04351d8937bb951be82f.css

@@ -1 +0,0 @@
-.header[data-v-4aa52956]{margin-top:20px;margin-bottom:30px;line-height:1.5}.tab-header[data-v-4aa52956]{margin-bottom:10px;line-height:1.5}.tab-content[data-v-4aa52956]{white-space:nowrap;overflow-x:scroll;height:calc(100vh - 300px)}.order-footer[data-v-4aa52956]{margin-top:10px}.el-form-item[data-v-4aa52956]{margin-bottom:0}.el-form[data-v-4aa52956]:last-child{margin-bottom:22px}

dist/_nuxt/0d8a4a5356eca2b9147b.css

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

dist/_nuxt/0f3fd07cfe3d236554bb.css

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

dist/_nuxt/156acc789582b617afa7.css

@@ -1 +0,0 @@
-.count-list[data-v-43fc575d]{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-43fc575d]{margin-right:20px;font-size:16px}.content[data-v-43fc575d]{white-space:nowrap;overflow-x:scroll;height:calc(100% - 150px)}.btn[data-v-43fc575d]{width:80px}.order-footer[data-v-43fc575d]{margin-top:10px}

dist/_nuxt/21c876aae1bc21cdca8c.css

@@ -1 +0,0 @@
-.i-title[data-v-1b6f6304]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-1b6f6304]{height:calc(100% - 80px)}.text-title[data-v-1b6f6304]{font-weight:600}.header-bar>div[data-v-1b6f6304]{margin-bottom:5px}.green[data-v-1b6f6304]{color:#259b24}.orange[data-v-1b6f6304]{color:#ff9800}.red[data-v-1b6f6304]{color:#ff021e}

dist/_nuxt/258c9790a7a3c4690caf.css

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

dist/_nuxt/278330c805aebfc3df95.css

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

dist/_nuxt/27933898ca915b136ee2.css

@@ -1 +0,0 @@
-.t-title[data-v-b5ea8742]{font-size:20px;font-weight:500;margin:10px 0 5px}.image[data-v-b5ea8742]{width:100%;height:100%}.box-card[data-v-b5ea8742]{width:480px;height:300px}

dist/_nuxt/2bf2ca42491fab948271.css

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

dist/_nuxt/3b79dc883658af9c79e3.css

@@ -1 +0,0 @@
-.content_t[data-v-9ce1b568]{padding:20px}.conf_title[data-v-9ce1b568]{font-weight:500;margin:10px 0}.conf_content[data-v-9ce1b568]{margin-left:30px}.input_t[data-v-9ce1b568]{width:120px}.save-btn[data-v-9ce1b568]{margin-top:30px}

dist/_nuxt/3d5fc2633d35c57ae906.css

@@ -1 +0,0 @@
-.count-list[data-v-5fc59914]{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-5fc59914]{margin-right:20px;font-size:16px}.content[data-v-5fc59914]{white-space:nowrap;overflow-x:hidden}.btn[data-v-5fc59914]{width:80px}.order-footer[data-v-5fc59914]{margin-top:10px}.clickable[data-v-5fc59914]{cursor:pointer;color:#409eff}

dist/_nuxt/3f96a7b0c70565732add.css

@@ -1 +0,0 @@
-.order-footer[data-v-b060ec0e]{position:absolute;bottom:10px;left:10px}#mainBody[data-v-b060ec0e]{white-space:nowrap;height:calc(100% - 40px)}.top[data-v-b060ec0e]{padding:10px}

dist/_nuxt/49f84019cdabf52e0492.css

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

dist/_nuxt/4a2404b582a7b26c6d4c.css

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

dist/_nuxt/6bed416a57409202dada.css

@@ -1 +0,0 @@
-.status-1[data-v-5eb8fe9c]{color:#67c23a}.status-0[data-v-5eb8fe9c]{color:#f56c6c}

dist/_nuxt/79e33d604f19b63a01b9.css

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

dist/_nuxt/7d3af3ded333e4eae799.css

@@ -1 +0,0 @@
-.recruitBlock[data-v-124ef175]{width:800px;margin:20px auto}.recruitBlockTitle[data-v-124ef175]{font-weight:800;font-size:17px;color:#333;margin-bottom:20px}.textCenter[data-v-124ef175]{text-align:center}.recruitInfoItem[data-v-124ef175]{font-size:14px;color:#606266;margin-right:6px}.mb-10[data-v-124ef175],.recruitInfoItem[data-v-124ef175]{margin-bottom:10px}

dist/_nuxt/7f818f746371c6a0dbf7.css

@@ -1 +0,0 @@
-.status-1[data-v-1e3bd9b3]{color:#67c23a}.status-0[data-v-1e3bd9b3]{color:#f56c6c}