fix some bug

ecommerce.csv

@@ -97,7 +97,6 @@ updatedAt,string,
 order,collection,
 id,ID,key
 user_id,ID,non-null
-userAddress_id,ID,non-null
 remark,string,
 productTotalPay,float,non-null
 orderTotalPay,float,non-null

src/App.js

@@ -88,6 +88,7 @@ class App extends Component {
         // console.log('isWechatLogin',isWechatLogin)
         if (isWechatLogin) {
             // setCookie("openid","o2fcFv6Rh2-4rCh3d5_1uCWCT5Yc")
+            setCookie("openid","o2fcFv8x3wy5WtcP116S5GzzkgDQ")
             let openid = getCookie("openid")
             let user_id = getCookie("user_id")
             console.log('oauthLogin openid', openid)

src/configs/url.js

@@ -1,6 +1,7 @@
 // const graphqlFC = 'https://ec.ioobot.cn/graphql';            // old schema fc mongodb
-// const graphqlFC = 'http://ecenhance.ioobot.cn/graphql';      // new schema fc mongodb
-const graphqlFC = 'http://ecommerce.ioobot.cn/graphql';      // new schema server mongodb
+const graphqlFC = 'http://ecenhance.ioobot.cn/graphql';      // new schema fc mongodb
+// const graphqlFC = 'http://ecommerce.ioobot.cn/graphql';      // new schema server mongodb
 const storeFile = 'http://deploy.ioobot.cn/api/store-file';
 
 export {graphqlFC, storeFile}
+

src/pages/cart/orders/index.js

@@ -180,7 +180,7 @@ class CartOrders extends Component {
                 console.log('submit error',err)
             })
         }else {
-            message.warning('请添加收货地址')
+            message.warning('请先添加收货地址')
         }
 
     }

src/pages/cart/pay/index.js

