@uxda/appkit 4.2.46 → 4.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.46",
+  "version": "4.2.48",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -34,6 +34,8 @@
     "@tarojs/shared": "^4.0.0",
     "@tarojs/taro": "^4.0.0",
     "@types/wechat-miniprogram": "^3.4.7",
+    "@uxda/appkit": "^4.2.47",
+    "@uxda/nutshell": "^1.6.50",
     "dayjs": "^1.11.10",
     "lodash-es": "^4.17.21",
     "validator": "^13.12.0",

package/src/Appkit.ts

@@ -41,6 +41,7 @@ export type DollarApp = {
   setTempToken: (token: () => string) => void
   requestPayment: (options: PaymentParams) => void
   invokeRecharge: (options: RechargeParams) => void
+  getSdkConfig: (appCode: string) => void
 }
 
 /**

package/src/balance/api/index.ts

@@ -1,4 +1,4 @@
-import Taro, { request as TaroRequest } from '@tarojs/taro'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
 import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
@@ -32,7 +32,7 @@ const vendor = {
               data: data.result as T,
             })
           } else if (data.code !== '401') {
-            Taro.showToast({
+            showToast({
               title: data.msg,
               icon: 'none',
             })

package/src/balance/components/AccountView.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="account-view">
     <div class="scroll-content">
-      <page-header title="我的账户" :class="{ 'with-background': scrolled > 0 }" @close="onPageHeaderClose" />
+      <page-header :title="Taro.getEnv() !== 'WEB' ? '我的账户' : ''" :class="{ 'with-background': scrolled > 0 }"
+        @close="onPageHeaderClose" />
       <div class="row jusify-right">
         <div class="small-bean-button" @click="onSecondBalanceButtonClick">
-          <label>收支明细</label>
+          <label class="label">收支明细</label>
         </div>
       </div>
       <div class="balance">
@@ -98,7 +99,7 @@
         </div>
       </div>
       <div class="operation-list">
-        <scroll-view class="operation-scroll" :scroll-y="true" @scroll="onScroll" :lower-threshold="100"
+        <ScrollView class="operation-scroll" :scroll-y="true" @scroll="onScroll" :lower-threshold="100"
           @scrolltolower="onReachBottom">
           <div class="box" v-if="consumptionGroups.length > 0">
             <div class="box-detail" v-for="(item, index) in consumptionGroups" :key="index">
@@ -126,14 +127,14 @@
             <div class="box-not-text" v-if="reachedLastPage">没有更多了</div>
           </div>
           <empty-view v-else></empty-view>
-        </scroll-view>
+        </ScrollView>
       </div>
     </div>
   </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow, showLoading, hideLoading } from '@tarojs/taro'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { endpoints, useHttp } from '../api'
 import { 账户流水筛选项, Balance, ConsumptionGroup, 账户流水 } from '../types'
@@ -146,8 +147,7 @@ import EmptyView from '../../shared/components/EmptyView.vue'
 import Tip from './Tip.vue'
 import groupBy from 'lodash-es/groupBy'
 import { useAmount } from '../../shared/composables/useAmount'
-
-const refreshing = ref(false)
+import { ScrollView } from '@tarojs/components'
 
 type AccountViewProps = {
   app: string
@@ -156,6 +156,7 @@ const props = withDefaults(defineProps<AccountViewProps>(), {
   app: '',
 })
 
+const refreshing = ref(false)
 const { formatAmount } = useAmount()
 const emit = defineEmits(['recharge', 'trade'])
 
@@ -212,9 +213,11 @@ const balance = ref<Balance>({
 })
 
 useDidShow(() => {
-  Taro.setNavigationBarTitle({
-    title: '我的账户',
-  })
+  if (Taro.getEnv() !== 'WEB') {
+    Taro.setNavigationBarTitle({
+      title: '我的账户',
+    })
+  }
   loadBalance()
 })
 
@@ -251,7 +254,7 @@ async function loadConsumptions(append: boolean = false) {
     consumptionGroups.value = []
   }
   const $http = useHttp()
-  Taro.showLoading({
+  showLoading({
     title: `加载中...`,
     mask: true,
   })
@@ -269,7 +272,7 @@ async function loadConsumptions(append: boolean = false) {
         reachedLastPage.value = false
       }
     }).finally(() => {
-      Taro.hideLoading()
+      hideLoading()
     })
 }
 
@@ -372,14 +375,16 @@ function onSecondBalanceButtonClick() {
 }
 
 watch(secondBalanceOpen, () => {
-  Taro.setNavigationBarColor({
-    frontColor: secondBalanceOpen.value ? '#000000' : '#ffffff',
-    backgroundColor: '#ffffff',
-    animation: {
-      duration: 400,
-      timingFunc: 'easeIn',
-    },
-  })
+  if (Taro.getEnv() !== 'WEB') {
+    Taro.setNavigationBarColor({
+      frontColor: secondBalanceOpen.value ? '#000000' : '#ffffff',
+      backgroundColor: '#ffffff',
+      animation: {
+        duration: 400,
+        timingFunc: 'easeIn',
+      },
+    })
+  }
 })
 
 function onDateReset() {
@@ -456,7 +461,7 @@ onMounted(() => {
     color: #353535;
     font-size: 12px;
 
-    label {
+    .label {
       background-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTEwIDZMMTYgMTJMMTAgMThWNloiIGZpbGw9IiMzNTM1MzUiIHN0cm9rZT0iIzM1MzUzNSIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo=');
       padding-right: 18px;
       background-repeat: no-repeat;
@@ -734,23 +739,23 @@ onMounted(() => {
         align-items: center;
 
         .item-title-button {
-          padding: 0 27rpx;
-          height: 54rpx;
-          line-height: 54rpx;
+          padding: 0 14px;
+          height: 27px;
+          line-height: 27px;
           background: -webkit-linear-gradient(262.82deg, #353535 10.04%, #433f46 90.21%);
           background: linear-gradient(187.18deg, #353535 10.04%, #433f46 90.21%);
-          border-radius: 27rpx;
+          border-radius: 14px;
           color: #e7caad;
-          font-size: 24rpx;
+          font-size: 12px;
           font-weight: 400;
-          margin-left: 40rpx;
+          margin-left: 20px;
           display: flex;
           align-items: center;
 
           .button-icon {
             display: block;
-            width: 24rpx;
-            height: 24rpx;
+            width: 12px;
+            height: 12px;
             font-size: 0;
             margin-left: 4px;
           }

package/src/components/bt-cropper/index.vue

@@ -55,7 +55,7 @@
 /**
  * better-cropper 图片裁切插件
  */
