@uxda/appkit 1.2.77 → 1.2.80

package/dist/index.js

@@ -4445,7 +4445,7 @@ var script$a = /* @__PURE__ */ defineComponent({
       emits("jump");
     }
     function toUser1() {
-      props?.mobile && toUser();
+      props.mobile && toUser();
     }
     function toLogin() {
       emits("login");
@@ -6695,11 +6695,11 @@ function useDragBox() {
     dragData.left = data.left * scale || 0;
     dragData.top = data.top * scale || 0;
     dragData.oldLeft = data.left * scale || 0;
-    if (data?.limitHorizontal?.length) {
-      dragData.limitHorizontal = data?.limitHorizontal;
+    if (data.limitHorizontal && data.limitHorizontal.length) {
+      dragData.limitHorizontal = data.limitHorizontal;
     }
-    if (data?.limitVertical?.length) {
-      dragData.limitVertical = data?.limitVertical;
+    if (data.limitVertical && data.limitVertical.length) {
+      dragData.limitVertical = data.limitVertical;
     }
   }
   function onDragStart(event) {
@@ -6824,12 +6824,15 @@ var script$2 = /* @__PURE__ */ defineComponent({
       onDragEnd1();
     }
     onMounted(async () => {
+      const systemInfo = Taro.getSystemInfoSync();
+      const safeHeight = (systemInfo.safeArea || {}).height || systemInfo.screenHeight;
+      const height = safeHeight > 620 ? 620 : safeHeight - 80;
       const navbarHeight = safeArea.nav + safeArea.status;
       initDragData({
         width: 40,
         height: 40,
         left: 324,
-        top: props.withNavbar ? 620 - navbarHeight : 620,
+        top: props.withNavbar ? height - navbarHeight : height,
         limitVertical: [
           !props.withNavbar ? navbarHeight : 0,
           props.withTabbar ? safeArea.menuRect.bottom : 0
@@ -6839,7 +6842,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
         width: 92,
         height: 43,
         left: 272,
-        top: props.withNavbar ? 620 - navbarHeight : 620,
+        top: props.withNavbar ? height - navbarHeight : height,
         limitVertical: [
           !props.withNavbar ? navbarHeight : 0,
           props.withTabbar ? safeArea.menuRect.bottom : 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.77",
+  "version": "1.2.80",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/BalanceCard.vue

@@ -44,60 +44,61 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
-import { endpoints, useHttp } from "../api";
-import { Balance } from "../types";
-import { useDidShow } from "@tarojs/taro";
+import { ref } from 'vue'
+import { endpoints, useHttp } from '../api'
+import { Balance } from '../types'
+import { useDidShow } from '@tarojs/taro'
 
 type BalanceCardProps = {
-  app: string;
-};
+  app: string
+}
 const props = withDefaults(defineProps<BalanceCardProps>(), {
-  app: "",
-});
+  app: '',
+})
 
 const balance = ref<Balance>({
   total: 0,
   privileges: [],
-});
+})
 
 const gotoRecharge = () => {
-  emit("recharge");
-};
+  emit('recharge')
+}
 
 async function loadBalance() {
-  const $http = useHttp();
+  const $http = useHttp()
   $http
     .get<Balance>(endpoints.获取余额明细, {
       app: props.app,
     })
     .then((data) => {
-      balance.value = data;
-    });
+      // balance.value = data
+      balance.value.total = data.total || (data.commonAccount as number)
+    })
 }
 
 const emit = defineEmits([
   /**
    * 跳账户详情
    */
-  "drill",
+  'drill',
   /**
    * 跳充值页
    */
-  "recharge",
-]);
+  'recharge',
+])
 
 function gotoDetail() {
-  emit("drill");
+  emit('drill')
 }
 
 useDidShow(() => {
-  loadBalance();
-});
+  loadBalance()
+})
 
 defineExpose({
   reload: loadBalance,
-});
+})
 </script>
 
 <style lang="scss">
@@ -179,12 +180,7 @@ defineExpose({
         height: 28px;
         line-height: 28px;
         border-radius: 14px;
-        background: linear-gradient(
-          90deg,
-          #ffebc1 0%,
-          #ffd7a7 52.29%,
-          #ffb875 100%
-        );
+        background: linear-gradient(90deg, #ffebc1 0%, #ffd7a7 52.29%, #ffb875 100%);
         .account-info-name {
           color: #975213;
           font-size: 13px;

package/src/balance/types.ts

@@ -82,6 +82,7 @@ export type Privilege = {
 export type Balance = {
   total: number
   privileges: any
+  commonAccount?: number
 }
 
 export type 权益类目 = {

package/src/shared/composables/useDragBox.ts

@@ -35,11 +35,11 @@ export function useDragBox() {
     dragData.top = data.top * scale || 0
     dragData.oldLeft = data.left * scale || 0
 
-    if (data?.limitHorizontal?.length) {
-      dragData.limitHorizontal = data?.limitHorizontal
+    if (data.limitHorizontal && data.limitHorizontal.length) {
+      dragData.limitHorizontal = data.limitHorizontal
     }
-    if (data?.limitVertical?.length) {
-      dragData.limitVertical = data?.limitVertical
+    if (data.limitVertical && data.limitVertical.length) {
+      dragData.limitVertical = data.limitVertical
     }
   }
 

package/src/user/components/UserEntry.vue

@@ -67,7 +67,7 @@ function toUser() {
 }
 
 function toUser1() {
-  props?.mobile && toUser()
+  props.mobile && toUser()
 }
 
 // 未登录时，点击前往登录

package/src/user/components/UserFeedbackEntry.vue

@@ -42,6 +42,7 @@
 import { computed, onMounted } from 'vue'
 import { useDragBox } from '../../shared/composables/useDragBox'
 import { useSafeArea } from '../../shared/composables'
+import Taro from '@tarojs/taro'
 
 const props = withDefaults(
   defineProps<{
@@ -101,13 +102,17 @@ function onDragEndHandler1() {
 }
 
 onMounted(async () => {
+  const systemInfo = Taro.getSystemInfoSync()
+  const safeHeight = (systemInfo.safeArea || {}).height || systemInfo.screenHeight
+  const height = safeHeight > 620 ? 620 : safeHeight - 80
+
   const navbarHeight = safeArea.nav + safeArea.status
   // 初始化拖拽元素
   initDragData({
     width: 40,
     height: 40,
     left: 324,
-    top: props.withNavbar ? 620 - navbarHeight : 620,
+    top: props.withNavbar ? height - navbarHeight : height,
     limitVertical: [
       !props.withNavbar ? navbarHeight : 0,
       props.withTabbar ? safeArea.menuRect.bottom : 0,
@@ -117,7 +122,7 @@ onMounted(async () => {
     width: 92,
     height: 43,
     left: 272,
-    top: props.withNavbar ? 620 - navbarHeight : 620,
+    top: props.withNavbar ? height - navbarHeight : height,
     limitVertical: [
       !props.withNavbar ? navbarHeight : 0,
       props.withTabbar ? safeArea.menuRect.bottom : 0,