From 2d5d7824dc1ebc95ff9249a3be96816b443b58e9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 9 Oct 2020 16:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/api/user.js                        |  2 +-
 client/src/layout/components/Sidebar/Logo.vue |  2 +-
 client/src/store/modules/user.js              |  2 +-
 client/src/utils/get-page-title.js            |  2 +-
 client/src/utils/request.js                   |  4 ++--
 client/src/views/login/index.vue              | 10 +++++-----
 client/src/views/system/changepassword.vue    |  2 +-
 server/apps/system/views.py                   |  4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/src/api/user.js b/client/src/api/user.js
index 397ef0c..f444181 100644
--- a/client/src/api/user.js
+++ b/client/src/api/user.js
@@ -9,7 +9,7 @@ export function login(data) {
 }
 
 export function login2(data) {
-  //验证码登陆
+  //验证码登录
   return request({
     url: '/token2/',
     method: 'post',
diff --git a/client/src/layout/components/Sidebar/Logo.vue b/client/src/layout/components/Sidebar/Logo.vue
index ddac692..501150e 100644
--- a/client/src/layout/components/Sidebar/Logo.vue
+++ b/client/src/layout/components/Sidebar/Logo.vue
@@ -23,7 +23,7 @@ export default {
   },
   data() {
     return {
-      title: '国检集团检测能力查询平台',
+      title: '国检集团检测能力共享平台',
       // logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
       logo:'http://testsearch.ctc.ac.cn:8000/media/default/avatar.png'
     }
diff --git a/client/src/store/modules/user.js b/client/src/store/modules/user.js
index 70d9281..4c22753 100644
--- a/client/src/store/modules/user.js
+++ b/client/src/store/modules/user.js
@@ -69,7 +69,7 @@ const actions = {
         const { data } = response
 
         if (!data) {
-          reject('验证失败,重新登陆.')
+          reject('验证失败,重新登录.')
         }
 
         const { perms, name, avatar } = data
diff --git a/client/src/utils/get-page-title.js b/client/src/utils/get-page-title.js
index 596e579..02d04bb 100644
--- a/client/src/utils/get-page-title.js
+++ b/client/src/utils/get-page-title.js
@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '能力检索'
+const title = defaultSettings.title || '能力共享'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {
diff --git a/client/src/utils/request.js b/client/src/utils/request.js
index 7c2c571..d4641f5 100644
--- a/client/src/utils/request.js
+++ b/client/src/utils/request.js
@@ -52,8 +52,8 @@ service.interceptors.response.use(
           duration: 3 * 1000
         })
       }else{
-        MessageBox.confirm('认证失败,请重新登陆.', '确认退出', {
-          confirmButtonText: '重新登陆',
+        MessageBox.confirm('认证失败,请重新登录.', '确认退出', {
+          confirmButtonText: '重新登录',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue
index d14c0cf..758daec 100644
--- a/client/src/views/login/index.vue
+++ b/client/src/views/login/index.vue
@@ -2,10 +2,10 @@
   <div class="login-container">
     <div class="login-form">
       <div class="title-container">
-        <h3 class="title">国检集团检测能力查询平台</h3>
+        <h3 class="title">国检集团检测能力共享平台</h3>
       </div>
       <el-tabs v-model="activeName" :stretch="true">
-        <el-tab-pane label="验证码登陆" name="msg">
+        <el-tab-pane label="验证码登录" name="msg">
           <el-form
             ref="loginForm2"
             :model="loginForm2"
@@ -54,12 +54,12 @@
               type="primary"
               style="width:100%;margin-bottom:30px;"
               @click.native.prevent="handleLogin2"
-            >验证登陆</el-button>
+            >验证登录</el-button>
           </el-form>
 
 
         </el-tab-pane>
-        <el-tab-pane label="密码登陆" name="pwd">
+        <el-tab-pane label="密码登录" name="pwd">
           <el-form
             ref="loginForm"
             :model="loginForm"
@@ -106,7 +106,7 @@
               type="primary"
               style="width:100%;margin-bottom:30px;"
               @click.native.prevent="handleLogin"
-            >登陆</el-button>
+            >登录</el-button>
           </el-form>
         </el-tab-pane>
       </el-tabs>
diff --git a/client/src/views/system/changepassword.vue b/client/src/views/system/changepassword.vue
index 165c218..8965ce0 100644
--- a/client/src/views/system/changepassword.vue
+++ b/client/src/views/system/changepassword.vue
@@ -62,7 +62,7 @@ export default {
         // TODO 提交表单
         changePassword(this.formData).then(async(res)=>{
             this.$message({
-          message: '密码修改成功,请重新登陆',
+          message: '密码修改成功,请重新登录',
           type: 'success'
         })
         await this.$store.dispatch('user/logout')
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index 406121c..9214f37 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -88,9 +88,9 @@ class sendMsg(APIView):
             return Response('该账户不存在', status=status.HTTP_400_BAD_REQUEST)
         try:
             # 邮件内容
-            msg=MIMEText('您好,能力查询本次登陆验证码为' + str(code),'plain','utf-8')
+            msg=MIMEText('您好,共享平台本次登陆验证码为' + str(code),'plain','utf-8')
             # 括号里的对应发件人邮箱昵称、发件人邮箱账号
-            msg['From']=formataddr(["国检集团检测能力查询平台",my_sender])  
+            msg['From']=formataddr(["国检集团检测能力共享平台",my_sender])  
             # 括号里的对应收件人邮箱昵称、收件人邮箱账号
             msg['To']=formataddr(["",my_user])   
             # 邮件的主题