fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 46791d13bb668bf0852d8f9d450bf1cf06076ff1 2 parents b3c29a49 5af4a34a

Merge branch 'release/4.8' of http://git.yoho.cn/fe/yohobuypc into release/4.8

Inline Side-by-side
Showing 10 changed files with 35 additions and 25 deletions
... ... @@ -2,6 +2,7 @@
<div class="order-ensure-page yoho-page clearfix">
{{# orderEnsure}}
<div class="order-edit">
<input type="hidden" id="recordMobileNumb" value="{{receiverMobile}}">
<div class="order-title">
<ul>
<li class="first">查看购物车</li>
... ...
... ... @@ -15272,7 +15272,7 @@ var $ = require("jquery"),
var address = require("js/order/address"),
receiptTitle = "个人",
receiptMobile = $('#input-mobile').val(),
receiptMobile = $('#recordMobileNumb').val(),
receiptMobileStar;
var dialog = require("js/common/dialog");
... ... @@ -16123,6 +16123,11 @@ $('.bag').find('ul').each(function() {
$invoiceCheck.click(function(){
receiptMobile = $('#recordMobileNumb').val(),
(function receiptMobileToStarString(numb) {
receiptMobileStar = numb.substr(0, 3) + '****' + numb.substr(7);
$('#input-mobile').val(receiptMobileStar);
}(receiptMobile));
if ($invoiceCheck.hasClass('active')) {
$invoiceCheck.removeAttr('checked');
$invoiceCheck.removeClass('active');
... ... @@ -16137,12 +16142,8 @@ $invoiceCheck.click(function(){
}
});
//电子发票
(function receiptMobileToStarString(numb) {
receiptMobileStar = numb.substr(0, 3) + '****' + numb.substr(7);
$('#input-mobile').val(receiptMobileStar);
}(receiptMobile));
//电子发票
function saveReceiptInfo() {
var passInfoVerify = true,
... ... @@ -16467,6 +16468,7 @@ exports.getUserAddressList = function() {
isHide = 'active address_select';
hasDefault++;
addressText = '默认地址';
$('#recordMobileNumb').val(addressData[i].completeMobile);
} else {
isChecked = '';
... ... @@ -16481,6 +16483,7 @@ exports.getUserAddressList = function() {
'" data-areaCode="' + addressData[i].areaCode +
'" data-addressDesc="' + addressData[i].addressDesc +
'" data-mobile="' + addressData[i].mobile +
'" data-completeMobile="' + addressData[i].completeMobile +
'" data-phoneNum="' + addressData[i].phoneNum +
'" data-phoneCode="' + addressData[i].phoneCode +
'" data-zipCode="' + addressData[i].zipCode +
... ... @@ -16721,7 +16724,6 @@ exports.saveAddress = function() {
var telCodeReg = /^[0-9]{3,5}$/;
var telReg = /^[0-9]{5,10}$/;
function hasText(val) {
if (val === telCode) {
... ... @@ -16752,7 +16754,7 @@ exports.saveAddress = function() {
.find('input[name="address"]').attr('checked', 'checked');
$('.address-list span').removeAttr('expand');
$('#recordMobileNumb').val($('.exist-address-list li.active input').attr('data-completemobile'));
refreshAddressStatus();
}
... ... @@ -16794,6 +16796,7 @@ exports.saveAddress = function() {
if (!!$saveBtn.attr('data-id')) {
postData.id = $saveBtn.attr('data-id');
}
$('#recordMobileNumb').val(phone);
$.ajax({
type: 'post',
... ... @@ -16922,7 +16925,6 @@ exports.saveAddress = function() {
};
// 支付及送货时间选择
$('.pay-time-modify .pay-btn').click(function() {
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -194,6 +194,7 @@ exports.getUserAddressList = function() {
isHide = 'active address_select';
hasDefault++;
addressText = '默认地址';
$('#recordMobileNumb').val(addressData[i].completeMobile);
} else {
isChecked = '';
... ... @@ -208,6 +209,7 @@ exports.getUserAddressList = function() {
'" data-areaCode="' + addressData[i].areaCode +
'" data-addressDesc="' + addressData[i].addressDesc +
'" data-mobile="' + addressData[i].mobile +
'" data-completeMobile="' + addressData[i].completeMobile +
'" data-phoneNum="' + addressData[i].phoneNum +
'" data-phoneCode="' + addressData[i].phoneCode +
'" data-zipCode="' + addressData[i].zipCode +
... ... @@ -448,7 +450,6 @@ exports.saveAddress = function() {
var telCodeReg = /^[0-9]{3,5}$/;
var telReg = /^[0-9]{5,10}$/;
function hasText(val) {
if (val === telCode) {
... ... @@ -479,7 +480,7 @@ exports.saveAddress = function() {
.find('input[name="address"]').attr('checked', 'checked');
$('.address-list span').removeAttr('expand');
$('#recordMobileNumb').val($('.exist-address-list li.active input').attr('data-completemobile'));
refreshAddressStatus();
}
... ... @@ -521,6 +522,7 @@ exports.saveAddress = function() {
if (!!$saveBtn.attr('data-id')) {
postData.id = $saveBtn.attr('data-id');
}
$('#recordMobileNumb').val(phone);
$.ajax({
type: 'post',
... ... @@ -649,7 +651,6 @@ exports.saveAddress = function() {
};
// 支付及送货时间选择
$('.pay-time-modify .pay-btn').click(function() {
... ...
... ... @@ -14,7 +14,7 @@ var $ = require('yoho.jquery'),
var address = require('./address'),
receiptTitle = "个人",
receiptMobile = $('#input-mobile').val(),
receiptMobile = $('#recordMobileNumb').val(),
receiptMobileStar;
var dialog = require('../common/dialog');
... ... @@ -865,6 +865,11 @@ $('.bag').find('ul').each(function() {
$invoiceCheck.click(function(){
receiptMobile = $('#recordMobileNumb').val(),
(function receiptMobileToStarString(numb) {
receiptMobileStar = numb.substr(0, 3) + '****' + numb.substr(7);
$('#input-mobile').val(receiptMobileStar);
}(receiptMobile));
if ($invoiceCheck.hasClass('active')) {
$invoiceCheck.removeAttr('checked');
$invoiceCheck.removeClass('active');
... ... @@ -879,12 +884,8 @@ $invoiceCheck.click(function(){
}
});
//电子发票
(function receiptMobileToStarString(numb) {
receiptMobileStar = numb.substr(0, 3) + '****' + numb.substr(7);
$('#input-mobile').val(receiptMobileStar);
}(receiptMobile));
//电子发票
function saveReceiptInfo() {
var passInfoVerify = true,
... ...
... ... @@ -141,6 +141,11 @@
.price {
color: #000;
}
p {
height: 30px;
overflow: hidden;
}
}
}
... ...
... ... @@ -429,7 +429,7 @@ class CartModel
*/
public static function getRecommendProduct($channel, $uid, $udid, $page)
{
$result = array('code' => 200, 'message' => '', 'data' => array('header' => '为你优选', 'hasPrev' => false, 'hasNext' => false, 'item' => array()));
$result = array('code' => 200, 'message' => '', 'data' => array('header' => '为您优选', 'hasPrev' => false, 'hasNext' => false, 'item' => array()));
do {
if (!is_numeric($page)) {
... ... @@ -500,9 +500,9 @@ class CartModel
$build['title'] = $value['product_name'];
$build['img'] = Helpers::getImageUrl($value['default_images'], 100, 100);
$build['alt'] = $value['product_name'];
$build['price'] = $value['price']['sales_price'];
if ($value['price']['sales_price'] !== $value['price']['market_price']) {
$build['marketPrice'] = $value['price']['market_price'];
$build['price'] = strstr(strval($value['sales_price']), '.') ? $value['sales_price'] : $value['sales_price'] . '.00';
if ($value['sales_price'] !== ['market_price']) {
$build['marketPrice'] = strstr(strval($value['market_price']), '.') ? $value['market_price'] : $value['market_price'] . '.00';
}
$result['data']['item'][] = $build;
... ... @@ -1009,7 +1009,7 @@ class CartModel
* @param int $redEnvelopes 红包
* @return array 接口返回的数据
*/
public static function orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceType, $invoiceTitle, $invoiceContent, $receiverMobile, $paymentId, $paymentType, $remark, $couponCode,$promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes)
public static function orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceType, $invoiceTitle, $invoiceContent, $receiverMobile, $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes)
{
$result = array('code' => 400, 'message' => self::ERROR_400_MESSAGE);
... ... @@ -1050,7 +1050,7 @@ class CartModel
$userAgent = isset($unionInfo['client_id']) ? 'YOHO!Buy/3.8.2.259(Model/PC;Channel/' . $unionInfo['client_id'] . ';uid/' . $uid . ')' : null;
}
$orderSubRes = CartData::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceType, $invoiceTitle, $invoiceContent, $receiverMobile, $paymentId, $paymentType, $remark, $couponCode,$promotionCode,$yohoCoin, $isPreContact, $isPrintPrice,$unionKey,$userAgent, $redEnvelopes);
$orderSubRes = CartData::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceType, $invoiceTitle, $invoiceContent, $receiverMobile, $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $unionKey, $userAgent, $redEnvelopes);
if ($orderSubRes && isset($orderSubRes['code'])) {
$result = $orderSubRes;
}
... ...
... ... @@ -52,7 +52,7 @@ class IndexController extends WebAction
default:
break;
}
// 为你优选 tar add 160701
// 为您优选 tar add 160701
$data['recommend'] = IndexModel::preferenceData($channelNum, $uid, $udid, '100004', 30);
//取消订单原因列表
... ...