Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/mall/index.vue

@@ -1,28 +1,30 @@
 <!-- 臻选商城 -->
  <template>
-  <div class="default-width white-bgc px-3 pt-5 pb-10">
-    <div class="statisticsBox">
-      <div class="mt-2">
-        <span style="font-size: 20px; color: var(--color-333); line-height: 28px; font-weight: bold;" class="ml-10">您当前可用积分</span>
-        <span style="font-size: 14px; color: var(--color-666); line-height: 24px; cursor: pointer;" class="ml-2" @click="toPointsDetails">积分明细</span>
+  <div style="background-color: var(--default-bgc); height: 100vh; overflow-y: auto;">
+    <div class="default-width white-bgc px-3 pt-5 pb-10" style="min-height: 100vh;">
+      <div class="statisticsBox">
+        <div class="mt-2">
+          <span style="font-size: 20px; color: var(--color-333); line-height: 28px; font-weight: bold;" class="ml-10">您当前可用积分</span>
+          <span style="font-size: 14px; color: var(--color-666); line-height: 24px; cursor: pointer;" class="ml-2" @click="toPointsDetails">积分明细</span>
+        </div>
+        <div class="d-flex justify-space-between align-end my-1">
+          <span style="font-size: 42px; color: #10897bba; line-height: 50px;" class="ml-10 cursor-pointer" @click="toPointsDetails">{{ integral }}</span>
+        </div>
       </div>
-      <div class="d-flex justify-space-between align-end my-1">
-        <span style="font-size: 42px; color: #10897bba; line-height: 50px;" class="ml-10 cursor-pointer" @click="toPointsDetails">{{ integral }}</span>
-      </div>
-    </div>
-    <!-- <v-tabs v-model="tab" class="mt-1" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList()"> -->
-    <v-tabs v-model="tab" class="mt-1" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList">
-      <v-tab :value="1">{{ $t('points.exchange') }}</v-tab>
-      <v-tab :value="2">{{ $t('points.exchangeRecords') }}</v-tab>
-    </v-tabs>
-    <div class="mt-5">
-      <!-- 积分兑换 -->
-      <div v-if="tab === 1">
-        <exchange></exchange>
-      </div>
-      <!-- 积分兑换记录 -->
-      <div v-if="tab === 2">
-        <exchangeRecords></exchangeRecords>
+      <!-- <v-tabs v-model="tab" class="mt-1" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList()"> -->
+      <v-tabs v-model="tab" class="mt-1" align-tabs="start" color="primary" bg-color="#fff" @update:model-value="getPositionList">
+        <v-tab :value="1">{{ $t('points.exchange') }}</v-tab>
+        <v-tab :value="2">{{ $t('points.exchangeRecords') }}</v-tab>
+      </v-tabs>
+      <div class="mt-5">
+        <!-- 积分兑换 -->
+        <div v-if="tab === 1">
+          <exchange></exchange>
+        </div>
+        <!-- 积分兑换记录 -->
+        <div v-if="tab === 2">
+          <exchangeRecords></exchangeRecords>
+        </div>
       </div>
     </div>
   </div>

src/views/recruit/personal/position/components/details.vue

@@ -115,7 +115,7 @@
       @close="shareDialog = false"
     >
       <div>
-        <div class="pa-4" style="background-color: #f0f0f0; border-radius: 8px;">{{ shareUrl }}</div>
+        <div class="pa-4" style="background-color: #f0f0f0; border-radius: 8px;">{{ shareUrlTxt }}</div>
         <v-btn v-if="!getToken()" class="mt-1" color="warning" variant="text">您还未登录，登录后分享可享受分享有礼活动！</v-btn>
         <v-btn class="mt-4 ml-3" color="success" @click="copyText">复制分享链接</v-btn>
         <v-btn class="mt-4 ml-3" color="primary" variant="outlined" @click="openShareLink">打开分享链接</v-btn>
@@ -137,7 +137,7 @@
 
 <script setup>
 defineOptions({ name: 'position-details' })
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { timesTampChange } from '@/utils/date'
 import { getPersonResumeCv } from '@/api/resume'
@@ -209,17 +209,22 @@ const handleShare = async () => {
     file: 'file',
   }).toString()
   shareDialog.value = true
-  // window.open(shareUrl.value)
 }
 const openShareLink = () => { window.open(shareUrl.value) }
+
+// 复制分享链接
+const shareUrlTxt = computed(() => {
+  return 'http://menduner.citupro.com:7878' + shareUrl.value
+})
 const copyText = async () => {
   try {
+    const txt = shareUrlTxt.value
     if (navigator.clipboard && navigator.clipboard.writeText) {
-      await navigator.clipboard.writeText(shareUrl.value)
+      await navigator.clipboard.writeText(txt)
       Snackbar.success('复制成功')
     } else {
       const textArea = document.createElement("textarea")
-      textArea.value = shareUrl.value
+      textArea.value = txt
       textArea.style.position = "fixed" // 避免在页面上滚动  
       textArea.style.top = 0
       textArea.style.left = 0