@uxda/appkit 4.1.62 → 4.2.0

package/.eslintrc.mjs

@@ -1,8 +1,8 @@
-module.exports = {
-  extends: [
-    './.eslintrc-auto-import.json'
-  ],
-  rules: {
-    ident: ['error', 2]
-  }
+module.exports = {
+  extends: [
+    './.eslintrc-auto-import.json'
+  ],
+  rules: {
+    ident: ['error', 2]
+  }
 }

package/README.md

@@ -1,188 +1,188 @@
-# AppKit
-
-小程序应用开发包
-
-向诸小程序提供供用的组件及基础设施
-
-模块:
-* payment 支付
-* balance 账户、代币(云豆)余额
-* auth 登录及会话状态 (待定)
-
-## 将 AppKit 加入应用项目
-
-```bash
-git clone git@10.1.108.137:fed/appkit.git
-cd appkit
-yarn link
-```
-
-然后 cd 到(周转)小程序根目录执行:
-```bash
-yarn link @uxda/appkit
-```
-完成 npm link
-
-
-## 用法
-```typescript
-import AppKit from '@uxda/appkit'
-import '@uxda/appkit/appkit.css'
-```
-## AppKit 初始化
-
-在应用入口页调用(示例)
-```typescript
-const App = createApp({})
-App.use(AppKit, {
-  app: () => 'cloudkitPro',
-  tenant: () => '1',
-  token: () => localStorage.getItem('token'),
-  baseUrl: () => process.env.TARO_APP_BASE_URL,
-  401: () => {
-    // 登录态丢失时的处理
-  }
-})
-```
-为 AppKit 的运行提供必需的 API 参数
-* app: 当前的 app code (嵌入接口调用的 header 参数)
-* tenant: 租户ID 需要提供以便调用接口
-* token: 用户登录态 token
-* baseUrl: 调用 API 的URL域名
-* 401： 登录态丢失异常处理 (通常要跳转登录页)
-
-
-## UI组件
-### 1️⃣ 充值用户界面 <recharge-view>
-
-```typescript
-import { RechargeView } from '@uxda/appkit'
-```
-
-```html
-<template>
-  <recharge-view
-    app="crm"
-    tenant="1"
-    @complete="onRechargeComplete" />
-</template>
-```
-
-#### 属性 props
-
-#### 事件 emits
-
-* @complete: 充值完成时发生
-
-### 2️⃣ 账户页 &lt;account-view&gt;
-```
-import { AccountView } from '@uxda/appkit'
-```
-```html
-<template>
-  <account-view app="crm" @recharge=onAccountViewRecharge />
-<template>
-```
-
-#### 事件 emits
-* @recharge 点击充值按钮时发生
-
-### 3️⃣ 账户卡片 &lt;balance-card&gt;
-
-```typescript
-import { BalanceCard } from '@uxda/appkit'
-```
-
-```html
-<template>
-  <balance-card app="crm" @drill="onBalanceCardDrill" @recharge="onBalanceCardRecharge" />
-<template>
-```
-
-#### 事件 emits 
-* app 配置到组件上的 app code
-* @drill 点击账户详情时发生
-* @recharge 点击充值按钮时发生
-
-场景端需定义以上跳转逻辑:
-
-```typescript
-function onBalanceCardDrill () {
-  //...
-}
-
-function onBalanceCardRecharge () {
-  //...
-}
-```
-
-### 方法 methods
-* reload() 刷新数据
-
-
-
-### 4️⃣ 余额不足提示框 &lt;balance-reminder&gt;
-
-```typescript
-import { BalanceReminder } from '@uxda/appkit'
-```
-
-```html
-<balance-reminder v-model="balanceReminderOpen" 
-  @recharge="onBalanceReminderRecharge" />
-```
-
-#### 事件 emits 
-* @recharge 点击充值按钮时发生
-
-
-## 公共API
-### 1️⃣ 唤起充值(跳支付中心小程序) $app.invokeRecharge()
-
-```typescript
-import { useAppKit } from '@uxda/appkit'
-const $app = useAppKit()
-$app.invokeRecharge({
-  app: 'crm',
-  tenant: '1',
-})
-```
-
-### 2️⃣ 唤起充值(小程序内直接支付、不跳) $app.requestPayment()
-
-```typescript
-import { useAppKit } from '@uxda/appkit'
-const $app = useAppKit()
-$app.requestPayment({
-  app: 'crm',
-  tenant: '1',
-  amount: 100,
-  user: '' // wx.login 之后得到的用户临时凭证
-})
-```
-
-## Hooks (Vue Composables)
-
-### useTabbar
-用于获取或设置 custom tab bar
-
-```typescript
-import { useTabbar } from '@uxda/appkit-next'
-
-onMounted(() => {
-  const { setTab } = useTabbar()
-  setTab('home')
-})
-```
-以上代码用于切换到 /pages/home/index 时, 设置 tab bar 选中项为 'home'
-在 custom-tab-bar/index.vue 需要做以下设置
-
-```typescript
-import { useSafeArea, useTabbar } from '@uxda/appkit-next'
-
-const { onTabChange } = useTabbar()
-onTabChange((value: string) => {
-  selected.value = value
-})
-```
+# AppKit
+
+小程序应用开发包
+
+向诸小程序提供供用的组件及基础设施
+
+模块:
+* payment 支付
+* balance 账户、代币(云豆)余额
+* auth 登录及会话状态 (待定)
+
+## 将 AppKit 加入应用项目
+
+```bash
+git clone git@10.1.108.137:fed/appkit.git
+cd appkit
+yarn link
+```
+
+然后 cd 到(周转)小程序根目录执行:
+```bash
+yarn link @uxda/appkit
+```
+完成 npm link
+
+
+## 用法
+```typescript
+import AppKit from '@uxda/appkit'
+import '@uxda/appkit/appkit.css'
+```
+## AppKit 初始化
+
+在应用入口页调用(示例)
+```typescript
+const App = createApp({})
+App.use(AppKit, {
+  app: () => 'cloudkitPro',
+  tenant: () => '1',
+  token: () => localStorage.getItem('token'),
+  baseUrl: () => process.env.TARO_APP_BASE_URL,
+  401: () => {
+    // 登录态丢失时的处理
+  }
+})
+```
+为 AppKit 的运行提供必需的 API 参数
+* app: 当前的 app code (嵌入接口调用的 header 参数)
+* tenant: 租户ID 需要提供以便调用接口
+* token: 用户登录态 token
+* baseUrl: 调用 API 的URL域名
+* 401： 登录态丢失异常处理 (通常要跳转登录页)
+
+
+## UI组件
+### 1️⃣ 充值用户界面 &lt;recharge-view&gt;
+
+```typescript
+import { RechargeView } from '@uxda/appkit'
+```
+
+```html
+<template>
+  <recharge-view
+    app="crm"
+    tenant="1"
+    @complete="onRechargeComplete" />
+</template>
+```
+
+#### 属性 props
+
+#### 事件 emits
+
+* @complete: 充值完成时发生
+
+### 2️⃣ 账户页 &lt;account-view&gt;
+```
+import { AccountView } from '@uxda/appkit'
+```
+```html
+<template>
+  <account-view app="crm" @recharge=onAccountViewRecharge />
+<template>
+```
+
+#### 事件 emits
+* @recharge 点击充值按钮时发生
+
+### 3️⃣ 账户卡片 &lt;balance-card&gt;
+
+```typescript
+import { BalanceCard } from '@uxda/appkit'
+```
+
+```html
+<template>
+  <balance-card app="crm" @drill="onBalanceCardDrill" @recharge="onBalanceCardRecharge" />
+<template>
+```
+
+#### 事件 emits 
+* app 配置到组件上的 app code
+* @drill 点击账户详情时发生
+* @recharge 点击充值按钮时发生
+
+场景端需定义以上跳转逻辑:
+
+```typescript
+function onBalanceCardDrill () {
+  //...
+}
+
+function onBalanceCardRecharge () {
+  //...
+}
+```
+
+### 方法 methods
+* reload() 刷新数据
+
+
+
+### 4️⃣ 余额不足提示框 &lt;balance-reminder&gt;
+
+```typescript
+import { BalanceReminder } from '@uxda/appkit'
+```
+
+```html
+<balance-reminder v-model="balanceReminderOpen" 
+  @recharge="onBalanceReminderRecharge" />
+```
+
+#### 事件 emits 
+* @recharge 点击充值按钮时发生
+
+
+## 公共API
+### 1️⃣ 唤起充值(跳支付中心小程序) $app.invokeRecharge()
+
+```typescript
+import { useAppKit } from '@uxda/appkit'
+const $app = useAppKit()
+$app.invokeRecharge({
+  app: 'crm',
+  tenant: '1',
+})
+```
+
+### 2️⃣ 唤起充值(小程序内直接支付、不跳) $app.requestPayment()
+
+```typescript
+import { useAppKit } from '@uxda/appkit'
+const $app = useAppKit()
+$app.requestPayment({
+  app: 'crm',
+  tenant: '1',
+  amount: 100,
+  user: '' // wx.login 之后得到的用户临时凭证
+})
+```
+
+## Hooks (Vue Composables)
+
+### useTabbar
+用于获取或设置 custom tab bar
+
+```typescript
+import { useTabbar } from '@uxda/appkit-next'
+
+onMounted(() => {
+  const { setTab } = useTabbar()
+  setTab('home')
+})
+```
+以上代码用于切换到 /pages/home/index 时, 设置 tab bar 选中项为 'home'
+在 custom-tab-bar/index.vue 需要做以下设置
+
+```typescript
+import { useSafeArea, useTabbar } from '@uxda/appkit-next'
+
+const { onTabChange } = useTabbar()
+onTabChange((value: string) => {
+  selected.value = value
+})
+```
 以上代码设置响应页面内的 setTab() 动作

package/babel.config.js

@@ -1,12 +1,12 @@
-// babel-preset-taro 更多选项和默认值：
-// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
-module.exports = {
-  presets: [
-    ['taro', {
-      framework: 'vue3',
-      ts: true
-    }]
-  ],
-  plugins: [
-  ],
-}
+// babel-preset-taro 更多选项和默认值：
+// https://github.com/NervJS/taro/blob/next/packages/babel-preset-taro/README.md
+module.exports = {
+  presets: [
+    ['taro', {
+      framework: 'vue3',
+      ts: true
+    }]
+  ],
+  plugins: [
+  ],
+}

package/dist/appkit.css

@@ -72,10 +72,6 @@
 .app-drawer.open {
   height: 100vh;
 }
-.app-drawer .page-header {
-  flex-grow: 0;
-  background-color: #fff;
-}
 .app-drawer .drawer-body {
   flex-grow: 1;
   overflow: scroll;
@@ -449,9 +445,9 @@
   color: #353535;
   background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
 }
-page {
-  --text-color: #333;
-  --text-color-dark-mode: #eee;
+page {
+  --text-color: #333;
+  --text-color-dark-mode: #eee;
 }
 .account-card .card {
   background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
@@ -974,9 +970,11 @@ page {
 }
 .operation-box .operation-list .operation-scroll {
   height: calc(100vh - 130px);
-  padding: 0 15px;
   box-sizing: border-box;
 }
+.operation-box .operation-list .box {
+  padding: 0 10px;
+}
 .operation-box .operation-list .box-detail .title {
   line-height: 22px;
   font-weight: 700;

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';
@@ -2237,7 +2238,7 @@ var script$w = /* @__PURE__ */ defineComponent({
               ]))
             ])
           ]),
