Skip to content

C
CivWeb
Commit 2698d400 authored by 崔佳豪's avatar 崔佳豪
Browse files
Options

Merge branch 'dev' into 'master'

Dev See merge request !12
parents 15bf6989 91abc7fb
Pipeline #59707 passed with stages
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 181 additions and 170 deletions
          src/pages/user/login/template/project/erlianhaote/index.js
          View file @ 2698d400
          ...@@ -153,7 +153,7 @@ const Login = forwardRef((props, _ref) => { ...@@ -153,7 +153,7 @@ const Login = forwardRef((props, _ref) => {
          <title>{props.global.title || defaultSetting.title}</title> <title>{props.global.title || defaultSetting.title}</title>
          <meta name="description" content={props.global.title || defaultSetting.title} /> <meta name="description" content={props.global.title || defaultSetting.title} />
          </Helmet> </Helmet>
          <div className={styles.login}> <div classnames={(styles.erlianhaotelogin, "erlianhaote")}>
          <div className={styles['inner-wrapper']}> <div className={styles['inner-wrapper']}>
          <div className={styles['left-imgbox']}></div> <div className={styles['left-imgbox']}></div>
          <div className={styles['inner-center']}> <div className={styles['inner-center']}>
          ......
          src/pages/user/login/template/project/xingan/index.js
          View file @ 2698d400
          ...@@ -152,7 +152,7 @@ const Login = forwardRef((props, _ref) => { ...@@ -152,7 +152,7 @@ const Login = forwardRef((props, _ref) => {
          <title>{props.global.title || defaultSetting.title}</title> <title>{props.global.title || defaultSetting.title}</title>
          <meta name="description" content={props.global.title || defaultSetting.title} /> <meta name="description" content={props.global.title || defaultSetting.title} />
          </Helmet> </Helmet>
          <div className={styles.login}> <div className={styles.xinganlogin}>
          <div className={styles['inner-wrapper']}> <div className={styles['inner-wrapper']}>
          {/* <div className={styles['left-imgbox']}></div> */} {/* <div className={styles['left-imgbox']}></div> */}
          <div className={styles['inner-center']}> <div className={styles['inner-center']}>
          ......
          src/pages/user/login/template/project/xingan/index.less
          View file @ 2698d400
          ...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
          src: url('@/assets/fonts/PingFang.ttf'); src: url('@/assets/fonts/PingFang.ttf');
          } }
          .login { .xinganlogin {
          width: 100%; width: 100%;
          height: 100%; height: 100%;
          background: url('./images/6.png') no-repeat; background: url('./images/6.png') no-repeat;
          ...@@ -15,40 +15,193 @@ ...@@ -15,40 +15,193 @@
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          }
          .login .inner-bg { .inner-bg {
          width: 100%; width: 100%;
          height: 100%; height: 100%;
          &>div {
          width: 70%;
          margin: 0 auto;
          }
          }
          .inner-wrapper {
          // width: 800px;
          // height: 400px;
          display: flex;
          justify-content: center;
          align-items: center;
          border-radius: 10px;
          position: absolute;
          bottom: 20%;
          // top: 46%;
          // right: 0;
          // transform: translateY(-50%);
          }
          .inner-bg .title {
          font-size: 27px;
          font-weight: bold;
          color: rgba(255, 255, 255, 1);
          letter-spacing: 2px;
          }
          .form-control:focus {
          border-color: #66afe9;
          outline: 0;
          -webkit-box-shadow: none;
          box-shadow: none;
          }
          .inner-center {
          position: relative;
          width: 482px;
          height: 316px;
          background: rgba(255,255,255,0.3);
          border: 1px solid #FFFFFF;
          box-shadow: 0px 15px 15px 3px rgba(140,142,145,0.52);
          border-radius: 15px;
          }
          .welcome-title{
          width: 100%;
          height: 68px;
          line-height: 68px;
          font-size: 24px;
          font-family: PingFang SC;
          font-weight: bold;
          color: #000000;
          opacity: 0.85;
          text-align: center;
          }
          .formgroup2 {
          display: flex;
          align-items: center;
          display: flex;
          margin: 0px 5.5%;
          margin-bottom: 10%;
          align-items: center;
          margin-bottom: 40px;
          }
          &>div { .APPcodeBox {
          width: 70%; width: 100%;
          display: flex;
          flex-flow: column;
          align-items: center;
          cursor: pointer;
          position: relative;
          }
          .APPCtext {
          font-size: 14px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #000000;
          line-height: 30px;
          opacity: 0.75;
          }
          .login-header{
          width: 100%;
          position: absolute;
          top: 4%;
          display: flex;
          justify-content: center;
          align-items: center;
          margin: 0 auto; margin: 0 auto;
          .left-title{
          display: flex;
          justify-content: center;
          align-items: center;
          .cn-title{
          font-size: 48px;
          font-family: PingFang SC;
          font-weight: bold;
          color: #A6D1FF;
          background: linear-gradient(180deg, #00B3FF 0%, #0173B7 100%);
          -webkit-background-clip: text;
          -webkit-text-fill-color: transparent;
          margin-bottom: 25px;
          }
          .logo-png{
          width: 107px;
          height: 111px;
          }
          }
          .right-timebox{
          display: flex;
          justify-content: center;
          align-items: center;
          height: 60px;
          .curr-time{
          width: 140px;
          font-size: 36px;
          font-family: Microsoft YaHei;
          font-weight: 300;
          color: #FFFFFF;
          }
          .curr-week-date{
          margin-left: 10px;
          .curr-week{
          font-size: 16px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #FFFFFF;
          }
          .curr-date{
          font-size: 14px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #FFFFFF;
          }
          }
          }
          }
          .copyright{
          position: absolute;
          bottom: 7%;
          width: 100%;
          margin: 0 auto;
          font-size: 12px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #F1F6FD;
          text-align: center;
          }
          .qrcode-box{
          position: absolute;
          bottom: 0;
          right: -35px;
          width: 35px;
          height: 35px;
          background: #FFFFFF;
          opacity: 0.8;
          cursor: pointer;
          }
          :global{
          .@{ant-prefix}-popover-inner-content{
          display: flex;
          justify-content: center;
          align-items: center;
          }
          .@{ant-prefix}-popover-title{
          display: flex;
          justify-content: center;
          align-items: center;
          }
          } }
          } }
          .inner-wrapper {
          // width: 800px;
          // height: 400px;
          display: flex;
          justify-content: center;
          align-items: center;
          border-radius: 10px;
          position: absolute;
          bottom: 20%;
          // top: 46%;
          // right: 0;
          // transform: translateY(-50%);
          }
          .login .inner-bg .title {
          font-size: 27px;
          font-weight: bold;
          color: rgba(255, 255, 255, 1);
          letter-spacing: 2px;
          }
          @keyframes waving { @keyframes waving {
          from { from {
          ...@@ -70,151 +223,10 @@ ...@@ -70,151 +223,10 @@
          } }
          } }
          .form-control:focus {
          border-color: #66afe9;
          outline: 0;
          -webkit-box-shadow: none;
          box-shadow: none;
          }
          .inner-center {
          position: relative;
          width: 482px;
          height: 316px;
          background: rgba(255,255,255,0.3);
          border: 1px solid #FFFFFF;
          box-shadow: 0px 15px 15px 3px rgba(140,142,145,0.52);
          border-radius: 15px;
          }
          .welcome-title{
          width: 100%;
          height: 68px;
          line-height: 68px;
          font-size: 24px;
          font-family: PingFang SC;
          font-weight: bold;
          color: #000000;
          opacity: 0.85;
          text-align: center;
          }
          .formgroup2 {
          display: flex;
          align-items: center;
          display: flex;
          margin: 0px 5.5%;
          margin-bottom: 10%;
          align-items: center;
          margin-bottom: 40px;
          }
          .APPcodeBox {
          width: 100%;
          display: flex;
          flex-flow: column;
          align-items: center;
          cursor: pointer;
          position: relative;
          }
          .APPCtext {
          font-size: 14px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #000000;
          line-height: 30px;
          opacity: 0.75;
          }
          .login-header{
          width: 100%;
          position: absolute;
          top: 4%;
          display: flex;
          justify-content: center;
          align-items: center;
          margin: 0 auto;
          .left-title{
          display: flex;
          justify-content: center;
          align-items: center;
          .cn-title{
          font-size: 48px;
          font-family: PingFang SC;
          font-weight: bold;
          color: #A6D1FF;
          background: linear-gradient(180deg, #00B3FF 0%, #0173B7 100%);
          -webkit-background-clip: text;
          -webkit-text-fill-color: transparent;
          margin-bottom: 25px;
          }
          .logo-png{
          width: 107px;
          height: 111px;
          }
          }
          .right-timebox{
          display: flex;
          justify-content: center;
          align-items: center;
          height: 60px;
          .curr-time{
          width: 140px;
          font-size: 36px;
          font-family: Microsoft YaHei;
          font-weight: 300;
          color: #FFFFFF;
          }
          .curr-week-date{
          margin-left: 10px;
          .curr-week{
          font-size: 16px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #FFFFFF;
          }
          .curr-date{
          font-size: 14px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #FFFFFF;
          }
          }
          }
          }
          .copyright{
          position: absolute;
          bottom: 7%;
          width: 100%;
          margin: 0 auto;
          font-size: 12px;
          font-family: Microsoft YaHei;
          font-weight: 400;
          color: #F1F6FD;
          text-align: center;
          }
          .qrcode-box{
          position: absolute;
          bottom: 0;
          right: -35px;
          width: 35px;
          height: 35px;
          background: #FFFFFF;
          opacity: 0.8;
          cursor: pointer;
          }
          :global{
          .@{ant-prefix}-popover-inner-content{
          display: flex;
          justify-content: center;
          align-items: center;
          }
          .@{ant-prefix}-popover-title{
          display: flex;
          justify-content: center;
          align-items: center;
          }
          }
          \ No newline at end of file
          Markdown is supported
          0% or
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment