fe / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit 22923c1ca5e0e40977451e743b1217661dfeb556 2 parents 06cb9b44 dec4d567

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 7 changed files with 48 additions and 8 deletions
@@ -399,10 +399,8 @@ class AbstractAction extends Controller_Abstract @@ -399,10 +399,8 @@ class AbstractAction extends Controller_Abstract
399 $header['lifeStyle'] = true; 399 $header['lifeStyle'] = true;
400 break; 400 break;
401 } 401 }
402 -  
403 $this->_view->assign('pageHeader', $header); 402 $this->_view->assign('pageHeader', $header);
404 } 403 }
405 -  
406 /** 404 /**
407 * 设置网站导航底部信息 405 * 设置网站导航底部信息
408 * 406 *
@@ -82,9 +82,10 @@ headerNavHammer.on('tap', function(e) { @@ -82,9 +82,10 @@ headerNavHammer.on('tap', function(e) {
82 } 82 }
83 }); 83 });
84 84
85 -formHammer = new Hammer(document.getElementById('img-form')); 85 +if (document.getElementById('img-form') !== null) {
  86 + formHammer = new Hammer(document.getElementById('img-form'));
86 87
87 -formHammer.on('tap', function(e) { 88 + formHammer.on('tap', function(e) {
88 if ($(e.target).hasClass('upload-img-remove')) { 89 if ($(e.target).hasClass('upload-img-remove')) {
89 $uploadImgList.html(''); 90 $uploadImgList.html('');
90 imgStr = ''; 91 imgStr = '';
@@ -93,11 +94,10 @@ formHammer.on('tap', function(e) { @@ -93,11 +94,10 @@ formHammer.on('tap', function(e) {
93 }, 50); 94 }, 50);
94 95
95 } 96 }
96 -}); 97 + });
  98 +}
97 99
98 // 点赞与取消点赞 100 // 点赞与取消点赞
99 -// suggestContentHammer = new Hammer(document.getElementById('suggest-content'));  
100 -  
101 $likeBtn.bind('click', function() { 101 $likeBtn.bind('click', function() {
102 var id = $(this).closest('.suggest-item').attr('data-id'), 102 var id = $(this).closest('.suggest-item').attr('data-id'),
103 $that = $(this); 103 $that = $(this);
@@ -79,3 +79,30 @@ @@ -79,3 +79,30 @@
79 padding-right: pxToRem(32px); 79 padding-right: pxToRem(32px);
80 } 80 }
81 } 81 }
  82 +.systemUpdate{
  83 + width: 100%;
  84 + height: 90rem / $pxConvertRem;
  85 + overflow: hidden;
  86 + line-height: 90rem / $pxConvertRem;
  87 + display: none;
  88 + @include background-image(linear-gradient(#323232, #414141));
  89 + .systemHeader{
  90 + width: 85%;
  91 + height: 100%;
  92 + overflow: hidden;
  93 + font-size: 60em / $pxConvertRem;
  94 + color:#fff;
  95 + float: left;
  96 + text-align: center;
  97 + }
  98 + span{
  99 + width: 14%;
  100 + height: 100%;
  101 + overflow: hidden;
  102 + float: left;
  103 + text-align: center;
  104 + font-size: 80em / $pxConvertRem;
  105 + font-weight: bold;
  106 + color: #fff;
  107 + }
  108 +}
@@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -110,7 +110,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
110 110
111 //发表意见 111 //发表意见
112 .create-new-suggest { 112 .create-new-suggest {
113 - display: block; 113 + display: inline-block;
114 color: #444; 114 color: #444;
115 width: 100%; 115 width: 100%;
116 height: pxToRem(88px); 116 height: pxToRem(88px);
@@ -43,4 +43,10 @@ @@ -43,4 +43,10 @@
43 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 43 <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
44 </head> 44 </head>
45 <body {{#if isPassportPage}}class=passport-body{{/if}}> 45 <body {{#if isPassportPage}}class=passport-body{{/if}}>
  46 +{{#if systemUpdate}}
  47 + <div class="systemUpdate">
  48 + <a href="systemUpdate" class="systemHeader">YOHO!BUY关于系统升级的公告</a>
  49 + <span>X</span>
  50 + </div>
  51 +{{/if}}
46 {{> layout/page_header}} 52 {{> layout/page_header}}
@@ -33,5 +33,14 @@ class IndexController extends AbstractAction @@ -33,5 +33,14 @@ class IndexController extends AbstractAction
33 'pageFooter' => true, 33 'pageFooter' => true,
34 )); 34 ));
35 } 35 }
  36 + /**
  37 + * 设置升级公告路由
  38 + *
  39 + */
  40 +
  41 + public function systemUpdate()
  42 + {
  43 + $this->_view->display('systemUpdate','');
  44 + }
36 45
37 } 46 }