htc 15 tuntia sitten
vanhempi
commit
8299a338d1

BIN
src/assets/img/login_bg.png


BIN
src/assets/img/login_logo.png


+ 21 - 5
src/assets/scss/pages/login.scss

@@ -10,11 +10,11 @@
     content: "";
   }
   &::before {
-    background-image: url(~@/assets/img/login_bg.jpg);
+    background-image: url(~@/assets/img/login_bg.png);
     background-size: cover;
   }
   &::after {
-    background-color: rgba(38, 50, 56, .4);
+    // background-color: rgba(38, 50, 56, .4);
   }
   .aui-content {
     display: flex;
@@ -32,8 +32,12 @@
     }
   }
   .login-header {
-    padding: 20px;
+    padding: 20px 20px 40px;
     color: #fff;
+    img{
+      width: 262px;
+      height: 88px;
+    }
     .login-brand {
       margin: 0 0 15px;
       font-size: 40px;
@@ -57,11 +61,23 @@
   }
   .login-body,
   .login-footer {
-    width: 460px;
+    width: 600px;
   }
   .login-body {
-    padding: 20px 30px;
+    padding: 47px 56px;
+    box-sizing: border-box;
     background-color: #fff;
+    border-radius: 8px;
+    &-title{
+      width: 100%;
+      font-family: PingFang-SC, PingFang-SC;
+      font-weight: bold;
+      font-size: 28px;
+      color: #393939;
+      line-height: 32px;
+      text-align: left;
+      padding-bottom: 43px;
+    }
     .login-title {
       font-size: 18px;
       font-weight: 400;

+ 3 - 3
src/views/modules/activity/list.vue

@@ -5,13 +5,13 @@
           <el-row :gutter="20" style="margin-top: 20px;">
             <el-col :span="6" class="adfac">
               <div class="query_text">活动类型</div>
-              <el-select v-model="queryParams.typeId" placeholder="请选择活动类型" class="select-box" style="width: 100%;">
+              <el-select v-model="queryParams.typeId" placeholder="请选择活动类型" class="select-box" style="width: 100%;" clearable>
                 <el-option v-for="item in typeOptions" :key="item.id" :label="item.typeName" :value="item.id"></el-option>
               </el-select>
             </el-col>
             <el-col :span="6" class="adfac">
               <div class="query_text">活动分类</div>
-              <el-select v-model="queryParams.categoryId" placeholder="请选择活动分类" class="select-box" style="width: 100%;">
+              <el-select v-model="queryParams.categoryId" placeholder="请选择活动分类" class="select-box" style="width: 100%;" clearable>
                 <el-option v-for="item in categoryOptions" :key="item.id" :label="item.categoryName" :value="item.id"></el-option>
               </el-select>
             </el-col>
@@ -19,7 +19,7 @@
           <el-row :gutter="20" style="margin-top: 20px;">
             <el-col :span="6" class="adfac">
               <div class="query_text">活动名称</div>
-              <el-input v-model="queryParams.activityName" placeholder="请输入活动名称" class="input-box"></el-input>
+              <el-input v-model="queryParams.activityName" placeholder="请输入活动名称" class="input-box" clearable></el-input>
             </el-col>
             <el-col :span="6" class="adfac">
               <div class="query_text">活动时间</div>

+ 1 - 1
src/views/modules/advertising.vue

@@ -47,7 +47,7 @@
             v-show="total > 0">
         </el-pagination>
         <el-dialog width="40%" :visible.sync="show" :title="dialogTitle" @close="cancel">
-            <el-form ref="advertRef" :model="advertForm" :rules="advertRules" label-width="100px" style="width: 90%;margin: 0 auto;">
+            <el-form ref="advertRef" :model="advertForm" :rules="advertRules" label-width="120px" style="width: 90%;margin: 0 auto;">
                 <el-form-item label="banner图位置" prop="space">
                     <el-select v-model="advertForm.space" placeholder="请选择banner图位置" style="width:100%">
                         <el-option label="首页" :value="1"></el-option>

+ 6 - 6
src/views/pages/login.vue

@@ -3,20 +3,20 @@
     <div class="aui-content__wrapper">
       <main class="aui-content">
         <div class="login-header">
-          <h2 class="login-brand">{{ $t('brand.lg') }}</h2>
+          <img src="@/assets/img/login_logo.png" alt="">
         </div>
         <div class="login-body">
-          <h3 class="login-title">{{ $t('login.title') }}</h3>
+          <div class="login-body-title">欢迎登录</div>
           <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" status-icon>
             <el-form-item prop="username">
-              <el-input v-model="dataForm.username" :placeholder="$t('login.username')">
+              <el-input v-model="dataForm.username" placeholder="请输入用户名">
                 <span slot="prefix" class="el-input__icon">
                   <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-user"></use></svg>
                 </span>
               </el-input>
             </el-form-item>
             <el-form-item prop="password">
-              <el-input v-model="dataForm.password" type="password" :placeholder="$t('login.password')">
+              <el-input v-model="dataForm.password" type="password" placeholder="请输入密码">
                 <span slot="prefix" class="el-input__icon">
                   <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-lock"></use></svg>
                 </span>
@@ -25,7 +25,7 @@
             <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
-                  <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
+                  <el-input v-model="dataForm.captcha" placeholder="请输入图形验证码">
                     <span slot="prefix" class="el-input__icon">
                       <svg class="icon-svg" aria-hidden="true"><use xlink:href="#icon-safetycertificate"></use></svg>
                     </span>
@@ -37,7 +37,7 @@
               </el-row>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
+              <el-button type="primary" style="margin-top: 26px;background-color: #01A463;font-size: 16px;" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title') }}</el-button>
             </el-form-item>
           </el-form>
         </div>