恢复代码

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",

package.json

@@ -8,10 +8,10 @@
     "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"
   }

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
+    });
+};

src/api/common/gift.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getGiftList = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};

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);
+        });
+    });
+};

src/api/invitationFission/invitationFission.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================每日数据====================================
+// 表单
+export const userInviteFissionRecordGetDailyPage = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getDailyPage',
+        method: 'get',
+        params: query
+    });
+};
+// 详情表单
+export const userInviteFissionRecordGetDailyDetailList = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getDailyDetailList',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const userInviteFissionRecordExport = query => {
+    window.location.href = `/admin/userInviteFissionRecord/export?${genQueryParam(query)}`;
+    return;
+};
+// ==================================邀请排名====================================
+// 设置白名单
+export const userInviteFissionRecordSetBlack = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/setBlack',
+        headers: { "Content-Type": 'application/x-www-form-urlencoded' },
+        method: 'post',
+        data: query
+    });
+};
+// 邀请排名列表
+export const userInviteFissionRecordGetInviteRank = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getInviteRank',
+        method: 'get',
+        params: query
+    });
+};

src/api/lucky/luckyGiftRangeConfig.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+export const getLuckyGiftRangeConfigList = query => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveLuckyGiftRangeConfig = data => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/save',
+        method: 'post',
+        data: data
+    });
+};
+
+// 获取礼物
+export const getAll = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};
+// 获取礼物区间
+export const luckyGiftRangeConfigList = query => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物配置列表
+export const luckyGiftRewardList = query => {
+    return request({
+        url: '/admin/luckyGiftReward/list',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物配置删除
+export const luckyGiftRewardDelete = query => {
+    return request({
+        url: '/admin/luckyGiftReward/delete',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼保存列表
+export const luckyGiftRewardSave = query => {
+    return request({
+        url: '/admin/luckyGiftReward/save',
+        method: 'post',
+        params: query
+    });
+};
+// 幸运礼物明细
+export const getGiftSendPage = query => {
+    return request({
+        url: '/admin/luckyGiftRewardRecord/getGiftSendPage',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物详情
+export const getRewardList = query => {
+    return request({
+        url: '/admin/luckyGiftRewardRecord/getRewardList',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物详情导出 
+export const luckyGiftRewardRecordExport = query => {
+    window.location.href = `/admin/luckyGiftRewardRecord/export?${genQueryParam(query)}`;
+    return;
+};

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
+    });
+}

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
+    });
+};

src/api/partition/partitionInfo.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getPartitionInfoList = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};

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
+    });
+}

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
+    });
+};

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
+    });
+};

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
+    });
+};

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,
+    });
 }

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
+    });
+};

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;
+};

src/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper.js

@@ -32,10 +32,10 @@ export default {
     build: function (val, idstr, defval) {
         var _this = this;
         if (val) {
-            if (Object.prototype.toString.call(val) === '[object Object]') {
+            if (Object.prototype.toString.call(val) === '[object Array]') {
                 $(idstr).empty();
-                $.each(val, function (n, value) {
-                    $(idstr).append("<option value='" + value.oval + "' data-value='" + value.oval + "'>" + value.otxt + "</option>");
+                $.each(val, function (n, obj) {
+                    $(idstr).append("<option value='" + obj.value + "' data-value='" + obj.value + "'>" + obj.text + "</option>");
                 });
                 $(idstr).btComboBox();
                 _this.setDef(idstr, defval);

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 ;_;

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;
+}

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);
+}));

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);
+}));
+

src/components/footer/index.vue

@@ -3,7 +3,7 @@
         <div class="pull-right hidden-xs">
             <b>Version</b> 2.0.0
         </div>
-        <strong>Copyright &copy; 2023 <a href="">触海网络</a>.</strong> All rights
+        <strong>Copyright &copy; 2024 <a href="">触海网络</a>.</strong> All rights
         reserved.
     </footer>
 </template>

src/components/header/index.vue

@@ -4,9 +4,9 @@
         <!-- Logo -->
         <a class="logo">
             <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><b>P</b>K</span>
+            <span class="logo-mini"><b>M</b>S</span>
             <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><b>piko</b>管理系统</span>
+            <span class="logo-lg"><b>molistar</b>管理系统</span>
         </a>
         <!-- Header Navbar: style can be found in header.less -->
         <nav class="navbar navbar-static-top" role="navigation">

src/components/maintainer/index.vue

@@ -99,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',
@@ -130,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;
@@ -163,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);
             }
         }
     },

src/constants/global.js

@@ -1,8 +1,8 @@
 export default {
     KEY: "piko",
     EXCLUDES: [
-        "/login/login.action",
-        "/login/sendSmsCode.action",
+        "/login/login",
+        "/login/sendSmsCode",
     ],
     NEED_LOGOUT: "needLogout",
 };

src/css/public.css

@@ -2,39 +2,69 @@
 /*鼠标点击后移开，恢复本身样式*/
 .primary,
 .primary:focus:not(.primary:hover) {
-  color: white;
-  background: #409eff;
-}
-/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
-/* 更改背景和字體顏色 */
-.primary:focus, .primary:hover{
     color: white;
     background: #409eff;
 }
+
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.primary:focus,
+.primary:hover {
+    color: white;
+    background: #409eff;
+}
+
 /*鼠标按下，没有抬起*/
 /* 更改邊框顏色 */
 .primary:active {
-  color: white;
-  background: #337ecc;
+    color: white;
+    background: #337ecc;
 }
 
 
 /*鼠标点击后移开，恢复本身样式*/
 .danger,
 .danger:focus:not(.danger:hover) {
-  color: white;
-  background: #f56c6c;
-}
-/* 危险的按钮样式 */
-/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
-/* 更改背景和字體顏色 */
-.danger:focus, .danger:hover{
     color: white;
     background: #f56c6c;
 }
+
+/* 危险的按钮样式 */
+/*鼠标悬浮，没有按下；鼠标按下后抬起，没有移开*/
+/* 更改背景和字體顏色 */
+.danger:focus,
+.danger:hover {
+    color: white;
+    background: #f56c6c;
+}
+
 /*鼠标按下，没有抬起*/
 /* 更改邊框顏色 */
 .danger:active {
-  color: white;
-  background: #c45656;
+    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;
 }

src/main.js

@@ -1,7 +1,9 @@
 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'
@@ -14,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'
 
@@ -45,10 +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')

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({

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;

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);
+    }
 }

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

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('&');
 }

src/utils/notify.js

