Merge branch 'develop' into 'test'

package.json

@@ -34,7 +34,7 @@
     "nprogress": "^0.2.0",
     "popmotion": "^8.1.22",
     "qiniu-js": "^2.2.0",
-    "rym-element-ui": "^0.1.54",
+    "rym-element-ui": "^0.1.55",
     "vue-qr": "^1.2.8",
     "vuedraggable": "^2.16.0",
     "wangeditor": "^3.1.1"

src/App.vue

@@ -5,6 +5,15 @@
       :title="title"
     >
       <div
+        class="com-logo"
+        slot="logo"
+      >
+        <img
+          src="@/assets/images/pic_logo.png"
+          alt="logo"
+        >
+      </div>
+      <div
         class="AppTopBar"
         slot="title"
       >

src/containers/layout/components/UserBox.vue

@@ -523,7 +523,7 @@ export default {
     display: flex;
     align-items: center;
     line-height: 20px;
-    font-size: 16px;
+    font-size: 14px;
     .avatar-name-icon {
       position: relative;
       margin-left: 6px;