Skip to content

M
manage
Commit d72fc9d9 by wangyalan-git
Options

登录页，忘记密码页样式调整，新增物品，物品查询

parent cc3370a8
Showing with 224 additions and 127 deletions
index.html
......@@ -136,7 +136,7 @@
top: 0;
width: 51%;
height: 100%;
background: #b70b30;
background: #4583F3;
/* Old browsers */
z-index: 1000;
-webkit-transform: translateX(0);
......
package-lock.json
......@@ -1634,7 +1634,7 @@
},
"cfb": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.1.4.tgz",
"resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.1.4.tgz?cache=0&sync_timestamp=1584079355027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcfb%2Fdownload%2Fcfb-1.1.4.tgz",
"integrity": "sha1-gf017eTJGdjwliqUWC4d+vcFHio=",
"requires": {
"adler-32": "~1.2.0",
......@@ -1645,7 +1645,7 @@
"dependencies": {
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz",
"integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM="
}
}
......@@ -1877,7 +1877,7 @@
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
}
}
......@@ -10486,7 +10486,7 @@
},
"ssf": {
"version": "0.10.3",
"resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
"resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz?cache=0&sync_timestamp=1592373934925&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssf%2Fdownload%2Fssf-0.10.3.tgz",
"integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": {
"frac": "~1.1.2"
......@@ -12112,7 +12112,7 @@
},
"xlsx": {
"version": "0.15.6",
"resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1584260249027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
"resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": {
"adler-32": "~1.2.0",
......@@ -12127,7 +12127,7 @@
"dependencies": {
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
}
}
......
src/api/inventory.js
......@@ -82,7 +82,7 @@ export function getGoodsList(params) {
params
})
}
// 万科后台_物品插入操作
// 万科后台_物品插入操作(单条)
export function addGoods(params) {
return request({
url: 'vankeGoods/insertGoods',
......@@ -90,3 +90,11 @@ export function addGoods(params) {
params
})
}
// 万科后台_插入多条物品信息
export function addGoodList(data) {
return request({
url: 'vankeGoods/insertVankeGoodsList',
method: 'post',
data
})
}
src/assets/images/ic_logo.png
src/assets/images/ic_logo.png

39.2 KB | W: | H:

src/assets/images/ic_logo.png

9.44 KB | W: | H:

src/assets/images/ic_logo.png
src/assets/images/ic_logo.png
src/assets/images/ic_logo.png
src/assets/images/ic_logo.png
  • 2-up
  • Swipe
  • Onion skin
src/icons/svg/password.svg
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503994678729" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9229" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M780.8 354.579692 665.6 354.579692 665.6 311.689846c0-72.310154-19.849846-193.299692-153.6-193.299692-138.870154 0-153.6 135.049846-153.6 193.299692l0 42.889846L243.2 354.579692 243.2 311.689846C243.2 122.249846 348.790154 0 512 0s268.8 122.249846 268.8 311.689846L780.8 354.579692zM588.8 669.420308C588.8 625.900308 554.220308 590.769231 512 590.769231s-76.8 35.131077-76.8 78.651077c0 29.459692 15.399385 54.468923 38.439385 67.820308l0 89.639385c0 21.740308 17.250462 39.699692 38.4 39.699692s38.4-17.959385 38.4-39.699692l0-89.639385C573.44 723.889231 588.8 698.88 588.8 669.420308zM896 512l0 393.609846c0 65.260308-51.869538 118.390154-115.2 118.390154L243.2 1024c-63.291077 0-115.2-53.129846-115.2-118.390154L128 512c0-65.220923 51.869538-118.390154 115.2-118.390154l537.6 0C844.130462 393.609846 896 446.779077 896 512z" p-id="9230"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1592968029950" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4682" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M825.611627 483.411895 392.464533 483.411895 392.464533 311.327608c0-75.091232 61.095473-136.186705 136.186705-136.186705 75.096349 0 136.192845 61.095473 136.192845 136.186705 0 25.822109 20.935822 46.75793 46.75793 46.75793 25.822109 0 46.75793-20.935822 46.75793-46.75793 0-126.660748-103.047957-229.702566-229.708705-229.702566S298.948673 184.66686 298.948673 311.327608l0 172.084287-67.25373 0c-25.716708 0-46.75793 21.041222-46.75793 46.75793l0 363.974665c0 25.716708 21.041222 46.75793 46.75793 46.75793l593.916684 0c25.716708 0 46.75793-21.041222 46.75793-46.75793L872.369557 530.168802C872.369557 504.452093 851.328335 483.411895 825.611627 483.411895zM567.353702 706.428178l0 87.700411c0 20.890796-17.093307 37.984103-37.984103 37.984103l-1.430582 0c-20.890796 0-37.984103-17.093307-37.984103-37.984103l0-87.701434c-18.328437-12.419867-30.375821-33.411971-30.375821-57.219189 0-38.149878 30.92636-69.076238 69.075215-69.076238 38.149878 0 69.076238 30.92636 69.076238 69.076238C597.730547 673.016207 585.68214 694.007287 567.353702 706.428178z" p-id="4683" data-spm-anchor-id="a313x.7781069.0.i5" fill="#D7DEE3" class="selected"></path></svg>
\ No newline at end of file
src/icons/svg/safe.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1592967924437" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3545" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M845.824 220.34432c-10.07616-9.29792-23.26528-13.94688-36.39296-13.94688-1.55648 0-2.33472 0-3.87072 0-0.77824 0-9.29792 0.77824-22.46656 0.77824-22.46656 0-65.04448-1.55648-106.06592-11.61216-52.67456-12.36992-113.84832-70.4512-131.66592-82.08384-8.4992-5.4272-19.3536-8.51968-29.42976-8.51968-10.05568 0-20.11136 3.09248-29.40928 8.51968-2.31424 1.55648-65.80224 67.35872-127.75424 82.08384-41.04192 10.05568-85.17632 11.61216-106.84416 11.61216-13.94688 0-22.44608-0.77824-23.22432-0.77824-0.77824 0-2.33472 0-3.09248 0-13.94688 0-26.33728 4.64896-36.39296 13.94688-10.83392 9.29792-17.01888 23.22432-17.01888 37.1712l0 128.512c0 473.88672 321.31072 535.01952 334.47936 537.35424 3.09248 0.77824 6.20544 0.77824 9.27744 0.77824 3.09248 0 6.22592 0 9.3184-0.77824 13.9264-2.33472 336.7936-63.488 336.7936-537.35424l0-128.512C862.06464 243.56864 855.83872 229.64224 845.824 220.34432L845.824 220.34432zM726.56896 403.8656 504.34048 619.08992c-1.55648 2.33472-3.09248 4.66944-5.4272 6.22592-6.20544 6.18496-14.70464 9.27744-23.22432 9.27744-8.54016 0-17.03936-3.09248-24.00256-9.27744-1.55648-1.55648-3.85024-3.87072-4.64896-6.22592l-119.23456-115.36384c-12.3904-12.3904-12.3904-31.72352 0-44.11392 12.36992-12.41088 33.28-12.41088 45.6704 0l102.21568 98.32448 205.18912-198.20544c13.18912-12.3904 33.28-12.3904 45.6704 0C739.71712 371.34336 739.71712 391.4752 726.56896 403.8656L726.56896 403.8656z" p-id="3546" fill="#D7DEE3"></path></svg>
\ No newline at end of file
src/main.js
......@@ -3,7 +3,6 @@ import Vue from 'vue'
import 'normalize.css/normalize.css'// A modern alternative to CSS resets
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
import VCharts from 'v-charts'
......
src/styles/index.scss
......@@ -3,6 +3,13 @@
@import "./transition.scss";
@import "./element-ui.scss";
@import "./sidebar.scss";
/* 改变主题色变量 */
$--color-primary: #4583F3;
/* 改变 icon 字体路径变量，必需 */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
@import "~element-ui/packages/theme-chalk/src/index";
body {
-moz-osx-font-smoothing: grayscale;
......
src/views/home/index.vue
......@@ -308,7 +308,7 @@ export default {
}
.total-icon {
color: #409eff;
color: #4583F3;
width: 60px !important;
height: 60px !important;
}
......
src/views/inv/StoreList.vue
......@@ -81,7 +81,7 @@
</el-table-column>
<el-table-column label="型号"
align="center">
<template slot-scope="scope">{{scope.row.name}}</template>
<template slot-scope="scope">{{scope.row.goodsNo}}</template>
</el-table-column>
<el-table-column label="物品类别"
align="center">
......
src/views/login/components/BottomFooter.vue
<template>
<div class="footer">
<el-link>如遇问题请联系我们</el-link>
<el-link style="color: #fff;">如遇问题请联系我们</el-link>
<div>Copyright © 2020 Powered By 泉州六方网络科技有限公司</div>
</div>
</template>
......@@ -21,7 +21,7 @@ export default {
justify-content: center;
height: 88px;
padding: 0 20px;
color: #999;
color: #FFFFFF;
font-size: 14px;
}
......
src/views/login/forgetPwd.vue
<template>
<div class="page">
<top-nav />
<div class="container">
<el-card class="password-form-layout">
<div class="password-title">找回密码（1/2）</div>
<el-form>
<el-form-item prop="username">
<el-input type="text"
placeholder="请输入登录手机号">
<div class="content">
<img class="logo"
src="@/assets/images/ic_logo.png"/>
<el-row :gutter="20" type="flex" justify="space-between" align="middle" class="my-form">
<el-col :span="12">
<img class="bg-img"
src="@/assets/images/Diagram.png"/>
</el-col>
<el-col :span="9">
<div class="password-form-layout">
<div class="password-title">找回密码（1/2）</div>
<el-form>
<el-form-item prop="username">
<el-input type="text"
placeholder="请输入登录手机号">
<span slot="prefix">
<i class="el-icon-user" />
<el-divider direction="vertical"></el-divider>
</span>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input type="text"
placeholder="请输入短信验证码">
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input type="text"
placeholder="请输入短信验证码">
<span slot="prefix">
<i class="el-icon-mobile-phone" />
<el-divider direction="vertical"></el-divider>
</span>
<span slot="suffix">
<el-button type="danger"
<span slot="suffix">
<el-button type="primary"
size="mini">发送短信</el-button>
</span>
</el-input>
</el-form-item>
<el-form-item>
<el-button type="danger"
style="width: 100%;"
:loading="loading"
@click.native.prevent="resetPassword">重设密码</el-button>
</el-form-item>
<el-link @click="goLogin">立即登录</el-link>
</el-form>
</el-card>
</el-input>
<div class="row">
<el-link style="color:#C5CDD3;" @click="goLogin">立即登录</el-link>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary"
style="width: 100%;border-radius: 20px;"
:loading="loading"
@click.native.prevent="resetPassword">重设密码</el-button>
</el-form-item>
</el-form>
</div>
</el-col>
</el-row>
</div>
<bottom-footer />
</div>
<bottom-footer />
</div>
</template>
<script>
......@@ -73,24 +84,52 @@ export default {
<style scoped>
.container {
position: relative;
height: calc(100vh - 196px);
min-height: 36.5vw;
background-color: #b70b30;
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
flex-direction: column;
align-items: center;
justify-content: center;
background: url("~@/assets/images/bg.png") no-repeat;
background-size: 100% 100%;
}
.container .content {
width: 60%;
padding: 3%;
height: 70%;
background: #FFFFFF;
border-radius: 10px;
display: flex;
flex-direction: column;
}
.content .bg-img {
width: 100%;
}
.row{
padding-bottom: 5px;
font-size:10px;
color: #C5CDD3;
}
.container .logo {
width: 12%;
}
.my-form {
padding-top: 5%;
flex: 1;
align-items: center;
}
.password-form-layout {
width: 320px;
padding: 20px;
z-index: 9;
}
.password-title {
color: #e12d1a;
font-size: 17px;
font-weight: bold;
color: #AFB0B3;
font-size: 25px;
text-align: center;
margin-bottom: 20px;
}
......@@ -98,3 +137,10 @@ export default {
margin: 0;
}
</style>
<style>
.password-form-layout .el-input__inner {
border: none;
border-bottom: 1px solid #cccccc;
border-radius: 0;
}
</style>
src/views/login/index.vue
<template>
<div>
<top-nav/>
<div class="container">
<img class="bg-img"
src="@/assets/images/bg_login.png"/>
<el-card class="login-form-layout">
<div class="login-title">账号登录</div>
<el-form autoComplete="on"
:model="loginForm"
:rules="loginRules"
ref="loginForm"
label-position="left">
<el-form-item prop="username">
<el-input name="username"
type="text"
v-model="loginForm.username"
autoComplete="on"
placeholder="请输入用户名">
<div class="container">
<div class="content">
<img class="logo"
src="@/assets/images/ic_logo.png"/>
<el-row :gutter="20" type="flex" justify="space-between" align="middle" class="my-form">
<el-col :span="12">
<img class="bg-img"
src="@/assets/images/Diagram.png"/>
</el-col>
<el-col :span="9">
<div class="login-form-layout">
<div class="login-title">账号登录</div>
<el-form autoComplete="on"
:model="loginForm"
:rules="loginRules"
ref="loginForm"
label-position="left">
<el-form-item prop="username">
<el-input name="username"
type="text"
v-model="loginForm.username"
autoComplete="on"
placeholder="请输入用户名">
<span slot="prefix">
<i class="el-icon-user-solid"/>
<el-divider direction="vertical"></el-divider>
</span>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input name="password"
:type="pwdType"
@keyup.enter.native="handleLogin"
v-model="loginForm.password"
autoComplete="on"
placeholder="请输入密码">
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input name="password"
:type="pwdType"
@keyup.enter.native="handleLogin"
v-model="loginForm.password"
autoComplete="on"
placeholder="请输入密码">
<span slot="prefix">
<svg-icon style="width: 14px;"
<svg-icon style="width: 15px;"
icon-class="password"></svg-icon>
<el-divider direction="vertical"></el-divider>
</span>
<!-- <span slot="suffix"
@click="showPwd">
<svg-icon icon-class="eye"></svg-icon>
</span> -->
</el-input>
</el-form-item>
<el-row type="flex" justify="space-between">
<el-col :span="15">
<!-- <span slot="suffix"
@click="showPwd">
<svg-icon icon-class="eye"></svg-icon>
</span> -->
</el-input>
</el-form-item>
<el-form-item prop="VerificationCode">       
<el-input type="text" v-model="loginForm.authCode" auto-complete="off"
placeholder="请输入验证码"></el-input>     
<el-input type="text" v-model="loginForm.authCode" autoComplete="on"
placeholder="请输入验证码">
<span slot="prefix">
<svg-icon style="width: 15px;"
icon-class="safe"></svg-icon>
</span>
 
</el-input>
<img style="width:100px; padding: 8px;position: absolute;bottom: 10px;right: 10px;"
:src="captchaImage" alt="" @click="refreshCode"> 
</el-form-item>
</el-col>
<el-col :span="9" v-if="captchaImage" style="text-align: right;" >
<img style="width:100px; padding: 8px;border: 1px solid #DCDFE6;border-radius: 4px;" :src="captchaImage" alt="" @click="refreshCode">
</el-col>
</el-row>
<el-form-item>
<el-button type="danger"
style="width: 100%;"
:loading="loading"
@click.native.prevent="handleLogin">登录
</el-button>
</el-form-item>
<el-link @click="forgetPwd">忘记密码</el-link>
</el-form>
</el-card>
<div class="row">
<p @click="forgetPwd">忘记密码</p>
</div>
<el-form-item>
<el-button type="primary"
style="width: 100%;border-radius: 20px;"
:loading="loading"
@click.native.prevent="handleLogin">登录
</el-button>
</el-form-item>
</el-form>
</div>
</el-col>
</el-row>
</div>
<bottom-footer/>
</div>
......@@ -69,7 +78,7 @@
<script>
import { setSupport, getSupport, setCookie, getCookie } from '@/utils/support'
import {getCaptchaImage} from '@/api/login'
import { getCaptchaImage } from '@/api/login'
import TopNav from './components/TopNav'
import BottomFooter from './components/BottomFooter'
......@@ -177,34 +186,53 @@ export default {
<style scoped>
.container {
position: relative;
height: calc(100vh - 196px);
min-height: 36.5vw;
background-color: #b70b30;
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
flex-direction: column;
align-items: center;
justify-content: flex-end;
justify-content: center;
background: url("~@/assets/images/bg.png") no-repeat;
background-size: 100% 100%;
}
.container .bg-img {
position: absolute;
z-index: 0;
left: 4.5vw;
bottom: 0;
height: 32.87vw;
.container .content {
width: 60%;
padding: 3%;
height: 70%;
background: #FFFFFF;
border-radius: 10px;
display: flex;
flex-direction: column;
}
.content .bg-img {
width: 100%;
}
.row{
padding-bottom: 5px;
font-size:10px;
color: #C5CDD3;
}
.container .logo {
width: 12%;
}
.my-form {
padding-top: 5%;
flex: 1;
align-items: center;
}
.login-form-layout {
width: 370px;
padding: 20px;
z-index: 9;
margin-right: 12.87vw;
}
.login-title {
color: #e12d1a;
font-size: 17px;
font-weight: bold;
color: #AFB0B3;
font-size: 25px;
text-align: center;
margin-bottom: 20px;
}
......@@ -212,3 +240,10 @@ export default {
margin: 0;
}
</style>
<style>
.login-form-layout .el-input__inner {
border: none;
border-bottom: 1px solid #cccccc;
border-radius: 0;
}
</style>
static/favicon.ico
No preview for this file type
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