Bladeren bron

fix bug about create order and this reason is updated schema

Csy817 6 jaren geleden
bovenliggende
commit
de22726442
3 gewijzigde bestanden met toevoegingen van 11 en 22 verwijderingen
  1. 5 2
      src/pages/cart/orders/index.js
  2. 4 4
      src/pages/cart/pay/index.js
  3. 2 16
      src/utils/gql.js

+ 5 - 2
src/pages/cart/orders/index.js

@@ -126,7 +126,10 @@ class CartOrders extends Component {
 
             // console.log('createOrder orderContent',orderContent)
 
-            let createOrder = create_order({variables:{...orderContent, ...orderLogistics}})
+            let createOrder = create_order({variables:{...orderContent, ...orderLogistics}}).then((data)=>{
+              // console.log('createOrder',data)
+              return data.data
+            })
 
             let createOrderProduct = shopping.map((item,index) => {
                 let createdAt = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -428,4 +431,4 @@ const OrdersAddress =({props,selectAddress}) => {
             </Item>
         </List>
     )
-}
+}

+ 4 - 4
src/pages/cart/pay/index.js

@@ -93,7 +93,7 @@ class Pay extends Component {
             let openid = getCookie('openid')
 
             let $this = this
-            axios.get('http://localhost:3000/payinfo', {
+            axios.get('/payinfo', {
                 params: {
                     needPay: parseInt(needPay * 100, 10),
                     openid,
@@ -111,8 +111,8 @@ class Pay extends Component {
                     message.warning('网络或系统故障,请稍后重试')
                     console.log('onBridgeReady error', error)
                 })
-        } else {
-            message.info('当前只支持在微信中打开')
+        } else if(!isWechat){
+            message.info('当前只支持在微信中支付')
         }
     }
 
@@ -184,4 +184,4 @@ class Pay extends Component {
     }
 }
 
-export default withRouter(Pay)
+export default withRouter(Pay)

+ 2 - 16
src/utils/gql.js

@@ -735,10 +735,10 @@ const orderProduct_by_props = `
 `
 
 const create_order = `
-    mutation createorder($remark: String, $updatedAt: String, $orderLogistics_id: ID, $orderTotalPay: Float, $createdAt: String, $orderStatus: String, $userAddress_id: ID, $id: ID!, $count: Int, $user_id: ID, $productTotalPay: Float, $orderPay_id: ID, 
+    mutation createorder($remark: String, $updatedAt: String, $orderLogistics_id: ID, $orderTotalPay: Float, $createdAt: String, $orderStatus: String, $id: ID!, $count: Int, $user_id: ID, $productTotalPay: Float, $orderPay_id: ID, 
                          $deliveryTime: String, $serviceStore: String, $logisticsFee: Float, $expressId: String, $order_id: ID, $consigneeTel: String, $orderLogisticsId: ID!, $expressName: String, $consignAddress: String, $LogisticsStatus: String, $consigneeName: String
                          $deleteId: [String]) {
-        createorder: create_order(remark: $remark updatedAt: $updatedAt orderLogistics_id: $orderLogistics_id orderTotalPay: $orderTotalPay createdAt: $createdAt orderStatus: $orderStatus userAddress_id: $userAddress_id id: $id count: $count user_id: $user_id productTotalPay: $productTotalPay orderPay_id: $orderPay_id) {
+        createorder: create_order(remark: $remark updatedAt: $updatedAt orderLogistics_id: $orderLogistics_id orderTotalPay: $orderTotalPay createdAt: $createdAt orderStatus: $orderStatus id: $id count: $count user_id: $user_id productTotalPay: $productTotalPay orderPay_id: $orderPay_id) {
             result
             order {
                 remark
@@ -760,20 +760,6 @@ const create_order = `
                 orderTotalPay
                 createdAt
                 orderStatus
-                userAddress_id {
-                    address
-                    updatedAt
-                    telephone
-                    default
-                    city
-                    username
-                    postcode
-                    createdAt
-                    deletedAt
-                    id    
-                    area
-                    province
-                }
                 id
                 count
                 productTotalPay