panhui 4 yıl önce
ebeveyn
işleme
ffa4019b78

+ 39 - 11
src/main/nine-space/src/views/asset/Detail.vue

@@ -199,7 +199,7 @@
                     <div class="prive" v-if="init.length > 0">
                         <div class="prive1" v-for="(item, index) in init" :key="index">
                             <img v-if="!item.opened" class="img" :src="item.icon[0]" alt="" />
-                            <div style="margin-top: 4px" v-if="item.icon[2]">
+                            <div style="margin-top: 4px;" v-if="item.icon[2]">
                                 <img v-if="item.opened" class="img" :src="item.icon[2]" alt="" />
                             </div>
                             <!-- <img class="img" v-else :src="item.icon[0]" alt="" /> -->
@@ -246,17 +246,14 @@
                         <div class="page-title"><img src="../../assets/info_icon_jiaoyijilu.png" alt="" />交易记录</div>
                     </template>
                     <div v-if="list.length > 0">
-                        <div class="content" v-for="item in list" :key="item.id">
-                            <van-image width="40" height="40" radius="20" :src="item.fromAvatar" fit="cover" />
-                            <div class="init">
-                                <div style="width: 100%;">
-                                    <div class="text1">{{ item.fromUser || '保密' }}</div>
-                                    <div class="text2">
-                                        <div class="text3">{{ item.operation }}¥{{ item.price }}</div>
-                                        <div class="text4">{{ item.createdAt }}</div>
-                                    </div>
-                                </div>
+                        <div class="user-detail" v-for="item in list" :key="item.id">
+                            <div class="text1 van-ellipsis">{{ item.fromUser || '保密' }}</div>
+                            <div class="text2" v-if="item.operation === '出售'">
+                                {{ item.operation }}¥{{ item.price }}
                             </div>
+                            <div class="text2" v-else>{{ item.operation }}</div>
+                            <div class="text3 van-ellipsis">{{ item.toUser || '保密' }}</div>
+                            <div class="text4">{{ item.createdAt }}</div>
                         </div>
                     </div>
                     <div v-else style="display: flex; justify-content: center;">暂无购买记录</div>
@@ -1542,4 +1539,35 @@ export default {
     padding: 12px 16px !important;
     background-color: #131313 !important;
 }
+
+
+.user-detail {
+    .flex();
+    width: 100%;
+    font-size: @font1;
+    height: 42px;
+    .text1 {
+        color: @prim;
+        width: 48px;
+        flex-shrink: 0;
+        margin-right: 20px;
+    }
+    .text2 {
+        color: @text3;
+        flex-grow: 1;
+    }
+    .text3 {
+        color: #fff;
+        width: 48px;
+        flex-shrink: 0;
+        margin-right: 20px;
+    }
+    .text4 {
+        color: @text3;
+    }
+
+    & + & {
+        border-top: 1px solid #202122;
+    }
+}
 </style>

+ 24 - 34
src/main/nine-space/src/views/product/Detail.vue

@@ -232,15 +232,14 @@
                     <div v-if="list.length > 0">
                         <div class="content" v-for="item in list" :key="item.id">
                             <!-- <img class="img" :src="list.avatar" alt="" /> -->
-                            <div class="init">
-                                <van-image width="40" height="40" radius="20" :src="item.fromAvatar" fit="contain" />
-                                <div class="init-content">
-                                    <div class="text1">{{ item.fromUser || '保密' }}</div>
-                                    <div class="text2">
-                                        <div class="text3">{{ item.operation }}¥{{ item.price }}</div>
-                                        <div class="text4">{{ item.createdAt }}</div>
-                                    </div>
+                            <div class="user-detail">
+                                <div class="text1 van-ellipsis">{{ item.fromUser || '保密' }}</div>
+                                <div class="text2" v-if="item.operation === '出售'">
+                                    {{ item.operation }}¥{{ item.price }}
                                 </div>
+                                <div class="text2" v-else>{{ item.operation }}</div>
+                                <div class="text3 van-ellipsis">{{ item.toUser || '保密' }}</div>
+                                <div class="text4">{{ item.createdAt }}</div>
                             </div>
                         </div>
                     </div>
@@ -792,20 +791,6 @@ export default {
         }
     }
 }
-.content {
-    // padding: 0px 16px;
-    display: flex;
-    align-items: center;
-    width: 343px;
-    height: 68px;
-    border-radius: 12px;
-    .img {
-        width: 32px;
-        height: 32px;
-        border-radius: 50%;
-        margin-right: 10px;
-    }
-}
 .qiaohua {
     border-radius: 4px;
     background: linear-gradient(45deg, rgba(253, 251, 96, 1), rgba(254, 181, 74, 1), rgba(255, 143, 62, 1));
@@ -1231,24 +1216,29 @@ export default {
     background-color: #131313 !important;
 }
 
-.init {
+.user-detail {
+    .flex();
     width: 100%;
-    .init-content {
-        flex-grow: 1;
-        margin-left: 12px;
+    font-size: @font1;
+    height: 42px;
+    .text1 {
+        color: @prim;
+        width: 48px;
+        flex-shrink: 0;
+        margin-right: 20px;
     }
-    .flex();
     .text2 {
-        font-size: @font2;
         color: @text3;
-        .flex();
-        line-height: 24px;
-        justify-content: space-between;
+        flex-grow: 1;
     }
-    .text1 {
-        font-size: @font2;
+    .text3 {
         color: #fff;
-        line-height: 24px;
+        width: 48px;
+        flex-shrink: 0;
+        margin-right: 20px;
+    }
+    .text4 {
+        color: @text3;
     }
 
     & + & {