合并develop代码

-
-
-
-
-
-        &.focus {
-            color: #000;
-        }
-    }
+.ps-list-page {
+  background-color: #f0f0f0;
+
+  .nav-tab, .ps-content {
+    width: 100%;
+  }
+
+  .nav-tab {
+    height: 60rem / $pxConvertRem;
+    padding: 10rem / $pxConvertRem 0;
+    background-color: #fff;
+  }
+
+  .star-nav, .plus-nav {
+    box-sizing: border-box;
+    float: left;
+    width: 50%;
+    height: 60rem / $pxConvertRem;
+    line-height: 60rem / $pxConvertRem;
+    font-size: 16px;
+    text-align: center;
+    color: #ccc;
+
+    &.focus {
+      color: #000;
+    }
+  }
     .bytouch{
         background:#eee;
     }