@@ -93,7 +93,7 @@ class Pay extends Component {
             let openid = getCookie('openid')
 
             let $this = this
-            axios.get('/payinfo', {
+            axios.get('http://localhost:3000/payinfo', {
                 params: {
                     needPay: parseInt(needPay * 100, 10),
                     openid,

src/pages/home/all/index.js

@@ -90,7 +90,7 @@ class All extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }
@@ -131,7 +131,7 @@ class All extends Component {
                                 if (loading) {
                                     return (
                                         <div className="loading-center">
-                                            <ActivityIndicator text="Loading..." size="large"/>
+                                            <ActivityIndicator text="加载中..." size="large"/>
                                         </div>
                                     )
                                 }

src/pages/home/detail/index.js

@@ -49,7 +49,7 @@ class Detail extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }

src/pages/home/kind/index.js

@@ -56,7 +56,7 @@ class Kind extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }
@@ -125,7 +125,7 @@ class KindRender extends Component {
                                       <div className='product-item-description'>
                                           <div className='product-item-name'>{dataItem.name}</div>
                                           <div className='product-item-price'>
-                                              <span>￥{dataItem.price}</span>&nbsp;
+                                              <span>￥{(dataItem.price * dataItem.discountRate / 100).toFixed(2)}</span>&nbsp;
                                               <span>￥{dataItem.price}</span>
                                           </div>
                                       </div>

src/pages/my/all/index.js

@@ -26,7 +26,7 @@ const orderIcon = [
     },
     {
         icon: 'https://ece-img-1254337200.cos.ap-chengdu.myqcloud.com/icon/judge.png',
-        text: '待评价',
+        text: '已完成',
         id: 'judge'
     }
 ]
@@ -42,11 +42,11 @@ const toolsIcon = [
         text: '购物袋',
         id: 'cart'
     },
-    {
-        icon: 'https://ece-img-1254337200.cos.ap-chengdu.myqcloud.com/icon/message.png',
-        text: '系统通知',
-        id: 'message'
-    }
+    // {
+    //     icon: 'https://ece-img-1254337200.cos.ap-chengdu.myqcloud.com/icon/message.png',
+    //     text: '系统通知',
+    //     id: 'message'
+    // }
 ]
 
 const memberIcon = [
@@ -102,7 +102,7 @@ class All extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }

src/pages/my/manage/goods/index.js

@@ -64,7 +64,7 @@ class Goods extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >商品管理</NavBar>
                 <div className='content-wrap'>
@@ -110,7 +110,7 @@ class AllCategory extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }
@@ -168,7 +168,7 @@ class AllCategorySwitch extends Component {
                         return (
                             <div className="loading">
                                 <div className="align">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             </div>
                         )
@@ -209,7 +209,7 @@ class AllCategoryButton extends Component {
                         return (
                             <div className="loading">
                                 <div className="align">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             </div>
                         )
@@ -247,7 +247,7 @@ class AllCategoryInput extends Component {
                         return (
                             <div className="loading">
                                 <div className="align">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             </div>
                         )
@@ -314,7 +314,7 @@ class AllGoods extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -348,7 +348,7 @@ class AllGoods extends Component {
                                                                     return (
                                                                         <div className="loading">
                                                                             <div className="align">
-                                                                                <ActivityIndicator text="Loading..."
+                                                                                <ActivityIndicator text="加载中..."
                                                                                                    size="large"/>
                                                                             </div>
                                                                         </div>
@@ -488,7 +488,7 @@ class AddGoods extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -510,7 +510,7 @@ class AddGoods extends Component {
                                                 if (loading) {
                                                     return (
                                                         <div className="loading-center">
-                                                            <ActivityIndicator text="Loading..." size="large"/>
+                                                            <ActivityIndicator text="加载中..." size="large"/>
                                                         </div>
                                                     )
                                                 }
@@ -570,7 +570,7 @@ class AddGoods extends Component {
                                                             return (
                                                                 <div className="loading">
                                                                     <div className="align">
-                                                                        <ActivityIndicator text="Loading..."
+                                                                        <ActivityIndicator text="加载中..."
                                                                                            size="large"/>
                                                                     </div>
                                                                 </div>
@@ -622,7 +622,7 @@ class AddGoods extends Component {
                                                                 return (
                                                                     <div className="loading">
                                                                         <div className="align">
-                                                                            <ActivityIndicator text="Loading..."
+                                                                            <ActivityIndicator text="加载中..."
                                                                                                size="large"/>
                                                                         </div>
                                                                     </div>
@@ -671,7 +671,7 @@ class AddGoods extends Component {
                                                                 return (
                                                                     <div className="loading">
                                                                         <div className="align">
-                                                                            <ActivityIndicator text="Loading..."
+                                                                            <ActivityIndicator text="加载中..."
                                                                                                size="large"/>
                                                                         </div>
                                                                     </div>
@@ -788,7 +788,7 @@ class AddSpecStock extends Component {
                                                         return (
                                                             <div className="loading">
                                                                 <div className="align">
-                                                                    <ActivityIndicator text="Loading..." size="large"/>
+                                                                    <ActivityIndicator text="加载中..." size="large"/>
                                                                 </div>
                                                             </div>
                                                         )
@@ -824,7 +824,7 @@ class AddSpecStock extends Component {
                                                             return (
                                                                 <div className="loading">
                                                                     <div className="align">
-                                                                        <ActivityIndicator text="Loading..."
+                                                                        <ActivityIndicator text="加载中..."
                                                                                            size="large"/>
                                                                     </div>
                                                                 </div>
@@ -854,7 +854,7 @@ class AddSpecStock extends Component {
                                                             return (
                                                                 <div className="loading">
                                                                     <div className="align">
-                                                                        <ActivityIndicator text="Loading..." size="large"/>
+                                                                        <ActivityIndicator text="加载中..." size="large"/>
                                                                     </div>
                                                                 </div>
                                                             )

src/pages/my/manage/orders/index.js

@@ -34,7 +34,7 @@ class Orders extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >订单管理</NavBar>
                 <div className='content-wrap'>
@@ -143,7 +143,7 @@ class SearchQuery extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -158,9 +158,9 @@ class SearchQuery extends Component {
                                 </div>
                             )
                         } else {
-                            let {id, orderStatus, orderTotalPay, productTotalPay, count, remark, user_id, userAddress_id, createdAt, orderLogistics_id, orderPay_id} = data
+                            let {id, orderStatus, orderTotalPay, productTotalPay, count, remark, user_id, createdAt, orderLogistics_id, orderPay_id} = data
                             let {telephone: telephoneUser, username: usernameUser, email} = user_id
-                            let {province, city, area, address, telephone, username} = userAddress_id
+                            let {consigneeName, consigneeTel, consignAddress} = orderLogistics_id
                             let logisticsFee, LogisticsStatus, expressCreatedAt
                             if (orderLogistics_id !== null) {
                                 logisticsFee = orderLogistics_id.logisticsFee
@@ -178,9 +178,9 @@ class SearchQuery extends Component {
                                 "产品总量": count,
                                 "产品总计价格": productTotalPay,
                                 "订单总计价格": orderTotalPay,
-                                "订单人名称": username,
-                                "订单电话": telephone,
-                                "订单地址": province + city + area + address,
+                                "收货人": consigneeName,
+                                "收货人联系号码": consigneeTel,
+                                "收货地址": consignAddress,
                                 "下单时间": createdAt,
                                 "用户名称": usernameUser,
                                 "用户邮箱": email,
@@ -223,7 +223,7 @@ class Shiping extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -232,7 +232,6 @@ class Shiping extends Component {
                         }
                         data = data.orderbyprops
 
-
                         return (
                             <div>
                                 {
@@ -271,7 +270,7 @@ class Unbox extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -279,7 +278,7 @@ class Unbox extends Component {
                             return 'error!'
                         }
                         data = data.orderbyprops
-                        console.log(data)
+                        // console.log(data)
                         return (
                             <div>
                                 {
@@ -318,7 +317,7 @@ class Completed extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -326,7 +325,7 @@ class Completed extends Component {
                             return 'error!'
                         }
                         data = data.orderbyprops
-                        console.log(data)
+                        // console.log(data)
                         return (
                             <div>
                                 {
@@ -365,7 +364,7 @@ class Commented extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }
@@ -373,7 +372,7 @@ class Commented extends Component {
                             return 'error!'
                         }
                         data = data.orderbyprops
-                        console.log(data)
+                        // console.log(data)
                         return (
                             <div>
                                 {

src/pages/my/manage/shop/index.js

@@ -26,7 +26,7 @@ class Shop extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >店铺管理</NavBar>
                 <Query query={gql(shop_by_props)} variables={{limit: 1}}>
@@ -36,7 +36,7 @@ class Shop extends Component {
                                 return (
                                     <div className="loading">
                                         <div className="align">
-                                            <ActivityIndicator text="Loading..." size="large"/>
+                                            <ActivityIndicator text="加载中..." size="large"/>
                                         </div>
                                     </div>
                                 )
@@ -234,7 +234,7 @@ class UpdateShopButton extends Component {
                         return (
                             <div className="loading">
                                 <div className="align">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             </div>
                         )
@@ -300,7 +300,7 @@ class CreateShopButton extends Component {
                         return (
                             <div className="loading">
                                 <div className="align">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             </div>
                         )

src/pages/my/member/card/index.js

@@ -17,7 +17,7 @@ class Card extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >会员卡</NavBar>
             </div>

src/pages/my/member/coupon/index.js

@@ -17,7 +17,7 @@ class Coupon extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >优惠券</NavBar>
             </div>

src/pages/my/member/credit/index.js

@@ -17,7 +17,7 @@ class Credit extends Component {
                     mode="light"
                     icon={<Icon type="left"/>}
                     onLeftClick={() => {
-                        this.props.history.go(-2)
+                        this.props.history.go(-1)
                     }}
                 >我的积分</NavBar>
             </div>

src/pages/my/order/detail/index.js

@@ -90,8 +90,10 @@ class Detail extends Component {
 
     render() {
         let {data} = this.state
-        let {username, telephone, province, city, area, address} = data.userAddress_id
-        return (
+      console.log("detail data",data)
+      let {consigneeName, consigneeTel, consignAddress} = data.orderLogistics_id
+
+      return (
             <div>
                 <div className='detail-wrap'>
                     <div className='navbar'>
@@ -120,10 +122,10 @@ class Detail extends Component {
                                     </Col>
                                     <Col span={20}>
                                         <div className='detail-address-content-username-phone'>
-                                            {username}&nbsp;&nbsp;{telephone}
+                                            {consigneeName}&nbsp;&nbsp;{consigneeTel}
                                         </div>
                                         <div>
-                                            地址：{province + city + area + address}
+                                            收货地址：{consignAddress}
                                         </div>
                                     </Col>
                                 </Row>

src/pages/my/order/display/index.js

@@ -1,6 +1,6 @@
 import React, {Component} from 'react'
 import {withRouter} from 'react-router-dom'
-import {Row, Col} from 'antd'
+import {Row, Col, message} from 'antd'
 import {NavBar, Icon, ActivityIndicator, Button} from 'antd-mobile'
 import {Query} from "react-apollo"
 import {Mutation} from "react-apollo"
@@ -67,7 +67,7 @@ class Display extends Component {
                         mode="light"
                         icon={<Icon type="left"/>}
                         onLeftClick={() => {
-                            this.props.history.go(-2)
+                            this.props.history.go(-1)
                         }}
                     >{navTitle}</NavBar>
                 </div>
@@ -77,7 +77,7 @@ class Display extends Component {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }
@@ -145,7 +145,7 @@ class DisplayRender extends Component {
                                             if (loading) {
                                                 return (
                                                     <div className="loading-center">
-                                                        <ActivityIndicator text="Loading..." size="large"/>
+                                                        <ActivityIndicator text="加载中..." size="large"/>
                                                     </div>
                                                 )
                                             }
@@ -192,7 +192,7 @@ class DisplayRender extends Component {
 
                                 {
                                     button ?
-                                        <ButtonGroupRender id={order.id} orderStatus={this.props.orderStatus}
+                                        <ButtonGroupRender id={order.id} order={order} orderStatus={this.props.orderStatus}
                                                            history={this.props.history}/>
                                         :
                                         ''
@@ -207,7 +207,7 @@ class DisplayRender extends Component {
 }
 
 const ButtonGroupRender = (props) => {
-    let {orderStatus, id} = props
+    let {orderStatus, id, order} = props
     let user_id = getCookie('user_id')
     switch (orderStatus) {
         case '0':
@@ -221,7 +221,7 @@ const ButtonGroupRender = (props) => {
                             if (loading) {
                                 return (
                                     <div className="loading-center">
-                                        <ActivityIndicator text="Loading..." size="large"/>
+                                        <ActivityIndicator text="加载中..." size="large"/>
                                     </div>
                                 )
                             }
@@ -238,6 +238,7 @@ const ButtonGroupRender = (props) => {
 
 
                     <Button size="small" className='pay-button order-button' style={{marginLeft: 5}} onClick={() => {
+                        sessionStorage.setItem('payOrder',JSON.stringify(order))
                         props.history.push({
                             pathname: '/cart/pay',
                             state: {}
@@ -248,31 +249,29 @@ const ButtonGroupRender = (props) => {
         case '1':
             return (
                 <div className='order-card-button-group'>
-                    <Button size="small" className='ship-button order-button'>催发货</Button>
-                    &nbsp;&nbsp;
-                    <Button size="small" className='cancel-button order-button'>取消订单</Button>
+                    <Button size="small" className='ship-button order-button' onClick={() => {
+                      message.success('已提醒')
+                    }}>催发货</Button>
                 </div>
             )
         case '2':
             return (
                 <div className='order-card-button-group'>
-                    <Button size="small" className='unbox-button order-button'>查看物流</Button>
-                    &nbsp;&nbsp;
-                    <Button size="small" className='cancel-button order-button'>取消订单</Button>
-                </div>
-            )
-        case '3':
-            return (
-                <div className='order-card-button-group'>
-                    <Button size="small" className='judge-button order-button'>去评价</Button>
-                    &nbsp;&nbsp;
-                    <Button size="small" className='more-button order-button'>售后</Button>
+                    <Button size="small" className='unbox-button order-button' onClick={() => {
+                      message.info('暂无物流信息')
+                    }}>查看物流</Button>
                 </div>
             )
+        // case '3':
+        //     return (
+        //         <div className='order-card-button-group'>
+        //             <Button size="small" className='judge-button order-button'>去评价</Button>
+        //         </div>
+        //     )
         default:
             return (
                 <div>
-                    ok
+
                 </div>
             )
     }

src/pages/my/profile/index.js

@@ -41,7 +41,7 @@ class Profile extends Component {
                         if (loading) {
                             return (
                                 <div className="loading-center">
-                                    <ActivityIndicator text="Loading..." size="large"/>
+                                    <ActivityIndicator text="加载中..." size="large"/>
                                 </div>
                             )
                         }

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

@@ -59,7 +59,7 @@ class Address extends Component {
                             if(single){
                                 this.changePage(false)
                             }else {
-                                this.props.history.go(-2)
+                                this.props.history.go(-1)
                             }
                         }}
                     >{navContent}</NavBar>
@@ -71,7 +71,7 @@ class Address extends Component {
                                 if (loading) {
                                     return (
                                         <div className="loading-center">
-                                            <ActivityIndicator text="Loading..." size="large"/>
+                                            <ActivityIndicator text="加载中..." size="large"/>
                                         </div>
                                     )
                                 }
@@ -131,7 +131,7 @@ class AddressRender extends Component {
 
         if(prePage){
             sessionStorage.setItem('ordersAddress',JSON.stringify(address))
-            this.props.history.go(-2)
+            this.props.history.go(-1)
         }
     }
 

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

@@ -16,9 +16,9 @@ class SingleAddress extends Component {
         let state = {
             username: '',
             telephone: '',
-            province: '安徽省',
-            city: '合肥市',
-            area: '蜀山区',
+            province: '',
+            city: '',
+            area: '',
             address: '',
             id: '',
             defaultStatus:false
@@ -79,7 +79,7 @@ class SingleAddress extends Component {
                 province
             }
 
-            let {defaultAddress, addressID} = this.props
+            let {defaultAddress} = this.props
             if(defaultAddress){
                 let {id} = defaultAddress
                 addressContent.updateID = id
@@ -95,9 +95,9 @@ class SingleAddress extends Component {
                 if(defaultStatus1){
                     sessionStorage.setItem('ordersAddress',JSON.stringify(addressContent))
                 }
-                if(prePage && addressID !== 'add'){
+                if(prePage){
                     sessionStorage.setItem('ordersAddress',JSON.stringify(addressContent))
-                    this.props.history.go(-2)
+                    this.props.history.go(-1)
                 }else {
                     this.props.changePage(false)
                 }
@@ -146,7 +146,8 @@ class SingleAddress extends Component {
                         <TextareaItem
                             title="选择地区"
                             editable={false}
-                            value={province+city+area}
+                            value={province ? province+city+area : null}
+                            placeholder="请选择地区"
                         />
                     </Picker>
                     <TextareaItem

src/pages/my/tools/message/index.js

@@ -18,7 +18,7 @@ class Message extends Component {
                         mode="light"
                         icon={<Icon type="left"/>}
                         onLeftClick={() => {
-                            this.props.history.go(-2)
+                            this.props.history.go(-1)
                         }}
                     >系统消息</NavBar>
                 </div>

src/utils/gql.js

@@ -469,8 +469,8 @@ const delete_address = `
 `
 
 const orderbyprops = `
-    query orderbyprops($updatedAt: String, $orderLogistics_id: ID, $orderTotalPay: Float, $createdAt: String, $orderStatus: String, $userAddress_id: ID, $count: Int, $user_id: ID, $productTotalPay: Float, $orderPay_id: ID) {
-        orderbyprops: order_by_props(updatedAt: $updatedAt orderLogistics_id: $orderLogistics_id orderTotalPay: $orderTotalPay createdAt: $createdAt orderStatus: $orderStatus userAddress_id: $userAddress_id count: $count user_id: $user_id productTotalPay: $productTotalPay orderPay_id: $orderPay_id) {
+    query orderbyprops($updatedAt: String, $orderLogistics_id: ID, $orderTotalPay: Float, $createdAt: String, $orderStatus: String, $count: Int, $user_id: ID, $productTotalPay: Float, $orderPay_id: ID) {
+        orderbyprops: order_by_props(updatedAt: $updatedAt orderLogistics_id: $orderLogistics_id orderTotalPay: $orderTotalPay createdAt: $createdAt orderStatus: $orderStatus count: $count user_id: $user_id productTotalPay: $productTotalPay orderPay_id: $orderPay_id) {
             updatedAt
             orderLogistics_id {
                 deliveryTime
@@ -491,20 +491,6 @@ const orderbyprops = `
             orderTotalPay
             createdAt
             orderStatus
-            userAddress_id {
-                address
-                updatedAt
-                telephone
-                default
-                city
-                username
-                postcode
-                createdAt
-                deletedAt
-                id
-                area
-                province
-            }
             id
             count
             productTotalPay
@@ -548,20 +534,6 @@ const order_by_id = `
             orderTotalPay
             createdAt
             orderStatus
-            userAddress_id {
-                address
-                updatedAt
-                telephone
-                default
-                city
-                username
-                postcode
-                createdAt
-                deletedAt
-                id
-                area
-                province
-            }
             id
             count
             user_id {
@@ -666,13 +638,11 @@ const create_order = `
                     logisticsFee
                     expressId
                     createdAt
-        
                     consigneeTel
                     id
                     expressName
                     consignAddress
                     LogisticsStatus
-        
                     consigneeName
                 }
                 orderTotalPay