Merge remote-tracking branch 'origin/master' into dev

yaowanxin

3 天以前 94227d6729a9c489730435e406e3238354dec334

 src/views/login.vue

@@ -181,8 +181,8 @@
<style lang='scss' scoped>

.login {

  height: 100%;

  background-image: url("../assets/indexViews/DHDCView.png");

  background-size: 100% 100%;

  background-image: url("../assets/indexViews/JZYJView.png");

  background-size: cover;

  position: relative;

}

.title {