Merge branch 'new-share' into pre

src/components/detail/redPacket/index.js

@@ -59,33 +59,41 @@ class RedPacket extends PureComponent {
     const { userInfo } = this.props;
     if(isWechat === '1' && !browser.isWeixin) {
       if(userInfo && userInfo.uid) {
-        http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
-          const { code, data } = res.data;
-          if(code === 200) {
-
-            // 检查收否领取过
-            http.post(
-              `${API.home}/sys/redPacket/split`,
-              {
-                action: 'check',
-                share_code: data.share_code
-              }
-            ).then(res => {
-              const { code, data } = res.data;
-              if(code === 200) {
-
-                // is_receive	是否领取过 0-否 1-是            
-                if(data.is_receive) {
-                  this.judgeReceiveStatus(data, 8);
-                }else {
-                  this.setState({
-                    type: 3
-                  });
+        const type = window.localStorage.getItem('redpacket-click');
+        if(type === 'split') {
+          http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
+            const { code, data } = res.data;
+            if(code === 200) {
+  
+              // 检查收否领取过
+              http.post(
+                `${API.home}/sys/redPacket/split`,
+                {
+                  action: 'check',
+                  share_code: data.share_code
                 }
-              }
-            })
-          }
-        });
+              ).then(res => {
+                const { code, data } = res.data;
+                if(code === 200) {
+                  window.localStorage.removeItem('redpacket-click');
+                  // is_receive	是否领取过 0-否 1-是            
+                  if(data.is_receive) {
+                    this.judgeReceiveStatus(data, 8);
+                  }else {
+                    this.setState({
+                      type: 3
+                    });
+                  }
+                }
+              })
+            }
+          });
+        }else {
+          this.setState({
+            type: 1
+          });
+          window.localStorage.removeItem('redpacket-click');
+        }
       }else {
         this.setState({
           type: 1
@@ -638,6 +646,7 @@ class RedPacket extends PureComponent {
                           <button 
                             className="popup-password__button--copy" 
                             onClick={() => {
+                              window.localStorage.setItem('redpacket-click', 'copy');
                               history.push('/passport/login');
                             }}
                           >复制口令</button>
@@ -661,6 +670,7 @@ class RedPacket extends PureComponent {
                         this.setState({
                           type: 3
                         });
+                        window.localStorage.setItem('redpacket-click', 'split');
                       }
                     }else {
                       this.handleToClose(true);