Skip to content

T
techbook
Commit 37cc8956 authored by anxixi's avatar anxixi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents f39903f4 aa5f5259
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 44 deletions
public/css/list.scss
View file @ 37cc8956
......@@ -109,6 +109,5 @@
}
}
.positionTop{
top: 3rem;
padding-bottom:3rem;
//top: 3rem;
}
\ No newline at end of file
src/api/api.js
View file @ 37cc8956
......@@ -15,15 +15,14 @@ const i18n = new VueI18n({
}
})
import { Loading,MessageBox } from 'element-ui';
let base = "",isMobile = window.localStorage.getItem("ismobile");
let base = "",isMobile = publicFunc.isWhichBrowe().mobile;
var lang = window.sessionStorage.getItem("language") == "en" ? "en_US" : "zh_CN";
// import slider from '../components/common/errorSlider';
export default {
router,
i18n,
isToWhich(){
isMobile==1? router.replace("/mobileLogin") :router.replace("/login")
isMobile? router.replace("/mobileLogin") :router.replace("/login")
},
fetchLogin(url, params, method = 'POST') {
return new Promise((resolve, reject) => {
......@@ -40,7 +39,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -56,21 +55,21 @@ export default {
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notServer")
}
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notFind")
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -91,7 +90,7 @@ export default {
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -136,7 +135,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -151,7 +150,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notServer")
......@@ -159,14 +158,14 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notFind")
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -185,7 +184,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -238,7 +237,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -253,7 +252,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notServer")
......@@ -261,14 +260,14 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notFind")
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -287,7 +286,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -340,7 +339,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -355,7 +354,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
router.replace("/notServer")
......@@ -363,7 +362,7 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -371,7 +370,7 @@ export default {
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -390,7 +389,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -448,7 +447,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -463,7 +462,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -472,7 +471,7 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -480,7 +479,7 @@ export default {
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -499,7 +498,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -547,7 +546,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -562,7 +561,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -571,7 +570,7 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -579,7 +578,7 @@ export default {
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -598,7 +597,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......@@ -642,7 +641,7 @@ export default {
this.isToWhich()
}
else if(response.data.code==91||response.data.code==80){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
location.reload();
}else{
......@@ -657,7 +656,7 @@ export default {
}
}
else if(response.data.code==500){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -666,7 +665,7 @@ export default {
}
else if(response.data.code==404){
if(isMobile==1){
if(isMobile){
Toast(response.data.code);
}else{
......@@ -674,7 +673,7 @@ export default {
}
}
else if(response.data.code==998||response.data.code==996){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
window.sessionStorage.clear();
this.isToWhich()
......@@ -693,7 +692,7 @@ export default {
// console.log("踢出登录");
}
else if(response.data.code==300||response.data.code==997||response.data.code==995){
if(isMobile==1){
if(isMobile){
Toast(response.data.msg);
setTimeout(function(){
router.go(-1);
......
src/components/mobile/searchList.vue
View file @ 37cc8956
<template>
<div class="contentList" :class="isMargin?'marginTop':'positionTop'" style="overflow: auto;-webkit-overflow-scrolling: touch;">
<div class="contentList" :class="isMargin?'marginTop':'positionTop'" style="-webkit-overflow-scrolling: touch;overflow: auto">
<mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
<ul v-if="tableData">
<li v-for="(item,index) in tableData" :key="item.businessId" v-if="$route.query.tab==2||isMargin" @click="handleToDetail(item)">
......
src/views/bigbusiness/pages/searchRecord.vue
View file @ 37cc8956
......@@ -73,8 +73,10 @@
window.sessionStorage.setItem("keyword",keyword);
this.businessProjectsCount = data.businessProjectsCount;
this.businessRequirementsCount = data.businessRequirementsCount;
window.sessionStorage.setItem("businessProjectsCount",data.businessProjectsCount);
window.sessionStorage.setItem("businessRequirementsCount",data.businessRequirementsCount);
this.totalCount = (data.businessProjectsCount?data.businessProjectsCount:0)+(data.businessRequirementsCount?data.businessRequirementsCount:0);
window.sessionStorage.setItem("totalCount",this.totalCount);
window.sessionStorage.setItem("businessProjectsCount",this.businessProjectsCount);
window.sessionStorage.setItem("businessRequirementsCount",this.businessRequirementsCount);
})
}
}
......
src/views/mobile/searchRecord.vue
View file @ 37cc8956
......@@ -12,7 +12,9 @@
</li>
</ul>
</div>
<searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
<div class="moreWrap">
<searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
</div>
</div>
</template>
......@@ -154,5 +156,13 @@
}
}
}
.moreWrap{
width: 100%;
position: absolute;
left: 0;
overflow: hidden;
height: 100vh;
top: 3rem;
}
</style>
\ No newline at end of file
src/views/mobile/selectScreen.vue
View file @ 37cc8956
......@@ -114,6 +114,7 @@
mounted(){
this.bigBusinessselect();
this.selectBigBusinessLevelOneSet();
this.resetClik();
}
}
</script>
......
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