Commit 356b91ce authored by 吴冠's avatar 吴冠

更新

parent 00bd4f21
...@@ -23,6 +23,7 @@ import {getMessagephone} from '@/common/list.js' ...@@ -23,6 +23,7 @@ import {getMessagephone} from '@/common/list.js'
export default { export default {
mounted(){ mounted(){
getMessagephone() getMessagephone()
console.log("111111111111")
}, },
data() { data() {
return { return {
...@@ -60,8 +61,10 @@ import {getMessagephone} from '@/common/list.js' ...@@ -60,8 +61,10 @@ import {getMessagephone} from '@/common/list.js'
}, },
mothods:{ mothods:{
async getMessagephone(){ async getMessagephone(){
console.log("111111111111")
const {data} = await getMessagephone() const {data} = await getMessagephone()
console.log(data) console.log(data)
console.log("111111111111")
this.footList[3].list[0].name=`客服联系电话 : ${data.phone}` this.footList[3].list[0].name=`客服联系电话 : ${data.phone}`
this.footList[3].list[1].name=`电子邮箱 : ${data.email}` this.footList[3].list[1].name=`电子邮箱 : ${data.email}`
} }
......
...@@ -5,24 +5,24 @@ ...@@ -5,24 +5,24 @@
<div class="flex-item"> <div class="flex-item">
<div class="flex-item"> <div class="flex-item">
<img src="~/assets/head/home-fill.png" class="home-fill" alt="logo"/> <img src="~/assets/head/home-fill.png" class="home-fill" alt="logo"/>
<nuxt-link to="/" class="head-title t1">首页</nuxt-link> <nuxt-link to="/" class="head-title t1 textr">首页</nuxt-link>
</div> </div>
<div class="welcome t1"> <div class="welcome t1">
<el-dropdown size="mini"> <el-dropdown size="mini">
<span class="text">{{userName}}<i class="el-icon-arrow-down el-icon--right" v-if="isicon"></i> </span> <span class="text textr">{{userName}}<i class="el-icon-arrow-down el-icon--right" v-if="isicon"></i> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<div v-if="isicon" size="mini" class="checkButton" @click="out">退出</div> <div v-if="isicon" size="mini" class="checkButton " @click="out">退出</div>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<!-- <div class="checkout" v-show = "showButton" @mouseover="hover()">退出</div> --> <!-- <div class="checkout" v-show = "showButton" @mouseover="hover()">退出</div> -->
<nuxt-link to="/login/user" class="login" v-show="showDefault">登录</nuxt-link> <nuxt-link to="/login/user" class="login textr" v-show="showDefault">登录</nuxt-link>
<span style="color:blue;margin-left:30px" class="other" @click="loginOther" v-show="showDefault">商家免费入驻</span> <span style="color:blue;margin-left:30px" class="other textr" @click="loginOther" v-show="showDefault">商家免费入驻</span>
</div> </div>
</div> </div>
<div class="flex-item t1 collection"> <div class="flex-item t1 collection">
<button @click="jump" v-show="!showDefault" class="right-pos">商家管理后台</button> <button @click="jump" v-show="!showDefault" class="right-pos textr">商家管理后台</button>
<div @click="addFavo" class="t5">收藏网站</div> <div @click="addFavo" class="t5 textr">收藏网站</div>
<img @click="addFavo" src="~/assets/head/collection.png" alt="收藏" class="t5"> <img @click="addFavo" src="~/assets/head/collection.png" alt="收藏" class="t5 textr">
</div> </div>
</div> </div>
</div> </div>
...@@ -166,4 +166,8 @@ import Cookies from 'js-cookie' ...@@ -166,4 +166,8 @@ import Cookies from 'js-cookie'
.text{ .text{
font-size: 12px; font-size: 12px;
} }
.textr{
font-size:12px;
line-height:.50rem
}
</style> </style>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class=" content flex-between"> <div class=" content flex-between">
<div class=" images flex"> <div class=" images flex">
<img src="~/assets/css/logo.jpg" > <img src="~/assets/css/logo.jpg" >
<div class="head-input-title">捷安采</div> <div class="head-input-title" @click="gotohome">捷安采</div>
</div> </div>
<div class="search flex-item"> <div class="search flex-item">
<div class="flex"> <div class="flex">
...@@ -38,7 +38,10 @@ import Cookies from "js-cookie" ...@@ -38,7 +38,10 @@ import Cookies from "js-cookie"
location.reload() location.reload()
this.input = null this.input = null
} }
} },
gotohome(){
this.$router.push("/")
},
}, },
data() { data() {
return { return {
...@@ -82,7 +85,8 @@ import Cookies from "js-cookie" ...@@ -82,7 +85,8 @@ import Cookies from "js-cookie"
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
color: #000000; color: #000000;
line-height: 37px; line-height: 37px;
margin-left:20px margin-left:20px;
cursor: pointer;
} }
.t11{ .t11{
cursor: pointer; cursor: pointer;
......
...@@ -46,8 +46,14 @@ import inDex from '@/pages/index.vue' ...@@ -46,8 +46,14 @@ import inDex from '@/pages/index.vue'
} }
}, },
mounted(){ mounted(){
console.log("1")
let path = this.$route.path; let path = this.$route.path;
console.log("path======",path)
console.log(path!="/")
if(path!="/"){
path="/"
this.$router.push(path)
}
/* if(path=="/"){ /* if(path=="/"){
this.nav = "0"; this.nav = "0";
}else if(path.indexOf("/message")==0){ }else if(path.indexOf("/message")==0){
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<div class="homepage" > <div class="homepage" >
<div class="content "> <div class="content ">
<div class="banner"> <div class="banner">
<!-- <el-carousel trigger="click" height="4.21rem" width="100%" class="car"> <el-carousel trigger="click" height="5.3rem" width="100%" >
<el-carousel-item v-for="(item,index) in picArr" :key="index"> <el-carousel-item v-for="(item,index) in picArr" :key="index">
<img :src="item.picUrl" alt="" class="src-img"> <img :src="item.picUrl" alt="" class="src-img">
</el-carousel-item> </el-carousel-item>
</el-carousel> --> </el-carousel>
<img src="~/assets/images/back.png" style="height:5.3rem;width:100%"> <!-- <img src="~/assets/images/back.png" style="height:5.3rem;width:100%"> -->
</div> </div>
<div class="loginbox"> <div class="loginbox">
<div class="login" > <div class="login" >
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:size="size" :size="size"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10]"
layout="total, prev, pager, next,sizes, jumper" layout="total, prev, pager, next,sizes, jumper"
:total="total" :total="total"
> >
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</li> </li>
</ul> </ul>
<div class="pagination flex-center"> <div class="pagination flex-center">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10]"
layout="total,prev, pager, next, sizes,jumper" :total="total"> layout="total,prev, pager, next, sizes,jumper" :total="total">
</el-pagination > </el-pagination >
</div> </div>
......
...@@ -50,8 +50,8 @@ export default { ...@@ -50,8 +50,8 @@ export default {
async getErrorDetails(id){ async getErrorDetails(id){
console.log(id+"-----------------") console.log(id+"-----------------")
const {data} = await getErrorDetails(id) const {data} = await getErrorDetails(id)
this.itemTitle = data.title this.itemTitle = data.nameAndCodeVO.projectName
this.itemCode = data.projectCode this.itemCode = data.nameAndCodeVO.projectCode
this.contentList = data.content this.contentList = data.content
this.itemTime = data.createTime.slice(0,10) this.itemTime = data.createTime.slice(0,10)
} }
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
</li> </li>
<div class="pagination flex-center" > <div class="pagination flex-center" >
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10]"
layout="total,prev, pager, next, sizes,jumper" :total="total"> layout="total,prev, pager, next, sizes,jumper" :total="total">
</el-pagination > </el-pagination >
</div> </div>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</li> </li>
</ul> </ul>
<div class="pagination flex-center"> <div class="pagination flex-center">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size = "getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size = "getData.size" :page-sizes="[10]"
layout="total,prev, pager, next,sizes, jumper" :total="total"> layout="total,prev, pager, next,sizes, jumper" :total="total">
</el-pagination> </el-pagination>
</div> </div>
......
...@@ -83,8 +83,8 @@ export default { ...@@ -83,8 +83,8 @@ export default {
const {data} = await getBidingdetails(id) const {data} = await getBidingdetails(id)
console.log(data) console.log(data)
this.date = data.createTime this.date = data.createTime
this.title = data.title this.title = data.nameAndCodeVO.projectName
this.code = data.projectCode this.code = data.nameAndCodeVO.projectCode
this.contentList = data.content this.contentList = data.content
this.fileList = data.accessoryVOList this.fileList = data.accessoryVOList
this.proId = data.projectId this.proId = data.projectId
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
:current-page="getData.currentPage" :current-page="getData.currentPage"
:page-size="getData.size" :page-size="getData.size"
:total="total" :total="total"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10]"
layout="total,prev, pager, next,sizes, jumper" layout="total,prev, pager, next,sizes, jumper"
></el-pagination> ></el-pagination>
</div> </div>
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</li> </li>
</ul> </ul>
<div class="pagination flex-center"> <div class="pagination flex-center">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10]"
layout="total,prev, pager, next, sizes,jumper" :total="total"> layout="total,prev, pager, next, sizes,jumper" :total="total">
</el-pagination > </el-pagination >
</div> </div>
......
...@@ -38,8 +38,8 @@ export default { ...@@ -38,8 +38,8 @@ export default {
}, },
async getCadidateDetails(id){ async getCadidateDetails(id){
const {data} = await getCadidateDetails(id) const {data} = await getCadidateDetails(id)
this.itemTitle = data.title this.itemTitle = data.nameAndCodeVO.projectName
this.itemCode = data.projectCode this.itemCode = data.nameAndCodeVO.projectCode
this.itemTime = data.createTime.slice(0,10) this.itemTime = data.createTime.slice(0,10)
this.contentList = data.content this.contentList = data.content
console.log(data) console.log(data)
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</li> </li>
</ul> </ul>
<div class="pagination flex-center"> <div class="pagination flex-center">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10]"
layout="total, prev, pager, next, sizes,jumper" :total="total"> layout="total, prev, pager, next, sizes,jumper" :total="total">
</el-pagination > </el-pagination >
</div> </div>
......
...@@ -41,8 +41,8 @@ export default { ...@@ -41,8 +41,8 @@ export default {
}, },
async getChangeDetails(id){ async getChangeDetails(id){
const {data} = await getChangeDetails(id) const {data} = await getChangeDetails(id)
this.itemTitle = data.title this.itemTitle = data.nameAndCodeVO.projectName
this.itemCode = data.projectCode this.itemCode = data.nameAndCodeVO.projectCode
this.contentList = data.content this.contentList = data.content
this.itemTime = data.createTime.slice(0,10) this.itemTime = data.createTime.slice(0,10)
} }
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</li> </li>
</ul> </ul>
<div class="pagination flex-center"> <div class="pagination flex-center">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10, 20, 30, 40]" <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="getData.currentPage" :page-size ="getData.size" :page-sizes="[10]"
layout="total,prev, pager, next,sizes, jumper" :total="total"> layout="total,prev, pager, next,sizes, jumper" :total="total">
</el-pagination > </el-pagination >
</div> </div>
......
...@@ -42,8 +42,8 @@ export default { ...@@ -42,8 +42,8 @@ export default {
async getClerDetailsList(id){ async getClerDetailsList(id){
console.log(id+"-----------------") console.log(id+"-----------------")
const {data} = await getClerDetailsList(id) const {data} = await getClerDetailsList(id)
this.itemTitle = data.title this.itemTitle = data.nameAndCodeVO.projectName
this.itemCode = data.projectCode this.itemCode = data.nameAndCodeVO.projectCode
this.contentList = data.content this.contentList = data.content
this.itemTime = data.createTime.slice(0,10) this.itemTime = data.createTime.slice(0,10)
} }
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="getData.currentPage" :current-page="getData.currentPage"
:pageSize="getData.size" :pageSize="getData.size"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10]"
layout="total,prev, pager, next, sizes,jumper" layout="total,prev, pager, next, sizes,jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
......
...@@ -50,8 +50,8 @@ export default { ...@@ -50,8 +50,8 @@ export default {
}, },
async getWindetails(id){ async getWindetails(id){
const {data} = await getWindetails(id) const {data} = await getWindetails(id)
this.itemTitle = data.title this.itemTitle = data.nameAndCodeVO.projectName
this.itemCode = data.projectCode this.itemCode = data.nameAndCodeVO.projectCode
this.itemTime = data.createTime.slice(0,10) this.itemTime = data.createTime.slice(0,10)
this.contentList = data.content this.contentList = data.content
console.log(id) console.log(id)
......
...@@ -820,7 +820,7 @@ export default { ...@@ -820,7 +820,7 @@ export default {
fileList: [], fileList: [],
flag: true, //该值变化,就会触发刷新 flag: true, //该值变化,就会触发刷新
code: "", //刷新后的验证码 code: "", //刷新后的验证码
active: 0, active: 1,
checked: true, checked: true,
adminform: { adminform: {
name: "", name: "",
......
...@@ -9,7 +9,7 @@ import requestUrl from '../utils/Domain.js' ...@@ -9,7 +9,7 @@ import requestUrl from '../utils/Domain.js'
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL:'http://60.205.251.80:8082/apis', baseURL:'http://60.205.251.80:8082/apis',
/* baseURL: 'http://192.168.3.35:8085/apis', */ /* baseURL: 'http://192.168.43.117:8085/apis', */
timeout: 35000 // 请求超时时间 timeout: 35000 // 请求超时时间
}) })
......
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