-
-
+
+
\ No newline at end of file
diff --git a/service/Application/Home/View/Default/User/Index.html b/service/Application/Home/View/Default/User/Index.html
index 7eae0111a..345451fd1 100755
--- a/service/Application/Home/View/Default/User/Index.html
+++ b/service/Application/Home/View/Default/User/Index.html
@@ -30,11 +30,11 @@
-
头像上传
+{{:L('common_avatar_upload_title')}}
×
-
- 
{{$user.avatar}}
diff --git a/service/Application/Service/UserService.class.php b/service/Application/Service/UserService.class.php
index ba3dae948..e6b5194d1 100755
--- a/service/Application/Service/UserService.class.php
+++ b/service/Application/Service/UserService.class.php
@@ -83,7 +83,7 @@ class UserService
$ret = params_checked($params, $p);
if($ret !== true)
{
- return DataReturn($ret);
+ return DataReturn($ret, -1);
}
// 获取用户地址
@@ -184,7 +184,7 @@ class UserService
$ret = params_checked($params, $p);
if($ret !== true)
{
- return DataReturn($ret);
+ return DataReturn($ret, -1);
}
$m = M('UserAddress');
@@ -269,7 +269,7 @@ class UserService
$ret = params_checked($params, $p);
if($ret !== true)
{
- return DataReturn($ret);
+ return DataReturn($ret, -1);
}
// 软删除数据
@@ -310,7 +310,7 @@ class UserService
$ret = params_checked($params, $p);
if($ret !== true)
{
- return DataReturn($ret);
+ return DataReturn($ret, -1);
}
// 模型
@@ -334,5 +334,153 @@ class UserService
}
}
+ /**
+ * [UserLoginRecord 用户登录记录]
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 0.0.1
+ * @datetime 2017-03-09T11:37:43+0800
+ * @param [int] $user_id [用户id]
+ * @return [boolean] [记录成功true, 失败false]
+ */
+ public static function UserLoginRecord($user_id = 0)
+ {
+ if(!empty($user_id))
+ {
+ $user = M('User')->field('*')->find($user_id);
+ if(!empty($user))
+ {
+ // 基础数据处理
+ $user['add_time_text'] = date('Y-m-d H:i:s', $user['add_time']);
+ $user['upd_time_text'] = date('Y-m-d H:i:s', $user['upd_time']);
+ $user['gender_text'] = L('common_gender_list')[$user['gender']]['name'];
+ $user['birthday_text'] = empty($user['birthday']) ? '' : date('Y-m-d', $user['birthday']);
+ $user['mobile_security']= empty($user['mobile']) ? '' : substr($user['mobile'], 0, 3).'***'.substr($user['mobile'], -3);
+ $user['email_security'] = empty($user['email']) ? '' : substr($user['email'], 0, 3).'***'.substr($user['email'], -3);
+
+ // 显示名称,根据规则优先展示
+ $user['user_name_view'] = $user['username'];
+ if(empty($user['user_name_view']))
+ {
+ $user['user_name_view'] = $user['nickname'];
+ }
+ if(empty($user['user_name_view']))
+ {
+ $user['user_name_view'] = $user['mobile_security'];
+ }
+ if(empty($user['user_name_view']))
+ {
+ $user['user_name_view'] = $user['email_security'];
+ }
+
+ // 头像
+ if(!empty($user['avatar']))
+ {
+ if(substr($user['avatar'], 0, 4) != 'http')
+ {
+ $user['avatar'] = C('IMAGE_HOST').$user['avatar'];
+ }
+ } else {
+ $user['avatar'] = C('IMAGE_HOST').'/Public/Home/'.C('DEFAULT_THEME').'/Images/default-user-avatar.jpg';
+ }
+
+ // 存储session
+ $_SESSION['user'] = $user;
+ return !empty($_SESSION['user']);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 用户头像更新
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-10-16
+ * @desc description
+ * @param [array] $params [输入参数]
+ */
+ public function UserAvatarUpload($params = [])
+ {
+ // 请求参数
+ $p = [
+ [
+ 'checked_type' => 'empty',
+ 'key_name' => 'img_width',
+ 'error_msg' => '图片宽度不能为空',
+ ],
+ [
+ 'checked_type' => 'empty',
+ 'key_name' => 'img_height',
+ 'error_msg' => '图片高度不能为空',
+ ],
+ [
+ 'checked_type' => 'isset',
+ 'key_name' => 'img_x',
+ 'error_msg' => '图片裁剪x坐标有误',
+ ],
+ [
+ 'checked_type' => 'isset',
+ 'key_name' => 'img_y',
+ 'error_msg' => '图片裁剪y坐标有误',
+ ],
+ [
+ 'checked_type' => 'empty',
+ 'key_name' => 'img_field',
+ 'error_msg' => '图片name字段值不能为空',
+ ],
+ [
+ 'checked_type' => 'empty',
+ 'key_name' => 'user',
+ 'error_msg' => '用户信息有误',
+ ],
+ ];
+ $ret = params_checked($params, $p);
+ if($ret !== true)
+ {
+ return DataReturn($ret, -1);
+ }
+
+ // 开始处理图片存储
+ // 定义图片目录
+ $root_path = ROOT_PATH;
+ $img_path = 'Public'.DS.'Upload'.DS.'user_avatar'.DS;
+ $date = DS.date('Y').DS.date('m').DS.date('d').DS;
+
+ // 图像类库
+ $images_obj = \Library\Images::Instance(['is_new_name'=>false]);
+
+ // 文件上传校验
+ $error = FileUploadError($params['img_field']);
+ if($error !== true)
+ {
+ return DataReturn($error, -2);
+ }
+
+ $original = $images_obj->GetCompressCut($_FILES[$params['img_field']], $root_path.$img_path.'original'.$date, 800, 800, $params['img_x'], $params['img_y'], $params['img_width'], $params['img_height']);
+ if(!empty($original))
+ {
+ $compr = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'compr'.$date, 200, 200);
+ $small = $images_obj->GetBinaryCompress($root_path.$img_path.'original'.$date.$original, $root_path.$img_path.'small'.$date, 50, 50);
+ }
+ if(empty($compr) || empty($small))
+ {
+ return DataReturn('图片有误，请换一张', -3);
+ }
+
+ // 更新用户头像
+ $data = [
+ 'avatar' => DS.$img_path.'compr'.$date.$compr,
+ 'upd_time' => time(),
+ ];
+ if(M('User')->where(['id'=>$params['user']['id']])->save($data))
+ {
+ self::UserLoginRecord($params['user']['id']);
+ return DataReturn('上传成功', 0);
+ }
+ return DataReturn('上传失败', -100);
+ }
+
}
?>
\ No newline at end of file
diff --git a/service/Public/Home/Default/Css/Common.css b/service/Public/Home/Default/Css/Common.css
index e4858938c..8080ce5b8 100755
--- a/service/Public/Home/Default/Css/Common.css
+++ b/service/Public/Home/Default/Css/Common.css
@@ -707,6 +707,7 @@ button { outline: none !important;}
.common-cropper-popup .img-preview { margin-left:20px; border: 1px solid #eee; background-color: #f9f9f9; }
.common-cropper-popup .cropper-container, .cropper-input-images-submit { border-radius:2px; }
.common-cropper-popup .am-form-file input[type="file"] { margin-top: 0; }
+.common-cropper-popup .am-form-group { width: auto; }
@media only screen and (max-width:641px){
.common-cropper-popup .img-preview { margin-left:10px; }
.common-cropper-popup .preview-md,
diff --git a/service/Public/Home/Default/Js/Common.js b/service/Public/Home/Default/Js/Common.js
index 04eb9960c..cf0f704e1 100755
--- a/service/Public/Home/Default/Js/Common.js
+++ b/service/Public/Home/Default/Js/Common.js
@@ -43,33 +43,6 @@ $(function()
}
}
- //鼠标悬停信息
- $("#wrap .item").mouseenter(function(){
- $(this).children(".mp_tooltip").animate({left:-92,queue:true});
- $(this).children(".mp_tooltip").css("visibility","visible");
- $(this).children(".ibar_login_box").css("display","block");
- });
- $("#wrap .item").mouseleave(function(){
- $(this).children(".mp_tooltip").css("visibility","hidden");
- $(this).children(".mp_tooltip").animate({left:-121,queue:true});
- $(this).children(".ibar_login_box").css("display","none");
- });
- $(".quick_toggle li").mouseover(function(){
- $(this).children(".mp_qrcode").show();
- $(this).children(".mp_tooltip").animate({left:-92,queue:true});
- $(this).children(".mp_tooltip").css("visibility","visible");
- });
- $(".quick_toggle li").mouseleave(function(){
- $(this).children(".mp_qrcode").hide();
- $(this).children(".mp_tooltip").css("visibility","hidden");
- $(this).children(".mp_tooltip").animate({left:-121,queue:true});
- });
-
- $(".return_top").click(function(){
- ds.scrollTo(0, 0);
- hideReturnTop();
- });
-
// 商品分类子级内容显示/隐藏
$(".category-content li").hover(function() {
$(".category-content .category-list li.first .menu-in").css("display", "none");
@@ -152,14 +125,15 @@ $(function()
});
-
-
- var $image = $('.user-head-img-container > img'),
- $dataX = $('#user-head-img_x'),
- $dataY = $('#user-head-img_y'),
- $dataHeight = $('#user-head-img_height'),
- $dataWidth = $('#user-head-img_width'),
- $dataRotate = $('#user-head-img_rotate'),
+ /**
+ * 用户头像上传插件初始化
+ */
+ var $image = $('.user-avatar-img-container > img'),
+ $dataX = $('#user-avatar-img_x'),
+ $dataY = $('#user-avatar-img_y'),
+ $dataHeight = $('#user-avatar-img_height'),
+ $dataWidth = $('#user-avatar-img_width'),
+ $dataRotate = $('#user-avatar-img_rotate'),
options = {
// strict: false,
// responsive: false,
@@ -196,7 +170,7 @@ $(function()
// zoomout: null,
aspectRatio: 1 / 1,
- preview: '.user-head-img-preview',
+ preview: '.user-avatar-img-preview',
crop: function (data) {
$dataX.val(Math.round(data.x));
$dataY.val(Math.round(data.y));
@@ -207,8 +181,8 @@ $(function()
};
$image.on({}).cropper(options);
- // Methods
- $(document.body).on('click', '[data-method]', function () {
+ // 缩放操作
+ $(document.body).on('click', '.common-cropper-popup [data-method]', function () {
var data = $(this).data(),
$target,
result;
@@ -221,7 +195,7 @@ $(function()
try {
data.option = JSON.parse($target.val());
} catch (e) {
- console.log(e.message);
+ Prompt(e.message);
}
}
}
@@ -236,7 +210,7 @@ $(function()
try {
$target.val(JSON.stringify(result));
} catch (e) {
- console.log(e.message);
+ Prompt(e.message);
}
}
@@ -245,12 +219,9 @@ $(function()
// 头像图片上传
- var $inputimage = $('.common-cropper-popup input[type="file"]'),
- URL = window.URL || window.webkitURL,
- blobURL;
-
+ var URL = window.URL || window.webkitURL, blobURL;
if (URL) {
- $inputimage.change(function () {
+ $('.common-cropper-popup input[type="file"]').on('change', function () {
var files = this.files,
file;
@@ -262,27 +233,19 @@ $(function()
$image.one('built.cropper', function () {
URL.revokeObjectURL(blobURL); // Revoke when load complete
}).cropper('reset', true).cropper('replace', blobURL);
- //$inputimage.val('');
} else {
Prompt('Please choose an image file.');
}
+ } else {
+ $image.cropper('reset', true).cropper('replace', $image.attr('src'));
}
});
- } else {
- $inputimage.parent().remove();
}
- // 图片裁剪提交确认
- $('.common-cropper-popup button[type="submit"]').on('click', function()
+ // 头像表单初始化
+ if($('form.form-validation-user-avatar').length > 0)
{
- var v = $inputimage.val();
- if(v.length == 0)
- {
- $(this).parents('.common-cropper-popup').find('.from-text-tips').removeClass('none');
- Prompt('请上传图片');
- return false;
- }
- });
-
+ FromInit('form.form-validation-user-avatar');
+ }
});
\ No newline at end of file
diff --git a/service/Public/Upload/user_avatar/compr/2018/10/16/20181016143756385674260.png b/service/Public/Upload/user_avatar/compr/2018/10/16/20181016143756385674260.png
new file mode 100644
index 000000000..ac4e132bd
Binary files /dev/null and b/service/Public/Upload/user_avatar/compr/2018/10/16/20181016143756385674260.png differ
diff --git a/service/Public/Upload/user_avatar/original/2018/10/16/20181016143756385674260.png b/service/Public/Upload/user_avatar/original/2018/10/16/20181016143756385674260.png
new file mode 100644
index 000000000..1a8f651dc
Binary files /dev/null and b/service/Public/Upload/user_avatar/original/2018/10/16/20181016143756385674260.png differ
diff --git a/service/Public/Upload/user_avatar/small/2018/10/16/20181016143756385674260.png b/service/Public/Upload/user_avatar/small/2018/10/16/20181016143756385674260.png
new file mode 100644
index 000000000..7ec623cec
Binary files /dev/null and b/service/Public/Upload/user_avatar/small/2018/10/16/20181016143756385674260.png differ
{{$user.user_name_view}}