ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 7e5c8a0325fc96f08f0401cc000be075430d0d1a 2 parents 34f2c965 c361e66d

Merge branch 'develop' into test

Inline Side-by-side
Showing 2 changed files with 21 additions and 2 deletions
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 <div class="submenu submenu-fashion"> 34 <div class="submenu submenu-fashion">
35 35
36 <!--<span class="arrow"></span>--> 36 <!--<span class="arrow"></span>-->
  37 + <div class="submenu-loading"></div>
37 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div> 38 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
38 </div> 39 </div>
39 </span> 40 </span>
@@ -48,6 +49,7 @@ @@ -48,6 +49,7 @@
48 <a class="menu" href="/beauty/index.html"></a> 49 <a class="menu" href="/beauty/index.html"></a>
49 <div class="submenu submenu-beauty"> 50 <div class="submenu submenu-beauty">
50 <!--<span class="arrow"></span>--> 51 <!--<span class="arrow"></span>-->
  52 + <div class="submenu-loading"></div>
51 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div> 53 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
52 </div> 54 </div>
53 </span> 55 </span>
@@ -59,6 +61,7 @@ @@ -59,6 +61,7 @@
59 <a class="menu" href="/sports/index.html"></a> 61 <a class="menu" href="/sports/index.html"></a>
60 <div class="submenu submenu-sport"> 62 <div class="submenu submenu-sport">
61 <!--<span class="arrow"></span>--> 63 <!--<span class="arrow"></span>-->
  64 + <div class="submenu-loading"></div>
62 <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div> 65 <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
63 </div> 66 </div>
64 </span> 67 </span>
@@ -70,6 +73,7 @@ @@ -70,6 +73,7 @@
70 <a class="menu" href="/lifestyle/index.html"></a> 73 <a class="menu" href="/lifestyle/index.html"></a>
71 <div class="submenu submenu-lifestyle"> 74 <div class="submenu submenu-lifestyle">
72 <!--<span class="arrow"></span>--> 75 <!--<span class="arrow"></span>-->
  76 + <div class="submenu-loading"></div>
73 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div> 77 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
74 </div> 78 </div>
75 </span> 79 </span>
@@ -86,6 +90,7 @@ @@ -86,6 +90,7 @@
86 {{/ videoSubmenu}} 90 {{/ videoSubmenu}}
87 </div> 91 </div>
88 <div class="right-content"> 92 <div class="right-content">
  93 + <div class="submenu-loading"></div>
89 </div> 94 </div>
90 <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div> 95 <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
91 </div> 96 </div>
@@ -156,6 +161,7 @@ @@ -156,6 +161,7 @@
156 <a class="hover-text">時尚</a> 161 <a class="hover-text">時尚</a>
157 <a class="menu" href="/fashion/index.html"></a> 162 <a class="menu" href="/fashion/index.html"></a>
158 <div class="submenu submenu-fashion"> 163 <div class="submenu submenu-fashion">
  164 + <div class="submenu-loading"></div>
159 <!--<span class="arrow"></span>--> 165 <!--<span class="arrow"></span>-->
160 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div> 166 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
161 </div> 167 </div>
@@ -171,6 +177,7 @@ @@ -171,6 +177,7 @@
171 <a class="menu" href="/beauty/index.html"></a> 177 <a class="menu" href="/beauty/index.html"></a>
172 <div class="submenu submenu-beauty"> 178 <div class="submenu submenu-beauty">
173 <!--<span class="arrow"></span>--> 179 <!--<span class="arrow"></span>-->
  180 + <div class="submenu-loading"></div>
174 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div> 181 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
175 </div> 182 </div>
176 </span> 183 </span>
@@ -182,6 +189,7 @@ @@ -182,6 +189,7 @@
182 <a class="menu" href="/sports/index.html"></a> 189 <a class="menu" href="/sports/index.html"></a>
183 <div class="submenu submenu-sport"> 190 <div class="submenu submenu-sport">
184 <!--<span class="arrow"></span>--> 191 <!--<span class="arrow"></span>-->
  192 + <div class="submenu-loading"></div>
185 <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div> 193 <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
186 </div> 194 </div>
187 </span> 195 </span>
@@ -193,6 +201,7 @@ @@ -193,6 +201,7 @@
193 <a class="menu" href="/lifestyle/index.html"></a> 201 <a class="menu" href="/lifestyle/index.html"></a>
194 <div class="submenu submenu-lifestyle"> 202 <div class="submenu submenu-lifestyle">
195 <!--<span class="arrow"></span>--> 203 <!--<span class="arrow"></span>-->
  204 + <div class="submenu-loading"></div>
196 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div> 205 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
197 </div> 206 </div>
198 </span> 207 </span>
@@ -209,6 +218,7 @@ @@ -209,6 +218,7 @@
209 {{/ videoSubmenu}} 218 {{/ videoSubmenu}}
210 </div> 219 </div>
211 <div class="right-content"> 220 <div class="right-content">
  221 + <div class="submenu-loading"></div>
