.

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

@@ -13,7 +13,7 @@
             <div class="name" v-for="(item, index) in list" :key="index">
                 <span>{{ item.title }}</span>
             </div>
-            <div class="name">4. 平台会收取作品出售价格的<span> 5% </span>作为服务费</div>
+            <div class="name">4. 平台会收取作品出售价格的<span style="color: #ff4f50"> 5% </span>作为服务费</div>
             <div class="name">5. 因电子支付通道限制，单笔限额20000元</div>
             <div class="border1"></div>
             <div class="title">寄售价格</div>
@@ -178,12 +178,16 @@ input::-webkit-inner-spin-button {
     background: #ffffff;
     border-radius: 8px;
     .el-dialog__title {
-        font-size: 20px;
-        font-weight: 500;
-        color: #292c33;
-        line-height: 28px;
+        font-size: 18px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: bold;
+        color: #000000;
+        line-height: 24px;
     }
 }
+/deep/ .el-dialog__header {
+    padding: 18px 0;
+}
 /deep/ .el-dialog__body {
     padding: 0;
 }
@@ -207,7 +211,7 @@ input::-webkit-inner-spin-button {
     border: 0;
 }
 .content {
-    margin-top: 0;
+    margin-top: 0 !important;
     .title {
         font-size: 16px;
         font-weight: 400;

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

@@ -135,11 +135,11 @@ export default {
     margin-bottom: 16px;
     .box {
         display: flex;
+        align-items: center;
+        justify-content: center;
         .img {
             width: 189px;
             height: 120px;
-            position: relative;
-            z-index: 1;
         }
         .coupon-top {
             padding: 16px 0;
@@ -152,14 +152,13 @@ export default {
                 font-weight: bold;
                 color: #1a1a1a;
                 line-height: 36px;
-                margin: 15px 0 0 27px;
             }
             .text2 {
                 font-size: 12px;
                 font-weight: 400;
                 color: #1a1a1a;
                 line-height: 22px;
-                margin-left: 30px;
+                text-align: center;
             }
         }
     }

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

@@ -60,7 +60,7 @@ export default {
             show: false,
             activeName: '',
             lists: '',
-            url: '/identityAuth/all',
+            // url: '/identityAuth/all',
             menus: [
                 {
                     label: '铸造者',

src/main/pc-space/src/views/Home.vue

@@ -173,12 +173,13 @@
 import CollectionInfo from '../components/CollectionInfo.vue';
 import MoreTitle from '../components/MoreTitle.vue';
 import LoginInfo from '../components/LoginInfo.vue';
-// import pageableTable from '@/mixins/pageableTable';
+import pageableTable from '@/mixins/pageableTable';
 import { mapState, mapMutations } from 'vuex';
 import { Swiper, SwiperSlide } from 'vue-awesome-swiper';
 import 'swiper/css/swiper.css';
 export default {
     components: { CollectionInfo, MoreTitle, Swiper, SwiperSlide, LoginInfo },
+    mixins: [pageableTable],
     data() {
         return {
             creators: [],
@@ -513,6 +514,7 @@ export default {
     text-align: center;
 }
 /deep/.menus {
+    // padding: 22px 25px 0px;
     padding: 22px 25px 0px;
     .el-tabs__item {
         padding: 0 25px;

src/main/pc-space/src/views/Send.vue

@@ -460,6 +460,12 @@ export default {
 /deep/.el-loading-mask {
     background-color: #ffffffee;
 }
+/deep/ .el-dialog__header {
+    padding: 18px 0;
+}
+/deep/ .el-dialog__title {
+    font-weight: bold;
+}
 .title {
     font-size: 16px;
     font-weight: 400;

src/main/pc-space/src/views/Submit.vue

@@ -197,7 +197,6 @@ export default {
         if (this.isLogin) {
             this.add();
         }
-        
     },
     methods: {
         initTime(dingdanId, initTime) {
@@ -249,14 +248,14 @@ export default {
                 }, 1000);
             }
         },
-        
+
         add() {
             this.$http
                 .post(
                     '/userCoupon/all',
                     {
                         query: {
-                            userId: this.userInfo.id
+                            // userId: this.userInfo.id
                         }
                     },
                     {
@@ -264,13 +263,16 @@ export default {
                     }
                 )
                 .then(res => {
-                    this.list = res.content.filter(item => {
-                        return !item.used && this.checkTime(item) && this.checkUse(item, this.$route.query.id);
-                    });
                     this.listAll = res.content.filter(item => {
+                        return item.used || !this.checkTime(item);
+                    });
+                    this.list = res.content.filter(item => {
                         return !item.used && this.checkTime(item) && this.checkUse(item, this.$route.query.id);
                     });
-                    console.log(this.listAll);
+                    // this.listAll = res.content.filter(item => {
+                    //     return !item.used && this.checkTime(item) && this.checkUse(item, this.$route.query.id);
+                    // });
+                    // console.log(this.listAll);
                 });
         },
         IdFn(e) {
@@ -484,6 +486,13 @@ export default {
 /deep/ .el-dialog {
     border-radius: 8px;
 }
+/deep/ .el-dialog__header {
+    padding: 18px 0;
+}
+/deep/ .el-dialog__title {
+    font-weight: bold;
+    font-size: 18px;
+}
 .list {
     padding: 24px 0 50px;
 }
@@ -493,11 +502,11 @@ export default {
     margin-bottom: 16px;
     .box {
         display: flex;
+        align-items: center;
+        justify-content: center;
         .img {
             width: 189px;
             height: 120px;
-            position: relative;
-            z-index: 1;
         }
         .coupon-top {
             padding: 16px 0;
@@ -510,14 +519,13 @@ export default {
                 font-weight: bold;
                 color: #1a1a1a;
                 line-height: 36px;
-                margin: 15px 0 0 27px;
             }
             .text2 {
                 font-size: 12px;
                 font-weight: 400;
                 color: #1a1a1a;
                 line-height: 22px;
-                margin-left: 30px;
+                text-align: center;
             }
         }
     }
@@ -548,11 +556,11 @@ export default {
             line-height: 16px;
             margin-top: 45px;
         }
-        .icon {
-            width: 24px;
-            height: 24px;
-            margin-top: 33px;
-        }
+    }
+    .icon {
+        width: 24px;
+        height: 24px;
+        margin-top: 33px;
     }
 }
 /deep/.el-radio {