From c95f62114462f043f7c86e9b14bb5ad40661b588 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 29 Apr 2025 20:38:50 +0800
Subject: [PATCH] =?UTF-8?q?reactor=EF=BC=9AgetSystemInfoSync=20=3D?=
 =?UTF-8?q?=E3=80=8B=20getWindowInfo=EF=BC=8C=E8=A7=A3=E5=86=B3=20device?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/components/detail/detail-content-card.vue |  3 ---
 pages/goods/components/detail/detail-navbar.vue       |  5 +++--
 sheep/helper/index.js                                 |  8 --------
 sheep/platform/index.js                               |  2 +-
 sheep/ui/su-sticky/su-sticky.vue                      | 10 ++++++----
 uni_modules/mp-html/components/mp-html/node/node.vue  |  4 ++--
 uni_modules/mp-html/components/mp-html/parser.js      |  6 ++++--
 7 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pages/goods/components/detail/detail-content-card.vue b/pages/goods/components/detail/detail-content-card.vue
index daac2b2f..38d45f98 100644
--- a/pages/goods/components/detail/detail-content-card.vue
+++ b/pages/goods/components/detail/detail-content-card.vue
@@ -11,9 +11,6 @@
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  const { safeAreaInsets } = sheep.$platform.device;
-
   const props = defineProps({
     content: {
       type: String,
diff --git a/pages/goods/components/detail/detail-navbar.vue b/pages/goods/components/detail/detail-navbar.vue
index 1d1153d4..d454ec0f 100644
--- a/pages/goods/components/detail/detail-navbar.vue
+++ b/pages/goods/components/detail/detail-navbar.vue
@@ -45,7 +45,7 @@
   import { onPageScroll } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import throttle from '@/sheep/helper/throttle.js';
-  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+  import { showMenuTools } from '@/sheep/hooks/useModal';
 
   const sys_statusBar = sheep.$platform.device.statusBarHeight;
   const sys_navBar = sheep.$platform.navbar;
@@ -98,7 +98,8 @@
 
   function getCommentCardNode() {
     return new Promise((res, rej) => {
-      uni.createSelectorQuery()
+      uni
+        .createSelectorQuery()
         .select('.detail-comment-selector')
         .boundingClientRect((data) => {
           if (data) {
diff --git a/sheep/helper/index.js b/sheep/helper/index.js
index baed3e47..328949ad 100644
--- a/sheep/helper/index.js
+++ b/sheep/helper/index.js
@@ -47,13 +47,6 @@ export function sleep(value = 30) {
 export function os() {
   return uni.getDeviceInfo().platform.toLowerCase();
 }
-/**
- * @description 获取系统信息同步接口
- * @link 获取系统信息同步接口 https://uniapp.dcloud.io/api/system/info?id=getsysteminfosync
- */
-export function sys() {
-  return uni.getSystemInfoSync();
-}
 
 /**
  * @description 取一个区间数
@@ -679,7 +672,6 @@ export default {
   getPx,
   sleep,
   os,
-  sys,
   random,
   guid,
   $parent,
diff --git a/sheep/platform/index.js b/sheep/platform/index.js
index c0bb0ec7..bf48e521 100644
--- a/sheep/platform/index.js
+++ b/sheep/platform/index.js
@@ -18,7 +18,7 @@ import apple from './provider/apple';
 import share from './share';
 import Pay from './pay';
 
-const device = uni.getSystemInfoSync();
+const device = uni.getWindowInfo();
 
 const os = uni.getDeviceInfo().platform;
 
diff --git a/sheep/ui/su-sticky/su-sticky.vue b/sheep/ui/su-sticky/su-sticky.vue
index a8831a26..959318d9 100644
--- a/sheep/ui/su-sticky/su-sticky.vue
+++ b/sheep/ui/su-sticky/su-sticky.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-  import { deepMerge, addStyle, addUnit, sleep, guid, getPx, os, sys } from '@/sheep/helper';
+  import { deepMerge, addStyle, addUnit, guid, getPx, os } from '@/sheep/helper';
   import sheep from '@/sheep';
   /**
    * sticky 吸顶
@@ -130,7 +130,8 @@
       },
       $uGetRect(selector, all) {
         return new Promise((resolve) => {
-          uni.createSelectorQuery()
+          uni
+            .createSelectorQuery()
             .in(this)
             [all ? 'selectAll' : 'select'](selector)
             .boundingClientRect((rect) => {
@@ -194,7 +195,7 @@
         // #endif
 
         // 如果安卓版本高于8.0，依然认为是支持css sticky的(因为安卓7在某些机型，可能不支持sticky)
-        if (os() === 'android' && Number(sys().system) > 8) {
+        if (os() === 'android' && Number(uni.getDeviceInfo().system) > 8) {
           this.cssSticky = true;
         }
 
@@ -218,7 +219,8 @@
         // 方法内进行判断，避免在其他平台生成无用代码
         // #ifdef APP-VUE || MP-WEIXIN
         return new Promise((resolve) => {
-          uni.createSelectorQuery()
+          uni
+            .createSelectorQuery()
             .in(this)
             .select('.u-sticky')
             .fields({
diff --git a/uni_modules/mp-html/components/mp-html/node/node.vue b/uni_modules/mp-html/components/mp-html/node/node.vue
index 09252fdd..b26eaa15 100644
--- a/uni_modules/mp-html/components/mp-html/node/node.vue
+++ b/uni_modules/mp-html/components/mp-html/node/node.vue
@@ -64,7 +64,7 @@
           </block>
         </view>
       </view>
-      
+
       <!-- 富文本 -->
       <!-- #ifdef H5 || ((MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE2) -->
       <rich-text v-else-if="!n.c&&!handler.isInline(n.name, n.attrs.style)" :id="n.attrs.id" :style="n.f" :user-select="opts[4]" :nodes="[n]" />
@@ -125,7 +125,7 @@ export default {
     return {
       ctrl: {},
       // #ifdef MP-WEIXIN
-      isiOS: uni.getSystemInfoSync().system.includes('iOS')
+      isiOS: uni.getDeviceInfo().system.includes('iOS')
       // #endif
     }
   },
diff --git a/uni_modules/mp-html/components/mp-html/parser.js b/uni_modules/mp-html/components/mp-html/parser.js
index 5a930007..5bddd163 100644
--- a/uni_modules/mp-html/components/mp-html/parser.js
+++ b/uni_modules/mp-html/components/mp-html/parser.js
@@ -77,11 +77,13 @@ const config = {
 }
 const tagSelector={}
 const {
-  windowWidth,
   // #ifdef MP-WEIXIN
   system
   // #endif
-} = uni.getSystemInfoSync()
+} = uni.getDeviceInfo()
+const {
+  windowWidth
+} = uni.getWindowInfo()
 const blankChar = makeMap(' ,\r,\n,\t,\f')
 let idIndex = 0