Merge remote-tracking branch 'origin/master'

src/modules/customer/components/CustomerFormDialog.vue

@@ -40,8 +40,8 @@
         <el-input v-model="form.remark" type="textarea" size="small" rows="4" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item>
-        <el-button size="mini" @click="handleClose">取消</el-button>
         <el-button type="primary" @click="handleSubmit" size="mini">提交</el-button>
+        <el-button size="mini" @click="handleClose">取消</el-button>
       </el-form-item>
     </el-form>
   </el-dialog>

src/modules/customer/views/Details.vue

 <template>
   <app-card>
+    <h4 class="title">{{title || ''}}</h4>
     <el-tabs v-model="tabActive">
       <el-tab-pane label="基本信息" name="baseInfo">
         <base-info :id="id" />
@@ -37,9 +38,18 @@ export default {
   computed: {
     id() {
       return this.$route.query.id
+    },
+    title() {
+      return this.$route.query.name
     }
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.title{
+  font-size:20px;
+  line-height:36px;
+  padding-bottom:10px;
+}
+</style>

src/modules/customer/views/Index.vue

@@ -273,7 +273,8 @@ export default {
       this.$router.push({
         path: '/customer-manage/details',
         query: {
-          id: row.id
+          id: row.id,
+          name: row.name
         }
       })
     },

src/modules/exception/index.js

+const routes = [
+  {
+    path: '/401',
+    component: () => import('./views/401.vue')
+  },
+  {
+    name: 'browser',
+    path: '/browser',
+    component: () => import('./views/browser.vue')
+  }
+]
+
+export { routes }

src/modules/exception/views/browser.vue

+<template>
+  <div class="container">
+    <div class="box">
+      <h1 class="tips">你的浏览器版本较低，请升级你的浏览器。</h1>
+      <div class="list">
+        <ul>
+          <li v-for="item in browserList" :key="item.name">
+            <a :href="item.href" target="_blank">
+              <img :src="item.logoUrl" />
+              <p class="t1">{{ item.name }}</p>
+              <p class="t2">{{ item.company }}</p>
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <p class="ua">{{ UA }}</p>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    const UA = window.navigator.userAgent
+    const isIe = window.ActiveXObject || 'ActiveXObject' in window
+    return {
+      UA,
+      isIe,
+      browserList: [
+        {
+          name: 'Chrome',
+          company: 'Google',
+          href: 'https://www.google.cn/chrome',
+          logoUrl: 'https://webapp-pub.ezijing.com/website/base/images/chrome.png'
+        },
+        {
+          name: 'Edge',
+          company: 'Microsoft',
+          href: 'https://www.microsoft.com/edge',
+          logoUrl: 'https://webapp-pub.ezijing.com/website/base/images/edge.png'
+        },
+        {
+          name: 'Firefox',
+          company: 'Mozilla Foundation',
+          href: 'https://download.mozilla.org',
+          logoUrl: 'https://webapp-pub.ezijing.com/website/base/images/firefox.png'
+        }
+      ]
+    }
+  },
+  beforeMount() {
+    !this.isIe && this.$router.replace('/')
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.box {
+  width: 700px;
+  background-color: #f4f5f7;
+  border-radius: 10px;
+}
+.tips {
+  margin: 30px;
+  font-size: 24px;
+  color: #172b4d;
+  text-align: center;
+}
+ul {
+  margin: 0;
+  padding: 0;
+  display: flex;
+  list-style: none;
+  li {
+    flex: 1;
+    padding: 40px;
+    text-align: center;
+  }
+  img {
+    width: 100px;
+  }
+  p {
+    margin: 0;
+    text-align: center;
+  }
+  .t1 {
+    color: #e25600;
+  }
+  .t2 {
+    color: #aaa;
+    text-decoration: none;
+  }
+  a {
+    text-decoration: none;
+  }
+}
+.ua {
+  font-size: 12px;
+  margin: 20px;
+}
+</style>