-          createCommentVNode(' <div class="line"></div>\r\n      <div class="card-row">\r\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\r\n        <div class="card-row-right">\r\n          <div class="pay" @click="gotoRecharge">\r\n            <div>\u5145\u503C</div>\r\n            <img\r\n              class="pay-icon"\r\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\r\n            />\r\n          </div>\r\n        </div>\r\n      </div> ')
+          createCommentVNode(' <div class="line"></div>\n      <div class="card-row">\n        <div class="card-row-left desc">\u6743\u76CA\u4F7F\u7528\u65F6\u81EA\u52A8\u6263\u51CF\u4E91\u8C46</div>\n        <div class="card-row-right">\n          <div class="pay" @click="gotoRecharge">\n            <div>\u5145\u503C</div>\n            <img\n              class="pay-icon"\n              src="https://cdn.ddjf.com/static/images/bpms-workBench/bean-right.png"\n            />\n          </div>\n        </div>\n      </div> ')
         ])
       ]);
     };
@@ -2797,6 +2798,7 @@ var script$q = /* @__PURE__ */ defineComponent({
         } else {
           reachedLastPage.value = false;
         }
+      }).finally(() => {
         Taro.hideLoading();
       });
     }
@@ -5843,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({
@@ -5920,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 */
@@ -8111,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: "",
@@ -8156,6 +8166,22 @@ var script = /* @__PURE__ */ defineComponent({
         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" }, {
@@ -8167,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 */
@@ -8191,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",
                           {
@@ -8207,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",
@@ -8229,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")