Merge branch 'master' of http://svn.ouj.com:3000/kangheitan/migrate-webgame-vue

app/src/components/boutiqueGame/style.scss

@@ -30,8 +30,14 @@
             color: $note-text-color;
             display: inline-block;
             padding: 0 3px;
-            border: 0 solid rgba(0, 0, 0, 0);
+            border-bottom: 2px solid rgba(255, 255, 255, 0);
+            padding-bottom: 5px;
             cursor: pointer;
+            &:hover {
+                color: $main-active-color;
+                border-bottom: 2px solid rgba($main-active-color, 1);
+                transition: all 0.3s;
+            }
         }
         .type {
             margin-right: 40px;
@@ -39,7 +45,7 @@
         .active {
             color: $main-active-color;
             border-bottom: 2px solid $main-active-color;
-            padding-bottom: 5px;
+            transition: all 0.2s;
         }
     }
     .more {

app/src/components/gameListPop/style.scss

@@ -47,6 +47,7 @@
                 border-radius: 2px;
                 font-size: 12px;
                 color: #fff;
+                text-align: center;
             }
         }
     }

app/src/page/list/allGame.vue

@@ -121,10 +121,11 @@ export default {
             li {
                 padding: 2px;
                 margin-right: 45px;
+                text-align: center;
+                border-radius: 2px;
                 cursor: pointer;
+                transition: all 0.2s ease;
                 &:hover {
-                    border-radius: 2px;
-                    text-align: center;
                     background: $main-active-color;
                     color: #fff;
                 }

app/src/page/self/index.vue

@@ -32,6 +32,10 @@
                                 </div>
                                 <div class="delete-game" v-if="isEdit"></div>
                             </div>
+                            <div class="add-game del-spacing">
+                                <div class="add-box"></div>
+                                <div>添加游戏</div>
+                            </div>
                         </div>
                     </el-carousel-item>
                 </el-carousel>
@@ -136,36 +140,36 @@ export default {
                     isTop: false,
                     isNew: false
                 },
-                // {
-                //     name: '龙权天下',
-                //     serve: '4服',
-                //     isTop: false,
-                //     isNew: false
-                // },
-                // {
-                //     name: '斩月屠龙H5',
-                //     serve: '4服',
-                //     isTop: false,
-                //     isNew: false
-                // },
-                // {
-                //     name: '斩月屠龙H5',
-                //     serve: '4服',
-                //     isTop: false,
-                //     isNew: false
-                // },
-                // {
-                //     name: '龙权天下',
-                //     serve: '4服',
-                //     isTop: false,
-                //     isNew: false
-                // },
-                // {
-                //     name: '龙卫传奇',
-                //     serve: '4服',
-                //     isTop: false,
-                //     isNew: false
-                // },
+                {
+                    name: '龙权天下',
+                    serve: '4服',
+                    isTop: false,
+                    isNew: false
+                },
+                {
+                    name: '斩月屠龙H5',
+                    serve: '4服',
+                    isTop: false,
+                    isNew: false
+                },
+                {
+                    name: '斩月屠龙H5',
+                    serve: '4服',
+                    isTop: false,
+                    isNew: false
+                },
+                {
+                    name: '龙权天下',
+                    serve: '4服',
+                    isTop: false,
+                    isNew: false
+                },
+                {
+                    name: '龙卫传奇',
+                    serve: '4服',
+                    isTop: false,
+                    isNew: false
+                },
             ]
         }
     },
@@ -176,11 +180,11 @@ export default {
         }
     },
     mounted() {
-        this.pageCount = Math.ceil(this.mockList.length / 6)
+        this.pageCount = Math.ceil(this.mockList.length / 5)
         this.pageCount > 1 && (this.showPoint = 'outside')
         //分组
-        for (var i = 0, len = this.mockList.length; i < len; i += 6) {
-            this.arr.push(this.mockList.slice(i, i + 6));
+        for (var i = 0, len = this.mockList.length; i < len; i += 5) {
+            this.arr.push(this.mockList.slice(i, i + 5));
         }
     }
 };
@@ -194,6 +198,7 @@ export default {
             height: 10px;
             border-radius: 5px;
             background: #dedede;
+            opacity: 1;
         }
     }
     .el-carousel__indicator {

app/src/page/self/style.scss

@@ -255,17 +255,9 @@
         }
     }
 
-    .list-complete-item {
-        transition: all 1s;
-        display: inline-block;
-        margin-right: 10px;
-    }
-    .list-complete-enter, .list-complete-leave-to
-/* .list-complete-leave-active for below version 2.1.8 */ {
-        opacity: 0;
-        transform: translateY(30px);
-    }
-    .list-complete-leave-active {
-        position: absolute;
+    .del-spacing {
+        width: 138px;
+        padding-left: 5px;
+        box-sizing: border-box;
     }
 }