4

@@ -154,13 +154,15 @@ class OrderpageController extends WeChatBaseController{
         $this -> assign('courier',$courier['courier']);
         $money['money'] = $money['money']+$courier['courier'];
         $this -> assign('money',$money['money']);
+        if(empty($indent_id['address_id'])){
+            $address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();
+        }else{
+            $address = Db::name('address') -> where('id',$indent_id['address_id']) -> find();
+        }
 
-        $address = Db::name('address') -> where("uid=".$uid." and default_address=1 and delete_time = 0") -> find();
         if(empty($address)){
             $this -> assign('address',4);
         }else{
-            $address_arr = explode(',',$address['detailed']);
-            $address['detailed'] = $address_arr[0].$address_arr[1];
             $indet_data = Db::name('indent') -> where("id",$indent_id['indet_id']) -> find();
             if($indet_data['state'] == 4){
                 $indet_data_update['id'] = $indent_id['indet_id'];

@@ -234,8 +234,6 @@
             }
         });
 
-
-
     }
 
 

@@ -74,9 +74,9 @@
 
         id = $('.haha').attr('data-id');
         if(typeof(id) == 'undefined'){
-            window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}";
+            window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}";
         }else{
-            window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}?address_id="+id;
+            window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}?address_id="+id;
         }
 
     }