From 24a6aabb6b4e9657f54c15eca9ca4a49f5bafc6b Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jul 2016 16:56:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E5=88=97=E8=A1=A8=E5=9C=86=E7=82=B9=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=B8=8E=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/new_project.html | 14 +++++++------- public/stylesheets/weui/weixin.css | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/public/assets/wechat/new_project.html b/public/assets/wechat/new_project.html index f121a281a..e14f17508 100644 --- a/public/assets/wechat/new_project.html +++ b/public/assets/wechat/new_project.html @@ -8,16 +8,16 @@
项目功能特性（微信版） 更多项目特性（浏览器版）
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index c67cd2a75..3738f1dc4 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -241,5 +241,6 @@ a.underline {text-decoration:underline;} /*20160729项目说明*/ -.project-intro {line-height:2; width:140px; margin-left:auto; margin-right:auto;} -.project-intro li {list-style:disc; margin-left:20px;} \ No newline at end of file +.project-intro {line-height:2; width:120px; margin-left:auto; margin-right:auto;} +.project-intro li {position:relative;} +.project-intro-dot {font-size:25px; font-weight:bold; position:absolute; left:-10px; top:-13px;} \ No newline at end of file From 634213797241c10ac67922e6f6a785e2e914825b Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jul 2016 17:06:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=BF=87=E5=A4=9A=E6=98=BE=E7=A4=BA=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E5=8F=B7=EF=BC=9A=E4=B8=AD=E6=96=87=E7=9C=81=E7=95=A5?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E8=8B=B1=E6=96=87=E5=8D=95=E8=AF=8D=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E8=A2=AB=E6=8B=86=E5=88=86=E6=98=BE=E7=A4=BA=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/wechat/directives/ellipsis.js | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/public/javascripts/wechat/directives/ellipsis.js b/public/javascripts/wechat/directives/ellipsis.js index a5dcfa293..d3a67c557 100644 --- a/public/javascripts/wechat/directives/ellipsis.js +++ b/public/javascripts/wechat/directives/ellipsis.js @@ -1,25 +1,25 @@ -/** - * Created by Tim on 7/22/16. - */ -//app.directive('ellipsisShow',["$timeout",function(timer){ -// return{ -// restrict: 'A', -// scope: {}, -// link: function(scope, element){ -// timer(function() { -// var textSplit = element.text().split(" "); -// var newContent = []; -// element.text(""); -// for (var i = 0; i < textSplit.length; i++) { -// newContent = newContent + " " + textSplit[i]; -// element.text(newContent); -// if(element[0].scrollHeight >= 100){ -// newContent = newContent + " " + textSplit[i+1] + " " + textSplit[i+2] + " " + textSplit[i+3] + " " + textSplit[i+4] + "..."; -// element.text(newContent); -// break; -// } -// } -// }); -// } -// } -//}]); \ No newline at end of file +/** + * Created by Tim on 7/22/16. + */ +app.directive('ellipsisShow',["$timeout",function(timer){ + return{ + restrict: 'A', + scope: {}, + link: function(scope, element){ + timer(function() { + var textSplit = element.text().split(""); + var newContent = []; + element.text(""); + for (var i = 0; i < textSplit.length; i++) { + newContent = newContent + textSplit[i]; + element.text(newContent); + if(element[0].scrollHeight >= 100){ + newContent = newContent + textSplit[i+1] + textSplit[i+2] + textSplit[i+3] + textSplit[i+4] + "..."; + element.text(newContent); + break; + } + } + }); + } + } +}]); \ No newline at end of file From 9a3acdd1dbd7661ec8e1f221dad3b2c7743c4309 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jul 2016 17:07:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/app.html | 110 +++++++++++++++++----------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html index 00a55f553..74af26cfe 100644 --- a/public/assets/wechat/app.html +++ b/public/assets/wechat/app.html @@ -1,56 +1,56 @@ - - - - - 仅供本地调试使用 - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 仅供本地调试使用 + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b100651185fdb149572db01412b26e513e8aef01 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 29 Jul 2016 17:09:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=BE=83=E5=A4=9A=E6=96=87=E5=AD=97=E5=90=8E=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9C=81=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/wechat/directives/ellipsis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/wechat/directives/ellipsis.js b/public/javascripts/wechat/directives/ellipsis.js index d3a67c557..1bc8491b3 100644 --- a/public/javascripts/wechat/directives/ellipsis.js +++ b/public/javascripts/wechat/directives/ellipsis.js @@ -14,7 +14,7 @@ app.directive('ellipsisShow',["$timeout",function(timer){ newContent = newContent + textSplit[i]; element.text(newContent); if(element[0].scrollHeight >= 100){ - newContent = newContent + textSplit[i+1] + textSplit[i+2] + textSplit[i+3] + textSplit[i+4] + "..."; + newContent = newContent + textSplit[i+1] + textSplit[i+2] + textSplit[i+3] + textSplit[i+4] + textSplit[i+5] + textSplit[i+6] + textSplit[i+7] + textSplit[i+8] + textSplit[i+9] + textSplit[i+10] + "..."; element.text(newContent); break; }