14 Commits

Author SHA1 Message Date
09452bf600 feat: 提交订单的loading 添加 2025-12-01 16:55:10 +08:00
c20563ecf5 feat: 修复了连接断开之后重连的逻辑 2025-12-01 16:39:55 +08:00
172bae663b feat: 支付的时候防止重复点击 2025-12-01 15:15:48 +08:00
9632f5c065 fix: 禁止分享登录页面 2025-12-01 14:18:37 +08:00
3f803b662a feat: 首页的动效的修复 2025-11-26 23:58:18 +08:00
84b77b3fe6 feat: 商品数量的计算问题 2025-11-26 23:35:31 +08:00
92f981769f feat: 商品计算报错问题 2025-11-26 22:47:17 +08:00
f69225dbff feat: 商品的计算问题 2025-11-26 22:24:04 +08:00
f422dbaa00 feat:工单的校验问题处理 2025-11-20 14:02:54 +08:00
14fee13568 feat: 快速预定栏的样式处理 2025-11-20 13:48:59 +08:00
ed62f3fbbc feat: 呼叫服务和反馈意见样式调整 2025-11-19 18:06:36 +08:00
duanshuwen
8f79f5aecf feat: 异常问题处理 2025-11-18 20:01:25 +08:00
duanshuwen
c2c4f323dc feat: 授权token保持登录 2025-11-18 19:44:55 +08:00
duanshuwen
de412aed9c feat: 授权后token刷新保持 2025-11-18 19:40:28 +08:00
24 changed files with 612 additions and 2278 deletions

View File

