diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 3391506f2..dbf5e8b27 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -5,7 +5,7 @@
-
+
@@ -39,7 +39,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -109,7 +109,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -181,7 +181,7 @@
-
+
@@ -208,7 +208,7 @@
-
+
diff --git a/public/images/wechat/icon.png b/public/images/wechat/icon.png new file mode 100755 index 000000000..afc7aa639 Binary files /dev/null and b/public/images/wechat/icon.png differ diff --git a/public/images/wechat/icon_list.gif b/public/images/wechat/icon_list.gif new file mode 100755 index 000000000..1d7dcb061 Binary files /dev/null and b/public/images/wechat/icon_list.gif differ diff --git a/public/images/wechat/loading.gif b/public/images/wechat/loading.gif deleted file mode 100755 index b806bf34c..000000000 Binary files a/public/images/wechat/loading.gif and /dev/null differ diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index b72d39c40..8f00a2b96 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -136,7 +136,7 @@ app.factory('common', function($http, auth, $routeParams){ url: apiUrl+ "new_comment/"+id, data: userInfo }).then(function successCallback(response) { - alert("提交成功"); + //alert("提交成功"); //数据提交完成,回复按钮启用 data.disabled = false; if(typeof cb === 'function'){ @@ -446,11 +446,16 @@ app.directive('inputAuto',function(){ scope: {}, link: function(scope, element){ var copyContainer = element.parent().children().eq(0); + var sendButton = element.parent().next(); element.on('input',function(){ + console.log(sendButton); copyContainer.html(element[0].value); var textHeight = copyContainer[0].scrollHeight; element.css('height', textHeight + 'px'); }); + sendButton.on('click',function(){ + element.css('height','28px'); + }); } } }); diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 67a5f683c..5f0e5343f 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -70,11 +70,11 @@ a.underline {text-decoration:underline;} .post-reply-date, .post-reply-trigger {font-size:13px;} .post-input-container {padding-right:2px;} .copy-input {width:100%; height:28px; line-height:28px; border-radius:3px; position:absolute; left:-9999em;} -.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:hidden; resize:none;} +.post-reply-input {width:100%; height:28px; max-height:84px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px; overflow-y:auto; resize:none;} .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;} -.reply-icon {background:url(/images/wechat/wechat_icon.gif) -100px 1px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} -.praise-icon {background:url(/images/wechat/wechat_icon.gif) -100px -38px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} -.praised-icon {background:url(/images/wechat/wechat_icon.gif) -100px -76px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} +.reply-icon {background:url(/images/wechat/icon_list.gif) -150px -155px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} +.praise-icon {background:url(/images/wechat/icon_list.gif) -36px -88px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} +.praised-icon {background:url(/images/wechat/icon_list.gif) -152px -86px no-repeat; width:20px; height:20px; display:inline-block; vertical-align:middle;} /* loading 弹框*/ .loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}