xuqiang 4 years ago
parent
commit
baaa9eddb1

+ 28 - 23
src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -30,28 +30,30 @@
                 :highlight-current-row="false"
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
                 style="width: 100%; background: #1c1e26"
             >
             >
-                <el-table-column prop="name" label="藏品信息" width="158">
+                <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
                     <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 style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    height: 48px;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                         </div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="minter" label="卖家" width="104"> </el-table-column>
-                <el-table-column prop="nickname" label="买方" width="104">
+                <el-table-column prop="minter" label="卖家" width="94"> </el-table-column>
+                <el-table-column prop="nickname" label="买方" width="94">
                     <!-- <template slot-scope="scope"> -->
                     <!-- <template slot-scope="scope"> -->
                     <div
                     <div
                         style="
                         style="
@@ -66,23 +68,23 @@
                     </div>
                     </div>
                     <!-- </template> -->
                     <!-- </template> -->
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="price" label="金额" width="100">
+                <el-table-column prop="price" label="金额" width="90">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <div style="display: flex">
                         <div style="display: flex">
                             <img
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                                 alt=""
                             />
                             />
                             <div
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                             >
                                 {{ scope.row.price }}
                                 {{ scope.row.price }}
                             </div>
                             </div>
                         </div>
                         </div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="120"> </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="100"> </el-table-column>
                 <el-table-column prop="createdAt" label="成交时间" width="158"> </el-table-column>
                 <el-table-column prop="createdAt" label="成交时间" width="158"> </el-table-column>
                 <el-table-column prop="status" label="状态" width="108" :formatter="statusFormatter">
                 <el-table-column prop="status" label="状态" width="108" :formatter="statusFormatter">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
