Merge branch '00-formal' into dev

src/components/bargainMiddlePage/index.js

@@ -153,11 +153,15 @@ class BargainMiddlePage extends Component {
 
     // 直接支付
     toCart = () => {
-        http.get(`${API['base-api']}/m/cart/addtopreorder/[${getParam('id')}]`).then((res) => {
-            if (res.data.errno === 0) {
+        const { history } = this.props;
+        http.get(`${API['base-api']}/m/cart/addtopreorder/[${getParam('id')}]`).then((res) =>{
+            const { errno, msg } = res.data;
+            if (errno === 0) {
                 this.props.history.push(`/order?id=[${getParam('id')}]`, {bargain: 1});
+            }else if(errno === 4030 || errno === 4040) {
+                history.push('/passport');
             } else {
-                Toast.info(res.data.msg, 2);
+                Toast.info(msg, 2);
             }
         })
         // let data = {
@@ -204,19 +208,23 @@ class BargainMiddlePage extends Component {
 
     // 领取砍价神器
     toArtifact = () => {
+        const { history } = this.props;
         const { course: { course_id = '' } } = this.state;
         let data = {
             courseId: getParam('id')? getParam('id') : course_id
         }
         http.post(`${API.home}/m/bargain/receiveLimit`, data).then((res) => {
-            if (res.data.code === 200) {
+            const { code, msg } = res.data;
+            if (code === 200) {
                 this.setState({
                     isShowOverlay: true,
                     status: 5,
                 });
                 this.getBargainInfo();
+            }else if(code === 4030 || code === 4040) {
+                history.push('/passport');
             } else {
-                Toast.info(res.data.msg, 2)
+                Toast.info(msg, 2)
             }
         })
     }