修改文案登陆为登录

addons/shopro/controller/third/Apple.php

@@ -21,9 +21,9 @@ class Apple extends Common
         $result = $apple->login($payload);
 
         if ($result) {
-            $this->success('登陆成功');
+            $this->success('登录成功');
         }
 
-        $this->error('登陆失败');
+        $this->error('登录失败');
     }
 }

addons/shopro/controller/third/Wechat.php

@@ -44,9 +44,9 @@ class Wechat extends Common
         });
 
         if ($result) {
-            $this->success('登陆成功');
+            $this->success('登录成功');
         }
-        $this->error('登陆失败');
+        $this->error('登录失败');
     }
 
     // 获取小程序sessionId+自动登录

addons/shopro/service/third/wechat/MiniProgram.php

@@ -26,13 +26,13 @@ class MiniProgram
     {
         // https://developers.weixin.qq.com/community/develop/doc/00022c683e8a80b29bed2142b56c01
         if (empty($this->payload['sessionId'])) {
-            error_stop('未获取到登陆态, 请重试', -1);
+            error_stop('未获取到登录态, 请重试', -1);
         }
 
         $sessionData = redis_cache($this->payload['sessionId']);
 
         if (empty($sessionData)) {
-            error_stop('登陆态已过期, 请重试', -1);
+            error_stop('登录态已过期, 请重试', -1);
         }
 
         $wechatUser = [
@@ -48,13 +48,13 @@ class MiniProgram
     public function bind()
     {
         if (empty($this->payload['sessionId'])) {
-            error_stop('未获取到登陆态, 请重试', -1);
+            error_stop('未获取到登录态, 请重试', -1);
         }
 
         $sessionData = redis_cache($this->payload['sessionId']);
 
         if (empty($sessionData)) {
-            error_stop('登陆态已过期, 请重试', -1);
+            error_stop('登录态已过期, 请重试', -1);
         }
 
         $wechatUser = [
@@ -70,13 +70,13 @@ class MiniProgram
     public function getUserPhoneNumber()
     {
         if (empty($this->payload['sessionId'])) {
-            error_stop('未获取到登陆态, 请重试', -1);
+            error_stop('未获取到登录态, 请重试', -1);
         }
 
         $sessionData = redis_cache($this->payload['sessionId']);
 
         if (empty($sessionData)) {
-            error_stop('登陆态已过期, 请重试', -1);
+            error_stop('登录态已过期, 请重试', -1);
         }
 
         $phoneInfo = $this->wechat->encryptor->decryptData($sessionData['session_key'], $this->payload['iv'], $this->payload['encryptedData']);
@@ -109,7 +109,7 @@ class MiniProgram
         }
 
         if (empty($decryptData['session_key'])) {
-            error_stop('未获取到登陆态, 请重试', -1);
+            error_stop('未获取到登录态, 请重试', -1);
         }
 
         // 自动登录流程

addons/shopro/service/third/wechat/OpenPlatform.php

@@ -23,7 +23,7 @@ class OpenPlatform
     {
         $payload = $this->payload;
         if (empty($payload['code'])) {
-            error_stop('登陆失败');
+            error_stop('登录失败');
         }
         $config = sheep_config('shop.platform.App');
 

addons/shopro/uniapp/sheep/api/third.js

@@ -13,7 +13,7 @@ export default {
         data,
         custom: {
           showSuccess: true,
-          loadingMsg: '登陆中',
+          loadingMsg: '登录中',
         },
       }),
 
@@ -50,7 +50,7 @@ export default {
         data,
         custom: {
           showSuccess: true,
-          loadingMsg: '登陆中',
+          loadingMsg: '登录中',
         },
       }),
 
@@ -122,7 +122,7 @@ export default {
         data,
         custom: {
           showSuccess: true,
-          loadingMsg: '登陆中',
+          loadingMsg: '登录中',
         },
       }),
   },

addons/shopro/uniapp/sheep/request/index.js

@@ -135,7 +135,7 @@ http.interceptors.response.use(
           break;
         case 401:
           if (isLogin) {
-            errorMessage = '您的登陆已过期';
+            errorMessage = '您的登录已过期';
           } else {
             errorMessage = '请先登录';
           }

application/admin/view/shopro/user/user/detail.html

@@ -230,7 +230,7 @@
                                             </div>
                                         </el-col>
                                         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-                                            <div class="left">上次登陆时间</div>
+                                            <div class="left">上次登录时间</div>
                                             <div class="right">{{ state.detail.logintime }}</div>
                                         </el-col>
                                         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">