@uxda/appkit 4.1.44 → 4.1.48

package/package.json

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

package/src/balance/components/AccountView.vue

@@ -16,7 +16,7 @@
           <div class="rule" @click="rulesPopupOpen = true">规则说明</div>
         </div>
         <div class="bean-counts spa-between">
-          <div class="counts number">{{ balance.total || 0 }}</div>
+          <div class="counts number">{{ formatAmount(balance.total || 0) }}</div>
           <div class="pay" @click="gotoRecharge">云豆充值</div>
         </div>
       </div>
@@ -26,7 +26,7 @@
         <div class="list">
           <div class="item star-item" v-for="(item, index) in balance.privileges.corporateStar" :key="index">
             <div class="item-count">
-              <span>{{ item.count }}</span><span>{{ item.unit }}</span>
+              <span>{{ formatAmount(item.count || 0) }}</span><span>{{ item.unit }}</span>
             </div>
             <div class="item-title">
               <div>{{ item.title }}</div>
@@ -42,7 +42,7 @@
         <div class="title">AI审批权益</div>
         <div class="list">
           <div class="item" v-for="(item, index) in balance.privileges.aiapprove" :key="index">
-            <div class="item-count">{{ item.count }}{{ item.unit }}</div>
+            <div class="item-count">{{ formatAmount(item.count || 0) }}{{ item.unit }}</div>
             <div class="item-title">{{ item.title }}</div>
           </div>
         </div>
@@ -130,6 +130,7 @@ import dayjs from 'dayjs'
 import EmptyView from '../../shared/components/EmptyView.vue'
 import Tip from './Tip.vue'
 import groupBy from 'lodash/groupBy'
+import { useAmount } from '../../shared/composables/useAmount'
 
 const refreshing = ref(false)
 
@@ -140,6 +141,7 @@ const props = withDefaults(defineProps<AccountViewProps>(), {
   app: '',
 })
 
+const { formatAmount } = useAmount()
 const emit = defineEmits(['recharge', 'trade'])
 
 const filterOpen = ref<boolean>(false)

package/src/balance/components/BalanceCard.vue

@@ -9,7 +9,7 @@
             </div>
             <span class="baan-name">云豆</span>
           </div>
-          <div class="bean-nums number">{{ balance.total || 0 }}</div>
+          <div class="bean-nums number">{{ formatAmount(balance.total || 0) }}</div>
         </div>
         <div class="card-row-right">
           <div class="account-info-entry" @click="gotoDetail">
@@ -43,6 +43,7 @@ import { ref } from 'vue'
 import { endpoints, useHttp } from '../api'
 import { Balance } from '../types'
 import { useDidShow } from '@tarojs/taro'
