From ce8466a73fe269e847facf9cc5d717ced8c0f890 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Mon, 13 Nov 2023 11:05:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/merchantManagement/agencyList.vue   |  2 +-
 .../merchantManagement/brokerageConfig.vue         |  2 +-
 src/components/merchantManagement/dataScreen.vue   |  2 +-
 src/components/merchantManagement/firmInfo.vue     |  2 +-
 src/components/merchantManagement/homePage.vue     |  2 +-
 src/components/merchantManagement/infoList.vue     |  2 +-
 src/components/merchantManagement/jobList.vue      |  2 +-
 src/components/merchantManagement/memberInfo.vue   |  2 +-
 src/components/merchantManagement/mineBill.vue     |  2 +-
 .../merchantManagement/navigationConfig.vue        |  2 +-
 src/components/merchantManagement/orderList.vue    |  2 +-
 src/components/merchantManagement/qiwei.vue        |  2 +-
 .../merchantManagement/serviceMarket.vue           |  2 +-
 src/components/merchantManagement/townsmanList.vue |  2 +-
 .../userinfo/accountsetting/components/bocaiTV.vue |  2 +-
 .../usercenter/components/dataStatistics.vue       | 16 +++++++++--
 src/router/index.js                                | 33 +++++++++++++---------
 src/style/index.less                               |  2 +-
 src/utils/commonUtil.js                            | 27 +++++++++++++++++-
 src/views/merchantBack.vue                         |  2 +-
 20 files changed, 76 insertions(+), 34 deletions(-)

