合并develop代码

@@ -95,6 +95,7 @@ likeHammer.on('tap', function(e) {
         success: function(data) {
         success: function(data) {
             if (data.code === 200) {
             if (data.code === 200) {
                 $this.toggleClass('like');
                 $this.toggleClass('like');
+                tip.show(data.message);
             } else if (data.code === 400 || data.code === 412) {
             } else if (data.code === 400 || data.code === 412) {
                 location.href = data.data; //未登录跳转登录页面
                 location.href = data.data; //未登录跳转登录页面
             } else {
             } else {

-.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 {
         &.focus {
             color: #000;
             color: #000;
@@ -42,6 +24,10 @@
         > a {
         > a {
             display: block;
             display: block;
             height: 310rem / $pxConvertRem;
             height: 310rem / $pxConvertRem;
+            > img {
+              width: 100%;
+              height: 100%;
+            }
         }
         }
     }
     }