修改

src/main/nine-space/src/views/asset/Detail.vue

@@ -112,11 +112,11 @@
             </template>
         </div>
 
-        <div class="btn van-safe-area-bottom" ref="btn" v-if="isBuy">
+        <!-- <div class="btn van-safe-area-bottom" ref="btn" v-if="isBuy">
             <div class="btns">
                 <van-button type="primary" block round @click="buy">立即购买</van-button>
             </div>
-        </div>
+        </div> -->
         <div class="btn van-safe-area-bottom" ref="btn">
             <div class="btns1">
                 <div @click="$router.push('/giveSearch')">

src/main/nine-space/src/views/asset/GiveSearch.vue

@@ -59,7 +59,7 @@ export default {
             stiky: null,
             type: '',
             minterId: '',
-            url: '/collection/all'
+            url: '/asset/all'
         };
     },
     computed: {
@@ -104,8 +104,9 @@ export default {
         font-weight: bold;
         color: #ffffff;
         line-height: 30px;
-        margin-top: 5px;
+        padding-top: 5px;
         padding-left: 16px;
+        background-color: #181818;
     }
     .name {
         font-size: 12px;
@@ -113,6 +114,7 @@ export default {
         color: #939599;
         line-height: 22px;
         padding-left: 16px;
+        background-color: #181818;
     }
     span {
         color: #fdfb60;

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

@@ -36,9 +36,14 @@
                 <el-table-column style="color: #fdfb60" prop="price" label="金额" width="100"> </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">
-                    {{ status }}</el-table-column
+                <el-table-column
+                    style="color: #fdfb60"
+                    prop="status"
+                    label="状态"
+                    width="108"
+                    :formatter="statusFormatter"
                 >
+                </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"
@@ -87,7 +92,11 @@ export default {
             type: 'PROCESSING,FINISH',
             url: '/order/all',
             search: '',
-            list: []
+            list: [],
+            statusOptions: [
+                { label: '已完成', value: 'FINISH' },
+                { label: '交易中', value: 'PROCESSING' }
+            ]
         };
     },
     mixins: [list],
@@ -121,6 +130,13 @@ export default {
         this.getData();
     },
     methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         beforeData() {
             return {
                 search: this.search,
@@ -137,18 +153,34 @@ export default {
             this.$confirm('确定删除该订单吗？', '警告', {
                 confirmButtonText: '确定',
                 cancelButtonText: '退出',
+                customClass: 'myClass',
                 type: 'warning'
             }).then(() => {
                 this.$http.get('/order/del' + row.id).then(() => {
-                    this.getData();
-                    console.log('删除成功');
+                    this.$message.success('删除成功');
+                    setTimeout(() => {
+                        this.getData();
+                    }, 1000);
                 });
             });
         }
     }
 };
 </script>
-
+<style lang="less">
+.myClass {
+    .el-button {
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        background: #c4c7cc;
+        color: #ffffff;
+        font-size: 13px;
+    }
+}
+</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: #1c1e26 !important;

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

@@ -28,8 +28,9 @@
                 <el-table-column prop="id" label="订单编号" width="184"> </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="payMethod" label="收益类型" width="140"> </el-table-column>
-                <el-table-column prop="right" label="收益金额"> </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>
         </template>
         <div class="pagination-wrapper">
@@ -56,7 +57,11 @@ export default {
             tableData: [],
             url: '/order/all',
             search: '',
-            list: []
+            list: [],
+            statusOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
         };
     },
     mixins: [list],
@@ -68,6 +73,13 @@ export default {
         this.getData();
     },
     methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         beforeData() {
             return {
                 search: this.search,

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

@@ -24,7 +24,8 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="payMethod" label="支付类型" width="158">{{ payMethod }} </el-table-column>
+                <el-table-column prop="payMethod" label="支付类型" width="158" :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>
@@ -63,27 +64,29 @@ export default {
             tableData: [],
             url: '/order/all',
             search: '',
-            list: []
+            list: [],
+            statusOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
         };
     },
     mixins: [list],
 
     computed: {
-        ...mapState(['userInfo']),
-        payMethod() {
-            return this.tableData.map(item => {
-                if (item.payMethod === 'WEIXIN') {
-                    return '微信';
-                } else {
-                    return '支付宝';
-                }
-            });
-        }
+        ...mapState(['userInfo'])
     },
     mounted() {
         this.getData();
     },
     methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         beforeData() {
             return {
                 search: this.search,
@@ -100,18 +103,34 @@ export default {
             this.$confirm('确定删除该订单吗？', '警告', {
                 confirmButtonText: '确定',
                 cancelButtonText: '退出',
+                customClass: 'myClass',
                 type: 'warning'
             }).then(() => {
                 this.$http.get('/order/del' + row.id).then(() => {
-                    this.getData();
-                    console.log('删除成功');
+                    this.$message.success('删除成功');
+                    setTimeout(() => {
+                        this.getData();
+                    }, 1000);
                 });
             });
         }
     }
 };
 </script>
-
+<style lang="less">
+.myClass {
+    .el-button {
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        background: #c4c7cc;
+        color: #ffffff;
+        font-size: 13px;
+    }
+}
+</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: #1c1e26 !important;

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

@@ -15,8 +15,8 @@
                         <span>用户信息</span>
                     </template>
                     <el-menu-item index="/accountdata">资料与账号</el-menu-item>
-                    <el-menu-item index="/address">地址管理</el-menu-item>
-                    <el-menu-item index="give">我赞过的</el-menu-item>
+                    <!-- <el-menu-item index="/address">地址管理</el-menu-item> -->
+                    <el-menu-item index="/give">我赞过的</el-menu-item>
                 </el-submenu>
                 <el-submenu index="2">
                     <template slot="title">

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

@@ -24,9 +24,10 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="payMethod" label="交易类型" width="158"> {{ payMethod }}</el-table-column>
+                <el-table-column prop="payMethod" label="交易类型" width="158" :formatter="statusFormatter">
+                </el-table-column>
                 <el-table-column prop="name" label="藏品信息" width="164"> </el-table-column>
-                <el-table-column style="color: #fdfb60" prop="store" label="来源" width="130"> </el-table-column>
+                <el-table-column style="color: #fdfb60" prop="source" label="来源" width="130"> </el-table-column>
                 <el-table-column prop="username" label="去向" width="190"> </el-table-column>
                 <el-table-column prop="payTime" label="交易时间" width="198"> </el-table-column>
                 <el-table-column fixed="right" label="操作">
@@ -62,27 +63,29 @@ export default {
             tableData: [],
             url: '/order/all',
             search: '',
-            list: []
+            list: [],
+            statusOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
         };
     },
     mixins: [list],
 
     computed: {
-        ...mapState(['userInfo']),
-        payMethod() {
-            return this.tableData.map(item => {
-                if (item.payMethod === 'WEIXIN') {
-                    return '微信';
-                } else {
-                    return '支付宝';
-                }
-            });
-        }
+        ...mapState(['userInfo'])
     },
     mounted() {
         this.getData();
     },
     methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
         beforeData() {
             return {
                 search: this.search,
@@ -98,18 +101,34 @@ export default {
             this.$confirm('确定删除该订单吗？', '警告', {
                 confirmButtonText: '确定',
                 cancelButtonText: '退出',
+                customClass: 'myClass',
                 type: 'warning'
             }).then(() => {
                 this.$http.get('/order/del' + row.id).then(() => {
-                    this.getData();
-                    console.log('删除成功');
+                    this.$message.success('删除成功');
+                    setTimeout(() => {
+                        this.getData();
+                    }, 1000);
                 });
             });
         }
     }
 };
 </script>
-
+<style lang="less">
+.myClass {
+    .el-button {
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        border: 0;
+    }
+    .el-button:nth-last-child(2) {
+        background: #c4c7cc;
+        color: #ffffff;
+        font-size: 13px;
+    }
+}
+</style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
     background: #1c1e26 !important;