replace that with this by applying arrow function

myvin · Aug 8, 2018 · 4fda618 · 4fda618
1 parent 9d6ea40
commit 4fda618
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 67 deletions.
diff --git a/components/heartbeat/heartbeat.js b/components/heartbeat/heartbeat.js
@@ -20,10 +20,9 @@ Component({
   ready () {
     let systeminfo = getApp().globalData.systeminfo
     if (utils.isEmptyObject(systeminfo)) {
-      let that = this
       wx.getSystemInfo({
-        success: function(res) {
-          that.setData({
+        success: (res) => {
+          this.setData({
             windowWidth: res.windowWidth || res.screenWidth,
             windowHeight: res.windowHeight || res.screenHeight,
           })
@@ -68,9 +67,8 @@ Component({
         tops,
         widths,
       })
-      let that = this
       let timer = setTimeout(() => {
-        that.setData({
+        this.setData({
           animations,
         })
         clearTimeout(timer)

diff --git a/pages/about/about.js b/pages/about/about.js
@@ -25,16 +25,15 @@ Page({
     })
   },
   initSwiper () {
-    let that = this
     let systeminfo = getApp().globalData.systeminfo
     if (utils.isEmptyObject(systeminfo)) {
       wx.getSystemInfo({
-        success: function (res) {
-          that.setSwiperHeight(res)
+        success: (res) => {
+          this.setSwiperHeight(res)
         },
       })
     } else {
-      that.setSwiperHeight(systeminfo)
+      this.setSwiperHeight(systeminfo)
     }
   },
   setSwiperHeight (res) {

diff --git a/pages/index/index.js b/pages/index/index.js
@@ -113,14 +113,13 @@ Page({
     this.setData({
       enableSearch: false,
     })
-    let that = this
     let heartbeat = this.selectComponent('#heartbeat')
     heartbeat.dance(() => {
-      that.setData({
+      this.setData({
         showHeartbeat: false,
         enableSearch: true,
       })
-      that.setData({
+      this.setData({
         showHeartbeat: true,
       })
     })
@@ -138,17 +137,15 @@ Page({
       duration: 300,
     })
     if (val) {
-      let that = this
       this.geocoder(val, (loc) => {
-        that.init({
+        this.init({
           location: `${loc.lng},${loc.lat}`
         })
       })
     }
   },
   // 地理位置编码
   geocoder (address, success) {
-    let that = this
     wx.request({
       url: getApp().setGeocoderUrl(address),
       success (res) {
@@ -170,15 +167,14 @@ Page({
           icon: 'none',
         })
       },
-      complete () {
-        that.setData({
+      complete: () => {
+        this.setData({
           searchText: '',
         })
       },
     })
   },
   fail (res) {
-    let that = this
     wx.stopPullDownRefresh()
     let errMsg = res.errMsg || ''
     // 拒绝授权地理位置权限
@@ -187,14 +183,14 @@ Page({
         title: '需要开启地理位置权限',
         icon: 'none',
         duration: 2500,
-        success (res) {
-          if (that.canUseOpenSettingApi()) {
+        success: (res) => {
+          if (this.canUseOpenSettingApi()) {
             let timer = setTimeout(() => {
               clearTimeout(timer)
               wx.openSetting({})
             }, 2500)
           } else {
-            that.setData({
+            this.setData({
               openSettingButtonShow: true,
             })
           }
@@ -220,14 +216,13 @@ Page({
     }
   },
   init(params) {
-    let that = this
     let BMap = new bmap.BMapWX({
       ak: globalData.ak,
     })
     BMap.weather({
       location: params.location,
-      fail: that.fail,
-      success: that.success,
+      fail: this.fail,
+      success: this.success,
     })
   },
   // drawWeather () {
@@ -243,27 +238,25 @@ Page({
     this.init({})
   },
   setMenuPosition () {
-    let that = this
     wx.getStorage({
       key: 'pos',
-      success: function(res) {
-        that.setData({
+      success: (res) => {
+        this.setData({
           pos: res.data,
         })
       },
-      fail: function (res) {
-        that.setData({
+      fail: (res) => {
+        this.setData({
           pos: {},
         })
       },
     })
   },
   getCityDatas() {
-    let that = this
     let cityDatas = wx.getStorage({
       key: 'cityDatas',
-      success: function (res) {
-        that.setData({
+      success: (res) => {
+        this.setData({
           cityDatas: res.data,
         })
       },
@@ -272,14 +265,13 @@ Page({
   onShow () {
     this.getCityDatas()
     this.setMenuPosition()
-    let that = this
     let bcgColor = utils.themeSetting()
     this.setData({
       bcgColor,
     })
     this.setBcg()
     this.initSetting((setting) => {
-      that.checkUpdate(setting)
+      this.checkUpdate(setting)
     })
     if (!this.data.cityChanged) {
       this.init({})
@@ -322,35 +314,33 @@ Page({
     })
   },
   setBcg () {
-    let that = this
     wx.getSavedFileList({
-      success: function (res) {
+      success: (res) => {
         let fileList = res.fileList
         if (!utils.isEmptyObject(fileList)) {
-          that.setData({
+          this.setData({
             bcgImg: fileList[0].filePath,
           })
         } else {
-          that.setData({
+          this.setData({
             bcgImg: '',
           })
         }
       },
     })
   },
   initSetting (successFunc) {
-    let that = this
     wx.getStorage({
       key: 'setting',
-      success: function(res) {
+      success: (res) => {
         let setting = res.data || {}
-        that.setData({
+        this.setData({
           setting,
         })
         successFunc && successFunc(setting)
       },
-      fail: function () {
-        that.setData({
+      fail: () => {
+        this.setData({
           setting: {},
         })
       },

diff --git a/pages/setting/setting.js b/pages/setting/setting.js
@@ -75,10 +75,9 @@ Page({
     })
   },
   customBcg () {
-    let that = this
     wx.chooseImage({
-      success: function (res) {
-        that.removeBcg(() => {
+      success: (res) => {
+        this.removeBcg(() => {
           wx.saveFile({
             tempFilePath: res.tempFilePaths[0],
             success: function (res) {
@@ -116,17 +115,16 @@ Page({
     })
     this.ifDisableUpdate()
     this.getScreenBrightness()
-    let that = this
     wx.getStorage({
       key: 'setting',
-      success: function(res) {
+      success: (res) => {
         let setting = res.data
-        that.setData({
+        this.setData({
           setting,
         })
       },
-      fail: function (res) {
-        that.setData({
+      fail: (res) => {
+        this.setData({
           setting: {},
         })
       },
@@ -176,15 +174,14 @@ Page({
     })
   },
   getScreenBrightness () {
-    let that = this
     wx.getScreenBrightness({
-      success: function (res) {
-        that.setData({
+      success: (res) => {
+        this.setData({
           screenBrightness: Number(res.value * 100).toFixed(0),
         })
       },
-      fail: function (res) {
-        that.setData({
+      fail: (res) => {
+        this.setData({
           screenBrightness: '获取失败',
         })
       },
@@ -194,22 +191,20 @@ Page({
     this.setScreenBrightness(e.detail.value)
   },
   setScreenBrightness (val) {
-    let that = this
     wx.setScreenBrightness({
       value: val / 100,
-      success: function (res) {
-        that.setData({
+      success: (res) => {
+        this.setData({
           screenBrightness: val,
         })
       },
     })
   },
   setKeepScreenOn (b) {
-    let that = this
     wx.setKeepScreenOn({
       keepScreenOn: b,
-      success () {
-        that.setData({
+      success: () => {
+        this.setData({
           keepscreenon: b,
         })
       },
@@ -221,7 +216,6 @@ Page({
     })
   },
   removeStorage (e) {
-    let that = this
     let datatype = e.currentTarget.dataset.type
     if (datatype === 'menu') {
       wx.setStorage({
@@ -242,15 +236,15 @@ Page({
         content: '确认要初始化设置',
         cancelText: '容朕想想',
         confirmColor: '#40a7e7',
-        success(res) {
+        success: (res) => {
           if (res.confirm) {
             wx.removeStorage({
               key: 'setting',
               success: function (res) {
                 wx.showToast({
                   title: '设置已初始化',
                 })
-                that.setData({
+                this.setData({
                   setting: {},
                 })
               },
@@ -267,11 +261,11 @@ Page({
         success (res) {
           if (res.confirm) {
             wx.clearStorage({
-              success: function (res) {
+              success: (res) => {
                 wx.showToast({
                   title: '数据已清除',
                 })
-                that.setData({
+                this.setData({
                   setting: {},
                   pos: {},
                 })