Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/496_dongfengqichen_wxsmall

496_dongfengqichen/pages/address/address.wxss

@@ -45,7 +45,7 @@ view{
   color:rgba(35,33,34,1);
 }
 .msgInput{
-  width: 530rpx;
+  width: 510rpx;
 }
 .addressDetail{
   padding: 21rpx 26rpx;

496_dongfengqichen/pages/luckyStar/luckyStar.js

@@ -419,11 +419,11 @@ Page({
     }
   },
   changeScroll:function(){
-    this.data.setInt = setInterval(()=>{
-      this.setData({
-        scrollNum: this.data.scrollNum+=1
-      })
-    },30);
+    // this.data.setInt = setInterval(()=>{
+    //   this.setData({
+    //     scrollNum: this.data.scrollNum+=1
+    //   })
+    // },30);
   },
   getMore:function(){
     if (!this.data.isMore){

496_dongfengqichen/pages/luckyStar/luckyStar.wxml

@@ -55,25 +55,29 @@
     </view>
     <view class="successPop" wx:if="{{pizeTip}}">
       <view class="successGroup" wx:if="{{pizeTip==1}}">
-        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
-        <image class="successIcon" src="{{imgUrl+'/images/successIcon.png'}}"></image>
+        <image class="luckyPizeType" src="{{imgUrl+'/images/luckyPizeType1.png'}}"></image>
+        <image class="gameRuleClose" bindtap="closeWindow" style="top:-5rpx;right:-5rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
+        <!-- <image class="successIcon" src="{{imgUrl+'/images/successIcon.png'}}"></image>
         <view class="titleGroup"></view>
-        <view class="successTip">幸运满格，大奖到手</view>
-        <!-- <image class="prizePic" src="{{imgUrl+'/images/prizePic1.png'}}" mode="aspectFit"></image> -->
-        <!-- <view class="prizeName">头等舱机票一张</view> -->
+        <view class="successTip">幸运满格，大奖到手</view> -->
         <image class="prizePic" src="{{endGameData.awardPicUrl}}" mode="aspectFit"></image>
         <view class="prizeName">{{endGameData.awardName}}</view>
-        <!-- <view class="startRegister" wx:if="{{(isAddress || endGameData.needAddress==0)}}" bindtap="receive">立即领取</view> -->
-        <view class="startRegister" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister">立即领取</view>
+        <!-- <image class="prizePic" src="https://dongfengqichen.jiyou-tech.com/storage/app/public/award/17_1.png" mode="aspectFit"></image>
+        <view class="prizeName">NITORI电动太空舱按摩椅</view> -->
+        <image class="startRegister" style="margin:0;" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister" src="{{imgUrl+'/images/luckyPizeTip1.png'}}"></image>
+        <!-- <view class="startRegister" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister">立即领取</view> -->
       </view>
       <view class="successGroup" wx:if="{{pizeTip==2 || pizeTip==3}}">
-        <image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
-        <image class="successIcon" src="{{imgUrl+'/images/failIcon.png'}}"></image>
+        <image class="luckyPizeType" src="{{imgUrl+'/images/luckyPizeType2.png'}}"></image>
+        <image class="gameRuleClose" bindtap="closeWindow" style="top:-5rpx;right:-5rpx;" src="{{imgUrl+'/star/closebtn.png'}}"></image>
+        <!-- <image class="successIcon" src="{{imgUrl+'/images/failIcon.png'}}"></image>
         <view class="titleGroup"></view>
         <view class="failText" style="margin-top:113rpx;">运气就差一点点</view>
-        <view class="failText" style="margin-top:20rpx;margin-bottom:82rpx;">重整旗鼓再来抓</view>
-        <view class="startRegister" wx:if="{{pizeTip==2}}">邀请好友一起来玩<button open-type="share" class="shareBtn" style="width:100%;height:100%;margin:0;padding:0;min-height:0;"></button></view>
-        <view class="startRegister" bindtap="userRegister" wx:if="{{pizeTip==3}}">立即注册，探索更多星探好礼</view>
+        <view class="failText" style="margin-top:20rpx;margin-bottom:82rpx;">重整旗鼓再来抓</view> -->
+        <view class="startRegister" wx:if="{{pizeTip==2}}">
+        <image style="width:100%;height:100%;" src="{{imgUrl+'/images/luckyPizeTip2.png'}}"></image><button open-type="share" class="shareBtn" style="width:100%;height:100%;margin:0;padding:0;min-height:0;"></button></view>
+        <image class="startRegister" bindtap="userRegister" wx:if="{{pizeTip==3}}" src="{{imgUrl+'/images/luckyPizeTip3.png'}}"></image>
+        <!-- <view class="startRegister" bindtap="userRegister" wx:if="{{pizeTip==3}}">立即注册，探索更多星探好礼</view> -->
       </view>
     </view>
     <view class="downTimeGroup" wx:if="{{startDown!=-1}}">

496_dongfengqichen/pages/luckyStar/luckyStar.wxss

@@ -53,6 +53,7 @@ view{
   right: -10rpx;
   height: 40rpx;
   width: 40rpx;
+  z-index: 9;
 }
 .gameStrat{
   width:277rpx;
@@ -181,13 +182,11 @@ view{
 }
 .successGroup{
   position: relative;
-  width:455rpx;
-  height:426rpx;
-  background-color: white;
+  width:488rpx;
+  height:475rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
-  border-radius: 20rpx;
 }
 .successIcon{
   position: absolute;
@@ -207,20 +206,15 @@ view{
 .startRegister{
   width:278rpx;
   height:50rpx;
-  background-color: #345489;
-  border-radius: 15rpx;
-  text-align: center;
-  font-size:21rpx;
-  font-family:PingFangSC;
-  font-weight:400;
-  color:rgba(255,255,255,1);
-  line-height:50rpx;
   position: relative;
+  margin-top: 360rpx;
 }
 .prizePic{
   width: 310rpx;
   height: 116rpx;
+  margin-top: 200rpx;
   margin-bottom: 10rpx;
+  z-index: 9;
 }
 .successTip{
   font-size:28rpx;
@@ -240,6 +234,7 @@ view{
   line-height:21rpx;
   text-align: center;
   margin-bottom: 30rpx;
+  z-index: 9;
 }
 .failText{
   font-size:28rpx;
@@ -393,4 +388,11 @@ view{
 .luckyNum{
   width: 221rpx;
   height: 131rpx;
+}
+.luckyPizeType{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
 }

496_dongfengqichen/pages/scout/register/register.wxss

@@ -8,10 +8,10 @@
   position: relative;
   width: 611rpx;
   height: 81rpx;
-  border: 1rpx solid #345489;
+  /* border: 1rpx solid #345489; */
   margin: 0 auto;
-  border-radius: 10rpx;
-  box-sizing: border-box;
+  /* border-radius: 10rpx; */
+  /* box-sizing: border-box; */
   margin-top: 168rpx;
 }
 .tabsBox>.item{