diff --git a/app-wx/config/params.php b/app-wx/config/params.php
index 1533d4e..927b7ff 100644
--- a/app-wx/config/params.php
+++ b/app-wx/config/params.php
@@ -1,5 +1,5 @@
'admin@example.com',
- 'VERSION' => 'v0.1.0 build 2', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
+ 'VERSION' => 'v0.1.0 build 3', // 当前发布版本号: v0.1.0 是版本号 | build 1 是编译次数
];
diff --git a/app-wx/modules/user/controllers/DefaultController.php b/app-wx/modules/user/controllers/DefaultController.php
index 857da1d..63460e9 100644
--- a/app-wx/modules/user/controllers/DefaultController.php
+++ b/app-wx/modules/user/controllers/DefaultController.php
@@ -3,6 +3,7 @@
namespace app\wx\modules\user\controllers;
use common\helpers\ImageManager;
+use common\helpers\ImageUtils;
use common\models\EngineerProfile;
use domain\toutiao\TtDefaultImageRepository;
use domain\toutiao\TtNewsImageRepository;
@@ -24,6 +25,4 @@ class DefaultController extends BaseController
{
return $this->render('index');
}
-
-
}
\ No newline at end of file
diff --git a/app-wx/modules/user/controllers/LoginController.php b/app-wx/modules/user/controllers/LoginController.php
new file mode 100644
index 0000000..768dc07
--- /dev/null
+++ b/app-wx/modules/user/controllers/LoginController.php
@@ -0,0 +1,176 @@
+success = false;
+ $e->message = 'ok';
+ $userId = 0;
+
+ if (empty($_FILES["file"])) {
+ $e->message = '文件为空';
+ return $this->renderJson($e);
+ }
+ if (empty($_FILES["file"]['tmp_name'])) {
+ $e->message = '文件为空';
+ return $this->renderJson($e);
+ }
+ $type = $_FILES["file"]["type"];
+ $typeArr = explode('/', $type);
+ if ('image' !== $typeArr[0]) {
+ $e->message = '只能上传 png， jpg 等文件';
+ return $this->renderJson($e);
+ }
+
+ $dir = Yii::getAlias('@site') . "/tmp";
+ $fileArr = explode('.', $_FILES["file"]['name']);
+ $tt = time();
+ $filename = 'auto_'.$tt.md5($_FILES["file"]['name']).'.'.end($fileArr);
+ $minFileName = 'auto_'.$tt.md5($_FILES["file"]['name']).'_min'.'.'.end($fileArr);
+ $saveFilePath = $dir.'/'.$filename;
+ move_uploaded_file($_FILES["file"]['tmp_name'], $saveFilePath);
+ $tmpUrl = $tmpMinFile= $this->site->base_url.'/tmp/'.$filename;
+ $imgSource = $this->_imageCreateFromPath($saveFilePath);
+ if ($imgSource) {
+ ImageUtils::resizeImage($imgSource, 100, 100, $dir.'/'.$minFileName);
+ $tmpMinFile = $this->site->base_url.'/tmp/'.$minFileName;
+ }
+
+ $e->success = true;
+ $e->tmpFile = $filename;
+ $e->tmpMinUrl = $tmpMinFile;
+ $e->tmpUrl = $tmpUrl;
+ $e->message = 'ok';
+
+ return $this->renderJson($e);
+ }
+
+ /**
+ * @param $imgPath
+ * @return null|resource
+ */
+ private function _imageCreateFromPath($imgPath)
+ {
+ list($width, $height, $type, $attr) = getimagesize($imgPath);
+ switch ($type) {
+ case 3: // png
+ return imagecreatefrompng($imgPath);
+ case 2: // jpeg
+ return imagecreatefromjpeg($imgPath);
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * @return string
+ */
+ public function actionGetCode()
+ {
+ $e = new stdClass();
+ $e->success = false;
+ $e->message = 'ok';
+ $e->codeDuration = 70;
+ $action = $this->request->get('action');
+ if ('login' == $action) {
+
+ } else {
+
+ }
+
+ $e->success = true;
+ return $this->renderJson($e);
+ }
+
+ /**
+ * 注册界面
+ * @return string
+ */
+ public function actionRegister()
+ {
+ $e = new stdClass();
+ $e->success = false;
+ $e->message = 'ok';
+ $name = $this->request->post('name');
+ $mobile = $this->request->post('mobile');
+ $code = $this->request->post('code');
+ $img = $this->request->post('img');
+ if (empty($name)) {
+ $e->message = '车厂名称必填';
+ return $this->renderJson($e);
+ }
+
+ if (!Utils::isPhone($mobile)) {
+ $e->message = '手机号码格式不对';
+ return $this->renderJson($e);
+ }
+
+ if (empty($code)) {
+ $e->message = '验证码必填';
+ return $this->renderJson($e);
+ }
+ if (empty($img)) {
+ $e->message = '请上传营业执照';
+ return $this->renderJson($e);
+ }
+ // 校验验证码
+ // 检查车厂名称是否注册了
+ // 检查手机号码是否注册了
+ echo $name.'_'.$mobile.'_'.$code.'_'.$img;
+ $e->success = true;
+
+ return $this->renderJson($e);
+ }
+
+ public function actionLogin2()
+ {
+ $e = new stdClass();
+ $e->success = false;
+ $e->message = 'ok';
+
+ $mobile = $this->request->post('mobile');
+ $code = $this->request->post('code');
+
+
+ if (!Utils::isPhone($mobile)) {
+ $e->message = '手机号码格式不对';
+ return $this->renderJson($e);
+ }
+
+ if (empty($code)) {
+ $e->message = '验证码必填';
+ return $this->renderJson($e);
+ }
+
+ // 校验验证码
+ // 检查车厂名称是否注册了
+ // 检查手机号码是否注册了
+ echo $mobile.'_'.$code;
+ $e->success = true;
+
+ return $this->renderJson($e);
+ }
+}
\ No newline at end of file
diff --git a/app-wx/modules/user/views/default/index.php b/app-wx/modules/user/views/default/index.php
index d01f7d5..75b9c89 100644
--- a/app-wx/modules/user/views/default/index.php
+++ b/app-wx/modules/user/views/default/index.php
@@ -22,6 +22,7 @@ function img($file, $path = '/i/')
render('pages/index-template', ['asset' => $asset])?>
render('pages/register-template', ['asset' => $asset])?>
+render('pages/login-template', ['asset' => $asset])?>
diff --git a/app-wx/modules/user/views/default/pages/register-template.php b/app-wx/modules/user/views/default/pages/register-template.php
index bb67cb6..8e26eea 100644
--- a/app-wx/modules/user/views/default/pages/register-template.php
+++ b/app-wx/modules/user/views/default/pages/register-template.php
@@ -8,37 +8,70 @@ $baseUrl = Url::base(true);
body,div,p,span,input{padding: 0;margin: 0}
input{-webkit-appearance: none;}
#register{}
- #register .input-list{padding:1rem;box-sizing: border-box}
- #register .input-row-cls{width:100%;margin-top:0.7rem;}
- #register .input-list .input-div{line-height: 1.25rem;font-size: 1rem;}
- #register .input-list .input-cls{width:100%;line-height: inherit;font-size: inherit;border:1px solid #ccc;padding:0.3rem;box-sizing: border-box}
+ #register .head-wrapper{display:block;padding: 2.5rem 2rem;box-sizing: border-box;padding-bottom: 1.25rem; }
+ #register .input-list{padding:1rem 2rem;box-sizing: border-box}
+ #register .input-row-cls{width:100%;margin:0.65rem 0; }
+ #register .input-row-cls:after{content:''; width:100%;height:1px;background:#DDDDDD;display: block; }
+ #register .input-list .input-div{line-height: 1.25rem;font-size: 1rem;padding-bottom:0.65rem;}
+ #register .input-list .input-cls{width:100%;line-height: inherit;font-size: inherit;border:0;padding:0.3rem;box-sizing: border-box}
#register .input-list .validation-code{display:flex;align-items: center}
- #register .input-list .get-code-cls{width: 7rem;font-size: 0.8rem;display: flex;align-items: center;justify-content:center;background:#f25601;color:#fff;padding:0.302rem 0.3rem;box-sizing: border-box;border: 1px solid #f25601;
- border-left:0;}
+ #register .input-list .get-code-cls{width: 10rem;font-size: 1rem;display: flex;align-items: center;justify-content:center;color:#FF8728;padding:0.302rem 0.3rem;box-sizing: border-box;border-left:0;}
+ #register .upload-box{padding:0 2rem 1rem 2rem;box-sizing: border-box}
+ #register .upload-box .upload-title{line-height: 1.5rem;color:#BCBCBC;margin-bottom: 1rem;}
+ #register .upload-box .upload-item{width:100%;height:0;padding-bottom: 100%;overflow:hidden;
+ background-position: center center;
+ background-repeat: no-repeat;
+ -webkit-background-size:cover;
+ -moz-background-size:cover;background-size:cover;position: relative}
+ #register .upload-box .upload-item{background-image:url('/i/upload-convert.png');background-size: 4.7rem auto;background-repeat: no-repeat;background-position: 1px 1px;}
+ #register .upload-box .upload-input-cls{width: 100%;display: block;background: rgba(0,0,0,0);opacity: 0;height: 0;padding-bottom: 100%;}
+ #register .register-btn-cls{width:80%;border-radius: 2rem; padding:0.8rem 1rem;text-align:center;box-sizing: border-box;color:#fff;background:#FF8728;margin: 0 auto;font-size:1.13rem}
+ #register .count-down-cls{font-size:0.7rem;color:#999}
+ #register .login-btn-cls{color:#4C4C4C;font-size:1rem;margin-top: 1rem; text-align: center}
+ #register input::-webkit-input-placeholder{
+ color:#BCBCBC
+ }
+ #register input::input-placeholder{
+ color:#BCBCBC
+ }