时间样式

轮次持续时间展示问题
修复白名单展示
2024-02-27 21:39:15 +08:00 · 2024-02-27 21:39:15 +08:00 · 2024-02-27 21:39:14 +08:00 · 2024-02-27 21:39:14 +08:00 · 2024-02-27 21:39:13 +08:00 · 2024-02-27 21:39:13 +08:00
376 changed files with 13124 additions and 2928 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,10 +8,10 @@
      "name": "peko-admin-web",
      "version": "0.1.0",
      "dependencies": {
+        "@element-plus/icons-vue": "^2.1.0",
        "admin-lte": "^2.3.2",
        "axios": "^1.5.0",
        "bootstrap": "^3.3.5",
-        "bootstrap-table": "^1.10.1",
        "core-js": "^3.8.3",
        "element-plus": "^2.3.14",
        "font-awesome": "^4.6.3",
@@ -26,7 +26,8 @@
        "sass": "^1.67.0",
        "sass-loader": "^13.3.2",
        "vue-router": "^4.0.3",
-        "vuex": "^4.0.0"
+        "vuex": "^4.0.0",
+        "xlsx": "^0.18.5"
      },
      "devDependencies": {
        "@babel/core": "^7.12.16",
@@ -38,6 +39,8 @@
        "@vue/cli-service": "~5.0.0",
        "eslint": "^7.32.0",
        "eslint-plugin-vue": "^8.0.3",
+        "unplugin-auto-import": "^0.16.7",
+        "unplugin-vue-components": "^0.25.2",
        "vue": "^3.2.13",
        "webpack-cli": "^5.1.4"
      }
@@ -78,6 +81,12 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/@antfu/utils": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.6.tgz",
+      "integrity": "sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==",
+      "dev": true
+    },
    "node_modules/@babel/code-frame": {
      "version": "7.22.13",
      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.13.tgz",
@@ -2180,6 +2189,28 @@
      "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.5.tgz",
+      "integrity": "sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/@sideway/address": {
      "version": "4.1.4",
      "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
@@ -3686,6 +3717,14 @@
        "node": ">= 10.0.0"
      }
    },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/admin-lte": {
      "version": "2.3.2",
      "resolved": "https://registry.npmmirror.com/admin-lte/-/admin-lte-2.3.2.tgz",
@@ -4171,11 +4210,6 @@
        "node": ">=0.10.1"
      }
    },
-    "node_modules/bootstrap-table": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmmirror.com/bootstrap-table/-/bootstrap-table-1.10.1.tgz",
-      "integrity": "sha512-jaRE6H4M3sSTEwe5g9PYVuDQW2ClHsnlB7grwfOD1Hk9Flv3gpwRcrkGZmGZ4+pzK4R41g5MRboFZ739xIIufw=="
-    },
    "node_modules/brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4414,6 +4448,18 @@
        "node": ">=4"
      }
    },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/chalk": {
      "version": "2.4.2",
      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
@@ -4666,6 +4712,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/color-convert": {
      "version": "1.9.3",
      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
@@ -4936,6 +4990,17 @@
        "node": ">=10"
      }
    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -6753,6 +6818,14 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/fraction.js": {
      "version": "4.3.6",
      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.6.tgz",
@@ -7831,6 +7904,12 @@
        "node": ">=6"
      }
    },
+    "node_modules/jsonc-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
+    },
    "node_modules/jsonfile": {
      "version": "6.1.0",
      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -8001,6 +8080,19 @@
        "node": ">=8.9.0"
      }
    },
+    "node_modules/local-pkg": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.5.0.tgz",
+      "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
+      "dev": true,
+      "dependencies": {
+        "mlly": "^1.4.2",
+        "pkg-types": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
    "node_modules/locate-path": {
      "version": "5.0.0",
      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
@@ -8819,6 +8911,18 @@
        "mkdirp": "bin/cmd.js"
      }
    },
+    "node_modules/mlly": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.4.2.tgz",
+      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.10.0",
+        "pathe": "^1.1.1",
+        "pkg-types": "^1.0.3",
+        "ufo": "^1.3.0"
+      }
+    },
    "node_modules/module-alias": {
      "version": "2.2.3",
      "resolved": "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz",
@@ -9847,6 +9951,12 @@
        "node": ">=8"
      }
    },
+    "node_modules/pathe": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.1.1.tgz",
+      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "dev": true
+    },
    "node_modules/picocolors": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
@@ -9881,6 +9991,17 @@
        "node": ">=8"
      }
    },
+    "node_modules/pkg-types": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.0.3.tgz",
+      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "dev": true,
+      "dependencies": {
+        "jsonc-parser": "^3.2.0",
+        "mlly": "^1.2.0",
+        "pathe": "^1.1.0"
+      }
+    },
    "node_modules/popper.js": {
      "version": "1.16.1",
      "resolved": "https://registry.npmmirror.com/popper.js/-/popper.js-1.16.1.tgz",
@@ -11134,6 +11255,12 @@
        "node": ">= 8"
      }
    },
+    "node_modules/scule": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/scule/-/scule-1.0.0.tgz",
+      "integrity": "sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==",
+      "dev": true
+    },
    "node_modules/select-hose": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
@@ -11581,6 +11708,17 @@
      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
      "dev": true
    },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/ssri": {
      "version": "8.0.1",
      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
@@ -11717,6 +11855,15 @@
        "node": ">=8"
      }
    },
+    "node_modules/strip-literal": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-1.3.0.tgz",
+      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.10.0"
+      }
+    },
    "node_modules/stylehacks": {
      "version": "5.1.1",
      "resolved": "https://registry.npmmirror.com/stylehacks/-/stylehacks-5.1.1.tgz",
@@ -12090,6 +12237,12 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/ufo": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.3.1.tgz",
+      "integrity": "sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==",
+      "dev": true
+    },
    "node_modules/unicode-canonical-property-names-ecmascript": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -12130,6 +12283,55 @@
        "node": ">=4"
      }
    },
+    "node_modules/unimport": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmmirror.com/unimport/-/unimport-3.4.0.tgz",
+      "integrity": "sha512-M/lfFEgufIT156QAr/jWHLUn55kEmxBBiQsMxvRSIbquwmeJEyQYgshHDEvQDWlSJrVOOTAgnJ3FvlsrpGkanA==",
+      "dev": true,
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.4",
+        "escape-string-regexp": "^5.0.0",
+        "fast-glob": "^3.3.1",
+        "local-pkg": "^0.4.3",
+        "magic-string": "^0.30.3",
+        "mlly": "^1.4.2",
+        "pathe": "^1.1.1",
+        "pkg-types": "^1.0.3",
+        "scule": "^1.0.0",
+        "strip-literal": "^1.3.0",
+        "unplugin": "^1.5.0"
+      }
+    },
+    "node_modules/unimport/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/unimport/node_modules/local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/unimport/node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/unique-filename": {
      "version": "2.0.1",
      "resolved": "https://registry.npmmirror.com/unique-filename/-/unique-filename-2.0.1.tgz",
@@ -12170,6 +12372,164 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/unplugin": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.5.0.tgz",
+      "integrity": "sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.10.0",
+        "chokidar": "^3.5.3",
+        "webpack-sources": "^3.2.3",
+        "webpack-virtual-modules": "^0.5.0"
+      }
+    },
+    "node_modules/unplugin-auto-import": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmmirror.com/unplugin-auto-import/-/unplugin-auto-import-0.16.7.tgz",
+      "integrity": "sha512-w7XmnRlchq6YUFJVFGSvG1T/6j8GrdYN6Em9Wf0Ye+HXgD/22kont+WnuCAA0UaUoxtuvRR1u/mXKy63g/hfqQ==",
+      "dev": true,
+      "dependencies": {
+        "@antfu/utils": "^0.7.6",
+        "@rollup/pluginutils": "^5.0.5",
+        "fast-glob": "^3.3.1",
+        "local-pkg": "^0.5.0",
+        "magic-string": "^0.30.5",
+        "minimatch": "^9.0.3",
+        "unimport": "^3.4.0",
+        "unplugin": "^1.5.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@nuxt/kit": "^3.2.2",
+        "@vueuse/core": "*"
+      },
+      "peerDependenciesMeta": {
+        "@nuxt/kit": {
+          "optional": true
+        },
+        "@vueuse/core": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/unplugin-auto-import/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/unplugin-auto-import/node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/unplugin-auto-import/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/unplugin-vue-components": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmmirror.com/unplugin-vue-components/-/unplugin-vue-components-0.25.2.tgz",
+      "integrity": "sha512-OVmLFqILH6w+eM8fyt/d/eoJT9A6WO51NZLf1vC5c1FZ4rmq2bbGxTy8WP2Jm7xwFdukaIdv819+UI7RClPyCA==",
+      "dev": true,
+      "dependencies": {
+        "@antfu/utils": "^0.7.5",
+        "@rollup/pluginutils": "^5.0.2",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.0",
+        "local-pkg": "^0.4.3",
+        "magic-string": "^0.30.1",
+        "minimatch": "^9.0.3",
+        "resolve": "^1.22.2",
+        "unplugin": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@babel/parser": "^7.15.8",
+        "@nuxt/kit": "^3.2.2",
+        "vue": "2 || 3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/parser": {
+          "optional": true
+        },
+        "@nuxt/kit": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/unplugin-vue-components/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/unplugin-vue-components/node_modules/local-pkg": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/unplugin-vue-components/node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/unplugin-vue-components/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/unplugin/node_modules/webpack-virtual-modules": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+      "dev": true
+    },
    "node_modules/update-browserslist-db": {
      "version": "1.0.13",
      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
@@ -12513,7 +12873,7 @@
    },
    "node_modules/webpack-bundle-analyzer": {
      "version": "4.9.1",
-      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz",
      "integrity": "sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==",
      "dev": true,
      "dependencies": {
@@ -12972,6 +13332,22 @@
      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
      "dev": true
    },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/wrap-ansi": {
      "version": "7.0.0",
      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -13038,6 +13414,26 @@
        }
      }
    },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/y18n": {
      "version": "5.0.8",
      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
--- a/package.json
+++ b/package.json
@@ -3,15 +3,15 @@
  "version": "0.1.0",
  "private": true,
  "scripts": {
-    "serve": "vue-cli-service serve --mode development",
+    "dev": "vue-cli-service serve --mode development",
    "build": "vue-cli-service build --mode production",
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
+    "@element-plus/icons-vue": "^2.1.0",
    "admin-lte": "^2.3.2",
    "axios": "^1.5.0",
    "bootstrap": "^3.3.5",
-    "bootstrap-table": "^1.10.1",
    "core-js": "^3.8.3",
    "element-plus": "^2.3.14",
    "font-awesome": "^4.6.3",
@@ -26,7 +26,8 @@
    "sass": "^1.67.0",
    "sass-loader": "^13.3.2",
    "vue-router": "^4.0.3",
-    "vuex": "^4.0.0"
+    "vuex": "^4.0.0",
+    "xlsx": "^0.18.5"
  },
  "devDependencies": {
    "@babel/core": "^7.12.16",
@@ -38,6 +39,8 @@
    "@vue/cli-service": "~5.0.0",
    "eslint": "^7.32.0",
    "eslint-plugin-vue": "^8.0.3",
+    "unplugin-auto-import": "^0.16.7",
+    "unplugin-vue-components": "^0.25.2",
    "vue": "^3.2.13",
    "webpack-cli": "^5.1.4"
  }