@@ -1,6 +1,6 @@
{
"zhinian": {
"clientId": "2",
"clientId": "6",
"appId": "wx5e79df5996572539",
"name": "智念",
"placeholder": "快告诉智念您在想什么~",

View File

@@ -1,9 +1,11 @@
<script setup>
import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
import { getEvnUrl } from "@/request/api/config";
import { refreshToken } from "@/hooks/useGoLogin";
onLaunch(() => {
getEvnUrl({ versionValue: "1.0.1" });
refreshToken();
});
onShow(() => {

View File

@@ -15,7 +15,7 @@
/>
</view>
<view v-if="!isCallSuccess" class="order-content border-box p-12">
<view v-if="!isCallSuccess" class="border-box p-12">
<view
class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
>
@@ -149,6 +149,8 @@ const originalPhone = ref("");
const contactPhone = ref("");
// 是否用户已编辑过手机号(一旦编辑则不再脱敏)
const hasEditedPhone = ref(false);
// 需求信息描述:使用可写的 ref并从工具结果初始化
const contactText = ref("");
// 手机号脱敏138****1234仅对11位数字进行处理
const maskPhone = (phone) => {
@@ -163,13 +165,10 @@ watch(
originalPhone.value = val?.userPhone || "";
hasEditedPhone.value = false;
contactPhone.value = maskPhone(originalPhone.value);
contactText.value = val?.callServiceContent || "";
},
{ immediate: true }
);
const contactText = computed({
get: () => toolResult.value?.callServiceContent || "",
set: (val) => (contactText.value = val),
});
// 处理图片上传
const handleChooseImage = () => {

View File

@@ -6,9 +6,6 @@
width: 98px;
height: 48px;
}
.order-content {
width: 335px;
}
.help-icon {
width: 16px;

View File

@@ -15,7 +15,7 @@
/>
</view>
<view v-if="!isCallSuccess" class="order-content border-box p-12">
<view v-if="!isCallSuccess" class="border-box p-12">
<view
class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
>

View File

@@ -7,10 +7,6 @@
height: 48px;
}
.order-content {
width: 335px;
}
.help-icon {
width: 16px;
height: 16px;

View File

@@ -1,6 +1,7 @@
import { wxLogin } from "../request/api/LoginApi";
import { loginAuth, bindPhone, checkPhone } from "@/manager/LoginManager";
import { clientId } from "@/constant/base";
import { useAppStore } from "@/store";
import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
// 跳转登录
export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
@@ -46,14 +47,44 @@ export const onLogin = async (e) => {
// 检测token
export const checkToken = () => {
const token = uni.getStorageSync("token");
return new Promise((resolve) => {
const appStore = useAppStore();
console.log("appStore.hasToken: ", appStore.hasToken);
if (!appStore.hasToken) {
console.log("没有token跳转到登录页");
if (!token) {
goLogin();
return;
}
resolve();
});
};
// 刷新token
export const refreshToken = () => {
const token = uni.getStorageSync("token");
if (!token) {
return;
}
uni.login({
provider: "weixin", //使用微信登录
success: async ({ code }) => {
console.log("refreshToken", code);
const params = {
openIdCode: [code],
grant_type: "wechat",
scope: "server",
clientId: clientId,
};
console.log("获取到的微信授权params:", JSON.stringify(params));
const response = await wxLogin(params);
if (response.access_token) {
uni.setStorageSync("token", response.access_token);
// 登录成功后,触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
}
},
});
};

View File

@@ -16,6 +16,8 @@ app.$mount();
import { createSSRApp } from "vue";
import * as Pinia from "pinia";
import { createUnistorage } from "pinia-plugin-unistorage";
import noclick from "./utils/noclick";
export function createApp() {
const app = createSSRApp(App);
const pinia = Pinia.createPinia();
@@ -23,10 +25,11 @@ export function createApp() {
pinia.use(createUnistorage());
app.use(pinia);
app.use(share);
app.use(noclick);
return {
app,
pinia,
};
}
// #endif
// #endif

View File

@@ -22,12 +22,8 @@ export const getWeChatAuthCode = (e) => {
uni.login({
provider,
onlyAuthorize: true,
success: (res) => {
resolve(res.code);
},
fail: (err) => {
reject(err);
},
success: (res) => resolve(res.code),
fail: (err) => reject(err),
});
});
};

View File

@@ -11,7 +11,6 @@ import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
const loginAuth = (e) => {
uni.setStorageSync("token", "");
const appStore = useAppStore();
appStore.setHasToken(false);
return new Promise(async (resolve, reject) => {
const openIdCode = await getWeChatAuthCode(e);
@@ -28,8 +27,6 @@ const loginAuth = (e) => {
if (response.access_token) {
uni.setStorageSync("token", response.access_token);
const appStore = useAppStore();
appStore.setHasToken(true);
// 登录成功后,触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
resolve();

View File

@@ -21,7 +21,7 @@
/>
<text
class="font-size-16 font-500 color-white"
@click="emit('payClick', orderData)"
@click="$onMultipleClicks(() => emit('payClick', orderData))"
>立即支付</text
>
</view>
@@ -57,7 +57,6 @@ const count = computed({
const totalAmt = computed(() => {
const { totalDays } = props.selectedDate;
const { specificationPrice } = props.orderData;
return count.value * Number(specificationPrice) * totalDays;
});
</script>

View File

@@ -128,11 +128,6 @@ const isDeleting = ref(false); // 标志位防止删除时watch冲突
watch(
quantity,
async (newQuantity) => {
// 非酒店类型,不处理
if (orderData.value.commodityTypeCode !== "0") {
return;
}
// 如果正在执行删除操作跳过watch逻辑
if (isDeleting.value) {
isDeleting.value = false;
@@ -208,96 +203,107 @@ const validateUserForms = () => {
// 处理支付点击事件
const handlePayClick = ThrottleUtils.createThrottle(async (goodsData) => {
console.log("处理支付点击事件", userFormList.value);
// 判断是酒店类型
if (goodsData.commodityTypeCode === "0") {
// 校验用户姓名
if (!validateUserForms()) {
// 点击后立即展示 loading
uni.showLoading({ title: "正在提交订单..." });
try {
console.log("处理支付点击事件", userFormList.value);
// 判断是酒店类型
if (goodsData.commodityTypeCode === "0") {
// 校验用户姓名
if (!validateUserForms()) {
uni.hideLoading();
return;
}
}
// 校验手机号
if (!PhoneUtils.validatePhone(userFormList.value[0].contactPhone)) {
uni.hideLoading();
uni.showToast({ title: "请输入正确的手机号", icon: "none" });
return;
}
// 购买的商品id
const commodityId = goodsData.commodityId;
// 消费者信息
const consumerInfoEntityList = userFormList.value;
// 购买数量
const purchaseAmount = consumerInfoEntityList.length;
// 支付方式 0-微信 1-支付宝 2-云闪付
const payWay = "0";
// 支付渠道 0-app 1-小程序 2-h5
const paySource = "1";
const params = {
commodityId,
purchaseAmount,
payWay,
paySource,
consumerInfoEntityList,
};
//酒店类型添加入住时间、离店时间
if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
const { startDate, endDate } = selectedDate.value;
// 入住时间
params.checkInData = startDate;
// 离店时间
params.checkOutData = endDate;
}
const res = await orderPay(params);
console.log("确认订单---2:", res);
// 检查接口返回数据
if (!res || !res.data) {
uni.hideLoading();
uni.showToast({ title: "订单创建失败,请重试", icon: "none" });
return;
}
const { data } = res;
const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
// 验证支付参数是否完整
if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
uni.hideLoading();
uni.showToast({ title: "支付参数错误,请重试", icon: "none" });
return;
}
// 在发起微信支付前关闭 loading避免与原生支付 UI 冲突)
uni.hideLoading();
// 调用微信支付
uni.requestPayment({
provider: "wxpay",
timeStamp: String(timeStamp), // 确保为字符串类型
nonceStr: String(nonceStr),
package: String(packageVal), // 确保为字符串类型
signType: String(signType),
paySign: String(paySign),
success: () => {
uni.showToast({
title: "支付成功",
icon: "success",
success: () => {
uni.navigateTo({
url: "/pages-order/order/list",
});
},
});
},
fail: () => {
uni.showToast({ title: "支付失败,请重试", icon: "none" });
},
});
} catch (error) {
console.error(error);
uni.showToast({ title: "请求出错,请重试", icon: "none" });
} finally {
// 防止某些分支忘记 hide确保最终关闭 loadingrequestPayment 后也可以安全调用 hide
uni.hideLoading();
}
// 校验手机号
if (!PhoneUtils.validatePhone(userFormList.value[0].contactPhone)) {
uni.showToast({ title: "请输入正确的手机号", icon: "none" });
return;
}
// 购买的商品id
const commodityId = goodsData.commodityId;
// 消费者信息
const consumerInfoEntityList = userFormList.value;
// 购买数量
const purchaseAmount = consumerInfoEntityList.length;
// 支付方式 0-微信 1-支付宝 2-云闪付
const payWay = "0";
// 支付渠道 0-app 1-小程序 2-h5
const paySource = "1";
const params = {
commodityId,
purchaseAmount,
payWay,
paySource,
consumerInfoEntityList,
};
//酒店类型添加入住时间、离店时间
if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
const { startDate, endDate } = selectedDate.value;
// 入住时间
params.checkInData = startDate;
// 离店时间
params.checkOutData = endDate;
}
const res = await orderPay(params);
console.log("确认订单---2:", res);
// 检查接口返回数据
if (!res || !res.data) {
uni.showToast({ title: "订单创建失败,请重试", icon: "none" });
return;
}
const { data } = res;
const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
// 验证支付参数是否完整
if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
// console.error("支付参数不完整:", {
// nonceStr: !!nonceStr,
// packageVal: !!packageVal,
// paySign: !!paySign,
// signType: !!signType,
// timeStamp: !!timeStamp,
// });
uni.showToast({ title: "支付参数错误,请重试", icon: "none" });
return;
}
// 调用微信支付
uni.requestPayment({
provider: "wxpay",
timeStamp: String(timeStamp), // 确保为字符串类型
nonceStr: String(nonceStr),
package: String(packageVal), // 确保为字符串类型
signType: String(signType),
paySign: String(paySign),
success: () => {
uni.showToast({
title: "支付成功",
icon: "success",
success: () => {
uni.navigateTo({
url: "/pages-order/order/list",
});
},
});
},
fail: () => {
uni.showToast({ title: "支付失败,请重试", icon: "none" });
},
});
}, 1000);
</script>

View File

@@ -17,7 +17,7 @@
'bg-2D91FF': ['1', '2', '3', '4', '5', '6'].includes(statusCode),
},
]"
@click="handleButtonClick(orderData)"
@click="$onmultipleClicks(() => handleButtonClick(orderData))"
>
{{ buttonText }}
</button>
@@ -71,10 +71,14 @@ const handleButtonClick = async (orderData) => {
uni.navigateTo({
url: `/pages/goods/index?commodityId=${orderData.commodityId}`,
});
return;
}
// 待支付状态,调用支付接口
if (statusCode.value === "0") {
// 显示 loading
uni.showLoading({ title: "正在提交订单..." });
const orderId = orderData.orderId;
const payWay = orderData.payWay;
const paySource = orderData.paySource;
@@ -84,6 +88,7 @@ const handleButtonClick = async (orderData) => {
// 检查接口返回数据
if (!res || !res.data) {
uni.hideLoading();
uni.showToast({ title: "订单创建失败,请重试", icon: "none" });
return;
}
@@ -93,17 +98,14 @@ const handleButtonClick = async (orderData) => {
// 验证支付参数是否完整
if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
// console.error("支付参数不完整:", {
// nonceStr: !!nonceStr,
// packageVal: !!packageVal,
// paySign: !!paySign,
// signType: !!signType,
// timeStamp: !!timeStamp,
// });
uni.hideLoading();
uni.showToast({ title: "支付参数错误,请重试", icon: "none" });
return;
}
// 在发起微信支付前关闭 loading避免与原生支付 UI 冲突)
uni.hideLoading();
// 调用微信支付
uni.requestPayment({
provider: "wxpay",
@@ -126,6 +128,7 @@ const handleButtonClick = async (orderData) => {
}
} catch (error) {
console.error("操作失败:", error);
uni.hideLoading();
}
};
</script>

View File

@@ -100,8 +100,6 @@ const handleLogout = () => {
success: (res) => {
if (res.confirm) {
uni.clearStorageSync();
appStore.setHasToken(false);
appStore.setTokenExpired(true);
emits("close");
uni.$emit(NOTICE_EVENT_LOGOUT);
}

View File

@@ -346,7 +346,9 @@ onLoad(() => {
// token存在初始化数据
const initHandler = () => {
console.log("initHandler");
if (!appStore.hasToken) return;
const token = uni.getStorageSync("token");
if (!token) return;
loadRecentConversation();
///loadConversationMsgList();
initWebSocket();
@@ -405,7 +407,7 @@ const getMainPageData = async () => {
/// =============对话↓================
// 初始化WebSocket
const initWebSocket = () => {
const initWebSocket = async () => {
// 清理旧实例
if (webSocketManager) {
webSocketManager.destroy();
@@ -424,9 +426,10 @@ const initWebSocket = () => {
// 连接成功回调
onOpen: (event) => {
console.log("WebSocket连接成功");
// 重置会话状态
webSocketConnectStatus = true;
isSessionActive.value = true;
isSessionActive.value = false; // 连接成功时重置会话状态,避免影响新消息发送
},
// 连接断开回调
@@ -439,9 +442,9 @@ const initWebSocket = () => {
// 错误回调
onError: (error) => {
console.error("WebSocket错误:", error);
webSocketConnectStatus = false;
isSessionActive.value = false;
console.error("WebSocket错误:", error);
},
// 消息回调
@@ -456,67 +459,73 @@ const initWebSocket = () => {
getAgentId: () => agentId.value,
});
// 初始化连接
webSocketManager
.connect()
.then(() => {
webSocketConnectStatus = true;
})
.catch((error) => {
console.error("WebSocket连接失败:", error);
});
try {
// 初始化连接
await webSocketManager.connect();
console.log("WebSocket连接初始化成功");
webSocketConnectStatus = true;
return true;
} catch (error) {
console.error("WebSocket连接失败:", error);
webSocketConnectStatus = false;
return false;
}
};
// 处理WebSocket消息
const handleWebSocketMessage = (data) => {
const aiMsgIndex = chatMsgList.value.length - 1;
if (!chatMsgList.value[aiMsgIndex] || aiMsgIndex < 0) {
return;
}
// 确保消息内容是字符串类型
if (data.content && typeof data.content !== "string") {
data.content = String(data.content);
}
// 直接拼接内容到AI消息
if (data.content) {
if (chatMsgList.value[aiMsgIndex].isLoading) {
chatMsgList.value[aiMsgIndex].msg = "";
const handleWebSocketMessage = (data) => {
const aiMsgIndex = chatMsgList.value.length - 1;
if (!chatMsgList.value[aiMsgIndex] || aiMsgIndex < 0) {
console.error("处理WebSocket消息时找不到对应的AI消息项");
return;
}
chatMsgList.value[aiMsgIndex].msg += data.content;
chatMsgList.value[aiMsgIndex].isLoading = false;
nextTick(() => scrollToBottom());
}
// 处理完成状态
if (data.finish) {
const msg = chatMsgList.value[aiMsgIndex].msg;
if (!msg || chatMsgList.value[aiMsgIndex].isLoading) {
chatMsgList.value[aiMsgIndex].msg = "未获取到内容,请重试";
chatMsgList.value[aiMsgIndex].isLoading = false;
if (data.toolCall) {
// 确保消息内容是字符串类型
if (data.content && typeof data.content !== "string") {
data.content = String(data.content);
}
// 直接拼接内容到AI消息
if (data.content) {
if (chatMsgList.value[aiMsgIndex].isLoading) {
chatMsgList.value[aiMsgIndex].msg = "";
}
chatMsgList.value[aiMsgIndex].msg += data.content;
chatMsgList.value[aiMsgIndex].isLoading = false;
nextTick(() => scrollToBottom());
}
// 处理toolCall
if (data.toolCall) {
chatMsgList.value[aiMsgIndex].toolCall = data.toolCall;
}
// 处理完成状态
if (data.finish) {
const msg = chatMsgList.value[aiMsgIndex].msg;
if (!msg || chatMsgList.value[aiMsgIndex].isLoading) {
chatMsgList.value[aiMsgIndex].msg = "未获取到内容,请重试";
chatMsgList.value[aiMsgIndex].isLoading = false;
if (data.toolCall) {
chatMsgList.value[aiMsgIndex].msg = "";
}
}
// 处理question
if (data.question && data.question.length > 0) {
chatMsgList.value[aiMsgIndex].question = data.question;
}
// 处理toolCall
if (data.toolCall) {
chatMsgList.value[aiMsgIndex].toolCall = data.toolCall;
}
// 重置会话状态
isSessionActive.value = false;
}
};
// 处理question
if (data.question && data.question.length > 0) {
chatMsgList.value[aiMsgIndex].question = data.question;
}
// 重置会话状态
isSessionActive.value = false;
}
};
// 重置消息状态
const resetMessageState = () => {};
const resetMessageState = () => {
// 重置当前会话消息ID
currentSessionMessageId = null;
};
// 初始化数据 首次数据加载的时候
const initData = () => {
@@ -534,12 +543,39 @@ const sendMessage = async (message, isInstruct = false) => {
await checkToken();
// 检查WebSocket连接状态如果未连接尝试重新连接
if (!webSocketConnectStatus) {
uni.showToast({
title: "当前网络异常,请稍后重试",
icon: "none",
console.log("WebSocket未连接尝试重新连接...");
// 显示加载提示
uni.showLoading({
title: "正在连接服务器...",
});
return;
// 尝试重新初始化WebSocket连接
try {
await initWebSocket();
// 等待短暂时间确保连接建立
await new Promise(resolve => setTimeout(resolve, 1000));
// 检查连接是否成功建立
if (!webSocketConnectStatus) {
uni.hideLoading();
uni.showToast({
title: "连接服务器失败,请稍后重试",
icon: "none",
});
return;
}
uni.hideLoading();
} catch (error) {
console.error("重新连接WebSocket失败:", error);
uni.hideLoading();
uni.showToast({
title: "连接服务器失败,请稍后重试",
icon: "none",
});
return;
}
}
if (isSessionActive.value) {
@@ -561,6 +597,8 @@ const sendMessage = async (message, isInstruct = false) => {
};
chatMsgList.value.push(newMsg);
inputMessage.value = "";
// 发送消息后滚动到底部
setTimeoutScrollToBottom();
sendChat(message, isInstruct);
console.log("发送的新消息:", JSON.stringify(newMsg));
};
@@ -576,9 +614,11 @@ const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
};
try {
webSocketManager.sendMessage(args);
// 直接调用webSocketManagersendMessage方法,利用其内部的消息队列机制
// 即使当前连接断开,消息也会被加入队列,等待连接恢复后发送
const result = webSocketManager.sendMessage(args);
console.log(`WebSocket消息已发送 [类型:${messageType}]:`, args);
return true;
return result;
} catch (error) {
console.error("发送WebSocket消息失败:", error);
isSessionActive.value = false;
@@ -588,9 +628,26 @@ const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
// 发送获取AI聊天消息
const sendChat = (message, isInstruct = false) => {
if (!webSocketManager || !webSocketManager.isConnected()) {
console.error("WebSocket未连接");
isSessionActive.value = false;
// 检查WebSocket管理器是否存在如果不存在尝试重新初始化
if (!webSocketManager) {
console.error("WebSocket管理器不存在尝试重新初始化...");
initWebSocket();
// 短暂延迟后再次检查连接状态
setTimeout(() => {
if (webSocketManager && webSocketManager.isConnected()) {
// 连接成功后重新发送消息
sendChat(message, isInstruct);
} else {
console.error("WebSocket重新初始化失败");
isSessionActive.value = false;
// 更新AI消息状态为失败
const aiMsgIndex = chatMsgList.value.length - 1;
if (aiMsgIndex >= 0 && chatMsgList.value[aiMsgIndex].msgType === MessageRole.AI) {
chatMsgList.value[aiMsgIndex].msg = "发送消息失败,请重试";
chatMsgList.value[aiMsgIndex].isLoading = false;
}
}
}, 1000);
return;
}
@@ -613,6 +670,8 @@ const sendChat = (message, isInstruct = false) => {
},
};
chatMsgList.value.push(aiMsg);
// 添加AI消息后滚动到底部
setTimeoutScrollToBottom();
const aiMsgIndex = chatMsgList.value.length - 1;
// 发送消息
@@ -676,6 +735,7 @@ const resetConfig = () => {
// 重置消息状态
resetMessageState();
isSessionActive.value = false;
// 清理定时器
if (holdKeyboardTimer.value) {

View File

@@ -1,6 +1,6 @@
<template>
<view
class="quick-access border-box flex flex-nowrap items-center ml-12 pt-8 pb-8"
class="quick-access flex flex-row ml-12 pt-8 pb-8 scroll-x whitespace-nowrap"
>
<view
class="item border-box rounded-50 flex flex-row items-center"

View File

@@ -3,11 +3,21 @@
}
.ip {
position: relative;
flex: 0 0 158px;
width: 158px;
height: 134px;
animation: sprite-play calc(var(--ipLargeTime) * 1s)
steps(var(--ipLargeImageStep)) infinite;
&::before {
content: "";
position: absolute;
background-color: #f9fcfd;
top: 0;
left: 0;
right: 0;
height: 3px;
}
}
@keyframes sprite-play {

View File

@@ -55,15 +55,6 @@
>
手机号快捷登录
</button>
<button
v-if="isAgree && appStore.tokenExpired"
class="login-btn"
type="primary"
@click="handleLogin"
>
手机号快捷登录
</button>
</view>
<AgreePopup
@@ -120,20 +111,6 @@ const getPhoneNumber = (e) => {
.catch(() => {});
};
const handleLogin = () => {
console.log("handleLogin");
onLogin()
.then(() => {
uni.showToast({
title: "登录成功",
icon: "success",
});
appStore.setTokenExpired(false);
goBack();
})
.catch(() => {});
};
// 处理同意协议点击事件
const handleAgreeClick = (type) => {
visible.value = true;

View File

@@ -25,6 +25,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
...defaultConfig.header,
...customConfig.header,
};
// 判断是否需要 token
if (customConfig.noToken) {
delete header.Authorization;
@@ -58,8 +59,6 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
if (res.statusCode && res.statusCode === 424) {
console.log("424错误重新登录");
uni.setStorageSync("token", "");
appStore.setHasToken(false);
appStore.setTokenExpired(true);
uni.$emit(NOTICE_EVENT_LOGOUT);
goLogin();
}

View File

@@ -5,8 +5,6 @@ export const useAppStore = defineStore("app", {
return {
title: "",
sceneId: "", // 分身场景id
hasToken: false, // 是否有token
tokenExpired: false, // token是否过期
previewImageData: [], // 预览图片数据
serverConfig: {
baseUrl: "https://onefeel.brother7.cn/ingress", // 服务器基础地址
@@ -23,12 +21,6 @@ export const useAppStore = defineStore("app", {
setSceneId(data) {
this.sceneId = data;
},
setHasToken(status) {
this.hasToken = status;
},
setTokenExpired(status) {
this.tokenExpired = status;
},
setPreviewImageData(data) {
this.previewImageData = data;
},

View File

@@ -3,7 +3,11 @@ import { defineStore } from "pinia";
export const useSelectedDateStore = defineStore("selectedDate", {
state() {
return {
selectedDate: {},
selectedDate: {
startDate: "",
endDate: "",
totalDays: 1,
},
};
},

28
src/utils/noclick.js Normal file
View File

@@ -0,0 +1,28 @@
// 防止处理多次点击
// methods是需要点击后需要执行的函数 info是点击需要传的参数
export function noMultipleClicks(fn, info, delay = 2000) {
if (typeof fn !== 'function') return;
// this 会是组件实例(因为通过 globalProperties 调用时 Vue 会把组件实例作为上下文)
const ctx = this || {};
if (!ctx.__noClickMap) ctx.__noClickMap = new WeakMap();
const map = ctx.__noClickMap;
if (map.get(fn)) {
console.log('请勿重复点击:', fn.name);
return;
}
map.set(fn, true);
// 保留组件上下文调用方法
fn.call(ctx, info);
setTimeout(() => {
map.set(fn, false);
}, delay);
}
export default {
install(app) {
app.config.globalProperties.$noMultipleClicks = noMultipleClicks;
}
}

View File

@@ -3,7 +3,9 @@ export default {
app.mixin({
onLoad() {
const page = getCurrentPages().pop();
if (page) {
console.log("Current page:", page);
const allowShare = page && page.route && page.route !== "pages/login/index";
if (allowShare) {
uni.showShareMenu({
withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"],

2331
yarn.lock

File diff suppressed because it is too large Load Diff