Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/.env

 # 易政秀
-VUE_APP_API_ES_URL=http://8.136.255.30
+VUE_APP_API_ES_URL=http://www.ezxiu.cn
 # 系统名称
 VUE_APP_systemName = 智慧大厅集成化综合管理平台
\ No newline at end of file

portal-manager-ui/admin/src/api/customer.js

 import http from "../request/http";
-let baseURL = "http://8.136.255.30"
+let baseURL = process.env.VUE_APP_API_ES_URL;
 let proURL = process.env.VUE_APP_API_BASE_URL;
 
 // 查询客户管理列表

portal-manager-ui/admin/src/components/licenseHint/index.js

@@ -4,7 +4,9 @@ import store from "@/store"; // 导入 Vuex store 实例
 const licenseHintModal = vue.extend(LicenseHintModal);
 function showLicenseHintModal(duration = 5) {
   const existingModal = document.getElementById("licenseHintModal");
-  if (!existingModal) {
+  if (existingModal) {
+    document.body.removeChild(existingModal);
+  }
   const dom = new licenseHintModal({
     store,
     el: document.createElement("div"),
@@ -16,7 +18,6 @@ function showLicenseHintModal(duration = 5) {
   });
   dom.$el.id = "licenseHintModal";
   document.body.appendChild(dom.$el);
-  }
 }
 
 function registryModal() {

portal-manager-ui/admin/src/components/watermark/index.js

@@ -12,7 +12,9 @@ let defaultParams = {
 };
 function showWatermarkCom(watermark = defaultParams) {
   const existingModal = document.getElementById("Watermark");
-  if (!existingModal) {
+  if (existingModal) {
+    document.body.removeChild(existingModal);
+  }
   const dom = new watermarkCom({
     store,
     el: document.createElement("div"),
@@ -24,7 +26,6 @@ function showWatermarkCom(watermark = defaultParams) {
   });
   dom.$el.id = "Watermark";
   document.body.appendChild(dom.$el);
-  }
 }
 
 function registryCom() {

portal-manager-ui/admin/src/router/index.js

@@ -26,18 +26,18 @@ router.beforeEach(async (to, from, next) => {
   // let routerPath = store.getters["user/routerList"];
   // let toRootPathArr = to.matched.map((v) => v.path);
   // let bol = hasIntersection(toRootPathArr, routerPath);
-  let date = moment().format("YYYY-MM-DD");
-  let getDate = store.getters["user/licenseInfo"].date;
-  if (!getDate || date != getDate) {
-    await store.dispatch("user/checkCipher");
-  }
-  let licenseInfo = store.getters["user/licenseInfo"];
-  if (licenseInfo.isExpire) {
-    // 打开弹窗
-    Vue.prototype.$licenseHintModal();
-    // 打开水印
-    Vue.prototype.$watermark();
-  }
+  // let date = moment().format("YYYY-MM-DD");
+  // let getDate = store.getters["user/licenseInfo"].date;
+  // if (!getDate || date != getDate) {
+  //   await store.dispatch("user/checkCipher");
+  // }
+  // let licenseInfo = store.getters["user/licenseInfo"];
+  // if (licenseInfo.isExpire) {
+  //   // 打开弹窗
+  //   Vue.prototype.$licenseHintModal();
+  //   // 打开水印
+  //   Vue.prototype.$watermark();
+  // }
   if (islogin) {
     next();
     // if (routerPath.includes(to.path) || bol) {