fe / yohobuywap-node · Commits

Go to a project

Authored by lijing
Commit 0d27f58779bc919a8d3a71829ebe1e2e28e9addb 1 parent e40ad82c

预约订单页显示bug

Inline Side-by-side
Showing 5 changed files with 114 additions and 26 deletions
... ... @@ -210,10 +210,13 @@ exports.travel = function(req, res, next) {
storeId: req.query.storeId,
activityType: 3,
isFront: req.query.isFront || req.cookies.isFront,
res: res
};
trendModel.travel(params).then((result) => {
res.cookie('travelId', result.travelId, {
domain: 'yohobuy.com',
path: '/'
});
res.render('trend/travel', Object.assign(responseData, result));
}).catch(next);
};
... ...
... ... @@ -346,9 +346,6 @@ const travelDetail = (params) => {
let resu = '';
Object.assign(params, {hairStylistId: result.data.id});
params.res.cookie('travelId', result.data.id, {
domain: 'yohobuy.com'
});
return Promise.all([
adviserList(params),
getDate2(params)
... ... @@ -366,7 +363,7 @@ const adviserList = (params) => {
storeId: params.storeId,
activityType: params.activityType,
id: params.id || '',
hairStylistId: params.hairStylistId || '',
hairStylistId: 8 || '',
isFront: params.isFront
}, {
cache: true,
... ... @@ -386,11 +383,12 @@ const travel = (params) => {
content: '',
adviser: [],
dateList: [],
storeId: params.storeId
storeId: params.storeId,
travelId: ''
};
if (result && result[0]) {
resu.travelId = result[0].id;
resu.content = result[0].tourDetail;
let build = [];
... ... @@ -990,8 +988,8 @@ const orderList = (params) => {
build.push({
name: val.activityName,
status: val.appointStatusStr,
createTime: _MYDHm(new Date(val.createTime * 1000)),
originTime: val.createTime,
createTime: _MYDHm(new Date(val.appointTime * 1000)),
originTime: val.appointTime,
id: val.id,
storeId: params.storeId
});
... ... @@ -1006,8 +1004,8 @@ const orderList = (params) => {
build.push({
name: val.activityName,
status: val.appointStatusStr,
createTime: _MYDHm(new Date(val.createTime * 1000)),
originTime: val.createTime,
createTime: _MYDHm(new Date(val.appointTime * 1000)),
originTime: val.appointTime,
id: val.id,
storeId: params.storeId
});
... ... @@ -1047,6 +1045,7 @@ const orderDetail = (params) => {
};
}
if (result[0] && result[0].data) {
console.log(result[0].data);
let appointContent = JSON.parse(result[0].data[0].appointContent);
resu.userInfo = {
babyName: appointContent.name,
... ... @@ -1055,6 +1054,7 @@ const orderDetail = (params) => {
userNote: result[0].data[0].userNote,
appointMobile: result[0].data[0].appointMobile,
appointTime: _MYDHm(new Date(result[0].data[0].appointTime * 1000)),
originTime: result[0].data[0].appointTime,
storeId: params.storeId,
activityId: result[0].data[0].activityId,
stylesName: result[0].data[0].stylesName,
... ... @@ -1062,7 +1062,10 @@ const orderDetail = (params) => {
status: result[0].data[0].appointStatusStr,
id: result[0].data[0].id,
showBtn: params.showBtn === 'true',
originUrl: result[0].data[0].url
originUrl: result[0].data[0].url,
personName: result[0].data[0].personName,
personId: result[0].data[0].personId,
num: result[0].data[0].appointPersonNum
};
}
}
... ...
... ... @@ -54,7 +54,7 @@
</a>
{{/ act}}
</div>
<div class="detail-list">
<div class="detail-list{{# adviser}} hide{{/ adviser}}">
<div class="list-item">
<div class="package-item">
<div class="top clearfix">
... ... @@ -81,12 +81,6 @@
<span class="iconfont icon-arr">&#xe604;</span>
</a>
{{/ photography}}
{{# adviser}}
<a href="//m.yohobuy.com/activity/trend/adviser?id={{id}}&typeStatus={{activityType}}&storeId={{storeId}}" class="order-a">
<span class="big">查看顾问详情</span>
<span class="iconfont icon-arr">&#xe604;</span>
</a>
{{/ adviser}}
{{# act}}
<a href="//m.yohobuy.com/activity/trend/act-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status=1&storeId={{storeId}}" class="order-a">
<span class="big">查看活动详情</span>
... ... @@ -94,7 +88,7 @@
</a>
{{/ act}}
{{# class}}
<a href="//m.yohobuy.com/activity/trend/act-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status=1&storeId={{storeId}}" class="order-a">
<a href="//m.yohobuy.com/activity/trend/class-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status=1&storeId={{storeId}}" class="order-a">
<span class="big">查看课堂详情</span>
<span class="iconfont icon-arr">&#xe604;</span>
</a>
... ... @@ -105,12 +99,30 @@
<div class="detail-list">
{{# userInfo}}
<div class="list-item padding">
{{#if ../adviserDetail/adviser}}
<div class="chosen chosen-detail">
<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" />
<span class="iconfont icon-arr">&#xe604;</span>
</a>
</div>
{{/if}}
{{#if ../adviserDetail/kidStyle}}
<div class="chosen chosen-detail">
<a class="chose-item select" href="//m.yohobuy.com/activity/trend/cutter?storeId={{../adviserDetail/storeId}}&id={{../userInfo/personId}}&typeStatus={{../adviserDetail/activityType}}&cutterName={{../userInfo/personName}}">
<span class="label">发型师</span>
<input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" />
<span class="iconfont icon-arr">&#xe604;</span>
</a>
</div>
{{/if}}
{{#if stylesName}}
<p class="tip-top">风格</p>
<p class="tip-main">{{stylesName}}</p>
{{/if}}
<p class="tip-top">预约时间</p>
<p class="tip-main"><span id="detail-time">{{appointTime}}</span>
<p class="tip-main"><span id="detail-time" date="{{originTime}}">{{appointTime}}</span>
{{#if showBtn}}
<a class="chan-btn" id={{id}} href="//m.yohobuy.com/activity/trend/chosen-time?storeId={{storeId}}&activityId={{activityId}}&typeStatus={{typeStatus}}&chosenType=2&order=true">更改</a>
{{/if}}
... ... @@ -120,7 +132,7 @@
</div>
<div class="detail-list">
{{# userInfo}}
<div class="list-item padding">
<div class="list-item padding detail-info">
<div>
<span class="tip-top">{{#if babyAge}}宝宝{{/if}}姓名：</span>
<span class="tip-main">{{babyName}}</span>
... ... @@ -138,13 +150,19 @@
</div>
{{/if}}
<div>
<span class="tip-top">手机号码：</span>
<span class="tip-top">手机{{#if babyAge}}号码{{/if}}：</span>
<span class="tip-main">{{appointMobile}}</span>
</div>
<div>
<span class="tip-top">人数：</span>
<span class="tip-main">{{num}}</span>
</div>
{{#if userNote}}
<div>
<span class="tip-top">备注：</span>
<span class="tip-main">{{userNote}}</span>
</div>
{{/ if}}
</div>
{{/ userInfo}}
</div>
... ...
... ... @@ -278,6 +278,8 @@ $(
},
success: function(result) {
if (result.code === 200) {
window.setCookie('detailtTimeStr', '');
window.location.href = window.location.href;
// tip.show('修改成功');
} else {
// tip.show(result.message);
... ... @@ -435,8 +437,8 @@ $(
diaLog.showDialog({
dialogText: '确认取消预约吗？',
hasFooter: {
leftBtnText: '取消',
rightBtnText: '确定'
leftBtnText: '我再想想',
rightBtnText: '确认取消'
}
},function() {
$.ajax({
... ... @@ -457,7 +459,8 @@ $(
});
});
// 修改弹框样式
$('.tap-hightlight').css('color', '#007aff');
$('.dialog-left-btn').css('color', '#999');
$('.dialog-right-btn').css('color', '#007aff');
});
// 加减人数按钮
... ... @@ -592,9 +595,52 @@ $(
$('.time-nav ul').find('.nav-item:eq(2)').addClass('active');
getTimeList();
}
if ($('.order-item').length > 0) {
$('.order-item').each(
function() {
var time = $(this).find('.time').attr('date') * 1000;
var weekTime = formatDate(time);
$(this).find('.time').html(weekTime);
}
);
}
if ($('#detail-time').length > 0) {
var time = $('#detail-time').attr('date') * 1000;
var weekTime = formatDate(time);
$('#detail-time').html(weekTime);
}
}
);
function formatDate(time) {
var week = new Array('周一', '周二', '周三', '周四', '周五', '周六', '周日');
var time = new Date(time);
var year = time.getYear();
if (year < 1900) {
year = year + 1900;
}
var month = time.getMonth() + 1;
if (month < 10) {
month = '0' + month;
}
var date = time.getDate();
if (date < 10) {
date = '0' + date;
}
var day = time.getDay();
var hour = time.getHours();
if (hour < 10) {
hour = '0' + hour;
}
var minutes = time.getMinutes();
if (minutes < 10) {
minutes = '0' + minutes;
}
return year + '年' + month + '月' + date + '日' + ' ' + week[day-1] + ' ' + hour + ':' + minutes;
}
function autoScroll (thisPo) {
$navUl.find('.nav-item:eq(' + thisPo + ')').addClass('active').siblings('li').removeClass('active');
if (thisPo >= 2) {
... ...
... ... @@ -491,6 +491,7 @@
margin-bottom: 30px;
.chose-item {
display: block;
line-height: 88px;
border-bottom: solid 1px #e0e0e0;
padding: 0 30px;
... ... @@ -1436,4 +1437,21 @@
color: #444;
}
}
.chosen-detail {
.label {
color: #b0b0b0 !important;
}
.chose-item {
padding: 0;
}
}
.detail-info {
div {
height: 50px;
line-height: 50px;
}
}
}
\ No newline at end of file
... ...