Merge branch 'develop/3.2.4' of http://60.205.190.38:9000/zhaoheqing/wxmini into develop/3.2.4

# Conflicts:
#	pages/index/index.js

pages/index/index.js

@@ -79,6 +79,7 @@ Page({
   onDeviceLoad() {
     var that = this;
     var devicelist = wx.getStorageSync("devicelist") || "";
+    console.log("gadfasdfqwerqwerqewrqr====" + devicelist);
     if (!strings.isEmpty(devicelist)) {
       var list = JSON.parse(devicelist);
       that.updateDeviceList(list, true);