|
|
@@ -24,10 +24,10 @@
|
|
|
<body>
|
|
|
<div>
|
|
|
<!--头部选项卡-->
|
|
|
- <div id="pro-top-menu" class="mui-segmented-control">
|
|
|
+ <div id="pro-top-menu" class="mui-segmented-control sales_transportation_type">
|
|
|
<!--(默认选中哪个就加上mui-active)，其他不加-->
|
|
|
- <a class="mui-control-item mui-active" href="#item1">邮寄</a>
|
|
|
- <a class="mui-control-item" href="#item2">自提</a>
|
|
|
+ <a class="mui-control-item mui-active " val="1" href="#item1">邮寄</a>
|
|
|
+ <a class="mui-control-item " val="2" href="#item2">自提</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="mui-content" style="padding-bottom: 56px;">
|
|
|
@@ -63,15 +63,15 @@
|
|
|
<div class="mui-content-padded">
|
|
|
<form class="mui-input-group no-line">
|
|
|
<div class="mui-input-row line">
|
|
|
- <label><span class="iconfont icon-dingwei" style="font-size: 16px;margin-right: 8px;"></span>自提点：</label>
|
|
|
+ <label style="width: 100%;"><span class="iconfont icon-dingwei" style="font-size: 16px;margin-right: 8px;"></span>自提点：<span id="selfAddressName"></span></label>
|
|
|
</div>
|
|
|
<div class="mui-input-row line">
|
|
|
<label style="width: 25%;">姓名信息</label>
|
|
|
- <input style="width: 75%;" type="text" maxlength="8" placeholder="请输入您的姓名">
|
|
|
+ <input style="width: 75%;" id="selfLifting-addressName" value="" type="text" maxlength="8" placeholder="请输入您的姓名">
|
|
|
</div>
|
|
|
<div class="mui-input-row line">
|
|
|
<label style="width: 25%;">手机号码</label>
|
|
|
- <input style="width: 75%;" type="tel" maxlength="11" placeholder="请输入手机号码">
|
|
|
+ <input style="width: 75%;" id="selfLifting-addressTel" value="" type="tel" maxlength="11" placeholder="请输入手机号码">
|
|
|
</div>
|
|
|
<div class="mui-input-row">
|
|
|
<label style="width: 100%;padding: 11px 0;"><h6>（请确认信息，如您在自提现场，请咨询工作人员）</label>
|
|
|
@@ -125,7 +125,7 @@
|
|
|
<script src="js/mui.min.js"></script>
|
|
|
<script src="js/jquery-2.1.1.min.js"></script>
|
|
|
<script src="js/main.js"></script>
|
|
|
- <script src="js/wechat-utils-1.0.js"></script>
|
|
|
+ <script src="js/wechat-utils-1.0.js"></script>
|
|
|
<script>
|
|
|
window.addEventListener('pageshow', function(e) {
|
|
|
// 通过persisted属性判断是否存在 BF Cache
|
|
|
@@ -150,6 +150,8 @@
|
|
|
var orderItem; //获取订单项信息
|
|
|
var couponMoney = 0; //新人卷 - 优惠金额
|
|
|
|
|
|
+ var isAllSelfLiftin = 1; //是否能够自提,默认能够
|
|
|
+
|
|
|
var channelType = getParam("channelType"); //渠道类型
|
|
|
var channelId = getParam("channelId"); //渠道id
|
|
|
if(channelType == null || channelId == null ){
|
|
|
@@ -235,7 +237,15 @@
|
|
|
proCount += num;
|
|
|
var total = (num * this.productPrice / 100).toFixed(2); //购物车小计,单位分，保留两位小数
|
|
|
var productId = this.cartProductId;
|
|
|
+
|
|
|
+ /* 如果为自提，将说明 */
|
|
|
+ var selfDesc = "";
|
|
|
+ if(this.isSelfLifting != 1){
|
|
|
+ selfDesc = "(提示：该产品不支持自提)";
|
|
|
+ isAllSelfLiftin = 2;
|
|
|
+ }
|
|
|
liNote += '<div class="mui-table"><div class="mui-table-cell mui-col-xs-5"><img class="mui-media-object wh-100" src="' + this.productIntroduceImg + '"></div><div class="mui-table-cell table-middle mui-col-xs-7" style="line-height:2.5">' + this.productName + '<h6>颜色：' + this.productColor + '<span class="center">数量：' + num + '</span></h6><div>单价¥' + (this.productPrice / 100).toFixed(2) + '</div></div></div>';
|
|
|
+ liNote += '<div class="cl-red">'+ selfDesc +'</div>';
|
|
|
});
|
|
|
var $productListUl = $(".shopping-cart-list");
|
|
|
$productListUl.empty();
|
|
|
@@ -256,6 +266,11 @@
|
|
|
wechatAddr.userName = dt.data.addressInfo.salesAddressName;
|
|
|
wechatAddr.userTel = dt.data.addressInfo.salesAddressTel;
|
|
|
wechatAddr.postalCode = dt.data.addressInfo.salesAddressPostnum;
|
|
|
+
|
|
|
+ /* 给自提姓名电话赋值 */
|
|
|
+ $("#selfLifting-addressName").val(dt.data.addressInfo.salesAddressName);
|
|
|
+ $("#selfLifting-addressTel").val(dt.data.addressInfo.salesAddressTel);
|
|
|
+ $("#selfAddressName").html(dt.data.channelName);
|
|
|
}else{
|
|
|
wechatAddr.status = false;
|
|
|
}
|
|
|
@@ -421,6 +436,46 @@
|
|
|
});
|
|
|
// 去支付
|
|
|
$(document).on('tap', '#go-pay', function() {
|
|
|
+
|
|
|
+ var addressName,addressTel;
|
|
|
+ var salesTransportationType = 1; //邮寄
|
|
|
+
|
|
|
+ var val = $(".sales_transportation_type").find(".mui-active").eq(0).attr("val");
|
|
|
+ if(parseInt(val) == 2){
|
|
|
+ salesTransportationType = 2; //自提
|
|
|
+ if(isAllSelfLiftin != 1){
|
|
|
+ mui.toast("当前订单中有无法自提的物品，请重新选择商品！");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 给自提姓名电话赋值 */
|
|
|
+ addressName = $("#selfLifting-addressName").val();
|
|
|
+ addressTel = $("#selfLifting-addressTel").val();
|
|
|
+ if(addressName == null || addressName == ""){
|
|
|
+ mui.toast("请填写您的姓名");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ var chinese_rsg = /^[\u4e00-\u9fa5]+$/;
|
|
|
+ if(!chinese_rsg.test(addressName)){
|
|
|
+ mui.toast("请正确填写您的姓名！");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(addressName.length > 10){
|
|
|
+ mui.toast("请正确填写您的姓名！");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(addressTel == null || addressTel == ""){
|
|
|
+ mui.toast("请填写您的电话号码");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ salesTransportationType = 1;
|
|
|
+ addressName = wechatAddr.userName;
|
|
|
+ addressTel = wechatAddr.userTel;
|
|
|
+ }
|
|
|
|
|
|
var remark = $("#textarea").val();
|
|
|
|
|
|
@@ -444,8 +499,8 @@
|
|
|
var dataArgs = {
|
|
|
"orderAddressInfo": wechatAddr.detailInfo,
|
|
|
"orderAddressPostNum": wechatAddr.postalCode,
|
|
|
- "orderAddressMoblie": wechatAddr.userTel,
|
|
|
- "orderAddressName": wechatAddr.userName,
|
|
|
+ "orderAddressMoblie":addressTel,
|
|
|
+ "orderAddressName": addressName,
|
|
|
"cartIdStr": cartIdStr
|
|
|
};
|
|
|
if(yhq_id != '') {
|
|
|
@@ -457,6 +512,7 @@
|
|
|
dataArgs["isCustomize"] = 1;
|
|
|
dataArgs["channelType"] = channelType;
|
|
|
dataArgs["channelId"] = channelId;
|
|
|
+ dataArgs["salesTransportationType"] = salesTransportationType;
|
|
|
$.ajax(base_path + '/wechat/order/pay', { // 提交订单,准备支付
|
|
|
data: dataArgs,
|
|
|
dataType: 'json',
|
