@uxda/appkit 4.2.34 → 4.2.38

package/dist/index.js

@@ -916,7 +916,11 @@ function useHttp$3() {
 
 var script$E = /* @__PURE__ */ defineComponent({
   __name: "DeviceVersion",
+  props: {
+    versions: { type: String, required: false, default: "{}" }
+  },
   setup(__props) {
+    const props = __props;
     const showAlert = ref(false);
     const safeArea = useSafeArea();
     const topStype = computed(() => {
@@ -924,6 +928,10 @@ var script$E = /* @__PURE__ */ defineComponent({
     });
     const recommendVersions = ref();
     const getPropertieByCode = debounce(async () => {
+      if (props?.versions !== "{}") {
+        recommendVersions.value = JSON.parse(props.versions);
+        return;
+      }
       if (recommendVersions.value) return;
       const $http = useHttp$3();
       $http.get("/cas/properties/getPropertie", {
@@ -1511,7 +1519,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,
@@ -1528,7 +1539,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) => {
@@ -1925,7 +1939,7 @@ 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 : "", Tenant: props.tenant });
       $http.get(endpoints.\u83B7\u53D6\u589E\u503C\u6743\u76CA\u7C7B\u76EE, {
         rightCode: props.app === "cloudkitPro" ? "riskQueryCompany" : "riskQueryMulti"
       }).then((res) => {
@@ -1935,7 +1949,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 : "", 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.34",
+  "version": "4.2.38",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/payment/components/TradeView.vue

@@ -110,7 +110,7 @@ const currentAmount = computed(() => {
 })
 
 onMounted(() => {
-  const $http = useHttp()
+  const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' ? props.app : '', Tenant: props.tenant })
   $http.get<any[]>(endpoints.获取增值权益类目, {
     rightCode: props.app === 'cloudkitPro' ? 'riskQueryCompany' : 'riskQueryMulti',
   }).then((res: any) => {
@@ -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 : '', 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 }

package/src/shared/components/DeviceVersion.vue

@@ -11,6 +11,15 @@ import Taro, { getSystemInfoSync } from '@tarojs/taro'
 import { useHttp } from '../../balance/api'
 import debounce from 'lodash-es/debounce'
 
+const props = withDefaults(
+  defineProps<{
+    versions?: string
+  }>(),
+  {
+    versions: '{}',
+  }
+)
+
 const showAlert = ref(false)
 const safeArea = useSafeArea()
 
@@ -21,6 +30,12 @@ const topStype = computed(() => {
 const recommendVersions = ref()
 // 获取系统配置 - 小程序推荐版本
 const getPropertieByCode = debounce(async () => {
+  if (props?.versions !== '{}') {
+    recommendVersions.value = JSON.parse(props.versions)
+
+    return
+  }
+
   if (recommendVersions.value) return
 
   const $http = useHttp()