Compare commits

..

No commits in common. "6e79d1658d07f8489b8848b435b7c5438402c000" and "5589ffb264a9a18e7d5024017489508c14d2dec2" have entirely different histories.

4 changed files with 19 additions and 49 deletions

19
App.vue
View File

@ -63,23 +63,24 @@ export default {
onHide: function () {}, onHide: function () {},
methods: { methods: {
initFn(data) { initFn(data) {
if (!data) { // uni.hideLoading(); // Loading
return uni.showToast({ title: "未传入参数 initFn", icon: "none" });
}
// uni.showModal({ // uni.showModal({
// title: "initFn", // title: 'initFn',
// content: JSON.stringify(data) || " initFn", // content: data || ' initFn',
// showCancel: true, // showCancel: true,
// success: function (res) {}, // success: function (res) {},
// }); // });
// "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9zaWQiOiIwOGRkNzFiZC01N2MxLTQ1YmMtODBiYS0xMjkzYjU4MTViMmEiLCJ1bmlxdWVfbmFtZSI6IuS_nea0gSIsInJvbGUiOiJVc2VyIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbW9iaWxlcGhvbmUiOiIxODE3NDAxMDU2MiIsImdyb3Vwc2lkIjoiNGIyZDk2NjItYTc2OC0wOGYyLWEwYzgtNzYyYjhjNzZkYTJhIiwibmJmIjoxNzQ0MjYzMTAyLCJleHAiOjE3NDQyNjY3MDIsImlhdCI6MTc0NDI2MzEwMn0.ZJTwC7rWCcywoM7ncysw-JRIiwXz4y_6hlmqctN-gMM" console.log("%c%s", "color:red", "init");
let token = data.token; console.log(data, "data--");
uni.setStorageSync("token", "Bearer " + token); uni.setStorageSync(
"token",
"Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9zaWQiOiIwOGRkNzFiZC01N2MxLTQ1YmMtODBiYS0xMjkzYjU4MTViMmEiLCJ1bmlxdWVfbmFtZSI6IuS_nea0gSIsInJvbGUiOiJVc2VyIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbW9iaWxlcGhvbmUiOiIxODE3NDAxMDU2MiIsImdyb3Vwc2lkIjoiNGIyZDk2NjItYTc2OC0wOGYyLWEwYzgtNzYyYjhjNzZkYTJhIiwibmJmIjoxNzQ0MjYzMTAyLCJleHAiOjE3NDQyNjY3MDIsImlhdCI6MTc0NDI2MzEwMn0.ZJTwC7rWCcywoM7ncysw-JRIiwXz4y_6hlmqctN-gMM"
);
uni.switchTab({ uni.switchTab({
url: "/pages/index/index", url: "/pages/index/index",
success() { success() {
console.log("跳转成功"); console.log("跳转成功");
window.initFn = null; //
}, },
fail(err) { fail(err) {
console.error("跳转失败", err); console.error("跳转失败", err);

View File

@ -5,7 +5,7 @@ if (process.env.NODE_ENV === 'development') {
BASE_URL = 'http://10.30.2.228:8556' //开发环境请求地址 BASE_URL = 'http://10.30.2.228:8556' //开发环境请求地址
} else { } else {
// 生产环境 // 生产环境
BASE_URL = 'http://10.30.2.228:8556' //生成环境请求地址 BASE_URL = 'https://mock.apifox.cn/m1/3553664-0-default' //生成环境请求地址
} }
export default BASE_URL export default BASE_URL

View File

@ -2,21 +2,25 @@
<view class="content"> </view> <view class="content"> </view>
</template> </template>
<script> <script>
import { useRouter } from "@/utils/utils.js";
import daySelect from "@/components/daySelect/index.vue";
export default { export default {
components: {
daySelect,
},
data() { data() {
return {}; return {
};
}, },
mounted() { mounted() {
// console.log("%c%s", "color:red", "mounted--"); // console.log("%c%s", "color:red", "mounted--");
}, },
onLoad() {},
methods: {}, methods: {},
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
height: 100vh; // // height: 100vh; //
// background-color: skyblue;
overflow: hidden; overflow: hidden;
padding-bottom: 100rpx; padding-bottom: 100rpx;
} }

View File

@ -45,41 +45,6 @@ const baseRequest = async (url, method, data = {}, loading = true) => {
reslove(res); reslove(res);
} }
} else { } else {
if(successData.statusCode === 401){
console.log(successData,'successData--')
console.log('%c%s', 'color:red', '登录过期')
uni.showModal({
title: "提示",
content: "登陆过期,请重新登陆",
showCancel: false,
success: function (res) {
let u = navigator.userAgent;
let isAndroid = u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
// let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios
try {
if (isAndroid && AndroidJs) {
console.log("%c%s", "color:red", "安卓--调用返回方法");
const reqRow = {
name: "back-android",
data: "",
};
AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参
} else {
console.log("%c%s", "color:red", "苹果--调用返回方法");
const reqRow = {
name: "back-iphone",
data: "",
};
window.webkit.messageHandlers.func.postMessage(JSON.stringify(reqRow)); // 给ios 传参
}
} catch (e) {
console.log(e, "e-----判断安卓苹果类型出错");
}
},
});
reject(res);
return
}
console.log("网络连接失败,请稍后重试", url); console.log("网络连接失败,请稍后重试", url);
toast("网络连接失败,请稍后重试"); toast("网络连接失败,请稍后重试");
reject(res); reject(res);