Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

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

@@ -99,11 +99,12 @@ export default {
                 height: 30px;
                 border-radius: 4px;
                 border: 1px solid;
-                border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
+                // border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
                 line-height: 30px;
                 text-align: center;
                 color: #00ffcb;
                 font-size: 16px;
+                // .line();
                 margin: 0 30px;
                 .login1 {
                     border: 1px solid #939599;

src/main/pc-space/src/mixins/pageableTable.js

@@ -158,16 +158,23 @@ export default {
         }
     },
     watch: {
-        sortStr() {
+        sort() {
+            let sortStr = [];
+            for (let [key, value] of Object.entries(this.sort)) {
+                if (value) {
+                    sortStr.push(key + ',' + value);
+                }
+            }
+            sortStr = sortStr.join(';');
             this.$router
                 .replace({
                     query: {
                         ...this.$route.query,
-                        sort: this.sortStr
+                        sort: sortStr
                     }
                 })
                 .catch(() => {});
-            this.page = 1;
+            this.sortStr = sortStr;
             this.getData();
         }
     }

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

@@ -120,7 +120,6 @@ export default {
 <style lang="less" scoped>
 .container {
     padding: 0 200px;
-
     background: #1a1a1a;
     .search {
         background: #1a1a1a;
@@ -179,6 +178,7 @@ export default {
     }
     .content {
         width: 276px;
+        height: 416px;
         // height: 416px;
         .line();
         display: inline-block;
@@ -262,7 +262,9 @@ export default {
                 border: 1px solid;
                 text-align: center;
                 line-height: 26px;
-                border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
+                // &::before {
+                //     color: red;
+                // }
             }
         }
     }

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

@@ -6,7 +6,7 @@
             <div class="btn">立即探索</div>
         </div>
 
-        <div class="card">33222</div>
+        <!-- <div class="card">33222</div> -->
 
         <div class="introduce">
             <div class="introduce2">
@@ -211,7 +211,7 @@ export default {
         justify-content: center;
         padding-bottom: 40px;
         &.all1 {
-            margin: 0;
+            margin-top: 40px;
         }
         .img1 {
             width: 32px;
@@ -271,6 +271,7 @@ export default {
         align-items: center;
         justify-content: space-between;
         .box {
+            // .line();
             width: 580px;
             height: 114px;
             background: #0f1111;

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

@@ -61,11 +61,13 @@ export default {
     min-height: 1300px;
     min-width: 1600px;
     background: #1a1a1a;
+    padding: 0 !important;
 }
 .el-footer {
     min-width: 1500px;
     position: relative;
     background: #0f1111;
+    padding: 0 !important;
     height: 170px !important;
     .footer {
         display: flex;

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

@@ -168,12 +168,9 @@ export default {
         display: flex;
         justify-content: space-between;
         .imgBox {
+            .line();
             width: 460px;
             height: 520px;
-            border-radius: 8px;
-            // margin-right: 30px;
-            border: 2px solid;
-            border-image: linear-gradient(135deg, rgba(0, 255, 203, 1), rgba(0, 110, 255, 1)) 1 1;
         }
         .works {
             display: flex;