@uxda/appkit 1.0.26 → 1.0.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/appkit.css CHANGED
@@ -1,47 +1,38 @@
1
- .amounts-picker .nut-grid-item__content {
2
- border-radius: 10px;
1
+ .amount-picker {
2
+ padding: 14px 0 14px 14px;
3
+ }
4
+ .amount-picker .nut-grid-item__content {
3
5
  border: 1px solid rgba(204, 204, 204, 0.8);
4
6
  background: #F5F5F5;
7
+ border-radius: 8px;
5
8
  }
6
- .amounts-picker .tile {
9
+ .amount-picker .tile {
7
10
  height: 80px;
8
11
  }
9
- .amounts-picker .tile.selected .nut-grid-item__content {
12
+ .amount-picker .tile.selected .nut-grid-item__content {
10
13
  border-width: 2px;
11
14
  border-color: #EFD082;
12
15
  background: linear-gradient(180deg, #FFF7E3 0%, #FEFDE6 100%);
13
16
  }
14
- .amounts-picker h4 {
15
- color: #d00;
16
- font-size: 18px;
17
- }
18
- .amounts-picker h5 {
19
- font-size: 12px;
20
- }
21
- .amounts-picker {
22
- padding-top: 10px;
23
- }
24
- .amounts-picker .nut-grid-item__content {
25
- border-radius: 8px;
26
- }
27
- .amounts-picker h4.token-line {
17
+ .amount-picker h4.token-line {
28
18
  background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
29
19
  background-size: 20px;
30
20
  background-repeat: no-repeat;
31
21
  background-position: left center;
32
22
  padding-left: 24px;
33
23
  color: #FD6701;
34
- font-size: 18px;
35
24
  font-weight: 600;
36
25
  line-height: 25px;
26
+ color: #d00;
27
+ font-size: 18px;
37
28
  }
38
- .amounts-picker h5 {
39
- font-size: 14px;
29
+ .amount-picker h5 {
40
30
  line-height: 18px;
41
31
  color: #353535;
42
32
  font-weight: 600;
43
33
  opacity: 0.6;
44
34
  margin-top: 4px;
35
+ font-size: 12px;
45
36
  }
46
37
  .agreement-doc {
47
38
  padding: 1em;
@@ -57,27 +48,6 @@
57
48
  .agreement-doc p {
58
49
  margin: 0;
59
50
  }
60
- .recharge-result {
61
- display: flex;
62
- width: 100vw;
63
- height: 100%;
64
- flex-direction: column;
65
- justify-content: center;
66
- align-items: center;
67
- }
68
- .recharge-result h2 {
69
- font-size: 16px;
70
- font-weight: bold;
71
- margin: 1em;
72
- }
73
- .recharge-result .figure {
74
- width: 100px;
75
- height: 100px;
76
- background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01MC41IDEwQzcyLjg2NzUgMTAgOTEgMjcuOTA4NiA5MSA1MEM5MSA3Mi4wOTE0IDcyLjg2NzUgOTAgNTAuNSA5MEMyOC4xMzI1IDkwIDEwIDcyLjA5MTQgMTAgNTBDMTAgMjcuOTA4NiAyOC4xMzI1IDEwIDUwLjUgMTBaIiBmaWxsPSIjOUFFMkNEIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNTAuNSAxOEM2OS4wMDE1IDE4IDg0IDMyLjU1MDggODQgNTAuNUM4NCA2OC40NDkyIDY5LjAwMTUgODMgNTAuNSA4M0MzMS45OTg1IDgzIDE3IDY4LjQ0OTIgMTcgNTAuNUMxNyAzMi41NTA4IDMxLjk5ODUgMTggNTAuNSAxOFYxOFoiIGZpbGw9IiNDQUZBRUMiLz4KPHBhdGggZD0iTTM3IDQ5LjVMNDcgNjBMNjcgMzkiIHN0cm9rZT0iIzNEQ0E5RCIgc3Ryb2tlLXdpZHRoPSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xOS4xMjA0IDE2LjI5MTlMNy45OTg4NCAxMi43MzIxTDE1LjkyOTQgNS4wNTg5N0wxOS4xMjA0IDE2LjI5MTlaIiBmaWxsPSIjQ0FGQUVDIi8+CjxwYXRoIGQ9Ik0xMi44MzQgMjMuNDY0Mkw4LjU0NjMxIDI3LjU3NzhMNy4xMjc2NSAyMS44MDc4TDEyLjgzNCAyMy40NjQyWiIgZmlsbD0iI0NBRkFFQyIvPgo8L3N2Zz4K");
77
- }
78
- .recharge-result .back-button {
79
- margin-top: 3em;
80
- }
81
51
  .page-header {
82
52
  flex-shrink: 0;
83
53
  position: relative;
@@ -138,6 +108,7 @@
138
108
  }
139
109
  .recharge-view .amount-footer {
140
110
  padding: 10px;
111
+ padding-bottom: 0;
141
112
  }
142
113
  .recharge-view .amount-footer .agreement {
143
114
  font-size: 12px;
@@ -151,6 +122,7 @@
151
122
  color: #353535;
152
123
  margin: 12px 0;
153
124
  border: 0;
125
+ border-radius: 8px;
154
126
  }
155
127
  .recharge-view .amount-footer .nut-checkbox {
156
128
  line-height: 40px;
@@ -164,6 +136,31 @@
164
136
  display: inline;
165
137
  color: #FD6701;
166
138
  }
139
+ .recharge-result {
140
+ display: flex;
141
+ width: 100vw;
142
+ height: 100vh;
143
+ flex-direction: column;
144
+ justify-content: center;
145
+ align-items: center;
146
+ }
147
+ .recharge-result h2 {
148
+ font-size: 16px;
149
+ font-weight: bold;
150
+ margin: 1em;
151
+ }
152
+ .recharge-result .caption {
153
+ color: #353535;
154
+ opacity: 0.5;
155
+ }
156
+ .recharge-result .figure {
157
+ width: 100px;
158
+ height: 100px;
159
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxwYXRoIG9wYWNpdHk9IjAuMiIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01MC41IDEwQzcyLjg2NzUgMTAgOTEgMjcuOTA4NiA5MSA1MEM5MSA3Mi4wOTE0IDcyLjg2NzUgOTAgNTAuNSA5MEMyOC4xMzI1IDkwIDEwIDcyLjA5MTQgMTAgNTBDMTAgMjcuOTA4NiAyOC4xMzI1IDEwIDUwLjUgMTBaIiBmaWxsPSIjOUFFMkNEIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNTAuNSAxOEM2OS4wMDE1IDE4IDg0IDMyLjU1MDggODQgNTAuNUM4NCA2OC40NDkyIDY5LjAwMTUgODMgNTAuNSA4M0MzMS45OTg1IDgzIDE3IDY4LjQ0OTIgMTcgNTAuNUMxNyAzMi41NTA4IDMxLjk5ODUgMTggNTAuNSAxOFYxOFoiIGZpbGw9IiNDQUZBRUMiLz4KPHBhdGggZD0iTTM3IDQ5LjVMNDcgNjBMNjcgMzkiIHN0cm9rZT0iIzNEQ0E5RCIgc3Ryb2tlLXdpZHRoPSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xOS4xMjA0IDE2LjI5MTlMNy45OTg4NCAxMi43MzIxTDE1LjkyOTQgNS4wNTg5N0wxOS4xMjA0IDE2LjI5MTlaIiBmaWxsPSIjQ0FGQUVDIi8+CjxwYXRoIGQ9Ik0xMi44MzQgMjMuNDY0Mkw4LjU0NjMxIDI3LjU3NzhMNy4xMjc2NSAyMS44MDc4TDEyLjgzNCAyMy40NjQyWiIgZmlsbD0iI0NBRkFFQyIvPgo8L3N2Zz4K");
160
+ }
161
+ .recharge-result .back-button {
162
+ margin-top: 3em;
163
+ }
167
164
  .account-card .card {
168
165
  background: #2F2F2F;
169
166
  border-radius: 10px;
package/dist/index.js CHANGED
@@ -1,4 +1,4 @@
1
- import { defineComponent, reactive, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createStaticVNode, createVNode, createTextVNode, createCommentVNode, renderSlot, ref, onMounted, unref, computed, withDirectives, vShow } from 'vue';
1
+ import { defineComponent, reactive, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createStaticVNode, createCommentVNode, renderSlot, createVNode, ref, onMounted, createTextVNode, unref, computed, withDirectives, vShow } from 'vue';
2
2
  import Taro, { usePageScroll } from '@tarojs/taro';
3
3
  import { Grid, GridItem, Button, Checkbox, Popup, OverLay, Icon, DatePicker, Picker } from '@nutui/nutui-taro';
4
4
 
@@ -28,7 +28,7 @@ var script$b = /* @__PURE__ */ defineComponent({
28
28
  const _component_nut_grid_item = resolveComponent("nut-grid-item");
29
29
  const _component_nut_grid = resolveComponent("nut-grid");
30
30
  return openBlock(), createBlock(_component_nut_grid, {
31
- class: "amounts-picker",
31
+ class: "amount-picker",
32
32
  "column-num": 3,
33
33
  gutter: 10,
34
34
  border: false
@@ -90,60 +90,6 @@ const script$a = {};
90
90
  script$a.render = render;
91
91
  script$a.__file = "src/payment/components/UserAgreement.vue";
92
92
 
93
- const _hoisted_1$9 = { class: "recharge-result" };
94
- const _hoisted_2$7 = /* @__PURE__ */ createElementVNode(
95
- "div",
96
- { class: "figure" },
97
- null,
98
- -1
99
- /* HOISTED */
100
- );
101
- const _hoisted_3$7 = /* @__PURE__ */ createElementVNode(
102
- "h2",
103
- null,
104
- "\u5145\u503C\u6210\u529F",
105
- -1
106
- /* HOISTED */
107
- );
108
- const _hoisted_4$6 = /* @__PURE__ */ createElementVNode(
109
- "div",
110
- { class: "caption" },
111
- "\u4E91\u8C46\u5C06\u57285\u5206\u949F\u4E4B\u5185\u5230\u8D26",
112
- -1
113
- /* HOISTED */
114
- );
115
- var script$9 = /* @__PURE__ */ defineComponent({
116
- __name: "RechargeResult",
117
- emits: ["dismiss"],
118
- setup(__props, { emit: __emit }) {
119
- const emit = __emit;
120
- function onBackClick() {
121
- emit("dismiss");
122
- }
123
- return (_ctx, _cache) => {
124
- const _component_nut_button = resolveComponent("nut-button");
125
- return openBlock(), createElementBlock("div", _hoisted_1$9, [
126
- _hoisted_2$7,
127
- _hoisted_3$7,
128
- _hoisted_4$6,
129
- createVNode(_component_nut_button, {
130
- class: "back-button",
131
- type: "default",
132
- onClick: onBackClick
133
- }, {
134
- default: withCtx(() => [
135
- createTextVNode("\u8FD4\u56DE")
136
- ]),
137
- _: 1
138
- /* STABLE */
139
- })
140
- ]);
141
- };
142
- }
143
- });
144
-
145
- script$9.__file = "src/payment/components/RechargeResult.vue";
146
-
147
93
  function requestPayment$2(json) {
148
94
  return new Promise((resolve, reject) => {
149
95
  const success = (message) => {
@@ -160,11 +106,11 @@ function requestPayment$2(json) {
160
106
  });
161
107
  }
162
108
 
163
- const _hoisted_1$8 = {
109
+ const _hoisted_1$9 = {
164
110
  key: 0,
165
111
  class: "page-title"
166
112
  };
167
- var script$8 = /* @__PURE__ */ defineComponent({
113
+ var script$9 = /* @__PURE__ */ defineComponent({
168
114
  __name: "PageHeader",
169
115
  props: {
170
116
  title: { type: String, required: false, default: "" },
@@ -188,7 +134,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
188
134
  [
189
135
  _ctx.title ? (openBlock(), createElementBlock(
190
136
  "h1",
191
- _hoisted_1$8,
137
+ _hoisted_1$9,
192
138
  toDisplayString(_ctx.title),
193
139
  1
194
140
  /* TEXT */
@@ -206,10 +152,10 @@ var script$8 = /* @__PURE__ */ defineComponent({
206
152
  }
207
153
  });
208
154
 
209
- script$8.__file = "src/shared/components/PageHeader.vue";
155
+ script$9.__file = "src/shared/components/PageHeader.vue";
210
156
 
211
- const _hoisted_1$7 = { class: "drawer-body" };
212
- var script$7 = /* @__PURE__ */ defineComponent({
157
+ const _hoisted_1$8 = { class: "drawer-body" };
158
+ var script$8 = /* @__PURE__ */ defineComponent({
213
159
  __name: "AppDrawer",
214
160
  props: {
215
161
  modelValue: { type: Boolean, required: true },
@@ -233,11 +179,11 @@ var script$7 = /* @__PURE__ */ defineComponent({
233
179
  "onUpdate:visible": onVisibleChange
234
180
  }, {
235
181
  default: withCtx(() => [
236
- createVNode(script$8, {
182
+ createVNode(script$9, {
237
183
  title: _ctx.title,
238
184
  onClose: onPageHeaderClose
239
185
  }, null, 8, ["title"]),
240
- createElementVNode("div", _hoisted_1$7, [
186
+ createElementVNode("div", _hoisted_1$8, [
241
187
  renderSlot(_ctx.$slots, "default")
242
188
  ])
243
189
  ]),
@@ -248,7 +194,7 @@ var script$7 = /* @__PURE__ */ defineComponent({
248
194
  }
249
195
  });
250
196
 
251
- script$7.__file = "src/shared/components/AppDrawer.vue";
197
+ script$8.__file = "src/shared/components/AppDrawer.vue";
252
198
 
253
199
  var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
254
200
  HttpMethod2["get"] = "GET";
@@ -479,11 +425,11 @@ const services$1 = [
479
425
  invokeRecharge$1
480
426
  ];
481
427
 
482
- const _hoisted_1$6 = { class: "view recharge-view" };
483
- const _hoisted_2$6 = { class: "flex-grow" };
484
- const _hoisted_3$6 = { class: "amount-footer" };
485
- const _hoisted_4$5 = { class: "agreement" };
486
- var script$6 = /* @__PURE__ */ defineComponent({
428
+ const _hoisted_1$7 = { class: "view recharge-view" };
429
+ const _hoisted_2$7 = { class: "flex-grow" };
430
+ const _hoisted_3$7 = { class: "amount-footer" };
431
+ const _hoisted_4$6 = { class: "agreement" };
432
+ var script$7 = /* @__PURE__ */ defineComponent({
487
433
  __name: "RechargeView",
488
434
  props: {
489
435
  app: { type: String, required: true },
@@ -497,7 +443,6 @@ var script$6 = /* @__PURE__ */ defineComponent({
497
443
  agreed: false,
498
444
  selected: 0,
499
445
  agreementOpen: false,
500
- resultOpen: false,
501
446
  buttonLoading: false
502
447
  });
503
448
  const amounts = ref([
@@ -543,27 +488,26 @@ var script$6 = /* @__PURE__ */ defineComponent({
543
488
  user: code
544
489
  }).then((result) => {
545
490
  state.buttonLoading = false;
546
- state.resultOpen = true;
491
+ if (result) {
492
+ emit("complete", true);
493
+ }
547
494
  });
548
495
  }
549
496
  });
550
497
  };
551
- const onResultDismiss = () => {
552
- emit("complete", true);
553
- };
554
498
  return (_ctx, _cache) => {
555
499
  const _component_nut_checkbox = resolveComponent("nut-checkbox");
556
500
  const _component_nut_button = resolveComponent("nut-button");
557
- return openBlock(), createElementBlock("view", _hoisted_1$6, [
558
- createElementVNode("view", _hoisted_2$6, [
501
+ return openBlock(), createElementBlock("view", _hoisted_1$7, [
502
+ createElementVNode("view", _hoisted_2$7, [
559
503
  createVNode(script$b, {
560
504
  items: amounts.value,
561
505
  selected: state.selected,
562
506
  onChange: onAmountSelect
563
507
  }, null, 8, ["items", "selected"])
564
508
  ]),
565
- createElementVNode("view", _hoisted_3$6, [
566
- createElementVNode("view", _hoisted_4$5, [
509
+ createElementVNode("view", _hoisted_3$7, [
510
+ createElementVNode("view", _hoisted_4$6, [
567
511
  createVNode(_component_nut_checkbox, {
568
512
  modelValue: state.agreed,
569
513
  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => state.agreed = $event)
@@ -593,7 +537,7 @@ var script$6 = /* @__PURE__ */ defineComponent({
593
537
  /* STABLE */
594
538
  }, 8, ["loading"])
595
539
  ]),
596
- createVNode(unref(script$7), {
540
+ createVNode(unref(script$8), {
597
541
  modelValue: state.agreementOpen,
598
542
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreementOpen = $event),
599
543
  title: "\u5145\u503C\u534F\u8BAE"
@@ -603,29 +547,73 @@ var script$6 = /* @__PURE__ */ defineComponent({
603
547
  ]),
604
548
  _: 1
605
549
  /* STABLE */
606
- }, 8, ["modelValue"]),
607
- createVNode(unref(script$7), {
608
- modelValue: state.resultOpen,
609
- "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => state.resultOpen = $event),
610
- title: "\u5145\u503C"
550
+ }, 8, ["modelValue"])
551
+ ]);
552
+ };
553
+ }
554
+ });
555
+
556
+ script$7.__file = "src/payment/components/RechargeView.vue";
557
+
558
+ const _hoisted_1$6 = { class: "recharge-result" };
559
+ const _hoisted_2$6 = /* @__PURE__ */ createElementVNode(
560
+ "div",
561
+ { class: "figure" },
562
+ null,
563
+ -1
564
+ /* HOISTED */
565
+ );
566
+ const _hoisted_3$6 = /* @__PURE__ */ createElementVNode(
567
+ "h2",
568
+ null,
569
+ "\u5145\u503C\u6210\u529F",
570
+ -1
571
+ /* HOISTED */
572
+ );
573
+ const _hoisted_4$5 = /* @__PURE__ */ createElementVNode(
574
+ "div",
575
+ { class: "caption" },
576
+ "\u4E91\u8C46\u5C06\u57285\u5206\u949F\u4E4B\u5185\u5230\u8D26",
577
+ -1
578
+ /* HOISTED */
579
+ );
580
+ var script$6 = /* @__PURE__ */ defineComponent({
581
+ __name: "RechargeResult",
582
+ emits: ["dismiss"],
583
+ setup(__props, { emit: __emit }) {
584
+ const emit = __emit;
585
+ function onBackClick() {
586
+ emit("dismiss");
587
+ }
588
+ return (_ctx, _cache) => {
589
+ const _component_nut_button = resolveComponent("nut-button");
590
+ return openBlock(), createElementBlock("div", _hoisted_1$6, [
591
+ _hoisted_2$6,
592
+ _hoisted_3$6,
593
+ _hoisted_4$5,
594
+ createVNode(_component_nut_button, {
595
+ class: "back-button",
596
+ type: "default",
597
+ onClick: onBackClick
611
598
  }, {
612
599
  default: withCtx(() => [
613
- createVNode(script$9, { onDismiss: onResultDismiss })
600
+ createTextVNode("\u8FD4\u56DE")
614
601
  ]),
615
602
  _: 1
616
603
  /* STABLE */
617
- }, 8, ["modelValue"])
604
+ })
618
605
  ]);
619
606
  };
620
607
  }
621
608
  });
622
609
 
623
- script$6.__file = "src/payment/components/RechargeView.vue";
610
+ script$6.__file = "src/payment/components/RechargeResult.vue";
624
611
 
625
612
  const components = {
626
613
  AmountPicker: script$b,
627
- RechargeView: script$6,
628
- UserAgreement: script$a
614
+ RechargeView: script$7,
615
+ UserAgreement: script$a,
616
+ RechargeResult: script$6
629
617
  };
630
618
 
631
619
  const typeMappings = {
@@ -698,7 +686,7 @@ const endpointsList = {
698
686
  list: result.accountRecordDetailDailyList.map((r) => ({
699
687
  date: r.operateTime,
700
688
  consumptions: r.accountRecordDetailList.map((d) => ({
701
- position: positionMappings[d.accountTYpe],
689
+ position: positionMappings[d.accountType],
702
690
  type: typeMappings[d.changeType],
703
691
  direction: directionMappings[d.inOrOut],
704
692
  amount: d.changeValue,
@@ -1780,4 +1768,4 @@ const AppKit = {
1780
1768
  }
1781
1769
  };
1782
1770
 
1783
- export { script$1 as AccountView, script$b as AmountPicker, script$7 as AppDrawer, script$5 as BalanceCard, script as BalanceReminder, script$8 as PageHeader, script$6 as RechargeView, script$a as UserAgreement, components, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useHttp };
1771
+ export { script$1 as AccountView, script$b as AmountPicker, script$8 as AppDrawer, script$5 as BalanceCard, script as BalanceReminder, script$9 as PageHeader, script$6 as RechargeResult, script$7 as RechargeView, script$a as UserAgreement, components, AppKit as default, requestPayment$2 as requestPayment, services$1 as services, useAppKit, useHttp };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uxda/appkit",
3
- "version": "1.0.26",
3
+ "version": "1.0.28",
4
4
  "description": "小程序应用开发包",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.ts",
@@ -75,7 +75,7 @@ const endpointsList: HttpEndpoints = {
75
75
  list: result.accountRecordDetailDailyList.map((r: any) => ({
76
76
  date: r.operateTime,
77
77
  consumptions: r.accountRecordDetailList.map((d: any) => ({
78
- position: positionMappings[d.accountTYpe],
78
+ position: positionMappings[d.accountType],
79
79
  type: typeMappings[d.changeType],
80
80
  direction: directionMappings[d.inOrOut],
81
81
  amount: d.changeValue,
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <nut-grid
3
- class="amounts-picker"
3
+ class="amount-picker"
4
4
  :column-num="3"
5
5
  :gutter="10"
6
6
  :border="false">
@@ -59,11 +59,12 @@ const onGridItemClick = (index: number) => {
59
59
  </script>
60
60
 
61
61
  <style lang="scss">
62
- .amounts-picker {
62
+ .amount-picker {
63
+ padding: 14px 0 14px 14px;
63
64
  .nut-grid-item__content {
64
- border-radius: 10px;
65
65
  border: 1px solid rgba(204, 204, 204, 0.80);
66
66
  background: #F5F5F5;
67
+ border-radius: 8px;
67
68
  }
68
69
  .tile {
69
70
  height: 80px;
@@ -75,22 +76,6 @@ const onGridItemClick = (index: number) => {
75
76
  }
76
77
  }
77
78
  }
78
- h4 {
79
- color: #d00;
80
- font-size: 18px;
81
- }
82
- h5 {
83
- font-size: 12px;
84
- }
85
- }
86
- </style>
87
-
88
- <style lang="scss">
89
- .amounts-picker {
90
- padding-top: 10px;
91
- .nut-grid-item__content {
92
- border-radius: 8px;
93
- }
94
79
  h4.token-line {
95
80
  background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
96
81
  background-size: 20px;
@@ -98,17 +83,18 @@ const onGridItemClick = (index: number) => {
98
83
  background-position: left center;
99
84
  padding-left: 24px;
100
85
  color: #FD6701;
101
- font-size: 18px;
102
86
  font-weight: 600;
103
87
  line-height: 25px;
88
+ color: #d00;
89
+ font-size: 18px;
104
90
  }
105
91
  h5 {
106
- font-size: 14px;
107
92
  line-height: 18px;
108
93
  color: #353535;
109
94
  font-weight: 600;
110
95
  opacity: 0.6;
111
96
  margin-top: 4px;
97
+ font-size: 12px;
112
98
  }
113
99
  }
114
100
  </style>
@@ -20,7 +20,7 @@ function onBackClick () {
20
20
  .recharge-result {
21
21
  display: flex;
22
22
  width: 100vw;
23
- height: 100%;
23
+ height: 100vh;
24
24
  flex-direction: column;
25
25
  justify-content: center;
26
26
  align-items: center;
@@ -29,6 +29,10 @@ function onBackClick () {
29
29
  font-weight: bold;
30
30
  margin: 1em;
31
31
  }
32
+ .caption {
33
+ color: #353535;
34
+ opacity: 0.5;
35
+ }
32
36
  .figure {
33
37
  width: 100px;
34
38
  height: 100px;
@@ -20,11 +20,6 @@
20
20
  title="充值协议">
21
21
  <user-agreement />
22
22
  </app-drawer>
23
- <app-drawer
24
- v-model="state.resultOpen"
25
- title="充值">
26
- <recharge-result @dismiss="onResultDismiss" />
27
- </app-drawer>
28
23
  </view>
29
24
  </template>
30
25
 
@@ -32,7 +27,6 @@
32
27
  import { onMounted, reactive, ref } from 'vue'
33
28
  import AmountPicker from './AmountPicker.vue'
34
29
  import UserAgreement from './UserAgreement.vue'
35
- import RechargeResult from './RechargeResult.vue'
36
30
  import { AppDrawer } from '../../shared'
37
31
  import { makeHttp, endpoints } from '../api'
38
32
  import { requestPayment } from '../services'
@@ -68,7 +62,6 @@ const state = reactive({
68
62
  agreed: false,
69
63
  selected: 0,
70
64
  agreementOpen: false,
71
- resultOpen: false,
72
65
  buttonLoading: false,
73
66
  })
74
67
 
@@ -117,16 +110,13 @@ const onPayClick = () => {
117
110
  user: code
118
111
  }).then(result => {
119
112
  state.buttonLoading = false
120
- state.resultOpen = true
113
+ if (result) {
114
+ emit('complete', true)
115
+ }
121
116
  })
122
117
  }
123
118
  })
124
119
  }
125
-
126
- const onResultDismiss = () => {
127
- emit('complete', true)
128
- // Taro.navigateBackMiniProgram({})
129
- }
130
120
  </script>
131
121
 
132
122
  <style lang="scss">
@@ -139,6 +129,7 @@ const onResultDismiss = () => {
139
129
  }
140
130
  .amount-footer {
141
131
  padding: 10px;
132
+ padding-bottom: 0;
142
133
  .agreement {
143
134
  font-size: 12px;
144
135
  display: flex;
@@ -151,6 +142,7 @@ const onResultDismiss = () => {
151
142
  color: #353535;
152
143
  margin: 12px 0;
153
144
  border: 0;
145
+ border-radius: 8px;
154
146
  }
155
147
  .nut-checkbox {
156
148
  line-height: 40px;
@@ -1,16 +1,19 @@
1
1
  import RechargeView from './RechargeView.vue'
2
2
  import AmountPicker from './AmountPicker.vue'
3
3
  import UserAgreement from './UserAgreement.vue'
4
+ import RechargeResult from './RechargeResult.vue'
4
5
 
5
6
  const components = {
6
7
  AmountPicker,
7
8
  RechargeView,
8
- UserAgreement
9
+ UserAgreement,
10
+ RechargeResult
9
11
  }
10
12
 
11
13
  export {
12
14
  AmountPicker,
13
15
  RechargeView,
14
16
  UserAgreement,
17
+ RechargeResult,
15
18
  components
16
19
  }