合并分支 'juan' 到 'master'

Juan



查看合并请求 !128

@@ -796,6 +796,28 @@
     })
     var address_id = '{$default_address_id}';
 
+    //选择地址
+    $(".managerplace").on("click",".default_list",function(){
+        window.event.stopPropagation();
+        $(".addresswrapper").hide();
+        var addressid=$(this).children(".default_body").children(".default_type").children(".edit").children(".defauledi").attr("data-id");
+        var selectplace=$(this).children(".manageraddress").children(".addresshead").children(".place").html();
+        var selectname=$(this).children(".manageraddress").children(".info").children(".name").html();
+        var selectphone=$(this).children(".manageraddress").children(".info").children(".telphone").html();
+        localStorage.setItem("selectname",selectname);
+        localStorage.setItem("selectplace",selectplace);
+        localStorage.setItem("selectphone",selectphone);
+        var pselectname=localStorage.getItem("selectname");
+        var pselectplace=localStorage.getItem("selectplace");
+        var pselectphone=localStorage.getItem("selectphone");
+        $(".people_name").html(pselectname);
+        $(".people_phone").html(pselectphone);
+        $(".people_place").html(pselectplace);
+        address_id = addressid;
+    })
+
+
+
 
     $(".managerplace").on("click",".xuan",function(){
         window.event.stopPropagation();
@@ -822,7 +844,7 @@
                 alert("设置默认地址失败")
             }
         })
-        address_id = id;
+
     })
 
 
@@ -1082,26 +1104,7 @@
     })
 
 
-    //选择地址
-    $(".managerplace").on("click",".default_list",function(){
-        window.event.stopPropagation();
-        $(".addresswrapper").hide();
-        var addressid=$(this).children(".default_body").children(".default_type").children(".edit").children(".defauledi").attr("data-id");
-        var selectplace=$(this).children(".manageraddress").children(".addresshead").children(".place").html();
-        var selectname=$(this).children(".manageraddress").children(".info").children(".name").html();
-        var selectphone=$(this).children(".manageraddress").children(".info").children(".telphone").html();
-        localStorage.setItem("selectname",selectname);
-        localStorage.setItem("selectplace",selectplace);
-        localStorage.setItem("selectphone",selectphone);
-
-        var pselectname=localStorage.getItem("selectname");
-        var pselectplace=localStorage.getItem("selectplace");
-        var pselectphone=localStorage.getItem("selectphone");
-        $(".people_name").html(pselectname);
-        $(".people_phone").html(pselectphone);
-        $(".people_place").html(pselectplace);
 
-    })
 </script>
 
 <!--订单地址相关-->