Merge remote-tracking branch 'origin/master'

@@ -101,7 +101,7 @@ Page({
     },
     timeorder:function(){
         if(this.data.sort==''){
-            this.data.form.sort=1;
+            this.data.sort=1;
         }else{
             this.data.sort='';
         }