@uxda/appkit 4.3.19 → 4.3.21

package/dist/appkit.css

@@ -239,8 +239,14 @@
   flex-grow: 1;
 }
 .recharge-view .amount-footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background-color: #fff;
   padding: 10px;
   padding-bottom: 20px;
+  z-index: 10;
 }
 .recharge-view .amount-footer .agreement {
   font-size: 12px;
@@ -424,6 +430,12 @@
 }
 .recharge-view2 .amount-footer {
   padding: 10px 0;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  z-index: 10;
+  background-color: #fff;
 }
 .recharge-view2 .amount-footer .agreement {
   font-size: 12px;

package/dist/index.js

@@ -452,7 +452,8 @@ const defaultLogOptions = {
   projectName: "ddyk-dev",
   logStore: "ddjf-internet-web",
   topic: "appkit",
-  enable: true
+  enable: true,
+  enableDebug: false
 };
 function generateUniqueId(pre) {
   return `${pre ? pre + "-" : ""}${Date.now().toString(16)}-${Math.random().toString(36).substr(2)}`;
@@ -481,6 +482,7 @@ function useLogger(options) {
   const baseUrl = `https://${projectName}.cn-shenzhen.log.aliyuncs.com/logstores/${logStore}/track?APIVersion=${APIVersion}`;
   const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl;
   const enable = options.enable === void 0 ? true : options.enable;
+  const enableDebug = options.enableDebug === void 0 ? false : options.enableDebug;
   const { miniProgram } = Taro.getEnv() === "WEAPP" ? Taro.getAccountInfoSync() : { miniProgram: { version: "" } };
   const systemInfo = JSON.stringify({
     ...getSystemInfoSync(),
@@ -522,7 +524,9 @@ function useLogger(options) {
       current: `${currentPage?.route}?${qs.stringify(taroParams)}`,
       last: lastPage ? `${lastPage?.route}?${qs.stringify(laseTaroParams)}` : ""
     }).slice(0, 1024);
-    console.log(params);
+    if (enableDebug) {
+      console.log(params);
+    }
     const tmpStr = Object.keys(params).map((key) => `${key}=${encodeURIComponent(params[key])}`).join("&");
     const url2 = `${alislsURL}&${tmpStr}`;
     request$1({ url: url2 });
@@ -995,7 +999,7 @@ const endpointsList$3 = {
     path: "/ac-app/account/info/detail/app",
     // /app
     translate: (data) => ({
-      appCode: data.app
+      appCode: data.app || ""
     }),
     transform(result) {
       return {
@@ -3905,10 +3909,13 @@ const _hoisted_6$9 = {
   key: 1,
   class: "amount"
 };
-const _hoisted_7$6 = { class: "amount" };
+const _hoisted_7$6 = {
+  key: 0,
+  class: "amount"
+};
 const _hoisted_8$5 = ["src"];
 const _hoisted_9$4 = {
-  key: 0,
+  key: 1,
   class: "balance-warning"
 };
 const _hoisted_10$3 = {
@@ -4105,14 +4112,14 @@ var script$A = /* @__PURE__ */ defineComponent({
       }
     }
     const onPayClick = async () => {
+      if (isCombinedPayment.value || selectBean.value) {
+        const res = await checkBalance();
+        if (!res) return;
+      }
       if (selectBean.value && !isCombinedPayment.value) {
         showDialog.value = true;
         return;
       }
-      if (isCombinedPayment.value) {
-        const res = await checkBalance();
-        if (!res) return;
-      }
       proceedWechatPayment();
     };
     async function checkBalance() {
@@ -4196,22 +4203,23 @@ var script$A = /* @__PURE__ */ defineComponent({
                 /* TEXT */
               ))
             ]),
-            createElementVNode("div", {
+            balance.value > 0 ? (openBlock(), createElementBlock("div", {
+              key: 0,
               class: "right",
               onClick: _cache[0] || (_cache[0] = ($event) => selectBean.value = !selectBean.value)
             }, [
-              createElementVNode(
+              !isCombinedPayment.value ? (openBlock(), createElementBlock(
                 "div",
                 _hoisted_7$6,
                 " -" + toDisplayString(unref(formatAmount)(amounts.value[state.selected].paymentAmount || 0)),
                 1
                 /* TEXT */
-              ),
+              )) : createCommentVNode("v-if", true),
               createElementVNode("img", {
                 class: "icon",
                 src: selectBean.value ? "https://cdn.ddjf.com/static/images/appkit/select.svg" : "https://cdn.ddjf.com/static/images/appkit/not-select.svg"
               }, null, 8, _hoisted_8$5)
-            ]),
+            ])) : createCommentVNode("v-if", true),
             isCombinedPayment.value ? (openBlock(), createElementBlock(
               "div",
               _hoisted_9$4,

package/package.json

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

package/src/balance/api/endpoints.ts

@@ -52,7 +52,7 @@ const endpointsList: HttpEndpoints = {
   获取余额明细: {
     path: '/ac-app/account/info/detail/app', // /app
     translate: (data: OnlyApp) => ({
-      appCode: data.app,
+      appCode: data.app || '',
     }),
     transform(result: any) {
       return {

package/src/payment/components/RechargeView.vue

@@ -191,8 +191,14 @@ defineExpose({
   }
 
   .amount-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background-color: #fff;
     padding: 10px;
     padding-bottom: 20px;
+    z-index: 10;
 
     .agreement {
       font-size: 12px;

package/src/payment/components/TradeView.vue

@@ -17,8 +17,8 @@
             {{ formatAmount(balance - amounts[state.selected].paymentAmount) }}
           </div>
         </div>
-        <div class="right" @click="selectBean = !selectBean">
-          <div class="amount">
+        <div v-if="balance > 0" class="right" @click="selectBean = !selectBean">
+          <div class="amount" v-if="!isCombinedPayment">
             -{{ formatAmount(amounts[state.selected].paymentAmount || 0) }}
           </div>
           <img
@@ -360,18 +360,18 @@ function getChannelCode() {
 }
 
 const onPayClick = async () => {
+  // 云豆支付与组合支付检验云豆是否已经改变，改变则刷新选择
+  if (isCombinedPayment.value || selectBean.value) {
+    const res = await checkBalance()
+    if (!res) return
+  }
+
   // 用云豆支付（纯云豆支付）
   if (selectBean.value && !isCombinedPayment.value) {
     showDialog.value = true;
     return;
   }
 
-  if (isCombinedPayment.value) {
-    // 检验云豆是否已经改变，改变则刷新选择
-    const res = await checkBalance()
-    if (!res) return
-  }
-
   // 纯微信支付
   proceedWechatPayment();
 }
@@ -512,6 +512,12 @@ defineExpose({
 
   .amount-footer {
     padding: 10px 0;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    background-color: #fff;
 
     .agreement {
       font-size: 12px;

package/src/shared/composables/useLogger.ts

@@ -15,6 +15,7 @@ interface LogType {
   alislsURL?: string
   systemInfo?: string
   enable?: boolean
+  enableDebug?: boolean
 }
 
 const defaultLogOptions: LogType = {
@@ -22,6 +23,7 @@ const defaultLogOptions: LogType = {
   logStore: 'ddjf-internet-web',
   topic: 'appkit',
   enable: true,
+  enableDebug: false,
 }
 
 // 使用时间戳生成唯一标识
@@ -56,6 +58,7 @@ export function useLogger(options?: LogType) {
   const baseUrl = `https://${projectName}.cn-shenzhen.log.aliyuncs.com/logstores/${logStore}/track?APIVersion=${APIVersion}`
   const alislsURL = topic ? `${baseUrl}&__topic__=${topic}` : baseUrl
   const enable = options.enable === undefined ? true : options.enable
+  const enableDebug = options.enableDebug === undefined ? false : options.enableDebug
 
   const { miniProgram } =
     Taro.getEnv() === 'WEAPP' ? Taro.getAccountInfoSync() : { miniProgram: { version: '' } }
@@ -107,7 +110,9 @@ export function useLogger(options?: LogType) {
         : '',
     }).slice(0, 1024)
 
-    console.log(params)
+    if (enableDebug) {
+      console.log(params)
+    }
 
     const tmpStr = Object.keys(params)
       .map((key) => `${key}=${encodeURIComponent(params[key])}`)