feat: 兼容支付宝小程序

sadais-org · Aug 28, 2020 · c1043bf · c1043bf
1 parent e4a35c8
commit c1043bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/components/pi-loading/index.vue b/components/pi-loading/index.vue
@@ -63,13 +63,6 @@ export default {
       default() {
         return loading.textStyle
       }
-    },
-    // 整个loading自定义样式
-    customStyle: {
-      type: Object,
-      default() {
-        return loading.customStyle
-      }
     }
   },
   computed: {

diff --git a/components/pi-popup/index.vue b/components/pi-popup/index.vue
@@ -23,7 +23,7 @@
       <view
         class="pi-rela pi-w-100P pi-h-100P"
         :class="{ 'pi-safearea': !['top', 'center'].includes(position) && safeAreaInsetBottom }"
-        :style="contentStyle"
+        :style="[contentStyle]"
       >
         <view
           v-if="showCloseIcon"

diff --git a/components/pi-search/index.vue b/components/pi-search/index.vue
@@ -66,6 +66,7 @@ const { search } = getConfig()
 
 export default {
   name: TAG,
+  // 混入自定义样式customStyle和customClass
   mixins: [ValueSync, createCustomPropsByConfig(search)], // 注入value与val，进行双向绑定
   props: {
     // 搜索框形状 round || square（默认'round'）

diff --git a/tools/system.js b/tools/system.js
@@ -3,6 +3,19 @@
  */
 export const systemInfo = (() => {
   const info = uni.getSystemInfoSync()
+  // 兼容某些平台没有safeArea参数
+  if (!info.safeArea) {
+    console.log('当前平台系统信息获取safeArea失败，自定义初始化')
+    info.safeArea = {
+      bottom: info.screenHeight,
+      height: info.screenHeight - info.statusBarHeight,
+      left: 0,
+      right: info.screenWidth,
+      top: info.statusBarHeight,
+      width: info.screenWidth
+    }
+  }
+
   console.log('当前系统信息为：', info)
   return info || {}
 })()