@uxda/appkit 4.2.66 → 4.2.68

package/dist/index.js

@@ -4,7 +4,7 @@ import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
 import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, withDirectives, vShow, useModel, mergeModels, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
-import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useDidShow, showModal, getStorageSync, useRouter } from '@tarojs/taro';
+import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useDidShow, getStorageSync, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isIdentityCard from 'validator/es/lib/isIdentityCard';
@@ -114,6 +114,16 @@ const getSdkConfig = (appCode, url) => {
 function requestWxH5Pay(options) {
   return new Promise((resolve, reject) => {
     function onBridgeReady() {
+      if (typeof WeixinJSBridge === "undefined") {
+        showModal({
+          title: "\u63D0\u793A",
+          content: "\u5F53\u524D\u73AF\u5883\u4E0D\u652F\u6301\u5FAE\u4FE1\u652F\u4ED8\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5185\u7F6E\u6D4F\u89C8\u5668\u4E2D\u6253\u5F00",
+          confirmText: "\u786E\u5B9A",
+          success: () => {
+          }
+        });
+        return;
+      }
       WeixinJSBridge.invoke(
         "getBrandWCPayRequest",
         {
@@ -125,6 +135,7 @@ function requestWxH5Pay(options) {
           timeStamp: options.timeStamp
         },
         function(res) {
+          console.log(res, "-------res");
           if (res.err_msg == "get_brand_wcpay_request:ok") {
             resolve(true);
           } else {
@@ -168,7 +179,7 @@ function requestPayment$2(json) {
   });
 }
 
-const services$2 = [getSdkConfig$1];
+const jssdkServices = [getSdkConfig$1];
 
 function useSafeArea() {
   const systemInfo = getSystemInfoSync(), capsule = Taro.getEnv() === "WEAPP" ? getMenuButtonBoundingClientRect() : { top: 0, height: 0 };
@@ -1668,6 +1679,7 @@ const requestBrandWCPay = (params, Appcode = "") => {
     $http.post(endpoints.\u83B7\u53D6\u5FAE\u4FE1\u652F\u4ED8\u53C2\u6570\u5305, {
       ...params
     }).then((response) => {
+      console.log(response, "-----response");
       if (!response.json) {
         showToast({
           title: response.message,
@@ -8743,7 +8755,7 @@ const nutComponents = [
 ({
   ...components
 });
-const services = [...services$1, ...services$2];
+const services = [...services$1, ...jssdkServices];
 const $app = {
   setToken: (token) => {
     const appKitOptions = useAppKitOptions();
@@ -8781,4 +8793,4 @@ const AppKit = {
   }
 };
 
-export { script$q as AccountView, script$J as AmountPicker, script$H as AppDrawer, script$G as AppVerify, script$w as BalanceCard, script$p as BalanceReminder, script$o as DateRange, script$E as DeviceVersion, script$m as ListFilter, script$2 as LoginSetting, script$f as NoticeBanner, script$e as NoticeEntry, script$c as NoticeList, script$C as OcrBusinessLicense, script$D as OcrIcon, script$I as PageHeader, script$l as PromoterCard, script$z as RechargeResult, script$B as RechargeView, script$h as SelfRegistration, script$x as TradeView, script$A as UserAgreement, script as UserAuth, script$8 as UserBinding, script$7 as UserBindingSuccess, script$b as UserEntry, script$4 as UserFeedback, script$3 as UserFeedbackEntry, script$5 as UserHeadCrop, script$9 as UserInfo, script$1 as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getSdkConfig, requestPayment$2 as requestPayment, requestWxH5Pay, useAppKit, useCountdown, useCrypto, useEncode, useLogger, useSafeArea, useTabbar, useUpload, useValidator };
+export { script$q as AccountView, script$J as AmountPicker, script$H as AppDrawer, script$G as AppVerify, script$w as BalanceCard, script$p as BalanceReminder, script$o as DateRange, script$E as DeviceVersion, script$m as ListFilter, script$2 as LoginSetting, script$f as NoticeBanner, script$e as NoticeEntry, script$c as NoticeList, script$C as OcrBusinessLicense, script$D as OcrIcon, script$I as PageHeader, script$l as PromoterCard, script$z as RechargeResult, script$B as RechargeView, script$h as SelfRegistration, script$x as TradeView, script$A as UserAgreement, script as UserAuth, script$8 as UserBinding, script$7 as UserBindingSuccess, script$b as UserEntry, script$4 as UserFeedback, script$3 as UserFeedbackEntry, script$5 as UserHeadCrop, script$9 as UserInfo, script$1 as UserResourceEmpty, components, createHttp, AppKit as default, defaultCryptoConfig, generateUniqueId, getSdkConfig, jssdkServices, requestPayment$2 as requestPayment, requestWxH5Pay, services$1 as services, useAppKit, useCountdown, useCrypto, useEncode, useLogger, useSafeArea, useTabbar, useUpload, useValidator };

package/package.json

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

package/src/index.ts

@@ -1,7 +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 { jssdkServices } from './shared'
 import // Grid,
 // GridItem,
 // Button,

package/src/payment/services/request-payment.ts

@@ -68,6 +68,7 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
         ...params,
       })
       .then((response: any) => {
+        console.log(response, '-----response')
         if (!response.json) {
           showToast({
             title: response.message,

package/src/shared/index.ts

@@ -3,6 +3,6 @@ export * from './components'
 export * from './composables'
 export * from './http'
 
-import services from './weixin'
+import jssdkServices from './weixin'
 
-export { services }
+export { jssdkServices }

package/src/shared/weixin/index.ts

@@ -1,9 +1,9 @@
 import { Service } from '../../payment/services'
 import getSdkConfig from './jssdk'
 
-const services: Service[] = [getSdkConfig]
+const jssdkServices: Service[] = [getSdkConfig]
 
-export default services
+export default jssdkServices
 
 export * from './payment'
 export * from './jssdk'

package/src/shared/weixin/jssdk.ts

@@ -1,5 +1,6 @@
 import { DollarApp } from '../../Appkit'
 import { useHttp } from '../../payment/api'
+import { showModal } from '@tarojs/taro'
 
 interface JssdkConfig {
   appId: string
@@ -44,6 +45,16 @@ const getSdkConfig = (appCode?: string, url?: string): Promise<JssdkConfig> => {
 function requestWxH5Pay(options: PrePayOptions) {
   return new Promise<boolean>((resolve, reject) => {
     function onBridgeReady() {
+      // @ts-ignore
+      if (typeof WeixinJSBridge === 'undefined') {
+        showModal({
+          title: '提示',
+          content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
+          confirmText: '确定',
+          success: () => {},
+        })
+        return
+      }
       // @ts-ignore
       WeixinJSBridge.invoke(
         'getBrandWCPayRequest',
@@ -56,6 +67,7 @@ function requestWxH5Pay(options: PrePayOptions) {
           timeStamp: options.timeStamp,
         },
         function (res) {
+          console.log(res, '-------res')
           if (res.err_msg == 'get_brand_wcpay_request:ok') {
             //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
             resolve(true)