Merge remote-tracking branch 'origin/test' into test

appdownload/css/style.css

@@ -365,64 +365,6 @@
     font-size: 12px;
     color: #333;
 }
-/*拼团列表*/
-.tuan-list a {
-    display: block;
-    box-sizing: border-box;
-    padding: 15px;
-}
-.tuan-list a img {
-    max-width: 100%;
-    border-radius: 3px;
-    vertical-align: top;
-}
-.tuan-list a h3 {
-    font-size: 17px;
-    font-weight: normal;
-    padding: 8px 0 5px;
-    color: #333;
-}
-.tuan-list a p {
-    height: 30px;
-    padding-top: 5px;
-}
-.tuan-list a p span.go-buy-btn {
-    position: relative;
-    float: right;
-    display: inline-block;
-    height: 30px;
-    border-radius: 3px;
-    background-color: red;
-    color: #fff;
-    line-height: 29px;
-    font-size: 14px;
-    padding: 0 25px 0 10px;
-}
-.tuan-list a p span.go-buy-btn i {
-    display: inline-block;
-    position: absolute;
-    right: 5px;
-    top: 0;
-    width: 20px;
-    height: 30px;
-    text-align: right;
-    line-height: 32px;
-}
-.tuan-list a p span.price {
-    display: inline-block;
-    float: left;
-    line-height: 30px;
-    font-size: 24px;
-    height: 30px;
-    color: red;
-}
-.tuan-list a p span.price b {
-    font-size: 12px;
-    color: #999;
-    font-weight: normal;
-}
-
-
 @media screen and (max-width:450px){
     html,body {
         background: none;

skin/default/css/banshou.css

@@ -638,3 +638,60 @@
     overflow: hidden;
 }
 
+/*拼团列表*/
+.tuan-list a {
+    display: block;
+    box-sizing: border-box;
+    padding: 15px;
+}
+.tuan-list a img {
+    max-width: 100%;
+    border-radius: 3px;
+    vertical-align: top;
+}
+.tuan-list a h3 {
+    font-size: 17px;
+    font-weight: normal;
+    padding: 8px 0 5px;
+    color: #333;
+}
+.tuan-list a p {
+    height: 30px;
+    padding-top: 5px;
+}
+.tuan-list a p span.go-buy-btn {
+    position: relative;
+    float: right;
+    display: inline-block;
+    height: 30px;
+    border-radius: 3px;
+    background-color: red;
+    color: #fff;
+    line-height: 29px;
+    font-size: 14px;
+    padding: 0 25px 0 10px;
+}
+.tuan-list a p span.go-buy-btn i {
+    display: inline-block;
+    position: absolute;
+    right: 5px;
+    top: 0;
+    width: 20px;
+    height: 30px;
+    text-align: right;
+    line-height: 32px;
+}
+.tuan-list a p span.price {
+    display: inline-block;
+    float: left;
+    line-height: 30px;
+    font-size: 24px;
+    height: 30px;
+    color: red;
+}
+.tuan-list a p span.price b {
+    font-size: 12px;
+    color: #999;
+    font-weight: normal;
+}
+