--- a/src/api/AccessRestriction.vue/AccessRestriction.js
+++ b/src/api/AccessRestriction.vue/AccessRestriction.js
@@ -0,0 +1,65 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// ==================================地区限制====================================
+
+// 地区列表
+export const recordPage = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/page',
+        method: 'get',
+        params: query
+    });
+};
+// 加入白名单
+export const addWhite = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/addWhite',
+        method: 'get',
+        params: query
+    });
+};
+// 解除限制
+export const relieve = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/relieve',
+        method: 'get',
+        params: query
+    });
+};
+// 添加地区访问限制
+export const recordSave = query => {
+    return request({
+        url: '/admin/ip/region/limit/record/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// ==================================访问白名单====================================
+
+// 白名单列表
+export const whitePage = query => {
+    return request({
+        url: '/admin/ip/region/white/page',
+        method: 'get',
+        params: query
+    });
+};
+// 移除白名单
+export const whiteDel = query => {
+    return request({
+        url: '/admin/ip/region/white/del',
+        method: 'get',
+        params: query
+    });
+};
+// 添加白名单
+export const whiteSave = query => {
+    return request({
+        url: '/admin/ip/region/white/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
--- a/src/api/common/upload.js
+++ b/src/api/common/upload.js
@@ -0,0 +1,72 @@
+import request from "@/utils/request";
+import '@/utils/ajaxfileupload';
+
+export const uploadFile = id => {
+    return new Promise((resolve, reject) => {
+        $.ajaxFileUpload({
+            fileElementId: id,
+            url: '/admin/upload/img',
+            type: 'post',
+            dataType: 'json',
+            secureuri: false,
+            async: true,
+            submitType: 'ajax',
+            success: function (res) {
+                resolve(res);
+            },
+            error: function (res, status, e) {
+                console.error(res);
+                console.error(status);
+                reject(e);
+            }
+        });
+    });
+};
+
+export const uploadQiNiuFile = (file) => {
+    console.log(file);
+    let formData = new FormData();
+    formData.append('file', file);
+    return new Promise((resolve, reject) => {
+        request.post('/admin/qiniu/upload/file', formData).then(res => {
+            resolve(res);
+        }).catch(e => {
+            reject(e);
+        });
+    });
+};
+
+export const uploadTencentFile = id => {
+    return new Promise((resolve, reject) => {
+        $.ajaxFileUpload({
+            fileElementId: id,
+            url: '/admin/upload/tencent/file',
+            type: 'post',
+            dataType: 'json',
+            secureuri: false,
+            async: true,
+            submitType: 'ajax',
+            success: function (res) {
+                resolve(res);
+            },
+            error: function (res, status, e) {
+                console.error(res);
+                console.error(status);
+                reject(e);
+            }
+        });
+    });
+};
+
+export const uploadGift = (file) => {
+    let formData = new FormData();
+    console.log(file);
+    formData.append('file', file);
+    return new Promise((resolve, reject) => {
+        request.post('/admin/gift/upload', formData).then(res => {
+            resolve(res);
+        }).catch(e => {
+            reject(e);
+        });
+    });
+};
--- a/src/api/official/officialConfig.js
+++ b/src/api/official/officialConfig.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+
+export const getOfficialConfigList = query => {
+    return request({
+        url: '/admin/official/config/list',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveOfficialConfig = data => {
+    return request({
+        url: '/admin/official/config/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: data
+    });
+}
--- a/src/api/official/officialRecord.js
+++ b/src/api/official/officialRecord.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const browseFor30Days = query => {
+    return request({
+        url: '/admin/official/browse/record/browseFor30Days',
+        method: 'get',
+        params: query
+    });
+};
--- a/src/api/resource/resource.js
+++ b/src/api/resource/resource.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+
+export const getResourcePage = query => {
+    return request({
+        url: '/admin/resource/page',
+        method: 'get',
+        params: query
+    });
+};
+
+export const delResource = query => {
+    return request({
+        url: '/admin/resource/del',
+        method: 'get',
+        params: query
+    });
+};
+
+export const effective = query => {
+    return request({
+        url: '/admin/resource/effective',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveResource = data => {
+    return request({
+        url: '/admin/resource/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: data
+    });
+}
--- a/src/api/resource/resourceRule.js
+++ b/src/api/resource/resourceRule.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getResourceRuleList = query => {
+    return request({
+        url: '/admin/resource/rule/list',
+        method: 'get',
+        params: query
+    });
+};
--- a/src/api/roomAlbumPower/RoomRed.js
+++ b/src/api/roomAlbumPower/RoomRed.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+
+// 获取房间权限列表
+export const redEnvelopePage = query => {
+    return request({
+        url: '/admin/room/redEnvelope/page',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const redEnvelopeSave = query => {
+    return request({
+        url: '/admin/room/redEnvelope/save',
+        method: 'post',
+        params: query
+    });
+};
+// 删除
+export const delRoomRedEnvelope = query => {
+    return request({
+        url: '/admin/room/redEnvelope/delRoomRedEnvelope',
+        method: 'get',
+        params: query
+    });
+};
+// 弹窗列表
+export const userPage = query => {
+    return request({
+        url: '/admin/room/redEnvelope/userPage',
+        method: 'get',
+        params: query
+    });
+};
+// 弹窗新增
+export const saveManager = query => {
+    return request({
+        url: '/admin/room/redEnvelope/saveManager',
+        method: 'post',
+        params: query
+    });
+};
+// 弹窗编辑
+export const redEnvelopeUpdate = query => {
+    return request({
+        url: '/admin/room/redEnvelope/update',
+        method: 'post',
+        params: query
+    });
+};
+// 弹窗删除
+export const delUserRoomRedEnvelope = query => {
+    return request({
+        url: '/admin/room/redEnvelope/delUserRoomRedEnvelope',
+        method: 'get',
+        params: query
+    });
+};
--- a/src/api/roomAlbumPower/roomAlbumPower.js
+++ b/src/api/roomAlbumPower/roomAlbumPower.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// 获取房间权限列表
+export const albumPage = query => {
+    return request({
+        url: '/admin/room/album/page',
+        method: 'get',
+        params: query
+    });
+};
+// 房间相册管理权限分页列表
+export const userPage = query => {
+    return request({
+        url: '/admin/room/album/userPage',
+        method: 'get',
+        params: query
+    });
+};
+// 删除权限
+export const delUserRoomAlbum = query => {
+    return request({
+        url: '/admin/room/album/delUserRoomAlbum',
+        method: 'get',
+        params: query
+    });
+};
+// 删除房间权限
+export const delRoomAlbum = query => {
+    return request({
+        url: '/admin/room/album/delRoomAlbum',
+        method: 'get',
+        params: query
+    });
+};
+// 清空该房间相册
+export const clearRoomAlbum = query => {
+    return request({
+        url: '/admin/room/album/clearRoomAlbum',
+        method: 'get',
+        params: query
+    });
+};
+// 增加房间权限接口
+export const albumSave = query => {
+    return request({
+        url: '/admin/room/album/save',
+        method: 'post',
+        params: query
+    });
+};
+// 保存房间相册管理权限
+export const saveManager = query => {
+    return request({
+        url: '/admin/room/album/saveManager',
+        method: 'post',
+        params: query
+    });
+};
+// =========图片管理============
+// 分页列表
+export const photoPage = query => {
+    return request({
+        url: '/admin/room/photo/page',
+        method: 'get',
+        params: query
+    });
+};
+// 删除照片
+export const photoDel = query => {
+    return request({
+        url: '/admin/room/photo/del',
+        method: 'get',
+        params: query
+    });
+};
--- a/src/api/sysconfAdminView/sysconfAdminView.js
+++ b/src/api/sysconfAdminView/sysconfAdminView.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// 获取列表
+export const getList = query => {
+    return request({
+        url: '/admin/sysConf/getList',
+        method: 'get',
+        params: query
+    });
+};
+// 保存新增
+export const sysConfSave = query => {
+    return request({
+        url: '/admin/sysConf/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// 删除
+export const sysConfDel = query => {
+    return request({
+        url: '/admin/sysConf/del',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
--- a/src/api/system/sysconf.js
+++ b/src/api/system/sysconf.js
@@ -5,4 +5,12 @@ export function getSysConfList() {
        url: '/admin/sysConf/getList',
        method: 'get'
    });
+}
+
+export const getConfigValueByKey = query => {
+    return request({
+        url: '/admin/sysConf/key',
+        method: 'get',
+        params: query,
+    });
 }
--- a/src/api/transferIdentitySet/transferIdentitySet.js
+++ b/src/api/transferIdentitySet/transferIdentitySet.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+import qs from 'qs';
+
+// 获取列表
+export const userPage = query => {
+    return request({
+        url: '/admin/give/user/page',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const userSave = query => {
+    return request({
+        url: '/admin/give/user/save',
+        method: 'post',
+        params: query
+    });
+};
+// 删除
+export const batchDel = query => {
+    return request({
+        url: '/admin/give/user/batchDel',
+        method: 'get',
+        params: query
+    });
+};
--- a/src/api/treasure/poolItem.js
+++ b/src/api/treasure/poolItem.js
@@ -8,3 +8,30 @@ export const savePoolItem = query => {
        params: query
    });
 };
+
+//发布
+export const deployPoolItem = query => {
+    return request({
+        url: '/admin/seize-treasure/pool/item/deploy',
+        method: 'get',
+        params: query
+    });
+};
+
+//已发布奖池
+export const deployedPoolItem = query => {
+    return request({
+        url: '/admin/seize-treasure/pool/item/deployed',
+        method: 'get',
+        params: query
+    });
+};
+
+//统计
+export const showPoolItemCount = query => {
+    return request({
+        url: '/admin/seize-treasure/pool/item/count',
+        method: 'get',
+        params: query
+    });
+}
--- a/src/api/wishingStar/wishingStar.js
+++ b/src/api/wishingStar/wishingStar.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================许愿礼物配置====================================
+// 表单
+export const promiseStarConfigList = query => {
+    return request({
+        url: '/admin/promiseStarConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+// 新增弹窗列表数据
+export const giftGetAll = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const promiseStarConfigSave = query => {
+    return request({
+        url: '/admin/promiseStarConfig/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// 下线
+export const promiseStarConfigUpdateEnable = query => {
+    return request({
+        url: '/admin/promiseStarConfig/updateEnable',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+
+export const promiseStarRoundPage = query => {
+    return request({
+        url: '/admin/promiseStarRound/page',
+        method: 'get',
+        params: query
+    });
+};
+
+export const promiseStarUserRecordGetPromiseUsers = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/getPromiseUsers',
+        method: 'get',
+        params: query
+    }); 
+};
+
+export const promiseStarUserRecordSetUserWhite = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/setUserWhite',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    }); 
+};
+
+export const promiseStarUserRecordPage = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/page',
+        method: 'get',
+        params: query
+    });
+};
+export const promiseStarUserRecordExport = query => {
+    window.location.href = `/admin/promiseStarUserRecord/export?${genQueryParam(query)}`;
+    return;
+};
--- a/src/assets/images/zs.png
+++ b/src/assets/images/zs.png
--- a/src/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper.js
+++ b/src/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper.js
@@ -29,26 +29,34 @@ export default {
        }
    },
    // 构建下拉组合框
-    build: function (url, idstr, defval) {
+    build: function (val, idstr, defval) {
        var _this = this;
-        if (url) {
-            $.ajax({
-                type: 'post',
-                url: url,
-                dataType: 'json',
-                success: function (json) {
-                    $(idstr).empty();
-                    $.each(json, function (n, value) {
-                        $(idstr).append("<option value='" + value.oval + "' data-value='" + value.oval + "'>" + value.otxt + "</option>");
-                    });
-                    $(idstr).btComboBox();
-                    _this.setDef(idstr, defval);
-                }
-            });
+        if (val) {
+            if (Object.prototype.toString.call(val) === '[object Array]') {
+                $(idstr).empty();
+                $.each(val, function (n, obj) {
+                    $(idstr).append("<option value='" + obj.value + "' data-value='" + obj.value + "'>" + obj.text + "</option>");
+                });
+                $(idstr).btComboBox();
+                _this.setDef(idstr, defval);
+            } else {
+                $.ajax({
+                    type: 'post',
+                    url: val,
+                    dataType: 'json',
+                    success: function (json) {
+                        $(idstr).empty();
+                        $.each(json, function (n, value) {
+                            $(idstr).append("<option value='" + value.oval + "' data-value='" + value.oval + "'>" + value.otxt + "</option>");
+                        });
+                        $(idstr).btComboBox();
+                        _this.setDef(idstr, defval);
+                    }
+                });
+            }
        } else {
            $(idstr).btComboBox();
            _this.setDef(idstr, defval);
        }
    }
-
 }
--- a/src/assets/plugins/bootstrap-multiselect/js/bootstrap-multiselect.js
+++ b/src/assets/plugins/bootstrap-multiselect/js/bootstrap-multiselect.js
@@ -52,7 +52,7 @@
        define(['jquery', 'knockout'], factory);
    } else {
        // Browser globals
-        factory(root.jQuery, root.ko);
+        factory(require("jquery"), root.ko);
    }
 })(this, function ($, ko) {
    "use strict";// jshint ;_;
--- a/src/assets/plugins/bootstrap-table/css/bootstrap-table.css
+++ b/src/assets/plugins/bootstrap-table/css/bootstrap-table.css
@@ -0,0 +1,303 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ * version: 1.10.1
+ * https://github.com/wenzhixin/bootstrap-table/
+ */
+
+.bootstrap-table .table {
+    margin-bottom: 0 !important;
+    border-bottom: 1px solid #dddddd;
+    border-collapse: collapse !important;
+    border-radius: 1px;
+}
+
+.bootstrap-table .table:not(.table-condensed),
+.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,
+.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,
+.bootstrap-table .table:not(.table-condensed)>thead>tr>td,
+.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,
+.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td {
+    padding: 8px;
+}
+
+.bootstrap-table .table.table-no-bordered>thead>tr>th,
+.bootstrap-table .table.table-no-bordered>tbody>tr>td {
+    border-right: 2px solid transparent;
+}
+
+.fixed-table-container {
+    position: relative;
+    clear: both;
+    border: 1px solid #dddddd;
+    border-radius: 4px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+}
+
+.fixed-table-container.table-no-bordered {
+    border: 1px solid transparent;
+}
+
+.fixed-table-footer,
+.fixed-table-header {
+    overflow: hidden;
+}
+
+.fixed-table-footer {
+    border-top: 1px solid #dddddd;
+}
+
+.fixed-table-body {
+    overflow-x: auto;
+    overflow-y: auto;
+    height: 100%;
+}
+
+.fixed-table-container table {
+    width: 100%;
+}
+
+.fixed-table-container thead th {
+    height: 0;
+    padding: 0;
+    margin: 0;
+    border-left: 1px solid #dddddd;
+}
+
+.fixed-table-container thead th:focus {
+    outline: 0 solid transparent;
+}
+
+.fixed-table-container thead th:first-child {
+    border-left: none;
+    border-top-left-radius: 4px;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+}
+
+.fixed-table-container thead th .th-inner,
+.fixed-table-container tbody td .th-inner {
+    padding: 8px;
+    line-height: 24px;
+    vertical-align: top;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.fixed-table-container thead th .sortable {
+    cursor: pointer;
+    background-position: right;
+    background-repeat: no-repeat;
+    padding-right: 30px;
+}
+
+.fixed-table-container thead th .both {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC');
+}
+
+.fixed-table-container thead th .asc {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==');
+}
+
+.fixed-table-container thead th .desc {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII= ');
+}
+
+.fixed-table-container th.detail {
+    width: 30px;
+}
+
+.fixed-table-container tbody td {
+    border-left: 1px solid #dddddd;
+}
+
+.fixed-table-container tbody tr:first-child td {
+    border-top: none;
+}
+
+.fixed-table-container tbody td:first-child {
+    border-left: none;
+}
+
+/* the same color with .active */
+.fixed-table-container tbody .selected td {
+    background-color: #f5f5f5;
+}
+
+.fixed-table-container .bs-checkbox {
+    text-align: center;
+}
+
+.fixed-table-container .bs-checkbox .th-inner {
+    padding: 8px 0;
+}
+
+.fixed-table-container input[type="radio"],
+.fixed-table-container input[type="checkbox"] {
+    margin: 0 auto !important;
+}
+
+.fixed-table-container .no-records-found {
+    text-align: center;
+}
+
+.fixed-table-pagination div.pagination,
+.fixed-table-pagination .pagination-detail {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.fixed-table-pagination div.pagination .pagination {
+    margin: 0;
+}
+
+.fixed-table-pagination .pagination a {
+    padding: 6px 12px;
+    line-height: 1.428571429;
+}
+
+.fixed-table-pagination .pagination-info {
+    line-height: 34px;
+    margin-right: 5px;
+}
+
+.fixed-table-pagination .btn-group {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.fixed-table-pagination .dropup .dropdown-menu {
+    margin-bottom: 0;
+}
+
+.fixed-table-pagination .page-list {
+    display: inline-block;
+}
+
+.fixed-table-toolbar .columns-left {
+    margin-right: 5px;
+}
+
+.fixed-table-toolbar .columns-right {
+    margin-left: 5px;
+}
+
+.fixed-table-toolbar .columns label {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.428571429;
+}
+
+.fixed-table-toolbar .bars,
+.fixed-table-toolbar .search,
+.fixed-table-toolbar .columns {
+    position: relative;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    line-height: 34px;
+}
+
+.fixed-table-pagination li.disabled a {
+    pointer-events: none;
+    cursor: default;
+}
+
+.fixed-table-loading {
+    display: none;
+    position: absolute;
+    top: 42px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+    background-color: #fff;
+    text-align: center;
+}
+
+.fixed-table-body .card-view .title {
+    font-weight: bold;
+    display: inline-block;
+    min-width: 30%;
+    text-align: left !important;
+}
+
+/* support bootstrap 2 */
+.fixed-table-body thead th .th-inner {
+    box-sizing: border-box;
+}
+
+.table th,
+.table td {
+    vertical-align: middle;
+    box-sizing: border-box;
+}
+
+.fixed-table-toolbar .dropdown-menu {
+    text-align: left;
+    max-height: 300px;
+    overflow: auto;
+}
+
+.fixed-table-toolbar .btn-group>.btn-group {
+    display: inline-block;
+    margin-left: -1px !important;
+}
+
+.fixed-table-toolbar .btn-group>.btn-group>.btn {
+    border-radius: 0;
+}
+
+.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+}
+
+.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+}
+
+.bootstrap-table .table>thead>tr>th {
+    vertical-align: bottom;
+    border-bottom: 1px solid #ddd;
+}
+
+/* support bootstrap 3 */
+.bootstrap-table .table thead>tr>th {
+    padding: 0;
+    margin: 0;
+}
+
+.bootstrap-table .fixed-table-footer tbody>tr>td {
+    padding: 0 !important;
+}
+
+.bootstrap-table .fixed-table-footer .table {
+    border-bottom: none;
+    border-radius: 0;
+    padding: 0 !important;
+}
+
+.pull-right .dropdown-menu {
+    right: 0;
+    left: auto;
+}
+
+/* calculate scrollbar width */
+p.fixed-table-scroll-inner {
+    width: 100%;
+    height: 200px;
+}
+
+div.fixed-table-scroll-outer {
+    top: 0;
+    left: 0;
+    visibility: hidden;
+    width: 200px;
+    height: 150px;
+    overflow: hidden;
+}
--- a/src/assets/plugins/bootstrap-table/js/bootstrap-table.js
+++ b/src/assets/plugins/bootstrap-table/js/bootstrap-table.js
--- a/src/assets/plugins/bootstrap-table/js/extensions/editable/bootstrap-table-editable.js
+++ b/src/assets/plugins/bootstrap-table/js/extensions/editable/bootstrap-table-editable.js
@@ -0,0 +1,146 @@
+/**
+ * @author zhixin wen <wenzhixin2010@gmail.com>
+ * extensions: https://github.com/vitalets/x-editable
+ */
+
+(function (root, factory) {
+    var define;
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module unless amdModuleId is set
+        define(["jquery"], function (a0) {
+            return (factory(a0));
+        });
+    } else if (typeof exports === 'object') {
+        // Node. Does not work with strict CommonJS, but
+        // only CommonJS-like environments that support module.exports,
+        // like Node.
+        module.exports = factory(require("jquery"));
+    } else {
+        factory(jQuery);
+    }
+}(this, function (jQuery) {
+
+    !function ($) {
+
+        'use strict';
+
+        $.extend($.fn.bootstrapTable.defaults, {
+            editable: true,
+            onEditableInit: function () {
+                return false;
+            },
+            onEditableSave: function (field, row, oldValue, $el) {
+                return false;
+            },
+            onEditableShown: function (field, row, $el, editable) {
+                return false;
+            },
+            onEditableHidden: function (field, row, $el, reason) {
+                return false;
+            }
+        });
+
+        $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
+            'editable-init.bs.table': 'onEditableInit',
+            'editable-save.bs.table': 'onEditableSave',
+            'editable-shown.bs.table': 'onEditableShown',
+            'editable-hidden.bs.table': 'onEditableHidden'
+        });
+
+        var BootstrapTable = $.fn.bootstrapTable.Constructor,
+            _initTable = BootstrapTable.prototype.initTable,
+            _initBody = BootstrapTable.prototype.initBody;
+
+        BootstrapTable.prototype.initTable = function () {
+            var that = this;
+            _initTable.apply(this, Array.prototype.slice.apply(arguments));
+
+            if (!this.options.editable) {
+                return;
+            }
+
+            $.each(this.columns, function (i, column) {
+                if (!column.editable) {
+                    return;
+                }
+
+                var editableOptions = {}, editableDataMarkup = [], editableDataPrefix = 'editable-';
+
+                var processDataOptions = function (key, value) {
+                    // Replace camel case with dashes.
+                    var dashKey = key.replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); });
+                    if (dashKey.slice(0, editableDataPrefix.length) == editableDataPrefix) {
+                        var dataKey = dashKey.replace(editableDataPrefix, 'data-');
+                        editableOptions[dataKey] = value;
+                    }
+                };
+
+                $.each(that.options, processDataOptions);
+
+                var _formatter = column.formatter;
+                column.formatter = function (value, row, index) {
+                    var result = _formatter ? _formatter(value, row, index) : value;
+
+                    $.each(column, processDataOptions);
+
+                    $.each(editableOptions, function (key, value) {
+                        editableDataMarkup.push(' ' + key + '="' + value + '"');
+                    });
+
+                    return ['<a href="javascript:void(0)"',
+                        ' data-name="' + column.field + '"',
+                        ' data-pk="' + row[that.options.idField] + '"',
+                        ' data-value="' + result + '"',
+                        editableDataMarkup.join(''),
+                        '>' + '</a>'
+                    ].join('');
+                };
+            });
+        };
+
+        BootstrapTable.prototype.initBody = function () {
+            var that = this;
+            _initBody.apply(this, Array.prototype.slice.apply(arguments));
+
+            if (!this.options.editable) {
+                return;
+            }
+
+            $.each(this.columns, function (i, column) {
+                if (!column.editable) {
+                    return;
+                }
+
+                that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+                    .off('save').on('save', function (e, params) {
+                        var data = that.getData(),
+                            index = $(this).parents('tr[data-index]').data('index'),
+                            row = data[index],
+                            oldValue = row[column.field];
+
+                        $(this).data('value', params.submitValue);
+                        row[column.field] = params.submitValue;
+                        that.trigger('editable-save', column.field, row, oldValue, $(this));
+                    });
+                that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+                    .off('shown').on('shown', function (e, editable) {
+                        var data = that.getData(),
+                            index = $(this).parents('tr[data-index]').data('index'),
+                            row = data[index];
+
+                        that.trigger('editable-shown', column.field, row, $(this), editable);
+                    });
+                that.$body.find('a[data-name="' + column.field + '"]').editable(column.editable)
+                    .off('hidden').on('hidden', function (e, reason) {
+                        var data = that.getData(),
+                            index = $(this).parents('tr[data-index]').data('index'),
+                            row = data[index];
+
+                        that.trigger('editable-hidden', column.field, row, $(this), reason);
+                    });
+            });
+            this.trigger('editable-init');
+        };
+
+    }(jQuery);
+}));
--- a/src/assets/plugins/bootstrap-table/js/locale/bootstrap-table-zh-CN.js
+++ b/src/assets/plugins/bootstrap-table/js/locale/bootstrap-table-zh-CN.js
@@ -0,0 +1,60 @@
+/**
+ * Bootstrap Table Chinese translation
+ * Author: Zhixin Wen<wenzhixin2010@gmail.com>
+ */
+
+(function (root, factory) {
+    var define;
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module unless amdModuleId is set
+        define(["jquery"], function (a0) {
+            return (factory(a0));
+        });
+    } else if (typeof exports === 'object') {
+        // Node. Does not work with strict CommonJS, but
+        // only CommonJS-like environments that support module.exports,
+        // like Node.
+        module.exports = factory(require("jquery"));
+    } else {
+        factory(jQuery);
+    }
+}(this, function (jQuery) {
+
+    (function ($) {
+        'use strict';
+
+        $.fn.bootstrapTable.locales['zh-CN'] = {
+            formatLoadingMessage: function () {
+                return '正在努力地加载数据中，请稍候……';
+            },
+            formatRecordsPerPage: function (pageNumber) {
+                return '每页显示 ' + pageNumber + ' 条记录';
+            },
+            formatShowingRows: function (pageFrom, pageTo, totalRows) {
+                return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录，总共 ' + totalRows + ' 条记录';
+            },
+            formatSearch: function () {
+                return '搜索';
+            },
+            formatNoMatches: function () {
+                return '没有找到匹配的记录';
+            },
+            formatPaginationSwitch: function () {
+                return '隐藏/显示分页';
+            },
+            formatRefresh: function () {
+                return '刷新';
+            },
+            formatToggle: function () {
+                return '切换';
+            },
+            formatColumns: function () {
+                return '列';
+            }
+        };
+
+        $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
+
+    })(jQuery);
+}));
+
--- a/src/components/footer/index.vue
+++ b/src/components/footer/index.vue
@@ -16,5 +16,4 @@ export default {
 }
 </script>
  
-<style scoped>
-</style>
+<style scoped></style>
--- a/src/components/maintainer/index.vue
+++ b/src/components/maintainer/index.vue
@@ -68,7 +68,8 @@
            </ol>
        </section>
        <!-- Main content -->
-        <section class="content" style="height: 100%; overflow: hidden; overflow: scroll;">
+        <section class="content">
+        <!-- <section class="content" style="height: 100%; overflow: hidden; overflow: scroll;"> -->
            <!-- Your Page Content Here -->
            <component :is="componentName"></component>
        </section>
@@ -98,13 +99,13 @@
    </div>
    <div class="modal fade loading" style="background: #00000040;" tabindex="-1" role="dialog"
         aria-labelledby="loadingModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="loadingGif" style="position: fixed;"><img :src="loading"></div>
+        <div class="loadingGif" style="position: fixed; left:50%; top:50%;"><img src="https://img.zcool.cn/community/0111345d94b0b8a801211d53cbd04d.gif" style="width: 10%;"></div>
    </div>
 </template>
  
 <script>
 import store from '@/store';
-import loading from '@/assets/images/loading.gif';
+import { getStore } from '@/utils/store';

 export default {
    name: 'MaintainerView',
@@ -129,6 +130,8 @@ export default {
    },
    methods: {
        getMenu() {
+            this.parentMenus = getStore({ name: 'parent_menus' });
+            this.childMenus = getStore({ name: 'child_menus' });
            store.dispatch('getMenu').then(res => {
                this.parentMenus = res.parents;
                this.childMenus = res.childs;
@@ -162,9 +165,7 @@ export default {
                        parentIds.push(v.id);
                    });
                }
-                console.log(parentIds);
                this.parentMenus = store.getters.parentMenus.filter(v1 => parentIds.filter(v2 => v1.id == v2).length > 0);
-                this.childMenus = store.getters.childMenus.filter(v1 => parentIds.filter(v2 => v1.parentid == v2).length > 0);
            }
        }
    },
--- a/src/css/public.css
+++ b/src/css/public.css
@@ -0,0 +1,70 @@
+/* 主要的按钮样式处理 */
+/*鼠标点击后移开，恢复本身样式*/
+.primary,
+.primary:focus:not(.primary:hover) {
+    color: white;
+    background: #409eff;
+}
+
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.primary:focus,
+.primary:hover {
+    color: white;
+    background: #409eff;
+}
+
+/*鼠标按下，没有抬起*/
+/* 更改邊框顏色 */
+.primary:active {
+    color: white;
+    background: #337ecc;
+}
+
+
+/*鼠标点击后移开，恢复本身样式*/
+.danger,
+.danger:focus:not(.danger:hover) {
+    color: white;
+    background: #f56c6c;
+}
+
+/* 危险的按钮样式 */
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.danger:focus,
+.danger:hover {
+    color: white;
+    background: #f56c6c;
+}
+
+/*鼠标按下，没有抬起*/
+/* 更改邊框顏色 */
+.danger:active {
+    color: white;
+    background: #c45656;
+}
+
+
+/*鼠标点击后移开，恢复本身样式*/
+.success,
+.success:focus:not(.success:hover) {
+    color: white;
+    background: #67c23a;
+}
+
+/* 危险的按钮样式 */
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.success:focus,
+.success:hover {
+    color: white;
+    background: #b3e19d;
+}
+
+/*鼠标按下，没有抬起*/
+/* 更改邊框顏色 */
+.danger:active {
+    color: white;
+    background: #529b2e;
+}
--- a/src/main.js
+++ b/src/main.js
@@ -1,10 +1,11 @@
 import { createApp } from 'vue'
+// @ts-ignore
 import App from './App.vue'
 import router from './router'
 import store from './store'
+
 import 'jquery'
 import 'jquery.md5'
-
 import 'bootstrap/dist/css/bootstrap.min.css'
 import 'bootstrap/dist/js/bootstrap.min.js'

@@ -15,10 +16,10 @@ import 'admin-lte/dist/css/AdminLTE.min.css'
 import 'admin-lte/dist/css/skins/skin-purple-light.min.css'
 import 'admin-lte/dist/js/app.min.js'

-import 'bootstrap-table/dist/bootstrap-table.css'
-import 'bootstrap-table/dist/bootstrap-table.js'
-import 'bootstrap-table/dist/locale/bootstrap-table-zh-CN.js'
-import 'bootstrap-table/dist/extensions/editable/bootstrap-table-editable.js'
+import '@/assets/plugins/bootstrap-table/css/bootstrap-table.css'
+import '@/assets/plugins/bootstrap-table/js/bootstrap-table.js'
+import '@/assets/plugins/bootstrap-table/js/locale/bootstrap-table-zh-CN.js'
+import '@/assets/plugins/bootstrap-table/js/extensions/editable/bootstrap-table-editable.js'

 import '@/assets/plugins/jquery/jquery.form.js'

@@ -46,9 +47,13 @@ import '@/assets/plugins/jQuery-Validation-Engine/js/languages/jquery.validation
 import '@/assets/plugins/bootstrap-treeview/css/bootstrap-treeview.min.css'
 import '@/assets/plugins/bootstrap-treeview/js/bootstrap-treeview.min.js'

+// @ts-ignore
 import components from '@/utils/components.js'

-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
+// import ElementPlus from 'element-plus'
+// import 'element-plus/dist/index.css'
+import '@/css/public.css'

-createApp(App).use(store).use(router).use(components).use(ElementPlus).mount('#app')
+const app = createApp(App)
+app.config.warnHandler = () => null;
+app.use(store).use(router).use(components).mount('#app')
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,7 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
 import HomeView from '../views/home/index.vue'
 import LoginView from '../views/login/index.vue'
+import BlankView from '../views/BlankView.vue'

 const routes = [
  {
@@ -12,6 +13,11 @@ const routes = [
    path: '/home',
    name: 'home',
    component: HomeView
+  },
+  {
+    path: '/blank',
+    name: 'blank',
+    component: BlankView
  }
 ]

--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -35,7 +35,7 @@ export default {
            let userAvatar = user.avatar;
            if (userAvatar) {
                if (userAvatar != "") {
-                    userAvatar = userAvatar.startsWith('https') || userAvatar.startsWith('http') || avatar;
+                    userAvatar = (userAvatar.startsWith('https') || userAvatar.startsWith('http')) ? userAvatar : avatar;
                }
                state.avatar = userAvatar;
                setStore({
--- a/src/utils/ajaxfileupload.js
+++ b/src/utils/ajaxfileupload.js
@@ -4,7 +4,6 @@ jQuery.extend({
        if (s.error) {
            s.error.call(s.context || s, xhr, status, e);
        }
-
        // Fire the global callback
        if (s.global) {
            (s.context ? jQuery(s.context) : jQuery.event).trigger("ajaxError", [xhr, s, e]);
@@ -13,17 +12,14 @@ jQuery.extend({
    createUploadIframe: function (id, uri) {
        //create frame
        var frameId = 'jUploadFrame' + id;
-
        if (window.ActiveXObject) {
            var io = document.createElement('<iframe id="' + frameId + '" name="' + frameId + '" />');
            if (typeof uri == 'boolean') {
                io.src = 'javascript:false';
-            }
-            else if (typeof uri == 'string') {
+            } else if (typeof uri == 'string') {
                io.src = uri;
            }
-        }
-        else {
+        } else {
            io = document.createElement('iframe');
            io.id = frameId;
            io.name = frameId;
@@ -31,18 +27,21 @@ jQuery.extend({
        io.style.position = 'absolute';
        io.style.top = '-1000px';
        io.style.left = '-1000px';
-
        document.body.appendChild(io);
-
-        return io
+        return io;
    },
    createUploadForm: function (id, fileElementId) {
        //create form	
        var formId = 'jUploadForm' + id;
        var fileId = 'jUploadFile' + id;
-        var form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
+        var form = $('#' + formId);
+        if (form && form.length > 0) {
+            form.remove();
+        }
+        form = $('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
        var oldElement = $('#' + fileElementId);
-        var newElement = $(oldElement).clone();
+        var newElement = $(oldElement).clone(true).val("");
+        //须要复制元素的全部事件处理。  
        $(oldElement).attr('id', fileId);
        $(oldElement).before(newElement);
        $(oldElement).appendTo(form);
@@ -53,7 +52,6 @@ jQuery.extend({
        $(form).appendTo('body');
        return form;
    },
-
    ajaxFileUpload: function (s) {
        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
        s = jQuery.extend({}, jQuery.ajaxSettings, s);
@@ -68,7 +66,7 @@ jQuery.extend({
        }
        var requestDone = false;
        // Create the request object
-        var xml = {}
+        var xml = {};
        if (s.global)
            jQuery.event.trigger("ajaxSend", [xml, s]);
        // Wait for a response to come back
@@ -98,7 +96,6 @@ jQuery.extend({
                        // If a local callback was specified, fire it and pass it the data
                        if (s.success)
                            s.success(data, status);
-
                        // Fire the global callback
                        if (s.global)
                            jQuery.event.trigger("ajaxSuccess", [xml, s]);
@@ -112,30 +109,22 @@ jQuery.extend({
                // The request was completed
                if (s.global)
                    jQuery.event.trigger("ajaxComplete", [xml, s]);
-
                // Handle the global AJAX counter
                if (s.global && ! --jQuery.active)
                    jQuery.event.trigger("ajaxStop");
-
                // Process result
                if (s.complete)
                    s.complete(xml, status);
-
-                jQuery(io).unbind()
-
+                jQuery(io).unbind();
                setTimeout(function () {
                    try {
                        $(io).remove();
                        $(form).remove();
-
                    } catch (e) {
                        jQuery.handleError(s, xml, null, e);
                    }
-
-                }, 100)
-
-                xml = null
-
+                }, 100);
+                xml = null;
            }
        }
        // Timeout checker
@@ -153,12 +142,23 @@ jQuery.extend({
            $(form).attr('target', frameId);
            if (form.encoding) {
                form.encoding = 'multipart/form-data';
-            }
-            else {
+            } else {
                form.enctype = 'multipart/form-data';
            }
-            $(form).submit();
-
+            let submitType = s.submitType;
+            let $form = $(form);
+            if (!submitType || submitType == 'form') {
+                $form.submit();
+            } else if (submitType == 'ajax') {
+                $form.ajaxSubmit({
+                    success: function (data, status) {
+                        s.success(data, status);
+                    },
+                    error: function (err) {
+                        jQuery.handleError(s, xml, null, err);
+                    }
+                });
+            }
        } catch (e) {
            jQuery.handleError(s, xml, null, e);
        }
@@ -169,9 +169,7 @@ jQuery.extend({
            document.getElementById(frameId).addEventListener('load', uploadCallback, false);
        }
        return { abort: function () { } };
-
    },
-
    uploadHttpData: function (r, type) {
        var data = !type;
        data = type == "xml" || data ? r.responseXML : r.responseText;
--- a/src/utils/bootstrap-table-helper.js
+++ b/src/utils/bootstrap-table-helper.js
@@ -1,42 +1,50 @@
 export default {
-    idstr: null,
    // 是否有且只选择了一项
-    isSelectOne: function (idstr) {
-        if ($(idstr).bootstrapTable('getSelections').length == 1) {
+    isSelectOne: function (id) {
+        if ($(id).bootstrapTable('getSelections').length == 1) {
            return true;
        }
        return false;
    },
    //是否选择了至少一项
-    hasSelectAny: function (idstr) {
-        if ($(idstr).bootstrapTable('getSelections').length > 0) {
+    hasSelectAny: function (id) {
+        if ($(id).bootstrapTable('getSelections').length > 0) {
            return true;
        }
        return false;
    },
    // 获取选择的一项
-    getOneSelectItem: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections')[0];
+    getOneSelectItem: function (id) {
+        return $(id).bootstrapTable('getSelections')[0];
    },
    // 已经选择的记录
-    getAllSelectItems: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections');
+    getAllSelectItems: function (id) {
+        return $(id).bootstrapTable('getSelections');
    },
-    getRowByUniqueId: function (idstr, id) {
-        return $(idstr).bootstrapTable('getRowByUniqueId', id);
+    getRowByUniqueId: function (id, recordId) {
+        return $(id).bootstrapTable('getRowByUniqueId', recordId);
    },
    // 已选择的项数量
-    selectLength: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections').length;
+    selectLength: function (id) {
+        return $(id).bootstrapTable('getSelections').length;
    },
    // 刷新
-    doRefresh: function (idstr) {
-        $(idstr).bootstrapTable('refresh');
+    doRefresh: function (id) {
+        $(id).bootstrapTable('refresh');
    },
-    unCheckAll: function (idstr) {
-        $(idstr).bootstrapTable('uncheckAll');
+    unCheckAll: function (id) {
+        $(id).bootstrapTable('uncheckAll');
    },
-    doRefreshAndToPage1: function (idstr) {
-        $(idstr).bootstrapTable('selectPage', 1);
+    doRefreshAndToPage1: function (id) {
+        $(id).bootstrapTable('selectPage', 1);
    },
+    getData: function(id) {
+        return $(id).bootstrapTable('getData');
+    },
+    destroy: function(id) {
+        $(id).bootstrapTable('destroy');
+    },
+    load: function(id, data) {
+        $(id).bootstrapTable('load', data);
+    }
 }
--- a/src/utils/excelUtils.js
+++ b/src/utils/excelUtils.js
@@ -0,0 +1,26 @@
+import * as XLSX from 'xlsx';
+const exportToExcel = (row, fileName, list, sheetNames) => {//调用方式 exportToExcel(接口返回的表格列表, "文件名", 定义的表头和字段[{ piko号: "erbanNo" }{ piko号: "erbanNo" }],, ["Sheet1"]);
+    var data = [];
+    var headerTitle = [];
+    row.forEach((res, i) => {
+        var arr = [];
+        for (let index = 0; index < list.length; index++) {
+            for (let key in list[index]) {
+                headerTitle[index] = key;
+                arr[index] = res[list[index][key]];
+            }
+        }
+        data[i] = arr;
+    });
+    let smallArr = Array.from(data);
+    let bigArr = [];
+    smallArr = smallArr.map((item) => {
+        bigArr.push(Object.values(item));
+    });
+    const ws = XLSX.utils.aoa_to_sheet([...[headerTitle], ...bigArr]); // tableName为表头，tableData为数据
+    const wb = XLSX.utils.book_new();
+    // 将工作表放入工作簿中
+    XLSX.utils.book_append_sheet(wb, ws, sheetNames);
+    XLSX.writeFile(wb, fileName + ".xlsx");
+}
+export default exportToExcel
--- a/src/utils/maintainer.js
+++ b/src/utils/maintainer.js
@@ -1,29 +1,3 @@
-/**
- * 扩展date函数
- * author:c3gen
- */
-
-export default Date.prototype.format = function (format) {
-    var o = {
-        "M+": this.getMonth() + 1,
-        "d+": this.getDate(),
-        "h+": this.getHours(),
-        "m+": this.getMinutes(),
-        "s+": this.getSeconds(),
-        "q+": Math.floor((this.getMonth() + 3) / 3),
-        "S": this.getMilliseconds()
-    }
-    if (/(y+)/.test(format)) {
-        format = format.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    }
-    for (var k in o) {
-        if (new RegExp("(" + k + ")").test(format)) {
-            format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-        }
-    }
-    return format;
-}
-
 export function showLoading() {
    $(".loadingGif").css('top', window.innerHeight / 2);
    $(".loadingGif").css('left', window.innerWidth / 2);
@@ -73,4 +47,13 @@ export function apiResult(json) {
    $("#tipMsg").text("请求失败，错误信息：" + json.message);
    $("#tipModal").modal('show');
    return false;
+}
+
+export function genQueryParam(json) {
+    if (!json) return ''
+    return cleanArray(Object.keys(json).map(key => {
+        if (json[key] === undefined) return ''
+        return encodeURIComponent(key) + '=' +
+            encodeURIComponent(json[key])
+    })).join('&');
 }
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,15 +3,28 @@ import store from "@/store";
 import global from "@/constants/global";

 const service = axios.create();
-
+import { ElMessage } from 'element-plus'
 service.interceptors.request.use(config => {
+    console.log('config', config);
    return config;
 }, error => {
    Promise.reject(error);
 });

 service.interceptors.response.use(res => {
-    userLogout(res.headers[global.NEED_LOGOUT]);
+    userLogout(res.headers[global.NEED_LOGOUT.toLowerCase()]);
+    console.log('res.data', res);
+    // if (res.data.code == 200) {
+        // ElMessage({
+        //     message: "成功",
+        //     type: 'success'
+        // });
+    // } else {
+        // ElMessage({
+        //     message: res.data.message,
+        //     type: 'error'
+        //   });
+    // }
    return res.data;
 }, error => {
    return Promise.reject(error);
@@ -21,11 +34,11 @@ $.ajaxSetup({
    headers: {
        'Access-Control-Allow-Origin': '*',
    },
-    beforeSend: function(xhr) {
+    beforeSend: function (xhr) {
        console.log(xhr);
    },
-    complete: function(xhr) {
-        if (xhr && typeof(xhr.getResponseHeader) == 'function') {
+    complete: function (xhr) {
+        if (xhr && typeof (xhr.getResponseHeader) == 'function') {
            userLogout(xhr.getResponseHeader(global.NEED_LOGOUT));
        }
    }
@@ -34,7 +47,7 @@ $.ajaxSetup({
 /**
 * 强制退出
 */
-function userLogout(needLogout) {
+function userLogout (needLogout) {
    try {
        if (global.NEED_LOGOUT == needLogout) {
            var win = window;
--- a/src/utils/string.js
+++ b/src/utils/string.js
@@ -19,4 +19,11 @@ export function upperFirst(str) {
 */
 export function lowerFirst(str) {
    return str.charAt(0).toLowerCase() + str.slice(1);
+}
+
+/**
+ * 是否为数字
+ */
+export function isNumber(str) {
+    return /^[0-9]+.?[0-9]*/.test(str);
 }
--- a/src/utils/system-helper.js
+++ b/src/utils/system-helper.js
@@ -1,6 +1,38 @@
 //获取url中的参数
-function getUrlParam(name) {
+export function getUrlParam(name) {
    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
    var r = window.location.search.substr(1).match(reg);  //匹配目标参数
    if (r != null) return unescape(r[2]); return null; //返回参数值
+}
+
+export function dateFormat (date, fmt) {
+    date = new Date(date);
+    var o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+    };
+
+    // 补全0
+    let padLeftZero = (str) => {
+        return ('00' + str).substr(str.length);
+    }
+
+    // 年份
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+
+    // 月日时分秒
+    for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+            var str = o[k] + '';
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+        }
+    }
+
+    date = o = padLeftZero = null;
+    return fmt;
 }
--- a/src/views/BlankView.vue
+++ b/src/views/BlankView.vue
@@ -0,0 +1,24 @@
+<template>
+    <div></div>
+</template>
+  
+<script>
+import router from '@/router';
+
+export default {
+    name: 'BlankView',
+    created() {
+        console.log('blank...');
+        console.log(window.performance.navigation.type);
+        //处理css样式污染问题
+        if (window.performance.navigation.type == window.performance.navigation.TYPE_RELOAD) {
+            router.push('/home');
+        } else {
+            console.log('router go ...');
+            router.go(0);
+        }
+    }
+}
+</script>
+  
+<style scoped></style>
--- a/src/views/OperationSmsAdminView.vue
+++ b/src/views/OperationSmsAdminView.vue
@@ -389,6 +389,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/accessRestriction/AccessRestriction.vue
+++ b/src/views/accessRestriction/AccessRestriction.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="outer">
+    <div class="search">
+      <div class="searchLeft">
+        <span>用户平台ID</span>
+        <el-input
+          v-model="userId"
+          size="default"
+          placeholder="用户平台ID"
+          class="input"
+        ></el-input>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="buttonBox">
+      <el-button class="primary" type="primary" size="default" @click="add()"
+        >新增</el-button
+      >
+      <el-button class="primary" type="primary" size="default" @click="search()"
+        >查询</el-button
+      >
+    </div>
+    <!-- 列表 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用戶id" />
+      <el-table-column prop="nick" align="center" label="用戶昵称" />
+      <el-table-column prop="phone" align="center" label="手机号" />
+      <el-table-column prop="signTime" align="center" label="注册时间" />
+      <el-table-column prop="createTime" align="center" label="进入访问限制时间" />
+      <el-table-column prop="inviteCode" align="center" label="邀请码" />
+      <el-table-column prop="signDeviceId" align="center" label="注册设备" />
+      <el-table-column prop="deviceIds" align="center" label="访问设备" />
+      <el-table-column prop="lastCheckIpRegion" align="center" label="最近一次访问地点" />
+      <el-table-column align="center" label="平台"
+        ><template v-slot="scope">{{
+          scope.row.os == "android" ? "安卓" : "苹果"
+        }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="sim卡信息" width="150"
+        ><template v-slot="scope">
+          <div v-html="tableArrFormat(scope.row)"></div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="系统语言" width="200">
+        <template v-slot="scope">
+          {{langFormat(scope.row.lang)}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="unfreeze(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >解除限制</el-button
+          >
+          <el-button
+            @click="addWhite(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >加入白名单</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 公共二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> {{ delDialogText }}</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 添加弹窗 -->
+    <el-dialog v-model="addSure" title="提示" width="30%" center>
+      <div class="selectBox">
+        <span class="left" style="margin-right: 20px">用户ID</span>
+        <el-input
+          v-model="selectUserId"
+          size="default"
+          placeholder="用户平台ID"
+          class="right"
+          style="width: 70%"
+        ></el-input>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addSure = false">取消</el-button>
+          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  recordPage,
+  addWhite,
+  relieve,
+  recordSave,
+} from "@/api/AccessRestriction.vue/AccessRestriction.js";
+import { ElMessage } from "element-plus";
+export default {
+  name: "AccessRestriction",
+  data() {
+    return {
+      userId: "", //用戶id
+      loading: false, //列表loading
+      tableData: [
+        {
+          erbanNo: "123123123",
+        },
+      ], //列表数据
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      delDialog: false, //控制公共弹窗展示
+      delDialogText: "确定要解除限制吗?", //公共弹窗标题
+      type: null, //1解除限制 2加入白名单
+      obj: {}, //存放公共参数
+      addSure: false, //控制确认添加弹窗展示
+      selectUserId: "", //添加用户id
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 初始化
+    getData() {
+      this.loading = true;
+      recordPage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+        userErBanNo: this.userId,
+      }).then((res) => {
+        this.tableData = res.data.records;
+        this.loading = false;
+        this.total = res.data.total;
+      });
+    },
+    // 搜索
+    search() {
+      this.getData();
+    },
+    // 新增
+    add() {
+      this.addSure = true;
+    },
+    // 确认新增
+    addSureClick() {
+      this.addSure = false;
+      this.delDialogText = "确定要添加地区限制访问吗?";
+      this.delDialog = true;
+      this.type = 3;
+    },
+    // 解除限制按钮
+    unfreeze(row) {
+      console.log(row);
+      this.delDialogText = "确定要解除限制吗?";
+      this.delDialog = true;
+      this.type = 1;
+      this.obj = row;
+    },
+    // 加入白名单
+    addWhite(row) {
+      console.log(row);
+      this.delDialogText = "确定要加入白名单吗?";
+      this.delDialog = true;
+      this.type = 2;
+      this.obj = row;
+    },
+    // 二次确认
+    sureClick() {
+      if (this.type == 1) {
+        relieve({ uid: this.obj.uid }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      } else if (this.type == 2) {
+        addWhite({ uid: this.obj.uid }).then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+      if (this.type == 3) {
+        recordSave({ erBanNoStr: this.selectUserId }).then((res) => {
+          if (res.code == 200) {
+            this.selectUserId = "";
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "success",
+            });
+            this.getData();
+          } else {
+            ElMessage({
+              showClose: true,
+              message: res.message,
+              type: "error",
+            });
+          }
+        });
+      }
+      this.getData();
+      this.delDialog = false;
+    },
+    // 分页导航
+    handleSizeChange(val) {
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.getData();
+    },
+    // sim格式化
+    tableArrFormat(val) {
+      //   console.log("aaaaaaaaaaaaa", val.simCards);
+      var str = "";
+      if (!val.simCards) {
+        return;
+      }
+      val.simCards.forEach((res, i) => {
+        str += `
+                sim卡${i + 1}: ${
+          res == 452
+            ? "越南"
+            : res == 454
+            ? "香港"
+            : res == 460
+            ? "中国"
+            : res == 466
+            ? "台湾"
+            : res == 456
+            ? "柬埔寨"
+            : res == 502
+            ? "马来西亚"
+            : res == 525
+            ? "新加坡"
+            : res == 510
+            ? "印尼"
+            : res == 414
+            ? "缅甸"
+            : res == 515
+            ? "菲律宾"
+            : res == 520
+            ? "泰国"
+            : res == 457
+            ? "老挝"
+            : res
+        }<br>
+            `;
+      });
+      return str;
+    },
+    // sim格式化
+    langFormat(val) {
+      var str = "";
+      if (val == null) {
+        str = "空";
+      }else if(val.match(/cn/gi)||val.match(/hans/gi)){
+        str = `${val}【简体中文】`;
+      }else if(val.match(/tw/gi)||val.match(/hant/gi)||val.match(/hk/gi)||val.match(/mo/gi)){
+        str = `${val}【繁体中文】`;
+      }else{
+        str = val;
+      }
+      return str;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+}
+</style>
--- a/src/views/accessRestriction/AccessWhitelist.vue
+++ b/src/views/accessRestriction/AccessWhitelist.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="outer">
+    <!-- 搜索 -->
+    <div class="search">
+      <div class="searchLeft">
+        <span>用户平台ID</span>
+        <el-input
+          v-model="userId"
+          size="default"
+          placeholder="用户平台ID"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="searchRight">
+        <span>用户手机号</span>
+        <el-input
+          v-model="userPhone"
+          size="default"
+          placeholder="用户手机号"
+          class="input"
+        ></el-input>
+      </div>
+    </div>
+    <!-- 按钮 -->
+    <div class="buttonBox">
+      <el-button class="primary" type="primary" size="default" @click="add()"
+        >新增</el-button
+      >
+      <el-button class="primary" type="primary" size="default" @click="search()"
+        >查询</el-button
+      >
+    </div>
+    <!-- 列表 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="erbanNo" align="center" label="用戶id" />
+      <el-table-column prop="phone" align="center" label="用戶手机号" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="signTime" align="center" label="注册时间" />
+      <el-table-column prop="roleName" align="center" label="身份" />
+      <el-table-column prop="createTime" align="center" label="进入白名单时间" />
+      <el-table-column prop="lastCheckTime" align="center" label="最近一次访问时间" />
+      <el-table-column align="center" label="进入白名单来源">
+        <template v-slot="scope">
+          {{
+            scope.row.source == 1
+              ? "手动添加"
+              : scope.row.source == 2
+              ? "手机号申请通过"
+              : scope.row.source == 3
+              ? "限制访问记录添加"
+              : "未知来源"
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="delWhite(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >移除白名单</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500]"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 公共二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> {{ delDialogText }}</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="sureClick(val, type)"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 添加弹窗 -->
+    <el-dialog v-model="addSure" title="提示" width="30%" center>
+      <div class="selectBox">
+        <span class="left">添加号码类型</span>
+        <el-select
+          v-model="value"
+          fit-input-width="true"
+          placeholder="请选择"
+          class="right"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="selectBox" v-if="value == 1">
+        <span class="left">用户ID</span>
+        <el-input
+          v-model="selectUserId"
+          size="default"
+          placeholder="用户平台ID"
+          class="right"
+        ></el-input>
+      </div>
+      <div class="selectBox" v-else>
+        <span class="left">手机号</span>
+        <el-input
+          v-model="selectUserPhone"
+          size="default"
+          placeholder=""
+          class="right"
+          style="width: 56%"
+        >
+        </el-input>
+        <b>+86</b>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="addSure = false">取消</el-button>
+          <el-button type="primary" @click="addSureClick()"> 添加 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  whitePage,
+  whiteDel,
+  whiteSave,
+} from "@/api/AccessRestriction.vue/AccessRestriction.js";
+import { ElMessage } from "element-plus";
+export default {
+  name: "AccessWhitelist",
+  data() {
+    return {
+      userId: "", //用戶id
+      userPhone: "", //用戶手机号
+      loading: false, //列表loading
+      tableData: [], //列表数据
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+      delDialog: false, //控制公共弹窗展示
+      delDialogText: "确定要移除白名单吗?", //公共弹窗标题
+      addSure: false, //控制确认添加弹窗展示
+      value: "1", //选择器
+      options: [
+        {
+          value: "1",
+          label: "用户id",
+        },
+        {
+          value: "2",
+          label: "用户手机号",
+        },
+      ],
+      selectUserId: "", //添加弹窗用户id
+      selectUserPhone: "", //添加弹窗用户手机号
+      obj: {}, //存放公共参数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 初始化
+    getData() {
+      this.loading = true;
+      whitePage({
+        page: this.currentPage,
+        pageSize: this.pageSize,
+        userErBanNo: this.userId,
+        phone: this.userPhone,
+      }).then((res) => {
+        this.tableData = res.data.records;
+        this.loading = false;
+        this.total = res.data.total;
+      });
+    },
+    // 新增
+    add() {
+      this.addSure = true;
+    },
+    // 搜索
+    search() {
+      this.getData();
+    },
+    // 移除白名单
+    delWhite(row) {
+      console.log(row);
+      this.obj = row;
+      this.delDialog = true;
+    },
+    // 二次确认
+    sureClick() {
+      whiteDel({ id: this.obj.id }).then((res) => {
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.delDialog = false;
+      });
+    },
+    // 添加确认
+    addSureClick() {
+      var objs = {};
+      if (this.value == 1) {
+        objs = {
+          userErBanNoStr: this.selectUserId,
+        };
+      } else {
+        let phone = this.selectUserPhone;
+        if (phone) {
+          phone = '86' + phone;
+        }
+        objs = {
+          phone: phone,
+        };
+      }
+      whiteSave(objs).then((res) => {
+        this.selectUserId = "";
+        this.selectUserPhone = "";
+        if (res.code == 200) {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "success",
+          });
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.getData();
+      });
+      this.addSure = false;
+    },
+    // 分页导航
+    handleSizeChange(val) {
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.outer {
+  padding-top: 20px;
+  background: #ecf0f5;
+  border-top: 3px solid #d2d6de;
+  .search {
+    width: 100%;
+    height: 41px;
+    .searchLeft,
+    .searchRight {
+      width: 20%;
+      float: left;
+      span {
+        margin-right: 10px;
+      }
+      .input {
+        width: 75%;
+      }
+    }
+  }
+  .buttonBox {
+    margin-top: 10px;
+  }
+  .authorityBox {
+    .authoritySpan {
+      margin-right: 20px;
+    }
+    .authorityInpput {
+      width: 50%;
+    }
+  }
+  .dialogTableVisibleBut {
+    margin: -25px 0 20px 0px;
+  }
+  .selectBox {
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    width: 70%;
+    .left {
+      display: block;
+      margin-right: 25px;
+      white-space: nowrap;
+    }
+    .right {
+      width: 70%;
+      position: relative;
+    }
+
+    b {
+      font-style: normal;
+      position: absolute;
+      left: 135px;
+      width: 54px;
+      height: 32px;
+      line-height: 32px;
+      text-align: center;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      border-top-left-radius: 5px;
+      border-bottom-left-radius: 5px;
+      border-right: 1px solid #dcdfe6;
+      border-left: 1px solid #dcdfe6;
+      border-bottom: 1px solid #dcdfe6;
+      border-top: 1px solid #dcdfe6;
+      background: #fff;
+    }
+  }
+}
+input[type="file"] {
+  display: none;
+}
+</style>
--- a/src/views/activity/ActivityAwardAdminView.vue
+++ b/src/views/activity/ActivityAwardAdminView.vue
@@ -590,6 +590,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/ActivityPackAdminView.vue
+++ b/src/views/activity/ActivityPackAdminView.vue
@@ -757,6 +757,7 @@ export default {
            })
        }
    },
+
 };

 </script>
--- a/src/views/activity/ChargeActivityAdminView.vue
+++ b/src/views/activity/ChargeActivityAdminView.vue
@@ -1147,6 +1147,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/FamilyPKManageAdminView.vue
+++ b/src/views/activity/FamilyPKManageAdminView.vue
@@ -617,6 +617,7 @@ export default {
            })
        }
    },
+
 };

 </script>
--- a/src/views/activity/LuckySeaItemAdminView.vue
+++ b/src/views/activity/LuckySeaItemAdminView.vue
@@ -654,6 +654,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/LuckySeaPlatformAdminView.vue
+++ b/src/views/activity/LuckySeaPlatformAdminView.vue
@@ -166,6 +166,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/activity/LuckySeaRecordAdminView.vue
+++ b/src/views/activity/LuckySeaRecordAdminView.vue
@@ -289,6 +289,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/activity/LuckySeaUserStatAdminView.vue
+++ b/src/views/activity/LuckySeaUserStatAdminView.vue
@@ -133,6 +133,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/activity/OperationActAdminView.vue
+++ b/src/views/activity/OperationActAdminView.vue
@@ -256,6 +256,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/PageActivityView.vue
+++ b/src/views/activity/PageActivityView.vue
@@ -249,6 +249,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/UserDrawRecordAdminView.vue
+++ b/src/views/activity/UserDrawRecordAdminView.vue
@@ -138,6 +138,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/activity/WeekStarConfigAdminView.vue
+++ b/src/views/activity/WeekStarConfigAdminView.vue
@@ -409,6 +409,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/administrator/SuperAdminOperateRecordView.vue
+++ b/src/views/administrator/SuperAdminOperateRecordView.vue
@@ -175,15 +175,16 @@ export default {
                });
                picker1.on('changeDate', function () {
                    var date = $('#beginDate').datetimepicker('getDate');
-                    picker2.datepicker('setStartDate', date);
+                    picker2.datetimepicker('setStartDate', date);
                });
                picker2.on('changeDate', function () {
                    var date = $('#endDate').datetimepicker('getDate');
-                    picker1.datepicker('setEndDate', date);
+                    picker1.datetimepicker('setEndDate', date);
                });
            });
        }
    },
+
 };
 </script>

--- a/src/views/administrator/SuperAdminView.vue
+++ b/src/views/administrator/SuperAdminView.vue
@@ -136,6 +136,7 @@ export default {
            });
        }
    },
+
 };


--- a/src/views/anchor/AnchorAdminView.vue
+++ b/src/views/anchor/AnchorAdminView.vue
@@ -221,6 +221,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorBillCheckView.vue
+++ b/src/views/anchor/AnchorBillCheckView.vue
@@ -242,6 +242,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorBillUploadView.vue
+++ b/src/views/anchor/AnchorBillUploadView.vue
@@ -261,6 +261,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorFansMpAudioView.vue
+++ b/src/views/anchor/AnchorFansMpAudioView.vue
@@ -279,6 +279,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorFansPrivilegeView.vue
+++ b/src/views/anchor/AnchorFansPrivilegeView.vue
@@ -502,6 +502,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorFansTeamStatsView.vue
+++ b/src/views/anchor/AnchorFansTeamStatsView.vue
@@ -212,6 +212,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/anchor/AnchorReleaseGoldView.vue
+++ b/src/views/anchor/AnchorReleaseGoldView.vue
@@ -254,6 +254,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/app/AppBottomBarAdminView.vue
+++ b/src/views/app/AppBottomBarAdminView.vue
@@ -1061,6 +1061,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/app/AppUpdateView.vue
+++ b/src/views/app/AppUpdateView.vue
@@ -434,6 +434,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/audiocard/AudioCardVerifyView.vue
+++ b/src/views/audiocard/AudioCardVerifyView.vue
@@ -264,6 +264,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/auditaudio/AuditAudioView.vue
+++ b/src/views/auditaudio/AuditAudioView.vue
@@ -542,15 +542,16 @@ export default {
                });
                picker1.on('changeDate', function () {
                    var date = $('#beginDate').datetimepicker('getDate');
-                    picker2.datepicker('setStartDate', date);
+                    picker2.datetimepicker('setStartDate', date);
                });
                picker2.on('changeDate', function () {
                    var date = $('#endDate').datetimepicker('getDate');
-                    picker1.datepicker('setEndDate', date);
+                    picker1.datetimepicker('setEndDate', date);
                });
            });
        }
    },
+
 };
 </script>

--- a/src/views/auditaudio/MonitorRuleView.vue
+++ b/src/views/auditaudio/MonitorRuleView.vue
@@ -151,6 +151,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/batch/FlowDataBatchSearchView.vue
+++ b/src/views/batch/FlowDataBatchSearchView.vue
@@ -218,9 +218,9 @@ export default {
                    cache: false,
                    striped: true,
                    showRefresh: false,
-                    pageSize: 20,
+                    pageSize: 10,
                    pagination: true,
-                    pageList: [20, 50, 100],
+                    pageList: [10, 20, 50, 100],
                    search: false,
                    sidePagination: "server", //表示服务端请求
                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
@@ -438,6 +438,11 @@ export default {
                        let id = $('#id').val();
                        let startTime = $('#startTime').val();
                        let endTime = $('#endTime').val(); 
+                        if (getDate(endTime).getMonth() != getDate(startTime).getMonth()) {
+                            $("#tipMsg").text("归因场次不允许跨月.");
+                            $("#tipModal").modal('show'); 
+                            return;
+                        }
                        if ((getDate(endTime).getTime() - getDate(startTime).getTime()) > (36 * 60 * 60 * 1000)) {
                            $("#tipMsg").text("时间间隔不能超过36h.");
                            $("#tipModal").modal('show');
@@ -536,6 +541,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/blinddate/BlindDateCapAdminView.vue
+++ b/src/views/blinddate/BlindDateCapAdminView.vue
@@ -288,7 +288,7 @@ export default {
                                $("#tipMsg").text("保存成功");
                                $("#tipModal").modal('show');
                                TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateCapModal").modal('hide');
                            } else {
                                $("#tipMsg").text("保存失败." + json.message);
                                $("#tipModal").modal('show');
@@ -334,6 +334,7 @@ export default {
                                $("#tipMsg").text("保存成功");
                                $("#tipModal").modal('show');
                                TableHelper.doRefresh("#table");
+                                $("#addCapModal").modal('hide');
                            } else {
                                $("#tipMsg").text("保存失败." + json.message);
                                $("#tipModal").modal('show');
@@ -405,6 +406,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/blinddate/BlindDateJoinhandAdminView.vue
+++ b/src/views/blinddate/BlindDateJoinhandAdminView.vue
@@ -1,165 +1,178 @@
 <template>
    <section class="content">
-    <div class="box box-primary">
-        <div class="box-body">
-            <!-- Content Header (Page header) -->
-            <section class="content-header">
-                <h1 id="itemTitle"></h1>
-            </section>
-            <div id="toolbar">
-                <div class="col-sm-12">
-                    <button id="addBtn" class="btn btn-default">
-                        <i class="glyphicon glyphicon-plus"></i>添加
-                    </button>
+        <div class="box box-primary">
+            <div class="box-body">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <div id="toolbar">
+                    <div class="col-sm-12">
+                        <button id="addBtn" class="btn btn-default">
+                            <i class="glyphicon glyphicon-plus"></i>添加
+                        </button>
+                    </div>
                </div>
            </div>
-        </div>

-        <!-- .content -->
-        <div id="table"></div>
-
-    </div>
-</section>
-
-<div class="modal fade" id="addJoinHandModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
-                </button>
-                <h4 class="modal-title" id="modalLabel">添加</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal" id="addForm">
-                    <input type="hidden" name="id" id="id"/>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">魅力值区间<font color="red">*</font>:</label>
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control validate[required]" name="charmValueMin" id="modal_charmMin" placeholder="请输入最小值">
-                        </div>
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control validate[required]" name="charmValueMax" id="modal_charmMax" placeholder="请输入最大值">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">场景名称:<font color="red">*</font>:</label>
-                        <div class="col-sm-6">
-                            <input type="text" class="input-sm form-control datetime validate[required]" name="title" id="modal_JoinHandTitle" placeholder="请输入">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">时长:<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="input-sm form-control datetime validate[required]" name="picSecond" id="modal_picSecond" placeholder="请输入">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">文件上传<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <img src="" id="picImage" style="width:250px;height:90px;" alt="">
-                            <input type="file" id="picUploadFile" name="file">
-                            <button class="btn btn-success" type="button" id="picUploadBtn">上传</button>
-                            <input type="hidden" id="picUrl" name="picUrl" class="form-control validate[required]"/>
-                            <span id="picImgInfo" style="color:red;"></span>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">飘屏开关<font color="red">*</font>:</label>
-                        <select name="notifySwitch" id="notifySwitch" data-btn-class="btn-warning">
-                            <option value="0" selected="selected">关闭</option>
-                            <option value="1">开启</option>
-                        </select>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">飘屏背景图片<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <img src="" id="notifyBackgroundUrlImage" style="width:250px;height:90px;" alt="">
-                            <input type="file" id="notifyBackgroundUrlUploadFile" name="file">
-                            <button class="btn btn-success" type="button" id="notifyBackgroundUrlUploadBtn">上传</button>
-                            <input type="hidden" id="notifyBackgroundUrl" name="notifyBackgroundUrl" class="form-control validate[required]"/>
-                            <span id="notifyBackgroundUrlImgInfo" style="color:red;"></span>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="add-JoinHand">确定</button>
-            </div>
+            <!-- .content -->
+            <div id="table"></div>

        </div>
-    </div>
-</div>
+    </section>

-<div class="modal fade" id="updateJoinHandModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
-                </button>
-                <h4 class="modal-title" id="updateModalLabel">编辑</h4>
-            </div>
-            <div class="modal-body">
-                <form class="form-horizontal" id="updateForm">
-                    <input type="hidden" name="id" id="e_id"/>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">魅力值区间<font color="red">*</font>:</label>
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control validate[required]" name="charmValueMin" id="e_modal_charmMin" placeholder="请输入最小值">
+    <div class="modal fade" id="addJoinHandModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span>
+                    </button>
+                    <h4 class="modal-title" id="modalLabel">添加</h4>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="addForm">
+                        <input type="hidden" name="id" id="id" />
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">魅力值区间<font color="red">*</font>:</label>
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control validate[required]" name="charmValueMin"
+                                    id="modal_charmMin" placeholder="请输入最小值">
+                            </div>
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control validate[required]" name="charmValueMax"
+                                    id="modal_charmMax" placeholder="请输入最大值">
+                            </div>
                        </div>
-                        <div class="col-sm-3">
-                            <input type="text" class="form-control validate[required]" name="charmValueMax" id="e_modal_charmMax" placeholder="请输入最大值">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">场景名称:<font color="red">*</font>:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="input-sm form-control datetime validate[required]" name="title"
+                                    id="modal_JoinHandTitle" placeholder="请输入">
+                            </div>
                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">场景名称:<font color="red">*</font>:</label>
-                        <div class="col-sm-6">
-                            <input type="text" class="input-sm form-control datetime validate[required]" name="title" id="e_modal_JoinHandTitle" placeholder="请输入">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">时长:<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="input-sm form-control datetime validate[required]"
+                                    name="picSecond" id="modal_picSecond" placeholder="请输入">
+                            </div>
                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">时长:<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="input-sm form-control datetime validate[required]" name="picSecond" id="e_modal_picSecond" placeholder="请输入">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">文件上传<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <img src="" id="picImage" style="width:250px;height:90px;" alt="">
+                                <input type="file" id="picUploadFile" name="file">
+                                <button class="btn btn-success" type="button" id="picUploadBtn">上传</button>
+                                <input type="hidden" id="picUrl" name="picUrl" class="form-control validate[required]" />
+                                <span id="picImgInfo" style="color:red;"></span>
+                            </div>
                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">配置图片<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <img src="" id="e_picImage" style="width:250px;height:90px;" alt="">
-                            <input type="file" id="e_picUploadFile" name="file">
-                            <button class="btn btn-success" type="button" id="e_picUploadBtn">上传</button>
-                            <input type="hidden" id="e_picUrl" name="picUrl" class="form-control validate[required]"/>
-                            <span id="e_picImgInfo" style="color:red;"></span>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">飘屏开关<font color="red">*</font>:</label>
+                            <select name="notifySwitch" id="notifySwitch" data-btn-class="btn-warning">
+                                <option value="0" selected="selected">关闭</option>
+                                <option value="1">开启</option>
+                            </select>
                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">飘屏开关<font color="red">*</font>:</label>
-                        <select name="notifySwitch" id="e_notifySwitch" data-btn-class="btn-warning">
-                            <option value="0" selected="selected">关闭</option>
-                            <option value="1">开启</option>
-                        </select>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">飘屏背景图片<font color="red">*</font>:</label>
-                        <div class="col-sm-9">
-                            <img src="" id="e_notifyBackgroundUrlImage" style="width:250px;height:90px;" alt="">
-                            <input type="file" id="e_notifyBackgroundUrlUploadFile" name="file">
-                            <button class="btn btn-success" type="button" id="e_notifyBackgroundUrlUploadBtn">上传</button>
-                            <input type="hidden" id="e_notifyBackgroundUrl" name="notifyBackgroundUrl" class="form-control validate[required]"/>
-                            <span id="e_notifyBackgroundUrlImgInfo" style="color:red;"></span>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">飘屏背景图片<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <img src="" id="notifyBackgroundUrlImage" style="width:250px;height:90px;" alt="">
+                                <input type="file" id="notifyBackgroundUrlUploadFile" name="file">
+                                <button class="btn btn-success" type="button" id="notifyBackgroundUrlUploadBtn">上传</button>
+                                <input type="hidden" id="notifyBackgroundUrl" name="notifyBackgroundUrl"
+                                    class="form-control validate[required]" />
+                                <span id="notifyBackgroundUrlImgInfo" style="color:red;"></span>
+                            </div>
                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-primary" id="updateJoinHand">确定</button>
-            </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary" id="add-JoinHand">确定</button>
+                </div>

+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" id="updateJoinHandModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span>
+                    </button>
+                    <h4 class="modal-title" id="updateModalLabel">编辑</h4>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="updateForm">
+                        <input type="hidden" name="id" id="e_id" />
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">魅力值区间<font color="red">*</font>:</label>
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control validate[required]" name="charmValueMin"
+                                    id="e_modal_charmMin" placeholder="请输入最小值">
+                            </div>
+                            <div class="col-sm-3">
+                                <input type="text" class="form-control validate[required]" name="charmValueMax"
+                                    id="e_modal_charmMax" placeholder="请输入最大值">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">场景名称:<font color="red">*</font>:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="input-sm form-control datetime validate[required]" name="title"
+                                    id="e_modal_JoinHandTitle" placeholder="请输入">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">时长:<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="input-sm form-control datetime validate[required]"
+                                    name="picSecond" id="e_modal_picSecond" placeholder="请输入">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">配置图片<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <img src="" id="e_picImage" style="width:250px;height:90px;" alt="">
+                                <input type="file" id="e_picUploadFile" name="file">
+                                <button class="btn btn-success" type="button" id="e_picUploadBtn">上传</button>
+                                <input type="hidden" id="e_picUrl" name="picUrl" class="form-control validate[required]" />
+                                <span id="e_picImgInfo" style="color:red;"></span>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">飘屏开关<font color="red">*</font>:</label>
+                            <select name="notifySwitch" id="e_notifySwitch" data-btn-class="btn-warning">
+                                <option value="0" selected="selected">关闭</option>
+                                <option value="1">开启</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">飘屏背景图片<font color="red">*</font>:</label>
+                            <div class="col-sm-9">
+                                <img src="" id="e_notifyBackgroundUrlImage" style="width:250px;height:90px;" alt="">
+                                <input type="file" id="e_notifyBackgroundUrlUploadFile" name="file">
+                                <button class="btn btn-success" type="button"
+                                    id="e_notifyBackgroundUrlUploadBtn">上传</button>
+                                <input type="hidden" id="e_notifyBackgroundUrl" name="notifyBackgroundUrl"
+                                    class="form-control validate[required]" />
+                                <span id="e_notifyBackgroundUrlImgInfo" style="color:red;"></span>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary" id="updateJoinHand">确定</button>
+                </div>
+
+            </div>
        </div>
    </div>
-</div>
 </template>

 <script>
@@ -178,332 +191,335 @@ export default {
    methods: {
        initData() {
            $(function () {
-        $('#table').bootstrapTable('destroy');
-        $('#table').bootstrapTable({
-            columns: [
-                {field: 'id', title: 'id', align: 'center', width: '5%'},
-                {field: 'charmValueMin', title: '魅力值下限', align: 'center', width: '5%',},
-                {field: 'charmValueMax', title: '魅力值上限', align: 'center', width: '5%',},
-                {field: 'title', title: '帽子名称', align: 'center', width: '5%'},
-                {field: 'picSecond', title: '时长(秒)', align: 'center', width: '5%',},
-                {field: 'notifySwitch', title: '飘屏开关', align: 'center', width: '5%',
-                    formatter: function (val,row,index) {
-                        if (val == '0') {
-                            return '关'
-                        } else {
-                            return '开'
+                $('#table').bootstrapTable('destroy');
+                $('#table').bootstrapTable({
+                    columns: [
+                        { field: 'id', title: 'id', align: 'center', width: '5%' },
+                        { field: 'charmValueMin', title: '魅力值下限', align: 'center', width: '5%', },
+                        { field: 'charmValueMax', title: '魅力值上限', align: 'center', width: '5%', },
+                        { field: 'title', title: '帽子名称', align: 'center', width: '5%' },
+                        { field: 'picSecond', title: '时长(秒)', align: 'center', width: '5%', },
+                        {
+                            field: 'notifySwitch', title: '飘屏开关', align: 'center', width: '5%',
+                            formatter: function (val, row, index) {
+                                if (val == '0') {
+                                    return '关'
+                                } else {
+                                    return '开'
+                                }
+                            }
+                        },
+                        {
+                            field: 'notifyBackgroundUrl', title: '飘屏背景图片', align: 'center', width: '5%',
+                            formatter: function (val, row, index) {
+                                return "<img src='" + val + "' width='40' height='40'>";
+                            }
+                        },
+                        {
+                            field: 'id',
+                            title: '操作',
+                            align: 'center',
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                const JoinHandId = row.id
+                                const charmValueMin = row.charmValueMin
+                                const charmValueMax = row.charmValueMax
+                                const title = row.title
+                                const picSecond = row.picSecond
+                                const picUrl = row.picUrl
+                                const notifySwitch = row.notifySwitch
+                                const notifyBackgroundUrl = row.notifyBackgroundUrl
+                                console.log('JoinHandId·········', JoinHandId)
+                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" JoinHandId=' + JoinHandId + ' charmValueMin=' + charmValueMin + ' charmValueMax=' + charmValueMax +
+                                    ' title=' + title + ' picSecond=' + picSecond + ' picUrl=' + picUrl + ' notifySwitch=' + notifySwitch + ' notifyBackgroundUrl=' + notifyBackgroundUrl + '>' +
+                                    '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
+                                    '<button class="btn btn-sm btn-danger opt-remove" JoinHandId=' + JoinHandId +
+                                    '><i class="glyphicon glyphicon-remove"></i>删除</button>';
+                            }
                        }
-                    }
-                },
-                {field: 'notifyBackgroundUrl', title: '飘屏背景图片', align: 'center', width: '5%',
-                    formatter: function (val,row,index) {
-                        return "<img src='"+val+"' width='40' height='40'>";
-                    }
-                },
-                {
-                    field: 'id',
-                    title: '操作',
-                    align: 'center',
-                    width: '10%',
-                    formatter: function (val, row, index) {
-                        const JoinHandId = row.id
-                        const charmValueMin = row.charmValueMin
-                        const charmValueMax = row.charmValueMax
-                        const title = row.title
-                        const picSecond = row.picSecond
-                        const picUrl = row.picUrl
-                        const notifySwitch = row.notifySwitch
-                        const notifyBackgroundUrl = row.notifyBackgroundUrl
-                        console.log('JoinHandId·········', JoinHandId)
-                        return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" JoinHandId=' + JoinHandId + ' charmValueMin=' + charmValueMin + ' charmValueMax=' + charmValueMax +
-                            ' title=' + title + ' picSecond='+ picSecond + ' picUrl=' + picUrl + ' notifySwitch=' + notifySwitch + ' notifyBackgroundUrl=' + notifyBackgroundUrl + '>' +
-                            '<i class="glyphicon glyphicon-edit"></i> 编辑</button>'+
-                            '<button class="btn btn-sm btn-danger opt-remove" JoinHandId=' + JoinHandId +
-                            '><i class="glyphicon glyphicon-remove"></i>删除</button>';
-                    }
-                }
-            ],
-            undefinedText: 0,
-            cache: false,
-            striped: true,
-            showRefresh: false,
-            pageSize: 20,
-            pagination: true,
-            pageList: [20, 50, 100, 200, 300, 500],
-            search: false,
-            sidePagination: "server", //表示服务端请求
-            queryParamsType: "undefined",
-            queryParams: function queryParams(params) {   //设置查询参数
-                var param = {
-                    pageNum: params.pageNumber,
-                    pageSize: params.pageSize,
-                };
-                return param;
-            },
-            toolbar: '#toolbar',
-            url: '/admin/blindDate/listJoinHand.action',
-            onLoadSuccess: function (res) {  //加载成功时执行
-                console.log("load success");
-            },
-            onLoadError: function () {  //加载失败时执行
-                console.log("load fail");
-            }
-        });
-
-        // 查询刷新
-        $('#btnSearch').on('click', function () {
-            TableHelper.doRefresh('#table');
-        });
-
-
-        //新建标签
-        $("#addBtn").click(function () {
-            $("#modal_charmMin").val("");
-            $("#modal_charmMax").val("");
-            $('#modal_JoinHandTitle').val("");
-            $("#modal_picSecond").val('');
-            $("#picUrl").val("");
-            $('#picImage').attr("src", '');
-            $("#picImgInfo").html('');
-            $("#picUploadFile").val('');
-            $("#notifyBackgroundUrl").val("");
-            $('#notifyBackgroundUrlImage').attr("src", '');
-            $("#notifyBackgroundUrlImgInfo").html('');
-            $("#notifyBackgroundUrlUploadFile").val('');
-            $("#addJoinHandModal").modal('show');
-        });
-
-        //编辑
-        $('#table').on('click','.opt-edit', function () {
-            const JoinHandId = $(this).attr('JoinHandId');
-            const charmValueMin = $(this).attr('charmValueMin');
-            const charmValueMax = $(this).attr('charmValueMax');
-            const title = $(this).attr('title');
-            const picSecond = $(this).attr('picSecond');
-            const picUrl = $(this).attr('picUrl');
-            const notifySwitch = $(this).attr('notifySwitch');
-            const notifyBackgroundUrl = $(this).attr('notifyBackgroundUrl');
-            console.log("param======", JoinHandId, charmValueMin, charmValueMax, title, picSecond, picUrl, notifyBackgroundUrl)
-            $("#e_id").val(JoinHandId);
-            $("#e_modal_charmMin").val(charmValueMin);
-            $("#e_modal_charmMax").val(charmValueMax);
-            $('#e_modal_JoinHandTitle').val(title);
-            $("#e_modal_picSecond").val(picSecond);
-            $("#e_notifySwitch").val(notifySwitch);
-            // 设置图片
-            $("#e_picUploadFile").val('');
-            $('#e_picUrl').val(picUrl);
-            $('#e_picImage').attr("src", picUrl);
-            if (picUrl != '') {
-                $("#e_picImgInfo").html('已上传');
-            } else {
-                $("#e_picImgInfo").html('未上传');
-            }
-
-            $("#e_notifyBackgroundUrlUploadFile").val('');
-            $('#e_notifyBackgroundUrl').val(notifyBackgroundUrl);
-            $('#e_notifyBackgroundUrlImage').attr("src", notifyBackgroundUrl);
-
-            if (notifyBackgroundUrl != 'undefined' && notifyBackgroundUrl !== '') {
-                $("#e_notifyBackgroundUrlImgInfo").html('已上传');
-            } else {
-                $("#e_notifyBackgroundUrlImgInfo").html('未上传');
-            }
-            $("#updateJoinHandModal").modal('show');
-        });
-
-
-        // 编辑
-        $("#updateJoinHand").click(function () {
-            console.log("id", $("#e_id").val());
-            $.ajax({
-                type: "post",
-                url: "/admin/blindDate/addOrUpdateJoinHand.action",
-                data: $('#updateForm').serialize(),
-                dataType: "json",
-                success: function (json) {
-                    if (json.success) {
-                        $("#tipMsg").text("保存成功");
-                        $("#tipModal").modal('show');
-                        TableHelper.doRefresh("#table");
-                        $("#updateItemModal").modal('hide');
-                    } else {
-                        $("#tipMsg").text("保存失败." + json.message);
-                        $("#tipModal").modal('show');
-                    }
-                }
-            });
-        });
-
-
-        //删除
-        $('#table').on('click','.opt-remove', function () {
-            const JoinHandId = $(this).attr('JoinHandId');
-            console.log("id=======", JoinHandId)
-            if (confirm("你确认删除该场景吗?")) {
-                $.ajax({
-                    type: "get",
-                    url: "/admin/blindDate/delJoinHand.action",
-                    data: {
-                        id: JoinHandId,
+                    ],
+                    undefinedText: 0,
+                    cache: false,
+                    striped: true,
+                    showRefresh: false,
+                    pageSize: 20,
+                    pagination: true,
+                    pageList: [20, 50, 100, 200, 300, 500],
+                    search: false,
+                    sidePagination: "server", //表示服务端请求
+                    queryParamsType: "undefined",
+                    queryParams: function queryParams(params) {   //设置查询参数
+                        var param = {
+                            pageNum: params.pageNumber,
+                            pageSize: params.pageSize,
+                        };
+                        return param;
                    },
-                    dataType: "json",
-                    success: function (json) {
-                        if (json.success) {
-                            console.log(json.data)
-                            TableHelper.doRefresh("#table");
-                        } else {
-                            $("#tipMsg").text("删除帽子失败." + json.message);
-                        }
+                    toolbar: '#toolbar',
+                    url: '/admin/blindDate/listJoinHand.action',
+                    onLoadSuccess: function (res) {  //加载成功时执行
+                        console.log("load success");
+                    },
+                    onLoadError: function () {  //加载失败时执行
+                        console.log("load fail");
                    }
+                });
+
+                // 查询刷新
+                $('#btnSearch').on('click', function () {
+                    TableHelper.doRefresh('#table');
+                });
+
+
+                //新建标签
+                $("#addBtn").click(function () {
+                    $("#modal_charmMin").val("");
+                    $("#modal_charmMax").val("");
+                    $('#modal_JoinHandTitle').val("");
+                    $("#modal_picSecond").val('');
+                    $("#picUrl").val("");
+                    $('#picImage').attr("src", '');
+                    $("#picImgInfo").html('');
+                    $("#picUploadFile").val('');
+                    $("#notifyBackgroundUrl").val("");
+                    $('#notifyBackgroundUrlImage').attr("src", '');
+                    $("#notifyBackgroundUrlImgInfo").html('');
+                    $("#notifyBackgroundUrlUploadFile").val('');
+                    $("#addJoinHandModal").modal('show');
+                });
+
+                //编辑
+                $('#table').on('click', '.opt-edit', function () {
+                    const JoinHandId = $(this).attr('JoinHandId');
+                    const charmValueMin = $(this).attr('charmValueMin');
+                    const charmValueMax = $(this).attr('charmValueMax');
+                    const title = $(this).attr('title');
+                    const picSecond = $(this).attr('picSecond');
+                    const picUrl = $(this).attr('picUrl');
+                    const notifySwitch = $(this).attr('notifySwitch');
+                    const notifyBackgroundUrl = $(this).attr('notifyBackgroundUrl');
+                    console.log("param======", JoinHandId, charmValueMin, charmValueMax, title, picSecond, picUrl, notifyBackgroundUrl)
+                    $("#e_id").val(JoinHandId);
+                    $("#e_modal_charmMin").val(charmValueMin);
+                    $("#e_modal_charmMax").val(charmValueMax);
+                    $('#e_modal_JoinHandTitle').val(title);
+                    $("#e_modal_picSecond").val(picSecond);
+                    $("#e_notifySwitch").val(notifySwitch);
+                    // 设置图片
+                    $("#e_picUploadFile").val('');
+                    $('#e_picUrl').val(picUrl);
+                    $('#e_picImage').attr("src", picUrl);
+                    if (picUrl != '') {
+                        $("#e_picImgInfo").html('已上传');
+                    } else {
+                        $("#e_picImgInfo").html('未上传');
+                    }
+
+                    $("#e_notifyBackgroundUrlUploadFile").val('');
+                    $('#e_notifyBackgroundUrl').val(notifyBackgroundUrl);
+                    $('#e_notifyBackgroundUrlImage').attr("src", notifyBackgroundUrl);
+
+                    if (notifyBackgroundUrl != 'undefined' && notifyBackgroundUrl !== '') {
+                        $("#e_notifyBackgroundUrlImgInfo").html('已上传');
+                    } else {
+                        $("#e_notifyBackgroundUrlImgInfo").html('未上传');
+                    }
+                    $("#updateJoinHandModal").modal('show');
+                });
+
+
+                // 编辑
+                $("#updateJoinHand").click(function () {
+                    console.log("id", $("#e_id").val());
+                    $.ajax({
+                        type: "post",
+                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        data: $('#updateForm').serialize(),
+                        dataType: "json",
+                        success: function (json) {
+                            if (json.success) {
+                                $("#tipMsg").text("保存成功");
+                                $("#tipModal").modal('show');
+                                TableHelper.doRefresh("#table");
+                                $("#updateJoinHandModal").modal('hide');
+                            } else {
+                                $("#tipMsg").text("保存失败." + json.message);
+                                $("#tipModal").modal('show');
+                            }
+                        }
+                    });
+                });
+
+
+                //删除
+                $('#table').on('click', '.opt-remove', function () {
+                    const JoinHandId = $(this).attr('JoinHandId');
+                    console.log("id=======", JoinHandId)
+                    if (confirm("你确认删除该场景吗?")) {
+                        $.ajax({
+                            type: "get",
+                            url: "/admin/blindDate/delJoinHand.action",
+                            data: {
+                                id: JoinHandId,
+                            },
+                            dataType: "json",
+                            success: function (json) {
+                                if (json.success) {
+                                    console.log(json.data)
+                                    TableHelper.doRefresh("#table");
+                                } else {
+                                    $("#tipMsg").text("删除帽子失败." + json.message);
+                                }
+                            }
+                        })
+                    }
+                });
+
+                // 新增
+                $("#add-JoinHand").click(function () {
+                    $.ajax({
+                        type: "post",
+                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        data: $('#addForm').serialize(),
+                        dataType: "json",
+                        success: function (json) {
+                            if (json.success) {
+                                $("#tipMsg").text("保存成功");
+                                $("#tipModal").modal('show');
+                                TableHelper.doRefresh("#table");
+                                $("#addJoinHandModal").modal('hide');
+                            } else {
+                                $("#tipMsg").text("保存失败." + json.message);
+                                $("#tipModal").modal('show');
+                            }
+                        }
+                    });
+                });
+
+                $('#picUploadBtn').on('click', function () {
+                    $.ajaxFileUpload({
+                        fileElementId: 'picUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                        url: '/admin/blindDate/upload', //后台方法的路径
+                        type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                        dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                        secureuri: false,   //是否启用安全提交，默认为false。
+                        async: true,   //是否是异步
+                        success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                            if (json.path) {
+                                $('#picUrl').val(json.path);
+                                $('#picImage').attr("src", json.path);
+                                if (json.path != '') {
+                                    $("#picImgInfo").html('已上传成功');
+                                } else {
+                                    $("#picImgInfo").html('未上传成功');
+                                }
+                                console.log(json.path);
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        },
+                        error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                            console.error(e);
+                        }
+                    });
                })
-            }
-        });

-        // 新增
-        $("#add-JoinHand").click(function () {
-            $.ajax({
-                type: "post",
-                url: "/admin/blindDate/addOrUpdateJoinHand.action",
-                data: $('#addForm').serialize(),
-                dataType: "json",
-                success: function (json) {
-                    if (json.success) {
-                        $("#tipMsg").text("保存成功");
-                        $("#tipModal").modal('show');
-                        TableHelper.doRefresh("#table");
-                    } else {
-                        $("#tipMsg").text("保存失败." + json.message);
-                        $("#tipModal").modal('show');
-                    }
-                }
-            });
-        });
+                $('#e_picUploadBtn').on('click', function () {
+                    $.ajaxFileUpload({
+                        fileElementId: 'e_picUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                        url: '/admin/blindDate/upload', //后台方法的路径
+                        type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                        dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                        secureuri: false,   //是否启用安全提交，默认为false。
+                        async: true,   //是否是异步
+                        success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                            if (json.path) {
+                                $('#e_picUrl').val(json.path);
+                                $('#e_picImage').attr("src", json.path);
+                                if (json.path != '') {
+                                    $("#picImgInfo").html('已上传成功');
+                                } else {
+                                    $("#picImgInfo").html('未上传成功');
+                                }
+                                console.log(json.path);

-        $('#picUploadBtn').on('click', function () {
-            $.ajaxFileUpload({
-                fileElementId: 'picUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
-                url: '/admin/blindDate/upload', //后台方法的路径
-                type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                secureuri: false,   //是否启用安全提交，默认为false。
-                async: true,   //是否是异步
-                success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
-                    if (json.path) {
-                        $('#picUrl').val(json.path);
-                        $('#picImage').attr("src", json.path);
-                        if (json.path != '') {
-                            $("#picImgInfo").html('已上传成功');
-                        } else {
-                            $("#picImgInfo").html('未上传成功');
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        },
+                        error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                            console.error(e);
                        }
-                        console.log(json.path);
-                    } else {
-                        $("#tipMsg").text(json.msg);
-                        $("#tipModal").modal('show');
-                    }
-                },
-                error: function (data, status, e) {  //提交失败自动执行的处理函数。
-                    console.error(e);
-                }
-            });
-        })
+                    });
+                })

-        $('#e_picUploadBtn').on('click', function () {
-            $.ajaxFileUpload({
-                fileElementId: 'e_picUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
-                url: '/admin/blindDate/upload', //后台方法的路径
-                type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                secureuri: false,   //是否启用安全提交，默认为false。
-                async: true,   //是否是异步
-                success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
-                    if (json.path) {
-                        $('#e_picUrl').val(json.path);
-                        $('#e_picImage').attr("src", json.path);
-                        if (json.path != '') {
-                            $("#picImgInfo").html('已上传成功');
-                        } else {
-                            $("#picImgInfo").html('未上传成功');
+
+                $('#notifyBackgroundUrlUploadBtn').on('click', function () {
+                    $.ajaxFileUpload({
+                        fileElementId: 'notifyBackgroundUrlUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                        url: '/admin/blindDate/upload', //后台方法的路径
+                        type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                        dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                        secureuri: false,   //是否启用安全提交，默认为false。
+                        async: true,   //是否是异步
+                        success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                            if (json.path) {
+                                $('#notifyBackgroundUrl').val(json.path);
+                                $('#notifyBackgroundUrlImage').attr("src", json.path);
+                                if (json.path != '') {
+                                    $("#notifyBackgroundUrlImgInfo").html('已上传成功');
+                                } else {
+                                    $("#notifyBackgroundUrlImgInfo").html('未上传成功');
+                                }
+                                console.log(json.path);
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        },
+                        error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                            console.error(e);
                        }
-                        console.log(json.path);
+                    });
+                })

-                    } else {
-                        $("#tipMsg").text(json.msg);
-                        $("#tipModal").modal('show');
-                    }
-                },
-                error: function (data, status, e) {  //提交失败自动执行的处理函数。
-                    console.error(e);
-                }
-            });
-        })
-
-
-        $('#notifyBackgroundUrlUploadBtn').on('click', function () {
-            $.ajaxFileUpload({
-                fileElementId: 'notifyBackgroundUrlUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
-                url: '/admin/blindDate/upload', //后台方法的路径
-                type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                secureuri: false,   //是否启用安全提交，默认为false。
-                async: true,   //是否是异步
-                success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
-                    if (json.path) {
-                        $('#notifyBackgroundUrl').val(json.path);
-                        $('#notifyBackgroundUrlImage').attr("src", json.path);
-                        if (json.path != '') {
-                            $("#notifyBackgroundUrlImgInfo").html('已上传成功');
-                        } else {
-                            $("#notifyBackgroundUrlImgInfo").html('未上传成功');
+                $('#e_notifyBackgroundUrlUploadBtn').on('click', function () {
+                    $.ajaxFileUpload({
+                        fileElementId: 'e_notifyBackgroundUrlUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                        url: '/admin/blindDate/upload', //后台方法的路径
+                        type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                        dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                        secureuri: false,   //是否启用安全提交，默认为false。
+                        async: true,   //是否是异步
+                        success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                            if (json.path) {
+                                $('#e_notifyBackgroundUrl').val(json.path);
+                                $('#e_notifyBackgroundUrlImage').attr("src", json.path);
+                                if (json.path != '') {
+                                    $("#e_notifyBackgroundUrlImgInfo").html('已上传成功');
+                                } else {
+                                    $("#e_notifyBackgroundUrlImgInfo").html('未上传成功');
+                                }
+                                console.log(json.path);
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        },
+                        error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                            console.error(e);
                        }
-                        console.log(json.path);
-                    } else {
-                        $("#tipMsg").text(json.msg);
-                        $("#tipModal").modal('show');
-                    }
-                },
-                error: function (data, status, e) {  //提交失败自动执行的处理函数。
-                    console.error(e);
-                }
+                    });
+                })
+
+
            });
-        })
-
-        $('#e_notifyBackgroundUrlUploadBtn').on('click', function () {
-            $.ajaxFileUpload({
-                fileElementId: 'e_notifyBackgroundUrlUploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
-                url: '/admin/blindDate/upload', //后台方法的路径
-                type: 'post',   //当要提交自定义参数时，这个参数要设置成post
-                dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
-                secureuri: false,   //是否启用安全提交，默认为false。
-                async: true,   //是否是异步
-                success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
-                    if (json.path) {
-                        $('#e_notifyBackgroundUrl').val(json.path);
-                        $('#e_notifyBackgroundUrlImage').attr("src", json.path);
-                        if (json.path != '') {
-                            $("#e_notifyBackgroundUrlImgInfo").html('已上传成功');
-                        } else {
-                            $("#e_notifyBackgroundUrlImgInfo").html('未上传成功');
-                        }
-                        console.log(json.path);
-                    } else {
-                        $("#tipMsg").text(json.msg);
-                        $("#tipModal").modal('show');
-                    }
-                },
-                error: function (data, status, e) {  //提交失败自动执行的处理函数。
-                    console.error(e);
-                }
-            });
-        })
-
-
-    });
        }
    },
+
 };
 </script>

-<style scoped>
-</style>
+<style scoped></style>
--- a/src/views/callbattle/ActCallBattleItemAdminView.vue
+++ b/src/views/callbattle/ActCallBattleItemAdminView.vue
@@ -570,6 +570,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/callbattle/ActCallBattlePlatformAdminView.vue
+++ b/src/views/callbattle/ActCallBattlePlatformAdminView.vue
@@ -156,6 +156,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/callbattle/ActCallBattleRecordAdminView.vue
+++ b/src/views/callbattle/ActCallBattleRecordAdminView.vue
@@ -290,6 +290,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/callbattle/ActCallBattleUserStatAdminView.vue
+++ b/src/views/callbattle/ActCallBattleUserStatAdminView.vue
@@ -133,6 +133,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/car/CarAdminView.vue
+++ b/src/views/car/CarAdminView.vue
@@ -267,6 +267,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/car/CarGoodsAdminView.vue
+++ b/src/views/car/CarGoodsAdminView.vue
@@ -594,6 +594,15 @@ export default {
                    $("#radishRenewPrice").val("");
                    $("#radishOriginalPrice").val("");

+                    $("input:radio[name='goldSale']")[0].checked = true;
+                    $("input:radio[name='radishSale']")[0].checked = true;
+                    $("input:radio[name='enable']")[0].checked = true;
+                    $("input:radio[name='isSale']")[0].checked = true;  
+                    $("input:radio[name='isNobleLimit']")[0].checked = true;
+                    $("input:radio[name='isMonsterLimit']")[0].checked = true;
+                    $("input:radio[name='isWeekStarLimit']")[0].checked = true;
+                    $("input:radio[name='isActivityLimit']")[0].checked = true;
+                    
                    $("#nobleId").btComboBox('disable');
                    ComboboxHelper.setDef("#nobleId", '0');

@@ -1026,6 +1035,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/car/CarRecordView.vue
+++ b/src/views/car/CarRecordView.vue
@@ -114,6 +114,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/car/CarStatisticsView.vue
+++ b/src/views/car/CarStatisticsView.vue
@@ -115,16 +115,17 @@ export default {
                    autoclose: true
                });
                picker1.on('changeDate', function () {
-                    var date = $('#beginDate').datepicker('getDate');
-                    picker2.datepicker('setStartDate', date);
+                    var date = $('#beginDate').datetimepicker('getDate');
+                    picker2.datetimepicker('setStartDate', date);
                });
                picker2.on('changeDate', function () {
-                    var date = $('#endDate').datepicker('getDate');
-                    picker1.datepicker('setEndDate', date);
+                    var date = $('#endDate').datetimepicker('getDate');
+                    picker1.datetimepicker('setEndDate', date);
                });
            });
        }
    },
+
 };
 </script>

--- a/src/views/channel/ChannelContentPartitionAdminView.vue
+++ b/src/views/channel/ChannelContentPartitionAdminView.vue
@@ -489,6 +489,7 @@ export default {

        }
    },
+
 };
 </script>

--- a/src/views/charge/ChargeRegionView.vue
+++ b/src/views/charge/ChargeRegionView.vue
@@ -307,7 +307,24 @@ export default {
                $('#channelTable').bootstrapTable('destroy');
                $('#channelTable').bootstrapTable({
                    columns: [
-                        { field: 'desc', title: '渠道名称', align: 'center', width: '5%' },
+                        { field: 'payChannel', title: '合作方', align: 'center', width: '5%' },
+                        { 
+                            field: 'desc', 
+                            title: '渠道名称', 
+                            align: 'center',
+                            width: '5%',
+                            formatter: function (val, row, index) {
+                                let color = 'black';
+                                if (val == 'MyCard點數卡' || val == 'MyCard會員點數' || val == 'MyCard Paypal' || val == '信用卡' || val == '悠遊付' || val == 'ezPay 簡單付' || val == '台灣Pay' || val == 'icash Pay' || val == 'Pi 拍錢包' || val == '全支付' || val == 'LINE Pay') {
+                                    color = 'green';
+                                } else if (val == '電子支付' || val == '銀行轉賬') {
+                                    color = 'blue';
+                                } else if (val == '市內電話帳單' || val == '行動電話帳單' || val == '電信數據ADSL帳單') {
+                                    color = 'orange';
+                                }
+                                return '<span style="color:' + color + ';">' + val + '</span>';
+                            }
+                        },
                        {
                            field: 'logo',
                            title: '图标',
@@ -711,6 +728,10 @@ export default {
            });
        }
    },
+    unmounted() {
+        $('#regionTable').bootstrapTable('destroy');
+        $('#channelTable').bootstrapTable('destroy');
+    }
 };
 </script>

--- a/src/views/charge/ChargeUserLimitView.vue
+++ b/src/views/charge/ChargeUserLimitView.vue
@@ -272,6 +272,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/charge/FirstChargeRewardConfigView.vue
+++ b/src/views/charge/FirstChargeRewardConfigView.vue
@@ -482,6 +482,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/charge/FirstChargeRewardRecordView.vue
+++ b/src/views/charge/FirstChargeRewardRecordView.vue
@@ -257,6 +257,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/charge/RedeemcodeAdminView.vue
+++ b/src/views/charge/RedeemcodeAdminView.vue
@@ -197,6 +197,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/chatbubble/ChatbubbleManageView.vue
+++ b/src/views/chatbubble/ChatbubbleManageView.vue
@@ -471,6 +471,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/chatbubble/ChatbubbleRecordView.vue
+++ b/src/views/chatbubble/ChatbubbleRecordView.vue
@@ -200,6 +200,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/discovery/DiscoveryAdminView.vue
+++ b/src/views/discovery/DiscoveryAdminView.vue
@@ -548,6 +548,7 @@ export default {
            });
        }
    },
+
 };

 function clearForm(formId) {
--- a/src/views/dressShop/DressShopAdminView.vue
+++ b/src/views/dressShop/DressShopAdminView.vue
@@ -407,6 +407,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/face/FaceJsonAdminView.vue
+++ b/src/views/face/FaceJsonAdminView.vue
@@ -815,6 +815,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/family/FamilyAdminView.vue
+++ b/src/views/family/FamilyAdminView.vue
@@ -773,6 +773,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/family/FamilyMemberAdminView.vue
+++ b/src/views/family/FamilyMemberAdminView.vue
@@ -201,6 +201,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/family/FamilyMoneyAdminView.vue
+++ b/src/views/family/FamilyMoneyAdminView.vue
@@ -472,6 +472,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/family/FamilyStatisticsView.vue
+++ b/src/views/family/FamilyStatisticsView.vue
@@ -143,6 +143,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/finance/FinanceStatisticsView.vue
+++ b/src/views/finance/FinanceStatisticsView.vue
@@ -185,6 +185,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/findlove/FindLovePlatformPrizeDataAdminView.vue
+++ b/src/views/findlove/FindLovePlatformPrizeDataAdminView.vue
@@ -228,6 +228,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/findlove/FindLovePoolItemAdminView.vue
+++ b/src/views/findlove/FindLovePoolItemAdminView.vue
@@ -823,6 +823,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/findlove/FindLovePrizeDrawRecordAdminView.vue
+++ b/src/views/findlove/FindLovePrizeDrawRecordAdminView.vue
@@ -147,6 +147,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/firstpage/FirstPageActivityBannerView.vue
+++ b/src/views/firstpage/FirstPageActivityBannerView.vue
@@ -959,6 +959,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/firstpage/FirstPageBannerView.vue
+++ b/src/views/firstpage/FirstPageBannerView.vue
@@ -977,6 +977,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/firstpage/FirstPageOptView.vue
+++ b/src/views/firstpage/FirstPageOptView.vue
@@ -342,6 +342,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/src/views/firstpage/FirstPageTabRoomView.vue
+++ b/src/views/firstpage/FirstPageTabRoomView.vue
@@ -571,6 +571,7 @@ export default {
            });
        }
    },
+
 };
 </script>

--- a/src/views/firstpage/FirstPageTabView.vue
+++ b/src/views/firstpage/FirstPageTabView.vue
@@ -476,6 +476,7 @@ export default {
            })
        }
    },
+
 };
 </script>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
liaozetao	ce7ed33f03	时间样式	2024-02-27 21:39:15 +08:00
liaozetao	d20ba9e3a3	轮次持续时间展示问题	2024-02-27 21:39:15 +08:00
liaozetao	8b744fbc0a	修复白名单展示	2024-02-27 21:39:14 +08:00
liaozetao	78a0896e99	修复白名单ID	2024-02-27 21:39:14 +08:00
Dragon	c3e24aae51	修复查询异常问题	2024-02-27 21:39:13 +08:00
liaozetao	3aa9d98aa2	修复设置白名单	2024-02-27 21:39:13 +08:00
liaozetao	5d13b68c5a	修复查询参数	2024-02-27 21:39:13 +08:00
liaozetao	b900c5fe83	修复导出问题	2024-02-27 21:39:12 +08:00
liaozetao	cfeceed259	修复展示问题	2024-02-27 21:39:12 +08:00
liaozetao	a9fedeccf2	处理获奖展示	2024-02-27 21:39:12 +08:00
liaozetao	624afcc90a	修复设置白名单后重新渲染	2024-02-27 21:39:11 +08:00
liaozetao	1a3f6137cb	修复白名单数量	2024-02-27 21:39:11 +08:00
liaozetao	05721d3916	添加白名单数量判断	2024-02-27 21:39:10 +08:00
liaozetao	3a52b34239	修改按钮颜色	2024-02-27 21:39:10 +08:00
liaozetao	782989b3c8	修复设置完后刷新问题	2024-02-27 21:39:09 +08:00
liaozetao	e5a2bd8433	修复设置白名单	2024-02-27 21:39:09 +08:00
liaozetao	04d23c58de	返回轮次ID	2024-02-27 21:39:08 +08:00
liaozetao	72649778a5	修复查询问题	2024-02-27 21:39:08 +08:00
Dragon	e850d11175	调用初始化接口	2024-02-27 21:39:07 +08:00
Dragon	f78e1c10b7	修复bug，新增ts，去除黄色警告	2024-02-27 21:39:06 +08:00
Dragon	4ed3d88e1e	完善许愿管理剩余接口	2024-02-27 21:39:06 +08:00
liaozetao	ccc03895a7	新增许愿轮次记录	2024-02-27 21:39:05 +08:00
Dragon	b38614c45e	新增许愿之星	2024-02-27 21:39:04 +08:00
liaozetao	74b32be861	去除id默認值0	2024-02-23 17:27:34 +08:00
liaozetao	e5f78df6e5	修改時間各式	2024-02-23 17:22:34 +08:00
liaozetao	3c5ea1a5e0	展示置顶时间	2024-02-23 16:47:28 +08:00
liaozetao	8019555459	修复roomUid问题	2024-02-23 16:17:19 +08:00
liaozetao	a5996c3db8	去除tab不能删除逻辑	2024-02-23 15:42:25 +08:00
liaozetao	681d7f7a5c	修复数据回显问题	2024-02-23 15:37:52 +08:00
liaozetao	52f4d6277c	添加时间组件	2024-02-23 15:03:11 +08:00
liaozetao	bc4c36bdc8	修改校验逻辑	2024-02-23 14:29:51 +08:00
liaozetao	5fa717465e	修改判斷邏輯	2024-02-21 17:59:02 +08:00
liaozetao	889bb2363e	修改toast提示	2024-02-21 17:59:01 +08:00
liaozetao	1111d4782e	标题判断逻辑	2024-02-21 17:59:01 +08:00
liaozetao	96ad03efb9	修复展示问题	2024-02-21 17:59:01 +08:00
liaozetao	49cdeb7407	修改版本判断逻辑	2024-02-21 17:59:01 +08:00
liaozetao	80dca35881	新增app原生固定编码	2024-02-20 14:29:16 +08:00
liaozetao	c7d6455c16	修复台湾货币保存	2024-02-20 10:18:43 +08:00
liaozetao	b2cd8d5b75	新增台湾地区银行	2024-02-19 16:45:42 +08:00
liaozetao	f6740bf1ca	设置时间必填项	2024-02-18 16:11:55 +08:00
liaozetao	ec30e516a0	修改开屏设置时间问题	2024-02-18 15:50:08 +08:00
liaozetao	a962dbc669	线性福袋	2024-02-05 20:46:57 +08:00
liaozetao	dab97ce8ae	新增mycard字段	2024-01-31 12:42:07 +08:00
liaozetao	3fbb4e287e	修改窗口长度滚动	2024-01-24 18:39:32 +08:00
liaozetao	1096194250	修改loading尺寸	2024-01-24 18:39:32 +08:00
liaozetao	6ad1b136a8	修改高度	2024-01-24 18:39:32 +08:00
liaozetao	f5a30e7a04	修改大小	2024-01-24 18:39:32 +08:00
liaozetao	62e8a2239f	补充	2024-01-24 18:39:32 +08:00
liaozetao	0c17ceffce	新增loading图	2024-01-24 18:39:32 +08:00
liaozetao	1cb752be00	修改时间长度	2024-01-24 18:39:32 +08:00
liaozetao	62211d9cf4	去除添加功能	2024-01-24 18:39:06 +08:00
liaozetao	bf9de20556	修复表单提交问题	2024-01-24 18:38:05 +08:00
liaozetao	7185f8f77a	修復鏈接回線問題	2024-01-24 18:32:58 +08:00
liaozetao	7d5fcd1494	修改鏈接展示邏輯	2024-01-24 18:32:58 +08:00
liaozetao	d462f6bbde	修改上傳按鈕邏輯	2024-01-24 18:32:57 +08:00
liaozetao	b470859daa	修改刪除按鈕邏輯	2024-01-24 18:32:57 +08:00
liaozetao	e3c82bcf92	打印日誌	2024-01-24 18:32:57 +08:00
liaozetao	ef022da215	清空鏈接處理	2024-01-24 18:32:57 +08:00
liaozetao	82dc883119	修復編輯回線	2024-01-24 18:32:57 +08:00
liaozetao	bf1ae344e3	修復查詢問題	2024-01-24 18:32:57 +08:00
liaozetao	eb10bdb44d	修改上傳組件按鈕	2024-01-24 18:32:57 +08:00
liaozetao	b52de9a90d	刪除多餘代碼	2024-01-24 18:32:57 +08:00
liaozetao	2a4929b476	修改上傳組件	2024-01-24 18:32:57 +08:00
liaozetao	9433dd254f	修復view name問題	2024-01-24 18:32:57 +08:00
liaozetao	c206b17acb	修复报错	2024-01-24 18:32:57 +08:00
liaozetao	8d21755335	新增官网配置页面	2024-01-24 18:32:57 +08:00
liaozetao	d8593c736d	修改名称	2024-01-22 15:57:10 +08:00
liaozetao	9258f46bdb	处理电话账单	2024-01-22 14:08:52 +08:00
liaozetao	12c3ad1e6e	修复编辑问题	2024-01-22 11:25:53 +08:00
liaozetao	451f778732	修复上传组件问题	2024-01-20 19:00:04 +08:00
liaozetao	68d7433a05	修复表单提交问题	2024-01-20 17:47:30 +08:00
liaozetao	dcc8e081ee	修复开屏广告配置问题	2024-01-20 15:37:02 +08:00
liaozetao	fc705cbc01	新增公会名称字段	2024-01-15 15:24:00 +08:00
liaozetao	7072376da6	新增平台号搜索	2024-01-15 14:23:52 +08:00
liaozetao	368550d4b8	修改时间格式化	2024-01-12 15:13:52 +08:00
liaozetao	60f349060d	新增修改事件	2024-01-12 12:03:13 +08:00
liaozetao	a5b21a28e0	修复事件失效问题	2024-01-11 19:04:31 +08:00
liaozetao	0b3aa136f9	补充5	2024-01-11 19:00:19 +08:00
liaozetao	c46de130c6	修复奖品设置	2024-01-11 18:55:56 +08:00
liaozetao	c184753083	补充4	2024-01-11 18:48:23 +08:00
liaozetao	6a55b37490	补充3	2024-01-11 18:21:14 +08:00
liaozetao	4b4185f71d	修改事件加载问题	2024-01-11 18:11:03 +08:00
liaozetao	7371a1654a	将事件迁移	2024-01-11 17:53:53 +08:00
liaozetao	e3bb745a92	补充	2024-01-11 17:33:31 +08:00
liaozetao	eb2920b62b	修复报错	2024-01-11 17:28:33 +08:00
liaozetao	270ef2e0e1	修复字段报错	2024-01-11 17:14:45 +08:00
Dragon	b7cc65001f	访问白名单新增操作人字段	2024-01-10 15:34:44 +08:00
liaozetao	dbf84bf7c8	修复时间问题	2024-01-10 15:00:58 +08:00
khalil	9d98c1afd8	寻爱之旅-后台-去掉废弃接口	2024-01-09 18:02:36 +08:00
liaozetao	f6845854a1	修复vgg问题	2024-01-09 15:56:44 +08:00
liaozetao	dbb193c7e9	补充2	2024-01-09 15:51:32 +08:00
liaozetao	71e44300a4	补充	2024-01-09 15:48:42 +08:00
liaozetao	39f1ad026c	修改上传代码	2024-01-09 15:48:27 +08:00
liaozetao	fdc01127e2	修补选择组件	2024-01-09 12:11:42 +08:00
liaozetao	faf0250aae	补充	2024-01-08 17:30:11 +08:00
liaozetao	1526875c7f	修复工具类问题	2024-01-08 17:08:31 +08:00
liaozetao	56df854368	优化私聊查询	2024-01-04 19:02:10 +08:00
liaozetao	7f15427638	超过高度滚动	2024-01-02 18:32:18 +08:00
liaozetao	0586ef3e55	修改mp4	2024-01-02 18:29:34 +08:00
liaozetao	d65e4eb701	修改视图展示	2024-01-02 18:23:17 +08:00
liaozetao	c050d4a338	添加遮罩层	2024-01-02 18:11:11 +08:00
liaozetao	11f0ca3dbd	添加遮罩层	2024-01-02 16:03:17 +08:00
liaozetao	f40a401b2b	超出换行	2023-12-28 18:49:43 +08:00
liaozetao	25ed55eac6	补充2	2023-12-28 18:42:21 +08:00
liaozetao	789d71d7c2	补充	2023-12-28 18:31:57 +08:00
liaozetao	51fa966457	修复超管展示问题	2023-12-28 18:19:45 +08:00
liaozetao	b2334b4e5f	新用户送礼流水	2023-12-28 11:47:17 +08:00
liaozetao	bf909cfa0f	渠道展示颜色	2023-12-27 17:40:38 +08:00
liaozetao	1f7dc304fd	修复置顶问题	2023-12-27 17:31:53 +08:00
liaozetao	b5d8eeebfe	新增合作方字段	2023-12-26 18:55:31 +08:00
liaozetao	2940c9dc0a	去除提示	2023-12-21 20:13:53 +08:00
Dragon	e2c34e5863	修复房间流水筛选bug	2023-12-20 14:50:49 +08:00
liaozetao	ac415d1bcb	修复查询逻辑	2023-12-18 16:52:32 +08:00
liaozetao	61f9575255	窗口未关闭问题	2023-12-18 16:44:04 +08:00
liaozetao	ef4e04286b	增加人气礼物类型	2023-12-15 10:21:16 +08:00
liaozetao	32ad54e4e3	补充	2023-12-13 17:45:10 +08:00
liaozetao	6ff8e23e59	修改礼物类型组件	2023-12-13 17:23:31 +08:00
liaozetao	c60c28efa2	调整样式	2023-12-11 12:37:00 +08:00
liaozetao	86e62d8d40	添加忽视版本和渠道字段	2023-12-11 10:47:26 +08:00
liaozetao	b25b59615e	修改默认选中	2023-12-11 10:28:00 +08:00
liaozetao	ff6bd4a91f	修改礼物默认类型	2023-12-11 10:14:18 +08:00
liaozetao	d20a59e843	补充	2023-12-08 15:37:19 +08:00
liaozetao	94dbb140fb	修改礼物类型默认值	2023-12-08 15:16:13 +08:00
liaozetao	864687bdab	修改礼物管理默认值	2023-12-08 15:13:04 +08:00
liaozetao	e11bf2a439	修改铭牌配置为动态获取	2023-12-06 15:31:26 +08:00
liaozetao	053be766c9	修复按钮问题	2023-12-05 11:51:10 +08:00
Dragon	3f0839f434	新增地区访问简体中文判断条件	2023-12-04 17:54:43 +08:00
Dragon	a7a1e080f3	新增语言转换	2023-12-04 17:05:30 +08:00
Dragon	5171520e65	修复报错问题，更改渲染格式	2023-12-04 15:01:35 +08:00
Dragon	73bddf774b	新增访问限制字段和弹窗	2023-12-04 14:20:20 +08:00
liaozetao	7d794a0fff	修复礼物默认选中逻辑	2023-11-29 17:21:34 +08:00
liaozetao	16503488c1	修改字段名	2023-11-28 11:17:33 +08:00
liaozetao	ff850ee37a	去除授权码	2023-11-27 16:31:14 +08:00
Dragon	cdfecefa12	修复地点为时间	2023-11-27 16:16:55 +08:00
Dragon	abf81518fe	修复白名单错别字	2023-11-27 16:15:23 +08:00
Dragon	1431dff97b	修改错别字	2023-11-27 16:12:28 +08:00
liaozetao	8d6efb8efb	邀请码管理增加填写类型来源	2023-11-27 15:04:39 +08:00
liaozetao	b3defa71d1	删除奇怪的文件	2023-11-27 14:56:23 +08:00
liaozetao	83a4ed0c9e	修复手机号缺少86	2023-11-23 14:27:50 +08:00
Dragon	1148e4b35d	修复全局上传文件按钮影响	2023-11-23 14:27:50 +08:00
Dragon	3aacfea299	完善分页	2023-11-23 14:27:49 +08:00
Dragon	90a732b4f4	修复假如白名单传参异常问题	2023-11-23 14:27:49 +08:00
Dragon	24f6702101	修复字段名错误问题	2023-11-23 14:27:49 +08:00
Dragon	ddcfd8c7ec	修复列表展示文案，以及字眼错误问题	2023-11-23 14:27:48 +08:00
Dragon	0cf6366dbd	修改post请求方式	2023-11-23 14:27:48 +08:00
Dragon	ac9756cf08	完成白名单以及地区访问限制	2023-11-23 14:27:47 +08:00
Dragon	6d8117050c	白名单功能暂存	2023-11-23 14:27:47 +08:00
liaozetao	9ee10ef721	修改菜单查询逻辑	2023-11-23 10:36:00 +08:00
liaozetao	ef3a28e686	修改单线比刷新逻辑	2023-11-22 17:11:40 +08:00
liaozetao	fc6a53122c	修复查询字段	2023-11-22 15:25:01 +08:00
liaozetao	5179669fb1	修复代码报错	2023-11-21 17:59:09 +08:00
liaozetao	271d3ad2b3	修復編輯回線問題	2023-11-21 16:29:31 +08:00
liaozetao	972816b94b	暫時去除緩存	2023-11-21 16:20:39 +08:00
liaozetao	eea217af60	修复渠道展示问题	2023-11-21 15:59:25 +08:00
liaozetao	376a72fdb2	修复跳转类型	2023-11-21 15:59:25 +08:00
liaozetao	fa47d94a96	修复开屏跳转类型	2023-11-21 15:59:25 +08:00
liaozetao	babe71973b	开屏设置默认开启	2023-11-21 15:59:25 +08:00
liaozetao	bbd7e21197	修复闪屏逻辑	2023-11-21 15:59:25 +08:00
liaozetao	0356944be5	修复上传按钮	2023-11-21 15:59:25 +08:00
liaozetao	c5196494ea	手机授权页面增加字段	2023-11-21 15:59:25 +08:00
liaozetao	80f5f05ea0	上传文件增加遮罩层	2023-11-21 15:59:25 +08:00
liaozetao	a2f10cc41f	修改file文件上传判断	2023-11-21 15:59:25 +08:00
liaozetao	339e3f5ba9	补充	2023-11-21 15:59:25 +08:00
liaozetao	908047e40b	修复展示类型	2023-11-21 15:59:25 +08:00
liaozetao	545a86ed54	判断不允许重复发请求	2023-11-21 15:59:25 +08:00
liaozetao	14c2e701a0	删除日志	2023-11-21 15:59:25 +08:00
liaozetao	211f4f51fa	修复按钮展示问题	2023-11-21 15:59:25 +08:00
liaozetao	c9a6677b91	修复上传问题	2023-11-21 15:59:25 +08:00
liaozetao	c5f4861c78	补充	2023-11-21 15:59:25 +08:00
liaozetao	2ff3cdac81	修改上传逻辑	2023-11-21 15:59:25 +08:00
liaozetao	9bc44106d5	修復時間格式化	2023-11-21 15:59:25 +08:00
liaozetao	ba89520f01	修復圖片上傳	2023-11-21 15:59:25 +08:00
liaozetao	8a2a51b0de	修复下拉框字段	2023-11-21 15:59:25 +08:00
liaozetao	2c95c7fbd3	修复按钮判断	2023-11-21 15:59:25 +08:00
liaozetao	8e654d1680	修复时间格式化问题	2023-11-21 15:59:25 +08:00
liaozetao	d168653061	新增开屏设置	2023-11-21 15:59:25 +08:00
liaozetao	7689181eb8	新增资源位管理	2023-11-21 15:59:25 +08:00
liaozetao	dbe9d47065	去除分析工具	2023-11-20 18:53:30 +08:00
liaozetao	a8232182ba	去除分析库	2023-11-16 14:38:41 +08:00
liaozetao	8065c2faca	去除unmounted	2023-11-14 18:00:42 +08:00
liaozetao	3a13518b10	修复table组件问题	2023-11-14 17:57:02 +08:00
liaozetao	2c55463d35	修复上传组件	2023-11-14 16:01:12 +08:00
Dragon	b8568ce761	后台-充值明细-输入框校验修改	2023-11-14 12:17:07 +08:00
Dragon	7daf9feb39	转赠身份设置后台管理	2023-11-06 18:23:59 +08:00
liaozetao	20bccaae6a	优化菜单展示逻辑	2023-11-02 17:29:09 +08:00
liaozetao	d392cb089f	修改菜单读取逻辑	2023-11-02 17:16:37 +08:00
liaozetao	9a68bf278f	归因场次不允许跨月	2023-11-02 15:44:30 +08:00
liaozetao	f8fc444e32	新增累计字段	2023-11-01 13:08:38 +08:00
liaozetao	332edf1d0c	修复小数点问题	2023-11-01 11:50:29 +08:00
Dragon	73eea6d101	修复保存传参异常问题	2023-11-01 11:39:29 +08:00
Dragon	c51d205a42	优化配置管理	2023-11-01 11:39:28 +08:00
Dragon	8c1cd51293	注释toast	2023-10-31 15:51:37 +08:00
Dragon	b8ad4f0234	修复分页异常问题	2023-10-31 15:29:17 +08:00
Dragon	8226604c00	新增编辑功能	2023-10-31 15:29:17 +08:00
Dragon	c23afafdc5	修复判断展示条件	2023-10-31 15:29:17 +08:00
Dragon	6b7aa99419	修复bug	2023-10-31 15:29:16 +08:00
Dragon	dd95a1d64e	红包管理后台	2023-10-31 15:29:16 +08:00
liaozetao	ec90636760	补充	2023-10-30 17:07:15 +08:00
liaozetao	5d6d22a0af	新增模块分析库	2023-10-30 16:49:55 +08:00
Dragon	50343e2aa9	优化代码加载速度	2023-10-30 16:11:05 +08:00
liaozetao	701bcb772a	新增字段	2023-10-30 12:37:18 +08:00
liaozetao	55d1e6fc43	新增分组统计字段	2023-10-30 12:13:32 +08:00
Dragon	642664edce	修复分组统计表格异常	2023-10-30 11:42:58 +08:00
liaozetao	7121ef5169	修复bootstrap-table组件问题	2023-10-27 18:10:15 +08:00
liaozetao	0388afa78e	修复退出登录问题	2023-10-26 17:03:57 +08:00
liaozetao	5bd9d0ead2	修改按钮样式	2023-10-26 16:28:09 +08:00
liaozetao	fe0f0dc186	修改样式	2023-10-26 15:47:47 +08:00
liaozetao	1a61a57c5a	优化下拉框样式	2023-10-26 15:32:13 +08:00
liaozetao	d514f71968	修复导出	2023-10-26 15:26:53 +08:00
liaozetao	b56d879298	修复导出问题	2023-10-26 15:05:34 +08:00
liaozetao	36083a6382	修復傳說試煉導出	2023-10-26 14:44:44 +08:00
liaozetao	7602628333	修復紅包ID問題	2023-10-26 14:40:40 +08:00
liaozetao	52da350b0f	新增转赠字段	2023-10-26 11:16:13 +08:00
liaozetao	839917da12	新增抽奖明细导出功能	2023-10-25 17:26:50 +08:00
liaozetao	7a3d3b054a	修改红包发放统计	2023-10-25 16:09:00 +08:00
liaozetao	786edc9294	奖品设置等级添加零级	2023-10-24 11:39:47 +08:00
liaozetao	3ba46dfc9b	补充	2023-10-24 11:26:34 +08:00
liaozetao	f865e989b9	添加奖品设置校验	2023-10-24 10:52:20 +08:00
liaozetao	4d877b9074	修复版本管理	2023-10-23 16:33:25 +08:00
liaozetao	0b391b3b9d	修改分页数	2023-10-23 14:40:51 +08:00
liaozetao	dc45af7c97	补充2	2023-10-23 12:36:53 +08:00
liaozetao	df0980565c	补充	2023-10-23 12:34:19 +08:00
liaozetao	059d43db48	奖品设置修改为搜索框	2023-10-23 12:32:55 +08:00
liaozetao	815356ce7f	修复头像展示问题2	2023-10-21 08:14:44 +08:00
liaozetao	0293f24864	修复头像展示问题	2023-10-21 08:13:51 +08:00
liaozetao	d1b239c91c	修改触发事件方式	2023-10-20 21:00:26 +08:00
liaozetao	adc1f06401	修复Date.prototype.format方法问题	2023-10-20 16:13:22 +08:00
liaozetao	eb23708953	修復版本管理	2023-10-20 14:38:48 +08:00
liaozetao	40344ec61c	修改配置的命名空间展示	2023-10-20 10:28:35 +08:00
liaozetao	8c9016246f	修改配置管理的展示方式	2023-10-19 17:44:57 +08:00
liaozetao	6502e1443b	修复多选框组件问题	2023-10-19 11:53:58 +08:00
Dragon	3cffb075ba	修复清除功能相册异常问题	2023-10-19 10:33:03 +08:00
Dragon	7a9eab4a73	完成相册管理后台	2023-10-19 10:33:01 +08:00
Dragon	d808a1e99f	优化预览图片	2023-10-19 10:33:01 +08:00
Dragon	ddad65f649	新增房间相册权限管理	2023-10-19 10:33:00 +08:00
Dragon	b6852d455b	暂存	2023-10-19 10:32:59 +08:00
liaozetao	f91d5d1cda	处理冲突	2023-10-18 17:39:20 +08:00
liaozetao	5751783109	修复奖池配置	2023-10-18 17:30:48 +08:00
liaozetao	770a2f37c0	新增删除功能	2023-10-18 16:54:04 +08:00
liaozetao	2adafe5600	修复时间组件代码错误	2023-10-18 09:28:26 +08:00
liaozetao	96ec03e9b5	修复样式问题	2023-10-17 19:11:52 +08:00
liaozetao	51072d93d8	blank路由问题	2023-10-17 17:04:10 +08:00
liaozetao	599fa22de8	处理/blank页面跳转问题	2023-10-17 17:04:04 +08:00
liaozetao	ca99af9d9c	添加script代码	2023-10-17 17:03:57 +08:00
liaozetao	355b68f83f	reload	2023-10-17 17:03:49 +08:00
liaozetao	28606a97ec	补充6	2023-10-17 17:03:43 +08:00
liaozetao	99c15ac7ee	补充4	2023-10-17 17:03:36 +08:00
liaozetao	df5275e79f	测试	2023-10-17 17:03:30 +08:00
liaozetao	20de4948d2	补充3	2023-10-17 17:03:22 +08:00
liaozetao	db56886866	处理刷新问题2	2023-10-17 17:03:16 +08:00
liaozetao	7c7807564a	修改刷新逻辑	2023-10-17 17:03:10 +08:00
liaozetao	45be789a40	恢复	2023-10-17 17:03:02 +08:00
liaozetao	881fd6af53	修改刷新逻辑	2023-10-17 17:02:54 +08:00
liaozetao	e1559b65e1	处理空白页面问题	2023-10-17 17:02:47 +08:00
liaozetao	485433f986	补充2	2023-10-17 17:02:41 +08:00
liaozetao	06120ffd1a	补充	2023-10-17 17:02:35 +08:00
liaozetao	ab6a9dd540	添加注释	2023-10-17 14:43:07 +08:00
liaozetao	121973fae1	新增空白页中转	2023-10-17 14:42:35 +08:00
liaozetao	474bbbb999	添加关闭按钮	2023-10-17 09:36:47 +08:00
liaozetao	47ee800328	修改提示语	2023-10-17 09:35:23 +08:00
liaozetao	27fb1d973f	修复奖品保存问题	2023-10-16 17:38:43 +08:00
liaozetao	cd20e88ed4	修改展示概率的显示	2023-10-16 15:52:32 +08:00
liaozetao	00a6c8af1d	修改写法	2023-10-16 15:52:32 +08:00
liaozetao	605b1ae994	vue组件渲染前删除toolbar	2023-10-16 15:37:56 +08:00
liaozetao	24d2268890	补充	2023-10-16 14:05:30 +08:00
liaozetao	be24413bbb	添加页面节点清除逻辑	2023-10-16 14:05:30 +08:00
liaozetao	068831f6cb	修复已发布奖池展示问题	2023-10-16 11:36:52 +08:00
liaozetao	d369702e89	区分奖池	2023-10-16 11:32:16 +08:00
liaozetao	6ae271077f	修复兑换商店展示问题	2023-10-16 11:22:50 +08:00
liaozetao	c383ec4bfb	修复列表页面嵌套问题	2023-10-16 11:20:05 +08:00
liaozetao	c3168d70ef	修复单线比问题	2023-10-16 10:25:16 +08:00
liaozetao	a25de8a414	修复概率计算问题	2023-10-16 10:06:06 +08:00
liaozetao	f6a1277806	新增奖池线统计	2023-10-13 19:54:06 +08:00
liaozetao	5b2aff6b7e	修复展示问题2	2023-10-13 17:38:10 +08:00
liaozetao	0407798ba0	新增奖池线统计	2023-10-13 17:33:08 +08:00
liaozetao	059419da08	修改展示问题	2023-10-13 17:13:57 +08:00
liaozetao	9b427a8e35	夺宝精灵奖池信息展示	2023-10-13 16:35:37 +08:00
liaozetao	cae5232130	新增发布功能	2023-10-13 15:25:35 +08:00
liaozetao	b8634c9f28	夺宝精灵奖池固定类型和等级	2023-10-13 14:54:46 +08:00
liaozetao	1c36f08da2	修复概率展示问题	2023-10-13 14:43:12 +08:00
liaozetao	1640f9f022	修复页面刷新顺序问题	2023-10-13 12:21:22 +08:00
liaozetao	331992ca50	修复奖池排序	2023-10-13 12:18:37 +08:00
liaozetao	94eddba213	修复夺宝精灵奖池BUG	2023-10-13 12:18:37 +08:00
liaozetao	6f92c15bd0	修改展示问题	2023-10-13 12:18:37 +08:00
liaozetao	d04ef6c256	修改兑换商店消耗碎片展示字段	2023-10-13 12:18:37 +08:00
liaozetao	8d5995f50b	修改奖池设置的概率	2023-10-13 12:18:37 +08:00
liaozetao	d19969cb0e	修改消耗碎片数逻辑	2023-10-13 12:06:14 +08:00
liaozetao	6ec34e930c	修复奖池设置问题	2023-10-13 12:06:14 +08:00
liaozetao	a7d2d0d592	修复数据加载问题	2023-10-13 12:06:14 +08:00
liaozetao	8abd4fb0c1	修复ID展示问题	2023-10-13 12:06:14 +08:00
liaozetao	3d522f39aa	修复rewardRefId	2023-10-13 12:06:14 +08:00
liaozetao	6139b57f53	修复奖品问题	2023-10-13 12:06:14 +08:00
liaozetao	bd061e865e	修复奖品select框	2023-10-13 12:06:14 +08:00
liaozetao	806ccf94d4	修复reward的id和name问题	2023-10-13 12:06:14 +08:00
liaozetao	1f17d690a6	修复reward的id和name问题	2023-10-13 12:06:14 +08:00
liaozetao	ba13d899fe	修复数据id和name问题	2023-10-13 12:06:14 +08:00
liaozetao	b10b3c99c8	修复消耗精灵框问题	2023-10-13 12:06:14 +08:00
liaozetao	a44b50bf2a	修复奖品名称	2023-10-13 12:06:14 +08:00
liaozetao	c70e6a961a	兑换商店-消耗碎片数隐藏	2023-10-13 12:06:14 +08:00
liaozetao	a95e93c845	修改样式	2023-10-13 12:06:14 +08:00