交易信息

src/main/pc-space/src/components/PageHeader.vue

@@ -36,7 +36,6 @@
                     </el-dropdown>
                 </div>
                 <div v-else class="login" @click="show = true">[登录]</div>
-                <div class="login login1">中文</div>
             </div>
         </div>
         <login-info :Show="show" @close="show = false"></login-info>
@@ -181,6 +180,7 @@ export default {
                 }
             }
             .btn-list {
+                margin-right: 52px;
                 .img {
                     width: 34px;
                     height: 34px;
@@ -200,13 +200,6 @@ export default {
                 color: @prim;
                 font-size: 16px;
                 // .line();
-                margin: 0 30px;
-                .login1 {
-                    border: 1px solid #939599;
-                    color: #939599;
-                    border-image: linear-gradient(0);
-                    margin: 0;
-                }
             }
         }
     }

src/main/pc-space/src/plugins/http.js

@@ -4,9 +4,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'https://nft.9space.vip';
+        baseUrl = 'https://nft.9space.vip';
         // baseUrl = 'http://192.168.50.190:8080';
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

src/main/pc-space/src/router/index.js

@@ -111,6 +111,22 @@ const routes = [
                         meta: {
                             title: '我赞过的'
                         }
+                    },
+                    {
+                        path: '/mylikes',
+                        name: 'mylikes',
+                        component: () => import('../views/user/MyLikes.vue'),
+                        meta: {
+                            title: '藏品订单'
+                        }
+                    },
+                    {
+                        path: '/payrecord',
+                        name: 'payrecord',
+                        component: () => import('../views/user/PayRecord.vue'),
+                        meta: {
+                            title: '支付记录'
+                        }
                     }
                 ]
             },

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

@@ -9,7 +9,7 @@
                         <img class="icon" src="../../assets/user/fenxiang-icon@3x (1).png" alt="" />
                     </div>
                     <div class="text2">昵称</div>
-                    <!-- <div class="text3">{{ userInfo.username }}</div> -->
+                    <div class="text3">{{ userInfo.username }}</div>
                 </div>
                 <div class="text4">修改</div>
             </div>
@@ -19,7 +19,7 @@
                         <img class="icon" src="../../assets/user/fenxiang-icon@3x (2).png" alt="" />
                     </div>
                     <div class="text2">编码</div>
-                    <!-- <div class="text3">{{ userInfo.id }}</div> -->
+                    <div class="text3">{{ userInfo.id }}</div>
                 </div>
                 <div class="text4">修改</div>
             </div>
@@ -41,7 +41,7 @@
                         <span class="el-icon-message"></span>
                     </div>
                     <div class="text2">邮箱</div>
-                    <!-- <div class="text3">{{ userInfo.email || '暂无' }}</div> -->
+                    <div class="text3">{{ userInfo.email || '暂无' }}</div>
                 </div>
                 <div class="text4">修改</div>
             </div>
@@ -53,7 +53,7 @@
                         <span class="el-icon-mobile-phone"></span>
                     </div>
                     <div class="text2">登录账号</div>
-                    <!-- <div class="text3">{{ Phone }}</div> -->
+                    <div class="text3">{{ Phone }}</div>
                 </div>
                 <div class="text4" @click="all('security')">修改</div>
             </div>
@@ -85,7 +85,7 @@
                         <img class="icon" src="../../assets/user/icon-renzheng@3x.png" alt="" />
                     </div>
                     <div class="text2">实名认证</div>
-                    <!-- <div class="text3">{{ Status }}</div> -->
+                    <div class="text3">{{ Status }}</div>
                 </div>
                 <div class="text4" @click="Auths">修改</div>
             </div>

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

@@ -34,6 +34,8 @@
 
 <script>
 import AddressInfo from '../../components/AddressInfo.vue';
+import { mapState } from 'vuex';
+import pageableTable from '../../mixins/pageableTable';
 export default {
     components: { AddressInfo },
     data() {
@@ -50,7 +52,14 @@ export default {
             ]
         };
     },
-    computed: {},
+    mixins: [pageableTable],
+
+    computed: {
+        ...mapState(['userInfo'])
+    },
+    mounted() {
+        this.init();
+    },
     methods: {
         handleClick(row) {
             this.show = true;
@@ -59,6 +68,18 @@ export default {
         add() {
             this.show = true;
             this.$forceUpdate();
+        },
+        init() {
+            this.$http.post('/userAddress/all', { body: 'json' }).then(res => {
+                // this.fetchingData = false;
+                // this.list = res;
+                console.log(res);
+            });
+            // this.$http.get(`/userAddress/get/${this.userInfo.id}`).then(res => {
+            //     // this.fetchingData = false;
+            //     // this.list = res;
+            //     console.log(res);
+            // });
         }
     }
 };

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

@@ -63,10 +63,11 @@ export default {
                     value: 'BLIND_BOX'
                 }
             ],
+            list: [],
             search: '',
             type: '',
-            url: '/collection/all',
-            list: []
+            empty: false,
+            url: '/collection/myLikes'
         };
     },
     mixins: [pageableTable],
@@ -83,6 +84,9 @@ export default {
             this.getData();
         }
     },
