Merge branch '1.1' into 1.2

64b39b4b · 毛细亚 · 2033631a · a404e0cb · 64b39b4b · 64b39b4b
--- a/company_app/index.html
+++ b/company_app/index.html
-<!DOCTYPE html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.b6398f5b.js"></script><script defer="defer" src="static/js/app.915b7f0b.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.df602958.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="favicon.ico">
-    <!-- HTTP 1.1 -->
-    <meta http-equiv="pragma" content="no-cache">
-    <!-- HTTP 1.0 -->
-    <meta http-equiv="cache-control" content="no-cache">
-    <!-- Prevent caching at the proxy server -->
-    <meta http-equiv="expires" content="0">
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
-    <title>company_app</title>
-    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
-    <script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
-  <script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
-  <body>
-    <noscript>
-      <strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-  </body>
-</html>
--- a/src/views/components/roleInfo/roleInfo.vue
+++ b/src/views/components/roleInfo/roleInfo.vue
--- a/src/views/roleInfo.vue
+++ b/src/views/roleInfo.vue
@@ -2,7 +2,7 @@
  <div class="roleTab">
    <el-tabs v-model="roleActive">
      <el-tab-pane label="角色信息" name="roleInfo">
-        <roleInfo v-if="roleActive === 'roleInfo'" :chatUserDetails="chatUserInfo" />
+        <roleInfoPanel v-if="roleActive === 'roleInfo'" :chatUserDetails="chatUserInfo" />
      </el-tab-pane>
      <el-tab-pane label="举报信息" name="report">
        <report v-if="roleActive === 'report'" />
@@ -15,14 +15,14 @@
 </template>
 <script>
-import roleInfo from './components/roleInfo/roleInfo.vue'
+import roleInfoPanel from './components/roleInfo/roleInfoPanel.vue'
 import report from './components/roleInfo/report.vue'
 import approval from './components/roleInfo/approval.vue'
 import { mapState } from 'vuex'
 export default {
  name: 'roleInfo',
  components: {
-    roleInfo,
+    roleInfoPanel,
    approval,
    report
  },