chuangte/bike
5
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
tx 2024-09-11 18:06:45 +08:00
parent 13dbe41a76
commit 53d2036584
5 changed files with 635 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
common/http.interceptor.js
View File

@ -5,11 +5,11 @@ const install = (Vue, vm) => {
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://61.174.243.28:15861', // baseUrl: 'http://61.174.243.28:15861',
// baseUrl: 'http://192.168.2.46:8080', // baseUrl: 'http://192.168.2.46:8080',
baseUrl: 'https://che.chuangtewl.com/prod-api', // baseUrl: 'https://che.chuangtewl.com/prod-api',
// 测试环境 // 测试环境
// baseUrl: 'https://dianche.chuantewulian.cn/prod-api', // baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
// 俞山岛 // 俞山岛
// baseUrl: 'https://dche.ccttiot.com/prod-api', baseUrl: 'https://dche.ccttiot.com/prod-api',
// 创特 // 创特
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 10000, loadingTime: 10000,
@ -70,35 +70,35 @@ const install = (Vue, vm) => {
// }) // })
// // return res.result; // // return res.result;
// } // }
if (res.code == 401) { // if (res.code == 401) {
wx.login({ // wx.login({
success(res) { // success(res) {
if (res.code) { // if (res.code) {
console.log('登录！', res); // // console.log('登录！', res);
let areaId = uni.getStorageSync('areaId'); // let areaId = uni.getStorageSync('areaId');
if (areaId) { // if (areaId) {
vm.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then( // vm.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
res => { // res => {
uni.hideLoading(); // uni.hideLoading();
if (res.code == 200) { // if (res.code == 200) {
uni.setStorageSync('token', res.token); // uni.setStorageSync('token', res.token);
} else if (res.code == 501) { // } else if (res.code == 501) {
uni.showToast({ // uni.showToast({
title: res.msg, // title: res.msg,
icon: 'none', // icon: 'none',
duration: 2000 // duration: 2000
}); // });
} else { // } else {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/login/login' // url: '/pages/login/login'
}) // })
} // }
}); // });
} // }
} // }
}, // },
}); // });
} // }
return res; return res;
} }

2
main.js
View File

@ -21,7 +21,7 @@ import'./common/css/iconfont.css'
let mpShare = require('uview-ui/libs/mixin/mpShare.js'); let mpShare = require('uview-ui/libs/mixin/mpShare.js');
Vue.mixin(mpShare); Vue.mixin(mpShare);
// import tabbar from '@/pages_admin/components/tab-bar/tab-bar.vue'; // import tabbar from '@/components/tab-bar/tab-bar.vue';
// import customizeAnswer from'@/components/customizeAnswer/customizeAnswer.vue' // import customizeAnswer from'@/components/customizeAnswer/customizeAnswer.vue'
// Vue.use('customizeAnswer',customizeAnswer) // Vue.use('customizeAnswer',customizeAnswer)

1011
pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

21
pages/login/login.vue
View File

@ -244,10 +244,16 @@
codeButtonText2: '获取验证码', codeButtonText2: '获取验证码',
countdown2: 60, countdown2: 60,
openCode:null, openCode:null,
isindex:false
} }
}, },
onLoad() { onLoad(e) {
this.deptId = uni.getStorageSync('deptId'); this.deptId = uni.getStorageSync('deptId');
if(e.isindex=='true'){
this.isindex=true
}
// this.deptId = 101 // this.deptId = 101
}, },
computed: { computed: {
@ -639,9 +645,16 @@
async ceshi() { async ceshi() {
this.$u.get("/getAppInfo").then((res) => { this.$u.get("/getAppInfo").then((res) => {
console.log('进入跳转'); console.log('进入跳转');
uni.navigateTo({ if(this.isindex==true){
url: '/pages/index/index' uni.navigateBack({
}) delta: 1 // delta值为1时表示返回的页面层数
});
}else{
uni.navigateTo({
url: '/pages/index/index'
})
}
}); });
}, },
} }

108
pages/my.vue
View File

@ -586,52 +586,70 @@
// }) // })
// } // }
} else { } else {
uni.redirectTo({
url: '/pages/login/login'
});
// let areaId = uni.getStorageSync('areaId');
// if (areaId) {
// let areaId = uni.getStorageSync('areaId');
// if (areaId) {
// let that = this;
// wx.login({
// success(res) {
// if (res.code) {
// console.log('登录111', res);
// let data = {
// wxOpenId: res.code,
// };
// let areaId = uni.getStorageSync('areaId');
// // 显示带有确定和取消按钮的弹窗
// uni.showModal({
// title: '确认登录',
// content: '是否使用当前微信账户进行登录？',
// success(modalRes) {
// if (modalRes.confirm) {
// console.log('用户点击确定');
// // 用户点击确定，继续执行登录操作
// that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId)
// .then(res => {
// uni.hideLoading();
// if (res.code == 200) {
// uni.setStorageSync('token', res.token);
// that.getuserInfo();
// } else if (res.code == 501) {
// uni.showToast({
// title: res.msg,
// icon: 'none',
// duration: 2000
// });
// } else {
// uni.redirectTo({
// url: '/pages/login/login'
// });
// }
// });
// } else if (modalRes.cancel) {
// console.log('用户点击取消');
// uni.redirectTo({
// url: '/pages/login/login'
// });
// // 用户点击取消，可以进行其他操作或提示
// }
// }
// });
// }
// }
// });
// }
let areaId = uni.getStorageSync('areaId'); // } else {
if (areaId) { // uni.showToast({
let that = this // title: '请授权位置信息后再尝试',
wx.login({ // icon: 'none',
success(res) { // duration: 4000
if (res.code) { // });
console.log('登录！', res); // }
let data = {
wxOpenId: res.code,
};
let areaId = uni.getStorageSync('areaId');
that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' +
areaId).then(
res => {
uni.hideLoading();
if (res.code == 200) {
uni.setStorageSync('token', res.token);
that.getuserInfo()
} else if (res.code == 501) {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
} else {
// console.log("老用户登录",res.data)
uni.redirectTo({
url: '/pages/login/login'
})
}
});
}
},
});
} else {
uni.showToast({
title: '请授权位置信息后再尝试',
icon: 'none',
duration: 4000
});
}
} }
}); });