212 </div> 222 </div>
213 <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div> 223 <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
214 </div> 224 </div>
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <a class="hover-text">时尚</a> 34 <a class="hover-text">时尚</a>
35 <a class="menu" href="/fashion/index.html"></a> 35 <a class="menu" href="/fashion/index.html"></a>
36 <div class="submenu submenu-fashion"> 36 <div class="submenu submenu-fashion">
37 - 37 + <div class="submenu-loading"></div>
38 <!--<span class="arrow"></span>--> 38 <!--<span class="arrow"></span>-->
39 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div> 39 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
40 </div> 40 </div>
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
49 <a class="hover-text">美丽</a> 49 <a class="hover-text">美丽</a>
50 <a class="menu" href="/beauty/index.html"></a> 50 <a class="menu" href="/beauty/index.html"></a>
51 <div class="submenu submenu-beauty"> 51 <div class="submenu submenu-beauty">
  52 + <div class="submenu-loading"></div>
52 <!--<span class="arrow"></span>--> 53 <!--<span class="arrow"></span>-->
53 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div> 54 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
54 </div> 55 </div>
@@ -61,8 +62,9 @@ @@ -61,8 +62,9 @@
61 <a class="hover-text">运动</a> 62 <a class="hover-text">运动</a>
62 <a class="menu" href="/sports/index.html"></a> 63 <a class="menu" href="/sports/index.html"></a>
63 <div class="submenu submenu-sport"> 64 <div class="submenu submenu-sport">
  65 + <div class="submenu-loading"></div>
64 <!--<span class="arrow"></span>--> 66 <!--<span class="arrow"></span>-->
65 - <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div> 67 + <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
66 </div> 68 </div>
67 </span> 69 </span>
68 </div> 70 </div>
@@ -73,6 +75,7 @@ @@ -73,6 +75,7 @@
73 <a class="menu" href="/lifestyle/index.html"></a> 75 <a class="menu" href="/lifestyle/index.html"></a>
74 <div class="submenu submenu-lifestyle"> 76 <div class="submenu submenu-lifestyle">
75 <!--<span class="arrow"></span>--> 77 <!--<span class="arrow"></span>-->
  78 + <div class="submenu-loading"></div>
76 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div> 79 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
77 </div> 80 </div>
78 </span> 81 </span>
@@ -89,6 +92,7 @@ @@ -89,6 +92,7 @@
89 {{/ videoSubmenu}} 92 {{/ videoSubmenu}}
90 </div> 93 </div>
91 <div class="right-content"> 94 <div class="right-content">
  95 + <div class="submenu-loading"></div>
92 </div> 96 </div>
93 <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div> 97 <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
94 </div> 98 </div>
@@ -159,6 +163,7 @@ @@ -159,6 +163,7 @@
159 <a class="menu" href="/fashion/index.html"></a> 163 <a class="menu" href="/fashion/index.html"></a>
160 <div class="submenu submenu-fashion"> 164 <div class="submenu submenu-fashion">
161 <!--<span class="arrow"></span>--> 165 <!--<span class="arrow"></span>-->
  166 + <div class="submenu-loading"></div>
162 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div> 167 <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
163 </div> 168 </div>
164 </span> 169 </span>
@@ -173,6 +178,7 @@ @@ -173,6 +178,7 @@
173 <a class="menu" href="/beauty/index.html"></a> 178 <a class="menu" href="/beauty/index.html"></a>
174 <div class="submenu submenu-beauty"> 179 <div class="submenu submenu-beauty">
175 <!--<span class="arrow"></span>--> 180 <!--<span class="arrow"></span>-->
  181 + <div class="submenu-loading"></div>
176 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div> 182 <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
177 </div> 183 </div>
178 </span> 184 </span>
@@ -184,6 +190,7 @@ @@ -184,6 +190,7 @@
184 <a class="menu" href="/sports/index.html"></a> 190 <a class="menu" href="/sports/index.html"></a>
185 <div class="submenu submenu-sport"> 191 <div class="submenu submenu-sport">
186 <!--<span class="arrow"></span>--> 192 <!--<span class="arrow"></span>-->
  193 + <div class="submenu-loading"></div>
187 <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div> 194 <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
188 </div> 195 </div>
189 </span> 196 </span>
@@ -195,6 +202,7 @@ @@ -195,6 +202,7 @@
195 <a class="menu" href="/lifestyle/index.html"></a> 202 <a class="menu" href="/lifestyle/index.html"></a>
196 <div class="submenu submenu-lifestyle"> 203 <div class="submenu submenu-lifestyle">
197 <!--<span class="arrow"></span>--> 204 <!--<span class="arrow"></span>-->
  205 + <div class="submenu-loading"></div>
198 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div> 206 <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
199 </div> 207 </div>
200 </span> 208 </span>
@@ -211,6 +219,7 @@ @@ -211,6 +219,7 @@
211 {{/ videoSubmenu}} 219 {{/ videoSubmenu}}
212 </div> 220 </div>
213 <div class="right-content"> 221 <div class="right-content">
  222 + <div class="submenu-loading"></div>
214 </div> 223 </div>
215 <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div> 224 <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
216 </div> 225 </div>