合并分支 'juan' 到 'master'

Juan



查看合并请求 !112

@@ -671,6 +671,25 @@
 </div>
 </body>
 <script src="__INDEX__/js/jquery.min.js"></script>
+<script type="text/javascript" src="__INDEX__/js/jquery-2.1.4.js"></script>
+<script type="text/javascript" src="__INDEX__/js/fastclick.js"></script>
+<script>
+    $(function() {
+        FastClick.attach(document.body);
+    });
+</script>
+<script type="text/javascript" src="__INDEX__/js/jquery-weui.js"></script>
+<script type="text/javascript" src="__INDEX__/js/city-picker.js"></script>
+<script type="text/javascript" src="__INDEX__/js/cookie.js"></script>
+<script>
+    $("#end,#select").cityPicker({
+        title: "请选择地区"
+    });
+    // $("#select").cityPicker({
+    //     title: "请选择地区"
+    // });
+</script>
+
 <script>
     var pay_type = '';
     $(".pay").click(function(){
@@ -748,11 +767,6 @@
         }
     })
 
-
-
-
-
-
     //确认支付
     $(".paywrapper").click(function(){
         $(this).css("display","none")
@@ -790,11 +804,27 @@
         $(this).siblings(".icon-xuanze-fangkuang").css("display","block");
         $(this).parents(".default_list").siblings(".default_list").children(".default_body").children(".default").children(".icon-xuanze-fangkuang").css("display","none")
         $(this).parents(".default_list").siblings(".default_list").children(".default_body").children(".default").children(".xuan").css("display","block")
-        var id=$(this).attr('data-id');
+
+
         $(".people_name").html($("#name_"+id).html());
         $(".people_phone").html($("#num_"+id).html());
         $(".people_place").html($("#place_"+id).html());
         address_id = id;
+
+        var data_id=$(this).attr('data-id');
+        var url = 'address/Place/setDefault';
+        var params = {
+            id:data_id,
+            is_sta:2
+        };
+        ajaxsend(url, params, function(res) {
+            console.log(res);
+            if(res.code==40000){
+                alert("设置默认地址失败")
+            }
+
+        })
+
     })