Merge branch 'hqyDev' of http://git.dayaedu.com/liushengqiang/music-score into ktyq-test-new

src/page-instrument/view-figner/index.module.less

@@ -307,6 +307,7 @@
                     line-height: 16px;
                     padding: 7px 6px;
                     height: 46px;
+                    flex-shrink: 0;
                 }
 
                 .backBtn {
@@ -413,7 +414,7 @@
                 .restoreBtn{
                     position: absolute;
                     right: -51px;
-                    top: -74px;
+                    top: -68px;
                     width: 72px;
                     height: 31px;
                     background: url("./image/restore.png") no-repeat;
@@ -423,10 +424,18 @@
             .moreFun{
                 margin-left: 6px;
                 position: relative;
-                width: 44px;
-                height: 54px;
-                background: url("./image/more.png") no-repeat;
-                background-size: 100% 100%;
+                text-align: center;
+                width: 42px;
+                background: linear-gradient(180deg, #F4EFED 0%, #D9CEC7 100%);
+                box-shadow: 0px 1px 2px 0px #9F9690, inset 0px -2px 0px 0px #CDC0B5, inset 0px 2px 1px 0px #FFFFFF;
+                border-radius: 21px;
+                font-weight: 600;
+                font-size: 12px;
+                color: #616161;
+                line-height: 16px;
+                padding: 7px 6px;
+                height: 46px;
+                flex-shrink: 0;
                 &:hover{
                     .btnBox{
                         display: initial;
@@ -435,33 +444,33 @@
                 .btnBox {
                     display: none;
                     position: absolute;
-                    height: 88px;
+                    height: 86px;
                     right: -20px;
-                    top: -86px;
+                    top: -84px;
                     .btnCon {
                         border-radius: 17px;
                         display: flex;
                         background: #DFD7D3;
                         padding: 6px 5px 3px 6px;
-                        border: 2px solid #FFFFFF;
+                        border: 2px solid #EBE5E3;
                         position: relative;
                         .triangle{
                             position: absolute;
-                            bottom: -12px;
-                            right: 29px;
+                            bottom: -9px;
+                            right: 30px;
                             width: 0;
                             height: 0;
-                            border-left: 12px solid transparent;
-                            border-right: 12px solid transparent;
-                            border-top: 12px solid #ffffff;
+                            border-left: 9px solid transparent;
+                            border-right: 9px solid transparent;
+                            border-top: 9px solid #EBE5E3;
                             &::after{
                                 content: "";
                                 position: absolute;
-                                bottom: 2px;
-                                left: -10px;
-                                border-left: 10px solid transparent;
-                                border-right: 10px solid transparent;
-                                border-top: 10px solid #DFD7D3;
+                                bottom: 2.5px;
+                                left: -6.5px;
+                                border-left: 7px solid transparent;
+                                border-right: 7px solid transparent;
+                                border-top: 7px solid #DFD7D3;
                                 z-index: 1;
                             }
                         }

src/page-instrument/view-figner/index.tsx

@@ -1644,6 +1644,7 @@ export default defineComponent({
                                     )}
                                 </div>
                                 <div class={styles.moreFun}>
+                                  更多功能
                                   <div class={styles.btnBox}>
                                     <div class={styles.btnCon}>
                                       <div