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

gaoluyang

昨天 373244688c435c149f34b29fed625926369567ea

 src/views/login.vue

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

.login {

  height: 100%;

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

  background-image: url("../assets/images/login-background.png");

  background-size: cover;

  position: relative;

}