Merge branch 'lvtz_home' of git.server:wangxuelai/wechatapp.shangjiadao.com into lvtz_home

business/pages/classservice/classranklist.js

@@ -19,7 +19,7 @@ Page({
     imageRoot: app.globalData.imageRoot,
     imageVersion: app.globalData.imageVersion,
     page: 1,
-    perPage: 4,
+    perPage: 20,
     hasmore: true,
     emptyPage: false,
     rankingType: 1,

components/sjdmediaeditor/index.js

@@ -302,7 +302,7 @@ Component({
           return tempFile
         }
         return wxChooseVideo({
-          compressed: true
+          // compressed: true
         })
       }).then((res) => {
         let tempFilePath ='';