李涵 / integral · 提交

转到一个项目

作者 李涵
提交 c1269876fa142b9d1a86259375e658dc7b2d167a 2 个父辈 d6ecdfbc 235d1bed
1 个管道 的构建 通过 耗费 0 秒

合并分支 'juanli' 到 'master' 

修改地址



查看合并请求 !408
内嵌 并排对比
正在显示 1 个修改的文件 包含 59 行增加 和 89 行删除
... ... @@ -452,49 +452,49 @@
</div>
<!--添加地址-->
<div class="addpositionwrapper" 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 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>
<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>
<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 class="save newsave">保存</div>
<div class="save editsave" style="display:none">保存</div>
</div>
<div class="save newsave">保存</div>
<div class="save editsave" style="display:none">保存</div>
</div>
<!--选择地址-->
<div class="addresswrapper" style="display:none">
<!--<div class="addresspoup">-->
<!--<volist name="address" id="vo">-->
<!--<div class="addaddress">-->
<!--<p class="iconfont icon-xuanzekuang xuan" data-id="{$vo.id}"></p>-->
<!--<p class="iconfont icon-xuanze-fangkuang" style="display:none"></p>-->
<!--<div class="addressinfo">-->
<!--<div class="address_text">-->
<!--<p class="address_name" id="name_{$vo.id}">{$vo.name}</p>-->
<!--<p class="address_num" id="num_{$vo.id}">{$vo.mobile}</p>-->
<!--</div>-->
<!--<p class="address_place" id="place_{$vo.id}">{$vo.province}{$vo.city}{$vo.county}{$vo.place}</p>-->
<!--</div>-->
<!--</div>-->
<!--</volist>-->
<!--<volist name="address" id="vo">-->
<!--<div class="addaddress">-->
<!--<p class="iconfont icon-xuanzekuang xuan" data-id="{$vo.id}"></p>-->
<!--<p class="iconfont icon-xuanze-fangkuang" style="display:none"></p>-->
<!--<div class="addressinfo">-->
<!--<div class="address_text">-->
<!--<p class="address_name" id="name_{$vo.id}">{$vo.name}</p>-->
<!--<p class="address_num" id="num_{$vo.id}">{$vo.mobile}</p>-->
<!--</div>-->
<!--<p class="address_place" id="place_{$vo.id}">{$vo.province}{$vo.city}{$vo.county}{$vo.place}</p>-->
<!--</div>-->
<!--</div>-->
<!--</volist>-->
<!--</div>-->
<div class="haveplace" >
... ... @@ -628,10 +628,10 @@
<div class="pay_name">当前剩余积分：{$balance}</div>
<div>
<if condition="$caid eq '1'">
<div class="pay_type_list">
<p class="pay_name">微信支付</p>
<p class="iconfont pay icon-not_Selected-copy" data-var="1"></p>
</div>
<div class="pay_type_list">
<p class="pay_name">微信支付</p>
<p class="iconfont pay icon-not_Selected-copy" data-var="1"></p>
</div>
</if>
<if condition="$caid eq '2'">
<div class="pay_type_list">
... ... @@ -648,10 +648,10 @@
</div>
</if>
<if condition="$caid eq '3'">
<div class="pay_type_list">
<p class="pay_name">积分支付</p>
<p class="iconfont pay icon-not_Selected-copy" data-var="3"></p>
</div>
<div class="pay_type_list">
<p class="pay_name">积分支付</p>
<p class="iconfont pay icon-not_Selected-copy" data-var="3"></p>
</div>
</if>
</div>
... ... @@ -951,9 +951,9 @@
var place="";
var code="";
var code_id="";
var eidtid=""
$(".edit").click(function(){
var eidtid="";
var editdistrict="";
$(".managerplace").on("click",".edit",function(){
window.event.stopPropagation();
$(".newsave").css("display","none");
$(".editsave").css("display","block")
... ... @@ -981,26 +981,6 @@
place=data.place;
label=data.province+" "+data.city+" "+data.county+" ";
console.log(code_id);
//编辑地址（保存地址）
$(".editsave").click(function(){
window.event.stopPropagation();
// $(".addpositionwrapper").css("display","none");
name=$("#name").val();
phone=$("#phone").val();
place=$("#place").val();
localStorage.setItem("editname",name);
localStorage.setItem("editphone",phone);
localStorage.setItem("editplace",place)
//省市区的id
if(code==""){
code=code_id;
}else{
code=$("#end").attr("data-codes");
}
//省市区
label=$("#end").val();
//编辑地址（保存地址）
$(".editsave").click(function(){
window.event.stopPropagation();
... ... @@ -1060,24 +1040,11 @@
})
})
var editname=localStorage.getItem("editname");
var editphone=localStorage.getItem("editphone");
var editplace=localStorage.getItem("editplace")
var len=$(".default_list");
for(var i=0;i<len.length;i++){
if($(len[i]).children(".default_body").children(".default_type").children(".edit").children(".defauledi").attr("data-id")==eidtid){
$(len[i]).children(".manageraddress").children(".addresshead").children(".place").html(editplace);
$(len[i]).children(".manageraddress").children(".info").children(".name").html("editname");
$(len[i]).children(".manageraddress").children(".info").children(".telphone").html("editphone");
}
}
})
}else{
alert("保存失败")
}
})
... ... @@ -1088,10 +1055,11 @@
var name=$("#name").val();
var phone=$("#phone").val();
var place=$("#place").val();
var district=$("#end").val();
localStorage.setItem("newname",name);
localStorage.setItem("newphone",phone);
localStorage.setItem("newplace",place);
localStorage.setItem("district",district);
//省市区的id
var code=$("#end").attr("data-codes");
//省市区
... ... @@ -1134,13 +1102,14 @@
var newplace=localStorage.getItem("newplace");
var newname=localStorage.getItem("newname");
var newphone=localStorage.getItem("newphone")
var newphone=localStorage.getItem("newphone");
var newdistrict=localStorage.getItem("district");
var html='';
html+='<div class="default_list">' +
' <div class="manageraddress">' +
' <div class="addresshead">' +
'<p class="iconfont icon-dizhi"></p>' +
'<p class="place">'+newplace+'</p>' +
'<p class="place">'+newdistrict+" "+newplace+'</p>' +
'</div>' +
'<div class="info">' +
'<p class="name">'+newname+'</p>' +
... ... @@ -1183,14 +1152,14 @@
//删除地址
var del_id="";
var delid="";
$(".delect").click(function(){
$(".managerplace").on("click",".delect",function(){
window.event.stopPropagation();
$(".addresswrapper").show();
del_id=$(this).children(".defaultdel").attr("data-id");
delid=$(this).children(".defaultdel").attr("data-id");
$(".deletewrapper").show();
})
});
//删除确定
$(".sure").click(function(){
... ... @@ -1279,8 +1248,8 @@
}
})
$(".combine").click(function(){
$(".wrapper").css("display","block")
$(".combine").click(function(){
$(".wrapper").css("display","block")
})
$(".wrapper").click(function(){
$(this).css("display","none")
... ... @@ -1306,4 +1275,5 @@
})
</script>
</html>
... ...