修改

src/main/pc-space/src/views/user/AccountData.vue

@@ -5,7 +5,7 @@
                 <img class="top" :src="userInfo.bg || require('../../assets/img/bg-moren@3x.png')" alt="" />
                 <i class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
-            <div class="btn" @click="aFn">更换背景</div>
+            <div class="btn">更换背景</div>
         </div>
         <div class="top1">
             <div class="title">
@@ -95,17 +95,17 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-document"></span>
+                        <img class="icon" src="../../assets/user/icon-jianjie@3x (1).png" alt="" />
                     </div>
                     <div class="text2">简介</div>
-                    <div class="text3 text5">{{ userInfo.intro || '暂无介绍' }}</div>
+                    <div class="text3">{{ userInfo.intro || '暂无介绍' }}</div>
                 </div>
                 <div class="text4" @click="intro">修改</div>
             </div>
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-message"></span>
+                        <img class="icon" src="../../assets/user/fenxiang-icon@3x (3).png" alt="" />
                     </div>
                     <div class="text2">邮箱</div>
                     <div class="text3">{{ userInfo.email || '暂无' }}</div>
@@ -117,7 +117,7 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-mobile-phone"></span>
+                        <img class="icon" src="../../assets/user/icon_zhanghao@3x.png" alt="" />
                     </div>
                     <div class="text2">登录账号</div>
                     <div class="text3">{{ Phone }}</div>
@@ -127,7 +127,7 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-lock"></span>
+                        <img class="icon" src="../../assets/user/icon_mima@3x (1).png" alt="" />
                     </div>
                     <div class="text2">登录密码</div>
                     <div class="text3">********</div>
@@ -137,7 +137,7 @@
             <div class="box">
                 <div class="text">
                     <div class="text1">
-                        <span class="el-icon-lock"></span>
+                        <img class="icon" src="../../assets/user/icon_mima@3x (1).png" alt="" />
                     </div>
                     <div class="text2">交易密码</div>
                     <div class="text3">付款时用来认证身份信息</div>
