From 845ad5b693ee1ce5b54574bbfb0c5da13f817d60 Mon Sep 17 00:00:00 2001
From: yangtao <yang1793766139@163.com>
Date: Wed, 10 Apr 2024 20:06:38 +0800
Subject: [PATCH] 1

---
 components/treasureBox/index.vue | 28 +++++++++++++++-------------
 pages/store/settled/step3.vue    |  2 +-
 pages/users/user_sgin/index.vue  | 12 ++++++------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/components/treasureBox/index.vue b/components/treasureBox/index.vue
index d59ed1f..fe31354 100644
--- a/components/treasureBox/index.vue
+++ b/components/treasureBox/index.vue
@@ -17,23 +17,24 @@
 		<view class="coupon_popups" v-if="popShow">
 			<view class="bg2"></view>
 			<view class="con" >
-				<view class="content">
-					<image :src="drawInfo.img" mode=""></image>
+				<view class="contents">
+					<image src="@/static/images/jf.png" style="width: 48px;height:48px;" mode=""></image>
 					<view class="text-black">恭喜您获得</view>
 					<view class="text-red">{{drawInfo.text}}积分</view>
-					<view class="btn" @click="confirm">开心收下</view>
+					<view class="btn" @click="confirm" v-if="">开心收下</view>
+					<view class="btn" @click="goBlind">继续开盲盒</view>
 				</view>
 				<view class='iconfont icon-guanbi3' @click="popShow = false"></view>
 			</view>
 		</view>
-		 
+		  <blindBox v-if="blindShow"></blindBox>
 	</view>
 </template>
 
 <script>
 	
 	import {getWhellNumber,getWhellConfig,getWhellAction,getWhellList,setSignIntegral} from '@/api/user.js';
-	import blindBox from '@/components/blindBox/blindBox.vue';
+    import blindBox from '@/components/blindBox/blindBox.vue';
 	export default {
 		components: {
 			blindBox
@@ -43,6 +44,7 @@
 				wheel:0,
 				popShow:false,
 				gifShow:false,
+				blindShow:false,
 				integral:'',
 				list:[],
 				drawInfo:{
@@ -59,14 +61,14 @@
 				this.popShow = false;
 				this.close();
 			},
-			async openBox(){
+			async openBox(){ 
 				await setSignIntegral().then(res=>{
 					this.drawInfo.text = res.data.integral;
 					this.gifShow=true;
 					setTimeout(()=>{
 						this.gifShow=false;
 						this.popShow=true;
-					},1500)			
+					},1500)	
 				}).catch(err=>{
 					this.close();
 				   return this.$util.Tips({title:err})
@@ -117,7 +119,7 @@
 				background-repeat: no-repeat;
 				display: flex;
 				justify-content: center;
-				.content{
+				.contents{
 					width: 500rpx;
 					height: 520rpx;
 					border-radius: 20rpx;
@@ -128,11 +130,11 @@
 					justify-content: center;
 					align-items: center;
 					grid-gap: 40rpx;
-					image{
-						width: 300rpx;
-						height: 200rpx;
-						margin-top: 50rpx;
-					}
+					// image{
+					// 	width: 860rpx;
+					// 	height: 200rpx;
+					// 	margin-top: 50rpx;
+					// }
 					.text-black{
 						font-size: 32rpx;
 						font-weight: bold;
diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue
index 57f08c2..70cbe4b 100644
--- a/pages/store/settled/step3.vue
+++ b/pages/store/settled/step3.vue
@@ -457,7 +457,7 @@
 	}
 	.merchantsSettled {
 		// background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		height: 125vh;
+		height: 100vh;
 		display: flex;
 		flex-direction: column;
 		grid-gap: 32rpx;
diff --git a/pages/users/user_sgin/index.vue b/pages/users/user_sgin/index.vue
index 83c10a3..62c861b 100644
--- a/pages/users/user_sgin/index.vue
+++ b/pages/users/user_sgin/index.vue
@@ -52,7 +52,7 @@
 		      </view>
 		   </view>
 		  <treasureBox v-if="treasureShow" @closeTreasureBox="closeBox"></treasureBox>
-		  <blindBox v-if="blindShow"></blindBox>
+		 
 		   <view class='signTip acea-row row-center-wrapper' :class='active==true?"on":""'>
 		      <view class='signTipLight loadingpic'></view>
 		      <view class='signTipCon' :style="'background-image: url('+domain+'/static/diy/signSuccess'+keyColor+'.png)'">
@@ -73,9 +73,9 @@
 	 import { HTTP_REQUEST_URL } from '@/config/app';
 	 import { toLogin } from '@/libs/login.js';
 	 import treasureBox from '@/components/treasureBox/index.vue';
-	 import blindBox from '@/components/blindBox/blindBox.vue';
+	 
 	 export default {
-		 components: {treasureBox,blindBox},
+		 components: {treasureBox},
 	 	data() {
 	 		return {
 				domain: HTTP_REQUEST_URL,
@@ -91,7 +91,7 @@
 				is_sign: false, //是否签到
 				disabled: false,
 				treasureShow:false,
-				blindShow:false,
+				
 	 		};
 	 	},
 	 	computed: mapGetters(['isLogin','viewColor','keyColor']),
@@ -131,11 +131,11 @@
 			getUserInfo:function(){
 			  let that=this;
 			  getSignUser().then(res=>{
-				  res.data.sign_num=6;
+				  // res.data.sign_num=6;
 			    res.data.integral = parseInt(res.data.integral);
 			    let sum_sgin_day = res.data.count;
 				that.$set(that,'signConfig',res.data.title);
-				that.$set(that,'is_sign',res.data.is_sign);
+				// that.$set(that,'is_sign',res.data.is_sign);
 				that.$set(that,'userInfo',res.data.userInfo);
 				that.signCount = that.PrefixInteger(sum_sgin_day, 4);
 				that.sign_index = res.data.sign_num;