合并分支 'juanli' 到 'master'

Juanli



查看合并请求 !409

@@ -215,6 +215,18 @@
             z-index: 5;
             overflow: scroll;
         }
+        .newaddpositionwrapper{
+            width: 100%;
+            height: 100%;
+            /*background-color: rgba(0,0,0,0.5);*/
+            background: RGBA(245, 246, 250, 1);
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            z-index: 5;
+            overflow: scroll;
+        }
         .select {
             background: #fff;
         }
@@ -476,8 +488,35 @@
             <input type="text" placeholder="请填写联系电话" class="detailplace" id="phone">
         </div>
     </div>
+    <div class="save editsave">保存</div>
+</div>
+<div class="newaddpositionwrapper" style="display:none">
+    <div class="select">
+        <div class="select_address">
+            <p class="placeselect">选择地区</p>
+            <div class="weui-cell" style="padding: 0">
+                <!--<div class="weui-cell__hd"><label for="date" class="weui-label place">选择地区</label></div>-->
+                <div class="weui-cell__bd">
+                    <input class="weui-input selectadd" id="end" type="text"  placeholder="请选择省市区" >
+                </div>
+            </div>
+            <p class="iconfont icon-xiaotuziCduan_" id="select"></p>
+        </div>
+        <div class="detail_address">
+            <p class="placeselect">详细地址</p>
+            <input type="text" placeholder="请填写详细地址" class="detailplace" id="place">
+        </div>
+        <div class="detail_address">
+            <p class="placeselect">收货人</p>
+            <input type="text" placeholder="请填写收货人" class="detailplace" id="name">
+        </div>
+        <div class="detail_address">
+            <p class="placeselect">联系电话</p>
+            <input type="text" placeholder="请填写联系电话" class="detailplace" id="phone">
+        </div>
+    </div>
     <div class="save newsave">保存</div>
-    <div class="save editsave" style="display:none">保存</div>
+
 </div>
 <!--选择地址-->
 <div class="addresswrapper" style="display:none">
@@ -857,15 +896,13 @@
 
     //新增收获地址
     $(".addplace").click(function(){
-        $(".addpositionwrapper").css("display","block")
-        $(".newsave").css("display","block");
-        $(".editsave").css("display","none")
+        $(".newaddpositionwrapper").css("display","block")
+
     })
 
     $(".addressplus").click(function(){
-        $(".addpositionwrapper").css("display","block")
-        $(".newsave").css("display","block");
-        $(".editsave").css("display","none")
+        $(".newaddpositionwrapper").css("display","block")
+
     })
     //选择地址
     $(".people_info").click(function(){
@@ -955,8 +992,6 @@
     var editdistrict="";
     $(".managerplace").on("click",".edit",function(){
         window.event.stopPropagation();
-        $(".newsave").css("display","none");
-        $(".editsave").css("display","block")
         $(".addresswrapper").css("display","none");
         $(".addpositionwrapper").css("display","block");
         var data_id=$(this).children(".defauledi").attr("data-id");
@@ -1097,7 +1132,7 @@
         ajaxsend(url, params, function(res) {-
             console.log(res);
             if(res.code=="20000"){
-                $(".addpositionwrapper").css("display","none");
+                $(".newaddpositionwrapper").css("display","none");
                 $(".addresswrapper").css("display","block");
 
                 var newplace=localStorage.getItem("newplace");
@@ -1154,7 +1189,7 @@
     var delid="";
     $(".managerplace").on("click",".delect",function(){
         window.event.stopPropagation();
-        $(".addresswrapper").show();
+        $(".addresswrapper").css("display","block");
         del_id=$(this).children(".defaultdel").attr("data-id");
         delid=$(this).children(".defaultdel").attr("data-id");
         $(".deletewrapper").show();
@@ -1183,7 +1218,8 @@
             }
 
         })
-        $(".deletewrapper").css("display","none")
+        $(".deletewrapper").css("display","none");
+        $(".addresswrapper").show();
     });
 
     $(".cancel").click(function(){