Merge branch 'feature-tianyong' into gym-test

instrument.html

@@ -82,7 +82,7 @@
       }
       .firstLoading .loadingTip {
         font-size: 14px;
-        color: #fff;
+        color: #999;
       }
       @keyframes rotate {
         from {