Compare commits

...

39 Commits

Author SHA1 Message Date
Phoenix
309760863a 成功 2025-04-18 17:23:06 +08:00
Phoenix
f5a51ffa7c Merge branch 'xingyy' into dev
# Conflicts:
#	pnpm-lock.yaml   resolved by xingyy version
2025-04-18 16:54:35 +08:00
Phoenix
304a98e88b 修复按钮快捷方式,移除 hover 状态样式 2025-04-16 19:36:01 +08:00
Phoenix
36fcab91a3 123 2025-04-16 19:29:56 +08:00
Phoenix
2036e060ac 提交 2025-04-16 19:26:50 +08:00
Phoenix
bfd42e5364 12 2025-04-16 19:07:36 +08:00
xingyy
30a46e6817 Merge branch 'xingyy' into dev 2025-03-17 13:38:26 +08:00
xingyy
ad7833a312 refactor(collect-code): 重构收集二维码功能的个人资料和协议页面
- 优化了个人资料页面的代码结构,增加了注释和函数封装
- 重构了协议页面的代码,提高了可读性和可维护性
- 添加了获取用户法大大认证信息的功能
- 完善了签署确认逻辑,支持特殊用户和普通用户的不同签署流程
- 优化了折叠面板和 PDF 查看的处理
2025-03-14 09:44:36 +08:00
xingyy
0ab8b5f9d1 12 2025-03-13 16:17:58 +08:00
xingyy
60431c8aec Merge branch 'main' into dev 2025-03-13 16:07:40 +08:00
xingyy
1321652fd9 12 2025-03-13 15:56:33 +08:00
xingyy
f17d5913ac 12312 2025-03-13 13:16:27 +08:00
xingyy
ae4d2b91cd 123 2025-03-13 11:30:19 +08:00
xingyy
790dd3e5cf 1212 2025-03-13 10:17:31 +08:00
xingyy
46dd94c8c7 Merge branch 'main' into dev 2025-03-12 15:58:25 +08:00
xingyy
2192624cc9 Merge branch 'main' into dev 2025-03-12 15:55:45 +08:00
xingyy
aadb4da5f7 Merge branch 'xingyy' into dev 2025-03-12 14:49:22 +08:00
xingyy
8a998fdb1f Merge branch 'xingyy' into dev 2025-03-12 14:34:03 +08:00
xingyy
bcbf855258 Merge branch 'xingyy' into dev 2025-03-12 14:19:07 +08:00
xingyy
09e3861b06 Merge branch 'xingyy' into dev
# Conflicts:
#	app/pages/login/index.vue
2025-03-12 14:16:21 +08:00
xingyy
8d16e66455 Merge branch 'xingyy' into dev 2025-03-12 14:14:52 +08:00
xingyy
746cda119d Merge branch 'xingyy' into dev 2025-03-12 11:41:26 +08:00
xingyy
81fc536df2 123 2025-03-12 11:40:58 +08:00
xingyy
665abb28d0 Merge branch 'xingyy' into dev 2025-03-12 11:25:14 +08:00
xingyy
ee8b3a5bce fix(login): 修复登录页面滑动退出功能
- 在 onLeave 函数中添加了对 moveX 参数的判断
- 如果 moveX 小于 0,则在 1 秒后隐藏登录页面
- 优化了用户体验,增加了反向滑动退出登录页面的功能
2025-03-12 11:24:46 +08:00
xingyy
4c8e63bd7d Merge branch 'xingyy' into dev 2025-03-12 11:19:29 +08:00
xingyy
13bc4f4883 refactor(login): 优化登录页面逻辑
- 移除了多余的注释代码
- 简化了验证码发送逻辑
- 删除了未使用的函数
- 优化了代码结构,提高了代码可读性
2025-03-12 11:18:37 +08:00
xingyy
415267e307 Merge branch 'xingyy' into dev 2025-03-12 10:19:05 +08:00
xingyy
ebe909c4d7 Merge branch 'main' into dev 2025-03-10 14:46:51 +08:00
xingyy
44bb45327e Merge branch 'xingyy' into dev 2025-03-03 14:56:23 +08:00
xingyy
76f1395794 Merge branch 'xingyy' into dev 2025-03-03 14:39:03 +08:00
xingyy
e49b6a78d4 合并 2025-03-03 10:35:52 +08:00
xingyy
629e31bc21 Merge branch 'main' into dev 2025-02-28 15:37:25 +08:00
xingyy
0562ef19c7 Merge branch 'main' into dev 2025-02-26 15:15:08 +08:00
xingyy
cd4c6929f3 Merge branch 'xingyy' into dev 2025-02-26 15:04:52 +08:00
xingyy
85fb2c3dc4 Merge branch 'main' into dev 2025-02-26 14:50:53 +08:00
xingyy
e9635ec269 Merge branch 'xingyy' into dev 2025-02-11 16:15:55 +08:00
xingyy
e72ce59fca Merge branch 'xingyy' into dev
# Conflicts:
#	app/components/AppFooter.vue
2025-02-11 15:40:38 +08:00
xingyy
1f3bff1174 1 2025-01-10 16:38:18 +08:00
3 changed files with 45 additions and 3 deletions

View File

@ -9,11 +9,54 @@
import QRCode from 'qrcode';
import { ref } from 'vue';
import {authStore} from "~/stores/auth/index.js";
import {orderQuery} from "~/api/goods/index.js";
const {payment}= authStore()
definePageMeta({
i18n: 'payment.title'
})
const router=useRouter()
const resData=ref({})
let timer = null
const queryOrder = async () => {
try {
const res = await orderQuery({
orderNo: payment.value.payUid
})
if (res.status === 0) {
resData.value = res.data
//
if (resData.value.status === 1) {
clearInterval(timer)
router.push({
path: '/payment/result',
query:{
orderNo:payment.value.payUid
}
})
}
}
} catch (error) {
clearInterval(timer)
}
}
//
await queryOrder()
const qrCodeUrl=ref('')
//
timer = setInterval(async () => {
await queryOrder()
}, 1000)
//
onUnmounted(() => {
if (timer) {
clearInterval(timer)
closeToast()
}
})
async function generateQRCodeURL(text) {
try {
const url = await QRCode.toDataURL(text, {

View File

@ -54,8 +54,7 @@
"sass-loader": "^16.0.4",
"sharp": "^0.33.5",
"typescript": "~5.7.2",
"vant": "^4.9.15",
"vite-plugin-imagemin": "^0.6.1"
"vant": "^4.9.15"
},
"pnpm": {
"peerDependencyRules": {

View File

@ -24,7 +24,7 @@ export default defineConfig({
],
shortcuts: [
// shortcuts to multiple utilities
['btn', 'px-6 py-3 rounded-3 inline-block bg-primary text-white cursor-pointer hover:bg-primary-hover disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
['btn', 'px-6 py-3 rounded-3 inline-block bg-primary text-white cursor-pointer disabled:cursor-default disabled:bg-gray-600 disabled:opacity-50'],
],
presets: [