Merge branch 'allTestUrgent' of http://124.70.211.186:3000/zhangqi/yos_web into allTestUrgent

# Conflicts:
#	src/components/newLayout/modules/header.vue
#	src/views/login/login.vue

package-lock.json

@@ -35,7 +35,7 @@
         "viewerjs": "^1.11.6",
         "vue": "^2.6.14",
         "vue-countupjs": "^1.0.0",
-        "vue-i18n": "^5.0.3",
+        "vue-i18n": "^8.27.0",
         "vue-image-viewer": "^1.1.8",
         "vue-router": "^3.5.1",
         "vuex": "^3.6.2",
@@ -15918,9 +15918,9 @@
       "dev": true
     },
     "node_modules/vue-i18n": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-5.0.3.tgz",
-      "integrity": "sha512-oe7vFjrsnQcEqXBIfbqopK7Dclgq2LjUdg3ke9AtIvxNBvrc3W02uC9+hyjLg7zWsMFhCWTTj6b0fIAUiOI8AA=="
+      "version": "8.28.2",
+      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz",
+      "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
     },
     "node_modules/vue-image-viewer": {
       "version": "1.1.8",
@@ -29398,9 +29398,9 @@
       "dev": true
     },
     "vue-i18n": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-5.0.3.tgz",
-      "integrity": "sha512-oe7vFjrsnQcEqXBIfbqopK7Dclgq2LjUdg3ke9AtIvxNBvrc3W02uC9+hyjLg7zWsMFhCWTTj6b0fIAUiOI8AA=="
+      "version": "8.28.2",
+      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz",
+      "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
     },
     "vue-image-viewer": {
       "version": "1.1.8",

src/components/newLayout/index.vue

@@ -144,7 +144,7 @@ export default {
   mounted() {
 
     if (JSON.parse(sessionStorage.getItem('active_password')) == '1' && JSON.parse(sessionStorage.getItem('password')) != '1'){
-      if (JSON.parse(sessionStorage.getItem('active_account')).usertype == 0 && JSON.parse(sessionStorage.getItem('active_account')).usertype == 1 && JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY'){
+      if (JSON.parse(sessionStorage.getItem('active_account')).usertype == 0 && JSON.parse(sessionStorage.getItem('active_account')).usertype == 1 && (JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1')){
         this.dialogVisible = false
       }else {
         this.dialogVisible = true