bugfix

zhima1234 · zhima1234 · commit 5c788ecec6d4 · 2017-06-06T18:29:38.000+08:00
diff --git a/src/http/controller/image.go b/src/http/controller/image.go
@@ -134,7 +134,7 @@ func (ImageController) Upload(ctx echo.Context) error {
 		return fail(ctx, 5, "文件上传失败！")
 	}
 
-	return success(ctx, map[string]interface{}{"url": cdnDomain + path})
+	return success(ctx, map[string]interface{}{"url": cdnDomain + path, "uri": path})
 }
 
 // Transfer 转换图片：通过 url 从远程下载图片然后转存到七牛
diff --git a/static/js/user.js b/static/js/user.js
@@ -135,9 +135,6 @@
 		});
 
 		if (typeof plupload != "undefined") {
-			// 上传自定义头像
-			var QINIU_DOAMIN = 'http://studygolang.qiniudn.com/';
-			
 			// 实例化一个plupload上传对象
 			var uploader = new plupload.Uploader({
 				browse_button : 'upload-img', // 触发文件选择对话框的按钮，为那个元素id
@@ -174,7 +171,7 @@
 					var data = $.parseJSON(responseObject.response);
 					if (data.ok) {
 						var path = data.data.uri;
-						var url = QINIU_DOAMIN+path;
+						var url = data.data.url;
 						var $img = $('#img-preview').find('img');
 						$img.attr('src', url);
 						$img.attr('alt', file.name);
diff --git a/template/user/edit.html b/template/user/edit.html
@@ -9,7 +9,7 @@
 			<li><a href="/user/{{.user.Username}}">个人信息</a></li>
 			<li class="active">编辑</li>
 		</ol>
-		<div class="box_white">
+		<div class="box_white" id="setting">
 			<form class="form-horizontal validate-form" role="form" action="/account/edit">
 				<fieldset>
 					<legend>个人资料设置</legend>
@@ -159,7 +159,7 @@ <h4 class="title">头像</h4>
 			</div>
 		</div>
 		<br>
-		<div class="box_white">
+		<div class="box_white" id="changepwd">
 			<form class="form-horizontal validate-form" role="form" action="/account/changepwd">
 				<fieldset>
 					<legend>{{if .has_passwd}}修改{{else}}设置{{end}}密码</legend>
@@ -236,7 +236,7 @@ <h5 class="mb-3">添加一个第三方账号</h5>
 					</a>
 				</li>
 				<li class="list-group-item">
-					<a href="#changeavatar">
+					<a href="#change-avatar">
 						<i class="fa fa-user-circle mr-2" aria-hidden="true"></i> 修改头像
 					</a>
 				</li>
@@ -267,7 +267,7 @@ <h5 class="mb-3">添加一个第三方账号</h5>
 <script type="text/javascript" src="/static/js/libs/marked.min.js"></script>
 <script type="text/javascript" src="/static/js/libs/highlight.min.js"></script>
 <script type="text/javascript" src="/static/js/libs/plupload.full.min.js"></script>
-<script type="text/javascript" src="/static/js/user.js?v=1.1"></script>
+<script type="text/javascript" src="/static/js/user.js?v=1.3"></script>
 <script type="text/javascript">
 $(function(){
 	// 文本框自动伸缩
@@ -276,6 +276,7 @@ <h5 class="mb-3">添加一个第三方账号</h5>
 	$('#unbind').submit(function(evt){
 		if ($('input[name=bind_id]:checked').length == 0) {
 			evt.preventDefault();
+			return;
 		}
 	});
 });

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (ImageController) Upload(ctx echo.Context) error {`
`134`	`134`	`return fail(ctx, 5, "文件上传失败！")`
`135`	`135`	`}`
`136`	`136`
`137`		`- return success(ctx, map[string]interface{}{"url": cdnDomain + path})`
	`137`	`+ return success(ctx, map[string]interface{}{"url": cdnDomain + path, "uri": path})`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Transfer 转换图片：通过 url 从远程下载图片然后转存到七牛`