Merge branch 'master' of http://gogs.ioobot.com:6680/xy/online

src/case/ShopApp/src/components/AddressPage/EditAddress.jsx

@@ -11,7 +11,7 @@ export default class EditAddress extends Component {
     this.createUserAddress=this.createUserAddress.bind(this)
   }
   componentDidMount(){
-    console.log('EditAddress mount')
+    //console.log('EditAddress mount')
   }
 
   componentWillUnmount(){

src/case/ShopApp/src/components/AddressPage/FormAddress.css

@@ -12,6 +12,9 @@ div.am-picker-popup-mask {
     height: 100%;
     width: 100%;
 }
+div.am-list-body{
+    background-color: transparent;
+}
 
 
 div.am-picker-popup-wrap ,div.am-picker-popup-wrap{

src/case/ShopApp/src/components/AddressPage/FormAddress.jsx

@@ -42,7 +42,7 @@ export default class FormAddress extends Component {
     //console.log('from render------',this.props.address_id)
     if(this.props.address_id){
       graphqls(getAddressById,{id:this.props.address_id}).then((e)=>{
-        console.log('--------getAddressBYID------------',e.userAddressbyid)
+        //console.log('--------getAddressBYID------------',e.userAddressbyid)
         let address=e.userAddressbyid
         this.setState({
           name:address.username,
@@ -62,35 +62,35 @@ export default class FormAddress extends Component {
     this.props.setAddressId('')
   }
   nameChange(e){
-    console.log(e)
+    //console.log(e)
     this.setState({
       name:e
     })
   }
 
   phoneChange(e){
-    console.log(e)
+    //console.log(e)
     this.setState({
       phone:e
     })
   }
 
   detailChange(e){
-    console.log(e)
+    //console.log(e)
     this.setState({
       detail:e
     })
   }
   codeChange(e){
-    console.log(e)
+    //console.log(e)
     this.setState({
       code:e
     })
   }
 
   areaChange(e=[0]){
-    console.log('e',e)
-    console.log(district)
+    //console.log('e',e)
+    //console.log(district)
 
     let provinceCode=e[0],cityCode=e[1],areaCode=e[2]
     
@@ -99,15 +99,15 @@ export default class FormAddress extends Component {
 
     district.map((item)=>{
       if(item.value===provinceCode){
-        console.log('province',item)
+        //console.log('province',item)
         province=item.label
         item.children.map((item)=>{
           if(item.value===cityCode){
-            console.log('city',item)
+            //console.log('city',item)
             city=item.label
             item.children.map((item)=>{
               if(item.value===areaCode){
-                console.log('area',item)
+               // console.log('area',item)
                 area=item.label
               }
               return 0
@@ -163,51 +163,54 @@ export default class FormAddress extends Component {
     //const { getFieldProps } = this.props.form;
     return (
       <div>
-        <form>
-          <List renderHeader={''} >
-            <InputItem
-              placeholder="姓名" 
-              value={this.state.name}
-              onChange={(e)=>{this.nameChange(e)}}
-            >收货人</InputItem>
-            <InputItem
-              type="phone"
-              placeholder="手机号码"
-              value={this.state.phone}
-              onChange={(e)=>{this.phoneChange(e)}}
-            >手机号码</InputItem>
-
-            <div className='pickerWrap' style={this.state.areaShow ? {}:{display:""}}>
-              <List style={{ backgroundColor: 'white' }} className="picker-list">
-                <Picker extra={this.state.province+this.state.city+this.state.area}
-                  data={district}
-                  title="Areas"
-                  onOk={e => console.log('ok', e)}
-                  onDismiss={e => this.areaChange(e)}
-                  onPickerChange={e=> this.areaChange(e)}
-                  indicatorStyle={{position:"absolute",bottom:"0",left:"0"}}
-                >
-                  <List.Item arrow="horizontal">点击选择地区</List.Item>
-                </Picker>
-              </List>
-            </div>
-            <InputItem
-              placeholder="详细地址"
-              value={this.state.detail}
-              onChange={(e)=>{this.detailChange(e)}}
-            >详细地址</InputItem>
-            <InputItem
-              type="number"
-              placeholder="邮编"
-              value={this.state.code}
-              maxLength={6}
-              onChange={(e)=>{this.codeChange(e)}}
-            >邮编</InputItem>
+        <div style={{marginTop:"50px"}}>
+        <List renderHeader={''} >
+        <InputItem
+          placeholder="姓名" 
+          value={this.state.name}
+          onChange={(e)=>{this.nameChange(e)}}
+        >收货人</InputItem>
+        <div style={{marginTop:"15px"}}></div>
+        <InputItem
+          type="phone"
+          placeholder="手机号码"
+          value={this.state.phone}
+          onChange={(e)=>{this.phoneChange(e)}}
+        >手机号码</InputItem>
+        <div style={{marginTop:"15px"}}></div>
+
+        <div className='pickerWrap' style={this.state.areaShow ? {}:{display:""}}>
+          <List style={{ backgroundColor: 'white' }} className="picker-list">
+            <Picker extra={this.state.province+this.state.city+this.state.area}
+              data={district}
+              title="Areas"
+              onOk={e => console.log('ok', e)}
+              onDismiss={e => this.areaChange(e)}
+              onPickerChange={e=> this.areaChange(e)}
+              indicatorStyle={{position:"absolute",bottom:"0",left:"0"}}
+            >
+              <List.Item arrow="horizontal">点击选择地区</List.Item>
+            </Picker>
           </List>
-          <Button type="primary" onClick={this.submit}>提交</Button><WhiteSpace />
-        </form>
-
-        
+        </div>
+        <div style={{marginTop:"15px"}}></div>
+        <InputItem
+          placeholder="详细地址"
+          value={this.state.detail}
+          onChange={(e)=>{this.detailChange(e)}}
+        >详细地址</InputItem>
+        <div style={{marginTop:"15px"}}></div>
+        <InputItem
+          type="number"
+          placeholder="邮编"
+          value={this.state.code}
+          maxLength={6}
+          onChange={(e)=>{this.codeChange(e)}}
+        >邮编</InputItem>
+      </List>
+      
+      <div style={{width:'100%',display:'flex',justifyContent:'center'}}><div style={{width:'256px'}}><Button type="primary" onClick={this.submit}>提交</Button></div></div>
+        </div>
       </div>
     )
   }

src/case/ShopApp/src/components/AddressPage/RadioAddress.css

@@ -18,6 +18,8 @@
     overflow: hidden;
     margin-top: 10px;
     border-bottom: 1px solid #d8d2d2;
+    background-color: #ffffff;
+    margin-bottom: 15px;
   }
 
   .left-icon{

src/case/ShopApp/src/components/AddressPage/RadioAddress.jsx

@@ -24,7 +24,7 @@ const Brief = Item.Brief;
 export default class RadioAddress extends Component{
 
   onChange = (id) => {
-    console.log('id:',id)
+   // console.log('id:',id)
     this.updateAddress(id)
   };
 
@@ -35,14 +35,14 @@ export default class RadioAddress extends Component{
 
   updateAddress=(id)=>{
     let that=this
-    console.log('更新启动')
+    //console.log('更新启动')
     let user_id=sessionStorage.getItem('openid')
     let data={id,default:1}
     
     graphqls(updateAddress,data).then((e)=>{
       //更新address成功之後，重新獲取地址列表,
       graphqls(getAddressByProps,{user_id}).then((res)=>{
-        console.log(res.userAddressbyprops)
+        //console.log(res.userAddressbyprops)
         res.userAddressbyprops.map((item)=>{
           if(item.id!==id){
             let data={id:item.id,default:0}

src/case/ShopApp/src/components/HomePage/Cards.css

@@ -20,15 +20,17 @@ p{
 
 .rightsidebar{
     padding-left: 8px;
+    text-align: right;
 }
-.rightsidebar .p1,.rightsidebar .p2{
+
+.indexPage .rightsidebar .p1,.rightsidebar .p2{
     font-size: 14px;
-    text-align: left;
+    text-align: right !important;
 }
 
 
 .p3{
-    text-align: left;
+    text-align: right;
     margin-top: 60px;
 }
 .sidebar{
@@ -36,7 +38,7 @@ p{
     font-size: 14px;
     flex-grow: 1;
     width: 100px;
-    overflow: hidden;
+    
 }
 .bodyWrap{
     display: flex;

src/case/ShopApp/src/components/HomePage/Cards.jsx

@@ -12,7 +12,7 @@ import {PageContext} from '../../context/context'
 
 class Cards extends Component{
     constructor(props){
-        console.log('111',props)
+        //console.log('111',props)
         super(props)
         this.state={
             product_id:''
@@ -48,7 +48,7 @@ class Cards extends Component{
                                                 </div>
                                             </div>
                                         </Card.Body>
-                                        <Card.Footer content="" extra={<div></div>} />
+                                        <Card.Footer content="" extra={<div></div>}/>
                                     </Card>
                                 {/*</Link>*/}
                                      <WhiteSpace size="lg" />

src/case/ShopApp/src/components/HomePage/HomePage.css

@@ -12,3 +12,8 @@
     background-color: #f5f5f5;
 }
 
+.homeWrap .am-card-header{
+    padding:1px 15px;
+}
+
+

src/case/ShopApp/src/components/HomePage/Search.jsx

@@ -14,11 +14,11 @@ class Search extends Component {
   }
   onChange= (value) => {
     this.setState({ value });
-    console.log(value)
+    //console.log(value)
   };
   clear = () => {
     this.setState({ value: '' });
-    console.log('cancel')
+    //console.log('cancel')
   };
   handleClick = () => {
     this.manualFocusInst.focus();

src/case/ShopApp/src/components/HomePage/TabBarTop.jsx

@@ -11,10 +11,8 @@ class TabBarTop extends Component {
       //console.log('this.state.products',this.state.products)
       return (
         <div>
-          <WhiteSpace />
             <Tabs onChange={e=>this.props.tabChange(e)} tabs={this.props.tabs} renderTabBar={props => <Tabs.DefaultTabBar {...props} page={4} />}>
             </Tabs>
-          <WhiteSpace />
         </div>
       );
     }

src/case/ShopApp/src/components/OrderCenterPage/OrderCard.jsx

@@ -24,7 +24,7 @@ export default class OrderCard extends Component {
                 <div className="OrderProductList">
                     {
                         (order.orderProducts||[]).map((item,index)=>{
-                            console.log(index,item)
+                            //console.log(index,item)
                             return (<ProductCard key={item.id} orderProduct={item}/>)
                         })
                     }

src/case/ShopApp/src/components/OrderCenterPage/OrderCenterPage.jsx

@@ -35,12 +35,12 @@ class OrderCenterPage extends Component {
   //获取订单，并根据订单id获取订单产品信息，之后重构数据结构
   getOrder(data){
     graphqls(getOrderByProps,data).then((res)=>{
-        console.log('order',res)
+        //console.log('order',res)
         let orderArr=res.orderbyprops||[]
         for(let i=0;i<orderArr.length;i++){
             //根据order_id获取订单产品信息,可以优化,可以只发出一次请求获取所有订单产品信息之后再经行处理
             graphqls(getProductByProps,{order_id:orderArr[i].id}).then((res)=>{
-                console.log('getProductByProps',res)
+                //console.log('getProductByProps',res)
                 orderArr[i].orderProducts=res.orderProductbyprops
                 
                 if(i===orderArr.length-1){
@@ -57,7 +57,7 @@ class OrderCenterPage extends Component {
             })
         }
     }).catch((e)=>{
-        console.log('catct',e)
+        //console.log('catct',e)
     })
   }
 
@@ -77,20 +77,20 @@ class OrderCenterPage extends Component {
   
   //删除订单
   toDeleteOrder(id){
-    console.log('order_id',id)
+    //console.log('order_id',id)
     this.deleteOrder({id})
     this.deleteOrderProduct({order_id:id})
   }
 
   toPay(id){
-    console.log('order_id',id)
+    //console.log('order_id',id)
     this.props.changePage('order')
     this.props.setOrderId(id,true)
   }
 
   tabChange(e){
     //有待优化，请求？(响应太慢，放弃)or使用缓存(徐分别处理，增加了代码量，这里采用)
-    console.log(e)
+    //console.log(e)
     let orderList=JSON.parse(sessionStorage.getItem('orderList'))||[]
     if(e.title==='未支付'){
         orderList=orderList.filter((item)=>{
@@ -117,7 +117,7 @@ class OrderCenterPage extends Component {
         <div className="orderList">
             {
                 orderList.map((item,index)=>{
-                    console.log(index,item)
+                    //console.log(index,item)
                     return(<OrderCard order={item} key={item.id} toPay={this.toPay} toDeleteOrder={this.toDeleteOrder}/>)
                 })
             }

src/case/ShopApp/src/components/OrderPage/OrderCard.jsx

@@ -5,7 +5,7 @@ export default class OrderCard extends Component {
   render() {
     //console.log(this.props)
     const product = this.props.product 
-    console.log('product',product)
+    //console.log('product',product)
     if(product.product_id){
         return (
             <WingBlank size="lg">

src/case/ShopApp/src/components/OrderPage/OrederPage.jsx

@@ -155,17 +155,17 @@ class OrderPage extends React.Component{
 
         const fromShopCar= this.props.fromShopCar
          graphqls(createOrders,orderData).then((e) => {
-            console.log('order创建订单成功', e)
+            //console.log('order创建订单成功', e)
             that.deleteAllShopCar()
             let products=that.state.products||[]
             let shopCarList=that.state.shopCarList||[]
             //从购物车页面跳转而来(多个产品)
             if(fromShopCar){
-                console.log('来自shopcar')
+                //console.log('来自shopcar')
                 //console.log('shopList----',shopCarList)
                 let i=1
                 shopCarList.map((item)=>{
-                    console.log(item)
+                    //console.log(item)
                     that.createProductOrder(id,item.count,item.product_id)
                     i++;
                     if(i===shopCarList.length){
@@ -175,7 +175,7 @@ class OrderPage extends React.Component{
                     return 0
                 })
             }else{//从产品详情页面跳转而来(一个产品)
-                console.log('来自detail')
+                //console.log('来自detail')
                 products.map((item)=>{
                     that.createProductOrder(id,that.state.num,item)
                     return 0
@@ -239,7 +239,7 @@ class OrderPage extends React.Component{
     render(){
         const address=this.state.address
         const num =this.state.num
-        console.log('+++',address)
+        //console.log('+++',address)
         return(
             <div className="orderWrap">
                 <ActivityIndicator toast text="loading" animating={this.state.loading}/>

src/case/ShopApp/src/components/ProductDetailPage/ActionSheet.jsx

@@ -46,7 +46,7 @@ class ActionSheets extends React.Component {
       let createdAt=new Date().toLocaleDateString()+' '+new Date().toLocaleTimeString().slice(2)
       let id=new Date().getTime()+parseInt(Math.random()*100000,10)
       let user_id=sessionStorage.getItem('openid')
-      console.log(user_id)
+      //console.log(user_id)
       //console.log('-----',this.props)
       const variable={
         count:that.state.num,

src/case/ShopApp/src/components/ProductDetailPage/Card.jsx

@@ -6,14 +6,14 @@ import './Card.css'
 export default class Card extends Component{
     constructor(props){
         super(props)
-        console.log('1',props)
+        //console.log('1',props)
         this.state={
             product:props.product
         }
     }
     
     componentWillReceiveProps(props){
-        console.log('cardProps',props)
+        //console.log('cardProps',props)
         this.setState({
             product:props.product
         })

src/case/ShopApp/src/components/ProductDetailPage/ProductDetail.jsx

@@ -22,7 +22,7 @@ export default class ProductDetail extends Component{
 
     getProduct(){
         graphqls(getProductById,{id:this.props.product_id}).then((e)=>{
-            console.log('productId',e.productbyid)
+            //console.log('productId',e.productbyid)
             this.setState({
                 product:e.productbyid,
                 loading:false

src/case/ShopApp/src/components/ShopCarPage/ShopCarPage.jsx

@@ -37,8 +37,8 @@ class ShopCarPage extends Component{
                 return 1
             })
 
-            console.log('sumPrice',sumPrice,'shopCarCount',shopCarCount)
-            console.log('getShopCarByProps',response.userCartbyprops)
+            //console.log('sumPrice',sumPrice,'shopCarCount',shopCarCount)
+            //console.log('getShopCarByProps',response.userCartbyprops)
             
             this.setState({
                 shopCarList:response.userCartbyprops,

src/case/ShopApp/src/components/UserPage/Head.jsx

@@ -3,7 +3,7 @@ import './Head.css'
 
 export default class Head extends Component {
   render() {
-    console.log(this.props)
+    //console.log(this.props)
     const user=this.props.user?this.props.user[0]:{username:'旺仔小馒头'}
     return (
       <div className="head">