diff --git a/common/AirQuality/build.gradle b/common/AirQuality/build.gradle index 46b60f671636e773ed178e73685210c630acf439..d16d30e6fa248ede2b405fea960d97a080b31e8e 100644 --- a/common/AirQuality/build.gradle +++ b/common/AirQuality/build.gradle @@ -17,7 +17,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:3.0.3.2' + classpath 'com.huawei.ohos:hap:3.0.5.2' } } diff --git a/common/AirQuality/entry/src/main/js/default/pages/second/second.js b/common/AirQuality/entry/src/main/js/default/pages/second/second.js index 1912cea0dc4e66fef86a4a25703202f3dcd109b9..ed704fddf11b5fbff2577d930f6738a057b8c62c 100644 --- a/common/AirQuality/entry/src/main/js/default/pages/second/second.js +++ b/common/AirQuality/entry/src/main/js/default/pages/second/second.js @@ -26,11 +26,6 @@ export default { } }, backMain() { - router.replace({ - uri: 'pages/index/index', - params: { - selectedCityIndex: this.selectedCityIndex - } - }); + router.back() } } diff --git a/common/DistributeCalc/build.gradle b/common/DistributeCalc/build.gradle index 34d8cda45039e1cf8172f826af98cbc762d29832..0a4780272fdd4d22a77eb45b1fc6ffa98d4170c6 100644 --- a/common/DistributeCalc/build.gradle +++ b/common/DistributeCalc/build.gradle @@ -16,7 +16,7 @@ buildscript { } } dependencies { - classpath 'com.huawei.ohos:hap:3.0.3.4' + classpath 'com.huawei.ohos:hap:3.0.5.2' } } diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js index 600aa4d9a76d983e933ef975ce051cb01d41b735..dc63491d8af881f47de2e77c6db03533931acf7f 100644 --- a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js +++ b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js @@ -254,5 +254,8 @@ export default { console.log('Calc[IndexPage] handleEqual'); this.dataChange('expression', 'equal'); } + }, + handleExist() { + app.terminate(); } }; \ No newline at end of file