Merge remote-tracking branch 'origin/dev' into dev

entry/src/main/ets/common/utils/tools.ts

@@ -119,12 +119,16 @@ export async function getCurrentHourTime():Promise<string> {
   //@ts-ignore
   s = s < 10 ? '0' + s : s;
   let ss = date.getMilliseconds();
-  //@ts-ignore
+  let nowSS = ''
-  ss = ss < 10 ? '00' + ss : ss;
+  if(ss < 10){
-  //@ts-ignore
+    //@ts-ignore
-  ss = ss < 100 ? '0' + ss : ss;
+    nowSS = '00' + ss
-
+  }
-  return `${h}${m}${s}${ss}`
+  if(ss >= 10 && ss < 100){
+    //@ts-ignore
+    nowSS = '0' + s
+  }
+  return `${h}${m}${s}${nowSS||ss}`
 }
 
 //时间戳转日期