10.23

pages/index/entertainment.vue

@@ -113,16 +113,18 @@
 				<view class="biwe">{{item.num*1}}</view>
 				<view class="biwe">{{item.get-item.num}}</view>
 				<view class="biwe flex-center">
-					<view v-if="item.status==1" class="list-buttom success margin-r-10">
-						{{$t('enter.u17')}}
+					<view v-if="item.status==0" class="list-buttom primary margin-r-10">
+						進行中
 					</view>
 					<view v-else class="list-buttom red margin-r-10">
 						{{$t("enter.a2")}}
 					</view>
 					<view class="list-buttom primary"  v-if="item.result==1">
+
+					<view class="list-buttom red"  v-if="item.result===1">
 						中獎
 					</view>
-					<view class="list-buttom primary" >
+					<view class="list-buttom success" v-if="item.result===0">
 						未中獎
 					</view>
 				</view>
@@ -192,6 +194,7 @@
 		</uni-popup>
 		<taber tab='entertainment' v-if="!upOnBtnData.show"></taber>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -765,7 +768,7 @@
 
 		.tab-item {
 			color: #FFF;
-			font-size: $font-sm;
+			font-size: $font-lg;
 			padding: 0 20rpx;
 			padding-bottom: 10rpx;
 

pages/index/pledge.vue

@@ -24,14 +24,14 @@
 				<view class="le1 ">
 					{{$t('homepledge.total')}}：{{item.stock*1}}U
 				</view>
-				<view class="le2 flex font-color-gray">
+				<!-- <view class="le2 flex font-color-gray">
 					<view class="line margin-r-10">
 						<view class="line-action" :style="{'margin-left': -(100-item.bfb)+'%'}">
 
 						</view>
 					</view>
 					<view>{{item.bfb}}%</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="ri">
 				<view class="r1 margin-b-20"> {{item.day_get}}% </view>

pages/myPledge/zyXingqing.vue

@@ -72,13 +72,7 @@
 					<view class="jiaru">{{$t('zy.m15')}}：{{allMoney}}</view>
 				</view>
 			</view>
-
-		</view>
-		<view class="jine margin-t-20">
-			<view class="je">{{$t('zy.m16')}}</view>
-			<view class="jes margin-t-30">{{base.join*1}}U</view>
 		</view>
-
 		<view class="yue flex margin-t-20">
 			<view class="flex">
 				<image class="qianbao" src="../../static/img/xq5.png" mode=""></image>
@@ -217,6 +211,7 @@
 <style lang="scss">
 	page {
 		background-color: #191a1f;
+		// background-color: #000000;
 	}
 
 	.all {
@@ -385,8 +380,6 @@
 		left: 0;
 		right: 0;
 		background-color: $page-color-base;
-		box-shadow: 0rpx 0rpx 20rpx #FFF;
-
 		.jr {
 			background: linear-gradient(90deg, #feb041 0%, #feb041 100%);
 			border-radius: 10rpx;

pages/user/shareQrCode.vue

@@ -6,9 +6,12 @@
 				<view class="lis" v-if="item.result === 1">
 					<view class="liss green">中獎</view>
 				</view>
-				<view class="lis" v-else>
+				<view class="lis" v-if="item.result === 0">
 					<view class="liss red">未中獎</view>
 				</view>
+				<view class="lis" v-if="item.status === 0">
+					<view class="liss primary">進行中</view>
+				</view>
 			</view>
 			<view class="listT">
 				<view class="TT flex">
@@ -140,6 +143,9 @@
 				&.green{
 					background: $color-green;
 				}
+				&.primary {
+					background: #01ebf6;
+				}
 			}
 		}