Merge branch 'master' of https://gitlab.ezijing.com/webapp/customer-admin

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>

src/modules/system/customergroup/components/AddCustomer.vue

@@ -73,17 +73,14 @@ export default {
       const param = this.multipleSelection
       const arr = param.map(item => item.id)
       const params = { group_id: this.id, customer_ids: arr }
-      createCustomer(params)
-        .then(res => {
-          if (res.code === 0) {
-            this.$message.success('添加客户成功')
-            this.$emit('update:visible', false)
-            this.$emit('success')
-          }
-        })
-        .catch(error => {
-          this.$message.error(error.message)
-        })
+      createCustomer(params).then(res => {
+        if (res.code === 0) {
+          this.$message.success('添加客户成功')
+          this.$emit('update:visible', false)
+          this.$emit('success')
+          this.$refs.list.refetch()
+        }
+      })
     }
   }
 }

src/modules/system/customergroup/components/AddCustomerGroup.vue

@@ -60,15 +60,11 @@ export default {
     // 编辑/更新客户组
     edit() {
       const params = Object.assign({ id: this.data.id }, this.form)
-      editCustomerGroup(params)
-        .then(res => {
-          this.$message.success('客户组更新成功')
-          this.$emit('update:visible', false)
-          this.$emit('success', res.data)
-        })
-        .catch(error => {
-          this.$message.error(error.message)
-        })
+      editCustomerGroup(params).then(res => {
+        this.$message.success('客户组更新成功')
+        this.$emit('update:visible', false)
+        this.$emit('success', res.data)
+      })
     },
     // 新建客户组
     create() {

src/modules/system/customergroup/components/AddEmployees.vue

@@ -53,7 +53,7 @@ export default {
         id: ''
       },
       rules: {
-        id: [{ required: true, trigger: 'blur' }]
+        id: [{ required: true, message: '请输入员工姓名/手机号码', trigger: 'blur' }]
       },
       employeeList: []
     }
@@ -108,17 +108,13 @@ export default {
     submit() {
       this.$refs.form.validate().then(() => {
         const params = Object.assign({ group_id: this.id, staff_ids: this.form.id })
-        createEmployee(params)
-          .then(res => {
-            if (res.code === 0) {
-              this.$message.success('添加员工成功')
-              this.$emit('update:visible', false)
-              this.$emit('success')
-            }
-          })
-          .catch(error => {
-            this.$message.error(error.message)
-          })
+        createEmployee(params).then(res => {
+          if (res.code === 0) {
+            this.$message.success('添加员工成功')
+            this.$emit('update:visible', false)
+            this.$emit('success')
+          }
+        })
       })
     }
   }

src/modules/system/customergroup/components/Customer.vue

@@ -80,16 +80,12 @@ export default {
     handleRemove(row) {
       const arr = []
       arr.push(row.id)
-      delCustomer({ ids: arr })
-        .then(res => {
-          if (res.code === 0) {
-            this.$message({ type: 'success', message: '删除成功' })
-            this.$refs.list.refetch()
-          }
-        })
-        .catch(error => {
-          this.$message.error(error.message)
-        })
+      delCustomer({ ids: arr }).then(res => {
+        if (res.code === 0) {
+          this.$message({ type: 'success', message: '删除成功' })
+          this.$refs.list.refetch()
+        }
+      })
     }
   }
 }

src/modules/system/customergroup/components/Employees.vue

@@ -72,16 +72,12 @@ export default {
     handleRemove(row) {
       const arr = []
       arr.push(row.id)
-      delEmployee({ ids: arr })
-        .then(res => {
-          if (res.code === 0) {
-            this.$message({ type: 'success', message: '删除成功' })
-            this.success()
-          }
-        })
-        .catch(error => {
-          this.$message.error(error.message)
-        })
+      delEmployee({ ids: arr }).then(res => {
+        if (res.code === 0) {
+          this.$message({ type: 'success', message: '删除成功' })
+          this.success()
+        }
+      })
     }
   }
 }

src/modules/system/customergroup/views/List.vue

@@ -112,16 +112,12 @@ export default {
     },
     // 删除
     handleRemove(row) {
-      deleteGroup({ id: row.id })
-        .then(res => {
-          if (res.code === 0) {
-            this.$message({ type: 'success', message: '删除成功' })
-            this.$refs.list.refetch()
-          }
-        })
-        .catch(error => {
-          this.$message.error(error.message)
-        })
+      deleteGroup({ id: row.id }).then(res => {
+        if (res.code === 0) {
+          this.$message({ type: 'success', message: '删除成功' })
+          this.$refs.list.refetch()
+        }
+      })
     }
   }
 }