Merge branch '5.6.0' of http://git.yoho.cn/mobile/YH_RNComponent into 5.6.0

@@ -915,7 +915,6 @@ function exposePruductListData(list,order,channel,index,shopId) {
             PRD_SKN : skn,
 			TAB_NAM : tab_name,
 			TAB_ID : tab_num,
-			P_PARAM : channelStr,
             C_ID: channel,
 			L2_TAB_ID: index,
 			L2_TAB_NAM: l2_TAB_NAM,

@@ -108,10 +108,6 @@ export default class Detail extends Component {
             acceptTime,
             accept_address
         } = this.props.resource;
-        console.log('aaaaaa');
-        console.log(this.props.resource
-            ? this.props.resource.toJS()
-            : 'no resource');
         let {isFetching, data} = detail;
 
         let addressBlob = {
@@ -132,7 +128,7 @@ export default class Detail extends Component {
         }
         let is_delivery_offline = 'N';
         if (data) {
-            is_delivery_offline = data.get('let is_delivery_offline');
+            is_delivery_offline = data.get('is_delivery_offline');
         }
         let showDeliveryOffline = is_delivery_offline && is_delivery_offline == 'Y';
 
@@ -141,6 +137,7 @@ export default class Detail extends Component {
             orderStatus: data && data.get('status_str'),
             orderTime: data && data.get('create_time'),
             payWay: data && data.get('payment_name'),
+            offLineStore: data && data.get('offline_store'),
             expressExisted: expressBlob,
             showDeliveryOffline,
         }
@@ -204,7 +201,7 @@ export default class Detail extends Component {
             'deliveryOffline': showDeliveryOffline
                 ?[1]
                 :[],
-            'express': expressBlob
+            'express': expressBlob && !showDeliveryOffline
                 ? [expressBlob]
                 : [],
             'multiPackage': isMultiPackage && packageTitle.length

@@ -23,16 +23,14 @@ export default class DistributionInfoCell extends Component {
 
     render() {
         return (
-            <View style={[styles.container, containerSeparator]}>
+            <View style={[styles.container]}>
                 <View style={styles.leftPart}>
                     <Image style={{
-                        width: 22,
-                        height: 22
                     }} source={require('../../image/xxd_ic.png')}/>
                 </View>
-                <View style={[styles.rightPart, rightSeparator]}>
+                <View style={[styles.rightPart]}>
                     <View style={styles.topPart}>
-                        <Text style={styles.codeText}>订单编号：{orderCode}</Text>
+                        <Text style={styles.codeText}>配送信息</Text>
                     </View>
                     <Text style={styles.otherText}>配送方式：门店取货</Text>
                 </View>

@@ -33,7 +33,7 @@ function getTimerString(timeLeft) {
     return '剩余'+timerString;
 }
 
-export default class Detail extends Component {
+export default class Footer extends Component {
 
     constructor(props) {
         super(props);

@@ -22,7 +22,7 @@ export default class OrderInfoCell extends Component {
     }
 
     render() {
-        let {orderCode, orderStatus, orderTime, payWay, expressExisted, showDeliveryOffline} = this.props.data;
+        let {orderCode, orderStatus, orderTime, payWay, offLineStore, expressExisted, showDeliveryOffline} = this.props.data;
         let containerSeparator = expressExisted || showDeliveryOffline ? {borderBottomWidth:0}:{};
         let rightSeparator = expressExisted || showDeliveryOffline ?{borderBottomWidth:0.5}:{};
         let timeInt = parseInt(orderTime) * 1000;
@@ -62,7 +62,8 @@ export default class OrderInfoCell extends Component {
                     </View>
                     <Text style={styles.otherText}>订单状态：{orderStatus}</Text>
                     <Text style={styles.otherText}>下单时间：{timeStr}</Text>
-                    {payWay&&payWay.leng?<Text style={styles.otherText}>支付方式：{payWay}</Text>:null}
+                    {payWay&&payWay.length?<Text style={styles.otherText}>支付方式：{payWay}</Text>:null}
+                    {offLineStore&&offLineStore.length?<Text style={styles.otherText}>下单门店：{offLineStore}</Text>:null}
                 </View>
             </View>
         );

@@ -34,7 +34,6 @@ export default class Segment extends Component {
                          inactiveTextColor={'#b0b0b0'}/>
                      }
                      onChangeTab={(obj) => {
-                         console.log('onChangeTab');
                          this.props._onSelectIndex && this.props._onSelectIndex(obj.i);
                      }}
                 >