@uxda/appkit 4.2.69 → 4.2.72

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.
Files changed (10) hide show
  1. package/dist/appkit.css +63 -41
  2. package/dist/index.js +192 -157
  3. package/package.json +1 -1
  4. package/src/balance/components/BalanceCard.vue +7 -12
  5. package/src/balance/components/PromoterCard.vue +123 -55
  6. package/src/balance/types.ts +1 -0
  7. package/src/payment/components/RechargeView.vue +1 -1
  8. package/src/payment/components/TradeView.vue +1 -1
  9. package/src/payment/services/request-payment.ts +0 -1
  10. package/src/user/components/UserEntry.vue +10 -4
package/dist/appkit.css CHANGED
@@ -451,15 +451,15 @@ page {
451
451
  --text-color-dark-mode: #eee;
452
452
  }
453
453
  .account-card .card {
454
- background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
454
+ background: linear-gradient(90deg, #EEF1FA 0%, #E4E6F3 100%);
455
455
  border-radius: 10px;
456
- padding: 14px 20px;
456
+ padding: 14px 10px 20px;
457
457
  margin: 0;
458
458
  }
459
459
  .account-card .card .card-row {
460
460
  display: flex;
461
461
  justify-content: space-between;
462
- align-items: center;
462
+ align-items: start;
463
463
  }
464
464
  .account-card .card .card-row .card-row-left {
465
465
  display: flex;
@@ -522,21 +522,16 @@ page {
522
522
  .account-card .card .card-row-right .account-info-entry {
523
523
  display: flex;
524
524
  align-items: center;
525
- padding: 0 10px;
526
- height: 28px;
527
- line-height: 28px;
528
- border-radius: 14px;
529
- background: rgba(255, 255, 255, 0.8);
530
525
  }
531
526
  .account-card .card .card-row-right .account-info-entry .account-info-name {
532
527
  color: #353535;
533
528
  font-size: 13px;
534
529
  font-weight: 500;
535
- margin-right: 8px;
530
+ margin-right: 5px;
536
531
  }
537
532
  .account-card .card .card-row-right .account-info-entry .account-info-icon {
538
- width: 15px;
539
- height: 15px;
533
+ width: 10px;
534
+ height: 10px;
540
535
  }
541
536
  .account-card .card .card-row-right .account-info-entry .account-info-icon .icon {
542
537
  display: block;
@@ -1266,33 +1261,51 @@ page {
1266
1261
  margin: 0 auto;
1267
1262
  border-radius: 15px;
1268
1263
  }
1264
+ .promoter-card.inAccount {
1265
+ background: linear-gradient(90deg, #DAEFFF 0%, #DEE7FF 52.22%, #C8CAFF 108.62%);
1266
+ }
1267
+ .promoter-card.inAccount::after, .promoter-card.inAccount::before {
1268
+ content: "";
1269
+ position: absolute;
1270
+ width: 15px;
1271
+ height: 15px;
1272
+ border-radius: 50%;
1273
+ background: #F4F6FA;
1274
+ top: 50%;
1275
+ transform: translateY(-50%);
1276
+ }
1277
+ .promoter-card.inAccount::before {
1278
+ left: -7.5px;
1279
+ }
1280
+ .promoter-card.inAccount::after {
1281
+ right: -7.5px;
1282
+ }
1283
+ .promoter-card.inAccount .ns-button-group .ns-button {
1284
+ background: rgba(1, 127, 255, 0.1);
1285
+ font-weight: normal;
1286
+ color: #353535;
1287
+ }
1288
+ .promoter-card.inAccount .ns-button-group .ns-button.active {
1289
+ background: #017FFF;
1290
+ color: #fff;
1291
+ }
1269
1292
  .promoter-card .icon {
1270
1293
  font-size: 10px;
1271
1294
  color: rgba(53, 53, 53, 0.3);
1272
1295
  }
1273
- .promoter-card .arrow {
1274
- position: absolute;
1275
- left: 0;
1276
- top: 22px;
1277
- width: 9px;
1278
- height: 16px;
1279
- }
1280
1296
  .promoter-card-hd {
1281
1297
  display: flex;
1282
- flex-direction: column;
1283
- align-items: flex-start;
1298
+ align-items: center;
1284
1299
  color: #353535;
1285
- margin-bottom: 12px;
1300
+ margin-bottom: 15px;
1286
1301
  }
1287
1302
  .promoter-card-hd-num {
1288
- font-size: 26px;
1303
+ font-size: 22px;
1289
1304
  font-weight: bold;
1290
- margin-top: 8px;
1291
- display: flex;
1292
- align-items: center;
1293
1305
  }
1294
1306
  .promoter-card-hd-info {
1295
- font-size: 14px;
1307
+ font-size: 13px;
1308
+ margin-left: 8px;
1296
1309
  }
1297
1310
  .promoter-card-ft {
1298
1311
  display: flex;
@@ -1320,29 +1333,34 @@ page {
1320
1333
  background: rgba(53, 53, 53, 0.2);
1321
1334
  margin-right: 30px;
1322
1335
  }
1336
+ .promoter-card .ns-button-group .ns-button {
1337
+ background: #F8F8F8;
1338
+ font-weight: normal;
1339
+ }
1340
+ .promoter-card .ns-button-group .ns-button.active {
1341
+ color: #017FFF;
1342
+ background: #EEF5FF;
1343
+ }
1323
1344
  .promoter-card-tab {
1324
- position: absolute;
1325
- top: 10px;
1326
- right: 13px;
1327
- border-radius: 4px;
1328
- overflow: hidden;
1329
- background: rgba(204, 204, 204, 0.2);
1345
+ display: flex;
1346
+ justify-content: space-between;
1347
+ margin-bottom: 12px;
1330
1348
  }
1331
1349
  .promoter-card-tab-item {
1332
1350
  display: inline-flex;
1333
1351
  align-items: center;
1334
1352
  justify-content: center;
1335
1353
  height: 29px;
1336
- width: 90px;
1337
- box-sizing: border-box;
1338
- padding: 0 10px;
1354
+ width: 46px;
1339
1355
  font-size: 13px;
1340
- color: #353535;
1356
+ color: #808080;
1357
+ border-radius: 23px;
1358
+ background: #F8F8F8;
1359
+ margin-right: 12px;
1341
1360
  }
1342
1361
  .promoter-card-tab-item.focus {
1343
- background: linear-gradient(90deg, #FFEBC1 0%, #FFF9ED 100%);
1344
- font-weight: bold;
1345
- border-radius: 4px;
1362
+ background: #EEF5FF;
1363
+ color: #017FFF;
1346
1364
  }
1347
1365
  .promoter-card .arrow-img {
1348
1366
  width: 16px;
@@ -1846,8 +1864,12 @@ page {
1846
1864
  line-height: 21px;
1847
1865
  }
1848
1866
  .user-entry-bd-arrow {
1849
- font-size: 12px;
1850
- margin-left: 8px;
1867
+ width: 10px;
1868
+ height: 10px;
1869
+ margin-left: 5px;
1870
+ display: flex;
1871
+ justify-content: center;
1872
+ align-items: center;
1851
1873
  }
1852
1874
  .dd-skeleton__item {
1853
1875
  margin-top: 10px;
package/dist/index.js CHANGED
@@ -8,7 +8,7 @@ import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, up
8
8
  import '@nutui/nutui-taro/dist/packages/popup/style/css';
9
9
  import isMobilePhone from 'validator/es/lib/isMobilePhone';
10
10
  import isIdentityCard from 'validator/es/lib/isIdentityCard';
11
- import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsPage, NsPageContent, NsCard, NsCheckbox } from '@uxda/nutshell/taro';
11
+ import { NsForm, NsInput, NsButton, NsIcon, usePopup, useNutshell, NsButtonGroup, NsPage, NsPageContent, NsCard, NsCheckbox } from '@uxda/nutshell/taro';
12
12
  import '@nutui/nutui-taro/dist/packages/actionsheet/style/css';
13
13
  import debounce from 'lodash-es/debounce';
14
14
  import '@nutui/nutui-taro/dist/packages/dialog/style/css';
@@ -1679,7 +1679,6 @@ const requestBrandWCPay = (params, Appcode = "") => {
1679
1679
  $http.post(endpoints.\u83B7\u53D6\u5FAE\u4FE1\u652F\u4ED8\u53C2\u6570\u5305, {
1680
1680
  ...params
1681
1681
  }).then((response) => {
1682
- console.log(response, "-----response");
1683
1682
  if (!response.json) {
1684
1683
  showToast({
1685
1684
  title: response.message,
@@ -1814,7 +1813,7 @@ var script$B = /* @__PURE__ */ defineComponent({
1814
1813
  }).then((result) => {
1815
1814
  console.log(result, "------requestBrandWCPay");
1816
1815
  state.buttonLoading = false;
1817
- if (typeof result === "boolean") {
1816
+ if (typeof result === "boolean" && result) {
1818
1817
  window.location.href = props.payFinishJumpUrl;
1819
1818
  } else {
1820
1819
  emit("complete", result);
@@ -2094,12 +2093,12 @@ const _hoisted_6$5 = {
2094
2093
  const _hoisted_7$5 = { class: "amount" };
2095
2094
  const _hoisted_8$5 = ["src"];
2096
2095
  const _hoisted_9$4 = { class: "amount-footer" };
2097
- const _hoisted_10$2 = {
2096
+ const _hoisted_10$3 = {
2098
2097
  key: 0,
2099
2098
  class: "agreement"
2100
2099
  };
2101
- const _hoisted_11$2 = { class: "buy-amount" };
2102
- const _hoisted_12$2 = { class: "left" };
2100
+ const _hoisted_11$3 = { class: "buy-amount" };
2101
+ const _hoisted_12$3 = { class: "left" };
2103
2102
  const _hoisted_13$2 = { class: "amount" };
2104
2103
  const _hoisted_14$2 = { class: "item" };
2105
2104
  const _hoisted_15$2 = { class: "item" };
@@ -2197,7 +2196,7 @@ var script$x = /* @__PURE__ */ defineComponent({
2197
2196
  }).then((result) => {
2198
2197
  console.log(result, "------requestBrandWCPay");
2199
2198
  state.buttonLoading = false;
2200
- if (typeof result === "boolean") {
2199
+ if (typeof result === "boolean" && result) {
2201
2200
  window.location.href = props.payFinishJumpUrl;
2202
2201
  } else {
2203
2202
  emit("complete", { result, type: "wePay" });
@@ -2277,7 +2276,7 @@ var script$x = /* @__PURE__ */ defineComponent({
2277
2276
  renderSlot(_ctx.$slots, "banner")
2278
2277
  ]),
2279
2278
  createElementVNode("view", _hoisted_9$4, [
2280
- !selectBean.value ? (openBlock(), createElementBlock("view", _hoisted_10$2, [
2279
+ !selectBean.value ? (openBlock(), createElementBlock("view", _hoisted_10$3, [
2281
2280
  createVNode(_component_nut_checkbox, {
2282
2281
  modelValue: state.agreed,
2283
2282
  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => state.agreed = $event)
@@ -2293,8 +2292,8 @@ var script$x = /* @__PURE__ */ defineComponent({
2293
2292
  /* STABLE */
2294
2293
  }, 8, ["modelValue"])
2295
2294
  ])) : createCommentVNode("v-if", true),
2296
- createElementVNode("div", _hoisted_11$2, [
2297
- createElementVNode("div", _hoisted_12$2, [
2295
+ createElementVNode("div", _hoisted_11$3, [
2296
+ createElementVNode("div", _hoisted_12$3, [
2298
2297
  _cache[7] || (_cache[7] = createTextVNode(" \u5F85\u652F\u4ED8\uFF1A ")),
2299
2298
  createElementVNode("span", _hoisted_13$2, [
2300
2299
  _cache[6] || (_cache[6] = createElementVNode(
@@ -2474,7 +2473,7 @@ var script$w = /* @__PURE__ */ defineComponent({
2474
2473
  [
2475
2474
  createElementVNode("img", {
2476
2475
  class: "icon",
2477
- src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHZpZXdCb3g9IjAgMCAzMCAzMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE1IDI3LjVDMjEuOTAzNiAyNy41IDI3LjUgMjEuOTAzNiAyNy41IDE1QzI3LjUgOC4wOTY0NCAyMS45MDM2IDIuNSAxNSAyLjVDOC4wOTY0NCAyLjUgMi41IDguMDk2NDQgMi41IDE1QzIuNSAyMS45MDM2IDguMDk2NDQgMjcuNSAxNSAyNy41WiIgZmlsbD0iIzM1MzUzNSIgc3Ryb2tlPSIjMzUzNTM1IiBzdHJva2Utd2lkdGg9IjIuNSIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBkPSJNMTEgMTUuMTU2MkgxOS4zMTI1IiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjEuODQ3MjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBkPSJNMTUuMTU2NyAxMUwxOS4zMTMgMTUuMTU2MkwxNS4xNTY3IDE5LjMxMjUiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMS44NDcyMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo="
2476
+ src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K"
2478
2477
  })
2479
2478
  ],
2480
2479
  -1
@@ -2922,12 +2921,12 @@ const _hoisted_7$4 = {
2922
2921
  };
2923
2922
  const _hoisted_8$4 = { class: "list" };
2924
2923
  const _hoisted_9$3 = { class: "item-count" };
2925
- const _hoisted_10$1 = { class: "item-title" };
2926
- const _hoisted_11$1 = {
2924
+ const _hoisted_10$2 = { class: "item-title" };
2925
+ const _hoisted_11$2 = {
2927
2926
  key: 0,
2928
2927
  class: "item-title-button"
2929
2928
  };
2930
- const _hoisted_12$1 = ["onClick"];
2929
+ const _hoisted_12$2 = ["onClick"];
2931
2930
  const _hoisted_13$1 = {
2932
2931
  key: 1,
2933
2932
  class: "rights-card"
@@ -3238,7 +3237,7 @@ var script$q = /* @__PURE__ */ defineComponent({
3238
3237
  /* TEXT */
3239
3238
  )
3240
3239
  ]),
3241
- createElementVNode("div", _hoisted_10$1, [
3240
+ createElementVNode("div", _hoisted_10$2, [
3242
3241
  createElementVNode(
3243
3242
  "div",
3244
3243
  null,
@@ -3246,10 +3245,10 @@ var script$q = /* @__PURE__ */ defineComponent({
3246
3245
  1
3247
3246
  /* TEXT */
3248
3247
  ),
3249
- item.id ? (openBlock(), createElementBlock("div", _hoisted_11$1, [
3248
+ item.id ? (openBlock(), createElementBlock("div", _hoisted_11$2, [
3250
3249
  createElementVNode("div", {
3251
3250
  onClick: ($event) => gotoTrade(item)
3252
- }, "\u4F01\u660E\u661F\u4F18\u60E0\u5145\u503C", 8, _hoisted_12$1),
3251
+ }, "\u4F01\u660E\u661F\u4F18\u60E0\u5145\u503C", 8, _hoisted_12$2),
3253
3252
  _cache[9] || (_cache[9] = createElementVNode(
3254
3253
  "img",
3255
3254
  {
@@ -3953,35 +3952,36 @@ var script$m = /* @__PURE__ */ defineComponent({
3953
3952
  script$m.__file = "src/balance/components/ListFilter.vue";
3954
3953
 
3955
3954
  const _hoisted_1$j = {
3956
- key: 0,
3957
- class: "promoter-card"
3958
- };
3959
- const _hoisted_2$e = {
3960
3955
  key: 0,
3961
3956
  class: "promoter-card-tab"
3962
3957
  };
3963
- const _hoisted_3$8 = { class: "promoter-card-hd-num number" };
3958
+ const _hoisted_2$e = { class: "promoter-card-hd-num number" };
3959
+ const _hoisted_3$8 = ["src"];
3964
3960
  const _hoisted_4$6 = { class: "promoter-card-ft" };
3965
3961
  const _hoisted_5$5 = {
3966
3962
  key: 0,
3967
3963
  class: "promoter-card-ft-item"
3968
3964
  };
3969
- const _hoisted_6$3 = { class: "promoter-card-ft-info" };
3970
- const _hoisted_7$3 = {
3965
+ const _hoisted_6$3 = { class: "promoter-card-ft-num number" };
3966
+ const _hoisted_7$3 = { class: "promoter-card-ft-info" };
3967
+ const _hoisted_8$3 = ["src"];
3968
+ const _hoisted_9$2 = {
3971
3969
  key: 1,
3972
3970
  class: "promoter-card-ft-line"
3973
3971
  };
3974
- const _hoisted_8$3 = {
3972
+ const _hoisted_10$1 = {
3975
3973
  key: 2,
3976
3974
  class: "promoter-card-ft-item"
3977
3975
  };
3978
- const _hoisted_9$2 = { class: "promoter-card-ft-info" };
3976
+ const _hoisted_11$1 = { class: "promoter-card-ft-info" };
3977
+ const _hoisted_12$1 = ["src"];
3979
3978
  var script$l = /* @__PURE__ */ defineComponent({
3980
3979
  __name: "PromoterCard",
3981
3980
  props: {
3982
3981
  useCase: { type: String, required: true, default: "" },
3983
3982
  applyRecord: { type: null, required: true, default: {} },
3984
- isAdmin: { type: Boolean, required: false, default: false }
3983
+ isAdmin: { type: Boolean, required: false, default: false },
3984
+ \u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546: { type: Boolean, required: false, default: false }
3985
3985
  },
3986
3986
  emits: [
3987
3987
  /**
@@ -3995,20 +3995,32 @@ var script$l = /* @__PURE__ */ defineComponent({
3995
3995
  /**
3996
3996
  * 跳返佣统计页面
3997
3997
  */
3998
- "rebate"
3998
+ "rebate",
3999
+ /**
4000
+ * tab切换
4001
+ */
4002
+ "tab"
3999
4003
  ],
4000
4004
  setup(__props, { expose: __expose, emit: __emit }) {
4001
4005
  const props = __props;
4006
+ const inAccount = computed(() => {
4007
+ return !props.\u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546;
4008
+ });
4002
4009
  const { formatAmount } = useAmount();
4003
4010
  const tab = ref("person");
4004
4011
  const promoter = ref({
4005
4012
  balance: 0,
4006
4013
  totalIncome: 0,
4007
- totalRebateIncome: 0
4014
+ totalRebateIncome: 0,
4015
+ subDistributorNum: 0
4008
4016
  });
4017
+ const options = [
4018
+ { label: "\u4E2A\u4EBA", value: "person" },
4019
+ { label: "\u4F01\u4E1A", value: "company" }
4020
+ ];
4009
4021
  function onTabChange(type) {
4010
- tab.value = type;
4011
4022
  loadPromoter();
4023
+ emits("tab", tab.value);
4012
4024
  }
4013
4025
  async function loadPromoter() {
4014
4026
  const $http = useHttp$3();
@@ -4018,6 +4030,7 @@ var script$l = /* @__PURE__ */ defineComponent({
4018
4030
  promoter.value.balance = data?.balance || 0;
4019
4031
  promoter.value.totalIncome = data?.totalIncome || 0;
4020
4032
  promoter.value.totalRebateIncome = data?.totalRebateIncome || 0;
4033
+ promoter.value.subDistributorNum = data?.subDistributorNum || 0;
4021
4034
  });
4022
4035
  }
4023
4036
  const emits = __emit;
@@ -4026,7 +4039,7 @@ var script$l = /* @__PURE__ */ defineComponent({
4026
4039
  });
4027
4040
  watch(() => props.applyRecord, () => {
4028
4041
  Object.keys(props.applyRecord)?.length && loadPromoter();
4029
- });
4042
+ }, { immediate: true });
4030
4043
  __expose({
4031
4044
  reload: loadPromoter
4032
4045
  });
@@ -4041,139 +4054,151 @@ var script$l = /* @__PURE__ */ defineComponent({
4041
4054
  confirmText: "\u77E5\u9053\u4E86"
4042
4055
  });
4043
4056
  }
4057
+ const arrowImg = computed(() => {
4058
+ if (props.\u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546) {
4059
+ return "https://cdn.ddjf.com/static/images/appkit/arrow.png";
4060
+ } else {
4061
+ return "https://cdn.ddjf.com/static/images/appkit/arrow-blue.png";
4062
+ }
4063
+ });
4044
4064
  return (_ctx, _cache) => {
4045
- return _ctx.applyRecord.distributorFlag === "Y" || _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_1$j, [
4046
- _cache[13] || (_cache[13] = createElementVNode(
4047
- "img",
4048
- {
4049
- class: "arrow",
4050
- src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTciIGhlaWdodD0iMjkiIHZpZXdCb3g9IjAgMCAxNyAyOSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE1LjM4MTQgMTIuMzIwN0MxNi43NjI4IDEzLjUxNyAxNi43NjI4IDE1LjY1OTkgMTUuMzgxNCAxNi44NTYyTDEuNjU0NjUgMjguNzQzOUMxLjAwNzAxIDI5LjMwNDggLTEuMzA0NTZlLTA2IDI4Ljg0NDggLTEuMjY3MTFlLTA2IDI3Ljk4OEwtOS41Njc5OGUtMDggMS4xODg5Qy01LjgyM2UtMDggMC4zMzIxNDYgMS4wMDcwMSAtMC4xMjc5MDUgMS42NTQ2NSAwLjQzMjk3MUwxNS4zODE0IDEyLjMyMDdaIiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfMTAyN185OTYpIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMTAyN185OTYiIHgxPSI0NiIgeTE9IjE1IiB4Mj0iLTUuNSIgeTI9IjE1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNFRjlENTciLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjRkZENDUwIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==",
4051
- alt: ""
4052
- },
4053
- null,
4054
- -1
4055
- /* HOISTED */
4056
- )),
4057
- _ctx.useCase === "company" && _ctx.isAdmin ? (openBlock(), createElementBlock("div", _hoisted_2$e, [
4058
- createElementVNode(
4059
- "div",
4060
- {
4061
- class: normalizeClass(["promoter-card-tab-item", { focus: tab.value === "person" }]),
4062
- onClick: _cache[0] || (_cache[0] = ($event) => onTabChange("person"))
4063
- },
4064
- "\u4E2A\u4EBA",
4065
- 2
4066
- /* CLASS */
4067
- ),
4068
- createElementVNode(
4069
- "div",
4070
- {
4071
- class: normalizeClass(["promoter-card-tab-item", { focus: tab.value === "company" }]),
4072
- onClick: _cache[1] || (_cache[1] = ($event) => onTabChange("company"))
4073
- },
4074
- "\u4F01\u4E1A",
4075
- 2
4076
- /* CLASS */
4077
- )
4078
- ])) : createCommentVNode("v-if", true),
4079
- _ctx.applyRecord.distributorFlag === "Y" || _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", {
4080
- key: 1,
4081
- class: "promoter-card-hd",
4082
- onClick: _cache[2] || (_cache[2] = ($event) => emits("blance", tab.value))
4083
- }, [
4084
- _cache[8] || (_cache[8] = createElementVNode(
4085
- "div",
4086
- { class: "promoter-card-hd-info" },
4087
- "\u53EF\u63D0\u73B0\u4F59\u989D(\u5143)",
4088
- -1
4089
- /* HOISTED */
4090
- )),
4091
- createElementVNode("div", _hoisted_3$8, [
4092
- createTextVNode(
4093
- toDisplayString(unref(formatAmount)(promoter.value.balance || 0)) + " ",
4065
+ return _ctx.applyRecord.distributorFlag === "Y" || _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock(
4066
+ "div",
4067
+ {
4068
+ key: 0,
4069
+ class: normalizeClass(["promoter-card", { inAccount: inAccount.value }])
4070
+ },
4071
+ [
4072
+ _ctx.useCase === "company" && _ctx.isAdmin ? (openBlock(), createElementBlock("div", _hoisted_1$j, [
4073
+ createElementVNode("div", null, [
4074
+ createVNode(unref(NsButtonGroup), {
4075
+ size: "sm",
4076
+ items: options,
4077
+ modelValue: tab.value,
4078
+ "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => tab.value = $event),
4079
+ round: "",
4080
+ fill: "transparent",
4081
+ foreground: "#808080",
4082
+ onChange: onTabChange
4083
+ }, null, 8, ["modelValue"]),
4084
+ createCommentVNode(` <div class="promoter-card-tab-item" @click="onTabChange('person')" :class="{ focus: tab === 'person' }">\u4E2A\u4EBA</div>\r
4085
+ <div class="promoter-card-tab-item" @click="onTabChange('company')" :class="{ focus: tab === 'company' }">\u4F01\u4E1A\r
4086
+ </div> `)
4087
+ ]),
4088
+ renderSlot(_ctx.$slots, "tab-btn")
4089
+ ])) : createCommentVNode("v-if", true),
4090
+ _ctx.applyRecord.distributorFlag === "Y" || _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", {
4091
+ key: 1,
4092
+ class: "promoter-card-hd",
4093
+ onClick: _cache[1] || (_cache[1] = ($event) => emits("blance", tab.value))
4094
+ }, [
4095
+ createElementVNode(
4096
+ "div",
4097
+ _hoisted_2$e,
4098
+ toDisplayString(unref(formatAmount)(promoter.value.balance || 0)),
4094
4099
  1
4095
4100
  /* TEXT */
4096
4101
  ),
4097
- _cache[7] || (_cache[7] = createElementVNode(
4098
- "img",
4099
- {
4100
- class: "arrow-img",
4101
- style: { "margin-left": "12px" },
4102
- src: "https://cdn.ddjf.com/static/images/appkit/arrow.png",
4103
- alt: ""
4104
- },
4105
- null,
4102
+ _cache[6] || (_cache[6] = createElementVNode(
4103
+ "div",
4104
+ { class: "promoter-card-hd-info" },
4105
+ "\u53EF\u63D0\u73B0\u4F59\u989D(\u5143)",
4106
4106
  -1
4107
4107
  /* HOISTED */
4108
- ))
4109
- ])
4110
- ])) : createCommentVNode("v-if", true),
4111
- createElementVNode("div", _hoisted_4$6, [
4112
- _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$5, [
4113
- createElementVNode("div", _hoisted_6$3, [
4114
- _cache[9] || (_cache[9] = createTextVNode("\u9500\u552E\u7D2F\u8BA1\u6536\u76CA(\u5143) ")),
4115
- createVNode(unref(IconFont), {
4116
- class: "icon",
4117
- name: "ask",
4118
- onClick: _cache[3] || (_cache[3] = ($event) => onHelpClick("profits"))
4119
- })
4120
- ]),
4121
- createElementVNode("div", {
4122
- class: "promoter-card-ft-num number",
4123
- onClick: _cache[4] || (_cache[4] = ($event) => emits("profits", tab.value))
4124
- }, [
4125
- createTextVNode(
4126
- toDisplayString(unref(formatAmount)(promoter.value.totalIncome || 0)) + " ",
4127
- 1
4128
- /* TEXT */
4129
- ),
4130
- _cache[10] || (_cache[10] = createElementVNode(
4131
- "img",
4132
- {
4133
- class: "arrow-img",
4134
- src: "https://cdn.ddjf.com/static/images/appkit/arrow.png",
4135
- alt: ""
4136
- },
4137
- null,
4138
- -1
4139
- /* HOISTED */
4140
- ))
4141
- ])
4108
+ )),
4109
+ createElementVNode("img", {
4110
+ class: "arrow-img",
4111
+ style: { "margin-left": "8px" },
4112
+ src: arrowImg.value,
4113
+ alt: ""
4114
+ }, null, 8, _hoisted_3$8)
4142
4115
  ])) : createCommentVNode("v-if", true),
4143
- _ctx.applyRecord.accessCheckStatus === "Y" && _ctx.applyRecord.distributorFlag === "Y" ? (openBlock(), createElementBlock("div", _hoisted_7$3)) : createCommentVNode("v-if", true),
4144
- _ctx.applyRecord.distributorFlag === "Y" ? (openBlock(), createElementBlock("div", _hoisted_8$3, [
4145
- createElementVNode("div", _hoisted_9$2, [
4146
- _cache[11] || (_cache[11] = createTextVNode("\u8FD4\u4F63\u7D2F\u8BA1\u6536\u76CA(\u5143) ")),
4147
- createVNode(unref(IconFont), {
4148
- class: "icon",
4149
- name: "ask",
4150
- onClick: _cache[5] || (_cache[5] = ($event) => onHelpClick("rebate"))
4151
- })
4152
- ]),
4153
- createElementVNode("div", {
4154
- class: "promoter-card-ft-num number",
4155
- onClick: _cache[6] || (_cache[6] = ($event) => emits("rebate", tab.value))
4156
- }, [
4157
- createTextVNode(
4158
- toDisplayString(unref(formatAmount)(promoter.value.totalRebateIncome || 0)) + " ",
4159
- 1
4160
- /* TEXT */
4161
- ),
4162
- _cache[12] || (_cache[12] = createElementVNode(
4163
- "img",
4164
- {
4116
+ createElementVNode("div", _hoisted_4$6, [
4117
+ _ctx.applyRecord.accessCheckStatus === "Y" ? (openBlock(), createElementBlock("div", _hoisted_5$5, [
4118
+ _ctx.\u663E\u793A\u4E0B\u7EA7\u5206\u9500\u5546 ? (openBlock(), createElementBlock(
4119
+ Fragment,
4120
+ { key: 0 },
4121
+ [
4122
+ _cache[7] || (_cache[7] = createElementVNode(
4123
+ "div",
4124
+ { class: "promoter-card-ft-info" },
4125
+ "\u4E0B\u7EA7\u5206\u9500\u5546\u6570\u91CF",
4126
+ -1
4127
+ /* HOISTED */
4128
+ )),
4129
+ createElementVNode(
4130
+ "div",
4131
+ _hoisted_6$3,
4132
+ toDisplayString(unref(formatAmount)(promoter.value.subDistributorNum || 0)),
4133
+ 1
4134
+ /* TEXT */
4135
+ )
4136
+ ],
4137
+ 64
4138
+ /* STABLE_FRAGMENT */
4139
+ )) : (openBlock(), createElementBlock(
4140
+ Fragment,
4141
+ { key: 1 },
4142
+ [
4143
+ createElementVNode("div", _hoisted_7$3, [
4144
+ _cache[8] || (_cache[8] = createTextVNode("\u4EA7\u54C1\u9500\u552E\u6536\u76CA(\u5143) ")),
4145
+ createVNode(unref(IconFont), {
4146
+ class: "icon",
4147
+ name: "ask",
4148
+ onClick: _cache[2] || (_cache[2] = ($event) => onHelpClick("profits"))
4149
+ })
4150
+ ]),
4151
+ createElementVNode("div", {
4152
+ class: "promoter-card-ft-num number",
4153
+ onClick: _cache[3] || (_cache[3] = ($event) => emits("profits", tab.value))
4154
+ }, [
4155
+ createTextVNode(
4156
+ toDisplayString(unref(formatAmount)(promoter.value.totalIncome || 0)) + " ",
4157
+ 1
4158
+ /* TEXT */
4159
+ ),
4160
+ createElementVNode("img", {
4161
+ class: "arrow-img",
4162
+ src: arrowImg.value,
4163
+ alt: ""
4164
+ }, null, 8, _hoisted_8$3)
4165
+ ])
4166
+ ],
4167
+ 64
4168
+ /* STABLE_FRAGMENT */
4169
+ ))
4170
+ ])) : createCommentVNode("v-if", true),
4171
+ _ctx.applyRecord.accessCheckStatus === "Y" && _ctx.applyRecord.distributorFlag === "Y" ? (openBlock(), createElementBlock("div", _hoisted_9$2)) : createCommentVNode("v-if", true),
4172
+ _ctx.applyRecord.distributorFlag === "Y" ? (openBlock(), createElementBlock("div", _hoisted_10$1, [
4173
+ createElementVNode("div", _hoisted_11$1, [
4174
+ _cache[9] || (_cache[9] = createTextVNode("\u5206\u9500\u8FD4\u4F63\u6536\u76CA(\u5143) ")),
4175
+ createVNode(unref(IconFont), {
4176
+ class: "icon",
4177
+ name: "ask",
4178
+ onClick: _cache[4] || (_cache[4] = ($event) => onHelpClick("rebate"))
4179
+ })
4180
+ ]),
4181
+ createElementVNode("div", {
4182
+ class: "promoter-card-ft-num number",
4183
+ onClick: _cache[5] || (_cache[5] = ($event) => emits("rebate", tab.value))
4184
+ }, [
4185
+ createTextVNode(
4186
+ toDisplayString(unref(formatAmount)(promoter.value.totalRebateIncome || 0)) + " ",
4187
+ 1
4188
+ /* TEXT */
4189
+ ),
4190
+ createElementVNode("img", {
4165
4191
  class: "arrow-img",
4166
- src: "https://cdn.ddjf.com/static/images/appkit/arrow.png",
4192
+ src: arrowImg.value,
4167
4193
  alt: ""
4168
- },
4169
- null,
4170
- -1
4171
- /* HOISTED */
4172
- ))
4173
- ])
4174
- ])) : createCommentVNode("v-if", true)
4175
- ])
4176
- ])) : createCommentVNode("v-if", true);
4194
+ }, null, 8, _hoisted_12$1)
4195
+ ])
4196
+ ])) : createCommentVNode("v-if", true)
4197
+ ])
4198
+ ],
4199
+ 2
4200
+ /* CLASS */
4201
+ )) : createCommentVNode("v-if", true);
4177
4202
  };
4178
4203
  }
4179
4204
  });
@@ -5761,7 +5786,12 @@ var script$b = /* @__PURE__ */ defineComponent({
5761
5786
  createElementVNode(
5762
5787
  "span",
5763
5788
  { class: "user-entry-bd-arrow" },
5764
- ">",
5789
+ [
5790
+ createElementVNode("img", {
5791
+ style: { "width": "100%", "height": "100%" },
5792
+ src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K"
5793
+ })
5794
+ ],
5765
5795
  -1
5766
5796
  /* HOISTED */
5767
5797
  )
@@ -5781,7 +5811,12 @@ var script$b = /* @__PURE__ */ defineComponent({
5781
5811
  _cache[1] || (_cache[1] = createElementVNode(
5782
5812
  "span",
5783
5813
  { class: "user-entry-bd-arrow" },
5784
- ">",
5814
+ [
5815
+ createElementVNode("img", {
5816
+ style: { "width": "100%", "height": "100%" },
5817
+ src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K"
5818
+ })
5819
+ ],
5785
5820
  -1
5786
5821
  /* HOISTED */
5787
5822
  ))
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@uxda/appkit",
3
- "version": "4.2.69",
3
+ "version": "4.2.72",
4
4
  "description": "小程序应用开发包",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.ts",
package/src/balance/components/BalanceCard.vue CHANGED
@@ -16,7 +16,7 @@
16
16
  <div class="account-info-name">账户明细</div>
17
17
  <div class="account-info-icon">
18
18
  <img class="icon"
19
- src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHZpZXdCb3g9IjAgMCAzMCAzMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE1IDI3LjVDMjEuOTAzNiAyNy41IDI3LjUgMjEuOTAzNiAyNy41IDE1QzI3LjUgOC4wOTY0NCAyMS45MDM2IDIuNSAxNSAyLjVDOC4wOTY0NCAyLjUgMi41IDguMDk2NDQgMi41IDE1QzIuNSAyMS45MDM2IDguMDk2NDQgMjcuNSAxNSAyNy41WiIgZmlsbD0iIzM1MzUzNSIgc3Ryb2tlPSIjMzUzNTM1IiBzdHJva2Utd2lkdGg9IjIuNSIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBkPSJNMTEgMTUuMTU2MkgxOS4zMTI1IiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjEuODQ3MjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8cGF0aCBkPSJNMTUuMTU2NyAxMUwxOS4zMTMgMTUuMTU2MkwxNS4xNTY3IDE5LjMxMjUiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMS44NDcyMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+Cjwvc3ZnPgo=" />
19
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K" />
20
20
  </div>
21
21
  </div>
22
22
  </div>
@@ -101,15 +101,15 @@ defineExpose({
101
101
  <style lang="scss">
102
102
  .account-card {
103
103
  .card {
104
- background: linear-gradient(90deg, #FFEBC1 0%, #FFB875 100%);
104
+ background: linear-gradient(90deg, #EEF1FA 0%, #E4E6F3 100%);
105
105
  border-radius: 10px;
106
- padding: 14px 20px;
106
+ padding: 14px 10px 20px;
107
107
  margin: 0;
108
108
 
109
109
  .card-row {
110
110
  display: flex;
111
111
  justify-content: space-between;
112
- align-items: center;
112
+ align-items: start;
113
113
 
114
114
  .card-row-left {
115
115
  display: flex;
@@ -184,22 +184,17 @@ defineExpose({
184
184
  .account-info-entry {
185
185
  display: flex;
186
186
  align-items: center;
187
- padding: 0 10px;
188
- height: 28px;
189
- line-height: 28px;
190
- border-radius: 14px;
191
- background: rgba(255, 255, 255, 0.8);
192
187
 
193
188
  .account-info-name {
194
189
  color: #353535;
195
190
  font-size: 13px;
196
191
  font-weight: 500;
197
- margin-right: 8px;
192
+ margin-right: 5px;
198
193
  }
199
194
 
200
195
  .account-info-icon {
201
- width: 15px;
202
- height: 15px;
196
+ width: 10px;
197
+ height: 10px;
203
198
 
204
199
  .icon {
205
200
  display: block;
package/src/balance/components/PromoterCard.vue CHANGED
@@ -1,40 +1,50 @@
1
1
  <template>
2
- <div class="promoter-card" v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
3
- <img class="arrow"
4
- src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTciIGhlaWdodD0iMjkiIHZpZXdCb3g9IjAgMCAxNyAyOSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTE1LjM4MTQgMTIuMzIwN0MxNi43NjI4IDEzLjUxNyAxNi43NjI4IDE1LjY1OTkgMTUuMzgxNCAxNi44NTYyTDEuNjU0NjUgMjguNzQzOUMxLjAwNzAxIDI5LjMwNDggLTEuMzA0NTZlLTA2IDI4Ljg0NDggLTEuMjY3MTFlLTA2IDI3Ljk4OEwtOS41Njc5OGUtMDggMS4xODg5Qy01LjgyM2UtMDggMC4zMzIxNDYgMS4wMDcwMSAtMC4xMjc5MDUgMS42NTQ2NSAwLjQzMjk3MUwxNS4zODE0IDEyLjMyMDdaIiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfMTAyN185OTYpIi8+CjxkZWZzPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMTAyN185OTYiIHgxPSI0NiIgeTE9IjE1IiB4Mj0iLTUuNSIgeTI9IjE1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNFRjlENTciLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjRkZENDUwIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg=="
5
- alt="">
2
+ <div class="promoter-card" :class="{ inAccount }"
3
+ v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
6
4
  <div class="promoter-card-tab" v-if="useCase === 'company' && isAdmin">
7
- <div class="promoter-card-tab-item" @click="onTabChange('person')" :class="{ focus: tab === 'person' }">个人</div>
8
- <div class="promoter-card-tab-item" @click="onTabChange('company')" :class="{ focus: tab === 'company' }">企业</div>
5
+ <div>
6
+ <ns-button-group size="sm" :items="options" v-model="tab" round fill="transparent" foreground="#808080"
7
+ @change="onTabChange" />
8
+ <!-- <div class="promoter-card-tab-item" @click="onTabChange('person')" :class="{ focus: tab === 'person' }">个人</div>
9
+ <div class="promoter-card-tab-item" @click="onTabChange('company')" :class="{ focus: tab === 'company' }">企业
10
+ </div> -->
11
+ </div>
12
+ <slot name="tab-btn"></slot>
9
13
  </div>
10
14
  <div class="promoter-card-hd" @click="emits('blance', tab)"
11
15
  v-if="applyRecord.distributorFlag === 'Y' || applyRecord.accessCheckStatus === 'Y'">
16
+ <div class="promoter-card-hd-num number">{{ formatAmount(promoter.balance || 0) }}</div>
12
17
  <div class="promoter-card-hd-info">可提现余额(元)</div>
13
- <div class="promoter-card-hd-num number">{{ formatAmount(promoter.balance || 0) }}
14
- <img class="arrow-img" style="margin-left: 12px;" src="https://cdn.ddjf.com/static/images/appkit/arrow.png"
15
- alt="">
16
- </div>
18
+ <img class="arrow-img" style="margin-left: 8px;" :src="arrowImg" alt="">
17
19
  </div>
18
20
  <div class="promoter-card-ft">
19
21
  <div class="promoter-card-ft-item" v-if="applyRecord.accessCheckStatus === 'Y'">
20
- <div class="promoter-card-ft-info">销售累计收益(元)
21
- <IconFont class="icon" name="ask" @click="onHelpClick('profits')" />
22
- </div>
23
- <div class="promoter-card-ft-num number" @click="emits('profits', tab)">
24
- {{ formatAmount(promoter.totalIncome || 0) }}
25
- <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
26
- </div>
22
+ <template v-if="显示下级分销商">
23
+ <div class="promoter-card-ft-info">下级分销商数量</div>
24
+ <div class="promoter-card-ft-num number">
25
+ {{ formatAmount(promoter.subDistributorNum || 0) }}
26
+ </div>
27
+ </template>
28
+ <template v-else>
29
+ <div class="promoter-card-ft-info">产品销售收益(元)
30
+ <IconFont class="icon" name="ask" @click="onHelpClick('profits')" />
31
+ </div>
32
+ <div class="promoter-card-ft-num number" @click="emits('profits', tab)">
33
+ {{ formatAmount(promoter.totalIncome || 0) }}
34
+ <img class="arrow-img" :src="arrowImg" alt="">
35
+ </div>
36
+ </template>
27
37
  </div>
28
38
  <div class="promoter-card-ft-line"
29
39
  v-if="applyRecord.accessCheckStatus === 'Y' && applyRecord.distributorFlag === 'Y'">
30
40
  </div>
31
41
  <div class="promoter-card-ft-item" v-if="applyRecord.distributorFlag === 'Y'">
32
- <div class="promoter-card-ft-info">返佣累计收益(元)
42
+ <div class="promoter-card-ft-info">分销返佣收益(元)
33
43
  <IconFont class="icon" name="ask" @click="onHelpClick('rebate')" />
34
44
  </div>
35
45
  <div class="promoter-card-ft-num number" @click="emits('rebate', tab)">
36
46
  {{ formatAmount(promoter.totalRebateIncome || 0) }}
37
- <img class="arrow-img" src="https://cdn.ddjf.com/static/images/appkit/arrow.png" alt="">
47
+ <img class="arrow-img" :src="arrowImg" alt="">
38
48
  </div>
39
49
  </div>
40
50
  </div>
@@ -42,22 +52,29 @@
42
52
  </template>
43
53
 
44
54
  <script setup lang="ts">
45
- import { ref, watch } from 'vue'
55
+ import { computed, ref, watch } from 'vue'
46
56
  import { endpoints, useHttp } from '../api'
47
57
  import { Promoter } from '../types'
48
- import Taro, { useDidShow, showModal } from '@tarojs/taro'
58
+ import { useDidShow, showModal } from '@tarojs/taro'
49
59
  import { useAmount } from '../../shared/composables/useAmount'
50
60
  import { IconFont } from '@nutui/icons-vue-taro'
61
+ import { NsButtonGroup } from "@uxda/nutshell/taro";
51
62
 
52
63
  type PromoterCardProps = {
53
64
  useCase: string
54
65
  applyRecord: any
55
66
  isAdmin?: boolean
67
+ 显示下级分销商?: boolean
56
68
  }
57
69
  const props = withDefaults(defineProps<PromoterCardProps>(), {
58
70
  useCase: '',
59
71
  applyRecord: {},
60
- isAdmin: false
72
+ isAdmin: false,
73
+ 显示下级分销商: false
74
+ })
75
+
76
+ const inAccount = computed(() => {
77
+ return !props.显示下级分销商
61
78
  })
62
79
 
63
80
  const { formatAmount } = useAmount()
@@ -67,11 +84,20 @@ const promoter = ref<Promoter>({
67
84
  balance: 0,
68
85
  totalIncome: 0,
69
86
  totalRebateIncome: 0,
87
+ subDistributorNum: 0,
70
88
  })
71
89
 
90
+ const options = [
91
+ { label: '个人', value: 'person' },
92
+ { label: '企业', value: 'company' },
93
+ ]
94
+
95
+
72
96
  function onTabChange(type: string) {
73
- tab.value = type
97
+ // tab.value = type
74
98
  loadPromoter()
99
+
100
+ emits('tab', tab.value)
75
101
  }
76
102
 
77
103
  async function loadPromoter() {
@@ -84,6 +110,7 @@ async function loadPromoter() {
84
110
  promoter.value.balance = data?.balance || 0
85
111
  promoter.value.totalIncome = data?.totalIncome || 0
86
112
  promoter.value.totalRebateIncome = data?.totalRebateIncome || 0
113
+ promoter.value.subDistributorNum = data?.subDistributorNum || 0
87
114
  })
88
115
  }
89
116
 
@@ -100,6 +127,10 @@ const emits = defineEmits([
100
127
  * 跳返佣统计页面
101
128
  */
102
129
  'rebate',
130
+ /**
131
+ * tab切换
132
+ */
133
+ 'tab',
103
134
  ])
104
135
 
105
136
  useDidShow(() => {
@@ -107,7 +138,7 @@ useDidShow(() => {
107
138
  })
108
139
  watch(() => props.applyRecord, () => {
109
140
  Object.keys(props.applyRecord)?.length && loadPromoter()
110
- })
141
+ }, { immediate: true })
111
142
 
112
143
  defineExpose({
113
144
  reload: loadPromoter,
@@ -124,6 +155,14 @@ function onHelpClick(type: string) {
124
155
  confirmText: '知道了',
125
156
  })
126
157
  }
158
+
159
+ const arrowImg = computed(() => {
160
+ if (props.显示下级分销商) {
161
+ return 'https://cdn.ddjf.com/static/images/appkit/arrow.png'
162
+ } else {
163
+ return 'https://cdn.ddjf.com/static/images/appkit/arrow-blue.png'
164
+ }
165
+ })
127
166
  </script>
128
167
 
129
168
  <style lang="scss">
@@ -135,39 +174,61 @@ function onHelpClick(type: string) {
135
174
  margin: 0 auto;
136
175
  border-radius: 15px;
137
176
 
177
+ &.inAccount {
178
+ background: linear-gradient(90deg, #DAEFFF 0%, #DEE7FF 52.22%, #C8CAFF 108.62%);
179
+
180
+ &::after,
181
+ &::before {
182
+ content: '';
183
+ position: absolute;
184
+ width: 15px;
185
+ height: 15px;
186
+ border-radius: 50%;
187
+ background: #F4F6FA;
188
+ top: 50%;
189
+ transform: translateY(-50%);
190
+ }
191
+
192
+ &::before {
193
+ left: -7.5px;
194
+ }
195
+
196
+ &::after {
197
+ right: -7.5px;
198
+ }
199
+
200
+ .ns-button-group .ns-button {
201
+ background: rgba(1, 127, 255, 0.1);
202
+ font-weight: normal;
203
+ color: #353535;
204
+
205
+ &.active {
206
+ background: #017FFF;
207
+ color: #fff;
208
+ }
209
+ }
210
+ }
211
+
138
212
  .icon {
139
213
  font-size: 10px;
140
214
  color: rgba(53, 53, 53, 0.3);
141
215
  }
142
216
 
143
- .arrow {
144
- position: absolute;
145
- left: 0;
146
- top: 22px;
147
- width: 9px;
148
- height: 16px;
149
- }
150
-
151
217
  &-hd {
152
218
  display: flex;
153
- flex-direction: column;
154
- align-items: flex-start;
219
+ align-items: center;
155
220
  color: #353535;
156
- margin-bottom: 12px;
221
+ margin-bottom: 15px;
157
222
 
158
223
  &-num {
159
- font-size: 26px;
224
+ font-size: 22px;
160
225
  font-weight: bold;
161
- margin-top: 8px;
162
- display: flex;
163
- align-items: center;
164
226
  }
165
227
 
166
228
  &-info {
167
- font-size: 14px;
229
+ font-size: 13px;
230
+ margin-left: 8px;
168
231
  }
169
-
170
-
171
232
  }
172
233
 
173
234
  &-ft {
@@ -201,29 +262,36 @@ function onHelpClick(type: string) {
201
262
  }
202
263
  }
203
264
 
265
+ .ns-button-group .ns-button {
266
+ background: #F8F8F8;
267
+ font-weight: normal;
268
+
269
+ &.active {
270
+ color: #017FFF;
271
+ background: #EEF5FF;
272
+ }
273
+ }
274
+
204
275
  &-tab {
205
- position: absolute;
206
- top: 10px;
207
- right: 13px;
208
- border-radius: 4px;
209
- overflow: hidden;
210
- background: rgba(204, 204, 204, 0.2);
276
+ display: flex;
277
+ justify-content: space-between;
278
+ margin-bottom: 12px;
211
279
 
212
280
  &-item {
213
281
  display: inline-flex;
214
282
  align-items: center;
215
283
  justify-content: center;
216
284
  height: 29px;
217
- width: 90px;
218
- box-sizing: border-box;
219
- padding: 0 10px;
285
+ width: 46px;
220
286
  font-size: 13px;
221
- color: #353535;
287
+ color: #808080;
288
+ border-radius: 23px;
289
+ background: #F8F8F8;
290
+ margin-right: 12px;
222
291
 
223
292
  &.focus {
224
- background: linear-gradient(90deg, #FFEBC1 0%, #FFF9ED 100%);
225
- font-weight: bold;
226
- border-radius: 4px;
293
+ background: #EEF5FF;
294
+ color: #017FFF;
227
295
  }
228
296
  }
229
297
  }
package/src/balance/types.ts CHANGED
@@ -94,4 +94,5 @@ export type Promoter = {
94
94
  balance: number
95
95
  totalIncome: number
96
96
  totalRebateIncome: number
97
+ subDistributorNum: number
97
98
  }
package/src/payment/components/RechargeView.vue CHANGED
@@ -114,7 +114,7 @@ const onPayClick = () => {
114
114
  }).then(result => {
115
115
  console.log(result, '------requestBrandWCPay')
116
116
  state.buttonLoading = false
117
- if (typeof result === 'boolean') {
117
+ if (typeof result === 'boolean' && result) {
118
118
  window.location.href = props.payFinishJumpUrl as string
119
119
  } else {
120
120
  emit('complete', result)
package/src/payment/components/TradeView.vue CHANGED
@@ -185,7 +185,7 @@ const onPayClick = () => {
185
185
  }).then(result => {
186
186
  console.log(result, '------requestBrandWCPay')
187
187
  state.buttonLoading = false
188
- if (typeof result === 'boolean') {
188
+ if (typeof result === 'boolean' && result) {
189
189
  window.location.href = props.payFinishJumpUrl as string
190
190
  } else {
191
191
  emit('complete', { result, type: 'wePay' })
package/src/payment/services/request-payment.ts CHANGED
@@ -68,7 +68,6 @@ const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
68
68
  ...params,
69
69
  })
70
70
  .then((response: any) => {
71
- console.log(response, '-----response')
72
71
  if (!response.json) {
73
72
  showToast({
74
73
  title: response.message,
package/src/user/components/UserEntry.vue CHANGED
@@ -8,12 +8,14 @@
8
8
  <div class="user-entry-bd">
9
9
  <div v-if="!mobile" class="user-entry-bd-bigtxt" @click="toLogin">
10
10
  请登录
11
- <span class="user-entry-bd-arrow">></span>
11
+ <span class="user-entry-bd-arrow"><img style="width: 100%; height: 100%;"
12
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K" /></span>
12
13
  </div>
13
14
  <template v-else>
14
15
  <div @click="toUser" class="user-entry-bd-txt">
15
16
  {{ name }}
16
- <span class="user-entry-bd-arrow">></span>
17
+ <span class="user-entry-bd-arrow"><img style="width: 100%; height: 100%;"
18
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjgwODA2IDIuMDU4MDZDNi4wNTIxNCAxLjgxMzk4IDYuNDQ3ODYgMS44MTM5OCA2LjY5MTk0IDIuMDU4MDZMMTQuMTkxOSA5LjU1ODA2QzE0LjQzNiA5LjgwMjE0IDE0LjQzNiAxMC4xOTc5IDE0LjE5MTkgMTAuNDQxOUw2LjY5MTk0IDE3Ljk0MTlDNi40NDc4NiAxOC4xODYgNi4wNTIxNCAxOC4xODYgNS44MDgwNiAxNy45NDE5QzUuNTYzOTggMTcuNjk3OSA1LjU2Mzk4IDE3LjMwMjEgNS44MDgwNiAxNy4wNTgxTDEyLjg2NjEgMTBMNS44MDgwNiAyLjk0MTk0QzUuNTYzOTggMi42OTc4NiA1LjU2Mzk4IDIuMzAyMTQgNS44MDgwNiAyLjA1ODA2WiIgZmlsbD0iIzM1MzUzNSIvPgo8L3N2Zz4K" /></span>
17
19
  </div>
18
20
  <div @click="toUser" class="user-entry-bd-smalltxt">{{ encodePhone(mobile) }}</div>
19
21
  </template>
@@ -125,8 +127,12 @@ const emits = defineEmits(['jump', 'login'])
125
127
  }
126
128
 
127
129
  &-arrow {
128
- font-size: 12px;
129
- margin-left: 8px;
130
+ width: 10px;
131
+ height: 10px;
132
+ margin-left: 5px;
133
+ display: flex;
134
+ justify-content: center;
135
+ align-items: center;
130
136
  }
131
137
  }
132
138
  }