Compare commits
2 Commits
a2bcaa3ded
...
da95a3cfb1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da95a3cfb1 | ||
|
|
44960116d2 |
@@ -52,8 +52,8 @@ export default defineAppConfig({
|
|||||||
},
|
},
|
||||||
permission: {
|
permission: {
|
||||||
"scope.userLocation": {
|
"scope.userLocation": {
|
||||||
desc: "用于定位设备位置",
|
desc: "用于绑定伴伴设备时补充初始位置参考",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
requiredPrivateInfos: ["getFuzzyLocation"],
|
requiredPrivateInfos: ["getLocation"],
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -216,8 +216,10 @@ export default function Bind() {
|
|||||||
if (!normalizedDeviceId) return
|
if (!normalizedDeviceId) return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const location = await Taro.getFuzzyLocation({
|
const location = await Taro.getLocation({
|
||||||
type: 'gcj02',
|
type: 'gcj02',
|
||||||
|
isHighAccuracy: true,
|
||||||
|
highAccuracyExpireTime: 3000,
|
||||||
})
|
})
|
||||||
await reportBindInitialLocation(normalizedDeviceId, {
|
await reportBindInitialLocation(normalizedDeviceId, {
|
||||||
latitude: location.latitude,
|
latitude: location.latitude,
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ export default function Device() {
|
|||||||
|
|
||||||
<View className='guest-action-card'>
|
<View className='guest-action-card'>
|
||||||
<Text className='guest-action-title'>准备绑定或管理设备</Text>
|
<Text className='guest-action-title'>准备绑定或管理设备</Text>
|
||||||
<Text className='guest-action-desc'>登录后可创建孩子资料、绑定设备并开启完整功能。</Text>
|
<Text className='guest-action-desc'>登录后可绑定设备,并在绑定流程中创建或选择孩子资料。</Text>
|
||||||
<View className='guest-primary-btn' onClick={() => goLoginWithRedirect('/pages/device/index')}>
|
<View className='guest-primary-btn' onClick={() => goLoginWithRedirect('/pages/device/index')}>
|
||||||
<Text className='guest-primary-btn-text'>登录后继续</Text>
|
<Text className='guest-primary-btn-text'>登录后继续</Text>
|
||||||
</View>
|
</View>
|
||||||
@@ -334,10 +334,10 @@ export default function Device() {
|
|||||||
<View className='empty-robot'>
|
<View className='empty-robot'>
|
||||||
<Image className='robot-img' src={require('../../assets/tab-icons/robot.png')} mode='aspectFit' />
|
<Image className='robot-img' src={require('../../assets/tab-icons/robot.png')} mode='aspectFit' />
|
||||||
</View>
|
</View>
|
||||||
<Text className='empty-title'>先添加一个儿童资料</Text>
|
<Text className='empty-title'>先绑定一台伴伴设备</Text>
|
||||||
<Text className='empty-subtitle'>添加后才能为孩子绑定专属设备并查看聊天和定位信息</Text>
|
<Text className='empty-subtitle'>绑定时可以选择已有孩子,或直接新建孩子昵称</Text>
|
||||||
<View className='empty-btn' onClick={() => Taro.switchTab({ url: '/pages/sleep/index' })}>
|
<View className='empty-btn' onClick={() => Taro.navigateTo({ url: '/pages/bind/index' })}>
|
||||||
<Text className='empty-btn-text'>去添加孩子</Text>
|
<Text className='empty-btn-text'>添加设备</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
{systemBanner}
|
{systemBanner}
|
||||||
|
|||||||
@@ -908,11 +908,6 @@ export default function Sleep() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.name === '新增孩子') {
|
|
||||||
handleOpenModal('add')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item.name === '删除孩子') {
|
if (item.name === '删除孩子') {
|
||||||
setShowDeleteChildModal(true)
|
setShowDeleteChildModal(true)
|
||||||
return
|
return
|
||||||
@@ -1075,13 +1070,6 @@ export default function Sleep() {
|
|||||||
value: currentChildName,
|
value: currentChildName,
|
||||||
arrow: true,
|
arrow: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
icon: require('../../assets/tab-icons/orange-robot.png'),
|
|
||||||
iconBgClass: 'orange',
|
|
||||||
name: '新增孩子',
|
|
||||||
value: '',
|
|
||||||
arrow: true,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
icon: require('../../assets/tab-icons/orange-robot.png'),
|
icon: require('../../assets/tab-icons/orange-robot.png'),
|
||||||
iconBgClass: 'orange',
|
iconBgClass: 'orange',
|
||||||
|
|||||||
Reference in New Issue
Block a user