From 731ad484071b5b27105fce087ccab071d3d5692a Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Thu, 21 Dec 2023 14:30:16 +0800
Subject: [PATCH] submit

---
 src/pages/blind-box/index.vue      |  5 +++--
 src/pages/mine/index.vue           | 15 ++++++++++-----
 src/pages/ticket-details/index.vue |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/blind-box/index.vue b/src/pages/blind-box/index.vue
index f21a8c3c..a47507be 100644
--- a/src/pages/blind-box/index.vue
+++ b/src/pages/blind-box/index.vue
@@ -10,7 +10,7 @@
       <div class="wrap2">大运河博物馆纪念盲盒</div>
     </div>
     <div class="content2">
-      <image src="https://cdns.fontree.cn/fonchain-main/prod/image/1833/avatar/76216159-e5a9-49ef-a6b3-6043924243e7.png"></image>
+      <image src="https://cdns.fontree.cn/fonchain-main/prod/image/1833/avatar/13e8a0db-9dca-4bdf-89d5-5868ec7c96e0.png"></image>
     </div>
     <div class="content3" @click="goGet">领取兑换</div>
     <div class="content4"></div>
@@ -86,7 +86,7 @@ const goGet=async ()=>{
     "userName": userInfo().realName, //用户姓名
     "idCard": userInfo().idNum, //用户身份证号
     "phone": userInfo().telNum, //预约电话
-    "blindBoxName": "博物馆开馆纪念盲盒", //盲盒名称
+    "blindBoxName": "大运河博物馆纪念盲盒", //盲盒名称
     blindBoxPicUrl:'https://cdns.fontree.cn/fonchain-main/prod/image/1833/avatar/13e8a0db-9dca-4bdf-89d5-5868ec7c96e0.png'
   }
  const res=await extractingBlindBoxes(data)
@@ -258,6 +258,7 @@ const goGet=async ()=>{
       height: 82rpx;
     }
     .content2{
+      overflow: hidden;
       margin-top: 12rpx;
       width: 100%;
       image{
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index d0de8840..6b066f17 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -53,9 +53,9 @@
         <div class="wrap1_1" style="background-color: #fff" v-if="item.isBlindBox===2">盲盒</div>
         <div class="wrap1_2">
           <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 class="wrap1_2_2">兑换场馆:{{item.venuesName}}</div>
+          <div class="wrap1_2_2">兑换日期:{{item.date?.replaceAll('/','.')}}</div>
+          <div class="wrap1_2_2">预约数量:1</div>
         </div>
         <div  class="wrap1_3"  :style="{backgroundColor:item.isBlindBox===2?'#000':''}">
           <image @click="goViewVenues(item)" v-if="item.isBlindBox===1" src="../../static/zu762@3x.png" alt=""/>
@@ -160,8 +160,13 @@ const exchange=async (item)=>{
     console.log(res,'onSocketOpen')
   });
   uni.onSocketMessage((res)=>{
-
-      console.log('WebSocket接收到消息：', res.data);
+  if (res.data==='start the camera'){
+    uni.closeSocket()
+    uni.navigateTo({
+      url: '/pages/face-auth/index'
+    })
+  }
+      console.log('WebSocket接收到消息：', res);
 
   });
 }
diff --git a/src/pages/ticket-details/index.vue b/src/pages/ticket-details/index.vue
index fbf677fc..30510ae7 100644
--- a/src/pages/ticket-details/index.vue
+++ b/src/pages/ticket-details/index.vue
@@ -7,7 +7,7 @@
         <div class="wrap1">
           <image src="../../static/zu1053@3x.png"></image>
         </div>
-        <div class="wrap2">{{ticket.ticketName}}</div>
+        <div class="wrap2">大运河博物馆</div>
       </div>
       <div class="content2">
         <image