do merge develop code to fixes some bugs

@@ -7139,12 +7139,14 @@ $page.on('touchstart', '.del-icon', function() {
             },
             success: function(data) {
                 if (data.code === 200) {
-                       dialog.showDialog({
+                    dialog.showDialog({
                             dialogText: '删除浏览记录成功',
                             autoHide: true,
                             fast: true
                         });
-                       setTimeout(function(){window.history.go(0);},1000);
+                    setTimeout(function() {
+                        window.history.go(0);
+                    }, 1000);
                 }
             },
             complete: function() {