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

496_dongfengqichen/pages/scout/register/register.js

       console.log(res)
       if(res.code=200 && res.data){
         if(res.data.adminState==1){//审核通过
+          // this.setData({maskShow:true})
           wx.navigateTo({url: '../../scout/scout'})
         }else if(res.data.adminState==0 || res.data.adminState==-1){//审核中&审核失败
           if(res.data.adminState==0){

496_dongfengqichen/pages/scout/register/register.json

 {
-  "navigationBarTitleText": "东风启辰“星探计划”",
+  "navigationBarTitleText": "认证中心",
   "usingComponents": {
     "tabBar": "../component/tabBar/index"
   }

496_dongfengqichen/pages/scout/register/register.wxml

   </view>
   <view class="mask" wx:if="{{maskShow}}">
     <view class="ruleContent">
-      <image class="rule" src="{{imgUrl+'/star/scout/register/getok.png'}}" bindtap="hiddenRule">></image>
-      <view class="closeBtn" style="right:-35rpx;top:-40rpx;" bindtap="hiddenRule"></view>
+      <image class="rule" src="{{imgUrl+'/star/scout/register/getok.png'}}" >></image>
+      <view class="returnbtn" bindtap="hiddenRule"></view>
+      <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="hiddenRule"></image>
     </view>
   </view>
 </view>

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

   width: 100%;
   height: 100%;
 }
-
+.returnbtn{
+  background-color: #000000;
+  position: absolute;
+  height: 50rpx;
+  width: 274rpx;
+  left:105rpx;
+  bottom:60rpx;
+  opacity: 0;
+}
 .closeBtn {
-  color: #ffffff;
-  border-radius: 50%;
-  text-align: center;
+  position: absolute;
   height: 40rpx;
-  line-height: 40rpx;
   width: 40rpx;
-  font-size: 30rpx;
-  padding: 2rpx;
-  position: absolute;
-  border: 2rpx solid #fff;
+  right:-40rpx;
+  top:-40rpx;
 }
 
 /* use cross as close button */
 
-.closeBtn::before {
+/* .closeBtn::before {
   content: "\2716";
-}
+} */

496_dongfengqichen/pages/scout/scout.json

 {
-  "navigationBarTitleText": "东风启辰“星探计划”",
+  "navigationBarTitleText": "星探任务",
   "usingComponents": {
     "tabBar": "../component/tabBar/index"
   }

496_dongfengqichen/pages/scout/scout.wxml

 <view class="showView">
   <view class="content">
     <image class="bg" src="{{imgUrl+'/star/scout/bg.jpg'}}"></image>
-    <image class="reward" src="{{imgUrl+'/star/scout/reward.png'}}"></image>
+    <image class="reward" src="{{imgUrl+'/star/tu1.png'}}"></image>
     <view class="btn" bindtap="getPoster">立即分享，赚取奖励</view>
     <button class="btn2" wx:if="{{iconShow}}" open-type="getUserInfo" bindgetuserinfo="getUserWxMsg"></button>
   </view>
   <view class="mask" wx:if="{{maskShow}}">
     <view class="tipContent" wx:if="{{tipShow}}">
       <view class="title">{{titleContent}}</view>
-      <image class="txt" src="{{imgUrl+'/star/scout/tipContent.png'}}"></image>
-      <view class="closeBtn" style="right:-40rpx;top:-45rpx;" bindtap="hiddenTip"></view>
+      <image class="txt" src="{{imgUrl+'/star/txt1.png'}}"></image>
+      <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="hiddenTip"></image>
     </view>
   </view>
 </view>

496_dongfengqichen/pages/scout/scout.wxss

 }
 .reward{
   width: 602rpx;
+  height: 446rpx;
   height: 548rpx;
   margin: 43rpx auto 0 auto;
 }
   color: #ffffff;
   border-radius: 15rpx;
   background-color: #2a558d;
-  margin: 20rpx auto 40rpx auto;
+  margin: 120rpx auto 40rpx auto;
 }
 .btn2{
   text-align: center;
   background-color: #2a558d;
 }
 .tipContent>.txt{
-  width: 400rpx;
+  width: 449rpx;
   height: 181rpx;
   margin:  70rpx auto 0 auto;
 }
 .closeBtn {
-  color: #ffffff;
-  border-radius: 50%;
-  text-align: center;
+  position: absolute;
   height: 40rpx;
-  line-height: 40rpx;
   width: 40rpx;
-  font-size: 30rpx;
-  padding: 2rpx;
-  position: absolute;
-  border: 2rpx solid #fff;
+  right:-40rpx;
+  top:-40rpx;
 }
 
 /* use cross as close button */
 
-.closeBtn::before {
+/* .closeBtn::before {
   content: "\2716";
-}
+} */

496_dongfengqichen/pages/star/star.js

             numList: [0,4,0,0,0]
           })
         }
-        this.getNumber=setInterval(this.vCodeDownTime,30);
+        this.getNumber=setInterval(this.vCodeDownTime,20);
       }
     }, this);
   },
   vCodeDownTime(){
     var numb = this.data.starNumber;
-    numb=Math.floor(this.data.starNumber+(this.data.stopNumber-4000)/90);
+    numb=Math.floor(this.data.starNumber+(this.data.stopNumber-4000)/80);
     if(numb>=this.data.stopNumber){
       numb=this.data.stopNumber;
       clearInterval(this.getNumber);
       this.setData({phonebol: false})
     }
     this.setData({isbtn: true})
+    
+    // wx.navigateTo({
+    //   url: '../scout/register/register'
+    // })
   },
 
   /**

496_dongfengqichen/pages/star/star.json

 {
-  "navigationBarTitleText": "东风启辰“星探计划”",
+  "navigationBarTitleText": "星探计划",
   "usingComponents": {
     "tabBar": "../component/tabBar/index"
   }

496_dongfengqichen/pages/star/star.wxml

   <view class="mask" wx:if="{{maskShow}}">
     <view class="ruleContent">
       <image class="rule" src="{{imgUrl+'/star/rule.png'}}"></image>
-      <view class="closeBtn" style="right:-40rpx;top:-45rpx;" bindtap="hiddenRule"></view>
+      <image class="closeBtn" src="{{imgUrl+'/star/closebtn.png'}}" bindtap="hiddenRule"></image>
+      <!-- <view class="closeBtn" style="right:-40rpx;top:-45rpx;" bindtap="hiddenRule"></view> -->
     </view>
   </view>
 </view>

496_dongfengqichen/pages/star/star.wxss

 }
 
 .closeBtn {
-  color: #ffffff;
-  border-radius: 50%;
-  text-align: center;
+  position: absolute;
   height: 40rpx;
-  line-height: 40rpx;
   width: 40rpx;
-  font-size: 30rpx;
-  padding: 2rpx;
-  position: absolute;
-  border: 2rpx solid #fff;
+  right:-40rpx;
+  top:-40rpx;
 }
 
 /* use cross as close button */
 
-.closeBtn::before {
+/* .closeBtn::before {
   content: "\2716";
-}
+} */

496_dongfengqichen/project.config.json

 					"pathName": "pages/coupon/coupon",
 					"query": ""
 				},
-        {
-          "id": -1,
-          "name": "集碎片",
-          "pathName": "pages/everyday/everyday",
-          "query": ""
-        },
-        {
-          "id": -1,
-          "name": "领红包注册",
-          "pathName": "pages/receiveRegister/receiveRegister",
-          "query": ""
-        }
+				{
+					"id": -1,
+					"name": "集碎片",
+					"pathName": "pages/everyday/everyday",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "领红包注册",
+					"pathName": "pages/receiveRegister/receiveRegister",
+					"query": ""
+				}
 			]
 		}
 	}