@uxda/appkit 4.1.62 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.1.62",
+  "version": "4.2.2",
   "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)
@@ -253,6 +253,7 @@ async function loadConsumptions(append: boolean = false) {
       } else {
         reachedLastPage.value = false
       }
+    }).finally(() => {
       Taro.hideLoading()
     })
 }
@@ -592,11 +593,11 @@ onMounted(() => {
 
     .operation-scroll {
       height: calc(100vh - 130px);
-      padding: 0 15px;
       box-sizing: border-box;
     }
 
     .box {
+      padding: 0 10px;
       &-detail {
         .title {
           line-height: 22px;

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({
   姓名: "",
   身份证号码: "",
   电话号码: "",
@@ -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

@@ -37,14 +37,23 @@
           :desc="encodePhone(userInfo.mobile || '')"
           @click="toBinding"
         />
-        <nut-cell title="昵称" :desc="userInfo?.nickName || '--'" />
+        <nut-cell
+          title="昵称"
+          is-link
+          @click="onNickNameChange"
+          :desc="userInfo?.nickName || '--'"
+        />
         <nut-cell title="认证信息" is-link @click="toAuth">
           <template #desc>
             <span v-if="userInfo?.verifyResult == 1">已认证</span>
             <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>
@@ -175,6 +184,46 @@
     </template>
   </nut-dialog>
 
+  <!-- 修改昵称弹框 -->
+  <nut-dialog
+    title="输入新的昵称"
+    :border="false"
+    pop-class="change-username-popup"
+    v-model:visible="nickNameState.visible"
+    @cancel="onNickNameCancel"
+  >
+    <input
+      v-model="nickNameState.value"
+      style="
+        background: #f5f5f5;
+        border-radius: 6px;
+        line-height: 40px;
+        padding: 10px 25px;
+        font-size: 16px;
+      "
+      :max-length="20"
+      placeholder="请输入新的昵称"
+      type="nickname"
+    />
+
+    <template #footer>
+      <nut-button
+        class="change-username-popup-cancel"
+        type="default"
+        @click="onNickNameCancel"
+      >
+        取消
+      </nut-button>
+      <nut-button
+        class="change-username-popup-ok"
+        type="primary"
+        @click="onNickNameOk"
+      >
+        确定
+      </nut-button>
+    </template>
+  </nut-dialog>
+
   <!-- 修改头像弹框 -->
   <nut-popup
     pop-class="upload-avatar-popup"
@@ -328,6 +377,10 @@ function toShowRole(item: any) {
   item.showRole = !item.showRole;
 }
 
+const nickNameState = reactive({
+  visible: false,
+  value: "",
+});
 // 更换用户名
 const userState = reactive({
   visible: false,
@@ -346,6 +399,15 @@ function onUserNameCancel() {
   userState.oldName = "";
   userState.tenantId = "";
 }
+
+function onNickNameCancel() {
+  nickNameState.visible = false;
+  nickNameState.value = "";
+}
+function onNickNameChange() {
+  nickNameState.visible = true;
+  nickNameState.value = "";
+}
 function onUserNameOk() {
   if (!userState.value) {
     return Taro.showToast({
@@ -376,6 +438,33 @@ function onUserNameOk() {
     });
 }
 
+function onNickNameOk() {
+  if (!nickNameState.value) {
+    return Taro.showToast({
+      title: "请输入昵称",
+      icon: "none",
+    });
+  }
+  // if (userState.value === userState.oldName) {
+  //   return Taro.showToast({
+  //     title: "用户名不能与原用户名相同",
+  //     icon: "none",
+  //   });
+  // }
+
+  const $http = useHttp();
+
+  $http
+    .post("/cas/sysAccount/updateAccountInfo", {
+      nickName: nickNameState.value,
+    })
+    .then(() => {
+      Taro.showToast({ title: "昵称修改成功", icon: "none" });
+      getUserInfoByUserId();
+      onNickNameCancel();
+      // emits("username-success");
+    });
+}
 // 退出登录
 function toLogout() {
   Taro.showModal({
@@ -397,7 +486,12 @@ function toBinding() {
 
 // 去认证页
 function toAuth() {
-  emits("auth", props.userId);
+  emits(
+    "auth",
+    props.userId,
+    userInfo.value?.verifyResult,
+    userInfo.value?.mobile
+  );
 }
 
 // 父组件事件