浏览代码

- ui调整

zhou_hang_feng 1 年之前
父节点
当前提交
14335dc987
共有 2 个文件被更改,包括 39 次插入19 次删除
  1. 28 9
      src/packagePrize/rolling/animation.vue
  2. 11 10
      src/pages/lucky/index.vue

+ 28 - 9
src/packagePrize/rolling/animation.vue

@@ -5,12 +5,18 @@
 			<view class="flex luck-warp" @touchmove.prevent.stop>
 				<view class="luck-info">
 					<view class="luck-info-bg">
-						<image src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/static/lucky_prize.png" mode="scaleToFill"></image>
+						<image src="https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/lucky1_prize.jpg" mode="scaleToFill"></image>
 					</view>
 					<view class="luck-info-content flex">
 						<view class="luck-info-content-num">
-							<image src="../../static/lucky/lucky_gkmp.png" mode="scaleToFill"
-								v-if="info.salePrice == 0"></image>
+<!-- 							<image src="../../static/lucky/lucky_gkmp.png" mode="scaleToFill"
+								v-if="info.salePrice == 0"></image> -->
+								<view class="luck-info-content-num-word" v-if="info.salePrice == 0">
+									<text>共富体验</text>
+									<text style="font-size: 66rpx;">开启我的
+									<text style="color: #FF0000;">共富</text>
+									时刻</text>
+								</view>
 							<image src="../../static/lucky/lucky_gkmptwo.png" mode="scaleToFill" v-else></image>
 						</view>
 						<view class="luck-info-content-img">
@@ -152,16 +158,18 @@
 
 		.luck-info {
 			position: relative;
-			width: 87vw;
+			// width: 87vw;
+			width: 100%;
 			height: 60vh;
 
 			&-bg {
 				position: absolute;
 				top: 0;
-
+				width: 100%;
 				image {
-					width: 87vw;
-					height: 60vh;
+					// width: 87vw;
+					width: 100%;
+					height: 70vh;
 				}
 			}
 
@@ -176,7 +184,7 @@
 
 				&-num {
 					position: relative;
-					width: 480rpx;
+					width: 500rpx;
 					height: 8vh;
 					margin-top: 16vh;
 					margin-bottom: 3vh;
@@ -187,6 +195,17 @@
 						width: 100%;
 						height: 100%;
 					}
+					&-word {
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						font-size: 81rpx;
+						font-family: YouSheBiaoTiHei;
+						font-weight: 400;
+						color: #7231F1;
+						// line-height: 164rpx;
+					}
 
 
 				}
@@ -263,7 +282,7 @@
 
 				&-ticket {
 					position: relative;
-					width: 80%;
+					width: 70%;
 					height: 10vh;
 					margin-top: 3vh;
 

+ 11 - 10
src/pages/lucky/index.vue

@@ -44,18 +44,18 @@
 							</view>
 						</view>
 						<view class="luck-info-content-nearby" v-if="info.status == 1 ">
-							附近已有<view class="num" style="display: inline-block; padding: 0 2px;">{{ nearbyNum }}</view>人刮开<view class="dots"><view>.</view><view>.</view><view>.</view></view>
+							附近已有<view class="num" style="display: inline-block; padding: 0 2px;">{{ nearbyNum }}</view>人参与<view class="dots"><view>.</view><view>.</view><view>.</view></view>
 						</view>
 						<view class="luck-info-content-btn" style="width: 500rpx;" @click="pay"
 							v-if="info.status == 1 && info.salePrice != 0">
 							点击支付</view>
 						<view class="luck-info-content-btn" style="width: 500rpx;" @click="payDetail"
-							v-else-if="info.status == 1 && info.salePrice == 0">立即刮奖</view>
+							v-else-if="info.status == 1 && info.salePrice == 0">点我开奖</view>
 						<!-- <view class=" code" v-else>开奖啦!</view> -->
 						<view class="luck-info-content-btn" style="width: 500rpx;" @click="toChoice" v-if="Choice">领取奖品
 						</view>
 					</view>
-					<view class="luck-info-close flex">
+					<view class="luck-info-close flex" style="justify-content: flex-end;padding-right: 40rpx;">
 						<navigator open-type="exit" target="miniProgram" hover-class="none"
 							class="luck-info-close-content flex">
 							<u-icon name="close" color="#fff" size="20"></u-icon>
@@ -70,7 +70,7 @@
 		<u-popup :show="showNull" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
 			@touchmove.prevent.stop>
 			<view class="null-prize">
-				<view class="title">该盲票已兑奖</view>
+				<view class="title">该已兑奖</view>
 				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
@@ -78,7 +78,7 @@
 		<u-popup :show="showStop" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
 			@touchmove.prevent.stop>
 			<view class="null-prize">
-				<view class="title">该盲票已停售</view>
+				<view class="title">该已停售</view>
 				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
@@ -86,7 +86,7 @@
 		<u-popup :show="tipShow" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
 			@touchmove.prevent.stop>
 			<view class="null-prize">
-				<view class="title">该盲票已被他人买走了</view>
+				<view class="title">该已被他人买走了</view>
 				<view class="btn" @click="toUser">确认</view>
 			</view>
 		</u-popup>
@@ -94,7 +94,7 @@
 		<u-popup :show="showAction" :round="10" mode="center" :safeAreaInsetBottom="false" overlayOpacity="0.8"
 			@touchmove.prevent.stop>
 			<view class="null-prize">
-				<view class="title">该盲票未激活</view>
+				<view class="title">该未激活</view>
 				<navigator open-type="exit" target="miniProgram" hover-class="none" class="btn">确认</navigator>
 			</view>
 		</u-popup>
@@ -208,7 +208,7 @@
 						this.showStop = true
 						this.luckyShow = false
 					}  else {
-						uni.$u.toast('该盲票不存在!');
+						uni.$u.toast('该不存在!');
 						setTimeout(() => {
 							uni.switchTab({
 								url: '/pages/index/index'
@@ -425,7 +425,7 @@
 
 				&-num {
 					position: relative;
-					// width: 480rpx;
+					width: 500rpx;
 					height: 8vh;
 					margin-top: 16vh;
 					margin-bottom: 3vh;
@@ -631,7 +631,8 @@
 			&-close {
 				width: 100%;
 				position: absolute;
-				bottom: -140rpx;
+				// bottom: -140rpx;
+				top: 0;
 
 				&-content {
 					width: 70rpx;