@uxda/appkit 4.2.85 → 4.2.86

package/dist/appkit.css

@@ -2701,8 +2701,6 @@ page {
   --nut-primary-color: #017fff;
   position: absolute;
   top: -36px;
-  left: 50%;
-  transform: translateX(-50%);
   white-space: nowrap;
   display: flex;
   align-items: center;

package/dist/index.js

@@ -16,6 +16,7 @@ import '@nutui/nutui-taro/dist/packages/datepicker/style/css';
 import dayjs from 'dayjs';
 import groupBy from 'lodash-es/groupBy';
 import { ScrollView, Swiper, SwiperItem } from '@tarojs/components';
+import dsBridge from 'dsbridge';
 import { IconFont } from '@nutui/icons-vue-taro';
 import '@nutui/nutui-taro/dist/packages/form/style/css';
 import '@nutui/nutui-taro/dist/packages/formitem/style/css';
@@ -2988,6 +2989,24 @@ var script$u = /* @__PURE__ */ defineComponent({
 
 script$u.__file = "src/balance/components/Tip.vue";
 
+function dataURItoBlob(dataURI) {
+  const byteString = atob(dataURI.split(",")[1]);
+  const mimeString = dataURI.split(",")[0].split(":")[1].split(";")[0];
+  const ab = new ArrayBuffer(byteString.length);
+  const ia = new Uint8Array(ab);
+  for (let i = 0; i < byteString.length; i++) {
+    ia[i] = byteString.charCodeAt(i);
+  }
+  return new Blob([ab], { type: mimeString });
+}
+function isWeb() {
+  const env = process.env.TARO_ENV || "";
+  return env === "h5" || Taro.getEnv() === "WEB";
+}
+function isApp() {
+  return dsBridge.hasNativeMethod("openWebPage");
+}
+
 const _hoisted_1$q = { class: "account-view" };
 const _hoisted_2$j = { class: "scroll-content" };
 const _hoisted_3$d = { class: "balance" };
@@ -3186,9 +3205,6 @@ var script$t = /* @__PURE__ */ defineComponent({
       }
       loadNextPage();
     };
-    computed(() => {
-      return rulesPopupOpen.value || datePickerOpen.value || filterOpen.value || secondBalanceOpen.value;
-    });
     const secondBalanceOpen = ref(false);
     function onSecondBalanceButtonClick() {
       secondBalanceOpen.value = true;
@@ -3220,6 +3236,9 @@ var script$t = /* @__PURE__ */ defineComponent({
         delta: 1
       });
     }
+    const isAppEnv = computed(() => {
+      return isApp();
+    });
     onMounted(() => {
       resetDateRange();
     });
@@ -3278,10 +3297,11 @@ var script$t = /* @__PURE__ */ defineComponent({
                     1
                     /* TEXT */
                   ),
-                  createElementVNode("div", {
+                  !isAppEnv.value ? (openBlock(), createElementBlock("div", {
+                    key: 0,
                     class: "pay",
                     onClick: gotoRecharge
-                  }, "\u4E91\u8C46\u5145\u503C")
+                  }, "\u4E91\u8C46\u5145\u503C")) : createCommentVNode("v-if", true)
                 ])
               ]),
               createVNode(script$u),
