diff --git a/app/api-collect-code/auth/index.js b/app/api-collect-code/auth/index.js
index 66c5ee3..b8ab883 100644
--- a/app/api-collect-code/auth/index.js
+++ b/app/api-collect-code/auth/index.js
@@ -1,24 +1,22 @@
import { request } from '@/api/http.js'
-export async function senCode(data) {
-
+export async function checkPhone(data) {
return await request({
+ url:'/api/v1/common/check/phone',
+ method: 'POST',
+ data
+ })
+}
+export async function userSend(data) {
+ return await request( {
url:'/api/v1/m/user/send',
method: 'POST',
data
})
}
-export async function userLogin(data) {
-
+export async function mobileLogin(data) {
return await request( {
- url:'/api/v1/m/user/login',
- method: 'POST',
- data
- })
-}
-export async function userUpdate(data) {
- return await request( {
- url:'/api/v1/m/user/update',
+ url:'/api/v1/m/user/mobile/login',
method: 'POST',
data
})
diff --git a/app/api-collect-code/goods/index.js b/app/api-collect-code/goods/index.js
index 99c537d..ebb8eb9 100644
--- a/app/api-collect-code/goods/index.js
+++ b/app/api-collect-code/goods/index.js
@@ -1,15 +1,15 @@
import { request } from '@/api/http.js'
-export async function artworkList(data) {
+export async function offlineQrcodeList(data) {
return await request( {
- url:'/api/v1/m/auction/default/artwork/list',
+ url:'/api/v1/offlineQrcode/query',
method: 'POST',
data
})
}
-export async function defaultDetail(data) {
+export async function offlineQrcodeCreate(data) {
return await request ({
- url:'/api/v1/m/auction/default/detail',
+ url:'/api/v1/offlineQrcode/create',
method: 'POST',
data
})
diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue
index d251a55..7065d7c 100644
--- a/app/pages/collectCode/login/index.vue
+++ b/app/pages/collectCode/login/index.vue
@@ -2,11 +2,12 @@
import { useRouter, useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'
import { senCode, userLogin } from "@/api/auth/index.js";
-import { authStore } from "@/stores/auth/index.js";
+import { codeAuthStore } from "@/stores-collect-code/auth/index.js";
import { message } from '@/components/x-message/useMessage.js'
// ... 现有导入 ...
import FingerprintJS from '@fingerprintjs/fingerprintjs'
-const { userInfo, token,fingerprint } = authStore()
+import {checkPhone, mobileLogin, userSend} from "@/api-collect-code/auth/index.js";
+const { userInfo, token,fingerprint } = codeAuthStore()
const router = useRouter();
const route = useRoute();
const { locale } = useI18n()
@@ -52,11 +53,19 @@ checkFingerprint()
const vanSwipeRef = ref(null)
const getCode = async () => {
loadingRef.value.loading1 = true
- const res = await senCode({
- telNum: phoneNum.value,
- zone: '86'
+ const res = await checkPhone({
+ tel: phoneNum.value,
})
loadingRef.value.loading1 = false
+ if (res.status === 0){
+ const res=await userSend({telNum:phoneNum.value,zone:'+86'})
+ if (res.status === 0){
+ pane.value = 1
+ vanSwipeRef.value?.swipeTo(pane.value)
+ showKeyboard.value = true
+ }
+ }
+/* loadingRef.value.loading1 = false
if (res.status === 0) {
@@ -64,7 +73,7 @@ const getCode = async () => {
pane.value = 1
vanSwipeRef.value?.swipeTo(pane.value)
showKeyboard.value = true
- startCountdown();
+ startCountdown();*/
/* pane.value = 1
vanSwipeRef.value?.swipeTo(pane.value)
showKeyboard.value=true
@@ -81,10 +90,10 @@ const goBack = () => {
}
const goLogin = async () => {
loadingRef.value.loading2 = true
- const res = await userLogin({
- telNum: phoneNum.value,
- zone: '86',
- code: code.value
+ const res = await mobileLogin({
+ TelNum: phoneNum.value,
+ Password:loginType.value===1?password.value:'',
+ Code: loginType.value===0?code.value:''
})
if (res.status === 0) {
userInfo.value = res.data.accountInfo
@@ -110,7 +119,7 @@ const goLogin = async () => {
-
+
手机号
@@ -120,7 +129,7 @@ const goLogin = async () => {
-
+
密码
@@ -138,21 +147,14 @@ const goLogin = async () => {
- {{ $t('login.getCode')
- }}
- {{
- $t('login.getCode')
- }}
+ 获取验证码
+ 获取验证码
- {{
- $t('login.login')
- }}
- {{
- $t('login.login')
- }}
+ 登录
+ 登录
@@ -161,7 +163,7 @@ const goLogin = async () => {
{{ $t('login.hasSendTo') }}
-
+{{ selectedZone }} {{ phoneNum }}
+
+86 {{ phoneNum }}
diff --git a/app/pages/collectCode/mine/components/codeCard/index.vue b/app/pages/collectCode/mine/components/codeCard/index.vue
new file mode 100644
index 0000000..7a9fd87
--- /dev/null
+++ b/app/pages/collectCode/mine/components/codeCard/index.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
¥ {{data.paidPrice}}/{{data.price}}
+
{{itemLabel(data).label}}
+
+
+
+
+
+
+
Lot:{{ data.lotNo }}
+
创建人:{{ data.userName }}
+
创建时间:{{data.createdAt}}
+
+
+
+
查看
+
+

+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/pages/collectCode/mine/index.vue b/app/pages/collectCode/mine/index.vue
index 005e24f..a931a91 100644
--- a/app/pages/collectCode/mine/index.vue
+++ b/app/pages/collectCode/mine/index.vue
@@ -1,25 +1,82 @@
@@ -34,7 +91,7 @@ initData()
{{ userInfo.realName }}
{{ userInfo.telNum }}
-
@@ -43,132 +100,31 @@ initData()
-
-
-
-
-
-
¥ 980,000/980,000
-
已付款
-
-
-
-
-
-
-
Lot:22
-
创建人:张三丰
-
创建时间:2024-09-06 12:12:12
-
-
-
-
查看
-
-

-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-

-
+
+
-
-
-
-
-
¥ 980,000/980,000
-
已付款
-
-
-
-
-
-
-
Lot:22
-
创建人:张三丰
-
创建时间:2024-09-06 12:12:12
-
-
-
-
查看
-
-

-
-
-
-
-
-
-
-

-
+
+
-
-
-
-
-
¥ 980,000/980,000
-
已付款
-
-
-
-
-
-
-
Lot:22
-
创建人:张三丰
-
创建时间:2024-09-06 12:12:12
-
-
-
-
查看
-
-

-
-
-
-
-
-
-
-

-
-
-
-
-
-
-
¥ 980,000/980,000
-
已付款
-
-
-
-
-
-
-
Lot:22
-
创建人:张三丰
-
创建时间:2024-09-06 12:12:12
-
-
-
-
查看
-
-

-
-
-
-
-
-
-
-

-
-
-
+
+
+
@@ -188,7 +144,8 @@ initData()
RMB
-
+
@@ -196,7 +153,7 @@ initData()
Lot号
-
+
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
new file mode 100644
index 0000000..511833a
--- /dev/null
+++ b/app/pages/collectCode/payment/index.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+

+
+
{{payStatus===0?'支付全部':'支付部分'}}
+
RMB 5000
+
+
+
+
{{payStatus===1?'支付全部':'支付部分'}}
+
+
+
+
\ No newline at end of file
diff --git a/app/static/images/dddf34@2x.png b/app/static/images/dddf34@2x.png
new file mode 100644
index 0000000..fc80bbe
Binary files /dev/null and b/app/static/images/dddf34@2x.png differ
diff --git a/app/stores-collect-code/goods/index.js b/app/stores-collect-code/goods/index.js
index 520d965..da84553 100644
--- a/app/stores-collect-code/goods/index.js
+++ b/app/stores-collect-code/goods/index.js
@@ -1,6 +1,7 @@
import { createGlobalState } from '@vueuse/core'
import { ref } from 'vue'
import { artworkList, defaultDetail, artworkDetail } from "@/api/goods/index.js"
+import {offlineQrcodeList} from "~/api-collect-code/goods/index.js";
export const goodStore = createGlobalState(() => {
// 状态定义
@@ -26,35 +27,20 @@ export const goodStore = createGlobalState(() => {
pageRef.value.itemCount = 0
}
- // 获取拍卖详情
- const getAuctionDetail = async () => {
- try {
- loading.value = true
- const res = await defaultDetail({})
- if (res.status === 0) {
- auctionDetail.value = res.data
- }
- } catch (err) {
- console.error('获取拍卖详情错误:', err)
- } finally {
- loading.value = false
- }
- }
// 获取艺术品列表
- const getArtworkList = async (isRefresh = false) => {
+ const getOfflineQrcodeList = async (isRefresh = false) => {
if (isRefresh) {
resetPage()
}
try {
loading.value = true
- const res = await artworkList({
- auctionUuid: auctionDetail.value.uuid,
+ const res = await offlineQrcodeList({
page: pageRef.value.page,
pageSize: pageRef.value.pageSize
})
if (res.status === 0) {
- const newItems = res.data.data || []
+ const newItems = res.data.Data || []
if (isRefresh) {
itemList.value = newItems
@@ -70,27 +56,13 @@ export const goodStore = createGlobalState(() => {
}
return { finished: true, items: [] }
} catch (err) {
- console.error('获取艺术品列表错误:', err)
return { finished: true, items: [] }
} finally {
loading.value = false
}
}
- // 获取艺术品详情
- const getArtworkDetail = async (uuid) => {
- try {
- loading.value = true
- const res = await artworkDetail({ uuid })
- if (res.status === 0) {
- artWorkDetail.value = res.data
- }
- } catch (err) {
- console.error('获取艺术品详情错误:', err)
- } finally {
- loading.value = false
- }
- }
+
return {
// 状态
@@ -106,9 +78,7 @@ export const goodStore = createGlobalState(() => {
loading,
error,
// 方法
- getAuctionDetail,
- getArtworkList,
- getArtworkDetail,
+ getOfflineQrcodeList,
resetPage
}
})
\ No newline at end of file