@uxda/appkit 4.2.36 → 4.2.40

package/dist/index.js

@@ -1464,10 +1464,11 @@ const vendor$2 = {
   }
 };
 function useHttp$2(defaultHeader) {
+  console.log(defaultHeader, "defaultHeader");
   const appkitOptions = useAppKitOptions();
   const headers = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
+    Appcode: defaultHeader?.Appcode !== void 0 ? defaultHeader?.Appcode : appkitOptions.app(),
     cookie: `tid=${defaultHeader?.Tenant || appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : "0"
   };
@@ -1519,7 +1520,10 @@ var invokeRecharge$1 = {
 
 const requestPayment = (params) => {
   return new Promise((resolve, reject) => {
-    const $http = useHttp$2();
+    const $http = useHttp$2({
+      Appcode: params.app !== "cloudkitPro" ? params.app : "",
+      Tenant: params.tenant
+    });
     $http.post(endpoints.\u83B7\u53D6\u5FAE\u4FE1\u652F\u4ED8\u53C2\u6570\u5305, {
       ...params
       // amount: 0.01,
@@ -1536,7 +1540,10 @@ const requestPayment = (params) => {
 };
 const requestPaymentByBean = (params) => {
   return new Promise((resolve, reject) => {
-    const $http = useHttp$2();
+    const $http = useHttp$2({
+      Appcode: params.app !== "cloudkitPro" ? params.app : "",
+      Tenant: params.tenant
+    });
     $http.post(endpoints.\u83B7\u53D6\u6743\u76CA\u5FAE\u4FE1\u652F\u4ED8, {
       ...params
     }).then((response) => {
@@ -1933,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();
+      const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" && props.app !== "aiapprove" ? props.app : "", Tenant: props.tenant });
       $http.get(endpoints.\u83B7\u53D6\u589E\u503C\u6743\u76CA\u7C7B\u76EE, {
-        rightCode: props.app === "cloudkitPro" ? "riskQueryCompany" : "riskQueryMulti"
+        rightCode: props.app === "corporateStar" ? "riskQueryCompany" : "riskQueryMulti"
       }).then((res) => {
         balance.value = res.balance;
         amounts.value = res.paymentCaseConfigVOS;
@@ -1943,7 +1950,7 @@ var script$x = /* @__PURE__ */ defineComponent({
     });
     const showDialog = ref(false);
     async function beanPay() {
-      const $http = useHttp$2();
+      const $http = useHttp$2({ Appcode: props.app !== "cloudkitPro" && props.app !== "aiapprove" ? props.app : "", Tenant: props.tenant });
       $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
         if (response) {
           showDialog.value = false;

package/package.json

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

package/src/payment/api/index.ts

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

package/src/payment/components/TradeView.vue

@@ -110,9 +110,9 @@ const currentAmount = computed(() => {
 })
 
 onMounted(() => {
-  const $http = useHttp()
+  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' && props.app !== 'aiapprove' ? props.app : '', Tenant: props.tenant })
   $http.get<any[]>(endpoints.获取增值权益类目, {
-    rightCode: props.app === 'cloudkitPro' ? 'riskQueryCompany' : 'riskQueryMulti',
+    rightCode: props.app === 'corporateStar' ? 'riskQueryCompany' : 'riskQueryMulti',
   }).then((res: any) => {
     balance.value = res.balance
     amounts.value = res.paymentCaseConfigVOS
@@ -122,7 +122,7 @@ onMounted(() => {
 // 云豆支付
 const showDialog = ref<boolean>(false)
 async function beanPay() {
-  const $http = useHttp()
+  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' && props.app !== 'aiapprove' ? props.app : '', Tenant: props.tenant })
   $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
     if (response) {
       showDialog.value = false

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

@@ -6,54 +6,61 @@ import Taro from '@tarojs/taro'
 
 const requestPayment = (params: PaymentParams) => {
   return new Promise<boolean>((resolve, reject) => {
-    const $http = useHttp()
-    $http.post(endpoints.获取微信支付参数包, {
-      ...params,
-      // amount: 0.01,
-    }).then(response => {
-      weappRequestPayment(response.json).then(result => {
-        if (result) {
-          resolve(true)
-        } else {
-          resolve(false)
-        }
-      })
+    const $http = useHttp({
+      Appcode: params.app !== 'cloudkitPro' ? params.app : '',
+      Tenant: params.tenant,
     })
-  })
-}
-
-const requestPaymentByBean = (params: PaymentParams) => {
-  return new Promise<boolean>((resolve, reject) => {
-    const $http = useHttp()
-    $http.post(endpoints.获取权益微信支付, {
-      ...params,
-    }).then((response: any) => {
-      if(!response.json){
-        Taro.showToast({
-          title: response.message,
-          icon: 'none',
-        })
-        resolve(false)
-      }else {
-        weappRequestPayment(response.json).then(result => {
+    $http
+      .post(endpoints.获取微信支付参数包, {
+        ...params,
+        // amount: 0.01,
+      })
+      .then((response) => {
+        weappRequestPayment(response.json).then((result) => {
           if (result) {
             resolve(true)
           } else {
             resolve(false)
           }
         })
-      }
+      })
+  })
+}
+
+const requestPaymentByBean = (params: PaymentParams) => {
+  return new Promise<boolean>((resolve, reject) => {
+    const $http = useHttp({
+      Appcode: params.app !== 'cloudkitPro' ? params.app : '',
+      Tenant: params.tenant,
     })
+    $http
+      .post(endpoints.获取权益微信支付, {
+        ...params,
+      })
+      .then((response: any) => {
+        if (!response.json) {
+          Taro.showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else {
+          weappRequestPayment(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
   })
 }
 
 export default {
-  install ($app: DollarApp) {
+  install($app: DollarApp) {
     $app.requestPayment = requestPayment
-  }
+  },
 }
 
-export {
-  requestPayment,
-  requestPaymentByBean
-}
+export { requestPayment, requestPaymentByBean }