@@ -3326,7 +3346,7 @@ var script$t = /* @__PURE__ */ defineComponent({
                             1
                             /* TEXT */
                           ),
-                          item.id ? (openBlock(), createElementBlock("div", _hoisted_11$2, [
+                          item.id && !isAppEnv.value ? (openBlock(), createElementBlock("div", _hoisted_11$2, [
                             createElementVNode("div", {
                               onClick: ($event) => gotoTrade(item)
                             }, "\u4F01\u660E\u661F\u4F18\u60E0\u5145\u503C", 8, _hoisted_12$2),
@@ -3381,7 +3401,7 @@ var script$t = /* @__PURE__ */ defineComponent({
                             1
                             /* TEXT */
                           ),
-                          item.id ? (openBlock(), createElementBlock("div", _hoisted_17$1, [
+                          item.id && !isAppEnv.value ? (openBlock(), createElementBlock("div", _hoisted_17$1, [
                             createElementVNode("div", {
                               onClick: ($event) => gotoTrade(item)
                             }, "AI\u5BA1\u6279\u5145\u503C", 8, _hoisted_18$1),
@@ -5911,21 +5931,6 @@ var script$f = /* @__PURE__ */ defineComponent({
 
 script$f.__file = "src/notice/components/NoticeList.vue";
 
-function dataURItoBlob(dataURI) {
-  const byteString = atob(dataURI.split(",")[1]);
-  const mimeString = dataURI.split(",")[0].split(":")[1].split(";")[0];
-  const ab = new ArrayBuffer(byteString.length);
-  const ia = new Uint8Array(ab);
-  for (let i = 0; i < byteString.length; i++) {
-    ia[i] = byteString.charCodeAt(i);
-  }
-  return new Blob([ab], { type: mimeString });
-}
-function isWeb() {
-  const env = process.env.TARO_ENV || "";
-  return env === "h5" || Taro.getEnv() === "WEB";
-}
-
 const _hoisted_1$d = {
   key: 0,
   class: "read-all"
@@ -6949,7 +6954,8 @@ var script$b = /* @__PURE__ */ defineComponent({
                   )) : createCommentVNode("v-if", true)
                 ]),
                 createElementVNode("div", _hoisted_23, [
-                  createVNode(_component_nut_button, {
+                  !unref(isApp)() ? (openBlock(), createBlock(_component_nut_button, {
+                    key: 0,
                     class: "user-info-ft-btn",
                     style: { "width": "100%", "margin-top": "12px" },
                     onClick: toLogout,
@@ -6965,7 +6971,7 @@ var script$b = /* @__PURE__ */ defineComponent({
                     ])]),
                     _: 1
                     /* STABLE */
-                  })
+                  })) : createCommentVNode("v-if", true)
                 ])
               ]))
             ]),
@@ -7102,10 +7108,11 @@ var script$b = /* @__PURE__ */ defineComponent({
                   src: userInfo.value.avatar,
                   alt: ""
                 }, null, 8, _hoisted_25)) : (openBlock(), createElementBlock("img", _hoisted_26)),
-                createElementVNode("div", {
+                !unref(isApp)() ? (openBlock(), createElementBlock("div", {
+                  key: 2,
                   class: "upload-avatar-popup-btn",
                   onClick: toUpload
-                }, "\u66F4\u6362\u5934\u50CF")
+                }, "\u66F4\u6362\u5934\u50CF")) : createCommentVNode("v-if", true)
               ])
             ]),
             _: 1
@@ -9202,7 +9209,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
                         rules: ["required"]
                       }, {
                         append: withCtx(() => [
-                          !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createBlock(unref(script$G), {
+                          !unref(isApp)() && !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createBlock(unref(script$G), {
                             key: 0,
                             onComplete: onOcrComplete
                           })) : createCommentVNode("v-if", true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.85",
+  "version": "4.2.86",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -34,8 +34,9 @@
     "@tarojs/shared": "^4.1.7",
     "@tarojs/taro": "^4.1.7",
     "@types/wechat-miniprogram": "^3.4.7",
-    "@uxda/nutshell": "^1.6.86",
+    "@uxda/nutshell": "^1.0.0",
     "dayjs": "^1.11.18",
+    "dsbridge": "^3.1.4",
     "lodash-es": "^4.17.21",
     "validator": "^13.15.15",
     "vue": "^3.5.22"

package/rollup.config.mjs

@@ -60,6 +60,7 @@ export default [
       '@uxda/nutshell',
       'dayjs',
       'validator',
+      'dsbridge',
     ],
   },
   // {

package/src/balance/components/AccountView.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="bean-counts spa-between">
           <div class="counts number">{{ formatAmount(balance.total || 0) }}</div>
-          <div class="pay" @click="gotoRecharge">云豆充值</div>
+          <div v-if="!isAppEnv" class="pay" @click="gotoRecharge">云豆充值</div>
         </div>
       </div>
       <Tip />
@@ -31,7 +31,7 @@
             </div>
             <div class="item-title">
               <div>{{ item.title }}</div>
-              <div class="item-title-button" v-if="item.id">
+              <div class="item-title-button" v-if="item.id && !isAppEnv">
                 <div @click="gotoTrade(item)">企明星优惠充值</div>
                 <img class="button-icon" src="https://cdn.ddjf.com/static/images/bpms-workBench/button-hg.svg" />
               </div>
@@ -46,7 +46,7 @@
             <div class="item-count">{{ formatAmount(item.count || 0) }}{{ item.unit }}</div>
             <div class="item-title">
               <div>{{ item.title }}</div>
-              <div class="item-title-button" v-if="item.id">
+              <div class="item-title-button" v-if="item.id && !isAppEnv">
                 <div @click="gotoTrade(item)">AI审批充值</div>
                 <img class="button-icon" src="https://cdn.ddjf.com/static/images/bpms-workBench/button-hg.svg" />
               </div>
@@ -148,6 +148,7 @@ import Tip from './Tip.vue'
 import groupBy from 'lodash-es/groupBy'
 import { useAmount } from '../../shared/composables/useAmount'
 import { ScrollView } from '@tarojs/components'
+import { isApp } from '../../utils/utils'
 
 type AccountViewProps = {
   app: string
@@ -358,15 +359,6 @@ const onReachBottom = () => {
   loadNextPage()
 }
 
-/**
- * 浮窗弹出时不允许
- * 1. 下拉刷新
- * 2. 上滑分页
- */
-const isAnyPopupOpen = computed(() => {
-  return rulesPopupOpen.value || datePickerOpen.value || filterOpen.value || secondBalanceOpen.value
-})
-
 const secondBalanceOpen = ref<boolean>(false)
 
 function onSecondBalanceButtonClick() {
@@ -408,6 +400,10 @@ function onPageHeaderClose() {
   })
 }
 
+const isAppEnv = computed(() => {
+  return isApp()
+})
+
 onMounted(() => {
   resetDateRange()
 })

package/src/user/components/UserAuth.vue

@@ -6,7 +6,7 @@
           <ns-input label="你的姓名" name="姓名" v-model="formData.姓名" placeholder="请输入或拍照识别" :maxlength="30" :disabled="已认证"
             :rules="['required']">
             <template #append>
-              <ocr-icon v-if="!已认证" @complete="onOcrComplete" />
+              <ocr-icon v-if="!isApp() && !已认证" @complete="onOcrComplete" />
             </template>
           </ns-input>
           <ns-input label="身份证号码" name="身份证号码" placeholder="请输入身份证号码" :maxlength="30" v-model="formData.身份证号码"
@@ -58,6 +58,7 @@ import { useNutshell } from "@uxda/nutshell/taro";
 import isMobilePhone from "validator/es/lib/isMobilePhone";
 import isIdentityCard from "validator/es/lib/isIdentityCard";
 import { useHttp } from "../api";
+import { isApp } from '../../utils/utils'
 
 const props = withDefaults(
   defineProps<{
@@ -191,8 +192,6 @@ const emits = defineEmits(["toAgreement"]);
       --nut-primary-color: #017fff;
       position: absolute;
       top: -36px;
-      left: 50%;
-      transform: translateX(-50%);
       white-space: nowrap;
       display: flex;
       align-items: center;

package/src/user/components/UserInfo.vue

@@ -74,7 +74,7 @@
       </div>
 
       <div class="user-info-ft">
-        <nut-button class="user-info-ft-btn" style="width: 100%; margin-top: 12px" @click="toLogout" plain
+        <nut-button v-if="!isApp()" class="user-info-ft-btn" style="width: 100%; margin-top: 12px" @click="toLogout" plain
           type="primary">退出登录</nut-button>
       </div>
     </div>
@@ -122,7 +122,7 @@
       <img class="upload-avatar-popup-avatar" mode="aspectFit" v-if="userInfo.avatar" :src="userInfo.avatar" alt="" />
       <img class="upload-avatar-popup-avatar" mode="aspectFit" v-else
         src="https://cdn.ddjf.com/static/images/wx-yunservice/account-head.png" alt="" />
-      <div class="upload-avatar-popup-btn" @click="toUpload">更换头像</div>
+      <div class="upload-avatar-popup-btn" @click="toUpload" v-if="!isApp()">更换头像</div>
     </div>
   </nut-popup>
 </template>
@@ -135,6 +135,7 @@ import { useEncode } from "../../shared/composables/useEncode";
 import DdSkeleton from "../../components/dd-skeleton/index.vue";
 import { useHttp } from "../api";
 import { ScrollView } from '@tarojs/components'
+import { isApp } from '../../utils/utils'
 
 const props = withDefaults(
   defineProps<{

package/src/utils/utils.ts

@@ -1,4 +1,5 @@
 import Taro from "@tarojs/taro"
+import dsBridge from 'dsbridge'
 
 // 工具函数：DataURL转Blob
 export function dataURItoBlob(dataURI) {
@@ -26,3 +27,7 @@ export function generateUniqueId(pre?: string, delimiter = '-') {
     .substr(2)}`
 }
 
+// 是否是App环境
+export function isApp() {
+  return dsBridge.hasNativeMethod('openWebPage')
+}