@uxda/appkit 1.2.20 → 1.2.24

package/dist/index.js

@@ -684,11 +684,19 @@ const _hoisted_3$b = /* @__PURE__ */ createElementVNode(
   -1
   /* HOISTED */
 );
-const _hoisted_4$9 = { class: "caption" };
+const _hoisted_4$9 = {
+  key: 0,
+  class: "caption"
+};
+const _hoisted_5$7 = {
+  key: 1,
+  class: "caption"
+};
 var script$f = /* @__PURE__ */ defineComponent({
   __name: "RechargeResult",
   props: {
-    type: { type: String, required: true, default: "recharge" }
+    type: { type: String, required: true, default: "recharge" },
+    payMethod: { type: String, required: true, default: "" }
   },
   emits: ["dismiss"],
   setup(__props, { emit: __emit }) {
@@ -712,13 +720,13 @@ var script$f = /* @__PURE__ */ defineComponent({
             1
             /* TEXT */
           ),
-          createElementVNode(
+          _ctx.payMethod == "bean" ? (openBlock(), createElementBlock("div", _hoisted_4$9, "\u6743\u76CA\u5DF2\u5230\u8D26")) : (openBlock(), createElementBlock(
             "div",
-            _hoisted_4$9,
+            _hoisted_5$7,
             toDisplayString(views[_ctx.type][1]) + "\u5C06\u57281\u5206\u949F\u4E4B\u5185\u5230\u8D26",
             1
             /* TEXT */
-          ),
+          )),
           createVNode(_component_nut_button, {
             class: "back-button",
             type: "default",
@@ -903,7 +911,7 @@ var script$d = /* @__PURE__ */ defineComponent({
       $http.post(`/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response) => {
         if (response) {
           showDialog.value = false;
-          emit("complete", response);
+          emit("complete", { result: response, type: "bean" });
         } else {
           Taro.showToast({
             title: response.message,
@@ -938,7 +946,7 @@ var script$d = /* @__PURE__ */ defineComponent({
           }).then((result) => {
             state.buttonLoading = false;
             if (result) {
-              emit("complete", true);
+              emit("complete", { result: true, type: "wePay" });
             }
           });
         }
@@ -2499,7 +2507,8 @@ const _hoisted_5$1 = { class: "col" };
 var script$5 = /* @__PURE__ */ defineComponent({
   __name: "BalanceReminder",
   props: {
-    modelValue: { type: Boolean, required: true, default: () => false }
+    modelValue: { type: Boolean, required: true, default: () => false },
+    buttonText: { type: String, required: false, default: "\u53BB\u5145\u503C" }
   },
   emits: ["recharge", "update:modelValue"],
   setup(__props, { emit: __emit }) {
@@ -2538,7 +2547,11 @@ var script$5 = /* @__PURE__ */ defineComponent({
                   onClick: _cache[1] || (_cache[1] = ($event) => emit("recharge"))
                 }, {
                   default: withCtx(() => [
-                    createTextVNode("\u53BB\u5145\u503C")
+                    createTextVNode(
+                      toDisplayString(_ctx.buttonText),
+                      1
+                      /* TEXT */
+                    )
                   ]),
                   _: 1
                   /* STABLE */

package/package.json

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

package/src/balance/components/BalanceReminder.vue

@@ -20,7 +20,7 @@
         <div class="col">
           <nut-button block
             class="recharge-button"
-            @click="emit('recharge')">去充值</nut-button>
+            @click="emit('recharge')">{{buttonText}}</nut-button>
         </div>
       </div>
     </div>
@@ -30,13 +30,15 @@
 <script setup lang="ts">
 interface BalanceReminderProps {
   modelValue: boolean
+  buttonText?: string
 }
 
 const emit = defineEmits(['recharge', 'update:modelValue'])
 
 withDefaults(
   defineProps<BalanceReminderProps>(), {
-    modelValue: () => false
+    modelValue: () => false,
+    buttonText: '去充值'
   }
 )
 </script>

package/src/payment/api/endpoints.ts

@@ -76,7 +76,7 @@ const endpointsList: HttpEndpoints = {
     }
   },
   获取增值权益类目: {
-    path: "/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig",
+    path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
     transform: (data: any) => data
   },
 } as const

package/src/payment/components/RechargeResult.vue

@@ -3,7 +3,8 @@
     <div class="content">
       <div class="figure"></div>
       <h2>{{views[type][0]}}成功</h2>
-      <div class="caption">{{views[type][1]}}将在1分钟之内到账</div>
+      <div class="caption" v-if="payMethod == 'bean'">权益已到账</div>
+      <div class="caption" v-else>{{views[type][1]}}将在1分钟之内到账</div>
       <nut-button class="back-button" type="default" @click="onBackClick">返回</nut-button>
     </div>
   </div>
@@ -14,9 +15,11 @@ const emit = defineEmits(['dismiss'])
 
 type viewProps = {
   type: string;
+  payMethod: string    // bean: 云豆支付   wePay: 微信支付
 };
 const props = withDefaults(defineProps<viewProps>(), {
   type: "recharge",
+  payMethod: ''
 });
 
 const views = {

package/src/payment/components/TradeView.vue

@@ -81,7 +81,7 @@ export interface RechargeViewProps {
 const props = defineProps<RechargeViewProps>()
 
 const emit = defineEmits<{
-  (event: 'complete', value: boolean): void
+  (event: 'complete', value: {result: boolean, type: string}): void
 }>()
 
 const state = reactive({
@@ -124,7 +124,7 @@ async function beanPay(){
   $http.post( `/payment/paymentCaseConfig/purchase/${amounts.value[state.selected].id}`).then((response: any) => {
     if (response) {
       showDialog.value = false
-      emit('complete', response)
+      emit('complete', {result: response, type: 'bean'})
     }else {
       Taro.showToast({
         title: response.message,
@@ -162,7 +162,7 @@ const onPayClick = () => {
       }).then(result => {
         state.buttonLoading = false
         if (result) {
-          emit('complete', true)
+          emit('complete', {result: true, type: 'wePay'})
         }
       })
     }