添加浏览器判断，仅微信里授权支付

src/App.js

@@ -11,7 +11,7 @@ import My from './pages/my'
 import {graphqlFC} from "./configs/url"
 import {getCookie, setCookie} from "./utils/cookie"
 import {find_user_by_openid, create_user} from "./utils/gql"
-import {idGen} from "./utils/func"
+import {idGen, getIsWechatBrowser} from "./utils/func"
 import './app.css'
 
 class App extends Component {
@@ -84,38 +84,40 @@ class App extends Component {
     }
 
     oauthLogin = () => {
-        setCookie("openid","obR_j5GbxDfGlOolvSeTdZUwfpKA")
-        let openid =  getCookie("openid")
-        let user_id =  getCookie("user_id")
-        console.log('oauthLogin openid',openid)
-
-        if (!openid) {
-            window.location.href = "/subscribe"
-
-        }
-        if(!user_id){
-            request(graphqlFC, find_user_by_openid ,{openid})
-                .then(data => {
-                    console.log('find user data',data)
-                    if(data.userbyprops.length){
-                        let id = data.userbyprops[0].id
-                        setCookie('user_id',id)
-                    }else {
-                        let createdAt = moment().format('YYYY-MM-DD HH:mm:ss')
-                        let id = idGen('user')
-                        const userContent = {
-                            email: "",
-                            updatedAt: "",
-                            password: "",
-                            telephone: "",
-                            username: "",
-                            createdAt,
-                            openid,
-                            id,
-                            userData_id: ""
-
-                        }
-                        request(graphqlFC, create_user ,userContent)
+        let isWechatLogin = getIsWechatBrowser()
+        // console.log('isWechatLogin',isWechatLogin)
+        if(isWechatLogin){
+            // setCookie("openid","obR_j5GbxDfGlOolvSeTdZUwfpKA")
+            let openid =  getCookie("openid")
+            let user_id =  getCookie("user_id")
+            console.log('oauthLogin openid',openid)
+
+            if (!openid) {
+                window.location.href = "/subscribe"
+            }
+            if(!user_id){
+                request(graphqlFC, find_user_by_openid ,{openid})
+                  .then(data => {
+                      console.log('find user data',data)
+                      if(data.userbyprops.length){
+                          let id = data.userbyprops[0].id
+                          setCookie('user_id',id)
+                      }else {
+                          let createdAt = moment().format('YYYY-MM-DD HH:mm:ss')
+                          let id = idGen('user')
+                          const userContent = {
+                              email: "",
+                              updatedAt: "",
+                              password: "",
+                              telephone: "",
+                              username: "",
+                              createdAt,
+                              openid,
+                              id,
+                              userData_id: ""
+
+                          }
+                          request(graphqlFC, create_user ,userContent)
                             .then(data => {
                                 console.log('create user data',data)
                                 setCookie('user_id',id)
@@ -123,11 +125,15 @@ class App extends Component {
                             .catch(err => {
                                 console.log(err, `graphql-request create user error`)
                             })
-                    }
-                })
-                .catch(err => {
-                    console.log(err, `graphql-request find user error`)
-                })
+                      }
+                  })
+                  .catch(err => {
+                      console.log(err, `graphql-request find user error`)
+                  })
+            }
+        }else {
+            setCookie("user_id","ioobot")
+            setCookie("openid","ioobot")
         }
     }
 

src/pages/cart/all/detail/index.js

@@ -259,7 +259,7 @@ class CartDetail extends Component {
             }
         }) 
         // console.log('cartList',this.state.cartList)
-        console.log('shopping',shopping)
+        // console.log('shopping',shopping)
         sessionStorage.setItem("cartSelected",JSON.stringify(shopping))
         sessionStorage.setItem("totalPrice",JSON.stringify(this.state.totalPrice))
         sessionStorage.setItem("totalCount",JSON.stringify(this.state.selectedCount))

src/pages/cart/orders/index.js

@@ -155,16 +155,16 @@ class CartOrders extends Component {
                     productPay: price,
                     orderPay_id: "",
                 }
-                console.log(`orderProduct${index}`,orderProduct)
+                // console.log(`orderProduct${index}`,orderProduct)
 
                 return create_order_product({variables:orderProduct}).then((data)=>{
-                    console.log('ok data',index,data)
+                    // console.log('ok data',index,data)
                     return data.data
                 })
             })
 
             Promise.all([createOrder, createOrderProduct]).then((data)=> {
-                console.log('onSubmitOrderAndProduct data',data)
+                // console.log('onSubmitOrderAndProduct data',data)
                 sessionStorage.setItem('payOrder',JSON.stringify(orderContent))
                 if(type === 'cartSelected'){
                     let cartCount = JSON.parse(localStorage.getItem("cartCount")) - totalCount

src/pages/cart/pay/index.js

@@ -11,6 +11,7 @@ import moment from 'moment'
 import {update_order} from "../../../utils/gql"
 import {getCookie} from "../../../utils/cookie"
 import './index.css'
+import {getIsWechatBrowser} from "../../../utils/func"
 
 let clicktag = 1;  //微信发起支付点击标志
 class Pay extends Component {
@@ -83,8 +84,9 @@ class Pay extends Component {
     }
 
     getBridgeReady = (update_order,id,needPay) => {
-        console.log('getBridgeReady params',id,needPay)
-        if(clicktag === 1) {
+        // console.log('getBridgeReady params',id,needPay)
+        let isWechat = getIsWechatBrowser()
+        if(clicktag === 1 && isWechat) {
             clicktag = 0   //进行标志，防止多次点击
             let openid = getCookie('openid')
 
@@ -97,7 +99,7 @@ class Pay extends Component {
                     }
                 })
                 .then((res) =>{
-                    console.log('onBridgeReady res',res)
+                    // console.log('onBridgeReady res',res)
                     $this.jsApiPay(res.data,id,update_order)
                     setTimeout(()=> {clicktag = 1}, 5000)
                 })
@@ -105,6 +107,8 @@ class Pay extends Component {
                     message.warning('网络或系统故障，请稍后重试')
                     console.log('onBridgeReady error',error)
                 })
+        }else {
+            message.info('当前只支持在微信中打开')
         }
     }
 

src/pages/home/all/index.js

@@ -138,7 +138,7 @@ class All extends Component {
                                 if (error) {
                                     return 'error!'
                                 }
-                                console.log(data.productbyprops)
+                                // console.log(data.productbyprops)
                                 return (
                                     <Recommend data={data.productbyprops} history={this.props.history}/>
                                 )

src/pages/home/detail/index.js

@@ -320,7 +320,7 @@ class SelectModal extends Component {
                 status:specStatus
             }
         }]
-        console.log('buyNowContent',buyNowContent)
+        // console.log('buyNowContent',buyNowContent)
         sessionStorage.setItem("buyNowContent",JSON.stringify(buyNowContent))
         sessionStorage.setItem("totalPrice",JSON.stringify(totalPrice))
         this.props.changeDetailState('openSelect')

src/pages/my/all/index.js

@@ -93,7 +93,7 @@ class All extends Component {
 
     render() {
         let user_id = getCookie('user_id')
-        console.log(user_id)
+        // console.log(user_id)
         return (
             <div className='my-wrap all'>
                 <Query query={gql(user_by_id)} variables={{id: user_id}}>

src/pages/my/tools/address/singleaddress/index.js

@@ -139,7 +139,7 @@ class SingleAddress extends Component {
                         data={district}
                         value={[province, city ? city : '', area ? area : '']}
                         onOk={(address) => {
-                            console.log('onOK address',address)
+                            // console.log('onOK address',address)
                             this.setState({province: address[0], city: address[1], area: address[2]})
                         }}
                     >

src/utils/func.js

@@ -2,4 +2,13 @@ const idGen = (kind) => {
     return kind + '_' + Date.now() + '_' + Math.random().toString().slice(-8);
 };
 
-export {idGen}
+const getIsWechatBrowser = function(){
+    let ua = navigator.userAgent.toLowerCase();
+    let isWechat = /micromessenger/i.test(ua) || typeof navigator.wxuserAgent !== 'undefined';
+    // console.log('isWechat result',isWechat);
+    let isWechatBrowser =  isWechat ? true:false;
+    // console.log('isWechatBrowser',isWechatBrowser);
+    return isWechatBrowser;
+};
+
+export {idGen, getIsWechatBrowser}