fix: onPageNotFound 兜底防空页崩溃 + 首页/记录页接入 i18n(语言切换覆盖全部3个tab)
这个提交包含在:
@@ -1,5 +1,6 @@
|
||||
var http = require('../../utils/request')
|
||||
var ble = require('../../services/ble')
|
||||
var i18n = require('../../i18n/index')
|
||||
|
||||
Page({
|
||||
data: {
|
||||
@@ -15,6 +16,7 @@ Page({
|
||||
},
|
||||
|
||||
onShow: function () {
|
||||
i18n.bind(this)
|
||||
this.loadRecords(true)
|
||||
},
|
||||
|
||||
@@ -52,7 +54,7 @@ Page({
|
||||
var records = (data.records || []).map(function (r) {
|
||||
var durationMin = Math.floor((r.total_duration_ms || 0) / 60000)
|
||||
pageMs += (r.total_duration_ms || 0)
|
||||
r.duration_text = durationMin + '分钟'
|
||||
r.duration_text = i18n.t('history.durationMin', { min: durationMin })
|
||||
r.region_names = ble.getRegionName(r.regions || 0).join('、')
|
||||
r.wavelength_name = ble.getWavelengthName(r.wavelength || 2)
|
||||
r.date_text = self.formatDate(r.start_time || r.created_at)
|
||||
@@ -89,8 +91,8 @@ Page({
|
||||
var h = ('0' + d.getHours()).slice(-2)
|
||||
var m = ('0' + d.getMinutes()).slice(-2)
|
||||
|
||||
if (d >= today) return '今天 ' + h + ':' + m
|
||||
if (d >= yesterday) return '昨天 ' + h + ':' + m
|
||||
return (d.getMonth() + 1) + '月' + d.getDate() + '日 ' + h + ':' + m
|
||||
if (d >= today) return i18n.t('history.today') + ' ' + h + ':' + m
|
||||
if (d >= yesterday) return i18n.t('history.yesterday') + ' ' + h + ':' + m
|
||||
return i18n.t('history.dateMd', { m: d.getMonth() + 1, d: d.getDate() }) + ' ' + h + ':' + m
|
||||
}
|
||||
})
|
||||
|
||||
在新工单中引用
屏蔽一个用户