fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit f8668b3058ff1449c0b1e565fdbb4df4e4642386 2 parents 9f24e6b1 a1636510

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 16 changed files with 48 additions and 32 deletions
... ... @@ -84,8 +84,8 @@
{{/ relatedGroup}}
</div>
</div>
<span class="btn-left iconfont hide">&#xe62c;</span>
<span class="btn-right iconfont">&#xe629;</span>
<span class="btn-left iconfont hide">&#xe64e;</span>
<span class="btn-right iconfont">&#xe64c;</span>
</div>
{{/ related}}
{{/ content}}
... ...
... ... @@ -96,6 +96,10 @@ const yohoCoinTotal = (uid)=> {
method: 'app.yoho.yohocoin',
uid: uid
}).then(result => {
if (!result.data.yohocoin_num || result.data.yohocoin_num === '') {
result.data.yohocoin_num = 0;
}
return result;
});
};
... ...
... ... @@ -345,7 +345,7 @@ const _setRefundDetailData = (data) => {
mode: data.return_amount_mode_name,
account: data.return_amount_mode_name,
amount: data.return_amount_total,
coin: data.use_yoho_coin_num
coin: parseInt(data.return_yoho_coin * 100, 10)
};
break;
case 91:
... ... @@ -719,6 +719,7 @@ const getExchangeDetailData = (id, uid) => {
returnsAPI.getExchangeDetail(id, uid),
returnsAPI.getExpressCompanyAsync()
]).then(result => {
console.log(result);
let exchangeData = {};
Object.assign(exchangeData, _setSideMenu('我的退/换货'));
... ...
... ... @@ -31,10 +31,10 @@
{{^}}
<div class="slide-switch">
<a class="prev" href="javascript:;">
<span class="iconfont">&#xe62c;</span>
<span class="iconfont">&#xe64e;</span>
</a>
<a class="next" href="javascript:;">
<span class="iconfont">&#xe629;</span>
<span class="iconfont">&#xe64c;</span>
</a>
</div>
<div class="slide-wrap">
... ...
... ... @@ -54,7 +54,7 @@
<p>退款方式：{{mode}}<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p>
<p class="tip-pad-top">退款账户：{{account}}</p>
<p class="tip-pad-top">金额：¥{{amount}}</p>
<p class="tip-pad-top">有货币：{{coin}}</p>
<p class="tip-pad-top">有货币：{{coin}}个</p>
</div>
{{/ refundSure}}
... ...
... ... @@ -8,7 +8,6 @@
const isProduction = process.env.NODE_ENV === 'production';
const isTest = process.env.NODE_ENV === 'test';
const isUseOneapm = process.env.USE_ONEAPM === 'true';
module.exports = {
app: 'web',
... ... @@ -23,10 +22,10 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
singleApi: 'http://single.yoho.cn/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://search.yohoops.org/yohosearch/'
},
useOneapm: false,
useCache: false,
... ... @@ -48,8 +47,7 @@ module.exports = {
name: 'error',
level: 'error',
filename: 'logs/error.log',
handleExceptions: true,
maxFiles: 7
handleExceptions: true
},
udp: { // send by udp
measurement: 'yohoblk_pc_log',
... ... @@ -101,7 +99,7 @@ if (isProduction) {
session: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
timeout: 3000
},
useOneapm: isUseOneapm,
useOneapm: true,
useCache: true,
pay: {
serviceNotify: 'http://service.yoho.cn/'
... ... @@ -111,10 +109,10 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: true,
useCache: true,
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
Created by FontForge 20120731 at Tue Aug 23 17:49:33 2016
By admin
</metadata>
<defs>
... ... @@ -16,10 +16,10 @@ Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
ascent="896"
descent="-128"
x-height="792"
bbox="0 -224 1303 896.303"
bbox="0 -224 1506 896.303"
underline-thickness="50"
underline-position="-100"
unicode-range="U+0078-E64D"
unicode-range="U+0078-E650"
/>
<missing-glyph horiz-adv-x="374"
d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
... ... @@ -108,9 +108,9 @@ q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31
t74 -31t31 -74z" />
<glyph glyph-name="uniE61B" unicode="&#xe61b;"
d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5z" />
<glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1093"
d="M1092 225v171q0 101 -39.5 193.5t-106.5 159.5t-160 107t-194 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h175q15 0 24.5 10t9.5 24v317q0 15 -9.5 24.5t-24.5 9.5h-128v116q0 88 34 168t92 137.5t138 92t168 34.5h67
q87 0 167 -34.5t138 -92t92 -137.5t34 -168v-113h-129q-15 0 -24.5 -10t-9.5 -25v-317q0 -14 9.5 -24t24.5 -10h175q14 0 24 10t10 24z" />
<glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1092"
d="M1092 226v170q0 101 -40 193.5t-107 159.5t-159.5 107t-193.5 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317q0 14 -10 24t-24 10h-130v116q0 87 34.5 167t92.5 138t138 92.5t167 34.5h67
q88 0 168 -34.5t138 -92.5t92 -138t34 -167v-113h-129q-14 0 -24 -10t-10 -24v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317z" />
<glyph glyph-name="uniE61D" unicode="&#xe61d;"
d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" />
<glyph glyph-name="uniE61E" unicode="&#xe61e;"
... ... @@ -254,9 +254,19 @@ d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5
t119 -118.5t164 -43.5t164.5 43.5t119 118.5t43.5 163.5t-43.5 163.5t-119 119t-164.5 44v0z" />
<glyph glyph-name="uniE64B" unicode="&#xe64b;"
d="M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z" />
<glyph glyph-name="uniE64C" unicode="&#xe64c;"
d="M327 -128q16 0 24 12l376 500l-373 500q-7 9 -20 11t-22 -5q-11 -6 -12.5 -19.5t6.5 -22.5l346 -464l-349 -464q-7 -9 -5 -22t11 -20q6 -6 18 -6z" />
<glyph glyph-name="uniE64D" unicode="&#xe64d;"
d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56q66 -59 66 -154q0 -43 -17 -79z" />
<glyph glyph-name="uniE64E" unicode="&#xe64e;"
d="M697 -128q-16 0 -24 12l-376 500l373 500q7 9 20 11t22 -5t11 -20t-5 -22l-346 -464l349 -467q7 -9 5 -22t-11 -20q-6 -3 -18 -3z" />
<glyph glyph-name="uniE64F" unicode="&#xe64f;"
d="M799 456l127 128v312h-51h-77h-574h-128v-445v-162v-2l421 -412l409 404v181l-415 -401l-287 283v426h574v-312h1zM671 519l-107 21l-53 101l-53 -101l-107 -21l75 -84l-14 -113l99 48l99 -48l-14 113z" />
<glyph glyph-name="uniE650" unicode="&#xe650;" horiz-adv-x="1506"
d="M885 540q-13 14 -31 22t-40 8t-39.5 -8t-30.5 -22t-20 -33t-7 -41q0 -23 7 -43t20 -33.5t30.5 -21.5t39.5 -8t39.5 8t30.5 21.5t20.5 33.5t7.5 43q0 22 -7.5 41t-19.5 33v0zM1084 896h-663q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -212v-602l261 181h823q115 0 212 56.5
t153.5 153.5t56.5 211.5t-56.5 211.5t-153.5 153.5t-212 56.5v0zM574 294h-82v142h-133v-142h-83v341h83v-129h133v129h82v-341v0zM986 392q-14 -34 -39 -57.5t-59 -37t-74 -13.5t-74 13t-59 37t-39 57.5t-14 74.5t14 74t39 56t59 35.5t74 12.5t74 -12.5t59 -35.5t39 -56
t14 -74t-14 -74zM1283 564h-97v-270h-82v270h-96v71h275v-71z" />
</font>
</defs></svg>
... ...
No preview for this file type
No preview for this file type
... ... @@ -66,4 +66,3 @@ $('#begin-time').on('change', function() {
beginTime = Bll.getTime(new Date(), months);
Bll.getDataList(type, page, beginTime);
});
... ...
... ... @@ -57,6 +57,7 @@ function setActive($item) {
var $colorList = $item.find('.color-list');
var $sizeList = $item.find('.size-list');
var activeIndex = 0;
$colorList.find('.img-box').each(function(i, box) {
var $box = $(box);
... ... @@ -64,10 +65,14 @@ function setActive($item) {
if ($box.find('img').data('color') === color) {
$colorList.find('.img-box').eq(i).addClass('active');
activeIndex = i;
return false;
}
});
$sizeList = $sizeList.eq(activeIndex).removeClass('hide');
$sizeList.find('span').each(function(i, s) {
var $size = $(s);
... ... @@ -276,7 +281,6 @@ function bindConfirmEvent() {
var $changeGood = $('.change-info-box.will-change');
var changeGoodsList = [];
var changeData = {};
var $specialReason = $changeGood.find('.special-reason');
var $imgs;
var imgs = [];
... ... @@ -294,6 +298,7 @@ function bindConfirmEvent() {
var $good = $(good);
var $c = $good.find('.goods-container');
var $f = $good.find('.form');
var $specialReason = $good.find('.special-reason');
goodObj.product_skn = $c.data('skn');
goodObj.product_skc = $c.data('skc');
... ...
... ... @@ -45,8 +45,8 @@ var $ = require('yoho-jquery'),
_createOrient: function() {
var orientHtml = '<div class="slide-switch">' +
'<a class="prev" href="javascript:;"><span class="iconfont">&#xe635;</span></a>' +
'<a class="next" href="javascript:;"><span class="iconfont">&#xe636;</span></a>' +
'<a class="prev" href="javascript:;"><span class="iconfont">&#xe64e;</span></a>' +
'<a class="next" href="javascript:;"><span class="iconfont">&#xe64c;</span></a>' +
'</div>';
if (this.$element.find('.slide-switch').length > 0) {
... ...
... ... @@ -123,7 +123,7 @@
height: 60px;
line-height: 60px;
text-align: center;
font-size: 16px;
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
... ...
... ... @@ -46,7 +46,7 @@
.cancel {
display: block;
width: 220px;
width: 240px;
height: 50px;
line-height: 50px;
font-size: 12px;
... ... @@ -244,7 +244,6 @@
width: 70px;
height: 70px;
margin-right: 10px;
}
span {
... ...
<div>
{{#goodsList}}
<div class="{{#unless @first}}hide{{/unless}} size-list" data-index="{{@index}}">
<div class="hide size-list" data-index="{{@index}}">
{{#sizeList}}
<span data-size="{{sizeName}}" data-sku="{{productSku}}" data-id="{{goodsId}}" {{#unless storageNumber}}class="disable"{{/unless}}>{{sizeName}}</span>
{{/sizeList}}
... ...