@@ -578,6 +578,7 @@ export default {
                     .icon {
                         width: 24px;
                         height: 24px;
+                        display: inline-block;
                     }
                 }
                 .text2 {

src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -24,31 +24,79 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#1c1e26', fontWeight: 'bold' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="name" label="藏品信息" width="158"> </el-table-column>
+                <el-table-column prop="name" label="藏品信息" width="158">
+                    <template slot-scope="scope">
+                        <img
+                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
+                            :src="scope.row.minterAvatar"
+                            alt=""
+                        />
+                        <div
+                            style="
+                                width: 88px;
+                                height: 24px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            "
+                        >
+                            {{ scope.row.name }}
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="minter" label="卖家" width="104"> </el-table-column>
-                <el-table-column prop="region" label="买方" width="104"> </el-table-column>
-                <el-table-column style="color: #fdfb60" prop="price" label="金额" width="100"> </el-table-column>
+                <el-table-column prop="nickname" label="买方" width="104">
+                    <template slot-scope="scope">
+                        <div
+                            style="
+                                width: 88px;
+                                height: 24px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            "
+                        >
+                            {{ scope.row.nickname }}
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="price" label="金额" width="100">
+                    <template slot-scope="scope">
+                        <div style="display: flex">
+                            <img
+                                style="width: 10px; height: 11px; margin-top: 8px"
+                                src="../../assets/img/icon_jiage@3x.png"
+                                alt=""
+                            />
+                            <div style="color: #fdfb60; font-size: 26px">
+                                {{ scope.row.price }}
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="id" label="订单编号" width="120"> </el-table-column>
                 <el-table-column prop="createdAt" label="成交时间" width="158"> </el-table-column>
-                <el-table-column
-                    style="color: #fdfb60"
-                    prop="status"
-                    label="状态"
-                    width="108"
-                    :formatter="statusFormatter"
-                >
+                <el-table-column prop="status" label="状态" width="108" :formatter="statusFormatter">
+                    <!-- <template slot-scope="scope">
+                        <div :style="{ color: 'red' }">
+                            {{ scope.row.status }}
+                        </div>
+                    </template> -->
                 </el-table-column>
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" style="color: red" type="text" size="small"
-                            >删除</el-button
-                        >
+                        <img
+                            style="width: 24px; height: 24px; cursor: pointer"
+                            @click="handleClick(scope.row)"
+                            src="../../assets/user/icon_shanchu@3x.png"
+                            alt=""
+                        />
                     </template>
                 </el-table-column>
             </el-table>
@@ -93,7 +141,9 @@ export default {
             url: '/order/all',
             // /asset/all
             search: '',
+            name1: '',
             list: [],
+            lists: [],
             statusOptions: [
                 { label: '已完成', value: 'FINISH' },
                 { label: '交易中', value: 'PROCESSING' }
@@ -149,7 +199,12 @@ export default {
             };
         },
         setList(list) {
-            this.tableData = list;
+            list.forEach(item => {
+                item.nickname = this.userInfo.nickname;
+                this.lists.push(item);
+                this.tableData = this.lists;
+            });
+            // this.tableData = list;
         },
         handleClick(row) {
             this.$confirm('确定删除该订单吗？', '警告', {
@@ -230,6 +285,7 @@ export default {
         color: #949699;
         width: 140px;
         height: 42px;
+
         span {
             font-size: 16px !important;
         }
@@ -285,11 +341,13 @@ export default {
 </style>
 <style lang="less">
 .customer-table th {
+    // font-weight: bold !important;
     border: none !important;
 }
 .customer-table td,
 .customer-table th.is-leaf {
     border: none;
+    // font-weight: bold !important;
 }
 //表格最外边框
 .el-table--border,
@@ -298,6 +356,7 @@ export default {
 }
 // 头部边框
 .customer-table thead tr th.is-leaf {
+    font-weight: bold !important;
     border: 1px solid #ebeef5;
     border-right: none;
 }

src/main/pc-space/src/views/user/OrderValue.vue

@@ -24,13 +24,39 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="name" label="商品信息" width="248"> </el-table-column>
+                <el-table-column prop="name" label="商品信息" width="228"> </el-table-column>
                 <el-table-column prop="id" label="订单编号" width="134"> </el-table-column>
                 <el-table-column style="color: #fdfb60" prop="payTime" label="交易时间" width="190"> </el-table-column>
-                <el-table-column prop="totalPrice" label="实际金额" width="140"> </el-table-column>
+                <el-table-column prop="totalPrice" label="实际金额" width="140">
+                    <template slot-scope="scope">
+                        <div style="display: flex">
+                            <img
+                                style="width: 10px; height: 11px; margin-top: 7px"
+                                src="../../assets/user/icon_jiage@3x (5).png"
+                                alt=""
+                            />
+                            <div style="color: #ffffff; font-size: 24px">
+                                {{ scope.row.totalPrice }}
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="payMethod" label="收益类型" width="140" :formatter="statusFormatter">
                 </el-table-column>
-                <el-table-column prop="price" label="收益金额"> </el-table-column>
+                <el-table-column prop="price" label="收益金额">
+                    <template slot-scope="scope">
+                        <div style="display: flex">
+                            <img
+                                style="width: 10px; height: 11px; margin-top: 7px"
+                                src="../../assets/img/icon_jiage@3x.png"
+                                alt=""
+                            />
+                            <div style="color: #fdfb60; font-size: 24px">
+                                {{ scope.row.price }}
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
             </el-table>
         </template>
         <div class="pagination-wrapper">
@@ -149,7 +175,7 @@ export default {
 }
 .container {
     padding: 45px 16px 0;
-
+    width: 938px;
     .top {
         .flex();
         justify-content: space-between;

src/main/pc-space/src/views/user/PayRecord.vue

@@ -24,17 +24,52 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="payMethod" label="支付类型" width="158" :formatter="statusFormatter">
+                <el-table-column prop="payMethod" label="支付类型" width="108" :formatter="statusFormatter">
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="164"> </el-table-column>
-                <el-table-column style="color: #fdfb60" prop="price" label="金额" width="130"> </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="190"> </el-table-column>
-                <el-table-column prop="payTime" label="支付时间" width="198"> </el-table-column>
-                <el-table-column fixed="right" label="操作">
+                <el-table-column prop="name" label="藏品信息" width="158">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" style="color: red" type="text" size="small"
-                            >删除</el-button
+                        <img
+                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
+                            :src="scope.row.minterAvatar"
+                            alt=""
+                        />
+                        <div
+                            style="
+                                width: 88px;
+                                height: 24px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            "
                         >
+                            {{ scope.row.name }}
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="price" label="金额" width="140">
+                    <template slot-scope="scope">
+                        <div style="display: flex">
+                            <img
+                                style="width: 10px; height: 11px; margin-top: 8px"
+                                src="../../assets/img/icon_jiage@3x.png"
+                                alt=""
+                            />
+                            <div style="color: #fdfb60; font-size: 26px">
+                                {{ scope.row.price }}
+                            </div>
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="160"> </el-table-column>
+                <el-table-column prop="payTime" label="支付时间" width="248"> </el-table-column>
+                <el-table-column fixed="right" label="操作">
+                    <template slot-scope="scope">
+                        <img
+                            style="width: 24px; height: 24px; cursor: pointer"
+                            @click="handleClick(scope.row)"
+                            src="../../assets/user/icon_shanchu@3x.png"
+                            alt=""
+                        />
                     </template>
                 </el-table-column>
             </el-table>
@@ -190,7 +225,7 @@ export default {
 }
 .container {
     padding: 45px 16px 0;
-
+    width: 938px;
     .top {
         .flex();
         justify-content: space-between;

src/main/pc-space/src/views/user/Personal.vue

@@ -68,6 +68,7 @@ export default {
         }
         .el-menu-item {
             background: #1c1e26 !important;
+            font-size: 16px;
             padding-left: 78px !important;
             span {
                 color: #ffffff !important;

src/main/pc-space/src/views/user/TransactionOrdes.vue

@@ -24,17 +24,39 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="payMethod" label="交易类型" width="208" :formatter="statusFormatter">
+                <el-table-column prop="payMethod" label="交易类型" width="148" :formatter="statusFormatter">
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="224"> </el-table-column>
-                <el-table-column style="color: #fdfb60" prop="minter" label="来源" width="130"> </el-table-column>
+                <el-table-column prop="name" label="藏品信息" width="178">
+                    <template slot-scope="scope">
+                        <img
+                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
+                            :src="scope.row.minterAvatar"
+                            alt=""
+                        />
+                        <div
+                            style="
+                                width: 88px;
+                                height: 24px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            "
+                        >
+                            {{ scope.row.name }}
+                        </div>
+                    </template>
+                </el-table-column>
+                <el-table-column style="color: #fdfb60" prop="minter" label="来源" width="140"> </el-table-column>
                 <!-- <el-table-column prop="username" label="去向" width="190"> </el-table-column> -->
                 <el-table-column prop="payTime" label="交易时间" width="278"> </el-table-column>
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" style="color: red" type="text" size="small"
-                            >删除</el-button
-                        >
+                        <img
+                            style="width: 24px; height: 24px; cursor: pointer"
+                            @click="handleClick(scope.row)"
+                            src="../../assets/user/icon_shanchu@3x.png"
+                            alt=""
+                        />
                     </template>
                 </el-table-column>
             </el-table>
@@ -188,7 +210,7 @@ export default {
 }
 .container {
     padding: 45px 16px 0;
-
+    width: 938px;
     .top {
         .flex();
         justify-content: space-between;