Merge branch '11-11' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 11-11

src/components/blessingPreheat/index.js

@@ -105,10 +105,22 @@ class BlessingPreheat extends Component {
     }
 
     window['getNewData'] = result => {
+      http.post(`${API.home}/sys/add/blessing`, {
+        share_platform: '', // 1 朋友圈 2 微博 3 qq
+        type: 4 // 1：签到；3：分享；4：浏览课程；
+      }).then(res => {
+        const {code} = res.data
+        if (code === 200) {
+          Toast.info('+2点福气值~', 2, null, false)
+        }
+      })
       this.fetchUserBlessing()
     }
     window['QQWXWBshare'] = result => {
-      this.handleToAddBlessing(result)
+      if (result != 0) {
+        this.handleToAddBlessing(result)
+      }
+      this.fetchUserBlessing()
     }
 
   }
@@ -223,7 +235,6 @@ class BlessingPreheat extends Component {
     const {userInfo} = this.state
     http.get(`${API.home}/sys/user/blessing`).then(res => {
       const {code, data} = res.data
-      alert(code)
       if (code === 200) {
         this.setState({
           isSign: !!data.today_signed,

src/components/blessingRank/index.js

-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { http } from "@/utils";
-import { Popup } from '@/common';
-import AddressPopup from './../blessingPreheat/addressPopup/index';
-import './index.scss';
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import { http } from "@/utils"
+import { Popup } from '@/common'
+import AddressPopup from './../blessingPreheat/addressPopup/index'
+import './index.scss'
 
-@connect(({ user }) => (
+@connect(({user}) => (
   {
     uid: user.data.uid || ''
   }
 ))
 class BlessingRank extends Component {
   constructor(props) {
-    super(props);
+    super(props)
     this.state = {
-      isAddress: false,
       rankList: [],
       rules: [
         '1、排行榜名次以2019年11月13日24点七月在线公布的排行榜为准，榜单确认后，得奖小伙伴请及时填写邮寄信息，7个自然日内不填写，视为主动放弃奖品；',
@@ -26,37 +25,39 @@ class BlessingRank extends Component {
   }
 
   componentDidMount() {
-    this.fetchRankData();
+    this.fetchRankData()
   }
 
   fetchRankData = () => {
     http.get(`${API.home}/sys/blessing/ranking`).then(res => {
-      const { code, data } = res.data;
-      if(code === 200) {
+      const {code, data} = res.data
+      if (code === 200) {
         this.setState({
           rankList: data,
-        });
+        })
       }
-    });
+    })
   }
 
   handleToSwitch = (bool) => {
-    const { history, uid } = this.props;
-    if(bool && !uid) {
-      history.push('/passport');
-    }else {
-      this.setState({
-        isAddress: bool
-      });
+    const {history, uid} = this.props
+    if (bool && !uid) {
+      history.push('/passport')
+    } else {
+      Popup({
+        title: '收货信息',
+        content: <AddressPopup handleToHide={() => this.handleToSwitch(false)}/>
+
+      })
     }
   }
 
   formatString = (str, len) => {
-    return str.length > len? `${str.substr(0, len)}...` : str;
+    return str.length > len ? `${str.substr(0, len)}...` : str
   }
 
   render() {
-    const { isAddress, rankList, rules } = this.state;
+    const {rankList, rules} = this.state
     return (
       <>
         <div className="rank__banner"></div>
@@ -76,10 +77,10 @@ class BlessingRank extends Component {
                     <dd className="rank__table-column">
                       {
                         index < 3
-                        ? (
-                          <i className="rank__table-num" data-num={index+1}></i>
-                        )
-                        : index + 1
+                          ? (
+                            <i className="rank__table-num" data-num={index + 1}></i>
+                          )
+                          : index + 1
                       }
                     </dd>
                     <dd className="rank__table-column">
@@ -91,10 +92,10 @@ class BlessingRank extends Component {
                     <dd className="rank__table-column">{item.blessing_value}</dd>
                     <dd className="rank__table-column">{this.formatString(item.prize_name, 7)}</dd>
                   </dl>
-                );
+                )
               })
             }
-            
+
           </div>
           <div className="rank__rule">
             <h2 className="rank__rule-title">活动规则</h2>
@@ -104,16 +105,10 @@ class BlessingRank extends Component {
               ))
             }
           </div>
-          <Popup 
-            visible={isAddress}
-            title="收货信息"
-          >
-            <AddressPopup handleToHide = {() => this.handleToSwitch(false)} />
-          </Popup>
         </div>
       </>
-    );
+    )
   }
 }
 
-export default BlessingRank;
+export default BlessingRank
\ No newline at end of file