Commit 5c00554b authored by 吴冠's avatar 吴冠

change

parent 3ea2cbf0
......@@ -25,14 +25,7 @@
import Cookies from "js-cookie"
export default {
mounted(){
let _that = this;
document.onkeypress = function(e) {
var keycode = document.all ? event.keyCode : e.which;
if (keycode == 13) {
_that.toSearch();// 登录方法名
return false;
}
};
},
methods:{
toSearch(){
......@@ -47,18 +40,6 @@ import Cookies from "js-cookie"
}
}
},
/* toSearch(){
sessionStorage.setItem("inputContent",this.input)
sessionStorage.setItem("contentStatus",1)
if(window.location.pathname !=="/notice/all"){
this.$router.push('/notice/all')
this.input = null
}else{
this.$message.error("请在下面查询!")
this.input = null
}
}
}, */
data() {
return {
showdefault:false,
......@@ -68,12 +49,10 @@ import Cookies from "js-cookie"
}
</script>
<style>
<style scoped>
.images{
width:200px;
/* height:20px; */
/* margin-left:0px;
margin-top:-20px */
height:38px;
}
.images>img{
width:40px;
......@@ -97,11 +76,7 @@ import Cookies from "js-cookie"
}
.head-input-title{
margin-top: -2px;
/* margin-left: -590px; */
/* font-size:.28rem;
color:rgba(0,0,0,1);
font-weight: bold; */
width: 86px;
width: 100px;
height: 37px;
font-size: 28px;
font-family: MicrosoftYaHei;
......@@ -116,17 +91,14 @@ import Cookies from "js-cookie"
.el-button{
color: #fff;
background-color: #FF5203;
/* border-color: #FF69B4; */
}
.el-button:hover{
background-color: #FF5203;
/* border-color: #FF69B4; */
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
/* border-color: #FF69B4; */
}
.el-input__inner{
border:1px solid #FF5203
......
<template>
<div>
<Nuxt/>
<Nuxt />
</div>
</template>
<script>
export default {
data(){
return{
return {
}
},
}
......
const nuxtPageCache = require('nuxt-page-cache')
export default {
/* render: {
bundleRenderer: {
cache: require('lru-cache')({
max: 1000,
maxAge: 1000 * 60 * 15
})
serverMiddleware: [
nuxtPageCache.cacheSeconds(60, req => {
if (req.query && req.query.currentPage) {
return req.query.currentPage
}
}, */
return false
})
],
/*
** Nuxt rendering mode
** See https://nuxtjs.org/api/configuration-mode
*/
mode: 'history',
mode: 'Universal',
/*
** Nuxt target
** See https://nuxtjs.org/api/configuration-target
......@@ -68,8 +68,9 @@ export default {
/*
** Nuxt.js modules
*/
cache:true,
modules: [
/* ['~/nuxtjs/component-cache', { maxAge: 1000 * 60 }] */
/* ['@nuxtjs/component-cache', { maxAge: 1000 * 60 }] */
],
/*
** Build configuration
......
......@@ -1395,6 +1395,21 @@
"vue": "^2.6.11",
"vue-meta": "^2.4.0",
"vue-server-renderer": "^2.6.11"
},
"dependencies": {
"lru-cache": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"requires": {
"yallist": "^3.0.2"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
"@nuxt/webpack": {
......@@ -2653,6 +2668,21 @@
"rimraf": "^2.7.1",
"ssri": "^7.0.0",
"unique-filename": "^1.1.1"
},
"dependencies": {
"lru-cache": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"requires": {
"yallist": "^3.0.2"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
"cache-base": {
......@@ -6255,18 +6285,11 @@
}
},
"lru-cache": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"requires": {
"yallist": "^3.0.2"
},
"dependencies": {
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
"yallist": "^4.0.0"
}
},
"make-dir": {
......@@ -8377,6 +8400,21 @@
"pac-proxy-agent": "^3.0.1",
"proxy-from-env": "^1.0.0",
"socks-proxy-agent": "^4.0.1"
},
"dependencies": {
"lru-cache": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"requires": {
"yallist": "^3.0.2"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
"proxy-from-env": {
......@@ -10500,6 +10538,16 @@
"ssri": "^6.0.1",
"unique-filename": "^1.1.1",
"y18n": "^4.0.0"
},
"dependencies": {
"lru-cache": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
"requires": {
"yallist": "^3.0.2"
}
}
}
},
"schema-utils": {
......@@ -10548,6 +10596,11 @@
"webpack-sources": "^1.4.0",
"worker-farm": "^1.7.0"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
}
}
},
......
......@@ -15,6 +15,7 @@
"element-china-area-data": "^5.0.1",
"element-ui": "^2.13.2",
"js-cookie": "^2.2.1",
"lru-cache": "^6.0.0",
"nuxt": "^2.14.0"
},
"devDependencies": {}
......
......@@ -235,6 +235,18 @@ import Cookies from 'js-cookie'
margin-right: 0.15rem;
width:70px
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
color:#FF5203;
......
......@@ -309,6 +309,18 @@ import Cookies from 'js-cookie'
margin-left: 0.3rem;
margin-right: 0.15rem;
width:70px;
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
......
......@@ -246,6 +246,18 @@ import Cookies from 'js-cookie'
margin-right: 0.15rem;
width:70px;
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
color:#FF5203;
......
......@@ -299,6 +299,18 @@ export default {
margin-right: 0.15rem;
width:70px
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
color:#FF5203;
......
......@@ -237,6 +237,18 @@ import Cookies from 'js-cookie'
margin-right: 0.15rem;
width:70px
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
color:#FF5203;
......
......@@ -236,6 +236,18 @@ import Cookies from 'js-cookie'
margin-left: 0.3rem;
margin-right: 0.15rem;
width:70px
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
......
......@@ -234,6 +234,18 @@ import Cookies from 'js-cookie'
margin-left: 0.3rem;
margin-right: 0.15rem;
width:70px;
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
......
......@@ -115,6 +115,7 @@ import dataTable from "@/components/dataTable.vue";
import breadCrumb from "@/components/dataBreadcrumb.vue";
import { getenquirydetails } from "@/common/list.js";
import Cookies from "js-cookie"
import noticeVue from '../notice.vue';
export default {
components: {
dataTable,
......@@ -217,7 +218,10 @@ export default {
}
},
prev() {
window.history.go(-1)
let size = Cookies.get("size")||10
let currentPage = Cookies.get("currentPage")||1
this.$router.push(`/notice/inquiry/?size=${size}&currentPage=${currentPage}&noticeType=ENQUIRY`)
/* window.history.back() */
},
async getenquirydetails(params) {
const { data } = await getenquirydetails(params);
......
......@@ -96,14 +96,15 @@ export default {
citySelect,
dataTable
},
async asyncData({ params, route, error }){
console.log(params,route)
async asyncData({query,ctx,route}){
console.log(ctx+'1111111111111111111111122')
console.log(route)
let details = Cookies.get("details")
let mes ={
currentPage:1,
size:10,
noticeType:'ENQUIRY'
currentPage:query.currentPage,
size:query.size,
noticeType:"ENQUIRY"
}
console.log(11111111111)
const res = await industryList();
const {data,total} = await getInquiryList(mes)
return {
......@@ -113,11 +114,6 @@ export default {
}
},
mounted(){
/* let mes ={
currentPage:1,
size:10,
noticeType:'ENQUIRY'
} */
console.log(11111111111)
if(Cookies.get("details")){
let mes = {}
......@@ -127,7 +123,6 @@ export default {
this. getInquiryList(mes)
}
this. industryList();
/* this. getInquiryList(mes) */
Cookies.remove("details")
Cookies.remove("currentPage")
Cookies.remove("size")
......@@ -260,7 +255,7 @@ export default {
this.getData.size = val
mess.currentPage = this.getData.currentPage
mess.noticeType = "ENQUIRY"
this.setform.size=val
Cookies.set("size",val)
this.getInquiryList(mess)
},
handleCurrentChange(val) {
......@@ -308,6 +303,18 @@ export default {
margin-right: 0.15rem;
width:70px;
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
.reset {
color:#FF5203;
......
......@@ -19,7 +19,7 @@
</el-input>
</el-form-item>
<div class="login-btn">
<el-button type="primary" @click="submitForm1()" style="width: 100%;">登录</el-button>
<el-button @click="submitForm1()" style="width: 100%;">登录</el-button>
</div>
</el-form>
<!-- 手机验证码验证 -->
......@@ -35,7 +35,7 @@
<div v-show="!Verification" class=" t5"><span>{{timer}}</span>秒后重新获取</div>
</div>
<div class="login-btn">
<el-button type="primary" @click="submitForm2()" style="width: 100%;">登录</el-button>
<el-button @click="submitForm2()" style="width: 100%;">登录</el-button>
</div>
</el-form>
<div class="login-font flex-between">
......@@ -307,8 +307,8 @@
}
.login-type .active{
border-bottom: 2px solid rgba(4, 134, 254, 1);
color: rgba(4, 134, 254, 1);
border-bottom: 2px solid #FF5203;;
color: #FF5203;
}
.login-type>div {
......@@ -321,7 +321,7 @@
}
.login-type>.active {
border-bottom: 2px solid rgba(4, 134, 254, 1);
border-bottom: 2px solid #FF5203
}
......@@ -346,4 +346,16 @@
left: 2.0rem;
width: 2rem;
}
.el-button{
color: #fff;
background-color: #FF5203;
}
.el-button:hover{
background-color: #FF5203;
color: #FFFFFF
}
.el-button:focus{
background-color: #FF5203;
color: #FFFFFF
}
</style>
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