songzhen vor 1 Monat
Ursprung
Commit
a373a1b269

+ 15 - 1
pnpm-lock.yaml

@@ -988,30 +988,35 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-glibc@2.4.1':
     resolution: {integrity: sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.4.1':
     resolution: {integrity: sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.4.1':
     resolution: {integrity: sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.4.1':
     resolution: {integrity: sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-wasm@2.4.1':
     resolution: {integrity: sha512-/ZR0RxqxU/xxDGzbzosMjh4W6NdYFMqq2nvo2b8SLi7rsl/4jkL8S5stIikorNkdR50oVDvqb/3JT05WM+CRRA==}
@@ -1163,46 +1168,55 @@ packages:
     resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.22.4':
     resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.22.4':
     resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.22.4':
     resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
     resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.22.4':
     resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-s390x-gnu@4.22.4':
     resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.22.4':
     resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.22.4':
     resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-win32-arm64-msvc@4.22.4':
     resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
@@ -1408,7 +1422,7 @@ packages:
     engines: {node: '>= 0.6'}
 
   accounting@0.4.1:
-    resolution: {integrity: sha512-RU6KY9Y5wllyaCNBo1W11ZOTnTHMMgOZkIwdOOs6W5ibMTp72i4xIbEA48djxVGqMNTUNbvrP/1nWg5Af5m2gQ==, tarball: https://registry.npmmirror.com/accounting/-/accounting-0.4.1.tgz}
+    resolution: {integrity: sha512-RU6KY9Y5wllyaCNBo1W11ZOTnTHMMgOZkIwdOOs6W5ibMTp72i4xIbEA48djxVGqMNTUNbvrP/1nWg5Af5m2gQ==}
 
   acorn-import-attributes@1.9.5:
     resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}

+ 9 - 6
src/components/TravelDetail/PinTuan/ResultModal.vue

@@ -62,8 +62,6 @@
 </template>
 
 <script setup>
-import { useClipboard } from '@vueuse/core'
-
 const show = defineModel('show', false)
 
 const props = defineProps({
@@ -80,11 +78,16 @@ const userId = computed(() => userInfo.value?.userId ?? '')
 const shareUrl = computed(() => {
   return `${import.meta.env.VITE_APP_WEBSITE_BASE_URL}/t/${props.pinTuanInfo.projectId}?pinTuanId=${props.pinTuanInfo.id}&fromUserId=${userId.value}`
 })
-const { copy } = useClipboard({ shareUrl })
 
-function handleCopy() {
-  copy(shareUrl.value)
-  ElMessage.success('复制成功')
+async function handleCopy() {
+  navigator.clipboard.writeText(shareUrl.value).then(
+    () => {
+      ElMessage.success('复制成功')
+    },
+    () => {
+      ElMessage.success('复制失败')
+    }
+  )
 }
 </script>
 

+ 6 - 1
src/components/TravelDetail/PinTuan/SharedPanel.vue

@@ -113,7 +113,7 @@
           class="ml-10"
           type="primary"
           size="large"
-          @click="pintuanFormModalOptions.show = true"
+          @click="handlePinTuan"
           >立即参团</el-button
         >
         <NuxtLink
@@ -221,6 +221,11 @@ const pintuanFormModalOptions = reactive({
 
 function handlePintuanSuccess() {}
 
+async function handlePinTuan() {
+  await needLogin()
+  pintuanFormModalOptions.show = true
+}
+
 onMounted(() => {
   getPinTuanBaseInfo()
 })

+ 1 - 1
src/components/TravelDetail/PinTuan/StepPriceCard.vue

@@ -42,7 +42,7 @@
 
         <span class="ml-30 text-black-3">成人低至</span>
         <div class="ml-10 font-semibold text-[#FF0000]">
-          <span class="text-sm">{{ item.priceUnit ?? '¥' }}</span>
+          <span class="text-sm">{{ item.priceUnit }}</span>
           <span class="text-xl">{{ item.adultPrice }}</span>
         </div>
       </div>

+ 11 - 6
src/pages/profile/index/travel-orders.vue

@@ -129,7 +129,7 @@
 </template>
 
 <script setup>
-import { useClipboard } from '@vueuse/core'
+// import useClipboard from 'vue-clipboard3'
 
 const tabs = [
   {
@@ -228,11 +228,16 @@ function handleShare(item) {
 const shareUrl = computed(() => {
   return `${import.meta.env.VITE_APP_WEBSITE_BASE_URL}/t/${shareDialogOptions.itemData.projectId}?pinTuanId=${shareDialogOptions.itemData.tourProjectGroupPurchase?.id}&fromUserId=${userId.value}`
 })
-const { copy } = useClipboard({ shareUrl })
-
-function handleCopy() {
-  copy(shareUrl.value)
-  ElMessage.success('复制成功')
+// const { toClipboard } = useClipboard()
+async function handleCopy() {
+  navigator.clipboard.writeText(shareUrl.value).then(
+    () => {
+      ElMessage.success('复制成功')
+    },
+    () => {
+      ElMessage.success('复制失败')
+    }
+  )
 }
 
 const userInfoStore = useUserInfoStore()