diff --git a/app/api-collect-code/goods/index.js b/app/api-collect-code/goods/index.js index ebb8eb9..30e1fb0 100644 --- a/app/api-collect-code/goods/index.js +++ b/app/api-collect-code/goods/index.js @@ -14,12 +14,11 @@ export async function offlineQrcodeCreate(data) { data }) } -export async function artworkDetail(data) { - - return await request( { - url:'/api/v1/m/artwork/detail', +export async function offlineQrcodeDelete(data) { + return await request ({ + url:'/api/v1/offlineQrcode/delete', method: 'POST', - data, + data }) } export async function userArtworks(data) { diff --git a/app/pages/collectCode/mine/components/codeCard/index.vue b/app/pages/collectCode/mine/components/codeCard/index.vue index 70b3a18..5dc3fb7 100644 --- a/app/pages/collectCode/mine/components/codeCard/index.vue +++ b/app/pages/collectCode/mine/components/codeCard/index.vue @@ -4,6 +4,7 @@ import XImage from "@/components/x-image/index.vue"; import {useRuntimeConfig} from "#app"; import QRCode from 'qrcode' import { showImagePreview } from 'vant'; +import {offlineQrcodeDelete} from "~/api-collect-code/goods/index.js"; const statusLabel=[ {label:'已付款',value:2,color:'#18A058'}, {label:'未付款',value:1,color:'#CF3050'}, {label:'已部分付款',value:4,color:'#F09F1F'} @@ -36,6 +37,7 @@ const openQrCode=async ()=>{ const base64=await getQRBase64() showImagePreview([base64]) } + diff --git a/app/pages/liveRoom/components/SideButton/index.vue b/app/pages/liveRoom/components/SideButton/index.vue index 67810e1..6207636 100644 --- a/app/pages/liveRoom/components/SideButton/index.vue +++ b/app/pages/liveRoom/components/SideButton/index.vue @@ -6,30 +6,39 @@ import { liveStore } from "@/stores/live/index.js"; import xButton from '@/components/x-button/index.vue' import tangPopup from './tangPopup.vue' import {goodStore} from "@/stores/goods/index.js"; - +import {authStore} from "~/stores/auth/index.js"; const { quoteStatus, changeStatus,show,auctionData ,getSocketData} = liveStore(); const {pageRef} = goodStore(); +const {userInfo}= authStore() const showTang=ref(false) const openOne=()=>{ showTang.value=true } - +const paySide=computed(()=>{ + //当前是否已成交,以及成交人是当前登录用户 +if (auctionData.value.artwork.isSoled&&auctionData.value.artwork.buyInfo.userID===userInfo.value.ID){ + return true +}else { + return false +} +}) +console.log('auctionData.value',auctionData.value) diff --git a/app/pages/liveRoom/components/SideButton/tangPopup.vue b/app/pages/liveRoom/components/SideButton/tangPopup.vue index 6a448f6..1c4b238 100644 --- a/app/pages/liveRoom/components/SideButton/tangPopup.vue +++ b/app/pages/liveRoom/components/SideButton/tangPopup.vue @@ -113,7 +113,7 @@ watch(()=>props.show,(newValue)=>{ loading="lazy" />
LOT{{item.index}}
- +
@@ -125,7 +125,6 @@ watch(()=>props.show,(newValue)=>{
-