@@ -3,7 +3,7 @@ export const notifyNotice = () => {
     console.log(window.Notification.permission);
     if (window.Notification) {
         $.ajax({
-            url: "/admin/dynamic/verify/notifySwitch.action",
+            url: "/admin/dynamic/verify/notifySwitch",
             success: function (json) {
                 if (json == 'true') {
                     notifyInterval = setInterval(notify, 50000);
@@ -17,7 +17,7 @@ export const notifyNotice = () => {
 
     function notify() {
         $.ajax({
-            url: "/admin/dynamic/verify/notify.action",
+            url: "/admin/dynamic/verify/notify",
             success: function (json) {
                 if (json != null && json != "" && json != undefined && json != 'undefined') {
                     var dynamicCount = json.dynamic;

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;

src/utils/system-helper.js

@@ -1,6 +1,54 @@
 //获取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;
+}
+
+export function buildSelectOption(id, defVal, array) {
+    let $select = $(id);
+    let children = $select.children(); 
+    if (children && children.length > 0) {
+        return;
+    }
+    for(let i in array) {
+        let obj = array[i];
+        let selected = false;
+        if (obj.value == defVal) {
+            selected = true;
+        }
+        $select.append('<option value="' + obj.value + '"' + (selected ? 'selected' : '') + '>' + obj.text + '</option>');
+    }
 }

src/views/OperationSmsAdminView.vue

@@ -213,7 +213,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/sms/list.action',
+                    url: '/admin/sms/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -256,7 +256,7 @@ export default {
                     showLoading();
                     var option = ({
                         type: "POST",
-                        url: "/admin/sms/uploadExcel.action",
+                        url: "/admin/sms/uploadExcel",
                         cache: false,
                         contentType: false,    //不可缺
                         processData: false,    //不可缺
@@ -310,7 +310,7 @@ export default {
                         createTime: createTime,
                         sendTime: sendTime
                     };
-                    var url = "/admin/sms/query/send.action";
+                    var url = "/admin/sms/query/send";
                     if (confirm("按查询条件发送最多一次可发送一万条短信!已发送过的用户不会重复发送,你确认批量发送吗?")) {
                         sendSmsByData(data, url);
                     }
@@ -329,7 +329,7 @@ export default {
                     var data = {
                         ids: JSON.stringify(idArr)
                     }
-                    var url = "/admin/sms/page/send.action";
+                    var url = "/admin/sms/page/send";
                     if (confirm("你确认批量发送吗?")) {
                         sendSmsByData(data, url);
                     }
@@ -338,7 +338,7 @@ export default {
                 $("#table").on('click', '.opt-send', function () {
                     var id = $(this).attr("data-id");
                     var data = { recordId: id };
-                    var url = "/admin/sms/send.action";
+                    var url = "/admin/sms/send";
                     if (confirm("已经发送过的短信将会重复发送,确定重复发送短信吗？")) {
                         sendSmsByData(data, url);
                     }
@@ -349,7 +349,7 @@ export default {
                     if (confirm("删除的数据将不能找回，确定删除吗？")) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/sms/del.action",
+                            url: "/admin/sms/del",
                             data: { recordId: id },
                             dataType: "json",
                             success: function (json) {
@@ -389,9 +389,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/QiniuUploadAdminView.vue

@@ -62,7 +62,7 @@ export default {
             }
             $.ajax({
                 type: "POST",
-                url: "/admin/qiniu/uploadPatch.action",
+                url: "/admin/qiniu/uploadPatch",
                 data: data,
                 cache: false,
                 contentType: false,    //不可缺

src/views/TencentUploadAdminView.vue

@@ -0,0 +1,195 @@
+<template>
+    <section class="content">
+        <div class="box box-primary">
+            <div class="box-body">
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <!-- .content -->
+                <div id="table"></div>
+                <div id="toolbar">
+                    <br />
+                    <br />
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button id="updateImgs" class="btn btn-sm btn-primary">上传文件</button>
+                    <h3 id="urlInfo"></h3>
+                    <br />
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class=" modal fade" id="fileUpload" tabindex="-1" role="dialog" aria-labelledby="modalLabel1">
+        <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="modalLabel1">上传文件</h4>
+                </div>
+                <div class="modal-footer" style="height: 20%">
+                    <span>上传文件</span>
+                    <!--<input type="file" name="file" id="uploadFile">-->
+                    <input type="file" name="logoFile1" id="logoFile1" onchange="setFiles(this);" style="display:inline;"
+                        multiple>
+                    <!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
+                    <!--<button type="button" class="btn btn-primary" id="upload">上传七牛</button>-->
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: "TencentUploadAdminView",
+    setup() {
+
+        function setFiles(obj) {
+            $("#confirmMsg").text("正在上传，请稍后");
+            $("#confirmModal").modal('show');
+            var f = $(obj).val();
+            if (f == null || f == undefined || f == '') {
+                return false;
+            }
+            var filePaths = $(obj)[0].files;
+            var num = filePaths.length;
+            var data = new FormData();
+            for (var i = 0; i <= num - 1; i++) {
+                var file = $(obj)[0].files[i];
+                data.append('file_' + i, file);
+            }
+            $.ajax({
+                type: "POST",
+                url: "/admin/tencent/cos/uploadPatch",
+                data: data,
+                cache: false,
+                contentType: false,    //不可缺
+                processData: false,    //不可缺
+                dataType: "json",
+                success: function (res) {
+                    $("#logoFile1").val("");
+                    $("#confirmModal").modal('hide');
+                    $("#fileUpload").modal('hide');
+                    console.log(res)
+                    if (res.code == 200) {
+                        $("#tipMsg").text("上传成功");
+                        $("#tipModal").modal('show');
+                        buildResult(res.data);
+                    } else {
+                        $("#tipMsg").text("上传失败.");
+                        $("#tipModal").modal('show');
+                    }
+                }
+            });
+        }
+        window.setFiles = setFiles;
+        return {
+            setFiles
+        };
+    },
+    created() {
+        this.$nextTick(function () {
+            this.initData();
+        });
+    },
+    methods: {
+        initData() {
+            $("#updateImgs").click(function () {
+                $("#uploadFile").val("");
+                $("#fileUpload").modal('show');
+            });
+
+            $("#upload").click(function () {
+                $.ajaxFileUpload({
+                    fileElementId: 'uploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                    url: "/admin/tencent/cos/upload", //后台方法的路径
+                    type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                    dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                    secureuri: false,   //是否启用安全提交，默认为false。
+                    async: true,   //是否是异步
+                    success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                        console.log(json)
+                        if (json.flag) {
+                            $("#urlInfo").html(json.url);
+                            $("#tipMsg").text("上传成功");
+                            $("#tipModal").modal('show');
+                        }
+                        else {
+                            $("#tipMsg").text("上传失败.");
+                            $("#tipModal").modal('show');
+                        }
+                        $("#faceJsonImgsUpload").modal('hide');
+                    },
+                    error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                        console.error(e);
+                        $("#tipMsg").text("上传失败");
+                        $("#tipModal").modal('show');
+                    }
+                });
+
+            });
+        }
+    },
+};
+
+function buildResult(data) {
+    var $urlInfo = $('#urlInfo');
+    for (var i = 0; i < data.length; i++) {
+        var $p = $('<p />');
+        $p.html(data[i]);
+        $urlInfo.append($p);
+    }
+}
+</script>
+
+<style scoped>
+ .bar1, .bar2 {
+        margin-bottom: 10px;
+    }
+
+    label.col-sm-1 {
+        padding: 0;
+        line-height: 30px;
+        text-align: right;
+        /*padding-right: 4px;*/
+    }
+
+    label.col-sm-1 {
+        padding: 0;
+        line-height: 30px;
+        text-align: right;
+        /*padding-right: 4px;*/
+    }
+
+    input, select {
+        margin-left: 8px;
+        margin-right: 8px;
+    }
+
+    .button-wrapper {
+        margin-top: 10px;
+    }
+
+    .record {
+        margin-top: 10px;
+    }
+
+    .record .title {
+        font-size: 16px;
+    }
+
+    .toggle-group {
+        display: none;
+    }
+
+    .tips {
+        font-size: 13px;
+        color: red;
+    }
+
+    .opt-group .col-sm-7 {
+        text-align: left;
+    }
+</style>

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>

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>

src/views/activity/ActivityAwardAdminView.vue

@@ -10,7 +10,7 @@
                     <div id="toolbar">
                         奖品类别：<select name="prizeType" id="prizeType" class="input-m">
                             <option value="0">--全部--</option>
-                            <option value="1">金币</option>
+                            <option value="1">钻石</option>
                             <option value="2">线上礼物</option>
                             <option value="3">座驾</option>
                             <option value="4">头饰</option>
@@ -45,7 +45,7 @@
 
                             <div class="col-sm-8" style="padding-top:7px;">
                                 <select name="addType" id="addType" data-btn-class="btn btn-warning">
-                                    <option value="1">金币</option>
+                                    <option value="1">钻石</option>
                                     <option value="2">线上礼物</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
@@ -179,7 +179,7 @@ export default {
                             field: 'prizeType', title: '奖品类别', align: 'center', valign: 'middle', width: '20%', formatter: function (val, row, index) {
                                 switch (val) {
                                     case 1:
-                                        return '金币';
+                                        return '钻石';
 
                                     case 2:
                                         return '在线礼物';
@@ -290,7 +290,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/activityAward/list.action',
+                    url: '/admin/activityAward/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -529,7 +529,7 @@ export default {
                         $('#carChoose').combobox();
                     })
 
-                    $.get('/admin/nameplate//total/list', {}, function (res) {
+                    $.get('/admin/nameplate/total/list', {}, function (res) {
                         if (res.code == 200) {
                             for (var i = 0; i < res.data.length; i++) {
                                 //                        car.push(res.data[i]);
@@ -590,9 +590,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/ActivityPackAdminView.vue

@@ -655,7 +655,7 @@ export default {
                                 field: 'type', title: '奖品类型', align: 'center', width: '5%', valign: 'middle', formatter: function (val, row, index) {
                                     switch (val) {
                                         case 1:
-                                            return '金币';
+                                            return '钻石';
 
                                         case 2:
                                             return '在线礼物';
@@ -757,9 +757,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 
 </script>

src/views/activity/ChargeActivityAdminView.vue

@@ -597,7 +597,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/charge/activity/getById.action",
+                        url: "/admin/charge/activity/getById",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -716,7 +716,7 @@ export default {
                                 $('#modal_packName').append('<option value="">请选择...</option>');
                                 $.ajax({
                                     type: "get",
-                                    url: "/admin/activity/pack/list.action",
+                                    url: "/admin/activity/pack/list",
                                     data: {
                                         status: 1
                                     },
@@ -760,7 +760,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/charge/activity/delete.action",
+                            url: "/admin/charge/activity/delete",
                             data: { id: id },
                             dataType: "json",
                             success: function (json) {
@@ -791,7 +791,7 @@ export default {
                     }
                     $.ajax({
                         type: "get",
-                        url: "/admin/activity/pack/list.action",
+                        url: "/admin/activity/pack/list",
                         data: {
                             status: 1
                         },
@@ -1147,9 +1147,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/FamilyPKManageAdminView.vue

@@ -617,9 +617,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 
 </script>

src/views/activity/LuckySeaItemAdminView.vue

@@ -218,7 +218,7 @@ export default {
                     queryParamsType: "undefined",
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listItemGroup.action',
+                    url: '/admin/luckySea/listItemGroup',
                     onLoadSuccess: function (data) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -410,7 +410,7 @@ export default {
                 }
 
                 function getPageInfo() {
-                    $.get('/admin/luckySea/listItem.action', {
+                    $.get('/admin/luckySea/listItem', {
                     }, function (res) {
                         console.log(res);
                         const data = res;
@@ -654,9 +654,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/LuckySeaPlatformAdminView.vue

@@ -154,7 +154,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listPlatformStat.action',
+                    url: '/admin/luckySea/listPlatformStat',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -166,9 +166,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/LuckySeaRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />钻石
+                        当前库存 <span name="stock" id="stock" />金币
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>
@@ -163,7 +163,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listActRecord.action',
+                    url: '/admin/luckySea/listActRecord',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -228,7 +228,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/luckySea/listRoundDrawDetail.action',
+                        url: '/admin/luckySea/listRoundDrawDetail',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -247,7 +247,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/getStock.action",
+                        url: "/admin/luckySea/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -268,7 +268,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/editStock.action",
+                        url: "/admin/luckySea/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },
@@ -289,9 +289,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/LuckySeaUserStatAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listUserDrawRecordList.action',
+                    url: '/admin/luckySea/listUserDrawRecordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -133,9 +133,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/OperationActAdminView.vue

@@ -145,7 +145,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/act/operational/list.action',
+                    url: '/admin/act/operational/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -176,7 +176,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/act/operational/save.action",
+                            url: "/admin/act/operational/save",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -197,7 +197,7 @@ export default {
                     var key = parseInt($(this).attr('data-id'));
                     $.ajax({
                         type: 'post',
-                        url: '/admin/act/operational/del.action',
+                        url: '/admin/act/operational/del',
                         data: { 'id': key },
                         dataType: 'json',
                         success: function (res) {
@@ -215,7 +215,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/upload/img.action',
+                        url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -256,9 +256,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/PageActivityView.vue

@@ -135,7 +135,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/act/static/list.action',
+                    url: '/admin/act/static/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -165,7 +165,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/act/static/save.action",
+                            url: "/admin/act/static/save",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -190,7 +190,7 @@ export default {
                     var key = parseInt($(this).attr('data-id'));
                     $.ajax({
                         type: 'post',
-                        url: '/admin/act/static/delete.action',
+                        url: '/admin/act/static/delete',
                         data: { 'id': key },
                         dataType: 'json',
                         success: function (res) {
@@ -208,7 +208,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/upload/img.action',
+                        url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -249,9 +249,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/UserDrawRecordAdminView.vue

@@ -138,9 +138,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/activity/WeekStarConfigAdminView.vue

@@ -166,8 +166,14 @@ export default {
                                 field: 'charmAward', title: '魅力榜奖励', align: 'center', valign: 'middle', formatter: function (val, row, index) {
                                     var packArr = JSON.parse(val);
                                     var str = '';
-                                    for (var i = 0; i < packArr.length; i++) {
-                                        str += packObj[packArr[i]] + '，';
+                                    for (var i = 0, len = packArr.length; i < len; i++) {
+                                        let value = packObj[packArr[i]];
+                                        if (value) {
+                                            str += value;
+                                        }
+                                        if (i != len - 1) {
+                                            str += '，';
+                                        }
                                     }
                                     return str.substr(0, str.length - 2);
                                 }
@@ -176,8 +182,14 @@ export default {
                                 field: 'levelAward', title: '豪气榜奖励', align: 'center', valign: 'middle', formatter: function (val, row, index) {
                                     var packArr = JSON.parse(val);
                                     var str = '';
-                                    for (var i = 0; i < packArr.length; i++) {
-                                        str += packObj[packArr[i]] + '，';
+                                    for (var i = 0, len = packArr.length; i < len; i++) {
+                                        let value = packObj[packArr[i]];
+                                        if (value) {
+                                            str += value;
+                                        }
+                                        if (i != len - 1) {
+                                            str += '，';
+                                        }
                                     }
                                     return str.substr(0, str.length - 2);
                                 }
@@ -232,7 +244,7 @@ export default {
                         },
                         uniqueId: 'id',
                         toolbar: '#toolbar',
-                        url: '/admin/weekStarConfig/getWeekConfigList.action',
+                        url: '/admin/weekStarConfig/getWeekConfigList',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -341,10 +353,15 @@ export default {
                         if (res.code == 200) {
                             var str = '';
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    giftName = JSON.parse(giftName).zh;
+                                } 
                                 // 存入对象
-                                giftObj[res.data[i].giftId] = res.data[i].giftName;
+                                giftObj[res.data[i].giftId] = giftName;
                                 // 渲染select
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftName + '</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + giftName + '</option>';
                             }
                             console.log(JSON.stringify(giftObj));
                             // $('.giftSelect').html(str);
@@ -362,10 +379,15 @@ export default {
                         if (res.code == 200) {
                             var str = '';
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    giftName = JSON.parse(giftName).zh;
+                                }
                                 // 存入对象
-                                giftObj[res.data[i].giftId] = res.data[i].giftName;
+                                giftObj[res.data[i].giftId] = giftName;
                                 // 渲染select
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftName + '</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + giftName + '</option>';
                             }
                             console.log(JSON.stringify(giftObj));
                             $('.giftSelect').html(str);
@@ -409,9 +431,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/administrator/SuperAdminOperateRecordView.vue

@@ -150,7 +150,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/super/operate/record/list.action',
+                    url: '/admin/super/operate/record/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -184,9 +184,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/administrator/SuperAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         var params = "uids=" + id;
                         $.ajax({
                             type: 'post',
-                            url: "/admin/super/del.action",
+                            url: "/admin/super/del",
                             data: params,
                             dataType: "json",
                             success: function (json) {
@@ -114,7 +114,7 @@ export default {
                         showLoading()
                         $.ajax({
                             type: "post",
-                            url: "/admin/super/save.action",
+                            url: "/admin/super/save",
                             data: 'erbanNo=' + erbanNo,
                             dataType: "json",
                             success: function (json) {
@@ -136,9 +136,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 
 
@@ -182,7 +180,7 @@ function initTable() {
             return param;
         },
         toolbar: '#toolbar',
-        url: '/admin/super/list.action',
+        url: '/admin/super/list',
         onLoadSuccess: function (data) {  //加载成功时执行
             setTimeout(function () {
                 loadCreateTime(data);
@@ -207,7 +205,7 @@ function loadCreateTime(data) {
     if (param != '') {
         $.ajax({
             type: "get",
-            url: "/admin/super/get/time.action",
+            url: "/admin/super/get/time",
             data: param,
             dataType: "json",
             success: function (json) {

src/views/anchor/AnchorAdminView.vue

@@ -221,9 +221,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorBillCheckView.vue

@@ -242,9 +242,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorBillUploadView.vue

@@ -41,8 +41,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>
@@ -261,9 +261,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorFansMpAudioView.vue

@@ -167,7 +167,7 @@ export default {
                     },
                     toolbar: '#toolbar',
                     uniqueId: 'id',
-                    url: '/admin/anchorFansTeamAudio/recordList.action',
+                    url: '/admin/anchorFansTeamAudio/recordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -195,7 +195,7 @@ export default {
                     if (confirm("确定批量批量审核通过图片吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/photo/batchPass.action',
+                            url: '/admin/photo/batchPass',
                             data: { pid: JSON.stringify(pid) },
                             dataType: 'json',
                             success: function (res) {
@@ -221,7 +221,7 @@ export default {
                         // console.log(data)
                         $.ajax({
                             type: 'post',
-                            url: '/admin/anchorFansTeamAudio/pass.action',
+                            url: '/admin/anchorFansTeamAudio/pass',
                             data: { pid: dataId, status: 2 },
                             dataType: 'json',
                             success: function (res) {
@@ -260,7 +260,7 @@ export default {
                     if ($("#messageForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/anchorFansTeamAudio/pass.action',
+                            url: '/admin/anchorFansTeamAudio/pass',
                             data: { pid: dataId, message: message, status: 1 },
                             dataType: 'json',
                             success: function (res) {
@@ -279,9 +279,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorFansPrivilegeView.vue

@@ -261,7 +261,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/anchorFansPrivilege/privilegeList.action',
+                            url: '/admin/anchorFansPrivilege/privilegeList',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -322,7 +322,7 @@ export default {
                         console.log(2333)
                         $.ajax({
                             type: "post",
-                            url: "/admin/anchorFansPrivilege/savePrivilege.action",
+                            url: "/admin/anchorFansPrivilege/savePrivilege",
                             data: {
                                 id: id,
                                 name: name,
@@ -361,7 +361,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/anchorFansPrivilege/getPrivilegeInfo.action",
+                        url: "/admin/anchorFansPrivilege/getPrivilegeInfo",
                         data: { id: id },
                         dataType: "json",
                         success: function (res) {
@@ -502,9 +502,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorFansTeamStatsView.vue

@@ -127,7 +127,7 @@ export default {
                     },
                     toolbar: '#toolbar',
                     uniqueId: 'uid',
-                    url: '/admin/anchorFansTeam/statis/statisList.action',
+                    url: '/admin/anchorFansTeam/statis/statisList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -184,7 +184,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/anchorFansTeam/statis/team/DetailList.action',
+                        url: '/admin/anchorFansTeam/statis/team/DetailList',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -212,9 +212,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/anchor/AnchorReleaseGoldView.vue

@@ -65,8 +65,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>
@@ -107,8 +107,8 @@ export default {
                         // {field: 'temp', title: 'id', align: 'center', checkbox: true, width: '5%'},
                         { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
                         { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币数量', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币数量', align: 'center', width: '5%' },
                         {
                             field: 'createTime',
                             title: '创建时间',
@@ -234,7 +234,7 @@ export default {
                     if (confirm("删除的数据将不能找回，确定删除吗？")) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/sms/del.action",
+                            url: "/admin/sms/del",
                             data: { recordId: id },
                             dataType: "json",
                             success: function (json) {
@@ -254,9 +254,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/app/AppBottomBarAdminView.vue

@@ -415,7 +415,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/bottomBar/list.action',
+                            url: '/admin/bottomBar/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -544,7 +544,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/bottomBar/saveBottomBar.action",
+                            url: "/admin/bottomBar/saveBottomBar",
                             data: {
                                 refSeq: refSeq,
                                 configName: configName,
@@ -594,7 +594,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/bottomBar/getBarByRefSeq.action",
+                        url: "/admin/bottomBar/getBarByRefSeq",
                         data: { refSeq: refSeq },
                         dataType: "json",
                         success: function (res) {
@@ -671,7 +671,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/bottomBar/deleteByRefSeq.action",
+                            url: "/admin/bottomBar/deleteByRefSeq",
                             data: { refSeq: refSeq },
                             dataType: "json",
                             success: function (json) {
@@ -1061,9 +1061,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/app/AppUpdateView.vue

@@ -266,7 +266,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/appUpdate/list.action',
+                            url: '/admin/appUpdate/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -310,7 +310,7 @@ export default {
                     if ($("#addModalForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/appUpdate/save.action",
+                            url: "/admin/appUpdate/save",
                             data: {
                                 name: $("#modal_name").val(),
                                 forceUpdate: $("#modal_forceUpdate").val(),
@@ -347,7 +347,7 @@ export default {
                     if ($("#editForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/appUpdate/save.action",
+                            url: "/admin/appUpdate/save",
                             data: {
                                 id: $("#id").val(),
                                 name: $("#name").val(),
@@ -386,7 +386,7 @@ export default {
                     console.log(id);
                     $.ajax({
                         type: "get",
-                        url: "/admin/appUpdate/get.action",
+                        url: "/admin/appUpdate/get",
                         data: { id: id },
                         dataType: "json",
                         success: function (ret) {
@@ -434,9 +434,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/audiocard/AudioCardVerifyView.vue

@@ -163,7 +163,7 @@ export default {
                         };
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/audioCard/page.action',
+                    url: '/admin/audioCard/page',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -221,7 +221,7 @@ export default {
                     showLoading();
                     $.ajax({
                         type: 'post',
-                        url: "/admin/audioCard/verify.action",
+                        url: "/admin/audioCard/verify",
                         data: {
                             id: id,
                             status: status
@@ -264,9 +264,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/auditaudio/AuditAudioView.vue

@@ -382,7 +382,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/audit/audio/list.action',
+                    url: '/admin/audit/audio/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -405,7 +405,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/handle/pass.action",
+                        url: "/admin/audit/audio/handle/pass",
                         data: { recordId: id },
                         dataType: "json",
                         success: function (json) {
@@ -425,7 +425,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/handle/unBlock.action",
+                        url: "/admin/audit/audio/handle/unBlock",
                         data: { recordId: id },
                         dataType: "json",
                         success: function (json) {
@@ -474,7 +474,7 @@ export default {
                     if ($("#modalLabel").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/audit/audio/handle/reject.action",
+                            url: "/admin/audit/audio/handle/reject",
                             data: {
                                 recordId: recordId,
                                 resultValue: resultValue,
@@ -508,7 +508,7 @@ export default {
                     if ($("#blockModalLabel").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/audit/audio/handle/reject.action",
+                            url: "/admin/audit/audio/handle/reject",
                             data: {
                                 recordId: recordId,
                                 resultValue: resultValue
@@ -551,9 +551,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/auditaudio/MonitorRuleView.vue

@@ -92,7 +92,7 @@ export default {
                 function getRuleDetail() {
                     $.ajax({
                         type: "get",
-                        url: "/admin/audit/audio/get/rule.action",
+                        url: "/admin/audit/audio/get/rule",
                         dataType: "json",
                         success: function (json) {
                             if (json.code == 200) {
@@ -128,7 +128,7 @@ export default {
                     showLoading();
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/rule/save.action",
+                        url: "/admin/audit/audio/rule/save",
                         data: {
                             type: type,
                             erbanNos: $("#erbanNos").val()
@@ -151,9 +151,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

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,9 +541,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/blinddate/BlindDateCapAdminView.vue

@@ -220,7 +220,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/blindDate/listCap.action',
+                    url: '/admin/blindDate/listCap',
                     onLoadSuccess: function (res) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -280,7 +280,7 @@ export default {
                     console.log("id", $("#e_id").val());
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateCap.action",
+                        url: "/admin/blindDate/addOrUpdateCap",
                         data: $('#updateForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -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');
@@ -305,7 +305,7 @@ export default {
                     if (confirm("你确认删除该帽子吗?")) {
                         $.ajax({
                             type: "get",
-                            url: "/admin/blindDate/delCap.action",
+                            url: "/admin/blindDate/delCap",
                             data: {
                                 id: capId,
                             },
@@ -326,7 +326,7 @@ export default {
                 $("#add-cap").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateCap.action",
+                        url: "/admin/blindDate/addOrUpdateCap",
                         data: $('#addForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -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,9 +406,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/blinddate/BlindDateJoinhandAdminView.vue

@@ -256,7 +256,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/blindDate/listJoinHand.action',
+                    url: '/admin/blindDate/listJoinHand',
                     onLoadSuccess: function (res) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -333,7 +333,7 @@ export default {
                     console.log("id", $("#e_id").val());
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        url: "/admin/blindDate/addOrUpdateJoinHand",
                         data: $('#updateForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -341,7 +341,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -358,7 +358,7 @@ export default {
                     if (confirm("你确认删除该场景吗?")) {
                         $.ajax({
                             type: "get",
-                            url: "/admin/blindDate/delJoinHand.action",
+                            url: "/admin/blindDate/delJoinHand",
                             data: {
                                 id: JoinHandId,
                             },
@@ -379,7 +379,7 @@ export default {
                 $("#add-JoinHand").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        url: "/admin/blindDate/addOrUpdateJoinHand",
                         data: $('#addForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -387,6 +387,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -517,9 +518,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/callbattle/ActCallBattleItemAdminView.vue

@@ -265,7 +265,7 @@ export default {
                 }
 
                 function getPageInfo() {
-                    $.get('/admin/callBattle/listItem.action', {
+                    $.get('/admin/callBattle/listItem', {
                     }, function (res) {
                         console.log(res);
                         const data = res;
@@ -570,9 +570,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/callbattle/ActCallBattlePlatformAdminView.vue

@@ -108,7 +108,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listPlatformStat.action',
+                    url: '/admin/callBattle/listPlatformStat',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -156,9 +156,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/callbattle/ActCallBattleRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />金币
+                        当前库存 <span name="stock" id="stock" />钻石
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>
@@ -164,7 +164,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listActRecord.action',
+                    url: '/admin/callBattle/listActRecord',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -229,7 +229,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/callBattle/listRoundDrawDetail.action',
+                        url: '/admin/callBattle/listRoundDrawDetail',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -248,7 +248,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/callBattle/getStock.action",
+                        url: "/admin/callBattle/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -269,7 +269,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/callBattle/editStock.action",
+                        url: "/admin/callBattle/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },
@@ -290,9 +290,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/callbattle/ActCallBattleUserStatAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listUserDrawRecordList.action',
+                    url: '/admin/callBattle/listUserDrawRecordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -133,9 +133,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/car/CarAdminView.vue

@@ -168,7 +168,7 @@ export default {
                             return param;
                         },
                         toolbar: '#toolbar',
-                        url: '/admin/car/getUserCarPort.action',
+                        url: '/admin/car/getUserCarPort',
                         onLoadSuccess: function (data) {  //加载成功时执行
                             if (data.users) {
                                 var $user = $('#userMessage');
@@ -267,9 +267,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/car/CarGoodsAdminView.vue

@@ -33,7 +33,12 @@
                                 </select>
                             </div>
                         </div>
-
+                        <div class="col-sm-12">
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-3">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                        </div>
                         <div class="col-sm-12">
                             <button id="car-goods-refresh" class="btn btn-default">
                                 <i class="glyphicon glyphicon-search"></i>查询
@@ -59,6 +64,14 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="carGoodsForm">
                         <input type="hidden" name="id" id="id" />
+                        <div class="form-group">
+                            <label for="partitionFlag" class="col-sm-4 control-label">选择分区</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
+                                <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
+                                <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="carGoodsType" class="col-sm-3 control-label">座驾类型:</label>
                             <div class="col-sm-9">
@@ -76,6 +89,18 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="name">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ar_name" class="col-sm-3 control-label">阿语座驾名称</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control validate[required]" name="name" id="ar_name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="en_name" class="col-sm-3 control-label">英语座驾名称</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control validate[required]" name="name" id="en_name">
+                            </div>
+                        </div>
 
                         <div class="form-group">
                             <label class="col-sm-3 control-label">使用萝卜购买</label>
@@ -111,7 +136,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">使用金币购买</label>
+                            <label class="col-sm-3 control-label">使用钻石购买</label>
                             <div class="col-sm-9">
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="0">否</label>
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="1" checked>是</label>
@@ -122,7 +147,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="price" id="price">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -130,7 +155,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="renewPrice" id="renewPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
                         <div class="form-group">
                             <label for="originalPrice" class="col-sm-3 control-label">原价:</label>
@@ -138,7 +163,7 @@
                                 <input type="number" class="form-control" placeholder="没有填0" value="0" name="originalPrice"
                                     id="originalPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -374,6 +399,8 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "CarGoodsAdminView",
@@ -382,6 +409,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -407,7 +435,28 @@ export default {
                     columns: [
                         { field: 'tmp', title: 'id', align: 'center', checkbox: true, width: '5%' },
                         { field: 'id', title: '座驾ID', align: 'center', width: '5%' },
-                        { field: 'name', title: '座驾名称', align: 'center', width: '20%' },
+                        {field: 'name.zh', title: '座驾名称', align: 'center', width: '20%'},
+                        {field: 'name.ar', title: '阿语座驾名称', align: 'center', width: '20%'},
+                        {field: 'name.en', title: '英语座驾名称', align: 'center', width: '20%'},
+                        {
+                            field: 'partitionFlag', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if ((val & 1) != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if ((val & 2) != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if ((val & 4) != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
                         {
                             field: 'carGoodsType', title: '座驾类型', align: 'center', width: '20%',
                             formatter: function (val) {
@@ -420,7 +469,7 @@ export default {
                         },
                         {
                             field: 'goldSale',
-                            title: '金币购买',
+                            title: '钻石购买',
                             align: 'center',
                             width: '3%',
                             formatter: function (val, row, index) {
@@ -448,9 +497,9 @@ export default {
                                 }
                             }
                         },
-                        { field: 'originalPrice', title: '原价（金币）', align: 'center', width: '5%' },
-                        { field: 'price', title: '购买价格（金币）', align: 'center', width: '5%' },
-                        { field: 'renewPrice', title: '续费价格（金币）', align: 'center', width: '5%' },
+                        { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
+                        { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
+                        { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
                         { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
@@ -523,12 +572,43 @@ export default {
                             searchText: params.searchText,
                             carGoodsName: $("#query_carGoodsName").val(),
                             carGoodsType: $("#query_carGoodsType").val(),
-                            enable: $("condition_type").val()
+                            enable: $("condition_type").val(),
+                            partitionId: $('#partitionId').val(),
                         };
                         return param;
                     },
+                    ajax:function(request){                    //使用ajax请求
+                        $.ajax({
+                            type:"GET",
+                            url:'/admin/car/goods?enable=' + ComboboxHelper.getSelected("#condition_type"),
+                            contentType:'application/json;charset=utf-8',
+                            dataType:'json',
+                            data: request.data,
+                            success:function (res) {
+                                console.log(res);
+                                request.success({
+                                    "rows": res.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(value);
+                                        } else {
+                                            i.name = {
+                                                zh: value,
+                                                ar: value,
+                                                en: value,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
+                                });
+                            },
+                            error:function(error){
+                                console.log(error);
+                            }
+                        })
+                    },
                     toolbar: '#toolbar',
-                    url: '/admin/car/goods.action',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -547,7 +627,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/car/goods/deletion.action",
+                            url: "/admin/car/goods/deletion",
                             data: {'ids': JSON.stringify([id])},
                             dataType: "json",
                             success: function (json) {
@@ -581,7 +661,12 @@ export default {
                     $("#viewFileInfo").html('');
 
                     $("#id").val('');
+                    $('#name').val('');
+                    $('#ar_name').val('');
+                    $('#en_name').val('');
                     $("#name").attr('readonly', false);
+                    $("#ar_name").attr('readonly', false);
+                    $("#en_name").attr('readonly', false);
                     // $("#price").attr('readonly', false);
                     // $("#renewPrice").attr('readonly', false);
                     $("#seq").val('');
@@ -602,7 +687,10 @@ export default {
                     $("input:radio[name='isMonsterLimit']")[0].checked = true;
                     $("input:radio[name='isWeekStarLimit']")[0].checked = true;
                     $("input:radio[name='isActivityLimit']")[0].checked = true;
-                    
+
+                    $('input[name="partitionFlag"]').each(function() {
+                        $(this).checked = false;
+                    });
                     $("#nobleId").btComboBox('disable');
                     ComboboxHelper.setDef("#nobleId", '0');
 
@@ -620,7 +708,7 @@ export default {
                 })
 
                 $("#car-goods-refresh").click(function () {
-                    $("#table").bootstrapTable('refresh', { url: '/admin/car/goods.action' });
+                    $("#table").bootstrapTable('refresh', { url: '/admin/car/goods' });
                 })
 
                 /*$("#car-goods-multiDel").click(function () {
@@ -639,7 +727,7 @@ export default {
                     if (confirm("你确认批量删除该记录吗?" + "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/car/goods/deletion.action",
+                            url: "/admin/car/goods/deletion",
                             data: {'ids': JSON.stringify(idArr)},
                             dataType: "json",
                             success: function (json) {
@@ -756,7 +844,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/car/goods/" + id + ".action",
+                        url: "/admin/car/goods/" + id + "",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -770,7 +858,18 @@ export default {
                                 // $("#price").val(json.entity.price);
                                 // $("#renewPrice").val(json.entity.renewPrice);
                                 $("#days").val(json.entity.days);
-                                $("#name").val(json.entity.name);
+                                console.log(json.entity.name)
+                                let name = json.entity.name;
+                                if (name.startsWith('{') && name.endsWith('}')) {
+                                    var jsonName = JSON.parse(json.entity.name);
+                                    $("#name").val(jsonName.zh);
+                                    $("#ar_name").val(jsonName.ar);
+                                    $("#en_name").val(jsonName.en);
+                                } else {
+                                    $("#name").val(name);
+                                    $("#ar_name").val(name);
+                                    $("#en_name").val(name);
+                                }
                                 $("#price").val(json.entity.price);
                                 $("#renewPrice").val(json.entity.renewPrice);
                                 $("#seq").val(json.entity.seq);
@@ -881,6 +980,24 @@ export default {
                                     $("#viewFileInfo").html('未上传');
                                 }
 
+                                //分区
+                                let partitionFlag = json.entity.partitionFlag;
+                                if ((partitionFlag & 1) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[0].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[0].checked = false; 
+                                }
+                                if ((partitionFlag & 2) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[1].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[1].checked = false; 
+                                }
+                                if ((partitionFlag & 4) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[2].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[2].checked = false; 
+                                }
+
                                 // 打开编辑弹窗
                                 $("#cardGoodsModal").modal('show');
                             } else {
@@ -916,7 +1033,7 @@ export default {
                             return;
                         }
                         if (goldSale == 1 && (!price || !renewPrice || !originalPrice)) {
-                            $("#tipMsg").text("请填写完整金币价格");
+                            $("#tipMsg").text("请填写完整钻石价格");
                             $("#tipModal").modal('show');
                             return;
                         } else if (radishSale == 1 && (!radishPrice || !radishRenewPrice || !radishOriginalPrice)) {
@@ -949,18 +1066,46 @@ export default {
                             $("#tipModal").modal('show');
                             return;
                         }
+                        // 获取序列化字符串并转换为对象
+                        let formData = $('#carGoodsForm').serializeArray().reduce(function(obj, item) {
+                            obj[item.name] = item.value;
+                            return obj;
+                        }, {});
+
+                        var name = $("#name").val();
+                        // 阿语名称
+                        var ar_name = $("#ar_name").val();
+                        // 英语名称
+                        var en_name = $("#en_name").val();
+                        // 国际化字段
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        const nameValue = JSON.stringify(jsonName);
+                        // 修改属性值
+                        formData.name = nameValue; // 将giftName修改为"newGiftName"
+                        //分区
+                        const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
+                        let partitionFlag = 0;
+                        for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
+                            console.log(partitionFlagArray[i]);
+                            partitionFlag |= partitionFlagArray[i].value;
+                        }
+                        formData.partitionFlag = partitionFlag;
+                        // 将修改后的对象转换回序列化字符串
+                        let newSerializeStr = $.param(formData);
                         $.ajax({
                             type: "post",
-                            url: "/admin/car/goods.action",
-                            data: $('#carGoodsForm').serialize(),
+                            url: "/admin/car/goods",
+                            data: newSerializeStr,
                             dataType: "json",
                             success: function (json) {
-                                if (json.success == 'true') {
+                                if (json.code == 200) {
                                     $("#carGoodsModal").modal('hide');
                                     $("#tipMsg").text("保存成功");
                                     $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#cardGoodsModal").modal('hide');
+                                    setTimeout(function() {
+                                        TableHelper.doRefresh("#table");
+                                        $("#cardGoodsModal").modal('hide');
+                                    }, 1000); 
                                 } else {
                                     $("#tipMsg").text("保存失败." + json.msg);
                                     $("#tipModal").modal('show');
@@ -1033,11 +1178,26 @@ export default {
                 })
 
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
 };
 </script>
 

src/views/car/CarRecordView.vue

@@ -81,7 +81,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/carRecord/list.action',
+                            url: '/admin/carRecord/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -114,9 +114,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/car/CarStatisticsView.vue

@@ -59,7 +59,7 @@ export default {
                         { field: 'createTime', title: '日期', align: 'center', width: '5%' },
                         { field: 'carId', title: '座驾ID', align: 'center', width: '5%' },
                         { field: 'carName', title: '座驾名称', align: 'center', width: '5%' },
-                        { field: 'carPrice', title: '座驾金额(金币)', align: 'center', width: '5%' },
+                        { field: 'carPrice', title: '座驾金额(钻石)', align: 'center', width: '5%' },
                         { field: 'carRadishPrice', title: '座驾金额(萝卜)', align: 'center', width: '5%' },
                         { field: 'carStatus', title: '座驾状态', align: 'center', width: '5%' },
                         { field: 'receivedCarNum', title: '用户收到数量', align: 'center', width: '5%' },
@@ -85,7 +85,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/car/statisticsCar.action',
+                    url: '/admin/car/statisticsCar',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -125,9 +125,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/channel/ChannelContentPartitionAdminView.vue

@@ -230,7 +230,7 @@ export default {
                         },
                         uniqueId: 'id',
                         toolbar: '#toolbar',
-                        url: '/admin/channel/content/queryList.action',
+                        url: '/admin/channel/content/queryList',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -367,7 +367,7 @@ export default {
 
                         $.ajax({
                             type: "post",
-                            url: "/admin/channel/content/saveChannelContent.action",
+                            url: "/admin/channel/content/saveChannelContent",
                             data: {
                                 id: id,
                                 channel: channel,
@@ -409,7 +409,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/channel/content/getChannelContent.action",
+                        url: "/admin/channel/content/getChannelContent",
                         data: { id: id },
                         dataType: "json",
                         success: function (ret) {
@@ -450,7 +450,7 @@ export default {
                     var status = $(this).data('status');
                     $.ajax({
                         type: "post",
-                        url: "/admin/channel/content/toggleState.action",
+                        url: "/admin/channel/content/toggleState",
                         data: { id: id, status: status },
                         dataType: "json",
                         success: function (ret) {
@@ -489,9 +489,7 @@ export default {
 
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

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: '图标',
@@ -355,7 +372,7 @@ export default {
                                 if (row.chargeProds) {
                                     for (let i = 0, len = row.chargeProds.length; i < len; i++) {
                                         var chargeProd = row.chargeProds[i];
-                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账钻石:' + chargeProd.chargeGoldNum + '<br/>';
+                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账金币:' + chargeProd.chargeGoldNum + '<br/>';
                                     }
                                 }
                                 return value;
@@ -532,9 +549,9 @@ export default {
                                 $select.append($option);
                             }
                             $div.append($select);
-                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         } else {
-                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         }
                         $formGroup.append($div);
                         $form.append($formGroup);
@@ -569,9 +586,9 @@ export default {
                             $select.append($option);
                         }
                         $div.append($select);
-                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     } else {
-                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     }
                     $formGroup.append($div);
                     $form.append($formGroup);

src/views/charge/ChargeUserLimitView.vue

@@ -272,9 +272,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/charge/FirstChargeRewardConfigView.vue

@@ -73,7 +73,7 @@
                                     <option value="2">铭牌</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
-                                    <option value="5">额外钻石</option>
+                                    <option value="5">额外金币</option>
                                 </select>
                             </div>
                         </div>
@@ -97,7 +97,7 @@
                             <label for="modal_rewardNum" class="col-sm-3 control-label">奖励个数：</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control validate[required,custom[integer]]" name="rewardNum"
-                                    id="modal_rewardNum" placeholder="礼物、额外钻石输入个数">
+                                    id="modal_rewardNum" placeholder="礼物、额外金币输入个数">
                             </div>
                         </div>
                         <div class="form-group">
@@ -260,7 +260,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/first/charge/reward/list.action',
+                    url: '/admin/first/charge/reward/list',
                     onLoadSuccess: function (res) {
                         console.log(res)
                         $('.giveShowPrice').text(res.giveShowPrice);
@@ -290,7 +290,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/first/charge/reward/getId.action",
+                        url: "/admin/first/charge/reward/getId",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -321,7 +321,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/first/charge/reward/delete.action",
+                            url: "/admin/first/charge/reward/delete",
                             data: { id: id },
                             dataType: "json",
                             success: function (json) {
@@ -482,9 +482,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/charge/FirstChargeRewardRecordView.vue

@@ -114,7 +114,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/first/charge/reward/statistics.action',
+                    url: '/admin/first/charge/reward/statistics',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -196,7 +196,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/first/charge/reward/record.action',
+                        url: '/admin/first/charge/reward/record',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -215,7 +215,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/getStock.action",
+                        url: "/admin/luckySea/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -236,7 +236,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/editStock.action",
+                        url: "/admin/luckySea/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },
@@ -257,9 +257,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/charge/RedeemcodeAdminView.vue

@@ -41,7 +41,7 @@
                                         </div>
                                     </div>
                                     <div class="form-group">
-                                        <label for="amount" class="col-sm-3 control-label">金币大小:</label>
+                                        <label for="amount" class="col-sm-3 control-label">钻石大小:</label>
                                         <div class="col-sm-8">
                                             <input type="text" class="form-control  validate[required]" name="amount"
                                                 id="amount" value=10>
@@ -92,7 +92,7 @@ export default {
                         {
                             field: 'amount', title: '金额', align: 'center', width: '10%',
                             formatter: function (val, row, index) {
-                                return val + "金币";
+                                return val + "钻石";
                             }
                         },
                         {
@@ -154,7 +154,7 @@ export default {
                     },
                     uniqueId: 'code',
                     toolbar: '#toolbar',
-                    url: '/admin/redeemcode/getlist.action',
+                    url: '/admin/redeemcode/getlist',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -176,7 +176,7 @@ export default {
                     if ($("#roleForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/redeemcode/gener.action",
+                            url: "/admin/redeemcode/gener",
                             data: $('#roleForm').serialize(),
                             dataType: "json",
                             success: function (json) {
@@ -197,9 +197,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/chatbubble/ChatbubbleManageView.vue

@@ -23,7 +23,11 @@
 
                             <label for="name" class="col-sm-1 control-label">气泡名称:</label>
                             <div class="col-sm-2"><input type="text" class="form-control" name="name" id="name"></div>
-
+                            
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
 
                         </div>
                     </form>
@@ -53,6 +57,14 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="addForm">
                         <input type="hidden" name="id" id="modal_id" />
+                        <div class="form-group">
+                            <label for="partitionFlag" class="col-sm-4 control-label">选择分区</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
+                                <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
+                                <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="modal_type" class="col-sm-4 control-label">装扮类型:</label>
                             <div class="col-sm-6">
@@ -69,6 +81,18 @@
                                     placeholder="请输入气泡名称">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ar_modal_name" class="col-sm-4 control-label">阿语装扮名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name" id="ar_modal_name" placeholder="请输入气泡名称">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="en_modal_name" class="col-sm-4 control-label">英语装扮名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-4 control-label">安卓图片:</label>
                             <div class="col-sm-6">
@@ -155,6 +179,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "ChatbubbleManageView",
@@ -163,6 +189,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -173,7 +200,28 @@ export default {
                 $('#table').bootstrapTable({
                     columns: [
                         { field: 'id', title: '装扮id', align: 'middle', width: '5%' },
-                        { field: 'name', title: '装扮名称', align: 'middle', width: '5%' },
+                        {
+                            field: 'partitionFlag', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if ((val & 1) != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if ((val & 2) != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if ((val & 4) != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
+                        {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'},
+                        {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'},
+                        {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, 
                         {
                             field: 'iosUrl',
                             title: '装扮图片',
@@ -261,11 +309,43 @@ export default {
                             type: $('#type').val(),
                             name: $('#name').val(),
                             id: $('#id').val(),
+                            partitionId: $('#partitionId').val(),
                         };
                         return param;
                     },
+                    ajax:function(request){                    //使用ajax请求
+                        $.ajax({
+                            type:"GET",
+                            url:'/admin/chatbubble/listByPage',
+                            contentType:'application/json;charset=utf-8',
+                            dataType:'json',
+                            data: request.data,
+                            success:function (res) {
+                                console.log(res);
+                                request.success({
+                                    "rows": res.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(value);
+                                        } else {
+                                            i.name = {
+                                                zh: value,
+                                                ar: value,
+                                                en: value,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
+                                });
+                            },
+                            error:function(error){
+                                console.log(error);
+                            }
+                        })
+                    },
                     toolbar: '#toolbar',
-                    url: '/admin/chatbubble/listByPage',
+                    // url: '/admin/chatbubble/listByPage',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -286,12 +366,43 @@ export default {
                     // 赋值
                     $("#addForm #modal_id").val(row.id);
                     $("#addForm #modal_type").val(row.type);
-                    $("#addForm #modal_name").val(row.name);
+                    console.log(row.name)
+                    let name = row.name;
+                    if (Object.prototype.hasOwnProperty.call(name, 'zh') || Object.prototype.hasOwnProperty.call(name, 'ar') || Object.prototype.hasOwnProperty.call(name, 'en')) {
+                        $("#modal_name").val(row.name.zh);
+                        // 阿语名称
+                        $("#ar_modal_name").val(row.name.ar);
+                        // 英语名称
+                        $("#en_modal_name").val(row.name.en);
+                    } else {
+                        $("#modal_name").val(name);
+                        // 阿语名称
+                        $("#ar_modal_name").val(name);
+                        // 英语名称
+                        $("#en_modal_name").val(name);
+                    }
                     $('#addAndroidIconPicUrl').attr("src", row.androidUrl);
                     $("#addForm #androidUrl").val(row.androidUrl);
                     $('#addIosIconPicUrl').attr("src", row.iosUrl);
                     $("#addForm #iosUrl").val(row.iosUrl);
                     $("#addForm #status").val(row.status);
+                    //分区
+                    let partitionFlag = row.partitionFlag;
+                    if ((partitionFlag & 1) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[0].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[0].checked = false; 
+                    }
+                    if ((partitionFlag & 2) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[1].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[1].checked = false; 
+                    }
+                    if ((partitionFlag & 4) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[2].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[2].checked = false; 
+                    }
                     $("#addModal").modal('show');
                 });
 
@@ -332,13 +443,48 @@ export default {
                 $('#button-save').on('click', function () {
                     var androidUrl = $('#androidUrl').val();
                     var iosUrl = $('#iosUrl').val();
-                    var name = $('#modal_name').val();
+                    // 获取序列化字符串并转换为对象
+                    let formData = $('#addForm').serializeArray().reduce(function(obj, item) {
+                        obj[item.name] = item.value;
+                        return obj;
+                    }, {});
+
+                    var name = $("#modal_name").val();
+                    // 阿语名称
+                    var ar_name = $("#ar_modal_name").val();
+                    // 英语名称
+                    var en_name = $("#en_modal_name").val();
+                    // 国际化字段
+                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                    const nameValue = JSON.stringify(jsonName);
+                    // 修改属性值
+                    formData.name = nameValue; // 将giftName修改为"newGiftName"
+                    //分区
+                    const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
+                    let partitionFlag = 0;
+                    for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
+                        console.log(partitionFlagArray[i]);
+                        partitionFlag |= partitionFlagArray[i].value;
+                    }
+                    formData.partitionFlag = partitionFlag;
+                    // 将修改后的对象转换回序列化字符串
+                    let newSerializeStr = $.param(formData);
                     //做下数据校验
                     if (isEmpty(name)) {
                         $("#tipMsg").text("装扮名字不能为空");
                         $("#tipModal").modal('show');
                         return;
                     }
+                    if (isEmpty(ar_name)) {
+                        $("#tipMsg").text("阿语装扮名字不能为空");
+                        $("#tipModal").modal('show');
+                        return;
+                    }
+                    if (isEmpty(en_name)) {
+                        $("#tipMsg").text("英语装扮名字不能为空");
+                        $("#tipModal").modal('show');
+                        return;
+                    }
                     if (isEmpty(androidUrl) || isEmpty(iosUrl)) {
                         $("#tipMsg").text("图片不能为空");
                         $("#tipModal").modal('show');
@@ -349,14 +495,16 @@ export default {
                         $.ajax({
                             type: "post",
                             url: "/admin/chatbubble/saveOrUpdate",
-                            data: $("#addForm").serialize(),
+                            data: newSerializeStr,
                             dataType: "json",
                             success: function (json) {
                                 if (json.code === 200) {
                                     $("#tipMsg").text("保存成功");
                                     $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#addModal").modal('hide');
+                                    setTimeout(function() {
+                                        TableHelper.doRefresh("#table");
+                                        $("#addModal").modal('hide');
+                                    }, 1000); 
                                 } else {
                                     $("#tipMsg").text("保存失败，错误信息：" + json.message);
                                     $("#tipModal").modal('show');
@@ -378,6 +526,11 @@ export default {
                     $('#status').val('');
                     $('#modal_type').val('');
                     $('#modal_name').val('');
+                    $('#ar_modal_name').val('');
+                    $('#en_modal_name').val('');
+                    $('input[name="partitionFlag"]').each(function() {
+                        $(this).checked = false;
+                    });  
                 }
                 //判断空值
                 function isEmpty(data) {
@@ -405,7 +558,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/nameplate/sync.action",
+                        url: "/admin/nameplate/sync",
                         data: {
                             id: id
                         },
@@ -469,11 +622,26 @@ export default {
                     }
                 });
             });
-        }
-    },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
+    }, 
 };
 </script>
 

src/views/chatbubble/ChatbubbleRecordView.vue

@@ -51,7 +51,19 @@ export default {
                     columns: [
                         { field: 'id', title: 'id', visible: false, align: 'center', width: '5%' },
                         { field: 'bubbleId', title: '装扮ID', align: 'center', width: '5%' },
-                        { field: 'bubbleName', title: '装扮名称', align: 'center', width: '5%' },
+                        { 
+                            field: 'bubbleName', 
+                            title: '装扮名称', 
+                            align: 'center', 
+                            width: '5%',
+                            formatter: function (val) {
+                                let value = val;
+                                if (val && val.startsWith('{') && val.endsWith('}')) {
+                                    value = JSON.parse(val).zh;
+                                }
+                                return value;
+                            } 
+                        },
                         { field: 'erbanNo', title: '获得用户ID', align: 'center', width: '5%' },
                         { field: 'nick', title: '用户昵称', align: 'center', width: '5%' },
                         {
@@ -200,9 +212,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/discovery/DiscoveryAdminView.vue

@@ -381,7 +381,7 @@ export default {
                     if ($("#discoveryForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/discovery/saveOrUpdate.action',
+                            url: '/admin/discovery/saveOrUpdate',
                             data: {
                                 id: id,
                                 name: name,
@@ -428,7 +428,7 @@ export default {
                 var id = $(this).attr("data-id");
                 $.ajax({
                     type: "get",
-                    url: "/admin/discovery/getById.action",
+                    url: "/admin/discovery/getById",
                     data: { id: id },
                     dataType: "json",
                     success: function (json) {
@@ -527,7 +527,7 @@ export default {
                     "\r\n删除后再也不能找回，请谨慎操作！")) {
                     $.ajax({
                         type: 'post',
-                        url: "/admin/discovery/saveOrUpdate.action",
+                        url: "/admin/discovery/saveOrUpdate",
                         data: {
                             'id': id,
                             'status': '0'
@@ -548,9 +548,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 
 function clearForm(formId) {
@@ -566,7 +564,7 @@ function clearForm(formId) {
 function getGame() {
     $.ajax({
         type: 'get',
-        url: '/admin/discovery/queryGame.action',
+        url: '/admin/discovery/queryGame',
         data: {},
         dataType: 'json',
         success: function (json) {
@@ -757,7 +755,7 @@ function initTable() {
             return param;
         },
         toolbar: '#toolbar',
-        url: '/admin/discovery/list.action',
+        url: '/admin/discovery/list',
         onLoadSuccess: function () {  //加载成功时执行
             $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
             console.log("load success");

src/views/dressShop/DressShopAdminView.vue

@@ -119,7 +119,9 @@ export default {
                     columns: [
                         { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'name', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' },
+                        {field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%'},
+                        {field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%'},
+                        {field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%'},
                         {
                             field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%',
                             formatter: function (val, row, index) {
@@ -206,15 +208,28 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/dress/shop/list.action',
+                            url: '/admin/dress/shop/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
                             success: function (res) {
                                 apiResult(res);
+                                console.log(res)
                                 request.success({
-                                    rows: res.data.rows,
-                                    total: res.data.total,
+                                    "rows": res.data.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(i.name);
+                                        } else {
+                                            i.name = {
+                                                zh: i.name,
+                                                ar: i.name,
+                                                en: i.name,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
                                 });
                             },
                             error: function (req) {
@@ -256,7 +271,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/dress/shop/saveOrUpdate.action",
+                            url: "/admin/dress/shop/saveOrUpdate",
                             data: {
                                 id: id,
                                 dressId: dressId,
@@ -291,7 +306,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/dress/shop/getById.action",
+                        url: "/admin/dress/shop/getById",
                         data: { id: id },
                         dataType: "json",
                         success: function (res) {
@@ -407,9 +422,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/face/FaceJsonAdminView.vue

@@ -296,7 +296,7 @@ export default {
             }
             $.ajax({
                 type: "POST",
-                url: "/admin/faceJson/updateImg.action",
+                url: "/admin/faceJson/updateImg",
                 data: data,
                 cache: false,
                 contentType: false,    //不可缺
@@ -311,7 +311,7 @@ export default {
                         for (var j = 0; j <= json.length - 1; j++) {
                             $("#tipMsg").text("上传成功");
                             $("#tipModal").modal('show');
-                            var path = '/admin/faceJson/getPicInputStream.action?type=1&picName=' + json[j];
+                            var path = '/admin/faceJson/getPicInputStream?type=1&picName=' + json[j];
                             var info = json[j].split('.');
                             var name = info[0];
                             var nameSuffix = info[1];
@@ -340,7 +340,7 @@ export default {
         function deleteImg(val, valRes) {
             $.ajax({
                 type: "post",
-                url: "/admin/faceJson/deleteFile.action",
+                url: "/admin/faceJson/deleteFile",
                 data: {
                     picName: val + '.' + valRes,
                     type: 1,
@@ -390,7 +390,7 @@ export default {
                             formatter: function (val, row, index) {
                                 var info = val.split('.');
                                 if (info.length > 1) {
-                                    var a = '/admin/faceJson/getPicInputStream.action?picName=' + val;
+                                    var a = '/admin/faceJson/getPicInputStream?picName=' + val;
                                     return "<img src='" + a + "' width='40' height='40'>";
 
                                 }
@@ -461,7 +461,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/faceJson/list.action',
+                    url: '/admin/faceJson/list',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         if (json.code != 200) {
                             console.log(json.msg);
@@ -502,7 +502,7 @@ export default {
                         "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/faceJson/deletePatch.action",
+                            url: "/admin/faceJson/deletePatch",
                             data: {
                                 ids: JSON.stringify(idArr),
                             },
@@ -526,7 +526,7 @@ export default {
                         $("#tipModal").modal('show');
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/updateFaceInfo.action",
+                            url: "/admin/faceJson/updateFaceInfo",
                             data: {},
                             dataType: "json",
                             success: function (json) {
@@ -548,7 +548,7 @@ export default {
                         $("#tipModal").modal('show');
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/restoreFaceInfo.action",
+                            url: "/admin/faceJson/restoreFaceInfo",
                             data: {},
                             dataType: "json",
                             success: function (json) {
@@ -587,7 +587,7 @@ export default {
                     var id = $(this).attr("data-id");
                     var info = id.split('.');
                     if (info.length > 1) {
-                        var path = '/admin/faceJson/getPicInputStream.action?picName=' + id;
+                        var path = '/admin/faceJson/getPicInputStream?picName=' + id;
                         $("#img").attr("src", path);
                         $("#beforeImgName").val(id);
                         $("#afterImgName").val("");
@@ -596,7 +596,7 @@ export default {
                     else {
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/getFaceJsonItem.action",
+                            url: "/admin/faceJson/getFaceJsonItem",
                             data: {
                                 picName: id,
                             },
@@ -657,7 +657,7 @@ export default {
                         if (confirm("确认删除表情图片吗?")) {
                             $.ajax({
                                 type: "post",
-                                url: "/admin/faceJson/deleteFile.action",
+                                url: "/admin/faceJson/deleteFile",
                                 data: {
                                     picName: id,
                                     type: 2,
@@ -680,7 +680,7 @@ export default {
                         if (confirm("确认删除表情json吗(相应表情图片也将删除)?")) {
                             $.ajax({
                                 type: "post",
-                                url: "/admin/faceJson/deleteFaceJsonItem.action",
+                                url: "/admin/faceJson/deleteFaceJsonItem",
                                 data: {
                                     picName: id,
                                 },
@@ -704,7 +704,7 @@ export default {
                 $("#addImg").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/faceJson/addImg.action",
+                        url: "/admin/faceJson/addImg",
                         data: {},
                         dataType: "json",
                         success: function (json) {
@@ -726,7 +726,7 @@ export default {
                     var afterImgName = $("#afterImgName").val();
                     $.ajax({
                         type: "post",
-                        url: "/admin/faceJson/renameImg.action",
+                        url: "/admin/faceJson/renameImg",
                         data: {
                             beforeImgName: beforeImgName,
                             afterImgName: afterImgName,
@@ -773,7 +773,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/configFaceJsonSingle.action?jsonConfigType=" + jsonConfigType,
+                            url: "/admin/faceJson/configFaceJsonSingle?jsonConfigType=" + jsonConfigType,
                             data: {
                                 id: addFaceId,
                                 name: addFaceName,
@@ -815,9 +815,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/family/FamilyAdminView.vue

@@ -387,7 +387,7 @@ export default {
                     if ($("#addFamilyForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/family/saveOrUpdate.action',
+                            url: '/admin/family/saveOrUpdate',
                             data: {
                                 name: familyName,
                                 leader: leaderId,
@@ -518,7 +518,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/list.action',
+                    url: '/admin/family/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
                         console.log("load success");
@@ -534,7 +534,7 @@ export default {
                 var id = $(this).attr("data-id");
                 $.ajax({
                     type: "get",
-                    url: "/admin/family/getById.action",
+                    url: "/admin/family/getById",
                     data: { familyId: id },
                     dataType: "json",
                     success: function (json) {
@@ -601,7 +601,7 @@ export default {
                 if ($("#editFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             name: familyName,
@@ -647,7 +647,7 @@ export default {
                 if ($("#forbFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             status: 2,
@@ -687,7 +687,7 @@ export default {
                 if ($("#recoverFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             status: 1,
@@ -729,7 +729,7 @@ export default {
                 if ($("#dissFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/remove.action',
+                        url: '/admin/family/remove',
                         data: {
                             familyId: familyId
                         },
@@ -773,9 +773,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/family/FamilyMemberAdminView.vue

@@ -94,7 +94,7 @@ export default {
                         "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/family/member/del.action",
+                            url: "/admin/family/member/del",
                             data: {
                                 'ids': JSON.stringify(idArr),
                                 'familyIds': JSON.stringify(familyIdArr)
@@ -183,7 +183,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/member/list.action',
+                    url: '/admin/family/member/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         //复选框居中
                         $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
@@ -201,9 +201,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/family/FamilyMoneyAdminView.vue

@@ -222,7 +222,7 @@ export default {
                     //TODO 权限密码校验目前没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/money/update.action',
+                        url: '/admin/family/money/update',
                         data: {
                             familyId: familyId,
                             targetId: targetId,
@@ -277,7 +277,7 @@ export default {
                     //TODO 权限密码校验目前没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/money/update.action',
+                        url: '/admin/family/money/update',
                         data: {
                             familyId: familyId,
                             targetId: targetId,
@@ -317,7 +317,7 @@ export default {
                     //TODO 权限教研暂时没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             openMoney: 0,
@@ -354,7 +354,7 @@ export default {
                     //TODO 权限教研暂时没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             openMoney: 1,
@@ -448,7 +448,7 @@ export default {
                             return param;
                         },
                         toolbar: '#toolbar',
-                        url: '/admin/family/money/list.action',
+                        url: '/admin/family/money/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             //复选框居中
                             $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
@@ -472,9 +472,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/family/FamilyStatisticsView.vue

@@ -100,7 +100,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/statistics/list.action',
+                    url: '/admin/family/statistics/list',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -143,9 +143,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/finance/FinanceStatisticsView.vue

@@ -79,12 +79,12 @@ export default {
                                 }
                             }
                         },
-                        { field: 'goldIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
-                        { field: 'goldDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币余额', align: 'center', width: '5%' },
-                        { field: 'diamondIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
-                        { field: 'diamondDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'goldIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
+                        { field: 'goldDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'diamondIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
+                        { field: 'diamondDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币余额', align: 'center', width: '5%' },
                         { field: 'totalNum', title: '总额', align: 'center', width: '5%' },
                     ],
                     cache: false,
@@ -107,7 +107,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/finance/statistics.action',
+                    url: '/admin/finance/statistics',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         var updateTime = json.updateTime;
                         $("#version").html('财务数据' + '    ' + updateTime + '    更新');
@@ -185,9 +185,7 @@ export default {
             });
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/findlove/FindLovePlatformPrizeDataAdminView.vue

@@ -36,7 +36,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入钻石总数：</span>
+                            <span>用户投入金币总数：</span>
                             <span id="userInputDiamonds"></span>
                         </p>
                         <p>
@@ -193,7 +193,7 @@ export default {
                                 { field: 'date', title: '日期', align: 'center', valign: 'middle', width: '20%' },
                                 { field: 'peopleNum', title: '抽奖人数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                                { field: 'userInputDiamonds', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
+                                { field: 'userInputDiamonds', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'giftOutputDiamonds', title: '平台产出价值数', align: 'center', valign: 'middle', width: '10%' }
                             ],
                             cache: false,
@@ -228,9 +228,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/findlove/FindLovePoolItemAdminView.vue

@@ -627,9 +627,14 @@ export default {
                         if (res.code == 200) {
                             //console.log(res);
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    item.giftName = JSON.parse(giftName).zh;
+                                }
                                 // id对象存储
-                                var id = '' + res.data[i].giftId;
-                                giftMap[id] = res.data[i];
+                                var id = '' + item.giftId;
+                                giftMap[id] = item;
                             }
                             renderAwardOption()
                         }
@@ -823,9 +828,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/findlove/FindLovePrizeDrawRecordAdminView.vue

@@ -10,7 +10,7 @@
                 <div id="toolbar">
                     <div class="col-sm-12">
                         <div class="pull-left">
-                            <form action="/admin/findLove/data/export.action" id="searchForm">
+                            <form action="/admin/findLove/data/export" id="searchForm">
                                 平台号：<input type="text" id="msNo" name="msNo" class="input-sm" placeholder="请输入平台号">
 
                                 奖品名称：<input type="text" id="prizeName" name="prizeName" class="input-sm"
@@ -100,7 +100,7 @@ export default {
                             }
                         },
                         { field: 'level', title: '礼物等级', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'diamonds', title: '钻石单价', align: 'center', valign: 'middle', width: '10%' },
+                        { field: 'diamonds', title: '金币单价', align: 'center', valign: 'middle', width: '10%' },
                         {
                             field: 'poolType', title: '礼物组类型', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                                 switch (row.poolType) {
@@ -147,9 +147,7 @@ export default {
             })
         }
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/firstpage/FirstPageActivityBannerView.vue

@@ -8,24 +8,47 @@
                 <section class="content">
                     <div id="table"></div>
                     <div id="toolbar">
-                        跳转类型: <select name="skipType" id="skipType" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">跳转app内部</option>
-                            <option value="2">跳转房间</option>
-                            <option value="3">跳转H5页面</option>
-                        </select>
-                        状态: <select name="status" id="status" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">激活启用中</option>
-                            <option value="2">未激活</option>
-                        </select>
-                        app: <select name="app" id="app" class="input-m">
-                            <option value="">--全部--</option>
-                        </select>
-                        &nbsp;&nbsp;&nbsp;
-                        开始日期:&nbsp;&nbsp;<input type="text" name="timeBegin" id="beginTime" class="input-sm" value="">
-                        &nbsp;&nbsp;&nbsp;&nbsp;
-                        结束日期:&nbsp;&nbsp;<input type="text" name="timeEnd" id="endTime" class="input-sm" value="">
+                        <div class="col-sm-12">
+                            <label for="skipType" class="col-sm-1 control-label">跳转类型: </label>
+                            <div class="col-sm-2">
+                                <select name="skipType" id="skipType" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">跳转app内部</option>
+                                    <option value="2">跳转房间</option>
+                                    <option value="3">跳转H5页面</option>
+                                </select>
+                            </div>
+                            <label for="status" class="col-sm-1 control-label">状态:</label>
+                            <div class="col-sm-2">
+                                <select name="status" id="status" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">激活启用中</option>
+                                    <option value="2">未激活</option>
+                                </select>
+                            </div>
+                            <label for="app" class="col-sm-1 control-label">app:</label>
+                            <div class="col-sm-2">
+                                <select name="app" id="app" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                </select>
+                            </div>    
+                        </div>
+                        <div class="col-sm-12">
+                            <label for="beginTime" class="col-sm-1 control-label">开始日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeBegin" id="beginTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">结束日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeEnd" id="endTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                            
+                        </div>
+
                         <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
 
                         <button id="add" class="btn btn-default">
@@ -50,6 +73,14 @@
                 </div>
                 <div class="modal-body">
                     <form class="form-horizontal" id="bannerForm">
+                        <div id="bannerPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="name" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -205,6 +236,14 @@
                 </div>
                 <div class="modal-body">
                     <form id="addBannerForm" class="form-horizontal">
+                        <div id="bannerAddPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionAddCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="addName" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -354,6 +393,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 var app = {};
 var validApp = {};
@@ -393,6 +434,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -437,6 +479,7 @@ export default {
                     $('#table').bootstrapTable({
                         columns: [
                             { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' },
+                            {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'},
                             { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' },
                             { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' },
                             {
@@ -618,14 +661,14 @@ export default {
                                 bannerStatus: parseInt($('#status').val()),
                                 skipType: parseInt($('#skipType').val()),
                                 bannerType: 9,
-                                // appId: ($('#app').val()) ? $('#app').val() : null
+                                partitionId: $('#partitionId').val(),
                             };
                             //                console.log(param);
                             return param;
                         },
                         uniqueId: 'code',
                         toolbar: '#toolbar',
-                        url: '/admin/banner/list.action',
+                        url: '/admin/banner/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -646,39 +689,66 @@ export default {
                     $('.titleListDev').addClass("hidden");
                     var bannerId = parseInt($(this).data('id'));
                     isEdit = true;
-                    debugger
                     $.ajax({
-                        type: "get",
-                        url: "/admin/banner/get.action",
-                        data: { bannerId: bannerId },
-                        dataType: "json",
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
-                                var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                $('#name').val(json.data.bannerName);
-                                $('#imgUrl').attr('src', json.data.bannerPic);
-                                $('#bannerPic').val(json.data.bannerPic);
-                                $('#skipUrlSort').val(json.data.skipType);
-                                $('#skipUrlContent').val(json.data.skipUri);
-                                $("#bannerType").val(json.data.bannerType);
-                                $('#seqNo').val(json.data.seqNo);
-                                //$("#appId").val(json.data.appId);
-                                $('#iosVersion').val(json.data.iosVersion);
-                                $('#androidVersion').val(json.data.androidVersion);
-                                $('#noShowChannels').val(json.data.noShowChannels);
-                                $('#bannerStatus').val(json.data.bannerStatus);
-                                $('#startDate').val(startDate);
-                                $('#endDate').val(date);
-                                $('#bannerId').val(json.data.bannerId);
-                                $('#platform').val(json.data.platform);
-                                $('#limitLevelExper').val(json.data.limitLevelExper);
-                                $('#showType').val(json.data.showType);
-                                $('#showRule').val(json.data.showRule);
-                                window.selectOnChange(json.data.bannerType, json.data.titleId);
-                                $('#titleList').val(json.data.titleId);
-                                $('#bannerModal').modal('show');
-                                // picker1.datetimepicker('setStartDate', startDate);
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionCheck");
+                                partitionCheck.empty();
+                                // 分区
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id});
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox,label);
+                                }
+                                $.ajax({
+                                    type: "get",
+                                    url: "/admin/banner/get",
+                                    data: { bannerId: bannerId },
+                                    dataType: "json",
+                                    success: function (json) {
+                                        if (json.code == 200) {
+                                            var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            $('#name').val(json.data.bannerName);
+                                            $('#imgUrl').attr('src', json.data.bannerPic);
+                                            $('#bannerPic').val(json.data.bannerPic);
+                                            $('#skipUrlSort').val(json.data.skipType);
+                                            $('#skipUrlContent').val(json.data.skipUri);
+                                            $("#bannerType").val(json.data.bannerType);
+                                            $('#seqNo').val(json.data.seqNo);
+                                            //$("#appId").val(json.data.appId);
+                                            $('#iosVersion').val(json.data.iosVersion);
+                                            $('#androidVersion').val(json.data.androidVersion);
+                                            $('#noShowChannels').val(json.data.noShowChannels);
+                                            $('#bannerStatus').val(json.data.bannerStatus);
+                                            $('#startDate').val(startDate);
+                                            $('#endDate').val(date);
+                                            $('#bannerId').val(json.data.bannerId);
+                                            $('#platform').val(json.data.platform);
+                                            $('#limitLevelExper').val(json.data.limitLevelExper);
+                                            $('#showType').val(json.data.showType);
+                                            $('#showRule').val(json.data.showRule);
+                                            window.selectOnChange(json.data.bannerType, json.data.titleId);
+                                            $('#titleList').val(json.data.titleId);
+                                            // 分区信息
+                                            var partitionIds = json.data.partitionIds;
+                                            var length = partitionIds.length;
+                                            for (var i = 0; i < length; i++) {
+                                                $("#checkbox" + partitionIds[i]).prop('checked', true);
+                                            }
+                                            $('#bannerModal').modal('show');
+                                            // picker1.datetimepicker('setStartDate', startDate);
+                                        } else {
+                                            $("#tipMsg").text("获取信息出错");
+                                            $("#tipModal").modal('show');
+                                        }
+                                    }
+                                });
                             } else {
                                 $("#tipMsg").text("获取信息出错");
                                 $("#tipModal").modal('show');
@@ -732,7 +802,7 @@ export default {
                     if ($('#bannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#startDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#startDate').val()
                                 + "&endTimeString=" + $('#endDate').val(),
                             data: $('#bannerForm').serialize(),
                             dataType: 'json',
@@ -756,6 +826,32 @@ export default {
                     $('#addStartDate').val('');
                     $('#addEndDate').val('');
 
+                    // 分区处理
+                    $.ajax({
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.code == 200) {
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionAddCheck");
+                                partitionCheck.empty();
+                                // 创建3个checkbox元素并添加到myDiv元素上
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {
+                                        type: "checkbox",
+                                        id: "checkbox" + json.data[i].id,
+                                        name: "partitionIds",
+                                        value: json.data[i].id
+                                    });
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox, label);
+                                }
+                            }
+                        }
+                    });
+
                     // 处理appId
                     // $('#addAppId').empty();
                     // $('#addAppId').append('<option value="">请选择</option>');
@@ -780,7 +876,7 @@ export default {
                     if ($('#addBannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#addStartDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#addStartDate').val()
                                 + "&endTimeString=" + $('#addEndDate').val(),
                             data: $('#addBannerForm').serialize(),
                             dataType: 'json',
@@ -835,7 +931,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -852,7 +948,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -911,7 +1007,7 @@ export default {
                     if (confirm("你确认删除选中Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -938,7 +1034,7 @@ export default {
                     if (confirm("你确认删除Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -957,11 +1053,27 @@ export default {
                     }
                 })
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 

src/views/firstpage/FirstPageBannerView.vue

@@ -8,31 +8,56 @@
                 <section class="content">
                     <div id="table"></div>
                     <div id="toolbar">
-                        跳转类型: <select name="skipType" id="skipType" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">跳转app内部</option>
-                            <option value="2">跳转房间</option>
-                            <option value="3">跳转H5页面</option>
-                        </select>
-                        状态: <select name="status" id="status" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">激活启用中</option>
-                            <option value="2">未激活</option>
-                        </select>
-                        app: <select name="app" id="app" class="input-m">
-                            <option value="">--全部--</option>
-                        </select>
-                        banner位置: <select name="bannerType" id="searchBannerType" class="input-m">
-                            <option value="">--全部--</option>
-                            <option value="1">首页</option>
-                            <option value="2">房间内</option>
-                            <option value="3">我的装扮</option>
-                            <option value="10">个人中心</option>
-                        </select>
-                        &nbsp;&nbsp;&nbsp;
-                        开始日期:&nbsp;&nbsp;<input type="text" name="timeBegin" id="beginTime" class="input-sm" value="">
-                        &nbsp;&nbsp;&nbsp;&nbsp;
-                        结束日期:&nbsp;&nbsp;<input type="text" name="timeEnd" id="endTime" class="input-sm" value="">
+                        <div class="col-sm-12">
+                            <label for="skipType" class="col-sm-1 control-label">跳转类型: </label>
+                            <div class="col-sm-2">
+                                <select name="skipType" id="skipType" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">跳转app内部</option>
+                                    <option value="2">跳转房间</option>
+                                    <option value="3">跳转H5页面</option>
+                                </select>
+                            </div>
+                            <label for="status" class="col-sm-1 control-label">状态:</label>
+                            <div class="col-sm-2">
+                                <select name="status" id="status" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">激活启用中</option>
+                                    <option value="2">未激活</option>
+                                </select>
+                            </div>
+                            <label for="app" class="col-sm-1 control-label">app:</label>
+                            <div class="col-sm-2">
+                                <select name="app" id="app" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                </select>
+                            </div>    
+                        </div>
+                        <div class="col-sm-12">
+                            <label for="bannerType" class="col-sm-1 control-label">banner位置:</label>
+                            <div class="col-sm-2">
+                                <select name="bannerType" id="searchBannerType" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                    <option value="1">首页</option>
+                                    <option value="2">房间内</option>
+                                    <option value="3">我的装扮</option>
+                                    <option value="10">个人中心</option>
+                                </select>
+                            </div>
+                            <label for="beginTime" class="col-sm-1 control-label">开始日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeBegin" id="beginTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">结束日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeEnd" id="endTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                            
+                        </div>
                         <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
 
                         <button id="add" class="btn btn-default">
@@ -57,6 +82,14 @@
                 </div>
                 <div class="modal-body">
                     <form class="form-horizontal" id="bannerForm">
+                        <div id="bannerPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="name" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -215,6 +248,14 @@
                 </div>
                 <div class="modal-body">
                     <form id="addBannerForm" class="form-horizontal">
+                        <div id="bannerAddPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionAddCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="addName" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -367,6 +408,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 var app = {};
 var validApp = {};
@@ -407,6 +450,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -453,6 +497,7 @@ export default {
                         columns: [
                             { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' },
                             { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' },
+                            {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'},
                             { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' },
                             {
                                 field: 'bannerType', title: 'banner位置', align: 'center', valign: 'middle', width: '10%',
@@ -632,6 +677,7 @@ export default {
                                 bannerStatus: parseInt($('#status').val()),
                                 skipType: parseInt($('#skipType').val()),
                                 bannerType: $('#searchBannerType').val(),
+                                partitionId: $('#partitionId').val(),
                                 // appId: ($('#app').val()) ? $('#app').val() : null
                             };
                             //                console.log(param);
@@ -639,7 +685,7 @@ export default {
                         },
                         uniqueId: 'code',
                         toolbar: '#toolbar',
-                        url: '/admin/banner/list.action',
+                        url: '/admin/banner/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -665,36 +711,64 @@ export default {
                     // }
                     $.ajax({
                         type: 'get',
-                        url: '/admin/banner/get.action',
-                        data: { 'bannerId': id },
+                        url: '/partition/listPartitionInfo',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
-                                var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                $('#name').val(json.data.bannerName);
-                                $('#imgUrl').attr('src', json.data.bannerPic);
-                                $('#bannerPic').val(json.data.bannerPic);
-                                $('#skipUrlSort').val(json.data.skipType);
-                                $('#skipUrlContent').val(json.data.skipUri);
-                                $("#bannerType").val(json.data.bannerType);
-                                $('#seqNo').val(json.data.seqNo);
-                                //$("#appId").val(json.data.appId);
-                                $('#iosVersion').val(json.data.iosVersion);
-                                $('#androidVersion').val(json.data.androidVersion);
-                                $('#noShowChannels').val(json.data.noShowChannels);
-                                $('#bannerStatus').val(json.data.bannerStatus);
-                                $('#startDate').val(startDate);
-                                $('#endDate').val(date);
-                                $('#bannerId').val(json.data.bannerId);
-                                $('#platform').val(json.data.platform);
-                                $('#limitLevelExper').val(json.data.limitLevelExper);
-                                $('#showType').val(json.data.showType);
-                                $('#showRule').val(json.data.showRule);
-                                window.selectOnChange(json.data.bannerType, json.data.titleId);
-                                $('#titleList').val(json.data.titleId);
-                                $('#bannerModal').modal('show');
-                                // picker1.datetimepicker('setStartDate', startDate);
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionCheck");
+                                partitionCheck.empty();
+                                // 分区
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id});
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox,label);
+                                }
+                                $.ajax({
+                                    type: 'get',
+                                    url: '/admin/banner/get',
+                                    data: {'bannerId': id},
+                                    dataType: 'json',
+                                    success: function (json) {
+                                        if (json.code == 200) {
+                                            var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            $('#name').val(json.data.bannerName);
+                                            $('#imgUrl').attr('src', json.data.bannerPic);
+                                            $('#bannerPic').val(json.data.bannerPic);
+                                            $('#skipUrlSort').val(json.data.skipType);
+                                            $('#skipUrlContent').val(json.data.skipUri);
+                                            $("#bannerType").val(json.data.bannerType);
+                                            $('#seqNo').val(json.data.seqNo);
+                                            //$("#appId").val(json.data.appId);
+                                            $('#iosVersion').val(json.data.iosVersion);
+                                            $('#androidVersion').val(json.data.androidVersion);
+                                            $('#noShowChannels').val(json.data.noShowChannels);
+                                            $('#bannerStatus').val(json.data.bannerStatus);
+                                            $('#startDate').val(startDate);
+                                            $('#endDate').val(date);
+                                            $('#bannerId').val(json.data.bannerId);
+                                            $('#platform').val(json.data.platform);
+                                            $('#limitLevelExper').val(json.data.limitLevelExper);
+                                            $('#showType').val(json.data.showType);
+                                            $('#showRule').val(json.data.showRule);
+                                            window.selectOnChange(json.data.bannerType, json.data.titleId);
+                                            $('#titleList').val(json.data.titleId);
+                                            // 分区信息
+                                            var partitionIds = json.data.partitionIds;
+                                            var length = partitionIds.length;
+                                            for (var i = 0; i < length; i++) {
+                                                $("#checkbox" + partitionIds[i]).prop('checked', true);
+                                            }
+                                            $('#bannerModal').modal('show');
+                                            // picker1.datetimepicker('setStartDate', startDate);
+                                        } else {
+                                            $("#tipMsg").text("获取信息出错");
+                                            $("#tipModal").modal('show');
+                                        }
+                                    }
+                                })
                             } else {
                                 $("#tipMsg").text("获取信息出错");
                                 $("#tipModal").modal('show');
@@ -746,7 +820,7 @@ export default {
                     if ($('#bannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#startDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#startDate').val()
                                 + "&endTimeString=" + $('#endDate').val(),
                             data: $('#bannerForm').serialize(),
                             dataType: 'json',
@@ -770,6 +844,32 @@ export default {
                     $('#addStartDate').val('');
                     $('#addEndDate').val('');
 
+                    // 分区处理
+                    $.ajax({
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.code == 200) {
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionAddCheck");
+                                partitionCheck.empty();
+                                // 创建3个checkbox元素并添加到myDiv元素上
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {
+                                        type: "checkbox",
+                                        id: "checkbox" + json.data[i].id,
+                                        name: "partitionIds",
+                                        value: json.data[i].id
+                                    });
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox, label);
+                                }
+                            }
+                        }
+                    })
+
                     // 处理appId
                     // $('#addAppId').empty();
                     // $('#addAppId').append('<option value="">请选择</option>');
@@ -798,7 +898,7 @@ export default {
                     if ($('#addBannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#addStartDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#addStartDate').val()
                                 + "&endTimeString=" + $('#addEndDate').val(),
                             data: $('#addBannerForm').serialize(),
                             dataType: 'json',
@@ -853,7 +953,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -870,7 +970,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -929,7 +1029,7 @@ export default {
                     if (confirm("你确认删除选中Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -956,7 +1056,7 @@ export default {
                     if (confirm("你确认删除Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -975,11 +1075,27 @@ export default {
                     }
                 })
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
-    unmounted() {
-        $('#table').bootstrapTable('destroy');
-    }
+
 };
 </script>
 
@@ -1029,4 +1145,10 @@ export default {
     height: 100%;
     vertical-align: top;
 }
+
+.partition-checkbox-label {    
+    margin-right: 10px;    
+    margin-left: 5px;
+}
+
 </style>