From 0d1b9e963065be7be7cc48d1b52369aa6dd83d8c Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 25 Oct 2023 14:59:54 +0800
Subject: [PATCH] 1

---
 src/App.vue                                        |    2 +-
 src/components/merchantManagement/memberInfo.vue   |  183 +-
 .../usercenter/components/dataStatistics.vue       |   91 +-
 src/style/index.less                               |   21 +-
 src/utils/commonUtil.js                            | 2778 ++++++++++----------
 src/views/merchantBack.vue                         |    2 +-
 6 files changed, 1591 insertions(+), 1486 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4a3c073..c73f4e7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_etcavihgi6d.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_st06ih16ux9.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index 917a112..93ac809 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -27,35 +27,56 @@
         </a-radio-group>
         <div v-if="menuType == 'role'">
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">全部角色（19人）</a-menu-item>
+            <a-menu-item key="all" class="fsa bb_after fw500" @click="selectGroup('all')">
+              全部角色
+              <i class="the_num f14 tac" style="min-width:12px" @click.stop>19</i>
+            </a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
-          <div class="f12 c9 ml24 mb8">默认角色（11人）</div>
+          <!-- <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div> -->
+          <!-- <div class="f12 c9 ml24 mb8">默认角色（11人）</div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <template v-for="(item, index) in ['创建人(1人)','管理员(3人)','成员(12人)']">
-              <a-menu-item :key="item" class="fsa showdot" @click="selectGroup(item)">{{item}}</a-menu-item>
+            <template v-for="(item, index) in ['创建人','管理员','成员']">
+              <a-menu-item :key="item" class="fsa" @click="selectGroup(item)">
+                <span>
+                  {{item}}
+                  <svg class="svg f20 ml4 mb2" aria-hidden="true">
+                    <use xlink:href="#icon-xitong" />
+                  </svg>
+                </span>
+                <i class="the_num tac" style="min-width:12px" @click.stop>3</i>
+              </a-menu-item>
             </template>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
-          <div class="f12 c9 ml24 mb8">自定义角色（8人）</div>
+          <!-- <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div> -->
+          <!-- <div class="f12 c9 ml24 mb8">自定义角色（8人）</div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <!-- <template v-for="(item, index) in groupList"> -->
-            <a-menu-item key="角色1（8人）" class="fsa showdot" @click="selectGroup('角色1（8人）')">{{'角色1（8人）'}}</a-menu-item>
-            <a-menu-item key="角色2（8人）" class="fsa showdot" @click="selectGroup('角色2（8人）')">{{'角色2（8人）'}}</a-menu-item>
-            <!-- </template> -->
+            <template v-for="(item, index) in ['角色1','角色2']">
+              <a-menu-item :key="item" class="fsa" @click="selectGroup(item)">
+                <span>
+                  {{item}}
+                  <svg class="svg f26 ml4 mb2" aria-hidden="true">
+                    <use xlink:href="#icon-zidingyi" />
+                  </svg>
+                </span>
+                <span class="the_num tac" style="min-width:12px">1</span>
+              </a-menu-item>
+            </template>
           </a-menu>
         </div>
         <div v-else>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">全部部门（19人）</a-menu-item>
+            <a-menu-item key="all" class="fsa bb_after fw500" @click="selectGroup('all')">
+              全部部门
+              <i class="the_num f14" @click.stop>18</i>
+            </a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div>
+          <!-- <div class="bb1 ml12 mr12 mt4 mb4" style="wdith:calc(100% - 24px)"></div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
               <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
-                {{item.teamName + '（8人）'}}
+                {{item.teamName}}
                 <a-dropdown overlayClassName="groupdropdown" :trigger="['click']" placement="bottomRight">
-                  <i class="iconfont icon-gengduo3 thedot f12" @click.stop></i>
+                  <i class="iconfont icon-gengduo3 thedot f14" @click.stop></i>
                   <div class="groupdropdownbox backTable" slot="overlay">
                     <div @click="[addGroupShow = true,isEdit = true,recordId = item.id,groupName=item.teamName]">修改名称</div>
                     <div @click="delGroup(item)">删除</div>
@@ -63,6 +84,7 @@
                     <div @click="index + 1 < groupList.length?moveList(item,'down'):null" :class="index + 1 == groupList.length? 'unactive':''">下移</div>
                   </div>
                 </a-dropdown>
+                <div class="the_num f14 tac" style="min-width:12px" @click.stop>6</div>
               </a-menu-item>
             </template>
           </a-menu>
@@ -89,11 +111,11 @@
           <a-table :columns="columns" :scroll="{x:currWidth}" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id" :locale="tablenodata">
             <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
             <span slot="nickName" slot-scope="text, record">{{ record.aliasName || record.userName }}</span>
-            <div slot="join" slot-scope="text, record">
-              <a-switch default-checked :checked="record.join" @change="showChange(record,'join')" />
+            <div slot="inAgencyStatistics" slot-scope="text, record">
+              <a-switch :checked="text" @change="showChange(record,'inAgencyStatistics')" />
             </div>
-            <div slot="bigScreen" slot-scope="text, record">
-              <a-switch default-checked :checked="record.bigScreen" @change="showChange(record,'bigScreen')" />
+            <div slot="showAgencyScreen" slot-scope="text, record">
+              <a-switch :checked="text" @change="showChange(record,'showAgencyScreen')" />
             </div>
             <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #1890FF">
               <!-- <a @click="showDetail('detail', record)">详情</a> -->
@@ -219,39 +241,38 @@
             <a-input placeholder="请输入备注名" v-decorator="[ 'aliasName', { rules: [{ required: true, message: '请输入备注名' }] }, ]" />
           </a-form-item>
           <a-form-item label="手机号">
-            <a-input placeholder="请输入手机号" v-decorator="['tel', {rules: [{ required: true, message: '请输入手机号' },{ type: 'regexp', validator: validateServiceName, message: '请输入正确的手机号',  }, ], validateTrigger: 'submit', }, ]" :max-length="11" />
+            <a-input placeholder="请输入手机号" v-decorator="['tel', {rules: [{ required: true, message: '请输入手机号' },{ type: 'regexp', validator: validateServiceName, message: '请输入正确的手机号',  }, ], validateTrigger: 'submit',validateFirst:true }, ]" :max-length="11" />
           </a-form-item>
           <a-form-item label="部门选择">
-            <a-select default-value="lucy" placeholder="请选择部门" v-decorator="['agencyTeamId',{ rules: [{ required: false, message: '请选择部门' }] },]" dropdownClassName="groupSelectDrop">
-              <div slot="dropdownRender" slot-scope="menu">
+            <a-select placeholder="请选择部门" v-decorator="['agencyTeamId',{ rules: [{ required: false, message: '请选择部门' }] },]" dropdownClassName="groupSelectDrop">
+              <a-select-option v-for="(item,index) in groupList" :value="item.id" class="groupSelectSub fsa" :key="index">
+                <div>{{item.teamName}}</div>
+              </a-select-option>
+              <!-- <div slot="dropdownRender" slot-scope="menu">
                 <div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index">
                   <div>{{item.teamName}}</div>
                 </div>
-                <!-- <div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> -->
-              </div>
+              </div>-->
             </a-select>
           </a-form-item>
           <a-form-item label="角色">
-            <a-select default-value="lucy" placeholder="请选择角色" v-decorator="['role',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop">
-              <div slot="dropdownRender" slot-scope="menu">
-                <div v-for="(item,index) in groupList" @click="choiceGroup(item)" class="groupSelectSub fsa" :key="index">
-                  <div>{{item.teamName}}</div>
-                </div>
-                <!-- <div class="bt1" style="padding: 9px 16px; cursor: pointer;" @mousedown="e => e.preventDefault()" @click="[addGroupShow = true,isEdit = false]">添加新部门</div> -->
-              </div>
+            <a-select placeholder="请选择角色" :defaultActiveFirstOption="false" v-decorator="['agencyRole',{ rules: [{ required: true, message: '请选择角色' }] },]" dropdownClassName="groupSelectDrop">
+              <a-select-option v-for="(item,index) in roleOptions" :value="item.value" class="groupSelectSub fsa" :key="index">
+                <div>{{item.label}}</div>
+              </a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item label="角色" class="dn">
+          <!-- <a-form-item label="角色" class="dn">
             <a-radio-group v-decorator="[
                 'agencyRole',
                 { rules: [{ required: true, message: '请选择角色' }] },
-              ]" :options="options" @change="groupChange" />
-          </a-form-item>
+              ]" :options="roleOptions" @change="groupChange" />
+          </a-form-item>-->
           <a-form-item label="参与统计">
-            <a-switch default-checked @change="onChange" />
+            <a-switch v-decorator="['inAgencyStatistics',{ valuePropName: 'checked' }]" />
           </a-form-item>
           <a-form-item label="大屏显示">
-            <a-switch default-checked @change="onChange" />
+            <a-switch v-decorator="['showAgencyScreen',{ valuePropName: 'checked' }]" />
           </a-form-item>
           <!-- <a-row>
             <a-col :span="4">权限：</a-col>
@@ -283,7 +304,7 @@
 </template>
 
 <script>
