Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

# Conflicts: # manager/src/config/index.js # seller/src/config/index.js
2025-12-18 08:55:52 +08:00 · 2021-06-28 11:25:30 +08:00
parent e14ecef05a 510cf963a2
commit 10fc7d4dd0
15 changed files with 595 additions and 301 deletions
--- a/buyer/src/pages/home/userCenter/MoneyManagement.vue
+++ b/buyer/src/pages/home/userCenter/MoneyManagement.vue
@@ -188,10 +188,10 @@ export default {
      },
      formValidate: {
        price: [
-          { required: true, message: '请输入大于0小于9999的合法充值金额' },
+          { required: true, message: '请输入大于等于1小于9999的合法充值金额' },
          {
            pattern: /^[1-9]\d{0,3}(\.\d{1,2})?$/,
-            message: '请输入大于0小于9999的合法充值金额',
+            message: '请输入大于等于1小于9999的合法充值金额',
            trigger: 'change'
          }
        ]
@@ -200,11 +200,13 @@ export default {
      logColumns: [
        {
          title: '时间',
+          width: 190,
          key: 'createTime'
        },
        {
          title: '金额',
          key: 'money',
+          width: 180,
          render: (h, params) => {
            if (params.row.money > 0) {
              return h('div', [
@@ -241,20 +243,29 @@ export default {
      logColumnsData: {}, // 余额日志
      // 充值记录
      rechargeListColumns: [
+        {
+          title: '充值时间',
+          key: 'createTime',
+          width: 168
+        },
        {
          title: '支付单号',
          key: 'rechargeSn',
          width: 200
        },
-        {
-          title: '支付方式',
-          key: 'rechargeWay'
-        },
        {
          title: '充值金额',
          key: 'rechargeMoney',
          render: (h, params) => {
-            return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+            if (params.row.payStatus === 'PAID') {
+              return h('div', [h('span', {
+                style: {
+                  color: 'green'
+                }
+              }, this.$options.filters.unitPrice(params.row.rechargeMoney, '+ ¥'))]);
+            } else {
+              return h('div', [h('span', this.$options.filters.unitPrice(params.row.rechargeMoney, '¥'))]);
+            }
          }
        },
        {
@@ -268,29 +279,60 @@ export default {
            }
          }
        },
+        {
+          title: '支付方式',
+          key: 'rechargeWay',
+          render: (h, params) => {
+            if (params.row.rechargeWay === 'ALIPAY') {
+              return h('div', [h('span', {}, '支付宝')]);
+            } else if (params.row.rechargeWay === 'WECHAT') {
+              return h('div', [h('span', {}, '微信')]);
+            } else if (params.row.rechargeWay === 'BANK_TRANSFER') {
+              return h('div', [h('span', {}, '线下转账')]);
+            } else {
+              return h('div', [h('span', {}, '')]);
+            }
+          }
+        },
        {
          title: '支付时间',
-          key: 'payTime'
+          key: 'payTime',
+          width: 180
        }
      ],
      rechargeListData: {}, // 充值记录数据
      // 提现记录
      withdrawApplyColumns: [
+        {
+          title: '申请时间',
+          key: 'createTime',
+          width: 168
+        },
        {
          title: '提现单号',
          key: 'sn',
-          width: 215
+          width: 200
        },
        {
          title: '提现金额',
          key: 'applyMoney',
+          width: 110,
          render: (h, params) => {
-            return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
+            if (params.row.applyStatus === 'VIA_AUDITING') {
+              return h('div', [h('span', {
+                style: {
+                  color: 'green'
+                }
+              }, this.$options.filters.unitPrice(params.row.applyMoney, '+ ¥'))]);
+            } else {
+              return h('div', [h('span', this.$options.filters.unitPrice(params.row.applyMoney, '¥'))]);
+            }
          }
        },
        {
          title: '提现状态',
          key: 'applyStatus',
+          width: 95,
          render: (h, params) => {
            if (params.row.applyStatus === 'APPLY') {
              return h('div', [h('span', {}, '申请中')]);
@@ -302,12 +344,14 @@ export default {
          }
        },
        {
-          title: '提现时间',
-          key: 'inspectTime'
+          title: '审核时间',
+          key: 'inspectTime',
+          width: 168
        },
        {
          title: '审核备注',
          key: 'inspectRemark'
+
        }
      ],
      withdrawApplyColumnsListData: {} // 提现记录
--- a/buyer/src/plugins/request.js
+++ b/buyer/src/plugins/request.js
@@ -69,7 +69,7 @@ service.interceptors.request.use(
      config.headers['accessToken'] = accessToken;
      // 解析当前token时间
      let jwtData = JSON.parse(
-        decodeURIComponent(escape(window.atob(accessToken.split('.')[1])))
+        decodeURIComponent(escape(window.atob(accessToken.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
      );
      if (jwtData.exp < Math.round(new Date() / 1000)) {
        refresh(config)
--- a/buyer/yarn.lock
+++ b/buyer/yarn.lock
@@ -2621,12 +2621,12 @@ dom-serializer@0:
    domelementtype "^2.0.1"
    entities "^2.0.0"

-dom7@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/dom7/download/dom7-3.0.0.tgz#b861ce5d67a6becd7aaa3ad02942ff14b1240331"
-  integrity sha1-uGHOXWemvs16qjrQKUL/FLEkAzE=
+dom7@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/dom7/-/dom7-2.1.5.tgz#a79411017800b31d8400070cdaebbfc92c1f6377"
+  integrity sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA==
  dependencies:
-    ssr-window "^3.0.0-alpha.1"
+    ssr-window "^2.0.0"

 domain-browser@^1.1.1:
  version "1.2.0"
@@ -7487,10 +7487,10 @@ sshpk@^1.7.0:
    safer-buffer "^2.0.2"
    tweetnacl "~0.14.0"

-ssr-window@^3.0.0, ssr-window@^3.0.0-alpha.1:
-  version "3.0.0"
-  resolved "https://registry.npm.taobao.org/ssr-window/download/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
-  integrity sha1-/VuCgBY4lD4MxwTEaRgBQ1r3rDc=
+ssr-window@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-2.0.0.tgz#98c301aef99523317f8d69618f0010791096efc4"
+  integrity sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A==

 ssri@^5.2.4:
  version "5.3.0"
@@ -7753,14 +7753,13 @@ svgo@^1.0.0:
    unquote "~1.1.1"
    util.promisify "~1.0.0"

-swiper@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.npm.taobao.org/swiper/download/swiper-6.4.1.tgz?cache=0&sync_timestamp=1607518804170&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-6.4.1.tgz#6d4e9252ed4226821d4005e77924e929848de8af"
-  integrity sha1-bU6SUu1CJoIdQAXneSTpKYSN6K8=
+swiper@^5.2.0:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-5.4.5.tgz#a350f654bf68426dbb651793824925512d223c0f"
+  integrity sha512-7QjA0XpdOmiMoClfaZ2lYN6ICHcMm72LXiY+NF4fQLFidigameaofvpjEEiTQuw3xm5eksG5hzkaRsjQX57vtA==
  dependencies:
-    dom7 "^3.0.0"
-    ssr-window "^3.0.0"
-    tslib "^2.0.0"
+    dom7 "^2.1.5"
+    ssr-window "^2.0.0"

 table@4.0.2:
  version "4.0.2"
@@ -7942,11 +7941,6 @@ tslib@^1.10.0:
  resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
  integrity sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=

-tslib@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.npm.taobao.org/tslib/download/tslib-2.0.3.tgz?cache=0&sync_timestamp=1602286724979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha1-jgdBrEX8DCJuWKF7/D5kubxsphw=
-
 tty-browserify@0.0.0:
  version "0.0.0"
  resolved "https://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"