Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

src/pages/person/index.js

@@ -49,10 +49,6 @@ export default class Person extends Component {
   doSign() {
     const { user: { id, havaSigned } } = this.state
     if (havaSigned) {
-      Taro.showToast({
-        title: '你已经签到过了',
-        icon: 'none'
-      })
       return
     }
 
@@ -175,7 +171,7 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className="qiandao-btn" onClick={this.doSign}>签到</View>
+            <View className={user.havaSigned?'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
 
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 

src/pages/person/index.scss

@@ -105,6 +105,13 @@
       border:2px solid #fff;
       border-radius: 12px;
     }
+    .reday-qiandao-btn{
+      padding: 6px 18px;
+      font-size: 28px;
+      color: #ddd;
+      border:2px solid #ddd;
+      border-radius: 12px;
+    }
  
   }
   .bg {