Merge branch 'dev-2.23.0' of depot-qinghai/depot-vue-qinghai into dev

src/components/common/topMenu.vue

@@ -165,11 +165,11 @@ export default {
     openMenu(item, index) {
       console.log('open menu', item, index)
       if (['crk', '/crk'].indexOf(item.funcUrl) >= 0) {
-        this.$store.state.flag = 1;
-        return
-        // return this.$systemUtils.gotoCrkSystem(this)
+        // this.$store.state.flag = 1;
+        // return
+        return this.$systemUtils.gotoCrkSystem(this)
       }else {
-        this.$store.state.flag = 2;
+        // this.$store.state.flag = 2;
       }
       if (this.$store.state.user.topMenuIndex === index) return
       this.$store.commit('SET_TOP_MENU_INDEX', index)

src/page/Layout/layout.vue

@@ -55,9 +55,6 @@ export default {
       u: localStorage.getItem("_userName"),
       p: localStorage.getItem("_password"),
       clientHeight: document.documentElement.clientHeight,
-      // url: `http://101.36.160.210:31055/crk/?ku_username=${u}&ku_password=${p}`,
-      // url: `http://localhost:9528/crk/welcome/?username=${u}&password=${p}`,
-      // url: `http://101.36.160.210:31055/crk/?ku_username=${u}&ku_password=${p}`,
       url: `http://101.36.160.210:31055/crk/#/welcome?username=${u}&password=${p}`,
     };
   },