-import Taro, { getSystemInfoSync } from '@tarojs/taro'
+import Taro, { getSystemInfoSync, showToast } from '@tarojs/taro'
 import calcImageSize from './utils/calcImageSize.js'
 import calcImagePosition from './utils/calcImagePosition.js'
 import calcCropper from './utils/calcCropper.js'
@@ -269,7 +269,7 @@ export default {
         fail: (err) => {
           console.error(err)
           this.imageInfo = ''
-          Taro.showToast({
+          showToast({
             title: '下载图片失败',
             icon: 'none',
           })

package/src/index.ts

@@ -1,6 +1,7 @@
 import { App } from 'vue'
 import { components as paymentComponents } from './payment/components'
 import { services as paymentServices } from './payment'
+import { services as jssdkServices } from './shared'
 import // Grid,
 // GridItem,
 // Button,
@@ -37,7 +38,7 @@ const appComponents = {
   ...paymentComponents,
 }
 
-const services = [...paymentServices]
+const services = [...paymentServices, ...jssdkServices]
 
 const $app: DollarApp = {
   setToken: (token: () => string) => {
@@ -50,6 +51,7 @@ const $app: DollarApp = {
   },
   requestPayment: (options: PaymentParams) => {},
   invokeRecharge: (options: RechargeParams) => {},
+  getSdkConfig: (appCode: string) => {},
 }
 
 services.forEach((service) => {

package/src/notice/api/index.ts

@@ -1,4 +1,4 @@
-import Taro, { request as TaroRequest } from '@tarojs/taro'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
 import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
@@ -32,7 +32,7 @@ const vendor = {
               data: data.result as T,
             })
           } else if (data.code !== '401') {
-            Taro.showToast({
+            showToast({
               title: data.msg,
               icon: 'none',
             })

package/src/notice/components/NoticeBanner.vue

@@ -1,24 +1,9 @@
 <template>
-  <div
-    class="notice-banner"
-    :class="{ fixed: fixed }"
-    :style="topStype"
-    v-if="bannerMessages.length"
-    @touchstart="onTouchStart"
-    @touchend="onTouchEnd"
-  >
-    <DdNoticeBar
-      :class="{ show: key === activeKey }"
-      v-for="(item, key) in bannerMessages"
-      :key="key"
-      :showClose="item.noticeType === 0"
-      @close="onClose(item, key)"
-    >
-      <img
-        class="notice-banner-icon"
-        src="https://cdn.ddjf.com/static/images/customer-center/notice-icon.png"
-        alt=""
-      />
+  <div class="notice-banner" :class="{ fixed: fixed }" :style="topStype" v-if="bannerMessages.length"
+    @touchstart="onTouchStart" @touchend="onTouchEnd">
+    <DdNoticeBar :class="{ show: key === activeKey }" v-for="(item, key) in bannerMessages" :key="key"
+      :showClose="item.noticeType === 0" @close="onClose(item, key)">
+      <img class="notice-banner-icon" src="https://cdn.ddjf.com/static/images/customer-center/notice-icon.png" alt="" />
       <div class="notice-banner-text">
         {{ item.context }}
       </div>
@@ -38,7 +23,7 @@ import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
 import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
 import NoticePopup from './NoticePopup.vue'
-import Taro from '@tarojs/taro'
+import Taro, { showToast } from '@tarojs/taro'
 import { useNotice } from './useNotice'
 import debounce from 'lodash-es/debounce'
 import { useSafeArea } from '../../shared/composables'
@@ -144,7 +129,7 @@ const onClose = debounce((item: any, index: number) => {
       receiveId: item.id,
     })
     .then(() => {
-      Taro.showToast({
+      showToast({
         title: '消息已关闭',
         icon: 'none',
       })
@@ -190,6 +175,7 @@ const emits = defineEmits(['detail', 'close', 'view', 'popup'])
   background: #e6f2ff;
   height: 30px;
   margin-bottom: 8px;
+
   &.fixed {
     position: fixed;
     z-index: 10;
@@ -206,19 +192,23 @@ const emits = defineEmits(['detail', 'close', 'view', 'popup'])
     min-height: auto;
     transition: all 0.2s;
     opacity: 0;
+
     &.show {
       height: 30px;
       opacity: 1;
     }
   }
+
   &-icon {
     width: 22px;
     height: 22px;
     margin-right: 8px;
   }
+
   .dd-notice-bar__close-img {
     display: none;
   }
+
   .dd-notice-bar__close {
     background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20' fill='none'%3E  %3Cpath d='M3.3335 3.33331L16.6668 16.6666' stroke='%23353535' stroke-width='1.66667' stroke-linecap='round' stroke-linejoin='round'/%3E  %3Cpath d='M3.3335 16.6666L16.6668 3.33331' stroke='%23353535' stroke-width='1.66667' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
     background-position: center;
@@ -226,6 +216,7 @@ const emits = defineEmits(['detail', 'close', 'view', 'popup'])
     background-size: 12px 12px;
     opacity: 0.6;
   }
+
   &-text {
     flex: 1;
     overflow: hidden;
@@ -235,6 +226,7 @@ const emits = defineEmits(['detail', 'close', 'view', 'popup'])
     -webkit-box-orient: vertical;
     text-align: left;
   }
+
   &-btn {
     color: var(--app-primary-color, #017fff);
     padding-left: 6px;

package/src/notice/components/NoticeEntry.vue

@@ -14,7 +14,7 @@
 import { ref } from 'vue'
 import { useHttp } from '../api'
 import { useAppKitOptions } from '../../Appkit'
-import Taro, { useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow, showToast } from '@tarojs/taro'
 import debounce from 'lodash-es/debounce'
 
 const props = withDefaults(
@@ -30,7 +30,7 @@ const props = withDefaults(
 
 const init = debounce(() => {
   if (!props.app) {
-    return Taro.showToast({
+    return showToast({
       title: 'NoticeEntry组件缺少appcode',
       icon: 'none',
     })

package/src/notice/components/NoticeList.vue

@@ -72,7 +72,7 @@
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue'
-import Taro from '@tarojs/taro'
+import Taro, { showToast } from '@tarojs/taro'
 import DdSearch from '../../components/dd-search/index.vue'
 import dayjs from 'dayjs'
 import { useNotice } from './useNotice'
@@ -109,7 +109,7 @@ const { list, init, runNext, runRefresh, isLast } = useCommonList<
 
 onMounted(async () => {
   if (!props.app) {
-    return Taro.showToast({
+    return showToast({
       title: 'NoticeList组件缺少appcode',
       icon: 'none',
     })
@@ -152,6 +152,10 @@ async function notifyRead(notice: any, index) {
       list.value[index].isRead = '1'
     }
   }
+  showToast({
+    title: '消息已读',
+    icon: 'none',
+  })
 }
 
 // 点击搜索

package/src/notice/components/useCommonList.ts

@@ -1,4 +1,4 @@
-import Taro from '@tarojs/taro'
+import Taro, { showLoading, hideLoading } from '@tarojs/taro'
 import { Ref, ref, unref } from 'vue'
 import { useHttp } from '../api'
 
@@ -17,7 +17,7 @@ interface QueryLimit {
 export function useCommonList<R, Q extends QueryLimit>(
   api: string,
   query: Ref<Q>,
-  showLoading = true,
+  loading = true,
   method = 'GET'
 ) {
   const isLast = ref(false)
@@ -28,7 +28,7 @@ export function useCommonList<R, Q extends QueryLimit>(
 
   async function fetchData(loading) {
     loading &&
-      Taro.showLoading({
+      showLoading({
         title: '加载中...',
       })
     isLoading.value = true
@@ -39,7 +39,7 @@ export function useCommonList<R, Q extends QueryLimit>(
     })
 
     isLoading.value = false
-    loading && Taro.hideLoading()
+    loading && hideLoading()
     if (res) {
       const pages = Math.ceil(res.total / res.pageSize)
       isLast.value = res.pageNum >= pages
@@ -69,7 +69,7 @@ export function useCommonList<R, Q extends QueryLimit>(
   async function init(pageNum?: number) {
     query.value.pageNum = pageNum || 1
     isLast.value = false
-    const data = await fetchData(showLoading)
+    const data = await fetchData(loading)
     list.value = data || []
     firstLoading.value = false
   }

package/src/payment/api/endpoints.ts

@@ -12,12 +12,13 @@ const endpointsList: HttpEndpoints = {
     translate: (data: any) => ({
       appCode: data.app,
       // caseCode: 'recharge', // 这个参数可以不要
-      tenantId: data.tenant
+      tenantId: data.tenant,
     }),
-    transform: (data: any) => data.amountList.map((d: any) => ({
-      token: d.desc,
-      amount: d.amount
-    }))
+    transform: (data: any) =>
+      data.amountList.map((d: any) => ({
+        token: d.desc,
+        amount: d.amount,
+      })),
   },
   /**
    * 查询支付参数包
@@ -37,22 +38,21 @@ const endpointsList: HttpEndpoints = {
     translate: (params: PaymentParams) => ({
       amount: params.amount,
       appCode: params.app,
-      // caseCode: data.stage, 这个参数可以不传
       tenantId: params.tenant,
-      // transFlowNo: '4343244', 这个参数可以不传
       certificateNo: params.user,
+      accountAuthFlag: params.accountAuthFlag || null,
+      channelCode: params.channelCode || null,
     }),
     transform: (data: any) => {
       let json = null
       try {
         json = JSON.parse(data.prePayStr)
-      } catch (e) {
-      }
+      } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
-        paymentId: data.payId // 查询用支付ID
+        paymentId: data.payId, // 查询用支付ID
       }
-    }
+    },
   },
   获取权益微信支付: {
     path: '/payment/outer/payment/valueExchangePay',
@@ -67,23 +67,22 @@ const endpointsList: HttpEndpoints = {
       let json = null
       try {
         json = JSON.parse(data.prePayStr)
-      } catch (e) {
-      }
+      } catch (e) {}
       return {
         json, // 拉起微信支付用的JSON串
-        paymentId: data.payId // 查询用支付ID
+        paymentId: data.payId, // 查询用支付ID
       }
-    }
+    },
   },
   获取增值权益类目: {
     path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
-    transform: (data: any) => data
+    transform: (data: any) => data,
   },
 } as const
 
 const keys = Object.keys(endpointsList as any)
 
-type Keys = typeof keys[number]
+type Keys = (typeof keys)[number]
 
 const endpoints: Record<Keys, string> = Object.fromEntries(
   Object.entries(endpointsList).map(([name, def]) => [name, def.path])
@@ -97,8 +96,4 @@ const transforms = Object.fromEntries(
   Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
 )
 
-export {
-  endpoints,
-  translates,
-  transforms,
-}
+export { endpoints, translates, transforms }

package/src/payment/api/index.ts

@@ -1,4 +1,4 @@
-import Taro, { request as TaroRequest } from '@tarojs/taro'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
 import { HttpRequestConfig, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
@@ -32,7 +32,7 @@ const vendor = {
               data: data.result as T,
             })
           } else if (data.code !== '401') {
-            Taro.showToast({
+            showToast({
               title: data.msg,
               icon: 'none',
             })

package/src/payment/components/RechargeView.vue

@@ -18,8 +18,9 @@
 import { onMounted, reactive, ref } from 'vue'
 import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
-import { requestPayment } from '../services'
-import Taro from '@tarojs/taro'
+import { requestBrandWCPay, requestPayment } from '../services'
+import Taro, { showToast } from '@tarojs/taro'
+import { getSdkConfig } from '../../shared'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -67,7 +68,13 @@ const onAmountSelect = (selected: number) => {
   state.selected = selected
 }
 
-onMounted(() => {
+// const 公众号配置 = ref<any>()
+
+onMounted(async () => {
+  // if (Taro.getEnv() === 'WEB') {
+  //   公众号配置.value = await getSdkConfig('loankitMp')
+  // }
+
   const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' ? props.app : '', Tenant: props.tenant })
 
   $http.get<any[]>(endpoints.获取充值金额列表, {
@@ -80,28 +87,41 @@ onMounted(() => {
 
 const onPayClick = () => {
   if (!state.agreed) {
-    Taro.showToast({
+    showToast({
       title: '请勾选《大道云平台云豆充值协议》',
       icon: 'none',
     })
     return false
   }
   state.buttonLoading = true
-  wx.login({
-    success({ code }: { code: string }) {
-      requestPayment({
-        amount: amounts.value[state.selected].amount,
-        app: props.app, // 'crm',
-        tenant: props.tenant, // '17454646',
-        user: code
-      }).then(result => {
-        state.buttonLoading = false
-        if (result) {
-          emit('complete', true)
-        }
-      })
-    }
-  })
+
+  if (Taro.getEnv() === 'WEB') {
+    requestBrandWCPay({
+      amount: amounts.value[state.selected].amount,
+      app: 'loankitMp',
+      tenant: props.tenant,
+      accountAuthFlag: false,
+      channelCode: 'centergzh',
+    }).then(result => {
+      console.log(result), 'result'
+    })
+  } else {
+    wx.login({
+      success({ code }: { code: string }) {
+        requestPayment({
+          amount: amounts.value[state.selected].amount,
+          app: props.app,
+          tenant: props.tenant,
+          user: code
+        }).then(result => {
+          state.buttonLoading = false
+          if (result) {
+            emit('complete', true)
+          }
+        })
+      }
+    })
+  }
 }
 </script>
 

package/src/payment/components/TradeView.vue

@@ -51,7 +51,7 @@ import { computed, onMounted, reactive, ref } from 'vue'
 import RightsPicker, { Amount } from './RightsPicker.vue'
 import { endpoints, useHttp } from '../api'
 import { requestPaymentByBean } from '../services'
-import Taro from '@tarojs/taro'
+import Taro, { showToast } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
 
 // 充值用户界面
@@ -132,7 +132,7 @@ async function beanPay() {
       showDialog.value = false
       emit('complete', { result: response, type: 'bean' })
     } else {
-      Taro.showToast({
+      showToast({
         title: response.message,
         icon: 'none',
       })
@@ -150,7 +150,7 @@ const onPayClick = () => {
 
   // 微信支付
   if (!selectBean.value && !state.agreed) {
-    Taro.showToast({
+    showToast({
       title: '请勾选《大道云平台云豆充值协议》',
       icon: 'none',
     })