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

 Conflicts:

	pages/main/index/jishuquan.vue

components/RightPanel/index.vue

@@ -98,7 +98,7 @@ export default {
 .rightPanel {
   width: 100%;
   max-width: 260px;
-  height: 100vh;
+  height: 100%;
   position: fixed;
   top: 0;
   right: 0;

components/menu/data.js

@@ -1,224 +1,230 @@
-const baseUrl = '/main/';
+const baseUrl = "/main/";
 export default [
-  {//
-    title: '管理中心',
-    icon: 'location',
-    path: '',
+  {
+    //
+    title: "管理中心",
+    icon: "location",
+    path: "",
     subs: [
       {
-        title: '管理中心',
-        path: 'https://www.proginn.com/rooter',
+        title: "管理中心",
+        path: "https://www.proginn.com/rooter"
       }
     ]
   },
   {
-    title: '财务',
-    icon: 'coin',
-    path: '',
+    title: "财务",
+    icon: "coin",
+    path: "",
     subs: [
       {
-        title: '交易订单',
-        path: baseUrl + 'orders'
+        title: "交易订单",
+        path: baseUrl + "orders"
+      },
+      {
+        title: "人工订单",
+        path: baseUrl + "artificial_orders"
       },
       {
-        title: '人工订单',
-        path: baseUrl + 'artificial_orders'
+        title: "薪资订单",
+        path: baseUrl + "qingtuanbao",
+        hidden: false
       },
       {
-        title: '云端结算',
-        path: baseUrl + 'cloud_balance'
+        title: "云端结算",
+        path: baseUrl + "cloud_balance"
       },
       {
-        title: '人工财务表单',
-        path: baseUrl + 'artificial_order',
+        title: "人工财务表单",
+        path: baseUrl + "artificial_order",
         hidden: true
       },
       {
-        title: '余额变动管理',
-        path: baseUrl + 'balance_change'
+        title: "余额变动管理",
+        path: baseUrl + "balance_change"
       },
       {
-        title: '提现账单',
-        path: baseUrl + 'withdraw'
+        title: "提现账单",
+        path: baseUrl + "withdraw"
       },
       {
-        title: '工资结算',
-        path: baseUrl + 'wage_settlement',
+        title: "工资结算",
+        path: baseUrl + "wage_settlement",
         hidden: true
       },
       {
-        title: '冻结订单',
-        path: baseUrl + 'orders_frozen',
+        title: "冻结订单",
+        path: baseUrl + "orders_frozen",
         hidden: false
       },
       {
-        title: '待支出订单',
-        path: baseUrl + 'wait_expend',
+        title: "待支出订单",
+        path: baseUrl + "wait_expend",
         hidden: false
       },
       {
-        title: '账单详情',
-        path: baseUrl + 'bills',
+        title: "账单详情",
+        path: baseUrl + "bills",
         hidden: true
       },
       {
-        title: '财务订单详情',
-        path: baseUrl + 'orders_detail',
+        title: "财务订单详情",
+        path: baseUrl + "orders_detail",
         hidden: true
       },
       {
-        title: '整包账单明细',
-        path: baseUrl + 'outsource_bill',
+        title: "整包账单明细",
+        path: baseUrl + "outsource_bill",
         hidden: true
       },
       {
-        title: '工资账单明细',
-        path: baseUrl + 'work_bill',
+        title: "工资账单明细",
+        path: baseUrl + "work_bill",
         hidden: true
       },
       {
-        title: '用户账单列表',
-        path: baseUrl + 'user_bills',
+        title: "用户账单列表",
+        path: baseUrl + "user_bills",
         hidden: true
       },
       {
-        title: '工资账单明细',
-        path: baseUrl + 'wage_details',
+        title: "工资账单明细",
+        path: baseUrl + "wage_details",
         hidden: true
       }
     ]
   },
   {
-    title: '运营',
-    icon: 'service',
-    path: '',
+    title: "运营",
+    icon: "service",
+    path: "",
     subs: [
       {
-        title: '云端开发者展示',
-        path: baseUrl + 'dev_show'
+        title: "云端开发者展示",
+        path: baseUrl + "dev_show"
       }
     ]
   },
   {
-    title: '项目',
-    icon: 's-management',
-    path: '',
+    title: "项目",
+    icon: "s-management",
+    path: "",
     subs: [
       {
-        title: '技术信用',
-        path: baseUrl + 'user_credit_list'
+        title: "技术信用",
+        path: baseUrl + "user_credit_list"
       },
       {
-        title: '技术圈',
-        path: baseUrl + 'jishuquan'
+        title: "技术圈",
+        path: baseUrl + "jishuquan"
       },
       {
-        title: '技术信用详情',
-        path: baseUrl + 'user_credit_item',
+        title: "技术信用详情",
+        path: baseUrl + "user_credit_item",
         hidden: true
       },
       {
-        title: '技术信用配置',
-        path: baseUrl + 'user_credit_setting',
+        title: "技术信用配置",
+        path: baseUrl + "user_credit_setting",
         hidden: true
       },
       {
-        title: '解决方案',
-        path: baseUrl + 'solution'
+        title: "解决方案",
+        path: baseUrl + "solution"
       },
       {
-        title: '企业入驻审核',
-        path: baseUrl + 'solution_detail',
+        title: "企业入驻审核",
+        path: baseUrl + "solution_detail",
         hidden: true
       },
       {
-        title: '兼职招聘',
-        path: baseUrl + 'jobs'
+        title: "兼职招聘",
+        path: baseUrl + "jobs"
       },
       {
-        title: '兼职招聘详情',
-        path: baseUrl + 'job',
+        title: "兼职招聘详情",
+        path: baseUrl + "job",
         hidden: true
       },
       {
-        title: '云端工作',
-        path: baseUrl + 'cloud_job'
+        title: "云端工作",
+        path: baseUrl + "cloud_job"
       },
       {
-        title: '协作群组',
-        path: baseUrl + 'group_list'
+        title: "协作群组",
+        path: baseUrl + "group_list"
       },
       {
-        title: '工猫结算订单',
-        path: baseUrl + 'gongmall'
+        title: "工猫结算订单",
+        path: baseUrl + "gongmall"
       },
       {
-        title: '驻场招聘信息',
-        path: baseUrl + 'publish_present',
+        title: "驻场招聘信息",
+        path: baseUrl + "publish_present",
         hidden: true
       },
       {
-        title: '驻场招聘申请列表',
-        path: baseUrl + 'present_job_apply',
+        title: "驻场招聘申请列表",
+        path: baseUrl + "present_job_apply",
         hidden: true
       }
     ]
   },
   {
-    title: '用户与认证',
-    icon: 's-check',
-    path: '',
+    title: "用户与认证",
+    icon: "s-check",
+    path: "",
     subs: [
       {
-        title: '开发者管理',
-        path: baseUrl + 'cats'
+        title: "开发者管理",
+        path: baseUrl + "cats"
       },
       {
-        title: '开发者审核',
-        path: baseUrl + 'dev_check'
+        title: "开发者审核",
+        path: baseUrl + "dev_check"
       },
       {
-        title: '认证开发者',
-        path: baseUrl + 'cert_check'
+        title: "认证开发者",
+        path: baseUrl + "cert_check"
       },
       {
-        title: '认证产品',
-        path: baseUrl + 'cert_pro'
+        title: "认证产品",
+        path: baseUrl + "cert_pro"
       },
       {
-        title: '云端开发者认证表',
-        path: baseUrl + 'cloud_developer'
+        title: "云端开发者认证表",
+        path: baseUrl + "cloud_developer"
       }
     ]
   },
   {
-    title: '会员',
-    icon: 'user-solid',
-    path: '',
+    title: "会员",
+    icon: "user-solid",
+    path: "",
     subs: [
       {
-        title: '会员管理',
-        path: baseUrl + 'vip_manager'
+        title: "会员管理",
+        path: baseUrl + "vip_manager"
       },
       {
-        title: '会员订单',
-        path: baseUrl + 'vip_order'
+        title: "会员订单",
+        path: baseUrl + "vip_order"
       },
       {
-        title: '会员设置',
-        path: baseUrl + 'vip_setting'
+        title: "会员设置",
+        path: baseUrl + "vip_setting"
       }
     ]
   },
   {
-    title: '网站配置',
-    icon: 'setting',
-    path: '',
+    title: "网站配置",
+    icon: "setting",
+    path: "",
     subs: [
       {
-        title: '技术信用配置',
-        path: baseUrl + 'user_credit_setting'
-      },
+        title: "技术信用配置",
+        path: baseUrl + "user_credit_setting"
+      }
     ]
   }
 ];

dist/_nuxt/011d1d035f9f45a32acd.css

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

dist/_nuxt/0f81aa4785c655301aa6.css

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

dist/_nuxt/118b9d825c1999ace2aa.css

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

dist/_nuxt/1ac80632653ac69b6d40.css

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

dist/_nuxt/278330c805aebfc3df95.css

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

dist/_nuxt/33858bb63cc6418a64a7.css

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

dist/_nuxt/3f0dead1e5ed75382256.css

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

dist/_nuxt/4b00d5096a8e86ebaa8c.css

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

dist/_nuxt/4bd2d2647f2b4cb91877.css

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

dist/_nuxt/4f64358e8b689739b665.css

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

dist/_nuxt/52a189ac7b932d0c59ba.css

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

dist/_nuxt/580caace4766839ce895.css

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

dist/_nuxt/5858373f86f796eb4a3b.css

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

dist/_nuxt/593f727003a442a8b57f.css

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

dist/_nuxt/59a452a8bcacd90df56b.css

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

dist/_nuxt/5b56931f82aed94e429d.css

@@ -1 +0,0 @@
-.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/68c5a0636061cc3407df.css

@@ -0,0 +1 @@
+.table[data-v-5f9ea0d6]{height:calc(100% - 80px)}.el-table[data-v-5f9ea0d6]{font-size:12px!important}.el-table td[data-v-5f9ea0d6],.el-table th[data-v-5f9ea0d6]{padding:4px 0!important}

dist/_nuxt/73c0fc507c876219291f.css

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

dist/_nuxt/771c4e6ada664c6ddcd2.css

@@ -1 +0,0 @@
-.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

@@ -1 +0,0 @@
-.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

@@ -1 +0,0 @@
-.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/856ba60f420b5fce1abb.css

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

dist/_nuxt/87ba79aaace31118f1d0.css

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

dist/_nuxt/91bcba15a62edea99f19.css

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

dist/_nuxt/9c1ff4705892f1e972fe.css

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

dist/_nuxt/9ce0818eb69bcd53dae2.css

@@ -0,0 +1 @@
+.form-inline[data-v-75661375]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}

dist/_nuxt/LICENSES

@@ -1,19 +1,16 @@
 /*!
- * 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.5
+  * (c) 2020 Evan You
   * @license MIT
   */
 
-/**
- * vuex v3.1.2
- * (c) 2019 Evan You
- * @license MIT
+/*!
+ * Fuse.js v3.4.6 - 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
  */
 
 /*!
@@ -25,41 +22,57 @@
  */
 
 /*!
- * Determine if an object is a Buffer
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
+ * Quill Editor v1.2.3
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
  */
 
 /*!
- * vue-client-only v2.0.0
- * (c) 2019-present egoist <0x142857@gmail.com>
- * Released under the MIT License.
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
  */
 
 /*!
- * Fuse.js v3.4.6 - 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
  */
 
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @author   Feross Aboukhadijeh <http://feross.org>
  * @license  MIT
  */
 
 /*!
- * Quill Editor v1.2.3
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
+ * 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.
  *
@@ -75,28 +88,8 @@
  * @license Modernizr 3.0.0pre (Custom Build) | MIT
  */
 
-/*!
- * Quill Editor v1.3.7
- * https://quilljs.com/
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- */
-
-/*!
- * 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-no-ssr v1.1.1
- * (c) 2018-present egoist <0x142857@gmail.com>
- * Released under the MIT License.
+/**
+ * vuex v3.1.2
+ * (c) 2019 Evan You
+ * @license MIT
  */