Browse Source

superDeals

zhangdehua 1 year ago
parent
commit
a81f372dfb

+ 1 - 1
app/api/controller/Checkout.php

@@ -211,7 +211,7 @@ class Checkout extends Controller
         return $this->renderSuccess([], 'Successful!');
     }
     public function paidSuccess(){
-        return view('paySuccessful');
+        return view('paySuccessful',['notice'=>lang('login success')]);
     }
 
     /**

+ 4 - 0
app/api/lang/zh-cn.php

@@ -0,0 +1,4 @@
+<?php
+return [
+    'login success'=>'Login Successful'
+];

+ 1 - 1
app/api/view/index/index.html

@@ -14,7 +14,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes"/>
     <meta name="keywords" content="电子烟,关键字"/>
     <meta name="Description" content="网站描述"/>
-    <title>首页</title>
+    <title>Home</title>
     <link rel="stylesheet" href="/assets/api/css/common.css?t=108211111">
     <link rel="stylesheet" href="/assets/api/css/index.css?t=13121111">
 </head>

+ 19 - 19
app/api/view/passport/logIn.html

@@ -30,23 +30,23 @@
             <div id="loginModel">
                 <h1 class="modelTitle">Log in</h1>
                 <div class="modelContainer">
-                    <!-- 用户名或电子邮箱 -->
+                    <!-- 电子邮箱 -->
                     <div class="modelItem">
-                        <p class="miTitle">用户名或电子邮箱</p>
+                        <p class="miTitle">Email Address</p>
                         <input class="input" type="text" name="" id="userName">
                     </div>
                     <!-- 密码 -->
                     <div class="modelItem">
-                        <p class="miTitle">密码</p>
+                        <p class="miTitle">Password</p>
                         <input class="input" type="password" name="" id="password">
                     </div>
-                    <p class="forgotPassword">忘记密码?</p>
+                    <p class="forgotPassword">Forget Your Password?</p>
                     <!-- 登录 -->
-                    <div class="pageButton" id="loginButton">登录</div>
+                    <div class="pageButton" id="loginButton">Login</div>
                     <!-- 没有账户 -->
                     <div class="accountTips">
-                        <p>没有账户?</p>
-                        <span id="toRegister">注册</span>
+                        <p>No account?</p>
+                        <span id="toRegister">Regist</span>
                     </div>
                 </div>
             </div>
@@ -59,41 +59,41 @@
                     <div class="modelContainer">
                         <!-- 电子邮箱地址 -->
                         <div class="modelItem">
-                            <p class="miTitle">电子邮箱地址</p>
+                            <p class="miTitle">Email Address</p>
                             <input class="input" type="text" name="" id="email">
                         </div>
-                        <div class="pageButton" id="continueButton">继续</div>
+                        <div class="pageButton" id="continueButton">Continue</div>
                         <div class="accountTips">
-                            <p>已经拥有账号?</p>
-                            <span id="toLogin">登录</span>
+                            <p>Have an Account?</p>
+                            <span id="toLogin">Login</span>
                         </div>
                     </div>
                 </div>
                 <!-- 电子邮箱验证模块 -->
                 <div id="emailVerifyModel">
-                    <h1 class="modelTitle">验证电子邮箱</h1>
-                    <p class="modelTips">您的验证码已发送至<span id="emailAddress"></span></p>
+                    <h1 class="modelTitle">Verify Email Address</h1>
+                    <p class="modelTips">Captcha has been sent<span id="emailAddress"></span></p>
                     <div class="modelContainer">
                         <!-- 电子邮箱验证码 -->
                         <div class="modelItem">
-                            <p class="miTitle">验证码</p>
+                            <p class="miTitle">Captcha</p>
                             <input class="input" type="text" name="" id="vcode">
                         </div>
                         <!-- 验证 -->
-                        <div class="pageButton" id="verifyButton">验证</div>
+                        <div class="pageButton" id="verifyButton">Verify</div>
                     </div>
                 </div>
                 <!-- 设置密码 -->
                 <div id="setPasswordModel">
-                    <h1 class="modelTitle">设置密码</h1>
+                    <h1 class="modelTitle">Password</h1>
                     <div class="modelContainer">
                         <!-- 设置密码 -->
                         <div class="modelItem">
-                            <p class="miTitle">设置密码</p>
+                            <p class="miTitle">Password</p>
                             <input class="input" type="password" name="" id="regPassword">
                         </div>
                         <!-- 注册 -->
-                        <div class="pageButton" id="registerButton">注册</div>
+                        <div class="pageButton" id="registerButton">Regist</div>
                     </div>
                 </div>
             </div>
@@ -199,7 +199,7 @@
                     //return false;
                     //注册成功后进入
                     if (obj.status === 200 || obj.status === '200') {
-                        console.log("登录成功",obj.data.token)
+                        console.log("success",obj.data.token)
                         localStorage.setItem(VAPES_TOKEN, obj.data.token)
                         jumpPage()
                     }

+ 1 - 1
config/lang.php

@@ -7,7 +7,7 @@ return [
     // 默认语言
     'default_lang'    => env('lang.default_lang', 'zh-cn'),
     // 允许的语言列表
-    'allow_lang_list' => [],
+    'allow_lang_list' => ['zh-cn', 'en-us'],
     // 多语言自动侦测变量名
     'detect_var'      => 'lang',
     // 是否使用Cookie记录