@uxda/appkit 4.1.60 → 4.2.0

package/dist/index.js

@@ -6,14 +6,15 @@ import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
-import { isIdentityCard, isMobilePhone } from 'validator';
+import isMobilePhone from 'validator/es/lib/isMobilePhone';
+import isIdentityCard from 'validator/es/lib/isIdentityCard';
 import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsPage, NsPageContent, NsCard, NsCheckbox } from '@uxda/nutshell/taro';
 import '@nutui/nutui-taro/dist/packages/actionsheet/style/css';
-import debounce from 'lodash/debounce';
+import debounce from 'lodash-es/debounce';
 import '@nutui/nutui-taro/dist/packages/dialog/style/css';
 import '@nutui/nutui-taro/dist/packages/datepicker/style/css';
 import dayjs from 'dayjs';
-import groupBy from 'lodash/groupBy';
+import groupBy from 'lodash-es/groupBy';
 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';
@@ -5844,7 +5845,12 @@ var script$9 = /* @__PURE__ */ defineComponent({
       emits("binding", userInfo.value.mobile || "");
     }
     function toAuth() {
-      emits("auth", props.userId);
+      emits(
+        "auth",
+        props.userId,
+        userInfo.value?.verifyResult,
+        userInfo.value?.mobile
+      );
     }
     const emits = __emit;
     __expose({
@@ -5921,7 +5927,8 @@ var script$9 = /* @__PURE__ */ defineComponent({
                   }, {
                     desc: withCtx(() => [
                       userInfo.value?.verifyResult == 1 ? (openBlock(), createElementBlock("span", _hoisted_5$2, "\u5DF2\u8BA4\u8BC1")) : createCommentVNode("v-if", true),
-                      userInfo.value?.verifyResult == 0 ? (openBlock(), createElementBlock("span", _hoisted_6$1, "\u5DF2\u5931\u6548\uFF0C\u91CD\u65B0\u8BA4\u8BC1")) : (openBlock(), createElementBlock("span", _hoisted_7$1, "\u672A\u8BA4\u8BC1\uFF0C\u53BB\u8BA4\u8BC1"))
+                      userInfo.value?.verifyResult == 0 ? (openBlock(), createElementBlock("span", _hoisted_6$1, "\u5DF2\u5931\u6548\uFF0C\u91CD\u65B0\u8BA4\u8BC1")) : createCommentVNode("v-if", true),
+                      userInfo.value?.verifyResult != 0 && userInfo.value?.verifyResult != 1 ? (openBlock(), createElementBlock("span", _hoisted_7$1, "\u672A\u8BA4\u8BC1\uFF0C\u53BB\u8BA4\u8BC1")) : createCommentVNode("v-if", true)
                     ]),
                     _: 1
                     /* STABLE */
@@ -8112,13 +8119,15 @@ const _hoisted_2 = {
 var script = /* @__PURE__ */ defineComponent({
   __name: "UserAuth",
   props: {
-    userId: { type: String, required: true, default: "" }
+    userId: { type: String, required: true, default: "" },
+    verifyResult: { type: Number, required: true, default: -1 },
+    mobile: { type: String, required: true, default: "" }
   },
   emits: ["toAgreement"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const formRef = ref(), $n = useNutshell();
-    const formData = reactive({
+    let formData = reactive({
       \u59D3\u540D: "",
       \u8EAB\u4EFD\u8BC1\u53F7\u7801: "",
       \u7535\u8BDD\u53F7\u7801: "",
@@ -8151,12 +8160,28 @@ var script = /* @__PURE__ */ defineComponent({
         name: formData.\u59D3\u540D,
         tenantId: props.userId
       }).then(() => {
-        Taro.showToast({ title: "\u8BA4\u8BC1\u6210\u529F", icon: "none" });
+        Taro.showToast({ title: "\u5DF2\u63D0\u4EA4\u8BA4\u8BC1\u4FE1\u606F", icon: "none" });
         toBack();
       }).catch((err) => {
         Taro.showToast({ title: err?.errMsg || "\u8BA4\u8BC1\u5931\u8D25", icon: "none" });
       });
     }
+    watch(
+      () => props.verifyResult,
+      () => {
+        if (props.verifyResult == 1) {
+          \u5DF2\u8BA4\u8BC1.value = true;
+        }
+      },
+      { deep: true, immediate: true }
+    );
+    watch(
+      () => props.mobile,
+      () => {
+        formData.\u7535\u8BDD\u53F7\u7801 = props.mobile;
+      },
+      { deep: true, immediate: true }
+    );
     const emits = __emit;
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NsPage), { class: "user-auth" }, {
@@ -8168,21 +8193,24 @@ var script = /* @__PURE__ */ defineComponent({
                   createVNode(unref(NsForm), {
                     ref_key: "formRef",
                     ref: formRef,
-                    modelValue: formData,
-                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => formData = $event)
+                    modelValue: unref(formData),
+                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => isRef(formData) ? formData.value = $event : formData = $event)
                   }, {
                     default: withCtx(() => [
                       createVNode(unref(NsInput), {
                         label: "\u4F60\u7684\u59D3\u540D",
                         name: "\u59D3\u540D",
-                        modelValue: formData.\u59D3\u540D,
-                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.\u59D3\u540D = $event),
+                        modelValue: unref(formData).\u59D3\u540D,
+                        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(formData).\u59D3\u540D = $event),
                         placeholder: "\u8BF7\u8F93\u5165\u6216\u62CD\u7167\u8BC6\u522B",
                         maxlength: 30,
                         rules: ["required"]
                       }, {
                         append: withCtx(() => [
-                          createVNode(unref(script$D), { onComplete: onOcrComplete })
+                          !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createBlock(unref(script$D), {
+                            key: 0,
+                            onComplete: onOcrComplete
+                          })) : createCommentVNode("v-if", true)
                         ]),
                         _: 1
                         /* STABLE */
@@ -8192,8 +8220,8 @@ var script = /* @__PURE__ */ defineComponent({
                         name: "\u8EAB\u4EFD\u8BC1\u53F7\u7801",
                         placeholder: "\u8BF7\u8F93\u5165\u8EAB\u4EFD\u8BC1\u53F7\u7801",
                         maxlength: 30,
-                        modelValue: formData.\u8EAB\u4EFD\u8BC1\u53F7\u7801,
-                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formData.\u8EAB\u4EFD\u8BC1\u53F7\u7801 = $event),
+                        modelValue: unref(formData).\u8EAB\u4EFD\u8BC1\u53F7\u7801,
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(formData).\u8EAB\u4EFD\u8BC1\u53F7\u7801 = $event),
                         rules: [
                           "required",
                           {
@@ -8208,8 +8236,9 @@ var script = /* @__PURE__ */ defineComponent({
                         name: "\u7535\u8BDD\u53F7\u7801",
                         placeholder: "\u8BF7\u8F93\u5165\u7535\u8BDD\u53F7\u7801",
                         maxlength: 11,
-                        modelValue: formData.\u7535\u8BDD\u53F7\u7801,
-                        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.\u7535\u8BDD\u53F7\u7801 = $event),
+                        modelValue: unref(formData).\u7535\u8BDD\u53F7\u7801,
+                        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(formData).\u7535\u8BDD\u53F7\u7801 = $event),
+                        disabled: true,
                         rules: [
                           {
                             name: "function",
@@ -8230,8 +8259,8 @@ var script = /* @__PURE__ */ defineComponent({
                 !\u5DF2\u8BA4\u8BC1.value ? (openBlock(), createElementBlock("div", _hoisted_2, [
                   createVNode(unref(NsCheckbox), {
                     style: { "font-size": "11px" },
-                    modelValue: formData.\u540C\u610F,
-                    "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => formData.\u540C\u610F = $event)
+                    modelValue: unref(formData).\u540C\u610F,
+                    "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => unref(formData).\u540C\u610F = $event)
                   }, {
                     default: withCtx(() => _cache[5] || (_cache[5] = [
                       createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.1.60",
+  "version": "4.2.0",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -35,6 +35,7 @@
     "@tarojs/taro": "^4.0.0",
     "@types/wechat-miniprogram": "^3.4.7",
     "dayjs": "^1.11.10",
+    "lodash-es": "^4.17.21",
     "validator": "^13.12.0",
     "vue": "^3.5.0"
   },
@@ -62,6 +63,7 @@
     "rollup-plugin-esbuild": "^6.1.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-scss": "^4.0.0",
+    "rollup-plugin-visualizer": "^5.12.0",
     "rollup-plugin-vue": "^6.0.0",
     "style-loader": "^4.0.0",
     "stylelint": "^16.8.2",

package/rollup.config.mjs

@@ -5,6 +5,7 @@ import postcss from 'rollup-plugin-postcss'
 import atImport from 'postcss-import'
 import NutUIResolver from '@nutui/auto-import-resolver'
 import Components from 'unplugin-vue-components/rollup'
+import { visualizer } from "rollup-plugin-visualizer"
 
 export default [
   {
@@ -38,8 +39,18 @@ export default [
       Components({
         resolvers: [NutUIResolver({ taro: true })],
       }),
+      visualizer(),
+    ],
+    external: [
+      'vue',
+      '@tarojs/components',
+      '@tarojs/shared',
+      '@nutui/nutui',
+      '@nutui/nutui-taro',
+      '@uxda/nutshell',
+      'dayjs',
+      'validator',
     ],
-    external: ['vue', '@nutui/nutui-taro'],
   },
   // {
   //   input: './src/main.scss',

package/src/balance/components/AccountView.vue

@@ -129,7 +129,7 @@ import { AppDrawer, PageHeader, WithPaging } from '../../shared'
 import dayjs from 'dayjs'
 import EmptyView from '../../shared/components/EmptyView.vue'
 import Tip from './Tip.vue'
-import groupBy from 'lodash/groupBy'
+import groupBy from 'lodash-es/groupBy'
 import { useAmount } from '../../shared/composables/useAmount'
 
 const refreshing = ref(false)

package/src/notice/components/NoticeBanner.vue

@@ -40,7 +40,7 @@ import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
 import NoticePopup from './NoticePopup.vue'
 import Taro from '@tarojs/taro'
 import { useNotice } from './useNotice'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 import { useSafeArea } from '../../shared/composables'
 
 const props = withDefaults(

package/src/notice/components/NoticeEntry.vue

@@ -15,7 +15,7 @@ import { ref } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import Taro, { useDidShow } from '@tarojs/taro'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 
 const props = withDefaults(
   defineProps<{

package/src/shared/components/DeviceVersion.vue

@@ -14,7 +14,7 @@ import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
 import { useSafeArea } from '../composables'
 import Taro from '@tarojs/taro'
 import { useHttp } from '../../balance/api'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 
 const showAlert = ref(false)
 const safeArea = useSafeArea()

package/src/shared/composables/useValidator.ts

@@ -1,7 +1,8 @@
 /**
  * 通用表单校验器
  */
-import { isMobilePhone, isIdentityCard } from 'validator'
+import isMobilePhone from 'validator/es/lib/isMobilePhone'
+import isIdentityCard from 'validator/es/lib/isIdentityCard'
 
 export function useValidator() {
   // 身份证号码校验

package/src/user/components/LoginSetting.vue

@@ -16,7 +16,7 @@ import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import { useSafeArea } from '../../shared/composables'
 import { useDidShow } from '@tarojs/taro'
-import debounce from 'lodash/debounce'
+import debounce from 'lodash-es/debounce'
 
 const props = withDefaults(
   defineProps<{

package/src/user/components/UserAuth.vue

@@ -12,7 +12,7 @@
             :rules="['required']"
           >
             <template #append>
-              <ocr-icon @complete="onOcrComplete" />
+              <ocr-icon v-if="!已认证" @complete="onOcrComplete" />
             </template>
           </ns-input>
           <ns-input
@@ -36,6 +36,7 @@
             placeholder="请输入电话号码"
             :maxlength="11"
             v-model="formData.电话号码"
+            :disabled="true"
             :rules="[
             {
               name: 'function',
@@ -76,7 +77,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from "vue";
+import { reactive, ref, watch } from "vue";
 import {
   NsForm,
   NsInput,
@@ -89,22 +90,27 @@ import {
 import { OcrIcon } from "../../shared/components";
 import Taro from "@tarojs/taro";
 import { useNutshell } from "@uxda/nutshell/taro";
-import { isIdentityCard, isMobilePhone } from "validator";
+import isMobilePhone from 'validator/es/lib/isMobilePhone'
+import isIdentityCard from 'validator/es/lib/isIdentityCard'
 import { useHttp } from "../api";
 
 const props = withDefaults(
   defineProps<{
     userId: string;
+    verifyResult: number;
+    mobile: string;
   }>(),
   {
+    verifyResult: -1,
     userId: "",
+    mobile: "",
   }
 );
 
 const formRef = ref(),
   $n = useNutshell();
 
-const formData = reactive({
+let formData = reactive({
   姓名: "",
   身份证号码: "",
   电话号码: "",
@@ -149,7 +155,7 @@ async function toSubmit() {
       tenantId: props.userId,
     })
     .then(() => {
-      Taro.showToast({ title: "认证成功", icon: "none" });
+      Taro.showToast({ title: "已提交认证信息", icon: "none" });
       // 提交认证信息，成功后返回
       toBack();
     })
@@ -157,6 +163,22 @@ async function toSubmit() {
       Taro.showToast({ title: err?.errMsg || "认证失败", icon: "none" });
     });
 }
+watch(
+  () => props.verifyResult,
+  () => {
+    if (props.verifyResult == 1) {
+      已认证.value = true;
+    }
+  },
+  { deep: true, immediate: true }
+);
+watch(
+  () => props.mobile,
+  () => {
+    formData.电话号码 = props.mobile;
+  },
+  { deep: true, immediate: true }
+);
 
 const emits = defineEmits(["toAgreement"]);
 </script>

package/src/user/components/UserInfo.vue

@@ -44,7 +44,11 @@
             <span v-if="userInfo?.verifyResult == 0" style="color: #e8523f"
               >已失效，重新认证</span
             >
-            <span v-else style="color: #017fff">未认证，去认证</span>
+            <span
+              v-if="userInfo?.verifyResult != 0 && userInfo?.verifyResult != 1"
+              style="color: #017fff"
+              >未认证，去认证</span
+            >
           </template>
         </nut-cell>
       </div>
@@ -397,7 +401,12 @@ function toBinding() {
 
 // 去认证页
 function toAuth() {
-  emits("auth", props.userId);
+  emits(
+    "auth",
+    props.userId,
+    userInfo.value?.verifyResult,
+    userInfo.value?.mobile
+  );
 }
 
 // 父组件事件