奖品提示

components.d.ts

@@ -30,6 +30,7 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
@@ -72,4 +73,7 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

src/views/mall/components/GoodsItem/index.vue

@@ -11,8 +11,9 @@
           <span class="color-333">￥{{ fen2yuan(item.price) }}</span>
           <span v-if="item.count" class="color-999 font-size-13 ml-1">x {{ item.count }}</span>
         </p>
-        <p v-if="lottery && lottery.length" class="font-size-14 color-primary text-decoration-underline" @click.stop="router.push('/recruit/personal/personalCenter/tradeOrder?key=3')">
-          奖品：{{ lottery.map(e => e.prize.name).join('、') }}
+        <p v-if="lottery && lottery.length" class="font-size-14" @click.stop="router.replace('/recruit/personal/personalCenter/tradeOrder?key=3')">
+          <span class="color-primary text-decoration-underline">奖品：{{ lottery.map(e => e.prize.name).join('、') }} </span>
+          <span v-if="!lottery[0].record.receiveInfo" class="color-999">（10天内未领取的，则视为主动放弃当前奖品）</span>
         </p>
       </div>
       <div v-if="[10, 20, 30].includes(orderStatus) && item.extend && item.extend?.fileUrls && item.extend?.fileUrls?.length" class="d-flex" style="max-width: 160px;">

src/views/mall/components/prizeDraw.vue

@@ -5,9 +5,12 @@
       <gridPage v-if="props.type === '1'" :lotteryId="props.lotteryId" :disabled="disabled" @start="disabled = true" @end="endCallback"></gridPage>
       <slotMachinePage v-if="props.type === '2'" :lotteryId="props.lotteryId" height="120" :class="{'mb-3': disabled}" :disabled="disabled" @start="disabled = true" @end="endCallback"></slotMachinePage>
 
-      <v-card min-height="300" width="600" class="pa-5" :class="{'mt-3': !disabled}" style="position: relative;">
+      <v-card min-height="300" width="700" class="pa-5" :class="{'mt-3': !disabled}" style="position: relative;">
         <div v-if="showDialog">
-          <p v-for="(k, i) in prizeData" :key="i" class="color-primary">{{ k.prize.prompt }}</p>
+          <p v-for="(k, i) in prizeData" :key="i" class="color-primary">
+            {{ k.prize.prompt }}
+            <span class="color-999">（10天内未领取的，则视为主动放弃当前奖品）</span>
+          </p>
           <p>凭此房券在规定有效期内可享受免费住宿一晚。</p>
           <p class="mb-5">请提供收货地址，以便安排房券派送。</p>