fe / yohobuywap-node · Commits

Go to a project

Authored by lijing
Commit 083c1ccd98c3ff569a9aa798b6a1a095f5dfcae0 1 parent e5244834

test1测试

Inline Side-by-side
Showing 9 changed files with 42 additions and 8 deletions
... ... @@ -28,6 +28,7 @@ exports.store = function(req, res, next) {
let params = {
storeId: req.query.storeId,
id: req.query.id,
isFront: req.query.isFront || req.cookies.isFront
};
... ...
... ... @@ -76,7 +76,7 @@ const storeInfo = (params) => {
const storeSon = (params) => {
return service.get('MenuConfigController/getChildrenNodeById', {
storeId: params.storeId,
id: 0,
id: params.id,
isFront: params.isFront
}, {
cache: true,
... ... @@ -391,7 +391,7 @@ const travel = (params) => {
travelId: ''
};
if (result && result[0]) {
if (result && result[0] && result[0].advisersList) {
resu.travelId = result[0].id;
resu.content = result[0].tourDetail;
... ... @@ -1114,6 +1114,11 @@ const orderDetail = (params) => {
startTime: newResult.data.activityDayStartTime,
endTime: newResult.data.activityDayEndTime
};
} else {
adviserDetail = {
adviser: true,
hideAd: true
}
}
resu = Object.assign(resu, {adviserDetail: adviserDetail});
return resu;
... ...
... ... @@ -6,7 +6,9 @@
{{# list}}
{{> trend/activity}}
{{/ list}}
{{#if oldList}}
<div class="big-title-2">精彩回顾</div>
{{/if}}
{{# oldList}}
{{> trend/activity}}
{{/ oldList}}
... ...
... ... @@ -119,9 +119,10 @@
我已阅读
<a href="http://m.yohobuy.com/activity/trend/need-know">
{{# classChosen}}潮流课堂{{/ classChosen}}
{{# adviserChosen}}潮流之旅{{/ adviserChosen}}
{{# babyName}}潮童造型{{/ babyName}}
{{# actChosen}}活动{{/ actChosen}}
{{# adviserChosen}}潮流之旅{{/ adviserChosen}}
{{# styleChosen}}儿童摄影{{/ styleChosen}}
{{# cutterChosen}}潮童造型{{/ cutterChosen}}
预约须知
</a>
</div>
... ...
... ... @@ -3,7 +3,27 @@
<div class="package-c">
<ul class="package">
{{# packageChosen}}
{{> trend/package}}
<li class="package-item">
<div class="top clearfix">
<div class="name">{{name}}</div>
<div class="price">
{{#if free}}
免费
{{else}}
<span>¥</span>{{price}}
{{/if}}
</div>
</div>
<div class="main">
<p>{{{summary}}}</p>
</div>
{{# foot}}
<div class="foot">
<input type="radio" name="package" class="diy" data="{{name}}" id="{{id}}" limit="{{limit}}" styleId="{{styleId}}" />
选择套餐
</div>
{{/ foot}}
</li>
{{/ packageChosen}}
</ul>
</div>
... ...
... ... @@ -6,7 +6,9 @@
{{# list}}
{{> trend/class}}
{{/ list}}
{{#if oldList}}
<div class="big-title-2">精彩回顾</div>
{{/if}}
{{# oldList}}
{{> trend/class}}
{{/ oldList}}
... ...
... ... @@ -65,7 +65,9 @@
{{#if free}}
免费
{{else}}
{{#if price}}
<span>¥</span>{{price}}
{{/if}}
{{/if}}
</div>
</div>
... ... @@ -102,7 +104,7 @@
{{# userInfo}}
<div class="list-item padding">
{{#if ../adviserDetail/adviser}}
<div class="chosen chosen-detail">
<div class="chosen chosen-detail{{#if ../adviserDetail/hideAd}} hide{{/if}}">
<a class="chose-item select" href="//m.yohobuy.com/activity/trend/adviser?id={{../adviserDetail/id}}&typeStatus={{../adviserDetail/activityType}}&storeId={{../adviserDetail/storeId}}">
<span class="label">潮流顾问</span>
<input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" />
... ...
... ... @@ -18,7 +18,7 @@ module.exports = {
testCode: 'yoho4946abcdef#$%&!@',
domains: {
api: 'http://api-test3.yohops.com:9999/',
service: 'http://192.168.102.47:8080/portal-gateway/',
service: 'http://service-test3.yohops.com:9999/',
liveApi: 'http://testapi.live.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/',
imSocket: 'ws://im.yohobuy.com:10240',
... ... @@ -26,7 +26,7 @@ module.exports = {
imServer: 'http://im.yohobuy.com/server'
// api: 'http://api.yoho.cn/',
// service: 'http://192.168.102.210:8080/portal-gateway/',
// service: 'http://service.yoho.cn/',
// liveApi: 'http://api.live.yoho.cn/',
// singleApi: 'http://single.yoho.cn/',
// imSocket: 'wss://imsocket.yohobuy.com:443',
... ...
... ... @@ -409,6 +409,7 @@ $(
window.setCookie('chosenPackage', $('.package-detail').find('.name').text());
window.setCookie('packageLimit', $('.package-detail').find('.limit').val());
window.setCookie('packageStyle', $('.package-detail').find('.styleid').val());
window.setCookie('packageId', window.queryString.id);
}
// 立即预约按钮
... ...