@uxda/appkit 4.2.59 → 4.2.61

package/dist/appkit.css

@@ -1473,6 +1473,8 @@ page {
   margin-right: 4px;
 }
 .notice-popup-bd {
+  position: relative;
+  z-index: 10;
   color: #353535;
   box-shadow: 0px 2px 8px 0px rgba(255, 255, 255, 0.2) inset, 0px 1px 1px 0px rgba(255, 255, 255, 0.5019607843) inset, 0px 0px 1px 0px rgba(255, 255, 255, 0.6980392157);
   border-radius: 3px;
@@ -1489,6 +1491,8 @@ page {
   font-weight: 600;
 }
 .notice-popup-ft {
+  position: relative;
+  z-index: 10;
   display: flex;
   align-items: center;
   justify-content: center;

package/dist/index.js

@@ -1714,6 +1714,11 @@ const services$1 = [
   invokeRecharge$1
 ];
 
+function isWechat() {
+  let ua = window.navigator.userAgent.toLowerCase();
+  return ua.includes("micromessenger");
+}
+
 const _hoisted_1$y = { class: "view recharge-view" };
 const _hoisted_2$o = { class: "flex-grow" };
 const _hoisted_3$i = { class: "amount-footer" };
@@ -1763,6 +1768,14 @@ var script$B = /* @__PURE__ */ defineComponent({
       }
       state.buttonLoading = true;
       if (Taro.getEnv() === "WEB") {
+        if (!isWechat()) {
+          showToast({
+            title: "\u8BF7\u4F7F\u7528\u5FAE\u4FE1\u6D4F\u89C8\u5668\u6253\u5F00",
+            icon: "none"
+          });
+          state.buttonLoading = false;
+          return false;
+        }
         requestBrandWCPay({
           amount: amounts.value[state.selected].amount,
           app: "loankitMp",
@@ -1771,7 +1784,7 @@ var script$B = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
+          state.buttonLoading = false;
           window.location.href = props.payFinishJumpUrl;
         });
       } else {
@@ -2130,6 +2143,14 @@ var script$x = /* @__PURE__ */ defineComponent({
       }
       state.buttonLoading = true;
       if (Taro.getEnv() === "WEB") {
+        if (!isWechat()) {
+          showToast({
+            title: "\u8BF7\u4F7F\u7528\u5FAE\u4FE1\u6D4F\u89C8\u5668\u6253\u5F00",
+            icon: "none"
+          });
+          state.buttonLoading = false;
+          return false;
+        }
         requestBrandWCPayByBean({
           caseConfigId: amounts.value[state.selected].id,
           amount: amounts.value[state.selected].paymentAmount,
@@ -2139,7 +2160,7 @@ var script$x = /* @__PURE__ */ defineComponent({
           channelCode: "centergzh",
           payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
-          console.log(result);
+          state.buttonLoading = false;
           window.location.href = props.payFinishJumpUrl;
         });
       } else {

package/package.json

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

package/src/notice/components/NoticePopup.vue

@@ -1,24 +1,12 @@
 <template>
-  <nut-popup
-    pop-class="notice-popup"
-    :close-on-click-overlay="false"
-    v-model:visible="showPopup"
-    round
-  >
+  <nut-popup pop-class="notice-popup" :close-on-click-overlay="false" v-model:visible="showPopup" round>
     <div class="notice-popup-hd">
-      <img
-        class="notice-popup-hd-icon"
-        src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
-        alt=""
-      />系统公告
+      <img class="notice-popup-hd-icon" src="https://cdn.ddjf.com/static/images/customer-center/system-notice-1.png"
+        alt="" />系统公告
     </div>
     <div class="notice-popup-bd">
       <div style="white-space: pre-wrap">{{ message.context.replace('【系统公告】 ', '') }}</div>
-      <div
-        v-if="message.jumpUrl || message.link"
-        class="notice-popup-bd-link"
-        @click="toViewAttachment"
-      >
+      <div v-if="message.jumpUrl || message.link" class="notice-popup-bd-link" @click="toViewAttachment">
         点击查看附件
       </div>
     </div>
@@ -43,7 +31,7 @@ const props = withDefaults(
 
 const showPopup = ref(true)
 
-onMounted(() => {})
+onMounted(() => { })
 
 // 关闭
 function onCancel() {
@@ -86,6 +74,7 @@ const emits = defineEmits(['close', 'view'])
   padding: 20px 15px;
   border-radius: 10px !important;
   background: linear-gradient(136.72deg, #d0fdfe 6.02%, #a2b9ff 59.97%, #6593ff 108.78%);
+
   &::after {
     content: '';
     position: absolute;
@@ -97,6 +86,7 @@ const emits = defineEmits(['close', 'view'])
     z-index: 1;
     border-radius: 10px;
   }
+
   &::before {
     content: '';
     width: 236px;
@@ -119,13 +109,17 @@ const emits = defineEmits(['close', 'view'])
     align-items: center;
     margin-bottom: 20px;
     font-weight: 600;
+
     &-icon {
       width: 20px;
       height: 20px;
       margin-right: 4px;
     }
   }
+
   &-bd {
+    position: relative;
+    z-index: 10;
     color: #353535;
     box-shadow: 0px 2px 8px 0px #ffffff33 inset, 0px 1px 1px 0px #ffffff80 inset,
       0px 0px 1px 0px #ffffffb2;
@@ -136,16 +130,21 @@ const emits = defineEmits(['close', 'view'])
     padding: 15px 10px;
     box-sizing: border-box;
     font-size: 10px;
+
     &-link {
       color: #007fff;
       margin-top: 2px;
       font-weight: 600;
     }
   }
+
   &-ft {
+    position: relative;
+    z-index: 10;
     display: flex;
     align-items: center;
     justify-content: center;
+
     &-btn {
       background: #007fff;
       color: #fff;

package/src/payment/components/RechargeView.vue

@@ -20,6 +20,7 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
+import { isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -93,6 +94,14 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
+    if (!isWechat()) {
+      showToast({
+        title: '请使用微信浏览器打开',
+        icon: 'none',
+      })
+      state.buttonLoading = false
+      return false
+    }
     requestBrandWCPay({
       amount: amounts.value[state.selected].amount,
       app: 'loankitMp',
@@ -101,7 +110,7 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
+      state.buttonLoading = false
       window.location.href = props.payFinishJumpUrl as string
     })
   } else {

package/src/payment/components/TradeView.vue

@@ -53,6 +53,7 @@ import { endpoints, useHttp } from '../api'
 import { requestBrandWCPayByBean, requestPaymentByBean } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
 import { useAmount } from '../../shared/composables/useAmount'
+import { isWechat } from '../../shared/composables/useDeviceEnv'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -163,6 +164,14 @@ const onPayClick = () => {
   state.buttonLoading = true
 
   if (Taro.getEnv() === 'WEB') {
+    if (!isWechat()) {
+      showToast({
+        title: '请使用微信浏览器打开',
+        icon: 'none',
+      })
+      state.buttonLoading = false
+      return false
+    }
     requestBrandWCPayByBean({
       caseConfigId: amounts.value[state.selected].id,
       amount: amounts.value[state.selected].paymentAmount,
@@ -172,7 +181,7 @@ const onPayClick = () => {
       channelCode: 'centergzh',
       payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
-      console.log(result), 'result'
+      state.buttonLoading = false
       window.location.href = props.payFinishJumpUrl as string
     })
   } else {

package/src/shared/composables/useDeviceEnv.ts

@@ -0,0 +1,11 @@
+// 是否微信环境
+export function isWechat() {
+  let ua = window.navigator.userAgent.toLowerCase()
+  return ua.includes('micromessenger')
+}
+
+// 是否支付宝环境
+export function isAlipay() {
+  let ua = window.navigator.userAgent.toLowerCase()
+  return ua.includes('alipayclient')
+}