eoss-ui 0.6.29 → 0.6.31

package/packages/login/src/main.vue

@@ -831,9 +831,9 @@ export default {
       return { 'background-image': `url(${img})` };
     },
     showForget() {
-      return this.forget && typeof this.forget === 'string'
+      return this.forgetUrl && typeof this.forgetUrl === 'string'
         ? true
-        : this.forget === true &&
+        : this.forgetUrl === true &&
             (this.loginModel.indexOf('11') > -1 ||
               this.loginModel.indexOf('6') > -1);
     }
@@ -1284,7 +1284,15 @@ export default {
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
-        this.forgetUrl = res.subsystemExtend.look_pass_url;
+        //忘记密码地址
+        if (
+          res.subsystemExtend.forgetPassUrl ||
+          res.subsystemExtend.look_pass_url
+        ) {
+          this.forgetUrl =
+            res.subsystemExtend.forgetPassUrl ||
+            res.subsystemExtend.look_pass_url;
+        }
         res.subsystemExtend.loginPage &&
           sessionStorage.setItem('loginPage', res.subsystemExtend.loginPage);
         if (res.subsystemExtend.login_url) {
@@ -1628,7 +1636,7 @@ export default {
         });
     },
     handleForget() {
-      if (typeof this.forget === 'string') {
+      if (typeof this.forgetUrl === 'string') {
         util.win.open(this.forgetUrl);
       } else {
         this.showResetPassword = true;
@@ -1752,7 +1760,7 @@ export default {
           )
             .then(() => {
               this.operationCheckCode = results.checkCode;
-              if (typeof this.forget === 'string') {
+              if (typeof this.forgetUrl === 'string') {
                 util.win.open(this.forgetUrl);
               } else {
                 this.showResetPassword = true;

package/packages/main/src/default/index.vue

@@ -876,7 +876,7 @@ export default {
           }
           if (results[i].webPageWatermark) {
             try {
-              util.win.top.webPageWatermark = results[i].webPageWatermark;
+              util.win.webPageWatermark = results[i].webPageWatermark;
               util.watermark(results[i].webPageWatermark);
             } catch (error) {
               util.win.postMessage(
@@ -1992,20 +1992,20 @@ export default {
               if (i === 'onlineUserNums' && data[i] > 0) {
                 this.online = data[i];
               }
-              if (i === 'sysMsgNums') {
+              if (i === 'sysMsgNums' && data[i] !== null) {
                 this.notice = data[i];
                 if (this.showMsg) {
                   this.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
+              if (i === 'menuTipsMap' && data[i] !== null) {
                 this.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
+              if (i === 'sysMsgList' && data[i] !== null) {
                 this.sysMsg = data[i];
                 data[i] && data[i].length && this.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
+              if (i === 'extraData' && data[i] !== null) {
                 this.extraData = data[i];
               }
             }

package/packages/main/src/simplicity/index.vue

@@ -38,7 +38,10 @@
             :title="item.text || item.name"
             @click="handlerClickApp(item)"
           >
-            <el-badge v-bind="getBadge(item)">
+            <el-badge
+              class="es-simplicity-side-app-badge"
+              v-bind="getBadge(item)"
+            >
               <es-icon
                 class="es-simplicity-side-app-icon"
                 :contents="item.icons || item.icon || menuIcon"
@@ -844,7 +847,7 @@ export default {
           }
           if (results[i].webPageWatermark) {
             try {
-              util.win.top.webPageWatermark = results[i].webPageWatermark;
+              util.win.webPageWatermark = results[i].webPageWatermark;
               util.watermark(results[i].webPageWatermark);
             } catch (error) {
               util.win.postMessage(
@@ -1245,6 +1248,10 @@ export default {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
@@ -1254,6 +1261,10 @@ export default {
           });
           if (flag) {
             this.$set(obj, 'tips', flag);
+            this.setDot(this.userApps, obj.appCode);
+            this.setDot(this.applications, obj.appCode);
+            this.setDot(this.business, obj.appCode);
+            this.setDot(this.systems, obj.appCode);
             return flag;
           }
         } else {
@@ -1269,6 +1280,15 @@ export default {
       }
       return false;
     },
+    setDot(obj, code) {
+      if (Array.isArray(obj)) {
+        obj.forEach((item) => {
+          this.setDot(item, code);
+        });
+      } else if (obj.code === code) {
+        this.$set(obj, 'tips', true);
+      }
+    },
     /**
      * @desc:获取气泡提醒
      * @author huangbo
@@ -1303,20 +1323,20 @@ export default {
               if (i === 'onlineUserNums' && data[i] > 0) {
                 this.userNums = data[i];
               }
-              if (i === 'sysMsgNums') {
+              if (i === 'sysMsgNums' && data[i] !== null) {
                 this.notice = data[i];
                 if (this.showMsg) {
                   this.$refs.message.getMsg(true);
                 }
               }
-              if (i === 'menuTipsMap') {
+              if (i === 'menuTipsMap' && data[i] !== null) {
                 this.menuTips = data[i];
               }
-              if (i === 'sysMsgList') {
+              if (i === 'sysMsgList' && data[i] !== null) {
                 this.sysMsg = data[i];
                 data[i] && data[i].length && this.$emit('bus-emit', 'waitdone');
               }
-              if (i === 'extraData') {
+              if (i === 'extraData' && data[i] !== null) {
                 this.extraData = data[i];
               }
             }