|
...
|
...
|
@@ -8,7 +8,6 @@ |
|
|
|
|
|
|
|
const service = global.yoho.ServiceAPI;
|
|
|
|
const moment = require('moment');
|
|
|
|
const helpers = global.yoho.helpers;
|
|
|
|
|
|
|
|
// 格式年月日
|
|
|
|
const _formatDay = (day) => {
|
|
...
|
...
|
@@ -52,7 +51,7 @@ const _HM = (day) => { |
|
|
|
|
|
|
|
// 资讯列表
|
|
|
|
const info = (params) => {
|
|
|
|
return service.get('InformationController/getFrontAllList', {
|
|
|
|
return service.get('InformationController/getFrontMainPushList', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
...
|
...
|
@@ -134,7 +133,12 @@ const articleDetail = (params) => { |
|
|
|
let resu = {};
|
|
|
|
|
|
|
|
if (result && result.data) {
|
|
|
|
resu = result.data;
|
|
|
|
resu = {
|
|
|
|
coverUrl: result.data.coverUrl,
|
|
|
|
titles: result.data.title,
|
|
|
|
summary: result.data.summary,
|
|
|
|
content: result.data.content
|
|
|
|
};
|
|
|
|
}
|
|
|
|
return resu;
|
|
|
|
});
|
|
...
|
...
|
@@ -189,7 +193,7 @@ const oldList = (params) => { |
|
|
|
if (result && result.data) {
|
|
|
|
resu = result.data;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return resu;
|
|
|
|
});
|
|
|
|
};
|
|
...
|
...
|
@@ -243,7 +247,7 @@ const classActList = (params) => { |
|
|
|
startTime: val.activityDayStartTime,
|
|
|
|
endTime: val.activityDayEndTime,
|
|
|
|
free: val.isFree === 1,
|
|
|
|
price: helpers.round(val.price, 0),
|
|
|
|
price: val.price,
|
|
|
|
needApo: val.isAppointment === 1,
|
|
|
|
apoStatus: val.appointStatus === 1,
|
|
|
|
id: val.id,
|
|
...
|
...
|
@@ -282,10 +286,13 @@ const classActList = (params) => { |
|
|
|
startTime: val.activityDayStartTime,
|
|
|
|
endTime: val.activityDayEndTime,
|
|
|
|
end: true,
|
|
|
|
free: true,
|
|
|
|
|
|
|
|
// free: true,
|
|
|
|
id: val.id,
|
|
|
|
status: status,
|
|
|
|
storeId: params.storeId
|
|
|
|
storeId: params.storeId,
|
|
|
|
free: val.isFree === 1,
|
|
|
|
price: val.price,
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
...
|
...
|
@@ -327,6 +334,58 @@ const classActDetail = (params) => { |
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 获取日期，星期(所有潮流顾问， 发型师详情页)
|
|
|
|
const getDate2 = (params) => {
|
|
|
|
return service.get('ActivityConfigController/getAppointDateForTour', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
hairStylistId: params.id || '',
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 获取日期，星期
|
|
|
|
const getDate = (params) => {
|
|
|
|
let apiUrl = 'ActivityConfigController/getAppointInfoById';
|
|
|
|
|
|
|
|
if (!params.activityId && (params.activityType === '3')) {
|
|
|
|
params.activityId = params.travelId;
|
|
|
|
params.activityType = 6;
|
|
|
|
} else if (!params.activityId && (params.activityType !== '3')) {
|
|
|
|
apiUrl = 'ActivityConfigController/getAllAppointDate';
|
|
|
|
}
|
|
|
|
return service.get(apiUrl, {
|
|
|
|
storeId: params.storeId,
|
|
|
|
activityId: params.activityId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 潮流顾问，发型师套餐列表
|
|
|
|
const adviserList = (params) => {
|
|
|
|
return service.get('ActivityConfigController/getActivityList', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
id: params.id || '',
|
|
|
|
hairStylistId: params.hairStylistId || '',
|
|
|
|
isFront: params.isFront,
|
|
|
|
filter: params.filter || '',
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 潮流之旅详情
|
|
|
|
const travelDetail = (params) => {
|
|
|
|
return service.get('MenuConfigController/getFrontMainTour', {
|
|
...
|
...
|
@@ -354,21 +413,6 @@ const travelDetail = (params) => { |
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 潮流顾问，发型师套餐列表
|
|
|
|
const adviserList = (params) => {
|
|
|
|
return service.get('ActivityConfigController/getActivityList', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
id: params.id || '',
|
|
|
|
hairStylistId: params.hairStylistId || '',
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 潮流之旅
|
|
|
|
const travel = (params) => {
|
|
|
|
return Promise.all([
|
|
...
|
...
|
@@ -405,12 +449,14 @@ const travel = (params) => { |
|
|
|
let build2 = [];
|
|
|
|
|
|
|
|
for (let item in result[0].dateList) {
|
|
|
|
build2.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[0].dateList[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
if (item) {
|
|
|
|
build2.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[0].dateList[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
resu.dateList = build2;
|
|
|
|
}
|
|
...
|
...
|
@@ -449,6 +495,8 @@ const adviser = (params) => { |
|
|
|
name: result[0].data.activityName,
|
|
|
|
summary: result[0].data.summary,
|
|
|
|
image: result[0].data.image,
|
|
|
|
isCanAppoint: result[0].data.isCanAppoint === 1,
|
|
|
|
storeId: params.storeId
|
|
|
|
};
|
|
|
|
|
|
|
|
resu.content = result[0].data.detail;
|
|
...
|
...
|
@@ -459,12 +507,14 @@ const adviser = (params) => { |
|
|
|
if (result && result[1] && result[1].data) {
|
|
|
|
|
|
|
|
for (let item in result[1].data) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[1].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
if (item) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[1].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resu.dateList = build;
|
|
...
|
...
|
@@ -499,37 +549,6 @@ const getStyle = (params) => { |
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 获取日期，星期
|
|
|
|
const getDate = (params) => {
|
|
|
|
if (!params.activityId) {
|
|
|
|
params.activityId = params.travelId;
|
|
|
|
params.activityType = 6;
|
|
|
|
}
|
|
|
|
return service.get('ActivityConfigController/getAppointInfoById', {
|
|
|
|
activityId: params.activityId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 获取日期，星期(所有潮流顾问， 发型师详情页)
|
|
|
|
const getDate2 = (params) => {
|
|
|
|
return service.get('ActivityConfigController/getAppointDateForTour', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
activityType: params.activityType,
|
|
|
|
hairStylistId: params.id || '',
|
|
|
|
isFront: params.isFront
|
|
|
|
}, {
|
|
|
|
code: 200
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 获取风格热推
|
|
|
|
const getStylePush = (params) => {
|
|
|
|
return service.get('MenuConfigController/getFrontMenuPhotoStyle', {
|
|
...
|
...
|
@@ -545,17 +564,20 @@ const getStylePush = (params) => { |
|
|
|
|
|
|
|
// 获取时间列表
|
|
|
|
const getTimeList = (params) => {
|
|
|
|
if (!params.activityId) {
|
|
|
|
params.activityId = params.travelId;
|
|
|
|
params.appointType = 6;
|
|
|
|
}
|
|
|
|
|
|
|
|
let ajaxUrl = '';
|
|
|
|
|
|
|
|
if (params.userId) {
|
|
|
|
ajaxUrl = 'ActivityConfigController/getAppointTimeForTour';
|
|
|
|
if (!params.activityId && (params.appointType !== '3')) {
|
|
|
|
ajaxUrl = 'ActivityConfigController/getAllAppointTime';
|
|
|
|
} else {
|
|
|
|
ajaxUrl = 'AppointmentController/getAppointTime';
|
|
|
|
if (!params.activityId) {
|
|
|
|
params.activityId = params.travelId;
|
|
|
|
params.appointType = 6;
|
|
|
|
}
|
|
|
|
if (params.userId) {
|
|
|
|
ajaxUrl = 'ActivityConfigController/getAppointTimeForTour';
|
|
|
|
} else {
|
|
|
|
ajaxUrl = 'AppointmentController/getAppointTime';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return service.get(ajaxUrl, {
|
|
...
|
...
|
@@ -579,13 +601,15 @@ const getTimeList = (params) => { |
|
|
|
|
|
|
|
if (result && result.data && result.data.timeMap) {
|
|
|
|
for (let item in result.data.timeMap) {
|
|
|
|
build.push({
|
|
|
|
time: _HM(new Date(item * 1000)),
|
|
|
|
originTime: item,
|
|
|
|
use: result.data.timeMap[item],
|
|
|
|
date2: _MDHm(new Date(item * 1000)),
|
|
|
|
date: _MYDHm(new Date(item * 1000)),
|
|
|
|
});
|
|
|
|
if (item) {
|
|
|
|
build.push({
|
|
|
|
time: _HM(new Date(item * 1000)),
|
|
|
|
originTime: item,
|
|
|
|
use: result.data.timeMap[item],
|
|
|
|
date2: _MDHm(new Date(item * 1000)),
|
|
|
|
date: _MYDHm(new Date(item * 1000)),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
resu.appointNum = result.data.appointNum;
|
|
|
|
resu.getTimeList = build;
|
|
...
|
...
|
@@ -616,7 +640,7 @@ const photography = (params) => { |
|
|
|
if (result) {
|
|
|
|
if (result[0] && result[0].data) {
|
|
|
|
resu.detail = {
|
|
|
|
bigPic: result[0].data.mainPushUrl
|
|
|
|
bigPic: result[0].data.pictureUrl.split(',')[0]
|
|
|
|
};
|
|
|
|
resu.content = result[0].data.detail;
|
|
|
|
}
|
|
...
|
...
|
@@ -697,7 +721,7 @@ const packageDetail = (params) => { |
|
|
|
limit: result[0].data.styleNumber,
|
|
|
|
styleId: result[0].data.styleList
|
|
|
|
};
|
|
|
|
resu.isAppointment = result[0].data.isAppointment === 1;
|
|
|
|
resu.isAppointment = result[0].data.isCanAppoint === 1;
|
|
|
|
resu.content = result[0].data.detail;
|
|
|
|
}
|
|
|
|
|
|
...
|
...
|
@@ -720,6 +744,7 @@ const styleDetail = (params) => { |
|
|
|
|
|
|
|
if (result && result[0] && result[0].data && result[0].data[0]) {
|
|
|
|
resu.introduction = result[0].data[0].introduction;
|
|
|
|
resu.sharePic = result[0].data[0].styleImage;
|
|
|
|
resu.picList = result[0].data[0].styleDemo.split(',');
|
|
|
|
resu.picList.forEach(val => {
|
|
|
|
bulid.push({
|
|
...
|
...
|
@@ -753,7 +778,7 @@ const appointment = (params) => { |
|
|
|
babyName: params.activityType === '4' || params.activityType === '5',
|
|
|
|
classChosen: params.activityType === '1',
|
|
|
|
actChosen: params.activityType === '2',
|
|
|
|
hideChosen: params.activityType === '3' ? false : true,
|
|
|
|
// hideChosen: params.activityType === '3' ? false : true,
|
|
|
|
};
|
|
|
|
|
|
|
|
if (result && result[0] && result[0].data) {
|
|
...
|
...
|
@@ -846,12 +871,14 @@ const chosenTime = (params) => { |
|
|
|
if (result && result[0] && result[0].data) {
|
|
|
|
|
|
|
|
for (let item in result[0].data) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[0].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
if (item) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[0].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resu.dateList = build;
|
|
...
|
...
|
@@ -861,10 +888,21 @@ const chosenTime = (params) => { |
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 不选发型师价格
|
|
|
|
const cutterPrice = (params) => {
|
|
|
|
return service.get('ActivityConfigController/getMinTimeStylistPrice', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
isFront: params.isFront
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
// 选择发型师
|
|
|
|
const chosenCutter = (params) => {
|
|
|
|
return Promise.all([
|
|
|
|
cutterList(params),
|
|
|
|
cutterList(params), // eslint-disable-line
|
|
|
|
cutterPrice(params),
|
|
|
|
]).then(result => {
|
|
|
|
|
|
|
|
let resu = {};
|
|
...
|
...
|
@@ -882,11 +920,15 @@ const chosenCutter = (params) => { |
|
|
|
radio: true,
|
|
|
|
arr: false,
|
|
|
|
free: val.minPrice === -1,
|
|
|
|
noPackage: val.minPrice === null
|
|
|
|
noPackage: val.minPrice === null,
|
|
|
|
id: val.id
|
|
|
|
});
|
|
|
|
});
|
|
|
|
resu.cutterList = build;
|
|
|
|
}
|
|
|
|
if (result[1]) {
|
|
|
|
resu.minPrice = result[1].data;
|
|
|
|
}
|
|
|
|
|
|
|
|
return resu;
|
|
|
|
});
|
|
...
|
...
|
@@ -963,13 +1005,15 @@ const orderList = (params) => { |
|
|
|
let params2 = params;
|
|
|
|
|
|
|
|
return Promise.all([
|
|
|
|
orderList1(Object.assign(params1, {statusList: '1,2'})),
|
|
|
|
orderList1(Object.assign(params2, {statusList: '3,4'}))
|
|
|
|
orderList1(Object.assign(params1, {statusList: '1'})),
|
|
|
|
orderList1(Object.assign(params2, {statusList: '2,3,4'})),
|
|
|
|
storeInfo(params)
|
|
|
|
]).then(result => {
|
|
|
|
|
|
|
|
let resu = {
|
|
|
|
list1: [],
|
|
|
|
list2: [],
|
|
|
|
storeInfo: {},
|
|
|
|
noOrder: false
|
|
|
|
};
|
|
|
|
|
|
...
|
...
|
@@ -1011,6 +1055,14 @@ const orderList = (params) => { |
|
|
|
resu.list2 = build;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result[2] && result[2].data) {
|
|
|
|
resu.storeInfo = {
|
|
|
|
name: result[2].data.storeName,
|
|
|
|
introduction: result[2].data.introduction,
|
|
|
|
pictureUrl: result[2].data.pictureUrl
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!result[0].data && !result[1].data) {
|
|
|
|
resu.noOrder = true;
|
|
|
|
}
|
|
...
|
...
|
@@ -1045,7 +1097,6 @@ const orderDetail = (params) => { |
|
|
|
latitude: result[1].data.latitude,
|
|
|
|
storeName: result[1].data.storeName,
|
|
|
|
address: result[1].data.address,
|
|
|
|
telephone: result[1].data.telephone,
|
|
|
|
introduction: result[1].data.introduction,
|
|
|
|
pictureUrl: result[1].data.pictureUrl
|
|
|
|
};
|
|
...
|
...
|
@@ -1068,13 +1119,14 @@ const orderDetail = (params) => { |
|
|
|
activityId: result[0].data[0].activityId,
|
|
|
|
stylesName: result[0].data[0].stylesName,
|
|
|
|
typeStatus: result[0].data[0].activityType,
|
|
|
|
status: result[0].data[0].appointStatusStr,
|
|
|
|
status: result[0].data[0].detailStatusStr,
|
|
|
|
id: result[0].data[0].id,
|
|
|
|
showBtn: params.showBtn === 'true',
|
|
|
|
originUrl: result[0].data[0].url,
|
|
|
|
personName: result[0].data[0].personName,
|
|
|
|
personId: result[0].data[0].personId,
|
|
|
|
num: result[0].data[0].appointPersonNum
|
|
|
|
num: result[0].data[0].appointPersonNum,
|
|
|
|
canChangeTime: result[0].data[0].isCanAppoint === 1
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
...
|
...
|
@@ -1088,11 +1140,10 @@ const orderDetail = (params) => { |
|
|
|
};
|
|
|
|
}
|
|
|
|
return adviserDetail(newNarams).then(newResult => {
|
|
|
|
|
|
|
|
let adviserDetail= '';
|
|
|
|
let adviserDetailData = '';
|
|
|
|
|
|
|
|
if (newResult && newResult.data) {
|
|
|
|
adviserDetail = {
|
|
|
|
adviserDetailData = {
|
|
|
|
name: newResult.data.activityName,
|
|
|
|
summary: newResult.data.summary,
|
|
|
|
free: newResult.data.isFree === 1,
|
|
...
|
...
|
@@ -1111,12 +1162,12 @@ const orderDetail = (params) => { |
|
|
|
endTime: newResult.data.activityDayEndTime
|
|
|
|
};
|
|
|
|
} else {
|
|
|
|
adviserDetail = {
|
|
|
|
adviserDetailData = {
|
|
|
|
adviser: true,
|
|
|
|
hideAd: true
|
|
|
|
};
|
|
|
|
}
|
|
|
|
resu = Object.assign(resu, {adviserDetail: adviserDetail});
|
|
|
|
resu = Object.assign(resu, {adviserDetail: adviserDetailData});
|
|
|
|
return resu;
|
|
|
|
});
|
|
|
|
});
|
|
...
|
...
|
@@ -1127,11 +1178,13 @@ const cutterList = (params) => { |
|
|
|
return service.get('MenuConfigController/getFrontMenuStylist', {
|
|
|
|
storeId: params.storeId,
|
|
|
|
id: params.id || '',
|
|
|
|
isFront: params.isFront
|
|
|
|
isFront: params.isFront,
|
|
|
|
filter: params.filter || '',
|
|
|
|
}).then(result => {
|
|
|
|
return result;
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
const cutterList2 = (params) => {
|
|
|
|
return service.get('MenuConfigController/getFrontMenuStylist', {
|
|
|
|
storeId: params.storeId,
|
|
...
|
...
|
@@ -1198,7 +1251,7 @@ const kidStyle = (params) => { |
|
|
|
|
|
|
|
if (result[2] && result[2].data) {
|
|
|
|
resu.detail = {
|
|
|
|
bigPic: result[2].data.mainPushUrl
|
|
|
|
bigPic: result[2].data.pictureUrl.split(',')[0]
|
|
|
|
};
|
|
|
|
resu.content = result[2].data.detail;
|
|
|
|
}
|
|
...
|
...
|
@@ -1288,19 +1341,22 @@ const cutter = (params) => { |
|
|
|
|
|
|
|
if (result && result[2] && result[2].data) {
|
|
|
|
for (let item in result[2].data) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[2].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
if (item) {
|
|
|
|
build.push({
|
|
|
|
date: _MD(item),
|
|
|
|
week: result[2].data[item],
|
|
|
|
dateOrigin: item,
|
|
|
|
dateParse: Date.parse(item) / 1000
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resu.dateList = build;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
resu.storeId = params.storeId;
|
|
|
|
resu.id = params.id;
|
|
|
|
return resu;
|
|
|
|
});
|
|
|
|
};
|
...
|
...
|
|
