Merge remote-tracking branch 'remotes/origin/feature/【机构人力排名】' into dev

src/assets/js/utils/getApp.js

@@ -15,5 +15,21 @@ export default {
         ]
       })
     }
+  },
+  closeBtn(that) {
+    that.$jump({
+      flag: 'webview_right_button',
+      extra: {
+        btns: [
+          {
+            img: that.$assetsUrl + 'images/del-close.png',
+            route: {
+              flag: '',
+              extra: {}
+            }
+          }
+        ]
+      }
+    })
   }
 }

src/views/ebiz/institutionalPerform/InstitutionalManpower/index.vue

@@ -56,7 +56,7 @@
 import Selectors from '@/views/ebiz/institutionalPerform/InstitutionalManpower/components/Selectors'
 import util from '@/views/ebiz/institutionalPerform/InstitutionalManpower/components/js/util'
 import { branchOfficeApi } from '@/api/ebiz/branchOffice/branchOffice'
-import refresh from '@/assets/js/utils/refresh'
+import getApp from '@/assets/js/utils/getApp'
 import { Tabs, Tab } from 'vant'
 export default {
   name: 'InstitutionalManpower',
@@ -209,19 +209,22 @@ export default {
         })
         .catch(err => {})
     },
-     refreshCallBack(data) {
-    console.log(data, 'data')
-    if (data.trigger == 'right_button_click') {
-      location.reload()
-    }
+        //页面返回服务页
+    appCallBack(data) {
+      if (data.trigger == 'right_button_click') {
+        this.$jump({
+          flag: 'service'
+        })
+      }
+ 
   }
   },
   created() {
-     refresh.refreshImg()
-    if (process.env.NODE_ENV != 'development') {
-
-      refresh.refreshImg()
-      window.appCallBack=this.refreshCallBack
+    var that=this
+   
+   
+      getApp.closeBtn(that)
+      window.appCallBack=this.appCallBack
       // setTimeout(() => {
       //   // eslint-disable-next-line no-undef
       //   EWebBridge.webCallAppInJs('webview_right_button', {
@@ -238,7 +241,7 @@ export default {
       //     ]
       //   })
       // }, 1000)
-    }
+    
   },
   mounted() {
     //  this.timeVal=this.$route.query.timeVal||""
@@ -299,7 +302,7 @@ export default {
    
   }
     table td {
-     text-align: center;
+     text-align: right;
     padding:8px;