Merge branch 'feature/shareBuy' into 'release/5.7'

返利状态



See merge request !568

@@ -229,6 +229,7 @@ module.exports = class extends global.yoho.BaseModel {
                 _.forEach(result.data.detail, function(val) {
 
                     val.cancel = parseInt(val.status, 10) === 0 ? true : false;
+                    val.already = parseInt(val.status, 10) === 2 ? true : false;
 
                     dateTime = new Date(val.createTime);
 

@@ -26,8 +26,8 @@
         {{# detail}}
         <li>
             <p class="earnings-info">
-                <span class="num">{{#if cancel}}-{{else}}+{{/if}}{{coinNum}}</span>
-                <span>{{nickName}} <i {{#if cancel}}class="cancel"{{/if}}>{{statusStr}}</i></span>
+                <span class="num">{{#if cancel}}-{{/if}}{{#if already}}+{{/if}}{{coinNum}}</span>
+                <span class="user">{{nickName}} <i {{#if cancel}}class="cancel"{{/if}}>{{statusStr}}</i></span>
 
             </p>
             <p class="order-info">

@@ -56,15 +56,15 @@
             }
 
             i {
-                display: inline-block;
-                width: 90px;
-                height: 29px;
+                display: block;
+                height: 28px;
                 background-color: #b0b0b0;
                 color: #fff;
                 font-size: 18px;
                 border-radius: 10px;
-                line-height: 29px;
-                text-align: center;
+                margin-left: 5px;
+                padding: 0 10px;
+                line-height: 32px;
             }
 
             .cancel {
@@ -76,6 +76,11 @@
                 float: right;
                 text-align: right;
             }
+
+            .user {
+                display: flex;
+                align-items: center;
+            }
         }
 
         .order-info {