Merge branch 'test'

# Conflicts:
#	src/utils/request.js

src/pages/museum/img.json

@@ -94,7 +94,7 @@
     "url": "../../static/museum/20.png"
   }, {
     "id": 21,
-    "name": "贴贴音箱",
+    "name": "贴贴音箱小王子Meet",
     "url": "../../static/museum/21.png"
   }]
 }]