Merge remote-tracking branch 'origin/detached' into 6-29印度股票

dcc

2024-08-01 285788e3a2ed86c8599ba146ad9c388363d54921

Merge remote-tracking branch 'origin/detached' into 6-29印度股票

# Conflicts:
#	src/App.vue
#	src/page/login/login.vue

 src/App.vue

@@ -45,7 +45,7 @@
  },
  name: "App",
  created() {
    // this.setUseInfo();
    //this.setUseInfo();
    this.$state.theme = "red";
    let title = this.$route.meta.title || this.$t("hj224");
    this.title = title;

 src/page/login/login.vue

@@ -170,8 +170,11 @@
  font-weight: 400;
  font-size: 0.37333rem;
  color: #8c9fad;
  margin: 20px auto;
  margin: 0.4rem auto;
  padding: 0.34667rem 0.4rem;
  width: 100%;
  height: 6rem;
  text-align: center;
  span {
    color: rgb(5, 106, 239);
  }