diff --git a/public/CNAME b/public/CNAME index e69de29bb..d57f77fb4 100644 --- a/public/CNAME +++ b/public/CNAME @@ -0,0 +1,37 @@ +查看分支:git branch + +创建分支:git branch + +切换分支:git checkout 或者git switch + +创建+切换分支:git checkout -b 或者git switch -c + +合并某分支到当前分支:git merge + +删除分支:git branch -d +运行:npm run serve + +推送:git push origin dev + +box-shadow: 0px 0px 14px 0px #000000CC; +width: calc(100%-135px); + +color: #000; + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); + border-radius: 10px; + border: 1px #fff solid; + transition: 0.3s ease-out; + cursor: pointer; + + + +background-color: #e86f0019; + box-sizing: border-box; + border-radius: 10px; + overflow: hidden; + overflow-y: auto; + border: 1px solid #d16400; + box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4); + + + color: #d16400; \ No newline at end of file diff --git a/src/assets/css/book/card.less b/src/assets/css/book/card.less index 9b303883e..b31e024b1 100644 --- a/src/assets/css/book/card.less +++ b/src/assets/css/book/card.less @@ -75,6 +75,9 @@ } } &:hover { + .u-book-info{ + box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.85); + } .u-desc-info { .desc { opacity: 0; diff --git a/src/assets/css/book/single.less b/src/assets/css/book/single.less index 83bb52618..cef793eca 100644 --- a/src/assets/css/book/single.less +++ b/src/assets/css/book/single.less @@ -33,7 +33,7 @@ padding: 14px 36px 14px 14px; box-sizing: border-box; color: #000000; - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.25); background: url("../../img/book/line.png") no-repeat top right #324148; background-size: contain; .book-content { @@ -351,7 +351,7 @@ @media screen and (max-width: @phone) { .book-single-wrapper .book-single-content { .book-detail-wrapper { - flex-direction: column; + flex-direction: column-reverse; .book-info { .w(100%); } diff --git a/src/assets/css/common/tabs.less b/src/assets/css/common/tabs.less index de7f33094..42ba9d756 100644 --- a/src/assets/css/common/tabs.less +++ b/src/assets/css/common/tabs.less @@ -149,8 +149,12 @@ .flex; box-sizing: border-box; flex-wrap: wrap; + justify-content:space-between; padding: 10px 15px; box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2); + .el-input{ + width: calc(100% - 50px); + } } } } diff --git a/src/assets/css/horse/index.less b/src/assets/css/horse/index.less index ebe8996e3..ebc3c20b9 100644 --- a/src/assets/css/horse/index.less +++ b/src/assets/css/horse/index.less @@ -10,6 +10,20 @@ color: #fff; } } + .u-search{ + svg{ + cursor: pointer; + border-radius: 20px; + margin-top:3px; + } + &:hover{ + svg{ + fill: #fff; + background-color: #d16400; + border-color: #d16400; + } + } + } } .m-horse-content { .m-horse-broadcast__header { diff --git a/src/assets/css/reputation/single.less b/src/assets/css/reputation/single.less index 1140f6e57..09124632b 100644 --- a/src/assets/css/reputation/single.less +++ b/src/assets/css/reputation/single.less @@ -23,11 +23,10 @@ .item { display: flex; justify-content: flex-start; - align-items: center; - padding: 0 20px; + align-items: start; + padding: 18px 20px; margin-bottom: 20px; width: 100%; - height: 60px; box-sizing: border-box; color: #000; box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); @@ -44,7 +43,8 @@ .desc { display: flex; justify-content: flex-start; - align-items: center; + align-items: start; + width: inherit; .desc-title { .fz(16px); margin-right: 10px; @@ -52,6 +52,7 @@ width: 90px; } .desc-content { + width: inherit; font-size: 14px; font-weight: 300; } @@ -69,13 +70,14 @@ padding: 20px; width: 414px; height: 380px; - background-color: #e86f0019; box-sizing: border-box; border-radius: 10px; overflow: hidden; overflow-y: auto; - border: 1px solid #d16400; - box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1); + border: 1px #fff solid; + transition: 0.3s ease-out; + cursor: pointer; .stage-title { display: flex; justify-content: space-between; @@ -83,7 +85,7 @@ span { font-size: 16px; font-weight: 700; - color: #d16400; + color: #000; } .page-list { display: flex; @@ -121,11 +123,25 @@ height: 36px; line-height: 36px; text-align: center; - background-color: #d16400; - color: #fff; + background-color: #C5C5C5; + color: #000; font-weight: 700; border-radius: 5px; } + &.active{ + border: 1px solid #d16400; + box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4); + .stage-title{ + span{ + color:#d16400; + } + } + .no-data{ + background-color: #d16400; + color:#fff; + } + + } } } } @@ -215,11 +231,12 @@ .r(10px); padding: 20px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); + height: fit-content; .map-content { .clip; margin-top: 20px; width: 468px; - height: 275px; + height: 260px; overflow: hidden; .m-reputation-map { & > div { @@ -320,15 +337,12 @@ flex-direction: column; height: auto; align-items: flex-start; - .from-to { - font-weight: normal; - } + .desc { align-items: flex-start; font-weight: normal; .desc-title { flex-shrink: 0; - font-weight: normal; } } } diff --git a/src/views/horse/Index.vue b/src/views/horse/Index.vue index dd665123f..534c40ccd 100644 --- a/src/views/horse/Index.vue +++ b/src/views/horse/Index.vue @@ -11,6 +11,9 @@ > {{ item.name }} + + + - - -