diff --git a/src/components/merchantManagement/agencyList.vue b/src/components/merchantManagement/agencyList.vue
index 831f45e..efb2ece 100644
--- a/src/components/merchantManagement/agencyList.vue
+++ b/src/components/merchantManagement/agencyList.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">代理列表-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/brokerageConfig.vue b/src/components/merchantManagement/brokerageConfig.vue
index 5be3953..a65f43f 100644
--- a/src/components/merchantManagement/brokerageConfig.vue
+++ b/src/components/merchantManagement/brokerageConfig.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">佣金配置-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/dataScreen.vue b/src/components/merchantManagement/dataScreen.vue
index cdd9dee..b593bd2 100644
--- a/src/components/merchantManagement/dataScreen.vue
+++ b/src/components/merchantManagement/dataScreen.vue
@@ -68,7 +68,7 @@ export default {
 <style scoped lang="less">
 .data_container {
   height: 100%;
-  padding: 16px;
+  // padding: 16px;
  
 }
 .bodyContainer {
diff --git a/src/components/merchantManagement/firmInfo.vue b/src/components/merchantManagement/firmInfo.vue
index 353b9c9..beaea65 100644
--- a/src/components/merchantManagement/firmInfo.vue
+++ b/src/components/merchantManagement/firmInfo.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">企业信息-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/homePage.vue b/src/components/merchantManagement/homePage.vue
index 22d9ad3..408b77e 100644
--- a/src/components/merchantManagement/homePage.vue
+++ b/src/components/merchantManagement/homePage.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">后台首页-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/infoList.vue b/src/components/merchantManagement/infoList.vue
index 98ae59e..bf43bc7 100644
--- a/src/components/merchantManagement/infoList.vue
+++ b/src/components/merchantManagement/infoList.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">通讯录-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/jobList.vue b/src/components/merchantManagement/jobList.vue
index f8a5a93..663973c 100644
--- a/src/components/merchantManagement/jobList.vue
+++ b/src/components/merchantManagement/jobList.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">职位列表-页面正在建设中…</div>
       </div>
     </div>
     
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index c897db1..95f914b 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -1052,7 +1052,7 @@ export default {
   // margin-top: 16px;
   // min-height: calc(100vh - 200px);
   height: 100%;
-  padding: 16px;
+  // padding: 16px;
   // background-color: #fff;
   border: 1px solid #0000;
 }
diff --git a/src/components/merchantManagement/mineBill.vue b/src/components/merchantManagement/mineBill.vue
index a6dd42a..2fc1231 100644
--- a/src/components/merchantManagement/mineBill.vue
+++ b/src/components/merchantManagement/mineBill.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">我的账单-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/navigationConfig.vue b/src/components/merchantManagement/navigationConfig.vue
index fc98627..c282ff6 100644
--- a/src/components/merchantManagement/navigationConfig.vue
+++ b/src/components/merchantManagement/navigationConfig.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">导航配置-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/orderList.vue b/src/components/merchantManagement/orderList.vue
index 69744df..53ea1d0 100644
--- a/src/components/merchantManagement/orderList.vue
+++ b/src/components/merchantManagement/orderList.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">工单列表-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/qiwei.vue b/src/components/merchantManagement/qiwei.vue
index 5642910..44c0f56 100644
--- a/src/components/merchantManagement/qiwei.vue
+++ b/src/components/merchantManagement/qiwei.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">企微配置-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/serviceMarket.vue b/src/components/merchantManagement/serviceMarket.vue
index dc90aac..805050f 100644
--- a/src/components/merchantManagement/serviceMarket.vue
+++ b/src/components/merchantManagement/serviceMarket.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">服务市场-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/merchantManagement/townsmanList.vue b/src/components/merchantManagement/townsmanList.vue
index 1cc5b41..3f140fe 100644
--- a/src/components/merchantManagement/townsmanList.vue
+++ b/src/components/merchantManagement/townsmanList.vue
@@ -13,7 +13,7 @@
         <svg class="svg_icon f320" aria-hidden="true">
           <use xlink:href="#icon-yemianjianshezhong" />
         </svg>
-        <div class="f14 c9" style="transform:translateY(-30px)">页面正在建设中…</div>
+        <div class="f14 c9" style="transform:translateY(-30px)">老乡列表-页面正在建设中…</div>
       </div>
     </div>
   </div>
diff --git a/src/components/userinfo/accountsetting/components/bocaiTV.vue b/src/components/userinfo/accountsetting/components/bocaiTV.vue
index c472a2f..a11e8f1 100644
--- a/src/components/userinfo/accountsetting/components/bocaiTV.vue
+++ b/src/components/userinfo/accountsetting/components/bocaiTV.vue
@@ -131,7 +131,7 @@ export default {
 
 <style scoped lang="less">
 .bocaiTV-container {
-  padding: 16px;
+  // padding: 16px;
 }
 .icon {
   width: 1em;
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 4e2c414..e895add 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -193,7 +193,7 @@
 import { getMemberGroupApi, dataStatisticsTeamDetailApi, dataStatisticsListApi } from '../../../../api/merchantConfig'
 
 import moment from 'moment'
-import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth, fullCopy } from '../../../../utils/commonUtil'
+import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth, fullCopy, setReturnFee } from '../../../../utils/commonUtil'
 const rowSelection = {
   onChange: (selectedRowKeys, selectedRows) => {
     console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@@ -564,6 +564,18 @@ export default {
             return row.applyUserName
           },
         },
+        {
+          title: '服务费',
+          dataIndex: 'returnFee',
+          key: 'returnFee',
+          ellipsis: true,
+          width: 80,
+          // slots: { title: 'applyUserName' },
+          customRender: (text, row, index) => {
+            // console.log(row);
+            return setReturnFee(row.returnFee, row.returnFeeType)
+          },
+        },
         {
           title: '入职绩点',
           dataIndex: 'entryGPA',
@@ -1079,7 +1091,7 @@ table {
 
 .dataStatisticsContainer {
   height: 100%;
-  padding: 16px;
+  // padding: 16px;
   // min-height: 780px;
 }
 .contentbody {
diff --git a/src/router/index.js b/src/router/index.js
index 3672af9..7e4149e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -233,7 +233,7 @@ const routes = [
     name: "largeScreen",
     component: () => import("../components/screen/largeScreen.vue"),
     // component: resolve => require(['../components/FirstJob/joblist.vue'],resolve)
-  },{
+  }, {
     path: "/largeScreen1",
     name: "largeScreen1",
     component: () => import("../components/screen/largeScreen1.vue"),
@@ -312,23 +312,19 @@ const routes = [
 
     component: () => import("../views/merchantBack.vue"),
     children: [
+      // 团队成员
       {
         path: "memberInfo",
         name: "MemberInfo",
         component: () => import("../components/merchantManagement/memberInfo.vue"),
       },
+      // 团队数据
       {
         path: "dataStatistics",
         name: "DataStatistics",
         component: () => import("../components/userinfo/usercenter/components/dataStatistics.vue"),
       },
-      {
-        path: "bocaiTV",
-        name: "BocaiTV",
-        component: () => import(
-          "../components/userinfo/accountsetting/components/bocaiTV.vue"
-        ),
-      },
+
       // 数据大屏
       {
         path: "dataScreen",
@@ -359,12 +355,7 @@ const routes = [
         name: "WorkBench",
         component: () => import("../components/merchantManagement/workBench.vue"),
       },
-      // 通知中心
-      {
-        path: "notificationCenter",
-        name: "NotificationCenter",
-        component: () => import("../components/merchantManagement/notificationCenter.vue"),
-      },
+
       // 后台首页
       {
         path: "homePage",
@@ -413,6 +404,20 @@ const routes = [
         name: "MineBill",
         component: () => import("../components/merchantManagement/mineBill.vue"),
       },
+      // 通知中心
+      {
+        path: "notificationCenter",
+        name: "NotificationCenter",
+        component: () => import("../components/merchantManagement/notificationCenter.vue"),
+      },
+      // TV配置
+      {
+        path: "bocaiTV",
+        name: "BocaiTV",
+        component: () => import(
+          "../components/userinfo/accountsetting/components/bocaiTV.vue"
+        ),
+      },
       // 企微配置
       {
         path: "qiwei",
diff --git a/src/style/index.less b/src/style/index.less
index 51b5b2c..83a58aa 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -495,7 +495,7 @@ i {
 }
 .bodyContainer {
 	padding: 16px;
-	min-height: calc(100vh - 170px);
+	min-height: calc(100vh - 194px);
 	// height: 97%;
 	background-color: #fff;
 }
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 1b71676..8aeb2f7 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1114,7 +1114,32 @@ export function userApplyOrderStatusArray () {
   ];
   return orderStatus;
 }
-
+/**
+* 获取服务费类型
+*/
+export function setReturnFee (returnFee, returnFeeType) {
+  console.log(returnFee);
+  console.log(returnFeeType);
+  let servetype
+  if (returnFeeType === 0) {
+    servetype = `${returnFee / 100 || "--"}元/小时`;
+  } else if (returnFeeType === 1) {
+    servetype = `${returnFee / 100 || "--"}元/日`;
+  } else if (returnFeeType === 2) {
+    servetype = `${returnFee / 100 || "--"}元/月`;
+  } else if (returnFeeType === 3) {
+    servetype = `${returnFee / 100 || "--"}元/次`;
+  } else if (returnFeeType === 4) {
+    servetype = `${returnFee / 100 || "--"}元/件`;
+  } else if (returnFeeType === 5) {
+    servetype = `工人收入${returnFee / 100 || "--"}%`;
+  } else if (returnFeeType === 6) {
+    servetype = `共${returnFee / 100 || "--"}元`;
+  } else if (returnFeeType === 7) {
+    servetype = `费用待定`;
+  }
+  return servetype
+}
 /**
  * 根据工单状态ID获取名称 我的老乡
  */
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index 8a1779a..d533e5b 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -670,7 +670,7 @@ header.header,
 .trans {
   -webkit-transition: all 0.2s;
   // height: calc(100vh - 64px);
-  min-height: calc(100vh - 64px);
+  // min-height: calc(100vh - 64px);
   overflow: hidden;
   background-color: #f0f2f5;
   transition: all 0.2s;