@uxda/appkit 4.2.67 → 4.2.69

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, useRouter, useDidShow, getStorageSync } 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",
         {
@@ -1676,6 +1686,8 @@ const requestBrandWCPay = (params, Appcode = "") => {
           icon: "none"
         });
         resolve(false);
+      } else if (params.fromMini) {
+        resolve(response.json);
       } else {
         requestWxH5Pay(response.json).then((result) => {
           if (result) {
@@ -1703,6 +1715,8 @@ const requestBrandWCPayByBean = (params, Appcode = "") => {
           icon: "none"
         });
         resolve(false);
+      } else if (params.fromMini) {
+        resolve(response.json);
       } else {
         requestWxH5Pay(response.json).then((result) => {
           if (result) {
@@ -1745,6 +1759,7 @@ var script$B = /* @__PURE__ */ defineComponent({
   emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const { params } = useRouter();
     const emit = __emit;
     const state = reactive({
       agreed: false,
@@ -1794,12 +1809,15 @@ var script$B = /* @__PURE__ */ defineComponent({
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: "centergzh",
-          payFinishJumpUrl: props.payFinishJumpUrl
+          payFinishJumpUrl: props.payFinishJumpUrl,
+          fromMini: !!params.from
         }).then((result) => {
           console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
-          if (result) {
+          if (typeof result === "boolean") {
             window.location.href = props.payFinishJumpUrl;
+          } else {
+            emit("complete", result);
           }
         });
       } else {
@@ -2098,6 +2116,7 @@ var script$x = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const { formatAmount } = useAmount();
+    const { params } = useRouter();
     const emit = __emit;
     const state = reactive({
       agreed: false,
@@ -2173,12 +2192,15 @@ var script$x = /* @__PURE__ */ defineComponent({
           tenant: props.tenant,
           accountAuthFlag: false,
           channelCode: "centergzh",
-          payFinishJumpUrl: props.payFinishJumpUrl
+          payFinishJumpUrl: props.payFinishJumpUrl,
+          fromMini: !!params.from
         }).then((result) => {
           console.log(result, "------requestBrandWCPay");
           state.buttonLoading = false;
-          if (result) {
+          if (typeof result === "boolean") {
             window.location.href = props.payFinishJumpUrl;
+          } else {
+            emit("complete", { result, type: "wePay" });
           }
         });
       } else {

package/package.json

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

package/src/payment/components/RechargeView.vue

@@ -19,7 +19,7 @@ import { onMounted, reactive, ref } from 'vue'
 import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
-import Taro, { showToast } from '@tarojs/taro'
+import Taro, { showToast, useRouter } from '@tarojs/taro'
 import { isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
@@ -46,6 +46,7 @@ export interface RechargeViewProps {
 }
 
 const props = defineProps<RechargeViewProps>()
+const { params } = useRouter()
 
 const emit = defineEmits<{
   (event: 'complete', value: boolean): void,
@@ -108,12 +109,15 @@ const onPayClick = () => {
       tenant: props.tenant,
       accountAuthFlag: false,
       channelCode: 'centergzh',
-      payFinishJumpUrl: props.payFinishJumpUrl
+      payFinishJumpUrl: props.payFinishJumpUrl,
+      fromMini: !!params.from
     }).then(result => {
       console.log(result, '------requestBrandWCPay')
       state.buttonLoading = false
-      if (result) {
+      if (typeof result === 'boolean') {
         window.location.href = props.payFinishJumpUrl as string
+      } else {
+        emit('complete', result)
       }
     })
   } else {

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 { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
-import Taro, { showToast } from '@tarojs/taro'
+import Taro, { showToast, useRouter } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
 import { isWechat } from '../../shared/composables/useDeviceEnv'
 
@@ -84,6 +84,7 @@ export interface RechargeViewProps {
 
 const props = defineProps<RechargeViewProps>()
 const { formatAmount } = useAmount()
+const { params } = useRouter()
 
 const emit = defineEmits<{
   (event: 'complete', value: { result: boolean, type: string }): void,
@@ -179,12 +180,15 @@ const onPayClick = () => {
       tenant: props.tenant,
       accountAuthFlag: false,
       channelCode: 'centergzh',
-      payFinishJumpUrl: props.payFinishJumpUrl
+      payFinishJumpUrl: props.payFinishJumpUrl,
+      fromMini: !!params.from
     }).then(result => {
       console.log(result, '------requestBrandWCPay')
       state.buttonLoading = false
-      if (result) {
+      if (typeof result === 'boolean') {
         window.location.href = props.payFinishJumpUrl as string
+      } else {
+        emit('complete', { result, type: 'wePay' })
       }
     })
   } else {

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

@@ -75,6 +75,8 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
             icon: 'none',
           })
           resolve(false)
+        } else if (params.fromMini) {
+          resolve(response.json)
         } else {
           requestWxH5Pay(response.json).then((result) => {
             if (result) {
@@ -105,6 +107,8 @@ const requestBrandWCPayByBean = (params: PaymentParams, Appcode = '') => {
             icon: 'none',
           })
           resolve(false)
+        } else if (params.fromMini) {
+          resolve(response.json)
         } else {
           requestWxH5Pay(response.json).then((result) => {
             if (result) {

package/src/payment/types.ts

@@ -26,6 +26,7 @@ export type PaymentParams = {
   accountAuthFlag?: boolean
   channelCode?: string
   payFinishJumpUrl?: string
+  fromMini?: Boolean
 }
 
 export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>

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',