优化代码
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
function VerifyLogin() {
|
||||
function VerifyLogin(id) {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
uni.getStorage({
|
||||
@@ -8,19 +8,18 @@ function VerifyLogin() {
|
||||
if (res.data.nickName) {
|
||||
resolve(true);
|
||||
} else {
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id);
|
||||
uni.reLaunch({ url: "/pages/UserInformation/UserInformation" });
|
||||
resolve(false);
|
||||
}
|
||||
} else {
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id);
|
||||
uni.navigateTo({ url: '/pages/login/login' });
|
||||
resolve(false);
|
||||
}
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error("获取用户信息失败", err);
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route+"?inid=" + id);
|
||||
uni.navigateTo({ url: '/pages/login/login' });
|
||||
reject(err);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import addPrefixToHeaderIcon from './addPrefixToHeaderIcon.js'
|
||||
export default function request(urldata) {
|
||||
const { url, data, method, header, userInfo } = urldata;
|
||||
// const baseUrl = "http://49.235.115.212:8086/"+ url;
|
||||
const baseUrl = "https://pk.zhukeping.com/"+ url;
|
||||
const baseUrl = "http://192.168.1.174:8086/" + url;
|
||||
// const baseUrl = "https://pk.zhukeping.com/"+ url;
|
||||
// const baseUrl = "http://120.26.251.180:8086/"+ url;
|
||||
// const baseUrl = "http://192.168.1.218:8086/"+ url;
|
||||
if (userInfo) {
|
||||
@@ -12,18 +12,28 @@ export default function request(urldata) {
|
||||
success: (res) => {
|
||||
if (res.data) {
|
||||
if (res.data.nickName) {
|
||||
uni.request({
|
||||
url: baseUrl,
|
||||
data: data,
|
||||
method: method,
|
||||
header: header,
|
||||
success: function (res) {
|
||||
console.log("请求成功", res);
|
||||
resolve(addPrefixToHeaderIcon(res.data));
|
||||
uni.getStorage({
|
||||
key: "token",
|
||||
success: (res) => {
|
||||
console.log("token", res.data);
|
||||
uni.request({
|
||||
url: baseUrl,
|
||||
data: data,
|
||||
method: method,
|
||||
header: {
|
||||
token: res.data,
|
||||
...header
|
||||
},
|
||||
success: function (res) {
|
||||
console.log("请求成功", res);
|
||||
resolve(addPrefixToHeaderIcon(res.data));
|
||||
},
|
||||
fail: function (res) {
|
||||
reject(res);
|
||||
}
|
||||
});
|
||||
},
|
||||
fail: function (res) {
|
||||
reject(res);
|
||||
}
|
||||
fail: (res) => {}
|
||||
});
|
||||
} else {
|
||||
uni.setStorageSync("lastPage", getCurrentPages()[getCurrentPages().length - 1].route);
|
||||
@@ -43,17 +53,43 @@ export default function request(urldata) {
|
||||
});
|
||||
} else {
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.request({
|
||||
url: baseUrl,
|
||||
data: data,
|
||||
method: method,
|
||||
header: header,
|
||||
success: function (res) {
|
||||
console.log("请求成功", res);
|
||||
resolve(addPrefixToHeaderIcon(res.data));
|
||||
uni.getStorage({
|
||||
key: "token",
|
||||
success: (res) => {
|
||||
console.log("token", res.data);
|
||||
uni.request({
|
||||
url: baseUrl,
|
||||
data: data,
|
||||
method: method,
|
||||
header: {
|
||||
token: res.data,
|
||||
...header
|
||||
},
|
||||
success: function (res) {
|
||||
console.log("请求成功", res);
|
||||
resolve(addPrefixToHeaderIcon(res.data));
|
||||
},
|
||||
fail: function (res) {
|
||||
reject(res);
|
||||
}
|
||||
});
|
||||
},
|
||||
fail: function (res) {
|
||||
reject(res);
|
||||
fail: (res) => {
|
||||
uni.request({
|
||||
url: baseUrl,
|
||||
data: data,
|
||||
method: method,
|
||||
header: {
|
||||
...header
|
||||
},
|
||||
success: function (res) {
|
||||
console.log("请求成功", res);
|
||||
resolve(addPrefixToHeaderIcon(res.data));
|
||||
},
|
||||
fail: function (res) {
|
||||
reject(res);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
<template>
|
||||
<view class="topNavigation">
|
||||
<view
|
||||
@click="MakeAppointmentPK"
|
||||
:class="{ Selectcss: !Select, NoSelectcss: Select }"
|
||||
class="RealTime"
|
||||
>今日PK</view
|
||||
>
|
||||
<view
|
||||
@click="RealTimePk"
|
||||
:class="{ Selectcss: Select, NoSelectcss: !Select }"
|
||||
class="MakeAppointment"
|
||||
class="RealTime"
|
||||
>PK大厅</view
|
||||
>
|
||||
<view
|
||||
@click="MakeAppointmentPK"
|
||||
:class="{ Selectcss: !Select, NoSelectcss: Select }"
|
||||
class="MakeAppointment"
|
||||
>今日PK</view
|
||||
>
|
||||
<view @click="screening" class="Screening">筛选</view>
|
||||
<!-- <image @click="Search" src="https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/Searching.png" class="filter-icon" /> -->
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -22,18 +21,18 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
title: "Hello",
|
||||
Select: false,
|
||||
Select: true,//是否选中实时PK/今日PK false/大厅 true
|
||||
};
|
||||
},
|
||||
onLoad() {
|
||||
// 页面加载时执行
|
||||
},
|
||||
methods: {
|
||||
MakeAppointmentPK() {
|
||||
MakeAppointmentPK() {//点击今日PK
|
||||
this.Select = false;
|
||||
this.$emit("MakeAppointmentPK");
|
||||
},
|
||||
RealTimePk() {
|
||||
RealTimePk() {//点击PK大厅
|
||||
this.Select = true;
|
||||
this.$emit("RealTimePk");//触发实时PK事件
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user