-import { getMemberListApi, deleteMemberApi, addMemberApi, getMemberGroupApi, addMemberGroupApi, updateMemberGroupApi, delMemberGroupApi, updateMemberApi, moveGroupNextApi, moveGroupPrevApi } from '../../api/userinfo'
+import { getMemberListApi, deleteMemberApi, addMemberApi, getMemberGroupApi, addMemberGroupApi, updateMemberGroupApi, delMemberGroupApi, updateMemberApi, moveGroupNextApi, moveGroupPrevApi, memberShowScreenApi, memberJoinDataApi } from '../../api/userinfo'
 import { formatDateYMD, getUserApplyOrderStatusById, getAgencyRoleTypeById, getAgencyPermissionNameById, getAgencyPermissionsByRole, tableWidth } from '../../utils/commonUtil'
 
 export default {
@@ -336,7 +357,7 @@ export default {
       visible: false,
       currentMember: {},
       modalTitle: '',
-      options: [
+      roleOptions: [
         // { label: "创建人", value: "1" },
         { label: '管理员', value: '2' },
         { label: '成员', value: '3' },
@@ -436,17 +457,19 @@ export default {
         },
         {
           title: '参与统计',
-          dataIndex: 'join',
-          key: 'join',
-          scopedSlots: { customRender: 'join' },
+          dataIndex: 'inAgencyStatistics',
+          key: 'inAgencyStatistics',
+          scopedSlots: { customRender: 'inAgencyStatistics' },
+
           ellipsis: true,
           width: 80,
         },
         {
           title: '大屏显示',
-          dataIndex: 'bigScreen',
-          key: 'bigScreen',
-          scopedSlots: { customRender: 'bigScreen' },
+          dataIndex: 'showAgencyScreen',
+          key: 'showAgencyScreen',
+          scopedSlots: { customRender: 'showAgencyScreen' },
+
           ellipsis: true,
           width: 80,
         },
@@ -546,12 +569,13 @@ export default {
             this.memberList.forEach((item, index) => {
               // item.group = '部门' + ((index % 5) + 1)
               // item1.children.forEach((item) => {
-              item.join = false
-              item.bigScreen = false
+              item.inAgencyStatistics = item.inAgencyStatistics == 0 ? true : false
+              item.showAgencyScreen = item.showAgencyScreen == 0 ? true : false
               item.role = getAgencyRoleTypeById(item.agencyRole)
               item.permission = getAgencyPermissionNameById(item.agencyPermissions)
               // })
             })
+            console.log(this.memberList)
             // this.memberList.sort((a, b) => {
             //   return a.agencyRole - b.agencyRole
             // })
@@ -709,6 +733,8 @@ export default {
             tel: this.currentMember.tel,
             group: this.currentMember.group,
             agencyTeamId: this.currentMember.agencyTeamName,
+            showAgencyScreen: this.currentMember.showAgencyScreen,
+            inAgencyStatistics: this.currentMember.inAgencyStatistics,
           })
         }, 200)
       } else if (type == 'detail') {
@@ -721,7 +747,7 @@ export default {
         this.$nextTick(() => {
           console.log(123)
           that.form.setFieldsValue({
-            agencyRole: '2',
+            agencyRole: '3',
           })
         })
       }
@@ -766,6 +792,8 @@ export default {
     handleSubmit() {
       console.log('issubmit')
       console.log(this.currentMember)
+      console.log(this.form.getFieldsValue())
+      let formData = this.form.getFieldsValue()
       this.form.validateFields(async (err) => {
         console.log(err)
         if (err == null) {
@@ -774,7 +802,9 @@ export default {
               let { data } = await updateMemberApi({
                 ...this.form.getFieldsValue(),
                 agencyPermissions: this.permission,
-                agencyTeamId: this.agencyTeamId,
+                inAgencyStatistics: formData.inAgencyStatistics == true ? 0 : 1,
+                showAgencyScreen: formData.showAgencyScreen == true ? 0 : 1,
+                // agencyTeamId: this.agencyTeamId,
                 id: this.currentMember.id,
               })
               console.log(data)
@@ -797,7 +827,9 @@ export default {
               let { data } = await addMemberApi({
                 ...this.form.getFieldsValue(),
                 agencyPermissions: this.permission,
-                agencyTeamId: this.agencyTeamId,
+                inAgencyStatistics: formData.inAgencyStatistics == true ? 0 : 1,
+                showAgencyScreen: formData.showAgencyScreen == true ? 0 : 1,
+                // agencyTeamId: this.agencyTeamId,
               })
               console.log(data)
               if (data.status == 200) {
@@ -827,14 +859,22 @@ export default {
         }
       })
     },
-    choiceGroup(e) {
-      console.log(e)
-      this.form.setFieldsValue({
-        agencyTeamId: e.teamName,
-      })
-      this.agencyTeamId = e.id
-      console.log(this.agencyTeamId)
-    },
+    // choiceGroup(e) {
+    //   console.log(e)
+    //   this.form.setFieldsValue({
+    //     agencyTeamId: e.teamName,
+    //   })
+    //   this.agencyTeamId = e.id
+    //   console.log(this.agencyTeamId)
+    // },
+    // choiceRole(e) {
+    //   console.log(e)
+    //   this.form.setFieldsValue({
+    //     agencyRole: e.teamName,
+    //   })
+    //   this.agencyTeamId = e.id
+    //   console.log(this.agencyTeamId)
+    // },
     groupChange(e) {
       console.log(e)
       this.form.setFieldsValue({
@@ -874,10 +914,10 @@ export default {
         if (item.id == e.id) {
           item[type] = !item[type]
           console.log(item[type])
-          if (type == 'bigScreen' && item['bigScreen'] == true) {
-            item['join'] = true
-          } else if (type == 'join' && item['join'] == false) {
-            item['bigScreen'] = false
+          if (type == 'showAgencyScreen' && item['showAgencyScreen'] == true) {
+            item['inAgencyStatistics'] = true
+          } else if (type == 'inAgencyStatistics' && item['inAgencyStatistics'] == false) {
+            item['showAgencyScreen'] = false
           }
 
           console.log(item)
@@ -887,6 +927,18 @@ export default {
         that.$forceUpdate()
       }, 10)
     },
+    /**
+     * 大屏显示
+     */
+    memberShowScreen(val) {
+      memberShowScreenApi().then(({ data }) => {})
+    },
+    /**
+     * 参与统计
+     */
+    memberJoinData(val) {
+      memberJoinDataApi().then(({ data }) => {})
+    },
     moveList(item, type) {
       console.log(item)
       if (type == 'up') {
@@ -1033,8 +1085,13 @@ export default {
     .thedot {
       display: none;
     }
-    .showdot:hover .thedot {
-      display: block;
+    .showdot:hover {
+      .thedot {
+        display: block;
+      }
+      .the_num {
+        display: none;
+      }
     }
   }
   .rightContainer {
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index c785928..61984ea 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -27,19 +27,28 @@
         </a-radio-group>
         <div v-if="menuType == 'role'">
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">全部成员（50人）</a-menu-item>
+            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">
+              全部成员
+              <span>{{totalDataList.length}}</span>
+            </a-menu-item>
           </a-menu>
-          <div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div>
+          <!-- <div class="bb1 ml12 mr12 mt4 mb8" style="wdith:calc(100% - 24px)"></div> -->
           <!-- <div class="f12 c9 ml24 mb8">默认角色（11人）</div> -->
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <template v-for="(item, index) in groupList">
-              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">{{item.teamName + '（18人）'}}</a-menu-item>
+              <a-menu-item :key="item.teamName" class="fsa showdot" @click="selectGroup(item)">
+                <span>{{item.teamName}}</span>
+                <i class="the_num" @click.stop>3</i>
+              </a-menu-item>
             </template>
           </a-menu>
         </div>
         <div v-else>
           <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
-            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">全部部门（50人）</a-menu-item>
+            <a-menu-item key="all" class="fsa showdot bb_after fw500" @click="selectGroup('all')">
+              全部部门
+              <span>32</span>
+            </a-menu-item>
           </a-menu>
           <!-- <a-menu :selectedKeys="selectedKeys" class="bgf" mode="inline" :class="'leftMenu'" style="overflow-y:scroll;height:calc(100%);overflow-x:hidden;">
             <a-menu-item key="all" class="fsa showdot bb_after" @click="selectGroup('all')">全部角色</a-menu-item>
@@ -179,7 +188,7 @@
 <script>
 import { dataStatisticsListApi, dataStatisticsTeamDetailApi, getMemberGroupApi } from '../../../../api/userinfo'
 import moment from 'moment'
-import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth } from '../../../../utils/commonUtil'
+import { getDateYMD, formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById, toFixed, tableWidth, fullCopy } from '../../../../utils/commonUtil'
 const rowSelection = {
   onChange: (selectedRowKeys, selectedRows) => {
     console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@@ -613,36 +622,45 @@ export default {
   watch: {
     menuType: {
       handler(value) {
+        let that = this
         console.log(value)
         if (value == 'group') {
           console.log(this.columns)
-          this.columns.splice(1, 1, {
-            title: '部门',
-            dataIndex: 'agencyTeamName',
-            key: 'agencyTeamName',
-            ellipsis: true,
-            // width: 120,
-            slots: { title: 'agencyTeamName' },
-          })
-          tableWidth(this, this.columns, 120)
-          console.log(this.currWidth)
+          that
+            .getDataStatisticsList()
+            .then(() => {
+              console.log(1313123131231232)
+              // this.dataList = this.groupDataList
+              that.columns.splice(1, 1, {
+                title: '部门',
+                dataIndex: 'agencyTeamName',
+                key: 'agencyTeamName',
+                ellipsis: true,
+                // width: 120,
+                slots: { title: 'agencyTeamName' },
+              })
+              tableWidth(that, that.columns, 120)
+              this.$forceUpdate()
+            })
+            .catch((err) => {
+              console.log(err)
+            })
+          //
         } else {
-          console.log(value)
-          console.log(this.columns.slice(2, 3))
-          if (this.columns.slice(1, 2)[0].title == '部门') {
-            this.columns.splice(1, 1, {
-              title: '姓名',
-              dataIndex: 'aliasName',
-              key: 'aliasName',
-              customRender: (text, row, index) => {
-                // if (row.users) {
-                //   return row.agencyTeamName
-                // } else {
-                return row.aliasName
-                // }
-              },
-              ellipsis: true,
-              // width: 100,
+          console.log(that.columns.slice(1, 2)[0].title)
+          if (that.columns.slice(1, 2)[0].title == '部门') {
+            that.getDataStatisticsList().then(() => {
+              console.log(1313123131231232)
+              that.dataList = fullCopy(that.totalDataList)
+              that.columns.splice(1, 1, {
+                title: '姓名',
+                dataIndex: 'aliasName',
+                key: 'aliasName',
+                customRender: (text, row, index) => {
+                  return row.aliasName
+                },
+                ellipsis: true,
+              })
             })
           }
         }
@@ -779,10 +797,17 @@ export default {
           console.log(index)
         })
         console.log(newList)
-        this.dataList = newList
+        if (this.menuType == 'group') {
+          this.dataList = data.data.list
+        } else {
+          this.dataList = newList
+        }
+        this.groupDataList = fullCopy(data.data.list)
+        this.totalDataList = fullCopy(newList)
         this.isspinning = false
       }
     },
+
     toFixed(value) {
       return toFixed(value)
     },
@@ -1183,7 +1208,7 @@ td:empty:before {
   }
 }
 /deep/.searchinput {
-  width: 326px;
+  width: 320px;
   // margin-bottom: 16px;
   position: relative;
 }
diff --git a/src/style/index.less b/src/style/index.less
index afbdcf7..40c450f 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -389,7 +389,7 @@ i {
 	font-size: 14px;
 }
 .f16 {
-	font-size: 16px;
+	font-size: 16px !important;
 }
 .f18 {
 	font-size: 18px;
@@ -403,6 +403,9 @@ i {
 .f24 {
 	font-size: 24px;
 }
+.f26 {
+	font-size: 26px;
+}
 .f32 {
 	font-size: 32px !important;
 }
@@ -471,7 +474,7 @@ i {
 .svg_icon {
 	width: 1em;
 	height: 1em;
-	fill: currentColor;
+	// fill: currentColor;
 	overflow: hidden;
 	display: inline-block;
 	vertical-align: middle;
@@ -481,7 +484,19 @@ i {
 	font-weight: normal;
 	margin-right: 2px;
 }
-
+.svg {
+	width: 1em;
+	height: 1em;
+	// fill: currentColor;
+	overflow: hidden;
+	display: inline-block;
+	vertical-align: middle;
+	// min-width: 30px;
+	text-align: center;
+	// font-size: 20px;
+	font-weight: normal;
+	margin-right: 2px;
+}
 // 公用样式类名
 .w {
 	width: 1200px;
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index cfe062d..48976d1 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -3,12 +3,12 @@
  * @param item
  * @returns
  */
-export function isEmptyCheck(value) {
-	if (value == null || value === "" || value == "null" || typeof value == "undefined") {
-		return true;
-	}
+export function isEmptyCheck (value) {
+  if (value == null || value === "" || value == "null" || typeof value == "undefined") {
+    return true;
+  }
 
-	return false;
+  return false;
 }
 /**
  * 如果不是是null '' 'null' 'undefined'
@@ -16,229 +16,229 @@ export function isEmptyCheck(value) {
  * @returns
  */
 
-export function isNotEmptyCheck(value) {
-	return !isEmptyCheck(value);
+export function isNotEmptyCheck (value) {
+  return !isEmptyCheck(value);
 }
 
-export function toFixed(value) {
-	if(value == 0 || value == '0'){
-		return 0
-	}else{
-		return  new Number(value).toFixed(2);
-	}
+export function toFixed (value) {
+  if (value == 0 || value == '0') {
+    return 0
+  } else {
+    return new Number(value).toFixed(2);
+  }
 }
 /**
  * 根据状态工单类型ID获取名称
  */
 
-export function getDistanceName(distance) {
-	let str = "";
+export function getDistanceName (distance) {
+  let str = "";
 
-	if (isNotEmptyCheck(distance)) {
-		if (distance > 1000) {
-			var dis = distance / 1000;
-			dis = dis.toFixed(1);
-			str = dis + "km";
-		} else {
-			str = distance + "m";
-		}
-	}
+  if (isNotEmptyCheck(distance)) {
+    if (distance > 1000) {
+      var dis = distance / 1000;
+      dis = dis.toFixed(1);
+      str = dis + "km";
+    } else {
+      str = distance + "m";
+    }
+  }
 
-	return str;
+  return str;
 }
 /**
  * 业务类型
  */
 
-export function jobTypeArray() {
-	let jobTypeArray = [
-		{
-			id: "0",
-			name: "代理招聘",
-			name2: "代理招聘",
-			value: "0",
-			text: "代理招聘",
-			checked: false,
-		},
-		{
-			id: "1",
-			name: "劳务派遣",
-			name2: "全职",
-			value: "1",
-			text: "劳务派遣",
-			checked: false,
-		},
-		{
-			id: "2",
-			name: "劳务外包",
-			name2: "兼职",
-			value: "2",
-			text: "劳务外包",
-			checked: false,
-		},
-		{
-			id: "4",
-			name: "劳务外包挂靠",
-			name2: "劳务外包挂靠",
-			value: "4",
-			text: "劳务外包挂靠",
-			checked: false,
-		},
-	];
-	return jobTypeArray;
+export function jobTypeArray () {
+  let jobTypeArray = [
+    {
+      id: "0",
+      name: "代理招聘",
+      name2: "代理招聘",
+      value: "0",
+      text: "代理招聘",
+      checked: false,
+    },
+    {
+      id: "1",
+      name: "劳务派遣",
+      name2: "全职",
+      value: "1",
+      text: "劳务派遣",
+      checked: false,
+    },
+    {
+      id: "2",
+      name: "劳务外包",
+      name2: "兼职",
+      value: "2",
+      text: "劳务外包",
+      checked: false,
+    },
+    {
+      id: "4",
+      name: "劳务外包挂靠",
+      name2: "劳务外包挂靠",
+      value: "4",
+      text: "劳务外包挂靠",
+      checked: false,
+    },
+  ];
+  return jobTypeArray;
 }
 /**
  * 根据业务类型ID获取名称
  */
 
-export function getJobTypeById(id) {
-	let str = "";
-	let array = jobTypeArray();
-	array.forEach((item) => {
-		if (item.id == id) {
-			str = item.name;
-		}
-	});
-	return str;
+export function getJobTypeById (id) {
+  let str = "";
+  let array = jobTypeArray();
+  array.forEach((item) => {
+    if (item.id == id) {
+      str = item.name;
+    }
+  });
+  return str;
 }
 /**
  * 工种类型
  */
 
-export function workTypeArray() {
-	let workTypeArray = [
-		{
-			id: 0,
-			name: "全职",
-			value: "0",
-			text: "全职",
-			checked: false,
-		},
-		{
-			id: 1,
-			name: "兼职",
-			value: "1",
-			text: "兼职",
-			checked: false,
-		},
-		{
-			id: 2,
-			name: "寒暑假工",
-			value: "2",
-			text: "寒暑假工",
-			checked: false,
-		},
-		{
-			id: 3,
-			name: "实习生",
-			value: "3",
-			text: "实习生",
-			checked: false,
-		},
-		{
-			id: 4,
-			name: "零工",
-			value: "4",
-			text: "零工",
-			checked: false,
-		},
-	];
-	return workTypeArray;
+export function workTypeArray () {
+  let workTypeArray = [
+    {
+      id: 0,
+      name: "全职",
+      value: "0",
+      text: "全职",
+      checked: false,
+    },
+    {
+      id: 1,
+      name: "兼职",
+      value: "1",
+      text: "兼职",
+      checked: false,
+    },
+    {
+      id: 2,
+      name: "寒暑假工",
+      value: "2",
+      text: "寒暑假工",
+      checked: false,
+    },
+    {
+      id: 3,
+      name: "实习生",
+      value: "3",
+      text: "实习生",
+      checked: false,
+    },
+    {
+      id: 4,
+      name: "零工",
+      value: "4",
+      text: "零工",
+      checked: false,
+    },
+  ];
+  return workTypeArray;
 }
 /**
  * 根据工种类型ID获取名称
  */
 
-export function getWorkTypeById(id) {
-	let str = "";
-	let array = workTypeArray();
-	array.forEach((item) => {
-		if (item.id == id) {
-			str = item.name;
-		}
-	});
-	return str;
+export function getWorkTypeById (id) {
+  let str = "";
+  let array = workTypeArray();
+  array.forEach((item) => {
+    if (item.id == id) {
+      str = item.name;
+    }
+  });
+  return str;
 }
 
 /**
  * 根据传递的scene参数，获取里面的内容
  */
-export function sceneToJson(sceneStr) {
-	let json = {};
-	let array = sceneStr.split(",");
-	array.forEach((item) => {
-		let arr = item.split("=");
-		let key = arr[0];
-		let value = arr[1];
-		json[key] = value;
-	});
-	return json;
+export function sceneToJson (sceneStr) {
+  let json = {};
+  let array = sceneStr.split(",");
+  array.forEach((item) => {
+    let arr = item.split("=");
+    let key = arr[0];
+    let value = arr[1];
+    json[key] = value;
+  });
+  return json;
 }
 
 var isMarry = [
-	// { id: "", name: "请选择"},
-	{ id: "未婚", name: "未婚" },
-	{ id: "已婚", name: "已婚" },
-	{ id: "离异", name: "离异" },
-	{ id: "其它", name: "其它" },
+  // { id: "", name: "请选择"},
+  { id: "未婚", name: "未婚" },
+  { id: "已婚", name: "已婚" },
+  { id: "离异", name: "离异" },
+  { id: "其它", name: "其它" },
 ];
 
 var isMarry2 = [
-	{ id: "", name: "请选择" },
-	{ id: "未婚", name: "未婚" },
-	{ id: "已婚", name: "已婚" },
-	{ id: "离异", name: "离异" },
-	{ id: "其它", name: "其它" },
+  { id: "", name: "请选择" },
+  { id: "未婚", name: "未婚" },
+  { id: "已婚", name: "已婚" },
+  { id: "离异", name: "离异" },
+  { id: "其它", name: "其它" },
 ];
 
 var education = [
-	// { id: "", name: "请选择"},
-	{ id: "初中", name: "初中" },
-	{ id: "中专", name: "中专" },
-	{ id: "高中", name: "高中" },
-	{ id: "大专", name: "大专" },
-	{ id: "本科及以上", name: "本科及以上" },
+  // { id: "", name: "请选择"},
+  { id: "初中", name: "初中" },
+  { id: "中专", name: "中专" },
+  { id: "高中", name: "高中" },
+  { id: "大专", name: "大专" },
+  { id: "本科及以上", name: "本科及以上" },
 ];
 // { id: "-1", name: "请选择" },
 var sex = [
-	{ id: "1", name: "男" },
-	{ id: "2", name: "女" },
+  { id: "1", name: "男" },
+  { id: "2", name: "女" },
 ];
 
 var attendanceStatus = [
-	{ id: "-1", name: "请选择" },
-	{ id: "1", name: "旷工" },
-	{ id: "2", name: "正常出勤" },
-	// { id: "3", name: "上班缺卡"},
-	// { id: "4", name: "下班缺卡"}
+  { id: "-1", name: "请选择" },
+  { id: "1", name: "旷工" },
+  { id: "2", name: "正常出勤" },
+  // { id: "3", name: "上班缺卡"},
+  // { id: "4", name: "下班缺卡"}
 ];
 
 var attendanceStatus2 = [
-	{ id: "-1", name: "请选择" },
-	{ id: "1", name: "旷工" },
-	{ id: "2", name: "正常出勤" },
-	{ id: "3", name: "上班缺卡" },
-	{ id: "4", name: "下班缺卡" },
-	{ id: "5", name: "请假" },
-	{ id: "6", name: "休息" },
+  { id: "-1", name: "请选择" },
+  { id: "1", name: "旷工" },
+  { id: "2", name: "正常出勤" },
+  { id: "3", name: "上班缺卡" },
+  { id: "4", name: "下班缺卡" },
+  { id: "5", name: "请假" },
+  { id: "6", name: "休息" },
 ];
 
 var signatoryTypeArray = [
-	{ id: "0", name: "甲方" },
-	{ id: "1", name: "乙方" },
-	{ id: "2", name: "丙方" },
-	{ id: "3", name: "丁方" },
-	{ id: "4", name: "午方" },
-	{ id: "5", name: "己方" },
-	{ id: "6", name: "庚方" },
-	{ id: "7", name: "辛方" },
-	{ id: "8", name: "壬方" },
-	{ id: "9", name: "癸方" },
+  { id: "0", name: "甲方" },
+  { id: "1", name: "乙方" },
+  { id: "2", name: "丙方" },
+  { id: "3", name: "丁方" },
+  { id: "4", name: "午方" },
+  { id: "5", name: "己方" },
+  { id: "6", name: "庚方" },
+  { id: "7", name: "辛方" },
+  { id: "8", name: "壬方" },
+  { id: "9", name: "癸方" },
 ];
 
 var contractTypeArray = [
-	{ id: "0", name: "个人" },
-	{ id: "1", name: "企业" },
+  { id: "0", name: "个人" },
+  { id: "1", name: "企业" },
 ];
 
 var hourArray = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"];
@@ -246,559 +246,559 @@ var hourArray = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10
 var timeArray1 = [["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"], ["00", "30"], ["-"], ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"], ["00", "30"]];
 //是否可以面试
 var interviewArray = [
-	{ id: "0", name: "请选择" },
-	{ id: "1", name: "可以面试" },
-	{ id: "2", name: "不能面试" },
+  { id: "0", name: "请选择" },
+  { id: "1", name: "可以面试" },
+  { id: "2", name: "不能面试" },
 ];
 
 //面试反馈状态
 var interviewStatusArray = [
-	{ id: "0", name: "请选择", checked: false },
-	{ id: "1", name: "不缺人", checked: false },
-	{ id: "2", name: "候选人不合适", checked: false },
-	{ id: "3", name: "面试时间不合适", checked: false },
-	{ id: "4", name: "面试地点不合适", checked: false },
-	{ id: "10", name: "爽约", checked: false },
-	{ id: "11", name: "未通过-形象不符", checked: false },
-	{ id: "12", name: "未通过-能力不匹配", checked: false },
-	{ id: "13", name: "放弃", checked: false },
-	{ id: "21", name: "通过-无法安置", checked: false },
-	{ id: "20", name: "通过-候选人考虑中", checked: false },
-	{ id: "29", name: "通过-安排入职", checked: false },
+  { id: "0", name: "请选择", checked: false },
+  { id: "1", name: "不缺人", checked: false },
+  { id: "2", name: "候选人不合适", checked: false },
+  { id: "3", name: "面试时间不合适", checked: false },
+  { id: "4", name: "面试地点不合适", checked: false },
+  { id: "10", name: "爽约", checked: false },
+  { id: "11", name: "未通过-形象不符", checked: false },
+  { id: "12", name: "未通过-能力不匹配", checked: false },
+  { id: "13", name: "放弃", checked: false },
+  { id: "21", name: "通过-无法安置", checked: false },
+  { id: "20", name: "通过-候选人考虑中", checked: false },
+  { id: "29", name: "通过-安排入职", checked: false },
 ];
 //面试反馈状态
 var interviewStatusArray1 = [
-	{ id: "0", name: "请选择", checked: false },
-	{ id: "1", name: "不缺人", checked: false },
-	{ id: "2", name: "候选人不合适", checked: false },
-	{ id: "3", name: "面试时间不合适", checked: false },
-	{ id: "4", name: "面试地点不合适", checked: false },
+  { id: "0", name: "请选择", checked: false },
+  { id: "1", name: "不缺人", checked: false },
+  { id: "2", name: "候选人不合适", checked: false },
+  { id: "3", name: "面试时间不合适", checked: false },
+  { id: "4", name: "面试地点不合适", checked: false },
 ];
 //面试反馈状态
 var interviewStatusArray2 = [
-	{ id: "0", name: "请选择", checked: false },
-	{ id: "10", name: "爽约", checked: false },
-	{ id: "13", name: "放弃", checked: false },
-	{ id: "11", name: "未通过-形象不符", checked: false },
-	{ id: "12", name: "未通过-能力不匹配", checked: false },
-	{ id: "21", name: "通过-无法安置", checked: false },
-	{ id: "20", name: "通过-候选人考虑中", checked: false },
-	{ id: "29", name: "通过-安排入职", checked: false },
+  { id: "0", name: "请选择", checked: false },
+  { id: "10", name: "爽约", checked: false },
+  { id: "13", name: "放弃", checked: false },
+  { id: "11", name: "未通过-形象不符", checked: false },
+  { id: "12", name: "未通过-能力不匹配", checked: false },
+  { id: "21", name: "通过-无法安置", checked: false },
+  { id: "20", name: "通过-候选人考虑中", checked: false },
+  { id: "29", name: "通过-安排入职", checked: false },
 ];
 //入职反馈状态
 var entryStatusArray = [
-	{ id: "0", name: "请选择", checked: false },
-	{ id: "1", name: "候选人主动放弃", checked: false },
-	{ id: "2", name: "候选人被淘汰", checked: false },
-	{ id: "10", name: "已入职", checked: false },
+  { id: "0", name: "请选择", checked: false },
+  { id: "1", name: "候选人主动放弃", checked: false },
+  { id: "2", name: "候选人被淘汰", checked: false },
+  { id: "10", name: "已入职", checked: false },
 ];
 
 var workType = [
-	{ id: "1", name: "全职" },
-	{ id: "2", name: "兼职" },
-	{ id: "3", name: "小时工" },
+  { id: "1", name: "全职" },
+  { id: "2", name: "兼职" },
+  { id: "3", name: "小时工" },
 ];
 var workType2 = [
-	{ id: "0", name: "请选择" },
-	{ id: "1", name: "全职" },
-	{ id: "2", name: "兼职" },
-	{ id: "3", name: "小时工" },
+  { id: "0", name: "请选择" },
+  { id: "1", name: "全职" },
+  { id: "2", name: "兼职" },
+  { id: "3", name: "小时工" },
 ];
 var workType3 = [
-	{ id: "0", name: "长期工" },
-	{ id: "1", name: "短期工" },
-	{ id: "2", name: "寒暑假工" },
-	{ id: "3", name: "实习生" },
+  { id: "0", name: "长期工" },
+  { id: "1", name: "短期工" },
+  { id: "2", name: "寒暑假工" },
+  { id: "3", name: "实习生" },
 ];
 var workType4 = [
-	{ id: "-1", name: "请选择" },
-	{ id: "0", name: "长期工" },
-	{ id: "1", name: "短期工" },
-	{ id: "2", name: "寒暑假工" },
-	{ id: "3", name: "实习生" },
+  { id: "-1", name: "请选择" },
+  { id: "0", name: "长期工" },
+  { id: "1", name: "短期工" },
+  { id: "2", name: "寒暑假工" },
+  { id: "3", name: "实习生" },
 ];
 //职位工资结算周期
 var settlementCycleArray = [
-	{ id: "0", name: "月结", checked: false },
-	{ id: "1", name: "半月结", checked: false },
-	{ id: "2", name: "周结", checked: false },
-	{ id: "3", name: "日结", checked: false },
-	{ id: "4", name: "次结", checked: false },
+  { id: "0", name: "月结", checked: false },
+  { id: "1", name: "半月结", checked: false },
+  { id: "2", name: "周结", checked: false },
+  { id: "3", name: "日结", checked: false },
+  { id: "4", name: "次结", checked: false },
 ];
 
 //职位计薪方式
 var salaryTypeArray = [
-	{ id: "0", name: "按月计薪", subName: "月计", checked: false, type: 1 },
-	{ id: "1", name: "按日计薪", subName: "日计", checked: false, type: 1 },
-	{ id: "2", name: "按时计薪", subName: "时计", checked: false, type: 1 },
-	{ id: "3", name: "按次计薪", subName: "次计", checked: false, type: 1 },
+  { id: "0", name: "按月计薪", subName: "月计", checked: false, type: 1 },
+  { id: "1", name: "按日计薪", subName: "日计", checked: false, type: 1 },
+  { id: "2", name: "按时计薪", subName: "时计", checked: false, type: 1 },
+  { id: "3", name: "按次计薪", subName: "次计", checked: false, type: 1 },
 ];
 
 var hopeLive = [
-	{ id: "", name: "请选择" },
-	{ id: "住宿舍", name: "住宿舍" },
-	{ id: "不住宿舍", name: "不住宿舍" },
+  { id: "", name: "请选择" },
+  { id: "住宿舍", name: "住宿舍" },
+  { id: "不住宿舍", name: "不住宿舍" },
 ];
 
 var workExp = [
-	// { id: "", name: "请选择"},
-	{ id: "无工作经验", name: "无工作经验" },
-	{ id: "餐饮管理经验", name: "餐饮管理经验" },
-	{ id: "餐饮服务岗经验", name: "餐饮服务岗经验" },
-	{ id: "非餐饮岗位经验", name: "非餐饮岗位经验" },
-	{ id: "星级酒店前厅岗位经验", name: "星级酒店前厅岗位经验" },
-	{ id: "其他", name: "其他" },
+  // { id: "", name: "请选择"},
+  { id: "无工作经验", name: "无工作经验" },
+  { id: "餐饮管理经验", name: "餐饮管理经验" },
+  { id: "餐饮服务岗经验", name: "餐饮服务岗经验" },
+  { id: "非餐饮岗位经验", name: "非餐饮岗位经验" },
+  { id: "星级酒店前厅岗位经验", name: "星级酒店前厅岗位经验" },
+  { id: "其他", name: "其他" },
 ];
 
 var education2 = [
-	{ id: "", name: "请选择" },
-	{ id: "初中", name: "初中" },
-	{ id: "中专", name: "中专" },
-	{ id: "高中", name: "高中" },
-	{ id: "大专", name: "大专" },
-	{ id: "本科及以上", name: "本科及以上" },
+  { id: "", name: "请选择" },
+  { id: "初中", name: "初中" },
+  { id: "中专", name: "中专" },
+  { id: "高中", name: "高中" },
+  { id: "大专", name: "大专" },
+  { id: "本科及以上", name: "本科及以上" },
 ];
 
 var bankAuth = [
-	{ id: "0", name: "未认证" },
-	{ id: "1", name: "已认证" },
-	{ id: "2", name: "审核中" },
+  { id: "0", name: "未认证" },
+  { id: "1", name: "已认证" },
+  { id: "2", name: "审核中" },
 ];
 
 var auth = [
-	{ id: "0", name: "未认证" },
-	{ id: "1", name: "已认证" },
+  { id: "0", name: "未认证" },
+  { id: "1", name: "已认证" },
 ];
 
 var healthAuth = [
-	{ id: "0", name: "未绑定" },
-	{ id: "1", name: "已绑定" },
+  { id: "0", name: "未绑定" },
+  { id: "1", name: "已绑定" },
 ];
 
 // function CommonUtil(){}
 
-export function getHealthArray() {
-	return healthAuth;
+export function getHealthArray () {
+  return healthAuth;
 }
 
-export function getAuthArray() {
-	return auth;
+export function getAuthArray () {
+  return auth;
 }
 //初始化picker选中项
-export function initAuthPicker(id) {
-	for (var i = 0; i < auth.length; i++) {
-		if (auth[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
+export function initAuthPicker (id) {
+  for (var i = 0; i < auth.length; i++) {
+    if (auth[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getAuthValue(index) {
-	return auth[index].id;
+export function getAuthValue (index) {
+  return auth[index].id;
 }
 
-export function getIsMarryArray() {
-	return isMarry;
+export function getIsMarryArray () {
+  return isMarry;
 }
 //初始化picker选中项
-export function initIsMarryPicker(name) {
-	for (var i = 0; i < isMarry.length; i++) {
-		if (isMarry[i].name == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initIsMarryPicker (name) {
+  for (var i = 0; i < isMarry.length; i++) {
+    if (isMarry[i].name == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getIsMarryValue(index) {
-	return isMarry[index].id;
+export function getIsMarryValue (index) {
+  return isMarry[index].id;
 }
 
-export function getEducationArray() {
-	return education;
+export function getEducationArray () {
+  return education;
 }
 //初始化picker选中项
-export function initEducationPicker(name) {
-	for (var i = 0; i < education.length; i++) {
-		if (education[i].name == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initEducationPicker (name) {
+  for (var i = 0; i < education.length; i++) {
+    if (education[i].name == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getEducationValue(index) {
-	return education[index].id;
+export function getEducationValue (index) {
+  return education[index].id;
 }
 
-export function getSexValue(index) {
-	return sex[index].id;
+export function getSexValue (index) {
+  return sex[index].id;
 }
 
-export function getSexArray() {
-	return sex;
+export function getSexArray () {
+  return sex;
 }
 //初始化picker选中项
-export function initSexPicker(id) {
-	for (var i = 0; i < sex.length; i++) {
-		if (sex[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
-}
-
-export function getAttendanceStatus() {
-	return attendanceStatus;
-}
-export function getAttendanceStatusValue(index) {
-	return attendanceStatus[index].id;
+export function initSexPicker (id) {
+  for (var i = 0; i < sex.length; i++) {
+    if (sex[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
+}
+
+export function getAttendanceStatus () {
+  return attendanceStatus;
+}
+export function getAttendanceStatusValue (index) {
+  return attendanceStatus[index].id;
+}
+export function getAttendanceStatusIndex (id) {
+  for (var i = 0; i < attendanceStatus.length; i++) {
+    if (attendanceStatus[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
+}
+export function getAttendanceStatusName (id) {
+  for (var i = 0; i < attendanceStatus.length; i++) {
+    if (attendanceStatus[i].id == id) {
+      return attendanceStatus[i].name;
+    }
+  }
+  return "";
 }
-export function getAttendanceStatusIndex(id) {
-	for (var i = 0; i < attendanceStatus.length; i++) {
-		if (attendanceStatus[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
-}
-export function getAttendanceStatusName(id) {
-	for (var i = 0; i < attendanceStatus.length; i++) {
-		if (attendanceStatus[i].id == id) {
-			return attendanceStatus[i].name;
-		}
-	}
-	return "";
-}
-export function getAttendanceStatusNameOfIndex(index) {
-	for (var i = 0; i < attendanceStatus.length; i++) {
-		if (index == i) {
-			return attendanceStatus[i].name;
-		}
-	}
-	return "";
-}
-
-export function getAttendanceStatus2() {
-	return attendanceStatus2;
-}
-export function getAttendanceStatusValue2(index) {
-	return attendanceStatus2[index].id;
-}
-export function getAttendanceStatusIndex2(id) {
-	for (var i = 0; i < attendanceStatus2.length; i++) {
-		if (attendanceStatus2[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
-}
-export function getAttendanceStatusName2(id) {
-	for (var i = 0; i < attendanceStatus2.length; i++) {
-		if (attendanceStatus2[i].id == id) {
-			return attendanceStatus2[i].name;
-		}
-	}
-	return "";
-}
-export function getAttendanceStatusNameOfIndex2(index) {
-	for (var i = 0; i < attendanceStatus2.length; i++) {
-		if (index == i) {
-			return attendanceStatus2[i].name;
-		}
-	}
-	return "";
-}
-
-export function getSignatoryTypeArray() {
-	return signatoryTypeArray;
-}
-
-export function getContractTypeArrayArray() {
-	return contractTypeArray;
-}
-
-export function getHourArray() {
-	return hourArray;
-}
-
-export function getTimeArray1() {
-	return timeArray1;
-}
-
-export function getInterviewArray() {
-	return interviewArray;
-}
-export function getInterviewArrayName(id) {
-	for (var i = 0; i < interviewArray.length; i++) {
-		if (interviewArray[i].id == id) {
-			return interviewArray[i].name;
-		}
-	}
-	return "";
-}
-
-export function getInterviewStatusArray() {
-	return interviewStatusArray;
-}
-export function getInterviewStatusName(id) {
-	for (var i = 0; i < interviewStatusArray.length; i++) {
-		if (interviewStatusArray[i].id == id) {
-			return interviewStatusArray[i].name;
-		}
-	}
-	return "";
-}
-export function getInterviewStatusArray1() {
-	return interviewStatusArray1;
-}
-export function getInterviewStatusName1(id) {
-	for (var i = 0; i < interviewStatusArray1.length; i++) {
-		if (interviewStatusArray1[i].id == id) {
-			return interviewStatusArray1[i].name;
-		}
-	}
-	return "";
-}
-export function getInterviewStatusIndex1(id) {
-	for (var i = 0; i < interviewStatusArray1.length; i++) {
-		if (interviewStatusArray1[i].id == id) {
-			return i;
-		}
-	}
-	return -1;
+export function getAttendanceStatusNameOfIndex (index) {
+  for (var i = 0; i < attendanceStatus.length; i++) {
+    if (index == i) {
+      return attendanceStatus[i].name;
+    }
+  }
+  return "";
 }
 
-export function getInterviewStatusArray2() {
-	return interviewStatusArray2;
+export function getAttendanceStatus2 () {
+  return attendanceStatus2;
 }
-export function getInterviewStatusName2(id) {
-	for (var i = 0; i < interviewStatusArray2.length; i++) {
-		if (interviewStatusArray2[i].id == id) {
-			return interviewStatusArray2[i].name;
-		}
-	}
-	return "";
+export function getAttendanceStatusValue2 (index) {
+  return attendanceStatus2[index].id;
 }
-export function getInterviewStatusIndex2(id) {
-	for (var i = 0; i < interviewStatusArray2.length; i++) {
-		if (interviewStatusArray2[i].id == id) {
-			return i;
-		}
-	}
-	return -1;
+export function getAttendanceStatusIndex2 (id) {
+  for (var i = 0; i < attendanceStatus2.length; i++) {
+    if (attendanceStatus2[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
+}
+export function getAttendanceStatusName2 (id) {
+  for (var i = 0; i < attendanceStatus2.length; i++) {
+    if (attendanceStatus2[i].id == id) {
+      return attendanceStatus2[i].name;
+    }
+  }
+  return "";
+}
+export function getAttendanceStatusNameOfIndex2 (index) {
+  for (var i = 0; i < attendanceStatus2.length; i++) {
+    if (index == i) {
+      return attendanceStatus2[i].name;
+    }
+  }
+  return "";
+}
+
+export function getSignatoryTypeArray () {
+  return signatoryTypeArray;
 }
 
-export function getEntryStatusArray() {
-	return entryStatusArray;
+export function getContractTypeArrayArray () {
+  return contractTypeArray;
 }
 
-export function getEntryStatusName(id) {
-	for (var i = 0; i < entryStatusArray.length; i++) {
-		if (entryStatusArray[i].id == id) {
-			return entryStatusArray[i].name;
-		}
-	}
-	return "";
+export function getHourArray () {
+  return hourArray;
 }
-export function getEntryStatusIndex(id) {
-	for (var i = 0; i < entryStatusArray.length; i++) {
-		if (entryStatusArray[i].id == id) {
-			return i;
-		}
-	}
-	return -1;
+
+export function getTimeArray1 () {
+  return timeArray1;
 }
 
-export function getWorkTypeArray() {
-	return workType;
+export function getInterviewArray () {
+  return interviewArray;
+}
+export function getInterviewArrayName (id) {
+  for (var i = 0; i < interviewArray.length; i++) {
+    if (interviewArray[i].id == id) {
+      return interviewArray[i].name;
+    }
+  }
+  return "";
+}
+
+export function getInterviewStatusArray () {
+  return interviewStatusArray;
+}
+export function getInterviewStatusName (id) {
+  for (var i = 0; i < interviewStatusArray.length; i++) {
+    if (interviewStatusArray[i].id == id) {
+      return interviewStatusArray[i].name;
+    }
+  }
+  return "";
+}
+export function getInterviewStatusArray1 () {
+  return interviewStatusArray1;
+}
+export function getInterviewStatusName1 (id) {
+  for (var i = 0; i < interviewStatusArray1.length; i++) {
+    if (interviewStatusArray1[i].id == id) {
+      return interviewStatusArray1[i].name;
+    }
+  }
+  return "";
+}
+export function getInterviewStatusIndex1 (id) {
+  for (var i = 0; i < interviewStatusArray1.length; i++) {
+    if (interviewStatusArray1[i].id == id) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+export function getInterviewStatusArray2 () {
+  return interviewStatusArray2;
+}
+export function getInterviewStatusName2 (id) {
+  for (var i = 0; i < interviewStatusArray2.length; i++) {
+    if (interviewStatusArray2[i].id == id) {
+      return interviewStatusArray2[i].name;
+    }
+  }
+  return "";
+}
+export function getInterviewStatusIndex2 (id) {
+  for (var i = 0; i < interviewStatusArray2.length; i++) {
+    if (interviewStatusArray2[i].id == id) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+export function getEntryStatusArray () {
+  return entryStatusArray;
+}
+
+export function getEntryStatusName (id) {
+  for (var i = 0; i < entryStatusArray.length; i++) {
+    if (entryStatusArray[i].id == id) {
+      return entryStatusArray[i].name;
+    }
+  }
+  return "";
+}
+export function getEntryStatusIndex (id) {
+  for (var i = 0; i < entryStatusArray.length; i++) {
+    if (entryStatusArray[i].id == id) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+export function getWorkTypeArray () {
+  return workType;
 }
 //初始化picker选中项
-export function initWorkTypePicker(id) {
-	for (var i = 0; i < workType.length; i++) {
-		if (workType[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
+export function initWorkTypePicker (id) {
+  for (var i = 0; i < workType.length; i++) {
+    if (workType[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getWorkTypeValue(index) {
-	return workType[index].id;
+export function getWorkTypeValue (index) {
+  return workType[index].id;
 }
 
-export function getWorkType2Array() {
-	return workType2;
+export function getWorkType2Array () {
+  return workType2;
 }
 //初始化picker选中项
-export function initWorkType2Picker(id) {
-	for (var i = 0; i < workType2.length; i++) {
-		if (workType2[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
+export function initWorkType2Picker (id) {
+  for (var i = 0; i < workType2.length; i++) {
+    if (workType2[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getWorkType2Value(index) {
-	return workType2[index].id;
+export function getWorkType2Value (index) {
+  return workType2[index].id;
 }
 
-export function getWorkType3Array() {
-	return workType3;
+export function getWorkType3Array () {
+  return workType3;
 }
 //初始化picker选中项
-export function initWorkType3Picker(id) {
-	for (var i = 0; i < workType3.length; i++) {
-		if (workType3[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
+export function initWorkType3Picker (id) {
+  for (var i = 0; i < workType3.length; i++) {
+    if (workType3[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getWorkType3Value(index) {
-	return workType3[index].id;
+export function getWorkType3Value (index) {
+  return workType3[index].id;
 }
-export function getWorkType3Name(id) {
-	for (var i = 0; i < workType3.length; i++) {
-		if (workType3[i].id == id) {
-			return workType3[i].name;
-		}
-	}
-	return "";
+export function getWorkType3Name (id) {
+  for (var i = 0; i < workType3.length; i++) {
+    if (workType3[i].id == id) {
+      return workType3[i].name;
+    }
+  }
+  return "";
 }
 
-export function getWorkType4Array() {
-	return workType4;
+export function getWorkType4Array () {
+  return workType4;
 }
 //初始化picker选中项
-export function initWorkType4Picker(id) {
-	for (var i = 0; i < workType4.length; i++) {
-		if (workType4[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
-}
-export function getWorkType4Value(index) {
-	return workType4[index].id;
-}
-export function getWorkType4Name(id) {
-	for (var i = 0; i < workType4.length; i++) {
-		if (workType4[i].id == id) {
-			return workType4[i].name;
-		}
-	}
-	return "";
-}
-
-export function getSettlementCycleArray() {
-	return settlementCycleArray;
-}
-export function getSettlementCycleName(id) {
-	for (var i = 0; i < settlementCycleArray.length; i++) {
-		if (settlementCycleArray[i].id == id) {
-			return settlementCycleArray[i].name;
-		}
-	}
-	return "";
-}
-
-export function getSalaryTypeArray() {
-	return salaryTypeArray;
-}
-export function getSalaryTypeName(id) {
-	for (var i = 0; i < salaryTypeArray.length; i++) {
-		if (salaryTypeArray[i].id == id) {
-			return salaryTypeArray[i].name;
-		}
-	}
-	return "";
-}
-export function getSalaryTypeSubName(id) {
-	for (var i = 0; i < salaryTypeArray.length; i++) {
-		if (salaryTypeArray[i].id == id) {
-			return salaryTypeArray[i].subName;
-		}
-	}
-	return "";
-}
-
-export function getHopeLiveArray() {
-	return hopeLive;
+export function initWorkType4Picker (id) {
+  for (var i = 0; i < workType4.length; i++) {
+    if (workType4[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
+}
+export function getWorkType4Value (index) {
+  return workType4[index].id;
+}
+export function getWorkType4Name (id) {
+  for (var i = 0; i < workType4.length; i++) {
+    if (workType4[i].id == id) {
+      return workType4[i].name;
+    }
+  }
+  return "";
+}
+
+export function getSettlementCycleArray () {
+  return settlementCycleArray;
+}
+export function getSettlementCycleName (id) {
+  for (var i = 0; i < settlementCycleArray.length; i++) {
+    if (settlementCycleArray[i].id == id) {
+      return settlementCycleArray[i].name;
+    }
+  }
+  return "";
+}
+
+export function getSalaryTypeArray () {
+  return salaryTypeArray;
+}
+export function getSalaryTypeName (id) {
+  for (var i = 0; i < salaryTypeArray.length; i++) {
+    if (salaryTypeArray[i].id == id) {
+      return salaryTypeArray[i].name;
+    }
+  }
+  return "";
+}
+export function getSalaryTypeSubName (id) {
+  for (var i = 0; i < salaryTypeArray.length; i++) {
+    if (salaryTypeArray[i].id == id) {
+      return salaryTypeArray[i].subName;
+    }
+  }
+  return "";
+}
+
+export function getHopeLiveArray () {
+  return hopeLive;
 }
 //初始化picker选中项
-export function initHopeLivePicker(name) {
-	for (var i = 0; i < hopeLive.length; i++) {
-		if (hopeLive[i].id == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initHopeLivePicker (name) {
+  for (var i = 0; i < hopeLive.length; i++) {
+    if (hopeLive[i].id == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getHopeLiveValue(index) {
-	return hopeLive[index].id;
+export function getHopeLiveValue (index) {
+  return hopeLive[index].id;
 }
 
-export function getWorkExpArray() {
-	return workExp;
+export function getWorkExpArray () {
+  return workExp;
 }
 //初始化picker选中项
-export function initWorkExpPicker(name) {
-	for (var i = 0; i < workExp.length; i++) {
-		if (workExp[i].name == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initWorkExpPicker (name) {
+  for (var i = 0; i < workExp.length; i++) {
+    if (workExp[i].name == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getWorkExpValue(index) {
-	return workExp[index].id;
+export function getWorkExpValue (index) {
+  return workExp[index].id;
 }
 
-export function getEducation2Array() {
-	return education2;
+export function getEducation2Array () {
+  return education2;
 }
 //初始化picker选中项
-export function initEducation2Picker(name) {
-	for (var i = 0; i < education2.length; i++) {
-		if (education2[i].name == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initEducation2Picker (name) {
+  for (var i = 0; i < education2.length; i++) {
+    if (education2[i].name == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getEducation2Value(index) {
-	return education2[index].id;
+export function getEducation2Value (index) {
+  return education2[index].id;
 }
 
-export function getIsMarry2Array() {
-	return isMarry2;
+export function getIsMarry2Array () {
+  return isMarry2;
 }
 //初始化picker选中项
-export function initIsMarry2Picker(name) {
-	for (var i = 0; i < isMarry2.length; i++) {
-		if (isMarry2[i].name == name) {
-			return i;
-		}
-	}
-	return 0;
+export function initIsMarry2Picker (name) {
+  for (var i = 0; i < isMarry2.length; i++) {
+    if (isMarry2[i].name == name) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getIsMarry2Value(index) {
-	return isMarry2[index].id;
+export function getIsMarry2Value (index) {
+  return isMarry2[index].id;
 }
 
-export function getBankAuthArray() {
-	return bankAuth;
+export function getBankAuthArray () {
+  return bankAuth;
 }
 
 //初始化picker选中项
-export function initBankAuthPicker(id) {
-	for (var i = 0; i < bankAuth.length; i++) {
-		if (bankAuth[i].id == id) {
-			return i;
-		}
-	}
-	return 0;
+export function initBankAuthPicker (id) {
+  for (var i = 0; i < bankAuth.length; i++) {
+    if (bankAuth[i].id == id) {
+      return i;
+    }
+  }
+  return 0;
 }
-export function getBankAuthValue(index) {
-	return bankAuth[index].id;
+export function getBankAuthValue (index) {
+  return bankAuth[index].id;
 }
 /**
  *
@@ -806,108 +806,108 @@ export function getBankAuthValue(index) {
  * @param detailPosition 详细地址
  * @returns {string}
  */
-export function getStoreAddress(district, detailPosition) {
-	var res = "";
-	if (isNotEmptyCheck(district)) {
-		var tmpArr = district.split(",");
-		if (tmpArr.length == 3 && tmpArr[0] == tmpArr[1]) {
-			res += tmpArr[1] + tmpArr[2];
-		} else {
-			res += district.replace(/,/g, "");
-		}
-	}
-	if (isNotEmptyCheck(detailPosition)) {
-		res += detailPosition;
-	}
-	return res;
+export function getStoreAddress (district, detailPosition) {
+  var res = "";
+  if (isNotEmptyCheck(district)) {
+    var tmpArr = district.split(",");
+    if (tmpArr.length == 3 && tmpArr[0] == tmpArr[1]) {
+      res += tmpArr[1] + tmpArr[2];
+    } else {
+      res += district.replace(/,/g, "");
+    }
+  }
+  if (isNotEmptyCheck(detailPosition)) {
+    res += detailPosition;
+  }
+  return res;
 }
 
 /**
  * 代理推广明细事件
  */
-export function agencyPromotionDetailEventArray() {
-	let agencyPromotionDetailEventArray = [
-		{ id: "10", name: "扫码", value: "10", text: "扫码", checked: false },
-		{ id: "20", name: "报名", value: "20", text: "报名", checked: false },
-		{ id: "30", name: "面试", value: "30", text: "面试", checked: false },
-		{ id: "40", name: "入职", value: "40", text: "入职", checked: false },
-		{ id: "50", name: "离职", value: "50", text: "离职", checked: false },
-	];
-	return agencyPromotionDetailEventArray;
+export function agencyPromotionDetailEventArray () {
+  let agencyPromotionDetailEventArray = [
+    { id: "10", name: "扫码", value: "10", text: "扫码", checked: false },
+    { id: "20", name: "报名", value: "20", text: "报名", checked: false },
+    { id: "30", name: "面试", value: "30", text: "面试", checked: false },
+    { id: "40", name: "入职", value: "40", text: "入职", checked: false },
+    { id: "50", name: "离职", value: "50", text: "离职", checked: false },
+  ];
+  return agencyPromotionDetailEventArray;
 }
 /**
  * 根据代理推广明细事件ID获取名称
  */
-export function getAgencyPromotionDetailEventNameId(id) {
-	let str = "";
-	let array = agencyPromotionDetailEventArray();
-	array.forEach((item) => {
-		if (item.id == id) {
-			str = item.name;
-		}
-	});
-	return str;
+export function getAgencyPromotionDetailEventNameId (id) {
+  let str = "";
+  let array = agencyPromotionDetailEventArray();
+  array.forEach((item) => {
+    if (item.id == id) {
+      str = item.name;
+    }
+  });
+  return str;
 }
 
 /**
  * 代理推广明细佣金状态
  */
-export function agencyPromotionDetailMoneyStatusArray() {
-	let agencyPromotionDetailMoneyStatusArray = [
-		{ id: "0", name: "无佣金", value: "0", text: "无佣金", checked: false },
-		{ id: "10", name: "待结算", value: "10", text: "待结算", checked: false },
-		{ id: "20", name: "已结算", value: "20", text: "已结算", checked: false },
-		{ id: "30", name: "已失效", value: "30", text: "已失效", checked: false },
-	];
-	return agencyPromotionDetailMoneyStatusArray;
+export function agencyPromotionDetailMoneyStatusArray () {
+  let agencyPromotionDetailMoneyStatusArray = [
+    { id: "0", name: "无佣金", value: "0", text: "无佣金", checked: false },
+    { id: "10", name: "待结算", value: "10", text: "待结算", checked: false },
+    { id: "20", name: "已结算", value: "20", text: "已结算", checked: false },
+    { id: "30", name: "已失效", value: "30", text: "已失效", checked: false },
+  ];
+  return agencyPromotionDetailMoneyStatusArray;
 }
 /**
  * 根据代理推广明细佣金状态ID获取名称
  */
-export function getAgencyPromotionDetailMoneyStatusNameId(id) {
-	let str = "";
-	let array = agencyPromotionDetailMoneyStatusArray();
-	array.forEach((item) => {
-		if (item.id == id) {
-			str = item.name;
-		}
-	});
-	return str;
-}
-
-export function moneyToFixed(money, fixed = 2, multiplicator = 100) {
-	if (money != 0 && money != null && money != "" && money != undefined) {
-		return cutZero(new Number(money / multiplicator).toFixed(fixed));
-	} else {
-		return "0";
-	}
-}
-export function cutZero(old) {
-	//拷贝一份 返回去掉零的新串
-	let newstr = old;
-	//循环变量 小数部分长度
-	var leng = old.length - old.indexOf(".") - 1;
-	//判断是否有效数
-	if (old.indexOf(".") > -1) {
-		//循环小数部分
-		for (var i = leng; i > 0; i--) {
-			//如果newstr末尾有0
-			if (newstr.lastIndexOf("0") > -1 && newstr.substr(newstr.length - 1, 1) == 0) {
-				var k = newstr.lastIndexOf("0");
-				//如果小数点后只有一个0 去掉小数点
-				if (newstr.charAt(k - 1) == ".") {
-					return newstr.substring(0, k - 1);
-				} else {
-					//否则 去掉一个0
-					newstr = newstr.substring(0, k);
-				}
-			} else {
-				//如果末尾没有0
-				return newstr;
-			}
-		}
-	}
-	return old;
+export function getAgencyPromotionDetailMoneyStatusNameId (id) {
+  let str = "";
+  let array = agencyPromotionDetailMoneyStatusArray();
+  array.forEach((item) => {
+    if (item.id == id) {
+      str = item.name;
+    }
+  });
+  return str;
+}
+
+export function moneyToFixed (money, fixed = 2, multiplicator = 100) {
+  if (money != 0 && money != null && money != "" && money != undefined) {
+    return cutZero(new Number(money / multiplicator).toFixed(fixed));
+  } else {
+    return "0";
+  }
+}
+export function cutZero (old) {
+  //拷贝一份 返回去掉零的新串
+  let newstr = old;
+  //循环变量 小数部分长度
+  var leng = old.length - old.indexOf(".") - 1;
+  //判断是否有效数
+  if (old.indexOf(".") > -1) {
+    //循环小数部分
+    for (var i = leng; i > 0; i--) {
+      //如果newstr末尾有0
+      if (newstr.lastIndexOf("0") > -1 && newstr.substr(newstr.length - 1, 1) == 0) {
+        var k = newstr.lastIndexOf("0");
+        //如果小数点后只有一个0 去掉小数点
+        if (newstr.charAt(k - 1) == ".") {
+          return newstr.substring(0, k - 1);
+        } else {
+          //否则 去掉一个0
+          newstr = newstr.substring(0, k);
+        }
+      } else {
+        //如果末尾没有0
+        return newstr;
+      }
+    }
+  }
+  return old;
 }
 // export function getCurrentPageUrlWithArgs() {
 //   // const pages = getCurrentPages()
@@ -923,34 +923,34 @@ export function cutZero(old) {
 //   return urlWithArgs
 // }
 
-export function getDateArrayOfScope() {
-	// var multiArray = [['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月'], ['-'],['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月']];
-	var multiArray = [[], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"], ["-"], [], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"]];
+export function getDateArrayOfScope () {
+  // var multiArray = [['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月'], ['-'],['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月']];
+  var multiArray = [[], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"], ["-"], [], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"]];
 
-	var date = new Date();
-	var end = date.getFullYear();
+  var date = new Date();
+  var end = date.getFullYear();
 
-	var yearArray = [];
-	for (var i = 1990; i <= end; i++) {
-		yearArray.push(i + "年");
-	}
+  var yearArray = [];
+  for (var i = 1990; i <= end; i++) {
+    yearArray.push(i + "年");
+  }
 
-	multiArray[0] = yearArray;
-	multiArray[3] = yearArray;
+  multiArray[0] = yearArray;
+  multiArray[3] = yearArray;
 
-	return multiArray;
+  return multiArray;
 }
 
-export function educationArray() {
-	let educationArray = [
-		{ id: "初中", name: "初中" },
-		{ id: "高中", name: "高中" },
-		{ id: "大专", name: "大专" },
-		{ id: "本科", name: "本科" },
-		{ id: "硕士", name: "硕士" },
-		{ id: "博士", name: "博士" },
-	];
-	return educationArray;
+export function educationArray () {
+  let educationArray = [
+    { id: "初中", name: "初中" },
+    { id: "高中", name: "高中" },
+    { id: "大专", name: "大专" },
+    { id: "本科", name: "本科" },
+    { id: "硕士", name: "硕士" },
+    { id: "博士", name: "博士" },
+  ];
+  return educationArray;
 }
 
 /**
@@ -958,758 +958,766 @@ export function educationArray() {
  * @param val
  * @returns {string}
  */
-export function formatDateYMD(val) {
-	if (val == null || val == "") {
-		return null;
-	}
-
-	if ((val != null || val == "") && typeof val == "string") {
-		if (val.indexOf("T")) {
-			val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
-		}
-		val = val.replace("-", "/").replace("-", "/");
-	}
-	var value = new Date(val);
-	//console.log(val);
-	var fmt = "yyyy-MM-dd";
-	var o = {
-		"M+": value.getMonth() + 1, //月份
-		"d+": value.getDate(), //日
-	};
-	if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
-	for (var k in o) {
-		if (new RegExp("(" + k + ")").test(fmt)) {
-			fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-		}
-	}
-	return fmt;
-}
-export function formatDateYMDHMS(val) {
-	// model -> view，在更新 `<input>` 元素之前格式化值
-	if (val !== "") {
-		if (val !== null && val !== "" && typeof val == "string") {
-			if (val.indexOf("T")) {
-				val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
-			}
-			val = val.replace("-", "/").replace("-", "/");
-		}
-		var value = new Date(val);
-		//console.log(val);
-		var fmt = "yyyy-MM-dd HH:mm";
-		var o = {
-			"M+": value.getMonth() + 1, //月份
-			"d+": value.getDate(), //日
-			"H+": value.getHours(), //小时
-			//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
-			"m+": value.getMinutes(), //分
-			"s+": value.getSeconds(), //秒
-			//"S": val.getMilliseconds() //毫秒
-			//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
-		};
-		if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
-		for (var k in o) {
-			if (new RegExp("(" + k + ")").test(fmt)) {
-				fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-			}
-		}
-		return fmt;
-	}
+export function formatDateYMD (val) {
+  if (val == null || val == "") {
+    return null;
+  }
+
+  if ((val != null || val == "") && typeof val == "string") {
+    if (val.indexOf("T")) {
+      val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
+    }
+    val = val.replace("-", "/").replace("-", "/");
+  }
+  var value = new Date(val);
+  //console.log(val);
+  var fmt = "yyyy-MM-dd";
+  var o = {
+    "M+": value.getMonth() + 1, //月份
+    "d+": value.getDate(), //日
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o) {
+    if (new RegExp("(" + k + ")").test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+    }
+  }
+  return fmt;
+}
+export function formatDateYMDHMS (val) {
+  // model -> view，在更新 `<input>` 元素之前格式化值
+  if (val !== "") {
+    if (val !== null && val !== "" && typeof val == "string") {
+      if (val.indexOf("T")) {
+        val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
+      }
+      val = val.replace("-", "/").replace("-", "/");
+    }
+    var value = new Date(val);
+    //console.log(val);
+    var fmt = "yyyy-MM-dd HH:mm";
+    var o = {
+      "M+": value.getMonth() + 1, //月份
+      "d+": value.getDate(), //日
+      "H+": value.getHours(), //小时
+      //"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
+      "m+": value.getMinutes(), //分
+      "s+": value.getSeconds(), //秒
+      //"S": val.getMilliseconds() //毫秒
+      //"q+": Math.floor((val.getMonth() + 3) / 3) //季度
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o) {
+      if (new RegExp("(" + k + ")").test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+      }
+    }
+    return fmt;
+  }
 }
 /**
  * 时间格式化  2017-01-01 01:01
  * @param val
  * @returns {string}
  */
-export function formatDateYMDHM(val) {
-	// model -> view，在更新 `<input>` 元素之前格式化值
-	if (isEmptyCheck(val)) {
-		return "";
-	} else {
-		if ((val != null || val == "") && typeof val == "string") {
-			val = val.replace("-", "/").replace("-", "/");
-		}
-		var value = new Date(val);
-		//console.log(val);
-		var fmt = "yyyy-MM-dd HH:mm";
-		var o = {
-			"M+": value.getMonth() + 1, //月份
-			"d+": value.getDate(), //日
-			"H+": value.getHours(), //小时
-			//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
-			"m+": value.getMinutes(), //分
-			// "s+": value.getSeconds() //秒
-			//"S": val.getMilliseconds() //毫秒
-			//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
-		};
-		if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
-		for (var k in o) {
-			if (new RegExp("(" + k + ")").test(fmt)) {
-				fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-			}
-		}
-		return fmt;
-	}
-}
-function getJobSpecialLabelNamesArray(jobSpecialLabelNames) {
-	if (isNotEmptyCheck(jobSpecialLabelNames)) {
-		return jobSpecialLabelNames.split(", ");
-	}
-	return [];
+export function formatDateYMDHM (val) {
+  // model -> view，在更新 `<input>` 元素之前格式化值
+  if (isEmptyCheck(val)) {
+    return "";
+  } else {
+    if ((val != null || val == "") && typeof val == "string") {
+      val = val.replace("-", "/").replace("-", "/");
+    }
+    var value = new Date(val);
+    //console.log(val);
+    var fmt = "yyyy-MM-dd HH:mm";
+    var o = {
+      "M+": value.getMonth() + 1, //月份
+      "d+": value.getDate(), //日
+      "H+": value.getHours(), //小时
+      //"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
+      "m+": value.getMinutes(), //分
+      // "s+": value.getSeconds() //秒
+      //"S": val.getMilliseconds() //毫秒
+      //"q+": Math.floor((val.getMonth() + 3) / 3) //季度
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o) {
+      if (new RegExp("(" + k + ")").test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+      }
+    }
+    return fmt;
+  }
+}
+function getJobSpecialLabelNamesArray (jobSpecialLabelNames) {
+  if (isNotEmptyCheck(jobSpecialLabelNames)) {
+    return jobSpecialLabelNames.split(", ");
+  }
+  return [];
 }
 
 /**
  * 处理工单状态
  */
-export function userApplyOrderStatusArray() {
-	// let orderStatus = [
-	//   { id: "10", name: "审核中", value: "10", text: "审核中" },
-	//   { id: "20", name: "待面试", value: "20", text: "待面试" },
-	//   { id: "30", name: "待入职", value: "30", text: "待入职" },
-	//   { id: "40", name: "在职中", value: "40", text: "在职中" },
-	//   { id: "50", name: "待离职", value: "50", text: "待离职" },
-	//   { id: "60", name: "已完成", value: "60", text: "已完成" },
-	// ];
-	let orderStatus = [
-		{
-			id: "10",
-			name: "已报名，审核中",
-			value: "10",
-			text: "报名审核中",
-			num: 0,
-		},
-		{
-			id: "20",
-			name: "报名成功，待面试",
-			value: "20",
-			text: "审核通过",
-			num: 0,
-		},
-		{
-			id: "21",
-			name: "审核未通过，报名失败",
-			value: "21",
-			text: "审核未通过",
-			num: 0,
-		},
-		{ id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
-		{ id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
-		{
-			id: "30",
-			name: "面试通过，待入职",
-			value: "30",
-			text: "面试通过",
-			num: 0,
-		},
-		{ id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
-		{ id: "40", name: "已入职，在职中", value: "40", text: "已入职", num: 0 },
-		{
-			id: "45",
-			name: "面试通过，未入职",
-			value: "45",
-			text: "通过未入职",
-			num: 0,
-		},
-		{ id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
-		// { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
-	];
-	return orderStatus;
+export function userApplyOrderStatusArray () {
+  // let orderStatus = [
+  //   { id: "10", name: "审核中", value: "10", text: "审核中" },
+  //   { id: "20", name: "待面试", value: "20", text: "待面试" },
+  //   { id: "30", name: "待入职", value: "30", text: "待入职" },
+  //   { id: "40", name: "在职中", value: "40", text: "在职中" },
+  //   { id: "50", name: "待离职", value: "50", text: "待离职" },
+  //   { id: "60", name: "已完成", value: "60", text: "已完成" },
+  // ];
+  let orderStatus = [
+    {
+      id: "10",
+      name: "已报名，审核中",
+      value: "10",
+      text: "报名审核中",
+      num: 0,
+    },
+    {
+      id: "20",
+      name: "报名成功，待面试",
+      value: "20",
+      text: "审核通过",
+      num: 0,
+    },
+    {
+      id: "21",
+      name: "审核未通过，报名失败",
+      value: "21",
+      text: "审核未通过",
+      num: 0,
+    },
+    { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
+    { id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
+    {
+      id: "30",
+      name: "面试通过，待入职",
+      value: "30",
+      text: "面试通过",
+      num: 0,
+    },
+    { id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
+    { id: "40", name: "已入职，在职中", value: "40", text: "已入职", num: 0 },
+    {
+      id: "45",
+      name: "面试通过，未入职",
+      value: "45",
+      text: "通过未入职",
+      num: 0,
+    },
+    { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
+    // { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
+  ];
+  return orderStatus;
 }
 
 /**
  * 根据工单状态ID获取名称 我的老乡
  */
-export function getUserApplyOrderStatusById(id) {
-	let str = "";
-	let array = userApplyOrderStatusArray();
-	array.forEach((item) => {
-		if (id == "50") {
-			str = "离职";
-		} else if (id == "40") {
-			str = "在职";
-		} else {
-			str = "报名";
-		}
-	});		
-	return str;
+export function getUserApplyOrderStatusById (id) {
+  let str = "";
+  let array = userApplyOrderStatusArray();
+  array.forEach((item) => {
+    if (id == "50") {
+      str = "离职";
+    } else if (id == "40") {
+      str = "在职";
+    } else {
+      str = "报名";
+    }
+  });
+  return str;
 }
 /**
  * 根据工单状态ID获取名称 我的工单
  */
-export function getUserApplyOrderStatusByIdToBill(id) {
-	let str = "";
-	let array = userApplyOrderStatusArray();
-	array.forEach((item) => {
+export function getUserApplyOrderStatusByIdToBill (id) {
+  let str = "";
+  let array = userApplyOrderStatusArray();
+  array.forEach((item) => {
     if (item.id == id) {
       str = item.name;
     }
-	});
-	return str;
+  });
+  return str;
 }
 // 处理职位列表的方法
-export function disposeJobListData(jobList) {
-	if (jobList !== undefined) {
-		if (Array.isArray(jobList)) {
-			jobList.forEach((item) => {
-				item["workType"] = getWorkTypeById(item.workTypeMulti);
-
-				if (isNotEmptyCheck(item.distance)) {
-					item["distanceKm"] = getDistanceName(item.distance);
-				}
-				if (isNotEmptyCheck(item.jobDesp)) {
-					item["jobDesp"] = item["jobDesp"].replaceAll("*****", "");
-				}
-				//年龄
-				// console.log(jobList);
-				var ageStr = "";
-				if (isNotEmptyCheck(item.minAge) && isNotEmptyCheck(item.maxAge)) {
-					ageStr = item.minAge + "-" + item.maxAge + "岁";
-				} else if (isNotEmptyCheck(item.minAge)) {
-					ageStr = item.minAge + "岁以上";
-				} else if (isNotEmptyCheck(item.maxAge)) {
-					ageStr = item.maxAge + "岁以下";
-				}
-				item["age"] = ageStr;
-				item.updateTime = formatDateYMDHM(item.updateTime);
-				// 更新时间距离现在的差距
-				let differenceTime = new Date().getTime() - new Date(item.updateTime || new Date()).getTime();
-				var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
-				var leave1 = differenceTime % (24 * 3600 * 1000);
-				var H = Math.floor(leave1 / (3600 * 1000));
-				var leave2 = leave1 % (3600 * 1000);
-				var M = Math.floor(leave2 / (60 * 1000));
-				var leave3 = leave2 % (60 * 1000);
-				var S = Math.floor(leave3 / 1000);
-				item.diffTime = null;
-				if (D > 0) {
-					item.diffTime = D + "天前";
-				} else if (H > 0) {
-					item.diffTime = H + "小时前";
-				} else if (M > 0) {
-					item.diffTime = M + "分钟前";
-				} else {
-					item.diffTime = S + "秒前";
-				}
-				// 服务费
-				// console.log(item);
-
-				if (item.returnFeeType) {
-					if (item.returnFeeType === 0) {
-						item.servetype = `${item.returnFee || "--"}元/小时`;
-					} else if (item.returnFeeType === 1) {
-						item.servetype = `${item.returnFee || "--"}元/日`;
-					} else if (item.returnFeeType === 2) {
-						item.servetype = `${item.returnFee || "--"}元/月`;
-					} else if (item.returnFeeType === 3) {
-						item.servetype = `${item.returnFee || "--"}元/次`;
-					} else if (item.returnFeeType === 4) {
-						item.servetype = `${item.returnFee || "--"}元/件`;
-					} else if (item.returnFeeType === 5) {
-						item.servetype = `工人收入${item.returnFee || "--"}%`;
-					} else if (item.returnFeeType === 6) {
-						item.servetype = `共${item.returnFee || "--"}元`;
-					} else if (item.returnFeeType === 7) {
-						item.servetype = `费用待定`;
-					}
-					// console.log(item);
-					// item["returnFee"] = item.returnFee / 100;
-				} else {
-					item.servetype = `${item.returnFee || "--"}元/小时`;
-				}
-				//时薪
-				// var hourlyPayStr = "";
-				// var hasHourlyPay = false;
-				// if (isNotEmptyCheck(item.hourlyPay)) {
-				//   hourlyPayStr = item.hourlyPay + "元/小时";
-				//   hasHourlyPay = true;
-				// } else if (isNotEmptyCheck(item.dayPay)) {
-				//   hourlyPayStr = item.dayPay + "元/日";
-				//   hasHourlyPay = true;
-				// } else {
-				//   if (
-				//     isNotEmptyCheck(item.minMonthlyPay) &&
-				//     isNotEmptyCheck(item.maxMonthlyPay)
-				//   ) {
-				//     if (item.minMonthlyPay == item.maxMonthlyPay) {
-				//       hourlyPayStr = item.minMonthlyPay;
-				//     } else {
-				//       hourlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
-				//     }
-				//   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
-				//     hourlyPayStr = item.minMonthlyPay;
-				//   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
-				//     hourlyPayStr = item.maxMonthlyPay;
-				//   }
-				// }
-				// item["hourlyPay"] = hourlyPayStr;
-				//月薪
-				// var monthlyPayStr = "";
-				// if (hasHourlyPay) {
-				//   if (
-				//     isNotEmptyCheck(item.minMonthlyPay) &&
-				//     isNotEmptyCheck(item.maxMonthlyPay)
-				//   ) {
-				//     if (item.minMonthlyPay == item.maxMonthlyPay) {
-				//       monthlyPayStr = item.minMonthlyPay;
-				//     } else {
-				//       monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
-				//     }
-				//   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
-				//     monthlyPayStr = item.minMonthlyPay;
-				//   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
-				//     monthlyPayStr = item.maxMonthlyPay;
-				//   }
-				// }
-				// item["monthlyPay"] = monthlyPayStr;
-				//地址深圳丨龙岗区丨
-				var districtStr = "";
-				if (isNotEmptyCheck(item.district)) {
-					// console.log(item.district);
-					var districtArr = item.district.split(",");
-					var districtArr1 = [];
-					// console.log(districtArr);
-					districtArr.forEach((item1) => {
-						if (item1.length != 0) {
-							item1 = item1 + "丨";
-							districtArr1.push(item1);
-						}
-					});
-					if (districtArr.length < 3) {
-						districtStr = districtArr1[districtArr1.length - 1];
-					} else {
-						districtStr = districtArr1.join("");
-					}
-					if (item.district.indexOf("undefined") > -1) {
-						districtStr = "-丨";
-					}
-					//districtStr = districtArr[1] + '丨' + districtArr[2];
-				}
-				item["district"] = districtStr;
-				//职位特色
-				item["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(item.jobSpecialLabelNames);
-				// 特色标签
-				// console.log(item.jobSpecialLabelNames);
-				const jobSpecialLabelNames = [];
-				if (isNotEmptyCheck(item.jobSpecialLabelNames) && Array.isArray(item.jobSpecialLabelNames)) {
-					item.jobSpecialLabelNames.forEach((item, index) => {
-						if (index <= 2) {
-							jobSpecialLabelNames.push(item);
-							// console.log(jobSpecialLabelNames);
-						} else {
-							return;
-						}
-					});
-					item.jobSpecialLabelNames = jobSpecialLabelNames;
-				}
-				// 年龄限制
-				if (Boolean(item.minAgeWoman) === true && Boolean(item.minAgeMan) === false) {
-					item.gender = "女丨";
-				} else if (Boolean(item.minAgeWoman) === false && Boolean(item.minAgeMan) === true) {
-					item.gender = "男丨";
-				} else {
-					item.gender = "男女不限丨";
-				}
-			});
-		} else {
-			jobList["workType"] = getWorkTypeById(jobList.workTypeMulti);
-
-			if (isNotEmptyCheck(jobList.distance)) {
-				jobList["distanceKm"] = getDistanceName(jobList.distance);
-			}
-			if (isNotEmptyCheck(jobList.jobDesp)) {
-				jobList["jobDesp"] = jobList["jobDesp"].replaceAll("*****", "");
-			}
-			//年龄
-			var ageStr = "";
-			if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {
-				ageStr = jobList.minAge + "-" + jobList.maxAge + "岁";
-			} else if (isNotEmptyCheck(jobList.minAge)) {
-				ageStr = jobList.minAge + "岁以上";
-			} else if (isNotEmptyCheck(jobList.maxAge)) {
-				ageStr = jobList.maxAge + "岁以下";
-			}
-			jobList["age"] = ageStr;
-			//时薪
-			// var hourlyPayStr = "";
-			// var hasHourlyPay = false;
-			// if (isNotEmptyCheck(jobList.hourlyPay)) {
-			//   hourlyPayStr = jobList.hourlyPay + "元/小时";
-			//   hasHourlyPay = true;
-			// } else if (isNotEmptyCheck(jobList.dayPay)) {
-			//   hourlyPayStr = jobList.dayPay + "元/日";
-			//   hasHourlyPay = true;
-			// } else {
-			//   if (
-			//     isNotEmptyCheck(jobList.minMonthlyPay) &&
-			//     isNotEmptyCheck(jobList.maxMonthlyPay)
-			//   ) {
-			//     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
-			//       hourlyPayStr = jobList.minMonthlyPay;
-			//     } else {
-			//       hourlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
-			//     }
-			//   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
-			//     hourlyPayStr = jobList.minMonthlyPay;
-			//   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
-			//     hourlyPayStr = jobList.maxMonthlyPay;
-			//   }
-			// }
-			// jobList["hourlyPay"] = hourlyPayStr;
-			//月薪
-			// var monthlyPayStr = "";
-			// if (hasHourlyPay) {
-			//   if (
-			//     isNotEmptyCheck(jobList.minMonthlyPay) &&
-			//     isNotEmptyCheck(jobList.maxMonthlyPay)
-			//   ) {
-			//     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
-			//       monthlyPayStr = jobList.minMonthlyPay;
-			//     } else {
-			//       monthlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
-			//     }
-			//   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
-			//     monthlyPayStr = jobList.minMonthlyPay;
-			//   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
-			//     monthlyPayStr = jobList.maxMonthlyPay;
-			//   }
-			// }
-			// jobList["monthlyPay"] = monthlyPayStr;
-			//服务费
-			// console.log(item);
-
-			if (jobList.returnFeeType) {
-				if (jobList.returnFeeType === 0) {
-					jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
-				} else if (jobList.returnFeeType === 1) {
-					jobList.servetype = `${jobList.returnFee || "--"}元/日`;
-				} else if (jobList.returnFeeType === 2) {
-					jobList.servetype = `${jobList.returnFee || "--"}元/月`;
-				} else if (jobList.returnFeeType === 3) {
-					jobList.servetype = `${jobList.returnFee || "--"}元/次`;
-				} else if (jobList.returnFeeType === 4) {
-					jobList.servetype = `${jobList.returnFee || "--"}元/件`;
-				} else if (jobList.returnFeeType === 5) {
-					jobList.servetype = `工人收入${jobList.returnFee || "--"}%`;
-				} else if (jobList.returnFeeType === 6) {
-					jobList.servetype = `共${jobList.returnFee || "--"}元`;
-				} else if (jobList.returnFeeType === 7) {
-					jobList.servetype = `费用待定`;
-				}
-			} else {
-				jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
-			}
-			// if (jobList.returnFeeType || jobList.returnFeeType === 0) {
-			//   if (jobList.returnFeeType === 0) {
-			//     jobList.servetype = "元/小时";
-			//   } else if (jobList.returnFeeType === 1) {
-			//     jobList.servetype = "元/日";
-			//   } else if (jobList.returnFeeType === 2) {
-			//     jobList.servetype = "元/月";
-			//   } else if (jobList.returnFeeType === 3) {
-			//     jobList.servetype = "元/次";
-			//   }
-			//   // console.log(jobList);
-			//   // jobList["returnFee"] = jobList.returnFee / 100;
-			// } else {
-			//   jobList.servetype = "元/小时";
-			// }
-			//地址深圳丨龙岗区丨
-			var districtStr = "";
-			if (isNotEmptyCheck(jobList.district)) {
-				var districtArr = jobList.district.split(",");
-				var districtArr1 = [];
-				// console.log(districtArr);
-				districtArr.forEach((item1) => {
-					if (item1.length != 0) {
-						item1 = item1 + "丨";
-						districtArr1.push(item1);
-					}
-				});
-				if (districtArr.length < 3) {
-					districtStr = districtArr1[districtArr1.length - 1];
-				} else {
-					// districtStr = districtArr[1] + "丨" + districtArr[2];
-					districtStr = districtArr1.join("");
-				}
-				if (jobList.district.indexOf("undefined") > -1) {
-					districtStr = "-丨";
-				}
-				//districtStr = districtArr[1] + '丨' + districtArr[2];
-			}
-			jobList["district"] = districtStr;
-			//职位特色
-			jobList["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(jobList.jobSpecialLabelNames);
-			// console.log(jobList.jobSpecialLabelNames);
-			// 特色标签
-			// console.log(jobList.jobSpecialLabelNames);
-			const jobSpecialLabelNames = [];
-			if (isNotEmptyCheck(jobList.jobSpecialLabelNames) && Array.isArray(jobList.jobSpecialLabelNames)) {
-				jobList.jobSpecialLabelNames.forEach((item, index) => {
-					if (index <= 4) {
-						jobSpecialLabelNames.push(item);
-						// console.log(jobSpecialLabelNames);
-					} else {
-						return;
-					}
-				});
-				jobList.jobSpecialLabelNames = jobSpecialLabelNames;
-			}
-			// 年龄限制
-			// console.log(jobList);
-			// console.log(jobList["gender"]);
-			if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
-				jobList.gender = "女丨";
-			} else if (Boolean(jobList.minAgeWoman) === false && Boolean(jobList.minAgeMan) === true) {
-				jobList.gender = "男丨";
-			} else {
-				jobList.gender = "男女不限丨";
-			}
-			// if (jobList["gender"] === 1) {
-			//   jobList["gender"] = "丨男";
-			// } else if (jobList["gender"] === 2) {
-			//   jobList["gender"] = "丨女";
-			// } else if (jobList["gender"] === 3) {
-			//   jobList["gender"] = "丨男女不限";
-			// } else {
-			//   jobList["gender"] = "丨男女不限";
-			// }
-		}
-	}
-
-	return jobList;
+export function disposeJobListData (jobList) {
+  if (jobList !== undefined) {
+    if (Array.isArray(jobList)) {
+      jobList.forEach((item) => {
+        item["workType"] = getWorkTypeById(item.workTypeMulti);
+
+        if (isNotEmptyCheck(item.distance)) {
+          item["distanceKm"] = getDistanceName(item.distance);
+        }
+        if (isNotEmptyCheck(item.jobDesp)) {
+          item["jobDesp"] = item["jobDesp"].replaceAll("*****", "");
+        }
+        //年龄
+        // console.log(jobList);
+        var ageStr = "";
+        if (isNotEmptyCheck(item.minAge) && isNotEmptyCheck(item.maxAge)) {
+          ageStr = item.minAge + "-" + item.maxAge + "岁";
+        } else if (isNotEmptyCheck(item.minAge)) {
+          ageStr = item.minAge + "岁以上";
+        } else if (isNotEmptyCheck(item.maxAge)) {
+          ageStr = item.maxAge + "岁以下";
+        }
+        item["age"] = ageStr;
+        item.updateTime = formatDateYMDHM(item.updateTime);
+        // 更新时间距离现在的差距
+        let differenceTime = new Date().getTime() - new Date(item.updateTime || new Date()).getTime();
+        var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
+        var leave1 = differenceTime % (24 * 3600 * 1000);
+        var H = Math.floor(leave1 / (3600 * 1000));
+        var leave2 = leave1 % (3600 * 1000);
+        var M = Math.floor(leave2 / (60 * 1000));
+        var leave3 = leave2 % (60 * 1000);
+        var S = Math.floor(leave3 / 1000);
+        item.diffTime = null;
+        if (D > 0) {
+          item.diffTime = D + "天前";
+        } else if (H > 0) {
+          item.diffTime = H + "小时前";
+        } else if (M > 0) {
+          item.diffTime = M + "分钟前";
+        } else {
+          item.diffTime = S + "秒前";
+        }
+        // 服务费
+        // console.log(item);
+
+        if (item.returnFeeType) {
+          if (item.returnFeeType === 0) {
+            item.servetype = `${item.returnFee || "--"}元/小时`;
+          } else if (item.returnFeeType === 1) {
+            item.servetype = `${item.returnFee || "--"}元/日`;
+          } else if (item.returnFeeType === 2) {
+            item.servetype = `${item.returnFee || "--"}元/月`;
+          } else if (item.returnFeeType === 3) {
+            item.servetype = `${item.returnFee || "--"}元/次`;
+          } else if (item.returnFeeType === 4) {
+            item.servetype = `${item.returnFee || "--"}元/件`;
+          } else if (item.returnFeeType === 5) {
+            item.servetype = `工人收入${item.returnFee || "--"}%`;
+          } else if (item.returnFeeType === 6) {
+            item.servetype = `共${item.returnFee || "--"}元`;
+          } else if (item.returnFeeType === 7) {
+            item.servetype = `费用待定`;
+          }
+          // console.log(item);
+          // item["returnFee"] = item.returnFee / 100;
+        } else {
+          item.servetype = `${item.returnFee || "--"}元/小时`;
+        }
+        //时薪
+        // var hourlyPayStr = "";
+        // var hasHourlyPay = false;
+        // if (isNotEmptyCheck(item.hourlyPay)) {
+        //   hourlyPayStr = item.hourlyPay + "元/小时";
+        //   hasHourlyPay = true;
+        // } else if (isNotEmptyCheck(item.dayPay)) {
+        //   hourlyPayStr = item.dayPay + "元/日";
+        //   hasHourlyPay = true;
+        // } else {
+        //   if (
+        //     isNotEmptyCheck(item.minMonthlyPay) &&
+        //     isNotEmptyCheck(item.maxMonthlyPay)
+        //   ) {
+        //     if (item.minMonthlyPay == item.maxMonthlyPay) {
+        //       hourlyPayStr = item.minMonthlyPay;
+        //     } else {
+        //       hourlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
+        //     }
+        //   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
+        //     hourlyPayStr = item.minMonthlyPay;
+        //   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
+        //     hourlyPayStr = item.maxMonthlyPay;
+        //   }
+        // }
+        // item["hourlyPay"] = hourlyPayStr;
+        //月薪
+        // var monthlyPayStr = "";
+        // if (hasHourlyPay) {
+        //   if (
+        //     isNotEmptyCheck(item.minMonthlyPay) &&
+        //     isNotEmptyCheck(item.maxMonthlyPay)
+        //   ) {
+        //     if (item.minMonthlyPay == item.maxMonthlyPay) {
+        //       monthlyPayStr = item.minMonthlyPay;
+        //     } else {
+        //       monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
+        //     }
+        //   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
+        //     monthlyPayStr = item.minMonthlyPay;
+        //   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
+        //     monthlyPayStr = item.maxMonthlyPay;
+        //   }
+        // }
+        // item["monthlyPay"] = monthlyPayStr;
+        //地址深圳丨龙岗区丨
+        var districtStr = "";
+        if (isNotEmptyCheck(item.district)) {
+          // console.log(item.district);
+          var districtArr = item.district.split(",");
+          var districtArr1 = [];
+          // console.log(districtArr);
+          districtArr.forEach((item1) => {
+            if (item1.length != 0) {
+              item1 = item1 + "丨";
+              districtArr1.push(item1);
+            }
+          });
+          if (districtArr.length < 3) {
+            districtStr = districtArr1[districtArr1.length - 1];
+          } else {
+            districtStr = districtArr1.join("");
+          }
+          if (item.district.indexOf("undefined") > -1) {
+            districtStr = "-丨";
+          }
+          //districtStr = districtArr[1] + '丨' + districtArr[2];
+        }
+        item["district"] = districtStr;
+        //职位特色
+        item["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(item.jobSpecialLabelNames);
+        // 特色标签
+        // console.log(item.jobSpecialLabelNames);
+        const jobSpecialLabelNames = [];
+        if (isNotEmptyCheck(item.jobSpecialLabelNames) && Array.isArray(item.jobSpecialLabelNames)) {
+          item.jobSpecialLabelNames.forEach((item, index) => {
+            if (index <= 2) {
+              jobSpecialLabelNames.push(item);
+              // console.log(jobSpecialLabelNames);
+            } else {
+              return;
+            }
+          });
+          item.jobSpecialLabelNames = jobSpecialLabelNames;
+        }
+        // 年龄限制
+        if (Boolean(item.minAgeWoman) === true && Boolean(item.minAgeMan) === false) {
+          item.gender = "女丨";
+        } else if (Boolean(item.minAgeWoman) === false && Boolean(item.minAgeMan) === true) {
+          item.gender = "男丨";
+        } else {
+          item.gender = "男女不限丨";
+        }
+      });
+    } else {
+      jobList["workType"] = getWorkTypeById(jobList.workTypeMulti);
+
+      if (isNotEmptyCheck(jobList.distance)) {
+        jobList["distanceKm"] = getDistanceName(jobList.distance);
+      }
+      if (isNotEmptyCheck(jobList.jobDesp)) {
+        jobList["jobDesp"] = jobList["jobDesp"].replaceAll("*****", "");
+      }
+      //年龄
+      var ageStr = "";
+      if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {
+        ageStr = jobList.minAge + "-" + jobList.maxAge + "岁";
+      } else if (isNotEmptyCheck(jobList.minAge)) {
+        ageStr = jobList.minAge + "岁以上";
+      } else if (isNotEmptyCheck(jobList.maxAge)) {
+        ageStr = jobList.maxAge + "岁以下";
+      }
+      jobList["age"] = ageStr;
+      //时薪
+      // var hourlyPayStr = "";
+      // var hasHourlyPay = false;
+      // if (isNotEmptyCheck(jobList.hourlyPay)) {
+      //   hourlyPayStr = jobList.hourlyPay + "元/小时";
+      //   hasHourlyPay = true;
+      // } else if (isNotEmptyCheck(jobList.dayPay)) {
+      //   hourlyPayStr = jobList.dayPay + "元/日";
+      //   hasHourlyPay = true;
+      // } else {
+      //   if (
+      //     isNotEmptyCheck(jobList.minMonthlyPay) &&
+      //     isNotEmptyCheck(jobList.maxMonthlyPay)
+      //   ) {
+      //     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
+      //       hourlyPayStr = jobList.minMonthlyPay;
+      //     } else {
+      //       hourlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
+      //     }
+      //   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
+      //     hourlyPayStr = jobList.minMonthlyPay;
+      //   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
+      //     hourlyPayStr = jobList.maxMonthlyPay;
+      //   }
+      // }
+      // jobList["hourlyPay"] = hourlyPayStr;
+      //月薪
+      // var monthlyPayStr = "";
+      // if (hasHourlyPay) {
+      //   if (
+      //     isNotEmptyCheck(jobList.minMonthlyPay) &&
+      //     isNotEmptyCheck(jobList.maxMonthlyPay)
+      //   ) {
+      //     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
+      //       monthlyPayStr = jobList.minMonthlyPay;
+      //     } else {
+      //       monthlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
+      //     }
+      //   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
+      //     monthlyPayStr = jobList.minMonthlyPay;
+      //   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
+      //     monthlyPayStr = jobList.maxMonthlyPay;
+      //   }
+      // }
+      // jobList["monthlyPay"] = monthlyPayStr;
+      //服务费
+      // console.log(item);
+
+      if (jobList.returnFeeType) {
+        if (jobList.returnFeeType === 0) {
+          jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
+        } else if (jobList.returnFeeType === 1) {
+          jobList.servetype = `${jobList.returnFee || "--"}元/日`;
+        } else if (jobList.returnFeeType === 2) {
+          jobList.servetype = `${jobList.returnFee || "--"}元/月`;
+        } else if (jobList.returnFeeType === 3) {
+          jobList.servetype = `${jobList.returnFee || "--"}元/次`;
+        } else if (jobList.returnFeeType === 4) {
+          jobList.servetype = `${jobList.returnFee || "--"}元/件`;
+        } else if (jobList.returnFeeType === 5) {
+          jobList.servetype = `工人收入${jobList.returnFee || "--"}%`;
+        } else if (jobList.returnFeeType === 6) {
+          jobList.servetype = `共${jobList.returnFee || "--"}元`;
+        } else if (jobList.returnFeeType === 7) {
+          jobList.servetype = `费用待定`;
+        }
+      } else {
+        jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
+      }
+      // if (jobList.returnFeeType || jobList.returnFeeType === 0) {
+      //   if (jobList.returnFeeType === 0) {
+      //     jobList.servetype = "元/小时";
+      //   } else if (jobList.returnFeeType === 1) {
+      //     jobList.servetype = "元/日";
+      //   } else if (jobList.returnFeeType === 2) {
+      //     jobList.servetype = "元/月";
+      //   } else if (jobList.returnFeeType === 3) {
+      //     jobList.servetype = "元/次";
+      //   }
+      //   // console.log(jobList);
+      //   // jobList["returnFee"] = jobList.returnFee / 100;
+      // } else {
+      //   jobList.servetype = "元/小时";
+      // }
+      //地址深圳丨龙岗区丨
+      var districtStr = "";
+      if (isNotEmptyCheck(jobList.district)) {
+        var districtArr = jobList.district.split(",");
+        var districtArr1 = [];
+        // console.log(districtArr);
+        districtArr.forEach((item1) => {
+          if (item1.length != 0) {
+            item1 = item1 + "丨";
+            districtArr1.push(item1);
+          }
+        });
+        if (districtArr.length < 3) {
+          districtStr = districtArr1[districtArr1.length - 1];
+        } else {
+          // districtStr = districtArr[1] + "丨" + districtArr[2];
+          districtStr = districtArr1.join("");
+        }
+        if (jobList.district.indexOf("undefined") > -1) {
+          districtStr = "-丨";
+        }
+        //districtStr = districtArr[1] + '丨' + districtArr[2];
+      }
+      jobList["district"] = districtStr;
+      //职位特色
+      jobList["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(jobList.jobSpecialLabelNames);
+      // console.log(jobList.jobSpecialLabelNames);
+      // 特色标签
+      // console.log(jobList.jobSpecialLabelNames);
+      const jobSpecialLabelNames = [];
+      if (isNotEmptyCheck(jobList.jobSpecialLabelNames) && Array.isArray(jobList.jobSpecialLabelNames)) {
+        jobList.jobSpecialLabelNames.forEach((item, index) => {
+          if (index <= 4) {
+            jobSpecialLabelNames.push(item);
+            // console.log(jobSpecialLabelNames);
+          } else {
+            return;
+          }
+        });
+        jobList.jobSpecialLabelNames = jobSpecialLabelNames;
+      }
+      // 年龄限制
+      // console.log(jobList);
+      // console.log(jobList["gender"]);
+      if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
+        jobList.gender = "女丨";
+      } else if (Boolean(jobList.minAgeWoman) === false && Boolean(jobList.minAgeMan) === true) {
+        jobList.gender = "男丨";
+      } else {
+        jobList.gender = "男女不限丨";
+      }
+      // if (jobList["gender"] === 1) {
+      //   jobList["gender"] = "丨男";
+      // } else if (jobList["gender"] === 2) {
+      //   jobList["gender"] = "丨女";
+      // } else if (jobList["gender"] === 3) {
+      //   jobList["gender"] = "丨男女不限";
+      // } else {
+      //   jobList["gender"] = "丨男女不限";
+      // }
+    }
+  }
+
+  return jobList;
 }
 /**
  * 根据薪资类型和薪资值获取薪资展示
  */
-export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
-	var hourlyPay = moneyToFixed(salaryClassifyValue);
-	if (salaryClassify == 0) {
-		return `<span>${hourlyPay}</span>元/小时`;
-	} else if (salaryClassify == 1) {
-		return `<span>${hourlyPay}</span>元/天`;
-	} else if (salaryClassify == 2) {
-		return `补<span>${hourlyPay}</span>元`;
-	} else if (salaryClassify == 3) {
-		return `返<span>${hourlyPay}</span>元`;
-	} else if (salaryClassify == 4) {
-		return "<i>计件</i>";
-	} else if (salaryClassify == 5) {
-		return `保底<span>${hourlyPay}</span>元`;
-	} else if (salaryClassify == 6) {
-		return `<i>面议</i>`;
-	} else if (salaryClassify == 7) {
-		// return '请配置薪资';
-		return `<i>月薪</i>`;
-	} else {
-		return "-";
-	}
+export function getSalaryClassifyValue (salaryClassify, salaryClassifyValue) {
+  var hourlyPay = moneyToFixed(salaryClassifyValue);
+  if (salaryClassify == 0) {
+    return `<span>${hourlyPay}</span>元/小时`;
+  } else if (salaryClassify == 1) {
+    return `<span>${hourlyPay}</span>元/天`;
+  } else if (salaryClassify == 2) {
+    return `补<span>${hourlyPay}</span>元`;
+  } else if (salaryClassify == 3) {
+    return `返<span>${hourlyPay}</span>元`;
+  } else if (salaryClassify == 4) {
+    return "<i>计件</i>";
+  } else if (salaryClassify == 5) {
+    return `保底<span>${hourlyPay}</span>元`;
+  } else if (salaryClassify == 6) {
+    return `<i>面议</i>`;
+  } else if (salaryClassify == 7) {
+    // return '请配置薪资';
+    return `<i>月薪</i>`;
+  } else {
+    return "-";
+  }
 }
 // 通过身份证获取信息
 
-export function getAgeFromBirthday(bir) {
-	if (isEmptyCheck(bir)) {
-		return "";
-	}
-	var infoObj = { age: "", gender: "" };
-	var birth = bir.substr(6, 8);
-	var age = bir.substr(16, 1);
-	// console.log(age);
-	// console.log(birth);
-	if (age % 2 == 0) {
-		infoObj.gender = "2";
-	} else {
-		infoObj.gender = "1";
-	}
-	// console.log(bir);
-	var returnAge;
-	// var strBirthdayArr = bir.split("-");
-	// if (strBirthdayArr.length == 1) {
-	//     var d = new Date();
-	//     var nowYear = d.getFullYear();
-	//     return nowYear - strBirthdayArr[0] + 1;
-	// }
-	var birthYear = birth.substr(0, 4);
-	var birthMonth = birth.substr(4, 2);
-	var birthDay = birth.substr(6, 2);
-
-	var d = new Date();
-	var nowYear = d.getFullYear();
-	var nowMonth = d.getMonth() + 1;
-	var nowDay = d.getDate();
-
-	if (nowYear == birthYear) {
-		returnAge = 0; //同年 则为0岁
-	} else {
-		var ageDiff = nowYear - birthYear; //年之差
-		if (ageDiff > 0) {
-			if (nowMonth == birthMonth) {
-				var dayDiff = nowDay - birthDay; //日之差
-				if (dayDiff < 0) {
-					returnAge = ageDiff - 1;
-				} else {
-					returnAge = ageDiff;
-				}
-			} else {
-				var monthDiff = nowMonth - birthMonth; //月之差
-				if (monthDiff < 0) {
-					returnAge = ageDiff - 1;
-				} else {
-					returnAge = ageDiff;
-				}
-			}
-		} else {
-			returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
-		}
-	}
-	infoObj.age = returnAge;
-	return infoObj; //返回周岁年龄
+export function getAgeFromBirthday (bir) {
+  if (isEmptyCheck(bir)) {
+    return "";
+  }
+  var infoObj = { age: "", gender: "" };
+  var birth = bir.substr(6, 8);
+  var age = bir.substr(16, 1);
+  // console.log(age);
+  // console.log(birth);
+  if (age % 2 == 0) {
+    infoObj.gender = "2";
+  } else {
+    infoObj.gender = "1";
+  }
+  // console.log(bir);
+  var returnAge;
+  // var strBirthdayArr = bir.split("-");
+  // if (strBirthdayArr.length == 1) {
+  //     var d = new Date();
+  //     var nowYear = d.getFullYear();
+  //     return nowYear - strBirthdayArr[0] + 1;
+  // }
+  var birthYear = birth.substr(0, 4);
+  var birthMonth = birth.substr(4, 2);
+  var birthDay = birth.substr(6, 2);
+
+  var d = new Date();
+  var nowYear = d.getFullYear();
+  var nowMonth = d.getMonth() + 1;
+  var nowDay = d.getDate();
+
+  if (nowYear == birthYear) {
+    returnAge = 0; //同年 则为0岁
+  } else {
+    var ageDiff = nowYear - birthYear; //年之差
+    if (ageDiff > 0) {
+      if (nowMonth == birthMonth) {
+        var dayDiff = nowDay - birthDay; //日之差
+        if (dayDiff < 0) {
+          returnAge = ageDiff - 1;
+        } else {
+          returnAge = ageDiff;
+        }
+      } else {
+        var monthDiff = nowMonth - birthMonth; //月之差
+        if (monthDiff < 0) {
+          returnAge = ageDiff - 1;
+        } else {
+          returnAge = ageDiff;
+        }
+      }
+    } else {
+      returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
+    }
+  }
+  infoObj.age = returnAge;
+  return infoObj; //返回周岁年龄
 }
 
 /**
  * 代理成员角色类型
  */
-export function agencyRoleTypeArray() {
-	let workTypeArray = [
-		{ id: 1, name: "创建人", value: "1", text: "创建人", checked: false },
-		{ id: 2, name: "管理员", value: "2", text: "管理员", checked: false },
-		{ id: 3, name: "成员", value: "3", text: "成员", checked: false },
-	];
-	return workTypeArray;
+export function agencyRoleTypeArray () {
+  let workTypeArray = [
+    { id: 1, name: "创建人", value: "1", text: "创建人", checked: false },
+    { id: 2, name: "管理员", value: "2", text: "管理员", checked: false },
+    { id: 3, name: "成员", value: "3", text: "成员", checked: false },
+  ];
+  return workTypeArray;
 }
 /**
  * 根据代理成员角色ID获取名称
  */
-export function getAgencyRoleTypeById(id) {
-	let str = "";
-	let array = agencyRoleTypeArray();
-	array.forEach((item) => {
-		if (item.id == id) {
-			str = item.name;
-		}
-	});
-	return str;
+export function getAgencyRoleTypeById (id) {
+  let str = "";
+  let array = agencyRoleTypeArray();
+  array.forEach((item) => {
+    if (item.id == id) {
+      str = item.name;
+    }
+  });
+  return str;
+}
+/**
+* 全拷贝
+*
+*
+*/
+export function fullCopy (data) {
+  return JSON.parse(JSON.stringify(data))
 }
 /**
 * table最小宽度优化
 *
 *
 */
-export function tableWidth(_context,columns,widthNum){
+export function tableWidth (_context, columns, widthNum) {
   let num = 0;
   console.log(columns);
   for (var i = 0; i < columns.length; i++) {
-      if (typeof(columns[i].width) == "undefined") {
-          num += widthNum
-          console.log(widthNum);
-      } else {
-          num += columns[i].width
-      }
+    if (typeof (columns[i].width) == "undefined") {
+      num += widthNum
+      console.log(widthNum);
+    } else {
+      num += columns[i].width
+    }
   }
   console.log(num);
   _context.currWidth = num;
-  console.log(_context.currWidth+"==============表宽")
+  console.log(_context.currWidth + "==============表宽")
 
 }
 /**
  * 代理成员权限
  */
-export function agencyPermissionArray() {
-	//查看职位、报名、查看报名、查看老乡、修改密码、修改手机号、新增成员、修改成员信息、删除成员
-	let workTypeArray = [
-		{
-			id: 1,
-			name: "查看职位",
-			value: "job:list",
-			text: "查看职位",
-			checked: false,
-		},
-		{ id: 2, name: "报名", value: "apply:add", text: "报名", checked: false },
-		{
-			id: 3,
-			name: "查看报名",
-			value: "apply:list",
-			text: "查看报名",
-			checked: false,
-		},
-		{
-			id: 4,
-			name: "查看老乡",
-			value: "apply:user",
-			text: "查看老乡",
-			checked: false,
-		},
-		{
-			id: 5,
-			name: "修改密码",
-			value: "user:pwd",
-			text: "修改密码",
-			checked: false,
-		},
-		{
-			id: 6,
-			name: "修改手机号",
-			value: "user:tel",
-			text: "修改手机号",
-			checked: false,
-		},
-		{
-			id: 7,
-			name: "新增成员",
-			value: "user:add",
-			text: "新增成员",
-			checked: false,
-		},
-		{
-			id: 8,
-			name: "修改成员信息",
-			value: "user:update",
-			text: "修改成员信息",
-			checked: false,
-		},
-		{
-			id: 9,
-			name: "删除成员",
-			value: "user:del",
-			text: "删除成员",
-			checked: false,
-		},
-	];
-	return workTypeArray;
+export function agencyPermissionArray () {
+  //查看职位、报名、查看报名、查看老乡、修改密码、修改手机号、新增成员、修改成员信息、删除成员
+  let workTypeArray = [
+    {
+      id: 1,
+      name: "查看职位",
+      value: "job:list",
+      text: "查看职位",
+      checked: false,
+    },
+    { id: 2, name: "报名", value: "apply:add", text: "报名", checked: false },
+    {
+      id: 3,
+      name: "查看报名",
+      value: "apply:list",
+      text: "查看报名",
+      checked: false,
+    },
+    {
+      id: 4,
+      name: "查看老乡",
+      value: "apply:user",
+      text: "查看老乡",
+      checked: false,
+    },
+    {
+      id: 5,
+      name: "修改密码",
+      value: "user:pwd",
+      text: "修改密码",
+      checked: false,
+    },
+    {
+      id: 6,
+      name: "修改手机号",
+      value: "user:tel",
+      text: "修改手机号",
+      checked: false,
+    },
+    {
+      id: 7,
+      name: "新增成员",
+      value: "user:add",
+      text: "新增成员",
+      checked: false,
+    },
+    {
+      id: 8,
+      name: "修改成员信息",
+      value: "user:update",
+      text: "修改成员信息",
+      checked: false,
+    },
+    {
+      id: 9,
+      name: "删除成员",
+      value: "user:del",
+      text: "删除成员",
+      checked: false,
+    },
+  ];
+  return workTypeArray;
 }
 
 /**
  * 根据代理权限ID获取名称
  */
-export function getAgencyPermissionNameById(permissionStr) {
-	// let str = "";
-	let array = agencyPermissionArray();
-	let names = [];
-	let permissions = permissionStr.split(",");
-	array.forEach((item) => {
-		if (permissions.indexOf(item.value) >= 0) {
-			names.push(item.name);
-		}
-	});
-	return names.join("，");
+export function getAgencyPermissionNameById (permissionStr) {
+  // let str = "";
+  let array = agencyPermissionArray();
+  let names = [];
+  let permissions = permissionStr.split(",");
+  array.forEach((item) => {
+    if (permissions.indexOf(item.value) >= 0) {
+      names.push(item.name);
+    }
+  });
+  return names.join("，");
 }
 
 /**
  * 根据代理角色获取权限
  */
-export function getAgencyPermissionsByRole(role) {
-	if (role == 1) {
-		return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel,user:add,user:update,user:del";
-	} else {
-		return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel";
-	}
+export function getAgencyPermissionsByRole (role) {
+  if (role == 1) {
+    return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel,user:add,user:update,user:del";
+  } else {
+    return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel";
+  }
 }
 /**
  * 获取当前时间
  */
-export function getDateYMD() {
-	// 开始时间
-	let date = new Date();
-	let prevYear = date.getFullYear();
-	let prevMonth = date.getMonth() + 1;
-	let prevDay = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
-	return prevYear + "-" + (prevMonth >= 10 ? prevMonth : "0" + prevMonth) + "-" + prevDay;
+export function getDateYMD () {
+  // 开始时间
+  let date = new Date();
+  let prevYear = date.getFullYear();
+  let prevMonth = date.getMonth() + 1;
+  let prevDay = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+  return prevYear + "-" + (prevMonth >= 10 ? prevMonth : "0" + prevMonth) + "-" + prevDay;
 }
\ No newline at end of file
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index b79105a..d657312 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -11,7 +11,7 @@
                   <use xlink:href="#icon-bocai1" />
                 </svg>
                 <!-- <router-link :to="{name:'home'}"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/adminLogo.svg" alt=""> -->
-                <h1>商家管理后台</h1>
+                <h1>稻田商家后台</h1>
                 <!-- style="position: relative;top: -1px;" -->
               </router-link>
             </div>