Authored by 毕凯

Merge branch 'feature/fav-suggest' into 'develop'

Feature/fav suggest

意见反馈设计修改,意见反馈跳转链接放到页面顶部。

See merge request !12

Code Review By BiKai
@@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
31 31
32 //意见反馈主体 32 //意见反馈主体
33 .suggest-content { 33 .suggest-content {
34 - border-top: pxToRem(30px) solid #fff; 34 + border-top: 1px solid #e0e0e0;
35 35
36 .suggest-item { 36 .suggest-item {
37 width: 100%; 37 width: 100%;
@@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
76 &.suggest-active { 76 &.suggest-active {
77 > div { 77 > div {
78 width: 50%; 78 width: 50%;
  79 + height: 100%;
79 float: left; 80 float: left;
80 text-align: left; 81 text-align: left;
81 padding-left: pxToRem(128px); 82 padding-left: pxToRem(128px);
@@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
135 line-height: pxToRem(88px); 136 line-height: pxToRem(88px);
136 text-align: center; 137 text-align: center;
137 font-size: pxToRem(30px); 138 font-size: pxToRem(30px);
138 - border-top: 1px solid #e0e0e0;  
139 - border-bottom: 1px solid #e0e0e0; 139 + //border-top: 1px solid #e0e0e0;
  140 + //border-bottom: 1px solid #e0e0e0;
  141 + border-top: pxToRem(30px) solid #f0f0f0;
  142 + border-bottom: pxToRem(30px) solid #f0f0f0;
  143 + position: relative;
  144 + &:after {
  145 + content: '';
  146 + width: 100%;
  147 + height: 1px;
  148 + border-top: 1px solid #e0e0e0;
  149 + position: absolute;
  150 + left: 0;
  151 + top: 0;
  152 + }
  153 + &:before {
  154 + content: '';
  155 + width: 100%;
  156 + height: 1px;
  157 + border-bottom: 1px solid #e0e0e0;
  158 + position: absolute;
  159 + left: 0;
  160 + bottom: 0;
  161 + }
140 162
141 a { 163 a {
142 color: #444; 164 color: #444;
@@ -6,6 +6,12 @@ @@ -6,6 +6,12 @@
6 我们希望了解您的意见和建议 6 我们希望了解您的意见和建议
7 </h2> 7 </h2>
8 8
  9 + <div class="create-new-suggest">
  10 + <a href="./suggestSub">
  11 + 反馈问题<span>(功能意见,界面意见)</span>
  12 + </a>
  13 + </div>
  14 +
9 <div class="suggest-content" id="suggest-content"> 15 <div class="suggest-content" id="suggest-content">
10 {{# suggestContent}} 16 {{# suggestContent}}
11 <div class="suggest-item" data-id="{{suggest_id}}"> 17 <div class="suggest-item" data-id="{{suggest_id}}">
@@ -46,11 +52,6 @@ @@ -46,11 +52,6 @@
46 52
47 {{/ suggestContent}} 53 {{/ suggestContent}}
48 </div> 54 </div>
49 - <div class="create-new-suggest">  
50 - <a href="./suggestSub">  
51 - 反馈问题<span>(功能意见,界面意见)</span>  
52 - </a>  
53 - </div>  
54 {{/ suggest}} 55 {{/ suggest}}
55 </div> 56 </div>
56 {{> layout/footer}} 57 {{> layout/footer}}