Merge branch 'master' of http://git.liuniu946.com/zhang/jingcai

pages/index/entertainment.vue

@@ -119,8 +119,11 @@
 					<view v-else class="list-buttom red margin-r-10">
 						{{$t("enter.a2")}}
 					</view>
-					<view class="list-buttom primary" v-if="item.status==1" @click="alertDetailOpen(item)">
-						{{$t('enter.u18')}}
+					<view class="list-buttom primary"  v-if="item.result==1">
+						中獎
+					</view>
+					<view class="list-buttom primary" >
+						未中獎
 					</view>
 				</view>
 			</view>

pages/user/shareQrCode.vue

@@ -3,11 +3,11 @@
 		<view class="list" v-for="item in list">
 			<view class="flex padding-b-20">
 				<view class="li">{{$t('set.a7')}}{{item.room.no}}{{$t('set.a8')}}</view>
-				<view class="lis" v-if="item.status === 1">
-					<view class="liss green">{{$t('gameList.a6')}}</view>
+				<view class="lis" v-if="item.result === 1">
+					<view class="liss green">中獎</view>
 				</view>
 				<view class="lis" v-else>
-					<view class="liss red">{{$t('gameList.a1')}}</view>
+					<view class="liss red">未中獎</view>
 				</view>
 			</view>
 			<view class="listT">