+import { useAmount } from '../../shared/composables/useAmount'
 
 type BalanceCardProps = {
   app: string
@@ -51,6 +52,7 @@ const props = withDefaults(defineProps<BalanceCardProps>(), {
   app: '',
 })
 
+const { formatAmount } = useAmount()
 const balance = ref<Balance>({
   total: 0,
   privileges: [],

package/src/balance/components/PromoterCard.vue

@@ -6,15 +6,15 @@
     </div>
     <div class="promoter-card-hd" @click="emits('blance', tab)"
       v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
-      <div class="promoter-card-hd-num">{{ promoter.balance }}</div>
+      <div class="promoter-card-hd-num">{{ formatAmount(promoter.balance || 0) }}</div>
       <div class="promoter-card-hd-info">可提现余额(元)</div>
       <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
     </div>
     <div class="promoter-card-ft">
       <div class="promoter-card-ft-item" v-if="applyRecord.accessCheckStatus === 'Y'" @click="emits('profits', tab)">
-        <div class="promoter-card-ft-info">销售累计收益(笔)</div>
+        <div class="promoter-card-ft-info">销售累计收益(元)</div>
         <div class="promoter-card-ft-num">
-          {{ promoter.totalIncome }}
+          {{ formatAmount(promoter.totalIncome || 0) }}
           <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
         </div>
       </div>
@@ -23,7 +23,7 @@
       <div class="promoter-card-ft-item" @click="emits('rebate', tab)" v-if="applyRecord.distributorFlag === 'Y'">
         <div class="promoter-card-ft-info">返佣累计收益(元)</div>
         <div class="promoter-card-ft-num">
-          {{ promoter.totalRebateIncome }}
+          {{ formatAmount(promoter.totalRebateIncome || 0) }}
           <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
         </div>
       </div>
@@ -36,6 +36,7 @@ import { ref, watch } from 'vue'
 import { endpoints, useHttp } from '../api'
 import { Promoter } from '../types'
 import { useDidShow } from '@tarojs/taro'
+import { useAmount } from '../../shared/composables/useAmount'
 
 type PromoterCardProps = {
   useCase: string
@@ -48,6 +49,7 @@ const props = withDefaults(defineProps<PromoterCardProps>(), {
   isAdmin: true
 })
 
+const { formatAmount } = useAmount()
 const tab = ref('person')
 
 const promoter = ref<Promoter>({

package/src/payment/components/TradeView.vue

@@ -1,44 +1,42 @@
 <template>
   <view class="view recharge-view2">
     <view class="flex-grow">
-      <rights-picker :items="amounts"
-        :selected="state.selected"
-        @change="onAmountSelect" />
+      <rights-picker :items="amounts" :selected="state.selected" @change="onAmountSelect" />
       <div class="bean-buy" v-if="amounts[state.selected]">
         <div class="left">
           <div class="title">使用云豆支付</div>
-          <div class="amount" v-if="!selectBean">余额 {{balance}}</div>
-          <div class="amount" v-else>扣减后余额 {{(balance - amounts[state.selected].paymentAmount).toFixed(1)}}</div>
+          <div class="amount" v-if="!selectBean">余额 {{ formatAmount(balance || 0) }}</div>
+          <div class="amount" v-else>扣减后余额 {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}</div>
         </div>
         <div class="right" v-if="balance >= amounts[state.selected].paymentAmount" @click="selectBean = !selectBean">
-          <div class="amount">-{{ amounts[state.selected].paymentAmount }}</div>
-          <img class="icon" :src="selectBean ? 'https://cdn.ddjf.com/static/images/appkit/select.svg' : 'https://cdn.ddjf.com/static/images/appkit/not-select.svg'" />
+          <div class="amount">-{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}</div>
+          <img class="icon"
+            :src="selectBean ? 'https://cdn.ddjf.com/static/images/appkit/select.svg' : 'https://cdn.ddjf.com/static/images/appkit/not-select.svg'" />
         </div>
-      </div>  
+      </div>
     </view>
     <view class="amount-footer">
       <view class="agreement" v-if="!selectBean">
-        <nut-checkbox v-model="state.agreed">我已阅读并同意<a class="link inline" @click="onAgreementLinkClick">《大道云平台云豆充值服务协议》</a></nut-checkbox>
+        <nut-checkbox v-model="state.agreed">我已阅读并同意<a class="link inline"
+            @click="onAgreementLinkClick">《大道云平台云豆充值服务协议》</a></nut-checkbox>
       </view>
       <div class="buy-amount">
         <div class="left">
           待支付：
           <span class="amount">
-            <i>￥</i>{{ currentAmount }}
+            <i>￥</i>{{ formatAmount(currentAmount) }}
           </span>
         </div>
-        <nut-button block
-        shape="square"
-        :loading="state.buttonLoading"
-        @click="onPayClick"
-        class="recharge-button">购买</nut-button>
+        <nut-button block shape="square" :loading="state.buttonLoading" @click="onPayClick"
+          class="recharge-button">购买</nut-button>
       </div>
     </view>
-    <nut-dialog title="确认购买" custom-class="trade-dialog" v-model:visible="showDialog" @cancel="showDialog = !showDialog" @ok="beanPay" >
+    <nut-dialog title="确认购买" custom-class="trade-dialog" v-model:visible="showDialog" @cancel="showDialog = !showDialog"
+      @ok="beanPay">
       <template v-if="amounts[state.selected]">
-        <div class="item">云豆扣减：{{ amounts[state.selected].paymentAmount }}</div>
-        <div class="item">权益增加：{{ amounts[state.selected].priceRightNum }}笔</div>
-        <div class="item">扣减后云豆余额：{{ (balance - amounts[state.selected].paymentAmount).toFixed(1) }}</div>
+        <div class="item">云豆扣减：{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}</div>
+        <div class="item">权益增加：{{ formatAmount(amounts[state.selected].priceRightNum || 0) }}笔</div>
+        <div class="item">扣减后云豆余额：{{ formatAmount(balance - amounts[state.selected].paymentAmount) }}</div>
       </template>
     </nut-dialog>
   </view>
@@ -50,6 +48,7 @@ import RightsPicker, { Amount } from './RightsPicker.vue'
 import { endpoints, useHttp } from '../api'
 import { requestPaymentByBean } from '../services'
 import Taro from '@tarojs/taro'
+import { useAmount } from '../../shared/composables/useAmount'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -71,9 +70,10 @@ export interface RechargeViewProps {
 }
 
 const props = defineProps<RechargeViewProps>()
+const { formatAmount } = useAmount()
 
 const emit = defineEmits<{
-  (event: 'complete', value: {result: boolean, type: string}): void,
+  (event: 'complete', value: { result: boolean, type: string }): void,
   (event: 'agree'): void,
 }>()
 
@@ -101,7 +101,7 @@ const onAmountSelect = (selected: number) => {
   selectBean.value = false
 }
 
-const currentAmount = computed(()=>{
+const currentAmount = computed(() => {
   return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0
 })
 
@@ -115,13 +115,13 @@ onMounted(() => {
 
 // 云豆支付
 const showDialog = ref<boolean>(false)
-async function beanPay(){
+async function beanPay() {
   const $http = useHttp()
-  $http.post( `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
+  $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
     if (response) {
       showDialog.value = false
-      emit('complete', {result: response, type: 'bean'})
-    }else {
+      emit('complete', { result: response, type: 'bean' })
+    } else {
       Taro.showToast({
         title: response.message,
         icon: 'none',
@@ -133,11 +133,11 @@ async function beanPay(){
 
 const onPayClick = () => {
   // 用云豆支付
-  if(selectBean.value){
+  if (selectBean.value) {
     showDialog.value = true
-    return 
+    return
   }
-  
+
   // 微信支付
   if (!selectBean.value && !state.agreed) {
     Taro.showToast({
@@ -148,7 +148,7 @@ const onPayClick = () => {
   }
   state.buttonLoading = true
   wx.login({
-    success ({code}: {code: string}) {
+    success({ code }: { code: string }) {
       requestPaymentByBean({
         caseConfigId: amounts.value[state.selected].id,
         amount: amounts.value[state.selected].paymentAmount,
@@ -158,7 +158,7 @@ const onPayClick = () => {
       }).then(result => {
         state.buttonLoading = false
         if (result) {
-          emit('complete', {result: true, type: 'wePay'})
+          emit('complete', { result: true, type: 'wePay' })
         }
       })
     }
@@ -171,10 +171,12 @@ const onPayClick = () => {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .flex-grow {
     flex-grow: 1;
   }
-  .bean-buy{
+
+  .bean-buy {
     margin: 0 15px;
     padding: 10px;
     background: #FFFBF3;
@@ -182,16 +184,18 @@ const onPayClick = () => {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    .left{
-      .title{
-        color:#FD6701;
+
+    .left {
+      .title {
+        color: #FD6701;
         font-size: 14px;
         font-weight: 600;
-        line-height: 20px; 
+        line-height: 20px;
         margin-bottom: 6px;
       }
-      .amount{
-        color:#353535;
+
+      .amount {
+        color: #353535;
         font-size: 13px;
         line-height: 16px;
         background-image: url('https://cdn.ddjf.com/static/images/appkit/yundou.png');
@@ -200,16 +204,19 @@ const onPayClick = () => {
         padding-left: 24px;
       }
     }
-    .right{
+
+    .right {
       display: flex;
       align-items: center;
-      .amount{
-        color:#353535;
+
+      .amount {
+        color: #353535;
         font-size: 15px;
         line-height: 20px;
         margin-right: 10px;
       }
-      .icon{
+
+      .icon {
         display: block;
         width: 16px;
         height: 16px;
@@ -217,9 +224,11 @@ const onPayClick = () => {
       }
     }
   }
+
   .amount-footer {
     padding: 10px 0;
     padding-bottom: 20px;
+
     .agreement {
       font-size: 12px;
       display: flex;
@@ -227,27 +236,33 @@ const onPayClick = () => {
       align-items: cebter;
       height: 40px;
     }
-    .buy-amount{
+
+    .buy-amount {
       display: flex;
       justify-content: space-between;
       align-items: center;
       padding: 0 10px;
       border-radius: 0px;
-      box-shadow: 0px -5px 14px -5px rgba(0, 0, 0, 0.1); /* 上边框阴影 */
-      .left{
+      box-shadow: 0px -5px 14px -5px rgba(0, 0, 0, 0.1);
+
+      /* 上边框阴影 */
+      .left {
         width: 70%;
-        color:#353535;
+        color: #353535;
         font-size: 13px;
-        .amount{
-          color:#FD6701;
+
+        .amount {
+          color: #FD6701;
           font-size: 20px;
           font-weight: 600;
-          i{
+
+          i {
             font-size: 14px;
             font-style: normal;
           }
         }
       }
+
       .recharge-button {
         background: linear-gradient(90deg, #FFEBC1 0%, #FFD7A7 52.29%, #FFB875 100%);
         color: #353535;
@@ -257,36 +272,43 @@ const onPayClick = () => {
         flex: 1;
       }
     }
+
     .nut-checkbox {
       line-height: 40px;
     }
+
     .nut-checkbox__label {
       margin-left: 8px;
       flex: flex;
       font-size: 12px;
     }
+
     .link {
       display: inline;
       color: #FD6701;
     }
   }
 }
-.trade-dialog{
-  .nut-dialog__header{
+
+.trade-dialog {
+  .nut-dialog__header {
     font-size: 16px;
     color: #262626
   }
-  .item{
+
+  .item {
     font-size: 14px;
-    color:#666666;
+    color: #666666;
     line-height: 21px;
   }
-  .nut-dialog__footer-cancel{
+
+  .nut-dialog__footer-cancel {
     color: #353535 !important;
     border-color: #CCCCCC !important;
   }
+
   .nut-dialog__footer-ok {
-    border:none;
+    border: none;
     color: #353535;
     background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
   }

package/src/register/components/SelfRegistration.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { reactive } from 'vue'
-import OcrId from './../../components/ocr-id/index.vue'
-import { OcrResultType } from '../../components/ocr-id/types'
+import OcrIcon from '../../shared/components/OcrIcon.vue'
 import DdArea from './../../components/dd-area/index.vue'
 import DdSelector from './../../components/dd-selector/index.vue'
 import Taro from '@tarojs/taro'
@@ -46,10 +45,10 @@ const positionOptions = [
 
 const emit = defineEmits(['submit'])
 
-function onOCRInfo(payload: OcrResultType) {
+function onOCRInfo(payload: any) {
   if (!payload) return
-  formState.name = payload.faceInfo.name
-  formState.certNo = payload.faceInfo.certNo
+  formState.name = payload?.faceInfo.name
+  formState.certNo = payload?.faceInfo.certNo
 }
 
 function showVerifyToast(tip: string, duration = 1500) {
@@ -124,25 +123,18 @@ async function submit() {
         </nut-form-item>
         <nut-form-item label="你的姓名" required>
           <div class="self-registration__input">
-            <input
-              v-model="formState.name"
-              class="nut-input-text"
-              placeholder="请输入或拍照识别"
-              type="text"
-              :maxlength="20"
-            />
-            <OcrId @ocr="onOCRInfo" style="margin-left: 5px" />
+            <input v-model="formState.name" class="nut-input-text" placeholder="请输入或拍照识别" type="text" :maxlength="20" />
+            <OcrIcon @complete="onOCRInfo">
+              <template #icon>
+                <img style="width: 20px; height: 20px; margin-left: 5px;"
+                  src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgZmlsbD0ibm9uZSI+PHBhdGggb3BhY2l0eT0iLjAxIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTQwIDB2NDBIMFYwaDQweiIgZmlsbD0iI0M0QzRDNCIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzMuMDQ0IDE3LjM2M2MuOTYgMCAxLjczOS0uNzkgMS43MzktMS43NjYgMC0uOTc1LS43NzktMS43NjYtMS43NC0xLjc2Ni0uOTYgMC0xLjczOC43OS0xLjczOCAxLjc2NnMuNzc4IDEuNzY2IDEuNzM5IDEuNzY2eiIgZmlsbD0iIzRCQ0I5MyIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMCAzMS44MTJWMTQuNzg4YzAtMi4yNTggMi4wNDktNC4wOTcgNC41NjQtNC4wOTdoMy44NDRsMS4xMzYtMy42NThDOS44ODggNS45MTMgMTEuMjM3IDUgMTIuNTQ4IDVIMjcuNDVjMS4zOSAwIDIuNjguODc2IDMuMDEgMi4wNDRsMS4xMzMgMy42NDdoMy44NDRjMi41MTUgMCA0LjU2NCAxLjgzOSA0LjU2NCA0LjA5N3YxLjczOWMwIC41MDMtLjQ1NC45MS0xLjAxNC45MXMtMS4wMTQtLjQwNy0xLjAxNC0uOTF2LTEuNzRjMC0xLjI1My0xLjEzOS0yLjI3NS0yLjUzNi0yLjI3NWgtMy44NDRjLS45MDcgMC0xLjcxMS0uNTQ5LTEuOTU1LTEuMzMybC0xLjEzNi0zLjY2YS4zNDIuMzQyIDAgMCAwLS4wMDctLjAyNWMtLjExLS4zOTYtLjYzOS0uNjc0LTEuMDQ1LS42NzRoLTE0LjljLS4zOTkgMC0uOTUuMzY2LTEuMDUzLjY5OWwtMS4xMzYgMy42NmMtLjI0Ny43ODYtMS4wNDUgMS4zMy0xLjk1NSAxLjMzMkg0LjU2NGMtMS4zOTcgMC0yLjUzNiAxLjAyMi0yLjUzNiAyLjI3NnYxNy4wMjRjMCAxLjI1NCAxLjEzOSAyLjI3NiAyLjUzNiAyLjI3NmgzMC44N2MxLjM5NyAwIDIuNTM1LTEuMDIyIDIuNTM1LTIuMjc2VjIxLjU5NmMwLS41MDMuNDU0LS45MSAxLjAxNC0uOTFzMS4wMTUuNDA3IDEuMDE1LjkxVjMxLjgxYy0uMDAzIDIuMjYtMi4wNSA0LjEtNC41NjcgNC4xSDQuNTY0QzIuMDQ5IDM1LjkxIDAgMzQuMDcgMCAzMS44MTF6IiBmaWxsPSIjNEJDQjkzIi8+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi4xNzQgMjEuNzc4YzAtNC44NyAzLjcwNS04LjgzIDguMjYtOC44MyA0LjU1NiAwIDguMjYyIDMuOTYgOC4yNjIgOC44M3MtMy43MDYgOC44MzItOC4yNjEgOC44MzJjLTQuNTU2IDAtOC4yNjEtMy45NjItOC4yNjEtOC44MzJ6bTEuNzc5LjEzYzAgMy43OTYgMi45MDcgNi44ODMgNi40ODIgNi44ODMgMy41NzQgMCA2LjQ4MS0zLjA4NyA2LjQ4MS02Ljg4M3MtMi45MDctNi44ODMtNi40ODItNi44ODNjLTMuNTc0IDAtNi40ODEgMy4wODctNi40ODEgNi44ODN6IiBmaWxsPSIjNEJDQjkzIi8+PC9zdmc+" />
+              </template>
+            </OcrIcon>
           </div>
         </nut-form-item>
 
         <nut-form-item v-if="formState.scene === 'person'" label="身份证号码" required>
-          <input
-            v-model="formState.certNo"
-            class="nut-input-text"
-            placeholder="请输入"
-            type="text"
-            :maxlength="18"
-          />
+          <input v-model="formState.certNo" class="nut-input-text" placeholder="请输入" type="text" :maxlength="18" />
         </nut-form-item>
 
         <template v-else>
@@ -150,22 +142,11 @@ async function submit() {
             <DdSelector v-model:value="formState.position" :options="positionOptions" />
           </nut-form-item>
           <nut-form-item label="公司名称" required>
-            <input
-              v-model="formState.companyName"
-              class="nut-input-text"
-              placeholder="请输入"
-              type="text"
-              :maxlength="50"
-            />
+            <input v-model="formState.companyName" class="nut-input-text" placeholder="请输入" type="text"
+              :maxlength="50" />
           </nut-form-item>
           <nut-form-item label="社会统一信用代码" required>
-            <input
-              v-model="formState.companyNo"
-              class="nut-input-text"
-              placeholder="请输入"
-              type="text"
-              :maxlength="18"
-            />
+            <input v-model="formState.companyNo" class="nut-input-text" placeholder="请输入" type="text" :maxlength="18" />
           </nut-form-item>
           <nut-form-item label="所在地区" required>
             <DdArea v-model:value="formState.areaCode" type="city" placeholder="请选择" />
@@ -174,9 +155,7 @@ async function submit() {
       </nut-form>
     </div>
     <div class="self-registration-bottom">
-      <nut-button block type="primary" class="experience-button" @click="submit"
-        >立即体验</nut-button
-      >
+      <nut-button block type="primary" class="experience-button" @click="submit">立即体验</nut-button>
     </div>
   </div>
 </template>

package/src/shared/components/OcrBusinessLicense.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    :class="['ocr-business-license', disabled ? 'disabled' : '']"
-    class="ocr-icon"
-    @click="onIconClick"
-  >
+  <div :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" @click="onIconClick">
     <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" />
   </div>
 </template>
@@ -82,7 +78,6 @@ async function onIconClick() {
         objectNo: `min${Date.now()}`,
       },
       header: {
-        sessionKey: session || '',
         token: session || '',
       },
     });
@@ -120,10 +115,12 @@ async function onIconClick() {
 .ocr-business-license {
   width: 24px;
   height: 24px;
+
   .ns-icon {
     width: 24px;
     height: 24px;
   }
+
   &.disabled {
     .ns-icon {
       filter: brightness(1.5) grayscale(1);