diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html
index 7968ba5d7..1f2f7ce72 100644
--- a/public/assets/wechat/project_discussion.html
+++ b/public/assets/wechat/project_discussion.html
@@ -42,7 +42,8 @@
-
+
+
diff --git a/public/images/wechat/wechat_icon.gif b/public/images/wechat/wechat_icon.gif
new file mode 100755
index 000000000..8d460be80
Binary files /dev/null and b/public/images/wechat/wechat_icon.gif differ
diff --git a/public/images/wechat/wechat_icon.png b/public/images/wechat/wechat_icon.png
index 7aa0a4351..cbc3eb565 100755
Binary files a/public/images/wechat/wechat_icon.png and b/public/images/wechat/wechat_icon.png differ
diff --git a/public/images/wechat/wechat_icon2.png b/public/images/wechat/wechat_icon2.png
deleted file mode 100755
index cbc3eb565..000000000
Binary files a/public/images/wechat/wechat_icon2.png and /dev/null differ
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index da314c5f5..b72d39c40 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -128,6 +128,7 @@ app.factory('common', function($http, auth, $routeParams){
openid: auth.openid()
};
+ //回复按钮禁用
data.disabled = true;
$http({
@@ -136,6 +137,7 @@ app.factory('common', function($http, auth, $routeParams){
data: userInfo
}).then(function successCallback(response) {
alert("提交成功");
+ //数据提交完成,回复按钮启用
data.disabled = false;
if(typeof cb === 'function'){
cb();
@@ -410,31 +412,46 @@ app.filter('safeHtml', function ($sce) {
}
});
-app.directive('textAutoHeight', function($timeout){
- return {
+//app.directive('textAutoHeight', function($timeout){
+// return {
+// restrict: 'A',
+// scope: {},
+// link: function(scope, element, attr){
+// scope.text = '点击展开';
+// $timeout(function(){
+// var e = element.parent().children().eq(5);
+// var height = e[0].scrollHeight;
+// if(height>90){
+// element.css('display', 'block');
+// element.on('click', function(){
+// if(element.text() == "点击展开"){
+// e.css("height", height+'px');
+// element.text("点击隐藏");
+// } else {
+// e.css("height", '90px');
+// element.text("点击展开");
+// }
+//
+// });
+// }
+// }, false);
+//
+// }
+// }
+//});
+
+app.directive('inputAuto',function(){
+ return{
restrict: 'A',
scope: {},
- link: function(scope, element, attr){
- scope.text = '点击展开';
- $timeout(function(){
- var e = element.parent().children().eq(5);
- var height = e[0].scrollHeight;
- if(height>90){
- element.css('display', 'block');
- element.on('click', function(){
- if(element.text() == "点击展开"){
- e.css("height", height+'px');
- element.text("点击隐藏");
- } else {
- e.css("height", '90px');
- element.text("点击展开");
- }
-
- });
- }
- }, false);
-
- }
+ link: function(scope, element){
+ var copyContainer = element.parent().children().eq(0);
+ element.on('input',function(){
+ copyContainer.html(element[0].value);
+ var textHeight = copyContainer[0].scrollHeight;
+ element.css('height', textHeight + 'px');
+ });
+ }
}
});
@@ -442,7 +459,7 @@ app.directive('loadingSpinner', function ($http) {
return {
restrict: 'A',
replace: true,
- template: '
加载中...',
+ template: '
加载中...',
link: function (scope, element, attrs) {
scope.$watch('activeCalls', function (newVal, oldVal) {
@@ -495,7 +512,7 @@ app.config(['$routeProvider',"$httpProvider",function ($routeProvider, $httpProv
redirectTo: '/activities'
});
- //监听异步请求
+ //监听异步请求,实现加载中显隐标记
$httpProvider.interceptors.push(function ($q, $rootScope) {
if ($rootScope.activeCalls == undefined) {
$rootScope.activeCalls = 0;
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 41084affa..30023f606 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -8,6 +8,7 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
.f13 {font-size:13px;}
.f15 {font-size:15px;}
.fb {font-weight:bold;}
+.mt2 {margin-top:2px;}
.mt5 {margin-top:5px;}
.mt10 {margin-top:10px;}
.mb5 {margin-bottom:5px;}
@@ -16,6 +17,8 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;}
.mr10 {margin-right:10px;}
.ml15 {margin-left:15px;}
.mr15 {margin-right:15px;}
+.mr20 {margin-right:20px;}
+.mr25 {margin-right:25px;}
.ml55 {margin-left:55px;}
.mr55 {margin-right:55px;}
.c-blue {color:#269ac9;}
@@ -66,11 +69,12 @@ a.underline {text-decoration:underline;}
.post-reply-content img {max-width:100%;}
.post-reply-date, .post-reply-trigger {font-size:13px;}
.post-input-container {padding-right:2px;}
-.post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;}
+.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-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.png) -100px 1px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praise-icon {background:url(/images/wechat/wechat_icon.png) -100px -38px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
-.praised-icon {background:url(/images/wechat/wechat_icon.png) -100px -76px no-repeat; width:20px; height:18px; display:inline-block; vertical-align:middle;}
+.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;}
/* 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;}