@uxda/appkit 4.1.12 → 4.1.16

package/dist/appkit.css

@@ -1406,6 +1406,7 @@ page {
   align-items: center;
   justify-content: center;
   border-radius: 15px;
+  z-index: 10;
 }
 .notice-banner {
   background: #e6f2ff;

package/dist/index.js

@@ -4,8 +4,8 @@ import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
 import { defineComponent, reactive, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, unref, isRef, normalizeStyle, onMounted, createStaticVNode, watch, resolveComponent, withDirectives, vShow, useModel, mergeModels, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
-import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import Taro, { useDidShow, useRouter } from '@tarojs/taro';
+import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import { isIdentityCard, isMobilePhone } from 'validator';
 import { NsForm, NsInput, NsButton, NsIcon, useNutshell } from '@uxda/nutshell/taro';
 import debounce from 'lodash/debounce';
@@ -1380,7 +1380,7 @@ var script$A = /* @__PURE__ */ defineComponent({
     app: { type: String, required: true },
     tenant: { type: String, required: true }
   },
-  emits: ["complete"],
+  emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
@@ -1391,8 +1391,10 @@ var script$A = /* @__PURE__ */ defineComponent({
       buttonLoading: false
     });
     const amounts = ref([]);
-    const onAgreementLinkClick = ($event) => {
-      state.agreementOpen = true;
+    const onAgreementLinkClick = (e) => {
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      emit("agree");
     };
     const onAmountSelect = (selected) => {
       state.selected = selected;
@@ -1452,7 +1454,7 @@ var script$A = /* @__PURE__ */ defineComponent({
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.agreed = $event)
             }, {
               default: withCtx(() => [
-                _cache[2] || (_cache[2] = createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")),
+                _cache[1] || (_cache[1] = createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")),
                 createElementVNode("a", {
                   class: "link inline",
                   onClick: onAgreementLinkClick
@@ -1469,18 +1471,13 @@ var script$A = /* @__PURE__ */ defineComponent({
             onClick: onPayClick,
             class: "recharge-button"
           }, {
-            default: withCtx(() => _cache[3] || (_cache[3] = [
+            default: withCtx(() => _cache[2] || (_cache[2] = [
               createTextVNode("\u7ACB\u5373\u5145\u503C")
             ])),
             _: 1
             /* STABLE */
           }, 8, ["loading"])
-        ]),
-        createVNode(unref(script$G), {
-          modelValue: state.agreementOpen,
-          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreementOpen = $event),
-          title: "\u5145\u503C\u534F\u8BAE"
-        }, null, 8, ["modelValue"])
+        ])
       ]);
     };
   }
@@ -1685,21 +1682,23 @@ var script$w = /* @__PURE__ */ defineComponent({
     app: { type: String, required: true },
     tenant: { type: String, required: true }
   },
-  emits: ["complete"],
+  emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
     const state = reactive({
       agreed: false,
       selected: 0,
-      agreementOpen: false,
+      // agreementOpen: false,
       buttonLoading: false
     });
     const balance = ref(0);
     const amounts = ref([]);
     const selectBean = ref(false);
-    const onAgreementLinkClick = ($event) => {
-      state.agreementOpen = true;
+    const onAgreementLinkClick = (e) => {
+      e.preventDefault();
+      e.stopImmediatePropagation();
+      emit("agree");
     };
     const onAmountSelect = (selected) => {
       state.selected = selected;
@@ -1775,7 +1774,7 @@ var script$w = /* @__PURE__ */ defineComponent({
           }, null, 8, ["items", "selected"]),
           amounts.value[state.selected] ? (openBlock(), createElementBlock("div", _hoisted_3$e, [
             createElementVNode("div", _hoisted_4$b, [
-              _cache[5] || (_cache[5] = createElementVNode(
+              _cache[4] || (_cache[4] = createElementVNode(
                 "div",
                 { class: "title" },
                 "\u4F7F\u7528\u4E91\u8C46\u652F\u4ED8",
@@ -1822,7 +1821,7 @@ var script$w = /* @__PURE__ */ defineComponent({
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreed = $event)
             }, {
               default: withCtx(() => [
-                _cache[6] || (_cache[6] = createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")),
+                _cache[5] || (_cache[5] = createTextVNode("\u6211\u5DF2\u9605\u8BFB\u5E76\u540C\u610F")),
                 createElementVNode("a", {
                   class: "link inline",
                   onClick: onAgreementLinkClick
@@ -1834,9 +1833,9 @@ var script$w = /* @__PURE__ */ defineComponent({
           ])) : createCommentVNode("v-if", true),
           createElementVNode("div", _hoisted_11$2, [
             createElementVNode("div", _hoisted_12$2, [
-              _cache[8] || (_cache[8] = createTextVNode(" \u5F85\u652F\u4ED8\uFF1A ")),
+              _cache[7] || (_cache[7] = createTextVNode(" \u5F85\u652F\u4ED8\uFF1A ")),
               createElementVNode("span", _hoisted_13$2, [
-                _cache[7] || (_cache[7] = createElementVNode(
+                _cache[6] || (_cache[6] = createElementVNode(
                   "i",
                   null,
                   "\uFFE5",
@@ -1857,7 +1856,7 @@ var script$w = /* @__PURE__ */ defineComponent({
               onClick: onPayClick,
               class: "recharge-button"
             }, {
-              default: withCtx(() => _cache[9] || (_cache[9] = [
+              default: withCtx(() => _cache[8] || (_cache[8] = [
                 createTextVNode("\u8D2D\u4E70")
               ])),
               _: 1
@@ -1865,23 +1864,12 @@ var script$w = /* @__PURE__ */ defineComponent({
             }, 8, ["loading"])
           ])
         ]),
-        createVNode(unref(script$G), {
-          modelValue: state.agreementOpen,
-          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.agreementOpen = $event),
-          title: "\u5145\u503C\u534F\u8BAE"
-        }, {
-          default: withCtx(() => [
-            createVNode(script$z)
-          ]),
-          _: 1
-          /* STABLE */
-        }, 8, ["modelValue"]),
         createVNode(_component_nut_dialog, {
           title: "\u786E\u8BA4\u8D2D\u4E70",
           "custom-class": "trade-dialog",
           visible: showDialog.value,
-          "onUpdate:visible": _cache[3] || (_cache[3] = ($event) => showDialog.value = $event),
-          onCancel: _cache[4] || (_cache[4] = ($event) => showDialog.value = !showDialog.value),
+          "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => showDialog.value = $event),
+          onCancel: _cache[3] || (_cache[3] = ($event) => showDialog.value = !showDialog.value),
           onOk: beanPay
         }, {
           default: withCtx(() => [

package/package.json

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

package/src/notice/components/NoticePopup.vue

@@ -155,6 +155,7 @@ const emits = defineEmits(['close', 'view'])
       align-items: center;
       justify-content: center;
       border-radius: 15px;
+      z-index: 10;
     }
   }
 }

package/src/payment/components/RechargeView.vue

@@ -15,18 +15,12 @@
         @click="onPayClick"
         class="recharge-button">立即充值</nut-button>
     </view>
-    <app-drawer
-      v-model="state.agreementOpen"
-      title="充值协议">
-    </app-drawer>
   </view>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, reactive, ref } from 'vue'
 import AmountPicker from './AmountPicker.vue'
-import UserAgreement from './UserAgreement.vue'
-import { AppDrawer } from '../../shared'
 import { useHttp, endpoints } from '../api'
 import { requestPayment } from '../services'
 import Taro from '@tarojs/taro'
@@ -53,7 +47,8 @@ export interface RechargeViewProps {
 const props = defineProps<RechargeViewProps>()
 
 const emit = defineEmits<{
-  (event: 'complete', value: boolean): void
+  (event: 'complete', value: boolean): void,
+  (event: 'agree'): void,
 }>()
 
 const state = reactive({
@@ -65,8 +60,11 @@ const state = reactive({
 
 const amounts = ref<any[]>([])
 
-const onAgreementLinkClick = ($event) => {
-  state.agreementOpen = true
+const onAgreementLinkClick = (e) => {
+  e.preventDefault()
+  e.stopImmediatePropagation()
+  emit('agree')
+  // state.agreementOpen = true
 }
 
 const onAmountSelect = (selected: number) => {

package/src/payment/components/TradeView.vue

@@ -33,13 +33,7 @@
         @click="onPayClick"
         class="recharge-button">购买</nut-button>
       </div>
-      
     </view>
-    <app-drawer
-      v-model="state.agreementOpen"
-      title="充值协议">
-      <user-agreement />
-    </app-drawer>
     <nut-dialog title="确认购买" custom-class="trade-dialog" v-model:visible="showDialog" @cancel="showDialog = !showDialog" @ok="beanPay" >
       <template v-if="amounts[state.selected]">
         <div class="item">云豆扣减：{{ amounts[state.selected].paymentAmount }}</div>
@@ -53,8 +47,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, reactive, ref } from 'vue'
 import RightsPicker, { Amount } from './RightsPicker.vue'
-import UserAgreement from './UserAgreement.vue'
-import { AppDrawer } from '../../shared'
 import { endpoints, useHttp } from '../api'
 import { requestPaymentByBean } from '../services'
 import Taro from '@tarojs/taro'
@@ -81,13 +73,14 @@ export interface RechargeViewProps {
 const props = defineProps<RechargeViewProps>()
 
 const emit = defineEmits<{
-  (event: 'complete', value: {result: boolean, type: string}): void
+  (event: 'complete', value: {result: boolean, type: string}): void,
+  (event: 'agree'): void,
 }>()
 
 const state = reactive({
   agreed: false,
   selected: 0,
-  agreementOpen: false,
+  // agreementOpen: false,
   buttonLoading: false,
 })
 
@@ -96,8 +89,11 @@ const balance = ref<number>(0)
 const amounts = ref<Amount[]>([])
 const selectBean = ref<boolean>(false)
 
-const onAgreementLinkClick = ($event) => {
-  state.agreementOpen = true
+const onAgreementLinkClick = (e) => {
+  e.preventDefault()
+  e.stopImmediatePropagation()
+  emit('agree')
+  // state.agreementOpen = true
 }
 
 const onAmountSelect = (selected: number) => {