4

@@ -52,6 +52,7 @@ class OrderpageController extends WeChatBaseController{
         $this -> assign('money',$money['money']);
         $this -> assign('data',$data);
         $this -> assign('indent_id',$indet_id['indet_id']);
+        $this -> assign('type',5);
         return $this -> fetch();
 
     }
@@ -274,6 +275,11 @@ class OrderpageController extends WeChatBaseController{
         $data = Db::name('address') -> where("delete_time = 0 and uid =".$uid) ->  select() -> toArray();
         $this -> assign('indent_id',$indent_id['indet_id']);
         $this -> assign('data',$data);
+        if(!empty($indent_id['type'])){
+            $this -> assign('type',5);
+        }else{
+            $this -> assign('type',6);
+        }
         return $this -> fetch();
 
     }

@@ -71,12 +71,23 @@
      *点击确认
      */
     function deter_sub(){
-
+        type = "{$type}";
         id = $('.haha').attr('data-id');
         if(typeof(id) == 'undefined'){
-            window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}";
+
+            if(type == 5){
+                window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}";
+            }else{
+                window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}";
+            }
+
         }else{
-            window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}?address_id="+id;
+            if(type == 5){
+                window.location.href = "{:url('Orderpage/order_page',array('indet_id'=>$indent_id))}?address_id="+id;
+            }else{
+                window.location.href = "{:url('Orderpage/order_salesman_kd',array('indet_id'=>$indent_id))}?address_id="+id;
+            }
+
         }
 
     }

@@ -37,7 +37,7 @@
                     <div class="order_adImg">
                         <img src="__TMPL__/public/assets/images/31.png" alt="">
                     </div>
-                    <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}">去添加</a></p>
+                    <p class="order_addressGo">暂无默认收货地址，<a href="{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id,'type'=>$type))}">去添加</a></p>
                 </div>
             <else/>
             <div class="order_addressYes">
@@ -52,7 +52,7 @@
                     <p class="or_address_detailed" id="detailed">{$address.region}{$address.detailed}</p>
                 </div>
                 <div class="or_addressYesImg2">
-                    <a href="{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id))}">
+                    <a href="{:url('Orderpage/go_add_address',array('indet_id'=>$indent_id,'type'=>$type))}">
                         <img src="__TMPL__/public/assets/images/29.png" alt="">
                     </a>
                 </div>