+    mounted() {
+        this.init();
+    },
     methods: {
         beforeGetData() {
             return {
@@ -94,6 +98,15 @@ export default {
         },
         setList(list) {
             this.list = list;
+        },
+        init() {
+            this.$http.get('/collection/myLikes').then(res => {
+                this.fetchingData = false;
+                this.list = res;
+                if (this.list.length === 0) {
+                    this.empty = true;
+                }
+            });
         }
     }
 };

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

@@ -0,0 +1,243 @@
+<template>
+    <div class="container">
+        <div class="top">
+            <el-radio-group class="menu" v-model="type" size="normal">
+                <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
+                    <div class="radio-item">
+                        <span>{{ item.label }}</span>
+                    </div>
+                </el-radio-button>
+            </el-radio-group>
+            <div class="search-list">
+                <el-input
+                    class="search"
+                    prefix-icon="el-icon-search"
+                    placeholder="请输入您想找到的作品名称…"
+                    v-model="search"
+                    clearable
+                    @change="onSearch"
+                >
+                </el-input>
+            </div>
+        </div>
+        <div class="border"></div>
+        <template>
+            <el-table
+                class="customer-table"
+                :header-cell-style="{ background: '#1c1e26' }"
+                :data="tableData"
+                :border="false"
+                :highlight-current-row="false"
+                style="width: 100%"
+            >
+                <el-table-column prop="name" label="藏品信息" width="158"> </el-table-column>
+                <el-table-column prop="phone" 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="address" label="订单编号" width="120"> </el-table-column>
+                <el-table-column prop="time" label="成交时间" width="158"> </el-table-column>
+                <el-table-column style="color: #fdfb60" prop="status" label="状态" width="68"> </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
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </template>
+    </div>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '../../mixins/pageableTable';
+export default {
+    data() {
+        return {
+            tableData: [
+                {
+                    id: 1104,
+                    name: '1',
+                    phone: '1',
+                    region: '1',
+                    price: 1,
+                    time: '12:20',
+                    status: '交易中',
+                    address: '1 1518 弄'
+                }
+            ],
+            typeList: [
+                {
+                    label: '全部',
+                    value: ''
+                },
+                {
+                    label: '交易中',
+                    value: 'PROCESSING'
+                },
+                {
+                    label: '已完成',
+                    value: 'FINISH'
+                }
+            ],
+            list: [],
+            search: '',
+            type: ''
+        };
+    },
+    mixins: [pageableTable],
+
+    computed: {
+        ...mapState(['userInfo'])
+    },
+    mounted() {},
+    methods: {
+        handleClick() {}
+    }
+};
+</script>
+
+<style lang="less" scoped>
+/deep/ .el-table__header {
+    background: #1c1e26 !important;
+}
+/deep/ .el-table__row {
+    background: #1c1e26 !important;
+    .cell {
+        color: #ffffff;
+    }
+}
+.search {
+    background: #1a1a1a;
+    width: 280px;
+    height: 42px;
+    border-radius: 8px;
+
+    /deep/.el-input__inner {
+        border: 1px solid #898989;
+        background-color: transparent;
+        color: #fff;
+        border-radius: 8px;
+        &:focus {
+            border-color: #fff;
+        }
+    }
+}
+/deep/.menu {
+    .el-radio-button__inner {
+        border-color: #949699;
+        background-color: transparent;
+        color: #949699;
+        width: 140px;
+    }
+    .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+        background: linear-gradient(46deg, @prim 0%, @warn 100%);
+        color: #fff;
+        border-color: #fff;
+    }
+    .el-radio-button {
+        &:last-child {
+            .el-radio-button__inner {
+                border-radius: 0 8px 8px 0;
+            }
+        }
+        &:first-child {
+            .el-radio-button__inner {
+                border-radius: 8px 0 0 8px;
+            }
+        }
+    }
+}
+/deep/ .el-empty {
+    margin: 0 auto;
+}
+.search-list {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .select {
+        /deep/.el-input__inner {
+            background-color: transparent;
+            color: #fff;
+        }
+    }
+}
+.container {
+    padding: 45px 16px 0;
+
+    .top {
+        .flex();
+        justify-content: space-between;
+        .text1 {
+            font-size: 14px;
+            font-weight: 400;
+            color: #ffffff;
+            line-height: 25px;
+        }
+        .text2 {
+            width: 106px;
+            height: 42px;
+            border-radius: 8px;
+            border: 1px solid #939599;
+            line-height: 42px;
+            text-align: center;
+            font-size: 14px;
+            color: #939599;
+            cursor: pointer;
+        }
+        span {
+            width: 26px !important;
+            height: 26px !important;
+            // font-size: 16px;
+            color: #939599;
+        }
+    }
+    .border {
+        height: 1px;
+        background: #494a4d;
+        border-radius: 1px;
+        margin: 24px 0 34px;
+    }
+}
+</style>
+<style lang="less">
+.customer-table th {
+    border: none !important;
+}
+.customer-table td,
+.customer-table th.is-leaf {
+    border: none;
+}
+//表格最外边框
+.el-table--border,
+.el-table--group {
+    border: none;
+}
+// 头部边框
+.customer-table thead tr th.is-leaf {
+    border: 1px solid #ebeef5;
+    border-right: none;
+}
+.customer-table thead tr th:nth-last-of-type(2) {
+    border-right: 1px solid #ebeef5;
+}
+// 表格最外层边框-底部边框
+.el-table--border::after,
+.el-table--group::after {
+    width: 0;
+}
+.customer-table::before {
+    width: 0;
+}
+.customer-table .el-table__fixed-right::before,
+.el-table__fixed::before {
+    width: 0;
+}
+//表格有滚动时表格头边框
+.el-table--border th.gutter:last-of-type {
+    border: 1px solid #ebeef5;
+    border-left: none;
+}
+</style>

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

@@ -23,6 +23,7 @@
                         <img class="icon" src="../../assets/user/icon_jiaoyixinxi@3x.png" alt="" />
                         <span>交易信息</span>
                     </template>
+                    <el-menu-item index="/mylikes">藏品订单</el-menu-item>
                 </el-submenu>
                 <el-submenu index="3">
                     <template slot="title">