@uxda/appkit 4.2.42 → 4.2.44

package/dist/index.js

@@ -1467,7 +1467,7 @@ function useHttp$2(defaultHeader) {
   const appkitOptions = useAppKitOptions();
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: defaultHeader?.Appcode !== void 0 ? defaultHeader?.Appcode : appkitOptions.app(),
+    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
     cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
@@ -1537,10 +1537,10 @@ const requestPayment = (params) => {
     });
   });
 };
-const requestPaymentByBean = (params) => {
+const requestPaymentByBean = (params, Appcode = "") => {
   return new Promise((resolve, reject) => {
     const $http = useHttp$2({
-      Appcode: params.app !== "cloudkitPro" && params.app !== "aiapprove" ? params.app : "",
+      Appcode,
       Tenant: params.tenant
     });
     $http.post(endpoints.\u83B7\u53D6\u6743\u76CA\u5FAE\u4FE1\u652F\u4ED8, {
@@ -1909,6 +1909,7 @@ const _hoisted_16$2 = { class: "item" };
 var script$x = /* @__PURE__ */ defineComponent({
   __name: "TradeView",
   props: {
+    headerApp: { type: String, required: true },
     app: { type: String, required: true },
     tenant: { type: String, required: true }
   },
@@ -1939,9 +1940,9 @@ var script$x = /* @__PURE__ */ defineComponent({
       return amounts.value[state.selected] && !selectBean.value ? amounts.value[state.selected].paymentAmount : 0;
     });
     onMounted(() => {
-      const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" && props.app !== "aiapprove" ? props.app : "", Tenant: props.tenant });
+      const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
       $http.get(endpoints.\u83B7\u53D6\u589E\u503C\u6743\u76CA\u7C7B\u76EE, {
-        rightCode: props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti"
+        rightCode: props.app === "cloudkitPro" ? "riskQueryCompany" : "riskQueryMulti"
       }).then((res) => {
         balance.value = res.balance;
         amounts.value = res.paymentCaseConfigVOS;
@@ -1949,7 +1950,7 @@ var script$x = /* @__PURE__ */ defineComponent({
     });
     const showDialog = ref(false);
     async function beanPay() {
-      const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" && props.app !== "aiapprove" ? props.app : "", Tenant: props.tenant });
+      const $http = useHttp$2({ Appcode: props.headerApp, Tenant: props.tenant });
       $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
         if (response) {
           showDialog.value = false;
@@ -1980,10 +1981,10 @@ var script$x = /* @__PURE__ */ defineComponent({
           requestPaymentByBean({
             caseConfigId: amounts.value[state.selected].id,
             amount: amounts.value[state.selected].paymentAmount,
-            app: props.app || "corporateStar",
+            app: props.app,
             tenant: props.tenant,
             user: code
-          }).then((result) => {
+          }, props.headerApp).then((result) => {
             state.buttonLoading = false;
             if (result) {
               emit("complete", { result: true, type: "wePay" });

package/package.json

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

package/src/payment/api/index.ts

@@ -63,7 +63,7 @@ function useHttp(defaultHeader?: DefaultHeaderType) {
   const appkitOptions = useAppKitOptions()
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: defaultHeader?.Appcode !== undefined ? defaultHeader?.Appcode : appkitOptions.app(),
+    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
     cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }

package/src/payment/components/TradeView.vue

@@ -59,6 +59,10 @@ import { useAmount } from '../../shared/composables/useAmount'
 // 自动获取支付套餐包列表
 // 并发起微信支付
 export interface RechargeViewProps {
+  /**
+   * header头中的appcode，一般情况下与app参数一致，当无应用权限时，此参数未空
+   **/
+  headerApp: string,
   /**
    * 应用
    **/
@@ -110,9 +114,9 @@ const currentAmount = computed(() => {
 })
 
 onMounted(() => {
-  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' && props.app !== 'aiapprove' ? props.app : '', Tenant: props.tenant })
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
   $http.get<any[]>(endpoints.获取增值权益类目, {
-    rightCode: props.app === 'corporateStar' ? 'riskQueryCompany' : 'riskQueryMulti',
+    rightCode: props.app === 'cloudkitPro' ? 'riskQueryCompany' : 'riskQueryMulti',
   }).then((res: any) => {
     balance.value = res.balance
     amounts.value = res.paymentCaseConfigVOS
@@ -122,7 +126,7 @@ onMounted(() => {
 // 云豆支付
 const showDialog = ref<boolean>(false)
 async function beanPay() {
-  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' && props.app !== 'aiapprove' ? props.app : '', Tenant: props.tenant })
+  const $http = useHttp({ Appcode: props.headerApp, Tenant: props.tenant })
   $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
     if (response) {
       showDialog.value = false
@@ -158,10 +162,10 @@ const onPayClick = () => {
       requestPaymentByBean({
         caseConfigId: amounts.value[state.selected].id,
         amount: amounts.value[state.selected].paymentAmount,
-        app: props.app || 'corporateStar',
+        app: props.app,
         tenant: props.tenant,
-        user: code
-      }).then(result => {
+        user: code,
+      }, props.headerApp).then(result => {
         state.buttonLoading = false
         if (result) {
           emit('complete', { result: true, type: 'wePay' })

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

@@ -27,10 +27,10 @@ const requestPayment = (params: PaymentParams) => {
   })
 }
 
-const requestPaymentByBean = (params: PaymentParams) => {
+const requestPaymentByBean = (params: PaymentParams, Appcode = '') => {
   return new Promise<boolean>((resolve, reject) => {
     const $http = useHttp({
-      Appcode: params.app !== 'cloudkitPro' && params.app !== 'aiapprove' ? params.app : '',
+      Appcode: Appcode,
       Tenant: params.tenant,
     })
     $http