From fedcb33d1570a35f58ac7e670cab722caf3786e5 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Wed, 20 Dec 2023 09:37:55 +0800
Subject: [PATCH] submit

---
 src/pages/blind-box/index.vue |   2 +-
 src/pages/mine/index.vue      |  29 ++++++++++++++++++++---------
 src/static/zu1216@3x.png      | Bin 0 -> 3599 bytes
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 src/static/zu1216@3x.png

diff --git a/src/pages/blind-box/index.vue b/src/pages/blind-box/index.vue
index e1f4ac0b..87ec48a1 100644
--- a/src/pages/blind-box/index.vue
+++ b/src/pages/blind-box/index.vue
@@ -42,7 +42,7 @@
           <div class="wrap3">
             <image :src="imageSrc"></image>
           </div>
-          <div class="wrap4">确定</div>
+          <div class="wrap4" @click="showWin4=false">确定</div>
           <div class="wrap5">*可从“我的票库”查看</div>
         </div>
     </tm-drawer>
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index c5dad57d..db15b9cc 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -48,17 +48,19 @@
       <div class="wrap1_5">
         <image :src="item.ticketCoverPic"></image>
       </div>
-        <div class="wrap1_6">
+        <div class="wrap1_6" :style="{backgroundColor:item.isBlindBox===2?'#CC2727':''}">
         </div>
-        <div class="wrap1_1" >{{statusList.find(x=>x.value===item.status).label}}</div>
+        <div class="wrap1_1" v-if="item.isBlindBox===1">{{statusList.find(x=>x.value===item.status).label}}</div>
+        <div class="wrap1_1" style="background-color: #fff" v-if="item.isBlindBox===2">盲盒</div>
         <div class="wrap1_2">
-          <div class="wrap1_2_1">首都博物馆门票</div>
-          <div class="wrap1_2_2">预约场馆:首都博物馆</div>
-          <div class="wrap1_2_2">预约日期:2023.12.30</div>
-          <div class="wrap1_2_2">预约类型:1</div>
+          <div class="wrap1_2_1">{{item.ticketName}}</div>
+          <div class="wrap1_2_2">预约场馆:{{item.venuesName}}</div>
+          <div class="wrap1_2_2">预约日期:{{item.date?.replaceAll('/','.')}}</div>
+          <div class="wrap1_2_2">预约类型:{{item.isBlindBox===1?'正常预约':'盲盒预约'}}</div>
         </div>
-        <div class="wrap1_3" @click="goViewVenues">
-          <image src="../../static/zu762@3x.png" alt=""/>
+        <div  class="wrap1_3" @click="goViewVenues" :style="{backgroundColor:item.isBlindBox===2?'#000':''}">
+          <image v-if="item.isBlindBox===1" src="../../static/zu762@3x.png" alt=""/>
+          <image v-if="item.isBlindBox===2" style="width: 79rpx;height: 34rpx" src="../../static/zu1216@3x.png" alt=""/>
         </div>
       </div>
     </div>
@@ -96,6 +98,10 @@ const statusList=ref([
   {
     label:'',
     value:5
+  },
+  {
+    label:'盲盒',
+    value:6
   }
 ])
 const getData=async ()=>{
@@ -182,6 +188,11 @@ const goSetUp = () => {
           background-color: #B29E92;
         }
       }
+      &.status6{
+        .wrap1_6{
+          background-color: #fff;
+        }
+      }
       &.status5{
         .wrap1_6{
           background-color: #EB783C;
@@ -222,7 +233,7 @@ const goSetUp = () => {
 
       .wrap1_2 {
         top: 16rpx;
-        right: 178rpx;
+        left: 285rpx;
         position: absolute;
 
         .wrap1_2_1 {
diff --git a/src/static/zu1216@3x.png b/src/static/zu1216@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..52f41a379d0b7fa538fdcbffe5c93177d0bf8575
GIT binary patch
literal 3599
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
Vjeq+P!utRK002ovPDHLkV1jAH^9KL`

literal 0
HcmV?d00001