Merge branch 'master' of http://60.205.190.38:9000/wuhao/ohplay_h5

# Conflicts:
#	src/pages/user/agreement.vue

src/pages/user/agreement.vue

@@ -139,6 +139,10 @@
   line-height: 45rpx;
 }
 
+.line-height {
+  line-height: 45rpx;
+}
+
 p, h3, .span{
   margin-bottom: 20rpx;
 }