@@ -279,6 +281,9 @@ export default {
         }
         }
     }
     }
 }
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 /deep/.menu {
 /deep/.menu {
     .el-radio-button__inner {
     .el-radio-button__inner {
         border-color: #949699;
         border-color: #949699;
@@ -348,7 +353,7 @@ export default {
 .customer-table td,
 .customer-table td,
 .customer-table th.is-leaf {
 .customer-table th.is-leaf {
     border: none;
     border: none;
-    // font-weight: bold !important;
+    padding: 16px 0;
 }
 }
 //表格最外边框
 //表格最外边框
 .el-table--border,
 .el-table--border,

+ 25 - 7
src/main/pc-space/src/views/user/OrderValue.vue

@@ -24,19 +24,33 @@
                 :highlight-current-row="false"
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
                 style="width: 100%; background: #1c1e26"
             >
             >
-                <el-table-column prop="name" label="商品信息" width="228"> </el-table-column>
+                <el-table-column prop="name" label="商品信息" width="228">
+                    <template slot-scope="scope">
+                        <div
+                            style="
+                                width: 113px;
+                                height: 48px;
+                                line-height: 48px;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                            "
+                        >
+                            {{ scope.row.name }}
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="id" label="订单编号" width="134"> </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 style="color: #fdfb60" prop="payTime" label="交易时间" width="190"> </el-table-column>
                 <el-table-column prop="totalPrice" label="实际金额" width="140">
                 <el-table-column prop="totalPrice" label="实际金额" width="140">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <div style="display: flex">
                         <div style="display: flex">
                             <img
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/user/icon_jiage@3x (5).png"
                                 src="../../assets/user/icon_jiage@3x (5).png"
                                 alt=""
                                 alt=""
                             />
                             />
                             <div
                             <div
-                                style="color: #ffffff; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #ffffff; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                             >
                                 {{ scope.row.totalPrice }}
                                 {{ scope.row.totalPrice }}
                             </div>
                             </div>
@@ -49,12 +63,12 @@
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <div style="display: flex">
                         <div style="display: flex">
                             <img
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                                 alt=""
                             />
                             />
                             <div
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                             >
                                 {{ scope.row.price }}
                                 {{ scope.row.price }}
                             </div>
                             </div>
@@ -146,6 +160,9 @@ export default {
 .pagination-wrapper {
 .pagination-wrapper {
     .pagination();
     .pagination();
 }
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
 .search {
     background: #1a1a1a;
     background: #1a1a1a;
     width: 280px;
     width: 280px;
@@ -178,13 +195,13 @@ export default {
     }
     }
 }
 }
 .container {
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     width: 938px;
     .top {
     .top {
         .flex();
         .flex();
         justify-content: space-between;
         justify-content: space-between;
         .pay {
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             font-weight: bold;
             color: #ffffff;
             color: #ffffff;
             line-height: 28px;
             line-height: 28px;
@@ -233,6 +250,7 @@ export default {
 .el-table--border,
 .el-table--border,
 .el-table--group {
 .el-table--group {
     border: none;
     border: none;
+    padding: 16px 0;
 }
 }
 // 头部边框
 // 头部边框
 .customer-table thead tr th.is-leaf {
 .customer-table thead tr th.is-leaf {

+ 27 - 21
src/main/pc-space/src/views/user/PayRecord.vue

@@ -30,23 +30,25 @@
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="158">
+                <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
                     <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 style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    height: 48px;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                         </div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
@@ -54,19 +56,19 @@
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <div style="display: flex">
                         <div style="display: flex">
                             <img
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                                 alt=""
                             />
                             />
                             <div
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                             >
                                 {{ scope.row.price }}
                                 {{ scope.row.price }}
                             </div>
                             </div>
                         </div>
                         </div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="160"> </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="130"> </el-table-column>
                 <el-table-column prop="payTime" label="支付时间" width="248"> </el-table-column>
                 <el-table-column prop="payTime" label="支付时间" width="248"> </el-table-column>
                 <el-table-column fixed="right" label="操作">
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
@@ -198,6 +200,9 @@ export default {
 .pagination-wrapper {
 .pagination-wrapper {
     .pagination();
     .pagination();
 }
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
 .search {
     background: #1a1a1a;
     background: #1a1a1a;
     width: 280px;
     width: 280px;
@@ -230,13 +235,13 @@ export default {
     }
     }
 }
 }
 .container {
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     width: 938px;
     .top {
     .top {
         .flex();
         .flex();
         justify-content: space-between;
         justify-content: space-between;
         .pay {
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             font-weight: bold;
             color: #ffffff;
             color: #ffffff;
             line-height: 28px;
             line-height: 28px;
@@ -280,6 +285,7 @@ export default {
 .customer-table td,
 .customer-table td,
 .customer-table th.is-leaf {
 .customer-table th.is-leaf {
     border: none;
     border: none;
+    padding: 16px 0;
 }
 }
 //表格最外边框
 //表格最外边框
 .el-table--border,
 .el-table--border,

+ 24 - 18
src/main/pc-space/src/views/user/TransactionOrdes.vue

@@ -30,23 +30,25 @@
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="178">
+                <el-table-column prop="name" label="藏品信息" width="248">
                     <template slot-scope="scope">
                     <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 style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    height: 48px;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                         </div>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
@@ -181,6 +183,9 @@ export default {
 .pagination-wrapper {
 .pagination-wrapper {
     .pagination();
     .pagination();
 }
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
 .search {
     background: #1a1a1a;
     background: #1a1a1a;
     width: 280px;
     width: 280px;
@@ -213,13 +218,13 @@ export default {
     }
     }
 }
 }
 .container {
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     width: 938px;
     .top {
     .top {
         .flex();
         .flex();
         justify-content: space-between;
         justify-content: space-between;
         .pay {
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             font-weight: bold;
             color: #ffffff;
             color: #ffffff;
             line-height: 28px;
             line-height: 28px;
@@ -263,6 +268,7 @@ export default {
 .customer-table td,
 .customer-table td,
 .customer-table th.is-leaf {
 .customer-table th.is-leaf {
     border: none;
     border: none;
+    padding: 16px 0;
 }
 }
 //表格最外边框
 //表格最外边框
 .el-table--border,
 .el-table--border,