@uxda/appkit 1.2.22 → 1.2.26

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" });
             }
           });
         }
@@ -967,7 +975,7 @@ var script$d = /* @__PURE__ */ defineComponent({
               )) : (openBlock(), createElementBlock(
                 "div",
                 _hoisted_7$4,
-                "\u6263\u51CF\u540E\u4F59\u989D " + toDisplayString(balance.value - amounts.value[state.selected].paymentAmount),
+                "\u6263\u51CF\u540E\u4F59\u989D " + toDisplayString((balance.value - amounts.value[state.selected].paymentAmount).toFixed(1)),
                 1
                 /* TEXT */
               ))

package/package.json

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

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

@@ -8,7 +8,7 @@
         <div class="left">
           <div class="title">使用云豆支付</div>
           <div class="amount" v-if="!selectBean">余额 {{balance}}</div>
-          <div class="amount" v-else>扣减后余额 {{balance - amounts[state.selected].paymentAmount}}</div>
+          <div class="amount" v-else>扣减后余额 {{(balance - amounts[state.selected].paymentAmount).toFixed(1)}}</div>
         </div>
         <div class="right" v-if="balance >= amounts[state.selected].paymentAmount" @click="selectBean = !selectBean">
           <div class="amount">-{{ amounts[state.selected].paymentAmount }}</div>
@@ -44,7 +44,7 @@
       <template v-if="amounts[state.selected]">
         <div class="item">云豆扣减：{{ amounts[state.selected].paymentAmount }}</div>
         <div class="item">权益增加：{{ amounts[state.selected].priceRightNum }}笔</div>
-        <div class="item">扣减后云豆余额：{{ balance - amounts[state.selected].paymentAmount }}</div>
+        <div class="item">扣减后云豆余额：{{ (balance - amounts[state.selected].paymentAmount).toFixed(1) }}</div>
       </template>
     </nut-dialog>
   </view>
@@ -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'})
         }
       })
     }