Merge branch 'master' into feature/ctxlj
Showing
53 changed files
with
938 additions
and
320 deletions
| @@ -66,16 +66,11 @@ exports.articleList = function(req, res, next) { | @@ -66,16 +66,11 @@ exports.articleList = function(req, res, next) { | ||
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | exports.map = function(req, res) { | 68 | exports.map = function(req, res) { |
| 69 | - | ||
| 70 | - Object.assign(responseData, { | ||
| 71 | - pageHeader: headerModel.setNav({ | ||
| 72 | - navTitle: '地图', | ||
| 73 | - navBtn: false | ||
| 74 | - }), | 69 | + let mapData = Object.assign({}, responseData, { |
| 75 | title: '地图' | 70 | title: '地图' |
| 76 | }); | 71 | }); |
| 77 | 72 | ||
| 78 | - res.render('trend/map', responseData); | 73 | + res.render('trend/map', mapData); |
| 79 | }; | 74 | }; |
| 80 | 75 | ||
| 81 | exports.articleDetail = function(req, res, next) { | 76 | exports.articleDetail = function(req, res, next) { |
| @@ -100,26 +95,55 @@ exports.articleDetail = function(req, res, next) { | @@ -100,26 +95,55 @@ exports.articleDetail = function(req, res, next) { | ||
| 100 | }; | 95 | }; |
| 101 | 96 | ||
| 102 | exports.classList = function(req, res, next) { | 97 | exports.classList = function(req, res, next) { |
| 103 | - | ||
| 104 | - Object.assign(responseData, { | 98 | + let classData = { |
| 105 | pageHeader: headerModel.setNav({ | 99 | pageHeader: headerModel.setNav({ |
| 106 | navTitle: '潮流课堂', | 100 | navTitle: '潮流课堂', |
| 107 | navBtn: false | 101 | navBtn: false |
| 108 | }), | 102 | }), |
| 109 | - title: '潮流课堂' | ||
| 110 | - }); | 103 | + title: '潮流课堂', |
| 104 | + module: 'activity', | ||
| 105 | + page: 'trend-class', | ||
| 106 | + width750: true, | ||
| 107 | + localCss: true | ||
| 108 | + }; | ||
| 111 | 109 | ||
| 112 | let params = { | 110 | let params = { |
| 113 | storeId: req.query.storeId, | 111 | storeId: req.query.storeId, |
| 114 | activityType: 1, | 112 | activityType: 1, |
| 113 | + classType: true, | ||
| 114 | + typeId: 0, | ||
| 115 | isFront: req.query.isFront || req.cookies.isFront | 115 | isFront: req.query.isFront || req.cookies.isFront |
| 116 | }; | 116 | }; |
| 117 | 117 | ||
| 118 | trendModel.classActList(params).then((result) => { | 118 | trendModel.classActList(params).then((result) => { |
| 119 | - res.render('trend/class', Object.assign(responseData, result)); | 119 | + res.render('trend/class', Object.assign(classData, result)); |
| 120 | + }).catch(next); | ||
| 121 | +}; | ||
| 122 | + | ||
| 123 | +exports.getClass = function(req, res, next) { | ||
| 124 | + let params = { | ||
| 125 | + storeId: req.query.storeId, | ||
| 126 | + activityType: 1, | ||
| 127 | + typeId: req.query.typeId, | ||
| 128 | + isFront: req.query.isFront || req.cookies.isFront | ||
| 129 | + }; | ||
| 130 | + | ||
| 131 | + trendModel.classList(params).then((result) => { | ||
| 132 | + res.json(result); | ||
| 120 | }).catch(next); | 133 | }).catch(next); |
| 121 | }; | 134 | }; |
| 122 | 135 | ||
| 136 | +exports.getVip = function(req, res, next) { | ||
| 137 | + let params = { | ||
| 138 | + uid: req.user.uid | ||
| 139 | + }; | ||
| 140 | + | ||
| 141 | + trendModel.getVip(params).then((result) => { | ||
| 142 | + res.json(result); | ||
| 143 | + }).catch(next); | ||
| 144 | +}; | ||
| 145 | + | ||
| 146 | + | ||
| 123 | exports.activity = function(req, res, next) { | 147 | exports.activity = function(req, res, next) { |
| 124 | 148 | ||
| 125 | Object.assign(responseData, { | 149 | Object.assign(responseData, { |
| @@ -314,7 +338,7 @@ exports.photography = function(req, res, next) { | @@ -314,7 +338,7 @@ exports.photography = function(req, res, next) { | ||
| 314 | id: req.query.id, | 338 | id: req.query.id, |
| 315 | activityType: 4, | 339 | activityType: 4, |
| 316 | isFront: req.query.isFront || req.cookies.isFront, | 340 | isFront: req.query.isFront || req.cookies.isFront, |
| 317 | - filter: 2 | 341 | + filter: 3 |
| 318 | }; | 342 | }; |
| 319 | 343 | ||
| 320 | trendModel.photography(params).then((result) => { | 344 | trendModel.photography(params).then((result) => { |
| @@ -322,6 +346,29 @@ exports.photography = function(req, res, next) { | @@ -322,6 +346,29 @@ exports.photography = function(req, res, next) { | ||
| 322 | }).catch(next); | 346 | }).catch(next); |
| 323 | }; | 347 | }; |
| 324 | 348 | ||
| 349 | +exports.allStyle = function(req, res, next) { | ||
| 350 | + | ||
| 351 | + Object.assign(responseData, { | ||
| 352 | + pageHeader: headerModel.setNav({ | ||
| 353 | + navTitle: '所有风格', | ||
| 354 | + navBtn: false | ||
| 355 | + }), | ||
| 356 | + title: '所有风格' | ||
| 357 | + }); | ||
| 358 | + | ||
| 359 | + let params = { | ||
| 360 | + storeId: req.query.storeId, | ||
| 361 | + id: req.query.id, | ||
| 362 | + activityType: 4, | ||
| 363 | + isFront: req.query.isFront || req.cookies.isFront, | ||
| 364 | + filter: 2 | ||
| 365 | + }; | ||
| 366 | + | ||
| 367 | + trendModel.allStyle(params).then((result) => { | ||
| 368 | + res.render('trend/all-style', Object.assign(responseData, result)); | ||
| 369 | + }).catch(next); | ||
| 370 | +}; | ||
| 371 | + | ||
| 325 | exports.kidStyle = function(req, res, next) { | 372 | exports.kidStyle = function(req, res, next) { |
| 326 | 373 | ||
| 327 | let resData = Object.assign({}, responseData, { | 374 | let resData = Object.assign({}, responseData, { |
| @@ -675,6 +722,18 @@ exports.success = function(req, res) { | @@ -675,6 +722,18 @@ exports.success = function(req, res) { | ||
| 675 | res.render('trend/success', Object.assign(responseData, {storeId: req.query.storeId})); | 722 | res.render('trend/success', Object.assign(responseData, {storeId: req.query.storeId})); |
| 676 | }; | 723 | }; |
| 677 | 724 | ||
| 725 | +exports.err = function(req, res) { | ||
| 726 | + Object.assign(responseData, { | ||
| 727 | + pageHeader: headerModel.setNav({ | ||
| 728 | + navTitle: '预约', | ||
| 729 | + navBtn: false | ||
| 730 | + }), | ||
| 731 | + title: '预约' | ||
| 732 | + }); | ||
| 733 | + | ||
| 734 | + res.render('trend/err', responseData); | ||
| 735 | +}; | ||
| 736 | + | ||
| 678 | exports.changeDate = function(req, res, next) { | 737 | exports.changeDate = function(req, res, next) { |
| 679 | 738 | ||
| 680 | let params = { | 739 | let params = { |
| @@ -7,7 +7,9 @@ | @@ -7,7 +7,9 @@ | ||
| 7 | 'use strict'; | 7 | 'use strict'; |
| 8 | 8 | ||
| 9 | const service = global.yoho.StoreAPI; | 9 | const service = global.yoho.StoreAPI; |
| 10 | +const api = global.yoho.API; | ||
| 10 | const moment = require('moment'); | 11 | const moment = require('moment'); |
| 12 | +const helpers = global.yoho.helpers; | ||
| 11 | 13 | ||
| 12 | // 格式年月日 | 14 | // 格式年月日 |
| 13 | const _formatDay = (day) => { | 15 | const _formatDay = (day) => { |
| @@ -64,7 +66,7 @@ const info = (params) => { | @@ -64,7 +66,7 @@ const info = (params) => { | ||
| 64 | 66 | ||
| 65 | // 店铺信息 | 67 | // 店铺信息 |
| 66 | const storeInfo = (params) => { | 68 | const storeInfo = (params) => { |
| 67 | - return service.get('StoreController/getStoreInfoExtById', { | 69 | + return service.get('InformationController/getStoreInfoExtById', { |
| 68 | storeId: params.storeId, | 70 | storeId: params.storeId, |
| 69 | isFront: params.isFront | 71 | isFront: params.isFront |
| 70 | }, { | 72 | }, { |
| @@ -173,6 +175,7 @@ const useList = (params) => { | @@ -173,6 +175,7 @@ const useList = (params) => { | ||
| 173 | return service.get('ActivityConfigController/getActivityNowList', { | 175 | return service.get('ActivityConfigController/getActivityNowList', { |
| 174 | storeId: params.storeId, | 176 | storeId: params.storeId, |
| 175 | activityType: params.activityType, | 177 | activityType: params.activityType, |
| 178 | + trendClassTypeId: params.typeId || 0, | ||
| 176 | isFront: params.isFront | 179 | isFront: params.isFront |
| 177 | }, { | 180 | }, { |
| 178 | code: 200 | 181 | code: 200 |
| @@ -186,6 +189,7 @@ const oldList = (params) => { | @@ -186,6 +189,7 @@ const oldList = (params) => { | ||
| 186 | return service.get('ActivityConfigController/getActivityEndList', { | 189 | return service.get('ActivityConfigController/getActivityEndList', { |
| 187 | storeId: params.storeId, | 190 | storeId: params.storeId, |
| 188 | activityType: params.activityType, | 191 | activityType: params.activityType, |
| 192 | + trendClassTypeId: params.typeId || 0, | ||
| 189 | isFront: params.isFront | 193 | isFront: params.isFront |
| 190 | }, { | 194 | }, { |
| 191 | code: 200 | 195 | code: 200 |
| @@ -201,16 +205,38 @@ const oldList = (params) => { | @@ -201,16 +205,38 @@ const oldList = (params) => { | ||
| 201 | }); | 205 | }); |
| 202 | }; | 206 | }; |
| 203 | 207 | ||
| 208 | +// 课堂tab | ||
| 209 | +const classTab = (params) => { | ||
| 210 | + return service.get('ActivityConfigController/getAllTrendClassType', { | ||
| 211 | + storeId: params.storeId, | ||
| 212 | + isFront: params.isFront | ||
| 213 | + }, { | ||
| 214 | + code: 200 | ||
| 215 | + }).then(result => { | ||
| 216 | + let resu = []; | ||
| 217 | + | ||
| 218 | + if (result && result.data) { | ||
| 219 | + resu = result.data; | ||
| 220 | + } | ||
| 221 | + return resu; | ||
| 222 | + }); | ||
| 223 | +}; | ||
| 224 | + | ||
| 204 | // 潮流课堂，活动列表 | 225 | // 潮流课堂，活动列表 |
| 205 | const classActList = (params) => { | 226 | const classActList = (params) => { |
| 206 | - return Promise.all([ | 227 | + let listApi = [ |
| 207 | useList(params), | 228 | useList(params), |
| 208 | oldList(params) | 229 | oldList(params) |
| 209 | - ]).then(result => { | 230 | + ]; |
| 210 | 231 | ||
| 232 | + if (params.classType === true) { | ||
| 233 | + listApi.push(classTab(params)); | ||
| 234 | + } | ||
| 235 | + return Promise.all(listApi).then(result => { | ||
| 211 | let resu = { | 236 | let resu = { |
| 212 | list: [], | 237 | list: [], |
| 213 | - oldList: [] | 238 | + oldList: [], |
| 239 | + typeList: [] | ||
| 214 | }; | 240 | }; |
| 215 | 241 | ||
| 216 | if (result && result[0] && result[0].data) { | 242 | if (result && result[0] && result[0].data) { |
| @@ -244,9 +270,9 @@ const classActList = (params) => { | @@ -244,9 +270,9 @@ const classActList = (params) => { | ||
| 244 | 270 | ||
| 245 | build.push({ | 271 | build.push({ |
| 246 | name: val.activityName, | 272 | name: val.activityName, |
| 247 | - image: val.image ? val.image.split(',')[0] : '', | 273 | + image: helpers.image(val.image ? val.image.split(',')[0] : '', 750, 750), |
| 248 | startDate: _formatDay(val.activityStartDate), | 274 | startDate: _formatDay(val.activityStartDate), |
| 249 | - endDate: endDate, | 275 | + endDate: val.activityStartDate === val.activityEndDate ? '' : endDate, |
| 250 | startTime: _HM2(val.activityDayStartTime), | 276 | startTime: _HM2(val.activityDayStartTime), |
| 251 | endTime: _HM2(val.activityDayEndTime), | 277 | endTime: _HM2(val.activityDayEndTime), |
| 252 | free: val.isFree === 1, | 278 | free: val.isFree === 1, |
| @@ -255,7 +281,8 @@ const classActList = (params) => { | @@ -255,7 +281,8 @@ const classActList = (params) => { | ||
| 255 | apoStatus: val.appointStatus === 1, | 281 | apoStatus: val.appointStatus === 1, |
| 256 | id: val.id, | 282 | id: val.id, |
| 257 | status: status, | 283 | status: status, |
| 258 | - storeId: params.storeId | 284 | + storeId: params.storeId, |
| 285 | + tag: val.trendClassTypeName | ||
| 259 | }); | 286 | }); |
| 260 | }); | 287 | }); |
| 261 | 288 | ||
| @@ -283,9 +310,9 @@ const classActList = (params) => { | @@ -283,9 +310,9 @@ const classActList = (params) => { | ||
| 283 | 310 | ||
| 284 | build.push({ | 311 | build.push({ |
| 285 | name: val.activityName, | 312 | name: val.activityName, |
| 286 | - image: val.image ? val.image.split(',')[0] : '', | 313 | + image: helpers.image(val.image ? val.image.split(',')[0] : '', 750, 750), |
| 287 | startDate: _formatDay(val.activityStartDate), | 314 | startDate: _formatDay(val.activityStartDate), |
| 288 | - endDate: endDate, | 315 | + endDate: val.activityStartDate === val.activityEndDate ? '' : endDate, |
| 289 | startTime: _HM2(val.activityDayStartTime), | 316 | startTime: _HM2(val.activityDayStartTime), |
| 290 | endTime: _HM2(val.activityDayEndTime), | 317 | endTime: _HM2(val.activityDayEndTime), |
| 291 | end: true, | 318 | end: true, |
| @@ -296,12 +323,37 @@ const classActList = (params) => { | @@ -296,12 +323,37 @@ const classActList = (params) => { | ||
| 296 | storeId: params.storeId, | 323 | storeId: params.storeId, |
| 297 | free: val.isFree === 1, | 324 | free: val.isFree === 1, |
| 298 | price: val.price, | 325 | price: val.price, |
| 326 | + tag: val.trendClassTypeName | ||
| 299 | }); | 327 | }); |
| 300 | }); | 328 | }); |
| 301 | 329 | ||
| 302 | resu.oldList = build; | 330 | resu.oldList = build; |
| 303 | } | 331 | } |
| 304 | 332 | ||
| 333 | + if (result && result[2]) { | ||
| 334 | + let build = []; | ||
| 335 | + | ||
| 336 | + result[2].forEach(val => { | ||
| 337 | + build.push({ | ||
| 338 | + name: val.typeName, | ||
| 339 | + id: val.typeId | ||
| 340 | + }); | ||
| 341 | + }); | ||
| 342 | + resu.typeList = build; | ||
| 343 | + } | ||
| 344 | + | ||
| 345 | + return resu; | ||
| 346 | + }); | ||
| 347 | +}; | ||
| 348 | + | ||
| 349 | +// 二期，活动跟课堂功能分离 | ||
| 350 | +const classList = (params) => { | ||
| 351 | + return Promise.all([ | ||
| 352 | + classActList(params) | ||
| 353 | + ]).then(newResult => { | ||
| 354 | + let resu = {}; | ||
| 355 | + | ||
| 356 | + resu = newResult[0]; | ||
| 305 | return resu; | 357 | return resu; |
| 306 | }); | 358 | }); |
| 307 | }; | 359 | }; |
| @@ -330,6 +382,7 @@ const classActDetail = (params) => { | @@ -330,6 +382,7 @@ const classActDetail = (params) => { | ||
| 330 | storeId: params.storeId, | 382 | storeId: params.storeId, |
| 331 | activityType: params.activityType, | 383 | activityType: params.activityType, |
| 332 | id: params.activityId, | 384 | id: params.activityId, |
| 385 | + vip: result.data.userLevels | ||
| 333 | }; | 386 | }; |
| 334 | } | 387 | } |
| 335 | 388 | ||
| @@ -435,6 +488,7 @@ const travel = (params) => { | @@ -435,6 +488,7 @@ const travel = (params) => { | ||
| 435 | resu.hairStylistId = result[0].hairStylistId; | 488 | resu.hairStylistId = result[0].hairStylistId; |
| 436 | resu.travelId = result[0].id; | 489 | resu.travelId = result[0].id; |
| 437 | resu.content = result[0].tourDetail; | 490 | resu.content = result[0].tourDetail; |
| 491 | + resu.vip = result[0].userLevel; | ||
| 438 | 492 | ||
| 439 | let build = []; | 493 | let build = []; |
| 440 | 494 | ||
| @@ -501,7 +555,8 @@ const adviser = (params) => { | @@ -501,7 +555,8 @@ const adviser = (params) => { | ||
| 501 | summary: result[0].data.summary, | 555 | summary: result[0].data.summary, |
| 502 | image: result[0].data.image, | 556 | image: result[0].data.image, |
| 503 | isCanAppoint: result[0].data.isCanAppoint === 1, | 557 | isCanAppoint: result[0].data.isCanAppoint === 1, |
| 504 | - storeId: params.storeId | 558 | + storeId: params.storeId, |
| 559 | + vip: result[0].data.userLevel | ||
| 505 | }; | 560 | }; |
| 506 | 561 | ||
| 507 | resu.content = result[0].data.detail; | 562 | resu.content = result[0].data.detail; |
| @@ -625,11 +680,36 @@ const getTimeList = (params) => { | @@ -625,11 +680,36 @@ const getTimeList = (params) => { | ||
| 625 | }); | 680 | }); |
| 626 | }; | 681 | }; |
| 627 | 682 | ||
| 683 | +// 所有风格 | ||
| 684 | +const allStyle = (params) => { | ||
| 685 | + return Promise.all([ | ||
| 686 | + getStyle(params) | ||
| 687 | + ]).then(result => { | ||
| 688 | + let resu = { | ||
| 689 | + styleList: [] | ||
| 690 | + }; | ||
| 691 | + | ||
| 692 | + if (result[0] && result[0].data) { | ||
| 693 | + let build = []; | ||
| 694 | + | ||
| 695 | + result[0].data.forEach(val => { | ||
| 696 | + build.push({ | ||
| 697 | + img: val.styleImage, | ||
| 698 | + id: val.id, | ||
| 699 | + name: val.styleName, | ||
| 700 | + storeId: params.storeId | ||
| 701 | + }); | ||
| 702 | + }); | ||
| 703 | + resu.styleList = build; | ||
| 704 | + } | ||
| 705 | + return resu; | ||
| 706 | + }); | ||
| 707 | +}; | ||
| 708 | + | ||
| 628 | // 摄影 | 709 | // 摄影 |
| 629 | const photography = (params) => { | 710 | const photography = (params) => { |
| 630 | return Promise.all([ | 711 | return Promise.all([ |
| 631 | photographyDetail(params), | 712 | photographyDetail(params), |
| 632 | - getStyle(params), | ||
| 633 | adviserList(params), | 713 | adviserList(params), |
| 634 | getStylePush(params), | 714 | getStylePush(params), |
| 635 | ]).then(result => { | 715 | ]).then(result => { |
| @@ -640,39 +720,26 @@ const photography = (params) => { | @@ -640,39 +720,26 @@ const photography = (params) => { | ||
| 640 | styleList: [], | 720 | styleList: [], |
| 641 | packageList: [], | 721 | packageList: [], |
| 642 | swiper: [], | 722 | swiper: [], |
| 643 | - storeId: params.storeId | 723 | + storeId: params.storeId, |
| 724 | + id: params.id | ||
| 644 | }; | 725 | }; |
| 645 | 726 | ||
| 646 | if (result) { | 727 | if (result) { |
| 647 | if (result[0] && result[0].data) { | 728 | if (result[0] && result[0].data) { |
| 648 | if (result[0].data.pictureUrl) { | 729 | if (result[0].data.pictureUrl) { |
| 649 | resu.detail = { | 730 | resu.detail = { |
| 650 | - bigPic: result[0].data.pictureUrl.split(',')[0] | 731 | + bigPic: result[0].data.pictureUrl.split(',')[0], |
| 732 | + name: result[0].data.name | ||
| 651 | }; | 733 | }; |
| 652 | } | 734 | } |
| 653 | resu.content = result[0].data.detail; | 735 | resu.content = result[0].data.detail; |
| 654 | } | 736 | } |
| 655 | if (result[1] && result[1].data) { | 737 | if (result[1] && result[1].data) { |
| 656 | - | ||
| 657 | let build = []; | 738 | let build = []; |
| 658 | 739 | ||
| 659 | result[1].data.forEach(val => { | 740 | result[1].data.forEach(val => { |
| 660 | 741 | ||
| 661 | build.push({ | 742 | build.push({ |
| 662 | - img: val.styleImage, | ||
| 663 | - id: val.id, | ||
| 664 | - name: val.styleName | ||
| 665 | - }); | ||
| 666 | - }); | ||
| 667 | - | ||
| 668 | - resu.styleList = build; | ||
| 669 | - } | ||
| 670 | - if (result[2] && result[2].data) { | ||
| 671 | - let build = []; | ||
| 672 | - | ||
| 673 | - result[2].data.forEach(val => { | ||
| 674 | - | ||
| 675 | - build.push({ | ||
| 676 | name: val.activityName, | 743 | name: val.activityName, |
| 677 | free: val.isFree === 1, | 744 | free: val.isFree === 1, |
| 678 | price: val.price, | 745 | price: val.price, |
| @@ -683,11 +750,11 @@ const photography = (params) => { | @@ -683,11 +750,11 @@ const photography = (params) => { | ||
| 683 | 750 | ||
| 684 | resu.packageList = build; | 751 | resu.packageList = build; |
| 685 | } | 752 | } |
| 686 | - if (result[3] && result[3].data) { | 753 | + if (result[2] && result[2].data) { |
| 687 | 754 | ||
| 688 | let build = []; | 755 | let build = []; |
| 689 | 756 | ||
| 690 | - result[3].data.forEach(val => { | 757 | + result[2].data.forEach(val => { |
| 691 | 758 | ||
| 692 | build.push({ | 759 | build.push({ |
| 693 | pic: val.pushImg, | 760 | pic: val.pushImg, |
| @@ -1264,6 +1331,7 @@ const kidStyle = (params) => { | @@ -1264,6 +1331,7 @@ const kidStyle = (params) => { | ||
| 1264 | if (result[2] && result[2].data) { | 1331 | if (result[2] && result[2].data) { |
| 1265 | if (result[2].data.pictureUrl) { | 1332 | if (result[2].data.pictureUrl) { |
| 1266 | resu.detail = { | 1333 | resu.detail = { |
| 1334 | + name: result[2].data.name, | ||
| 1267 | bigPic: result[2].data.pictureUrl.split(',')[0] | 1335 | bigPic: result[2].data.pictureUrl.split(',')[0] |
| 1268 | }; | 1336 | }; |
| 1269 | } | 1337 | } |
| @@ -1413,6 +1481,15 @@ const getAbleTime = (params) => { | @@ -1413,6 +1481,15 @@ const getAbleTime = (params) => { | ||
| 1413 | }); | 1481 | }); |
| 1414 | }; | 1482 | }; |
| 1415 | 1483 | ||
| 1484 | +const getVip = (params) => { | ||
| 1485 | + return api.get('', { | ||
| 1486 | + method: 'app.passport.getUserBase', | ||
| 1487 | + uid: params.uid | ||
| 1488 | + }).then(result => { | ||
| 1489 | + return result; | ||
| 1490 | + }); | ||
| 1491 | +}; | ||
| 1492 | + | ||
| 1416 | module.exports = { | 1493 | module.exports = { |
| 1417 | store, | 1494 | store, |
| 1418 | articleDetail, | 1495 | articleDetail, |
| @@ -1439,5 +1516,8 @@ module.exports = { | @@ -1439,5 +1516,8 @@ module.exports = { | ||
| 1439 | delOrder, | 1516 | delOrder, |
| 1440 | changeDate, | 1517 | changeDate, |
| 1441 | kids, | 1518 | kids, |
| 1442 | - getAbleTime | 1519 | + getAbleTime, |
| 1520 | + allStyle, | ||
| 1521 | + classList, | ||
| 1522 | + getVip | ||
| 1443 | }; | 1523 | }; |
| @@ -173,6 +173,7 @@ router.get('/trend/map', trend.map); | @@ -173,6 +173,7 @@ router.get('/trend/map', trend.map); | ||
| 173 | 173 | ||
| 174 | // 潮流之旅-潮流课堂-活动 | 174 | // 潮流之旅-潮流课堂-活动 |
| 175 | router.get('/trend/class', trend.classList); | 175 | router.get('/trend/class', trend.classList); |
| 176 | +router.get('/trend/getClass', trend.getClass); | ||
| 176 | router.get('/trend/activity', trend.activity); | 177 | router.get('/trend/activity', trend.activity); |
| 177 | router.get('/trend/class-detail', trend.classDetail); | 178 | router.get('/trend/class-detail', trend.classDetail); |
| 178 | router.get('/trend/act-detail', trend.actDetail); | 179 | router.get('/trend/act-detail', trend.actDetail); |
| @@ -187,6 +188,7 @@ router.get('/trend/kids', trend.kids); | @@ -187,6 +188,7 @@ router.get('/trend/kids', trend.kids); | ||
| 187 | router.get('/trend/photography', trend.photography); | 188 | router.get('/trend/photography', trend.photography); |
| 188 | router.get('/trend/style-detail', trend.styleDetail); | 189 | router.get('/trend/style-detail', trend.styleDetail); |
| 189 | router.get('/trend/package-detail', trend.packageDetail); | 190 | router.get('/trend/package-detail', trend.packageDetail); |
| 191 | +router.get('/trend/all-style', trend.allStyle); | ||
| 190 | 192 | ||
| 191 | // 潮流之旅-儿童造型 | 193 | // 潮流之旅-儿童造型 |
| 192 | router.get('/trend/kid-style', trend.kidStyle); | 194 | router.get('/trend/kid-style', trend.kidStyle); |
| @@ -218,6 +220,8 @@ router.get('/trend/changeDate', trend.changeDate); | @@ -218,6 +220,8 @@ router.get('/trend/changeDate', trend.changeDate); | ||
| 218 | 220 | ||
| 219 | // 预约成功页 | 221 | // 预约成功页 |
| 220 | router.get('/trend/success', trend.success); | 222 | router.get('/trend/success', trend.success); |
| 223 | +router.get('/trend/err', trend.err); | ||
| 224 | +router.get('/trend/getVip', trend.getVip); | ||
| 221 | 225 | ||
| 222 | // 协议页面 | 226 | // 协议页面 |
| 223 | router.get('/trend/need-know1', trend.needKnow); | 227 | router.get('/trend/need-know1', trend.needKnow); |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | </div> | 19 | </div> |
| 20 | {{# detail}} | 20 | {{# detail}} |
| 21 | {{#if isCanAppoint}} | 21 | {{#if isCanAppoint}} |
| 22 | - <a class="foot-btn ok" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=3">立即预约</a> | 22 | + <a class="foot-btn ok check-vip" data-vip="{{vip}}" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=3">立即预约</a> |
| 23 | {{/if}} | 23 | {{/if}} |
| 24 | {{/ detail}} | 24 | {{/ detail}} |
| 25 | </div> | 25 | </div> |
| 1 | +<div class="trend-c no-mg" id="no-download"> | ||
| 2 | + <div class="push-style"> | ||
| 3 | + {{# styleList}} | ||
| 4 | + <a href="http://m.yohobuy.com/activity/trend/style-detail?id={{id}}&storeId={{storeId}}&styleName={{name}}"> | ||
| 5 | + <div class="pic limit-pic"> | ||
| 6 | + <img src="{{image img}}"> | ||
| 7 | + <p class="title eps">{{name}}</p> | ||
| 8 | + </div> | ||
| 9 | + </a> | ||
| 10 | + {{/ styleList}} | ||
| 11 | + </div> | ||
| 12 | +</div> |
| @@ -3,12 +3,12 @@ | @@ -3,12 +3,12 @@ | ||
| 3 | <div class="apt-info"> | 3 | <div class="apt-info"> |
| 4 | <div>当前预约门店：{{name}}</div> | 4 | <div>当前预约门店：{{name}}</div> |
| 5 | <div> | 5 | <div> |
| 6 | - <span class="icon-pic adr"></span> | 6 | + <span class="iconfont adr"></span> |
| 7 | 门店地址：{{adr}} | 7 | 门店地址：{{adr}} |
| 8 | </div> | 8 | </div> |
| 9 | <a href="tel:{{telephone}}"> | 9 | <a href="tel:{{telephone}}"> |
| 10 | <div> | 10 | <div> |
| 11 | - <span class="icon-pic tel"></span> | 11 | + <span class="iconfont tel"></span> |
| 12 | 门店电话：{{telephone}} | 12 | 门店电话：{{telephone}} |
| 13 | </div> | 13 | </div> |
| 14 | </a> | 14 | </a> |
| @@ -18,14 +18,14 @@ | @@ -18,14 +18,14 @@ | ||
| 18 | {{# classChosen}} | 18 | {{# classChosen}} |
| 19 | <div class="chose-item select depend"> | 19 | <div class="chose-item select depend"> |
| 20 | <span class="label">潮流课堂</span> | 20 | <span class="label">潮流课堂</span> |
| 21 | - <input class="inp chosen-class eps" type="text" label="潮流课堂" placeholder="未选择" readonly="readonly" /> | 21 | + <input class="inp chosen-class eps grey-font" disabled="disabled" type="text" label="潮流课堂" placeholder="未选择" readonly="readonly" /> |
| 22 | <span class="iconfont icon-arr"></span> | 22 | <span class="iconfont icon-arr"></span> |
| 23 | </div> | 23 | </div> |
| 24 | {{/ classChosen}} | 24 | {{/ classChosen}} |
| 25 | {{# actChosen}} | 25 | {{# actChosen}} |
| 26 | <div class="chose-item select depend"> | 26 | <div class="chose-item select depend"> |
| 27 | <span class="label">活动</span> | 27 | <span class="label">活动</span> |
| 28 | - <input class="inp chosen-class eps" type="text" label="活动" placeholder="未选择" readonly="readonly" /> | 28 | + <input class="inp chosen-class eps grey-font" disabled="disabled" type="text" label="活动" placeholder="未选择" readonly="readonly" /> |
| 29 | <span class="iconfont icon-arr"></span> | 29 | <span class="iconfont icon-arr"></span> |
| 30 | </div> | 30 | </div> |
| 31 | {{/ actChosen}} | 31 | {{/ actChosen}} |
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | <div class="chose-item select depend"> | 33 | <div class="chose-item select depend"> |
| 34 | <span class="label">发型师</span> | 34 | <span class="label">发型师</span> |
| 35 | <a href="http://m.yohobuy.com/activity/trend/chosen-cutter?storeId={{storeId}}&chosenType=5&typeStatus={{typeStatus}}"> | 35 | <a href="http://m.yohobuy.com/activity/trend/chosen-cutter?storeId={{storeId}}&chosenType=5&typeStatus={{typeStatus}}"> |
| 36 | - <input class="inp chosen-cutter eps require" type="text" label="发型师" placeholder="未选择" readonly="readonly" /> | 36 | + <input class="inp chosen-cutter eps require" disabled="disabled" type="text" label="发型师" placeholder="未选择" readonly="readonly" /> |
| 37 | </a> | 37 | </a> |
| 38 | <span class="iconfont icon-arr"></span> | 38 | <span class="iconfont icon-arr"></span> |
| 39 | </div> | 39 | </div> |
| @@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
| 42 | <div class="chose-item select depend"> | 42 | <div class="chose-item select depend"> |
| 43 | <span class="label">选择套餐</span> | 43 | <span class="label">选择套餐</span> |
| 44 | <a href="http://m.yohobuy.com/activity/trend/chosen-package?storeId={{storeId}}&chosenType=4&typeStatus={{typeStatus}}"> | 44 | <a href="http://m.yohobuy.com/activity/trend/chosen-package?storeId={{storeId}}&chosenType=4&typeStatus={{typeStatus}}"> |
| 45 | - <input class="inp chosen-package eps require" label="套餐" type="text" placeholder="未选择" readonly="readonly" /> | 45 | + <input class="inp chosen-package eps require" disabled="disabled" label="套餐" type="text" placeholder="未选择" readonly="readonly" /> |
| 46 | </a> | 46 | </a> |
| 47 | <span class="iconfont icon-arr"></span> | 47 | <span class="iconfont icon-arr"></span> |
| 48 | </div> | 48 | </div> |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | <div class="chose-item select"> | 51 | <div class="chose-item select"> |
| 52 | <span class="label">选择风格</span> | 52 | <span class="label">选择风格</span> |
| 53 | <a href="http://m.yohobuy.com/activity/trend/chosen-style?storeId={{storeId}}&chosenType=1&typeStatus={{typeStatus}}"> | 53 | <a href="http://m.yohobuy.com/activity/trend/chosen-style?storeId={{storeId}}&chosenType=1&typeStatus={{typeStatus}}"> |
| 54 | - <input class="inp chosen-style eps require" type="text" label="风格" placeholder="未选择 " readonly="readonly" /> | 54 | + <input class="inp chosen-style eps require" disabled="disabled" type="text" label="风格" placeholder="未选择 " readonly="readonly" /> |
| 55 | </a> | 55 | </a> |
| 56 | <span class="iconfont icon-arr"></span> | 56 | <span class="iconfont icon-arr"></span> |
| 57 | </div> | 57 | </div> |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | <div class="chose-item select{{#if hideChosen}} depend{{/if}}"> | 60 | <div class="chose-item select{{#if hideChosen}} depend{{/if}}"> |
| 61 | <span class="label">潮流顾问</span> | 61 | <span class="label">潮流顾问</span> |
| 62 | <a href="http://m.yohobuy.com/activity/trend/chosen-adviser?storeId={{storeId}}&chosenType=3&typeStatus={{typeStatus}}"> | 62 | <a href="http://m.yohobuy.com/activity/trend/chosen-adviser?storeId={{storeId}}&chosenType=3&typeStatus={{typeStatus}}"> |
| 63 | - <input class="inp chosen-adviser eps require" type="text" label="潮流顾问" placeholder="未选择" readonly="readonly" /> | 63 | + <input class="inp chosen-adviser eps require" disabled="disabled" type="text" label="潮流顾问" placeholder="未选择" readonly="readonly" /> |
| 64 | </a> | 64 | </a> |
| 65 | <span class="iconfont icon-arr"></span> | 65 | <span class="iconfont icon-arr"></span> |
| 66 | </div> | 66 | </div> |
| @@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
| 68 | <div class="chose-item select{{#if hideChosen}} need{{/if}}"> | 68 | <div class="chose-item select{{#if hideChosen}} need{{/if}}"> |
| 69 | <span class="label">选择时间</span> | 69 | <span class="label">选择时间</span> |
| 70 | <a href="http://m.yohobuy.com/activity/trend/chosen-time?storeId={{storeId}}&chosenType=2&typeStatus={{typeStatus}}"> | 70 | <a href="http://m.yohobuy.com/activity/trend/chosen-time?storeId={{storeId}}&chosenType=2&typeStatus={{typeStatus}}"> |
| 71 | - <input class="inp chosen-time require" type="text" label="时间" placeholder="未选择" readonly="readonly" /> | 71 | + <input class="inp chosen-time require" disabled="disabled" type="text" label="时间" placeholder="未选择" readonly="readonly" /> |
| 72 | </a> | 72 | </a> |
| 73 | <span class="iconfont icon-arr"></span> | 73 | <span class="iconfont icon-arr"></span> |
| 74 | </div> | 74 | </div> |
| @@ -3,8 +3,8 @@ | @@ -3,8 +3,8 @@ | ||
| 3 | {{#if coverUrl}} | 3 | {{#if coverUrl}} |
| 4 | <img src="{{image coverUrl}}"> | 4 | <img src="{{image coverUrl}}"> |
| 5 | {{/if}} | 5 | {{/if}} |
| 6 | - <p class="title">{{titles}}</p> | 6 | + <p class="title eps">{{titles}}</p> |
| 7 | <p class="tip-s hide">{{summary}}</p> | 7 | <p class="tip-s hide">{{summary}}</p> |
| 8 | - <div class="content">{{{content}}}</div> | 8 | + <div class="content no-pd-top">{{{content}}}</div> |
| 9 | </div> | 9 | </div> |
| 10 | </div> | 10 | </div> |
| 1 | <div class="trend-c" id="no-download"> | 1 | <div class="trend-c" id="no-download"> |
| 2 | <div class="side-main"> | 2 | <div class="side-main"> |
| 3 | <div class="package-c"> | 3 | <div class="package-c"> |
| 4 | - <ul class="package"> | 4 | + <ul class="package chosen-package"> |
| 5 | {{# packageChosen}} | 5 | {{# packageChosen}} |
| 6 | <li class="package-item"> | 6 | <li class="package-item"> |
| 7 | <div class="top clearfix"> | 7 | <div class="top clearfix"> |
| 1 | <div class="trend-c" id="no-download"> | 1 | <div class="trend-c" id="no-download"> |
| 2 | <div class="class class-detail"> | 2 | <div class="class class-detail"> |
| 3 | - <div class="class-item clearfix"> | 3 | + <div class="class-item clearfix no-pd-top"> |
| 4 | <div class="info"> | 4 | <div class="info"> |
| 5 | <span class="name" id="{{id}}">{{name}}</span> | 5 | <span class="name" id="{{id}}">{{name}}</span> |
| 6 | {{#if price}} | 6 | {{#if price}} |
| 7 | <span class="price"><span>¥</span>{{price}}</span> | 7 | <span class="price"><span>¥</span>{{price}}</span> |
| 8 | {{else}} | 8 | {{else}} |
| 9 | - <span class="price">免费</span> | 9 | + <span class="price price-2">免费</span> |
| 10 | {{/if}} | 10 | {{/if}} |
| 11 | </div> | 11 | </div> |
| 12 | <div class="tip"> | 12 | <div class="tip"> |
| 13 | <div> | 13 | <div> |
| 14 | - <p>日期：{{startDate}}－{{endDate}}</p> | ||
| 15 | - <p>时间：{{startTime}}－{{endTime}}</p> | 14 | + <p>日期：{{startDate}}{{#if endDate}}－{{/if}}{{endDate}}</p> |
| 15 | + <p>时间：{{startTime}}{{#if endTime}}－{{/if}}{{endTime}}</p> | ||
| 16 | </div> | 16 | </div> |
| 17 | </div> | 17 | </div> |
| 18 | <div class="content"> | 18 | <div class="content"> |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | {{#if status}} | 23 | {{#if status}} |
| 24 | {{> (lookup . 'status')}} | 24 | {{> (lookup . 'status')}} |
| 25 | {{#*inline '1'}} | 25 | {{#*inline '1'}} |
| 26 | - <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus={{activityType}}">立即预约</a> | 26 | + <a class="foot-btn ok clearCookie check-vip" data-vip="{{vip}}" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus={{activityType}}">立即预约</a> |
| 27 | {{/inline}} | 27 | {{/inline}} |
| 28 | {{#*inline '2'}} | 28 | {{#*inline '2'}} |
| 29 | <a class="foot-btn full">已约满</a> | 29 | <a class="foot-btn full">已约满</a> |
| 1 | <div class="trend-c no-pb share-class" id="no-download"> | 1 | <div class="trend-c no-pb share-class" id="no-download"> |
| 2 | + <div class="scroll-class"> | ||
| 3 | + <span class="scroll-item active">ALL</span> | ||
| 4 | + {{# typeList}} | ||
| 5 | + <span class="scroll-item" id={{id}}>{{name}}</span> | ||
| 6 | + {{/typeList}} | ||
| 7 | + </div> | ||
| 2 | <div class="package-top"> | 8 | <div class="package-top"> |
| 3 | <span></span> | 9 | <span></span> |
| 4 | 预约后需到店付款 | 10 | 预约后需到店付款 |
| 5 | </div> | 11 | </div> |
| 6 | - {{# list}} | ||
| 7 | - {{> trend/class}} | ||
| 8 | - {{/ list}} | ||
| 9 | - {{#if oldList}} | ||
| 10 | - <div class="big-title-2">精彩回顾</div> | ||
| 11 | - {{/if}} | ||
| 12 | - {{# oldList}} | ||
| 13 | - {{> trend/class}} | ||
| 14 | - {{/ oldList}} | 12 | + <div class="class-c"> |
| 13 | + {{# list}} | ||
| 14 | + {{> trend/class}} | ||
| 15 | + {{/ list}} | ||
| 16 | + {{#if oldList}} | ||
| 17 | + <div class="big-title-2">精彩回顾</div> | ||
| 18 | + {{/if}} | ||
| 19 | + {{# oldList}} | ||
| 20 | + {{> trend/class}} | ||
| 21 | + {{/ oldList}} | ||
| 22 | + </div> | ||
| 15 | </div> | 23 | </div> |
| @@ -7,14 +7,16 @@ | @@ -7,14 +7,16 @@ | ||
| 7 | 预约后需到店付款 | 7 | 预约后需到店付款 |
| 8 | </div> | 8 | </div> |
| 9 | {{/if}} | 9 | {{/if}} |
| 10 | - {{# packageList}} | ||
| 11 | - {{> trend/cutter-package}} | ||
| 12 | - {{/ packageList}} | 10 | + <div> |
| 11 | + {{# packageList}} | ||
| 12 | + {{> trend/cutter-package}} | ||
| 13 | + {{/ packageList}} | ||
| 14 | + </div> | ||
| 13 | {{#if dateList}} | 15 | {{#if dateList}} |
| 14 | <div class="big-title">可预约时间</div> | 16 | <div class="big-title">可预约时间</div> |
| 15 | {{> trend/date-list}} | 17 | {{> trend/date-list}} |
| 16 | {{/if}} | 18 | {{/if}} |
| 17 | - <div class="big-title">作品展示</div> | 19 | + <div class="big-title no-border">作品展示</div> |
| 18 | <div class="display-list clearfix"> | 20 | <div class="display-list clearfix"> |
| 19 | <div class="pull-pic-list clearfix"> | 21 | <div class="pull-pic-list clearfix"> |
| 20 | {{# stylist}} | 22 | {{# stylist}} |
apps/activity/views/action/trend/err.hbs
0 → 100644
| 1 | <div class="trend-c kid-style" id="no-download"> | 1 | <div class="trend-c kid-style" id="no-download"> |
| 2 | + {{# detail}} | ||
| 3 | + {{#if bigPic}} | ||
| 4 | + <img src="{{image bigPic}}"> | ||
| 5 | + {{/if}} | ||
| 6 | + {{#if name}} | ||
| 7 | + <div class="left-title center eps">{{name}}</div> | ||
| 8 | + {{/if}} | ||
| 9 | + {{/ detail}} | ||
| 10 | + {{#if content}} | ||
| 2 | <div class="box-padding"> | 11 | <div class="box-padding"> |
| 3 | - {{# detail}} | ||
| 4 | - {{#if bigPic}} | ||
| 5 | - <img src="{{image bigPic}}"> | ||
| 6 | - {{/ if}} | ||
| 7 | - {{/ detail}} | ||
| 8 | - <div class="left-title">儿童造型</div> | ||
| 9 | - {{#if content}} | ||
| 10 | - <div class="content">{{{content}}}</div> | 12 | + <div class="content no-pd-top">{{{content}}}</div> |
| 11 | {{/if}} | 13 | {{/if}} |
| 12 | </div> | 14 | </div> |
| 13 | <div class="tip-tittle"> | 15 | <div class="tip-tittle"> |
| @@ -24,8 +26,10 @@ | @@ -24,8 +26,10 @@ | ||
| 24 | <span></span> | 26 | <span></span> |
| 25 | 预约后需到店付款 | 27 | 预约后需到店付款 |
| 26 | </div> | 28 | </div> |
| 27 | - {{# packageList}} | ||
| 28 | - {{> trend/cutter-package}} | ||
| 29 | - {{/packageList}} | 29 | + <div> |
| 30 | + {{# packageList}} | ||
| 31 | + {{> trend/cutter-package}} | ||
| 32 | + {{/packageList}} | ||
| 33 | + </div> | ||
| 30 | <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=5">立即预约</a> | 34 | <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=5">立即预约</a> |
| 31 | </div> | 35 | </div> |
| @@ -2,22 +2,22 @@ | @@ -2,22 +2,22 @@ | ||
| 2 | {{# userInfo}} | 2 | {{# userInfo}} |
| 3 | <div class="detail-top">预约状态：{{status}}</div> | 3 | <div class="detail-top">预约状态：{{status}}</div> |
| 4 | {{/ userInfo}} | 4 | {{/ userInfo}} |
| 5 | - <div class="detail-list"> | 5 | + <div class="detail-list detail-list-2"> |
| 6 | {{#storeInfo}} | 6 | {{#storeInfo}} |
| 7 | <a class="list-item" href="//m.yohobuy.com/activity/trend/store?storeId={{storeId}}"> | 7 | <a class="list-item" href="//m.yohobuy.com/activity/trend/store?storeId={{storeId}}"> |
| 8 | - <span class="icon-pic shop"></span> | 8 | + <span class="iconfont shop"></span> |
| 9 | 门店：{{name}} | 9 | 门店：{{name}} |
| 10 | <span class="iconfont icon-arr"></span> | 10 | <span class="iconfont icon-arr"></span> |
| 11 | </a> | 11 | </a> |
| 12 | <a class="list-item"{{#if longitude}} href="//m.yohobuy.com/activity/trend/map?jd={{longitude}}&wd={{latitude}}&name={{storeName}}&intro={{introduction}}&tel={{telephone}}&adr={{address}}&pic={{image pictureUrl}}"{{/if}}> | 12 | <a class="list-item"{{#if longitude}} href="//m.yohobuy.com/activity/trend/map?jd={{longitude}}&wd={{latitude}}&name={{storeName}}&intro={{introduction}}&tel={{telephone}}&adr={{address}}&pic={{image pictureUrl}}"{{/if}}> |
| 13 | - <span class="icon-pic adr"></span> | 13 | + <span class="iconfont adr"></span> |
| 14 | 门店地址：{{adr}} | 14 | 门店地址：{{adr}} |
| 15 | {{#if longitude}} | 15 | {{#if longitude}} |
| 16 | <span class="iconfont icon-arr"></span> | 16 | <span class="iconfont icon-arr"></span> |
| 17 | {{/if}} | 17 | {{/if}} |
| 18 | </a> | 18 | </a> |
| 19 | <a class="list-item" href="tel:{{telephone}}"> | 19 | <a class="list-item" href="tel:{{telephone}}"> |
| 20 | - <span class="icon-pic tel"></span> | 20 | + <span class="iconfont tel"></span> |
| 21 | 门店电话：{{telephone}} | 21 | 门店电话：{{telephone}} |
| 22 | <span class="iconfont icon-arr"></span> | 22 | <span class="iconfont icon-arr"></span> |
| 23 | </a> | 23 | </a> |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | {{/ storeInfo}} | 25 | {{/ storeInfo}} |
| 26 | </div> | 26 | </div> |
| 27 | {{# adviserDetail}} | 27 | {{# adviserDetail}} |
| 28 | - <div class="detail-list"> | 28 | + <div class="detail-list big-list"> |
| 29 | {{# adviser}} | 29 | {{# adviser}} |
| 30 | <a class="list-item" href="{{../userInfo/originUrl}}"> | 30 | <a class="list-item" href="{{../userInfo/originUrl}}"> |
| 31 | <span class="big">潮流之旅</span> | 31 | <span class="big">潮流之旅</span> |
| @@ -57,7 +57,7 @@ | @@ -57,7 +57,7 @@ | ||
| 57 | </a> | 57 | </a> |
| 58 | {{/ act}} | 58 | {{/ act}} |
| 59 | </div> | 59 | </div> |
| 60 | - <div class="detail-list{{# adviser}} hide{{/ adviser}}"> | 60 | + <div class="detail-list{{# adviser}} hide{{/ adviser}} detail-list-3"> |
| 61 | <div class="list-item"> | 61 | <div class="list-item"> |
| 62 | <div class="package-item"> | 62 | <div class="package-item"> |
| 63 | <div class="top clearfix"> | 63 | <div class="top clearfix"> |
| @@ -101,12 +101,12 @@ | @@ -101,12 +101,12 @@ | ||
| 101 | </div> | 101 | </div> |
| 102 | </div> | 102 | </div> |
| 103 | {{/ adviserDetail}} | 103 | {{/ adviserDetail}} |
| 104 | - <div class="detail-list"> | 104 | + <div class="detail-list detail-list-3"> |
| 105 | {{# userInfo}} | 105 | {{# userInfo}} |
| 106 | <div class="list-item padding"> | 106 | <div class="list-item padding"> |
| 107 | {{#if ../adviserDetail/adviser}} | 107 | {{#if ../adviserDetail/adviser}} |
| 108 | <div class="chosen chosen-detail{{#if ../adviserDetail/hideAd}} hide{{/if}}"> | 108 | <div class="chosen chosen-detail{{#if ../adviserDetail/hideAd}} hide{{/if}}"> |
| 109 | - <a class="chose-item select" href="//m.yohobuy.com/activity/trend/adviser?id={{../adviserDetail/id}}&typeStatus={{../adviserDetail/activityType}}&storeId={{../adviserDetail/storeId}}"> | 109 | + <a class="chose-item select chose-item-2" href="//m.yohobuy.com/activity/trend/adviser?id={{../adviserDetail/id}}&typeStatus={{../adviserDetail/activityType}}&storeId={{../adviserDetail/storeId}}"> |
| 110 | <span class="label">潮流顾问</span> | 110 | <span class="label">潮流顾问</span> |
| 111 | <input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" /> | 111 | <input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" /> |
| 112 | <span class="iconfont icon-arr"></span> | 112 | <span class="iconfont icon-arr"></span> |
| @@ -116,7 +116,7 @@ | @@ -116,7 +116,7 @@ | ||
| 116 | {{#if ../adviserDetail/kidStyle}} | 116 | {{#if ../adviserDetail/kidStyle}} |
| 117 | {{#if ../userInfo/personName}} | 117 | {{#if ../userInfo/personName}} |
| 118 | <div class="chosen chosen-detail"> | 118 | <div class="chosen chosen-detail"> |
| 119 | - <a class="chose-item select" href="//m.yohobuy.com/activity/trend/cutter?storeId={{../adviserDetail/storeId}}&id={{../userInfo/personId}}&typeStatus={{../adviserDetail/activityType}}&cutterName={{../userInfo/personName}}"> | 119 | + <a class="chose-item select chose-item-2" href="//m.yohobuy.com/activity/trend/cutter?storeId={{../adviserDetail/storeId}}&id={{../userInfo/personId}}&typeStatus={{../adviserDetail/activityType}}&cutterName={{../userInfo/personName}}"> |
| 120 | <span class="label">发型师</span> | 120 | <span class="label">发型师</span> |
| 121 | <input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" /> | 121 | <input class="inp eps" type="text" value="{{../userInfo/personName}}" readonly="readonly" /> |
| 122 | <span class="iconfont icon-arr"></span> | 122 | <span class="iconfont icon-arr"></span> |
| @@ -169,7 +169,7 @@ | @@ -169,7 +169,7 @@ | ||
| 169 | </div> | 169 | </div> |
| 170 | {{/if}} | 170 | {{/if}} |
| 171 | {{#if userNote}} | 171 | {{#if userNote}} |
| 172 | - <div> | 172 | + <div class="tip-limit"> |
| 173 | <span class="tip-top">备注：</span> | 173 | <span class="tip-top">备注：</span> |
| 174 | <span class="tip-main">{{userNote}}</span> | 174 | <span class="tip-main">{{userNote}}</span> |
| 175 | </div> | 175 | </div> |
| 1 | <div class="trend-c share-photography" id="no-download"> | 1 | <div class="trend-c share-photography" id="no-download"> |
| 2 | + {{# detail}} | ||
| 3 | + {{#if bigPic}} | ||
| 4 | + <img src="{{image bigPic}}"> | ||
| 5 | + {{/if}} | ||
| 6 | + {{#if name}} | ||
| 7 | + <div class="left-title center eps">{{name}}</div> | ||
| 8 | + {{/if}} | ||
| 9 | + {{/ detail}} | ||
| 2 | <div class="box-padding"> | 10 | <div class="box-padding"> |
| 3 | - {{# detail}} | ||
| 4 | - {{#if bigPic}} | ||
| 5 | - <img src="{{image bigPic}}"> | ||
| 6 | - {{/if}} | ||
| 7 | - {{/ detail}} | ||
| 8 | - <div class="left-title">儿童摄影</div> | ||
| 9 | {{#if content}} | 11 | {{#if content}} |
| 10 | - <div class="content">{{{content}}}</div> | 12 | + <div class="content no-pd-top">{{{content}}}</div> |
| 11 | {{/if}} | 13 | {{/if}} |
| 12 | </div> | 14 | </div> |
| 13 | - <div class="big-title">当季最IN主题</div> | ||
| 14 | - <div class="swiper-c"> | ||
| 15 | - <div class="swiper-container"> | ||
| 16 | - <div class="swiper-wrapper"> | ||
| 17 | - {{# swiper}} | ||
| 18 | - <div class="swiper-slide"> | ||
| 19 | - <a href="http://m.yohobuy.com/activity/trend/style-detail?id={{id}}&storeId={{storeId}}&styleName={{name}}"> | ||
| 20 | - <div class="pic limit-pic"> | ||
| 21 | - <img src="{{image pic}}"> | ||
| 22 | - </div> | ||
| 23 | - <p class="title eps">{{name}}</p> | ||
| 24 | - <p class="main">{{introduction}}</p> | ||
| 25 | - </a> | ||
| 26 | - </div> | ||
| 27 | - {{/ swiper}} | ||
| 28 | - </div> | ||
| 29 | - <div class="swiper-pagination"></div> | ||
| 30 | - </div> | 15 | + <div class="big-title no-border font-normal">当季最IN主题 |
| 16 | + <a class="more" href="//m.yohobuy.com/activity/trend/all-style?storeId={{storeId}}&id={{id}}">MORE</a> | ||
| 17 | + </div> | ||
| 18 | + <div class="push-style"> | ||
| 19 | + {{# swiper}} | ||
| 20 | + <a href="http://m.yohobuy.com/activity/trend/style-detail?id={{id}}&storeId={{storeId}}&styleName={{name}}"> | ||
| 21 | + <div class="pic limit-pic"> | ||
| 22 | + <img src="{{image pic}}"> | ||
| 23 | + <p class="title eps">{{name}}</p> | ||
| 24 | + </div> | ||
| 25 | + </a> | ||
| 26 | + {{/ swiper}} | ||
| 31 | </div> | 27 | </div> |
| 28 | + <div class="more-article-c"> | ||
| 29 | + <a class="more-article" href="//m.yohobuy.com/activity/trend/all-style?storeId={{storeId}}&id={{id}}">查看所有风格 | ||
| 30 | + <span class="iconfont icon-arr"></span> | ||
| 31 | + </a> | ||
| 32 | + </div> | ||
| 33 | + {{#if packageList}} | ||
| 32 | <div class="tab clearfix"> | 34 | <div class="tab clearfix"> |
| 33 | <div class="tab-top"> | 35 | <div class="tab-top"> |
| 34 | - <span class="active">风格</span> | ||
| 35 | - <span>套餐</span> | 36 | + <span>推荐套餐</span> |
| 36 | </div> | 37 | </div> |
| 37 | <div class="tab-item"> | 38 | <div class="tab-item"> |
| 38 | - <div class="tab-ul clearfix"> | ||
| 39 | - <div class="pull-pic-list clearfix"> | ||
| 40 | - {{# styleList}} | ||
| 41 | - <div class="box"> | ||
| 42 | - <a href="http://m.yohobuy.com/activity/trend/style-detail?id={{id}}&storeId={{../storeId}}&styleName={{name}}"> | ||
| 43 | - <img data="{{image img}}"> | ||
| 44 | - </a> | ||
| 45 | - </div> | ||
| 46 | - {{/ styleList}} | ||
| 47 | - </div> | ||
| 48 | - </div> | ||
| 49 | - </div> | ||
| 50 | - <div class="tab-item hide"> | ||
| 51 | <div class="package-top"> | 39 | <div class="package-top"> |
| 52 | <span></span> | 40 | <span></span> |
| 53 | 预约后需到店付款 | 41 | 预约后需到店付款 |
| @@ -59,5 +47,6 @@ | @@ -59,5 +47,6 @@ | ||
| 59 | </ul> | 47 | </ul> |
| 60 | </div> | 48 | </div> |
| 61 | </div> | 49 | </div> |
| 50 | + {{/if}} | ||
| 62 | <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=4">立即预约</a> | 51 | <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=4">立即预约</a> |
| 63 | </div> | 52 | </div> |
| 1 | -<div class="trend-c no-pb share-store" id="no-download"> | 1 | +<div class="trend-c no-pb no-mg share-store" id="no-download"> |
| 2 | + <div class="article-2"> | ||
| 2 | {{# infos}} | 3 | {{# infos}} |
| 3 | {{> trend/article}} | 4 | {{> trend/article}} |
| 4 | {{/ infos}} | 5 | {{/ infos}} |
| 6 | + </div> | ||
| 5 | {{#if infos}} | 7 | {{#if infos}} |
| 6 | {{#detail}} | 8 | {{#detail}} |
| 7 | - <a class="more-article" href="//m.yohobuy.com/activity/trend/article-list?storeId={{storeId}}&name={{storeName}}&intro={{introduction}}&pic={{image pictureUrl}}">更多活动资讯 | ||
| 8 | - <span class="iconfont icon-arr"></span> | ||
| 9 | - </a> | 9 | + <div class="more-article-c"> |
| 10 | + <a class="more-article" href="//m.yohobuy.com/activity/trend/article-list?storeId={{storeId}}&name={{storeName}}&intro={{introduction}}&pic={{image pictureUrl}}">更多活动资讯 | ||
| 11 | + <span class="iconfont icon-arr"></span> | ||
| 12 | + </a> | ||
| 13 | + </div> | ||
| 10 | {{/ detail}} | 14 | {{/ detail}} |
| 11 | {{/if}} | 15 | {{/if}} |
| 12 | <div class="article"> | 16 | <div class="article"> |
| @@ -17,22 +21,22 @@ | @@ -17,22 +21,22 @@ | ||
| 17 | <img src="{{image pictureUrl}}"> | 21 | <img src="{{image pictureUrl}}"> |
| 18 | </div> | 22 | </div> |
| 19 | {{/if}} | 23 | {{/if}} |
| 20 | - <p class="title">{{storeName}}</p> | 24 | + <p class="title eps">{{storeName}}</p> |
| 21 | <div class="tip tip-2">{{introduction}}</div> | 25 | <div class="tip tip-2">{{introduction}}</div> |
| 22 | <div class="list"> | 26 | <div class="list"> |
| 23 | <a class="list-item"> | 27 | <a class="list-item"> |
| 24 | - <span class="icon-pic clock"></span> | 28 | + <span class="iconfont time"></span> |
| 25 | 营业时间：{{businessTime}} | 29 | 营业时间：{{businessTime}} |
| 26 | </a> | 30 | </a> |
| 27 | <a class="list-item"{{#if longitude}} href="//m.yohobuy.com/activity/trend/map?jd={{longitude}}&wd={{latitude}}&name={{storeName}}&intro={{introduction}}&tel={{telephone}}&adr={{address}}&pic={{image pictureUrl}}"{{/if}}> | 31 | <a class="list-item"{{#if longitude}} href="//m.yohobuy.com/activity/trend/map?jd={{longitude}}&wd={{latitude}}&name={{storeName}}&intro={{introduction}}&tel={{telephone}}&adr={{address}}&pic={{image pictureUrl}}"{{/if}}> |
| 28 | - <span class="icon-pic adr"></span> | 32 | + <span class="iconfont adr"></span> |
| 29 | 门店地址：{{address}} | 33 | 门店地址：{{address}} |
| 30 | {{#if longitude}} | 34 | {{#if longitude}} |
| 31 | <span class="iconfont icon-arr"></span> | 35 | <span class="iconfont icon-arr"></span> |
| 32 | {{/if}} | 36 | {{/if}} |
| 33 | </a> | 37 | </a> |
| 34 | <a class="list-item" href="tel:{{telephone}}"> | 38 | <a class="list-item" href="tel:{{telephone}}"> |
| 35 | - <span class="icon-pic tel"></span> | 39 | + <span class="iconfont tel"></span> |
| 36 | 门店电话：{{telephone}} | 40 | 门店电话：{{telephone}} |
| 37 | <span class="iconfont icon-arr"></span> | 41 | <span class="iconfont icon-arr"></span> |
| 38 | </a> | 42 | </a> |
| @@ -41,6 +45,7 @@ | @@ -41,6 +45,7 @@ | ||
| 41 | {{/ detail}} | 45 | {{/ detail}} |
| 42 | </div> | 46 | </div> |
| 43 | </div> | 47 | </div> |
| 48 | + {{#if storeSon}} | ||
| 44 | <div class="appointment"> | 49 | <div class="appointment"> |
| 45 | <div class="title">活动预约</div> | 50 | <div class="title">活动预约</div> |
| 46 | {{# storeSon}} | 51 | {{# storeSon}} |
| @@ -49,4 +54,5 @@ | @@ -49,4 +54,5 @@ | ||
| 49 | </a> | 54 | </a> |
| 50 | {{/ storeSon}} | 55 | {{/ storeSon}} |
| 51 | </div> | 56 | </div> |
| 57 | + {{/if}} | ||
| 52 | </div> | 58 | </div> |
| 1 | <div class="trend-c" id="no-download"> | 1 | <div class="trend-c" id="no-download"> |
| 2 | - <div class="box-padding style-detail"> | 2 | + <div class="box-padding style-detail no-border"> |
| 3 | <div class="content">{{introduction}}</div> | 3 | <div class="content">{{introduction}}</div> |
| 4 | <input class="share-pic" type="hidden" value="{{sharePic}}" /> | 4 | <input class="share-pic" type="hidden" value="{{sharePic}}" /> |
| 5 | - <div class="pull-pic-list clearfix"> | 5 | + <div> |
| 6 | {{# picList}} | 6 | {{# picList}} |
| 7 | - <div class="box"> | ||
| 8 | - <img data="{{image imgSrc}}" /> | ||
| 9 | - </div> | 7 | + <img class="detail-pic" src="{{image imgSrc}}" /> |
| 10 | {{/ picList}} | 8 | {{/ picList}} |
| 11 | - </div> | 9 | + </div> |
| 12 | </div> | 10 | </div> |
| 13 | <a class="foot-btn ok" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=4">立即预约</a> | 11 | <a class="foot-btn ok" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=4">立即预约</a> |
| 14 | <div class="big-pic"> | 12 | <div class="big-pic"> |
| 1 | -<div class="trend-c travel" id="no-download"> | 1 | +<div class="trend-c travel change-bottom" id="no-download"> |
| 2 | <div class="box"> | 2 | <div class="box"> |
| 3 | <div class="content content-padding2"> | 3 | <div class="content content-padding2"> |
| 4 | {{{content}}} | 4 | {{{content}}} |
| @@ -9,9 +9,11 @@ | @@ -9,9 +9,11 @@ | ||
| 9 | 潮流顾问 | 9 | 潮流顾问 |
| 10 | </div> | 10 | </div> |
| 11 | {{/if}} | 11 | {{/if}} |
| 12 | - {{# adviser}} | ||
| 13 | - {{> trend/adviser}} | ||
| 14 | - {{/ adviser}} | 12 | + <div class="adviser-c"> |
| 13 | + {{# adviser}} | ||
| 14 | + {{> trend/adviser}} | ||
| 15 | + {{/ adviser}} | ||
| 16 | + </div> | ||
| 15 | {{#if dateList}} | 17 | {{#if dateList}} |
| 16 | <div class="big-title"> | 18 | <div class="big-title"> |
| 17 | 可预约时间 | 19 | 可预约时间 |
| @@ -24,6 +26,6 @@ | @@ -24,6 +26,6 @@ | ||
| 24 | <p>2、您可以和2-3名好友一起来参加活动，共同体验潮流之旅；</p> | 26 | <p>2、您可以和2-3名好友一起来参加活动，共同体验潮流之旅；</p> |
| 25 | <p>3、活动时长预估时间，如超出时间请您谅解。</p> | 27 | <p>3、活动时长预估时间，如超出时间请您谅解。</p> |
| 26 | </div> | 28 | </div> |
| 27 | - <a class="foot-btn ok clearCookie" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=3">立即预约</a> | 29 | + <a class="foot-btn ok clearCookie check-vip" data-vip="{{vip}}" href="//m.yohobuy.com/activity/trend/appointment?storeId={{storeId}}&typeStatus=3">立即预约</a> |
| 28 | <input type="hidden" id="hairStylistId" value="{{hairStylistId}}" /> | 30 | <input type="hidden" id="hairStylistId" value="{{hairStylistId}}" /> |
| 29 | </div> | 31 | </div> |
| 1 | <div class="class"> | 1 | <div class="class"> |
| 2 | <div class="class-item clearfix"> | 2 | <div class="class-item clearfix"> |
| 3 | <a class="pic" href="//m.yohobuy.com/activity/trend/act-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status={{status}}&storeId={{storeId}}&pic={{image image}}"> | 3 | <a class="pic" href="//m.yohobuy.com/activity/trend/act-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status={{status}}&storeId={{storeId}}&pic={{image image}}"> |
| 4 | - <img src="{{image image}}"> | 4 | + <img src="{{image2 image mode=2 q=60}}"> |
| 5 | <div class="info"> | 5 | <div class="info"> |
| 6 | - <span class="name">{{name}}</span> | 6 | + <span class="name eps">{{name}}</span> |
| 7 | {{#if free}} | 7 | {{#if free}} |
| 8 | <span class="free">免费</span> | 8 | <span class="free">免费</span> |
| 9 | {{else}} | 9 | {{else}} |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | </div> | 12 | </div> |
| 13 | <div class="tip"> | 13 | <div class="tip"> |
| 14 | <div> | 14 | <div> |
| 15 | - <p>日期：{{startDate}}－{{endDate}}</p> | 15 | + <p>日期：{{startDate}}{{#if endDate}}－{{/if}}{{endDate}}</p> |
| 16 | <p>时间：{{startTime}}－{{endTime}}</p> | 16 | <p>时间：{{startTime}}－{{endTime}}</p> |
| 17 | </div> | 17 | </div> |
| 18 | {{#if end}} | 18 | {{#if end}} |
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | </div> | 4 | </div> |
| 5 | <div class="adviser-info"> | 5 | <div class="adviser-info"> |
| 6 | {{#if image}} | 6 | {{#if image}} |
| 7 | - <div class="pic" style="background-image:url({{image image}})"></div> | 7 | + <div class="pic" data-pic="{{image image}}" style="background-image:url({{image image}})"></div> |
| 8 | {{/if}} | 8 | {{/if}} |
| 9 | {{#if name}} | 9 | {{#if name}} |
| 10 | <div class="name">{{name}}</div> | 10 | <div class="name">{{name}}</div> |
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <img src="{{image coverUrl}}"> | 4 | <img src="{{image coverUrl}}"> |
| 5 | </a> | 5 | </a> |
| 6 | <a href="//m.yohobuy.com/activity/trend/article-detail?informationId={{id}}"> | 6 | <a href="//m.yohobuy.com/activity/trend/article-detail?informationId={{id}}"> |
| 7 | - <p class="title">{{title}}</p> | 7 | + <p class="title eps">{{title}}</p> |
| 8 | </a> | 8 | </a> |
| 9 | <div class="tip"> | 9 | <div class="tip"> |
| 10 | <a href="//m.yohobuy.com/activity/trend/article-detail?informationId={{id}}">{{summary}}</a> | 10 | <a href="//m.yohobuy.com/activity/trend/article-detail?informationId={{id}}">{{summary}}</a> |
| 1 | <div class="class"> | 1 | <div class="class"> |
| 2 | <div class="class-item clearfix"> | 2 | <div class="class-item clearfix"> |
| 3 | <a class="pic" href="//m.yohobuy.com/activity/trend/class-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status={{status}}&storeId={{storeId}}&pic={{image image}}"> | 3 | <a class="pic" href="//m.yohobuy.com/activity/trend/class-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status={{status}}&storeId={{storeId}}&pic={{image image}}"> |
| 4 | - <img src="{{image image}}"> | 4 | + <span class="tag">{{tag}}</span> |
| 5 | + <img src="{{image2 image mode=2 q=60}}"> | ||
| 5 | <div class="info"> | 6 | <div class="info"> |
| 6 | - <span class="name">{{name}}</span> | 7 | + <span class="name eps">{{name}}</span> |
| 7 | {{#if free}} | 8 | {{#if free}} |
| 8 | <span class="free">免费</span> | 9 | <span class="free">免费</span> |
| 9 | {{else}} | 10 | {{else}} |
| @@ -12,7 +13,7 @@ | @@ -12,7 +13,7 @@ | ||
| 12 | </div> | 13 | </div> |
| 13 | <div class="tip"> | 14 | <div class="tip"> |
| 14 | <div> | 15 | <div> |
| 15 | - <p>日期：{{startDate}}－{{endDate}}</p> | 16 | + <p>日期：{{startDate}}{{#if endDate}}－{{/if}}{{endDate}}</p> |
| 16 | <p>时间：{{startTime}}－{{endTime}}</p> | 17 | <p>时间：{{startTime}}－{{endTime}}</p> |
| 17 | </div> | 18 | </div> |
| 18 | {{#if end}} | 19 | {{#if end}} |
| @@ -21,7 +21,8 @@ const domains = { | @@ -21,7 +21,8 @@ const domains = { | ||
| 21 | liveApi: 'http://testapi.live.yohops.com:9999/', | 21 | liveApi: 'http://testapi.live.yohops.com:9999/', |
| 22 | imSocket: 'ws://socket.yohobuy.com:10240', | 22 | imSocket: 'ws://socket.yohobuy.com:10240', |
| 23 | imCs: 'http://im.yohobuy.com/api', | 23 | imCs: 'http://im.yohobuy.com/api', |
| 24 | - platformApi: 'http://192.168.102.48:8088/' | 24 | + platformApi: 'http://192.168.102.48:8088/', |
| 25 | + store: 'http://192.168.102.47:8080/portal-gateway/wechat/' | ||
| 25 | }; | 26 | }; |
| 26 | 27 | ||
| 27 | module.exports = { | 28 | module.exports = { |
| @@ -134,7 +135,7 @@ if (isProduction) { | @@ -134,7 +135,7 @@ if (isProduction) { | ||
| 134 | api: 'http://api.yoho.yohoops.org/', | 135 | api: 'http://api.yoho.yohoops.org/', |
| 135 | service: 'http://service.yoho.yohoops.org/', | 136 | service: 'http://service.yoho.yohoops.org/', |
| 136 | global: 'http://api-global.yohobuy.com', | 137 | global: 'http://api-global.yohobuy.com', |
| 137 | - store: '', // 线上域名尚未确定 | 138 | + store: 'http://openstore.yohobuy.com', // 线上域名尚未确定 |
| 138 | liveApi: 'http://api.live.yoho.cn/', | 139 | liveApi: 'http://api.live.yoho.cn/', |
| 139 | singleApi: 'http://single.yoho.cn/', | 140 | singleApi: 'http://single.yoho.cn/', |
| 140 | imSocket: 'wss://imsocket.yohobuy.com:443', | 141 | imSocket: 'wss://imsocket.yohobuy.com:443', |
| @@ -204,7 +205,7 @@ if (isProduction) { | @@ -204,7 +205,7 @@ if (isProduction) { | ||
| 204 | api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/', | 205 | api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/', |
| 205 | service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/', | 206 | service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/', |
| 206 | global: process.env.TEST_GLOBAL || 'http://global-test-soa.yohops.com:9999/', | 207 | global: process.env.TEST_GLOBAL || 'http://global-test-soa.yohops.com:9999/', |
| 207 | - store: process.env.TEST_STORE || 'http://192.168.102.210:8080/portal-gateway/', | 208 | + store: process.env.TEST_STORE || 'http://192.168.102.210:8080/portal-gateway/wechat/', |
| 208 | liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/', | 209 | liveApi: process.env.TEST_LIVE || 'http://testapi.live.yohops.com:9999/', |
| 209 | singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/', | 210 | singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/', |
| 210 | imSocket: process.env.TEST_IM_SOCKET || 'ws://socket.yohobuy.com:10240', | 211 | imSocket: process.env.TEST_IM_SOCKET || 'ws://socket.yohobuy.com:10240', |
No preview for this file type
| @@ -2,7 +2,11 @@ | @@ -2,7 +2,11 @@ | ||
| 2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > | 2 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > |
| 3 | <svg xmlns="http://www.w3.org/2000/svg"> | 3 | <svg xmlns="http://www.w3.org/2000/svg"> |
| 4 | <metadata> | 4 | <metadata> |
| 5 | +<<<<<<< HEAD | ||
| 6 | +Created by FontForge 20120731 at Fri Jun 9 09:57:45 2017 | ||
| 7 | +======= | ||
| 5 | Created by FontForge 20120731 at Tue Jul 4 10:11:46 2017 | 8 | Created by FontForge 20120731 at Tue Jul 4 10:11:46 2017 |
| 9 | +>>>>>>> master | ||
| 6 | By admin | 10 | By admin |
| 7 | </metadata> | 11 | </metadata> |
| 8 | <defs> | 12 | <defs> |
No preview for this file type
No preview for this file type
public/hbs/activity/trend/class-list.hbs
0 → 100644
public/hbs/activity/trend/class.hbs
0 → 100644
| 1 | +<div class="class"> | ||
| 2 | + <div class="class-item clearfix"> | ||
| 3 | + <a class="pic" href="//m.yohobuy.com/activity/trend/class-detail?activityId={{id}}&name={{name}}&price={{price}}&startDate={{startDate}}&endDate={{endDate}}&startTime={{startTime}}&endTime={{endTime}}&status={{status}}&storeId={{storeId}}&pic={{image image}}"> | ||
| 4 | + <span class="tag">{{tag}}</span> | ||
| 5 | + <img src="{{image2 image mode=2 q=60}}"> | ||
| 6 | + <div class="info"> | ||
| 7 | + <span class="name">{{name}}</span> | ||
| 8 | + {{#if free}} | ||
| 9 | + <span class="free">免费</span> | ||
| 10 | + {{else}} | ||
| 11 | + <span class="price"><span>¥</span>{{price}}</span> | ||
| 12 | + {{/if}} | ||
| 13 | + </div> | ||
| 14 | + <div class="tip"> | ||
| 15 | + <div> | ||
| 16 | + <p>日期：{{startDate}}－{{endDate}}</p> | ||
| 17 | + <p>时间：{{startTime}}－{{endTime}}</p> | ||
| 18 | + </div> | ||
| 19 | + {{#if end}} | ||
| 20 | + <div class="end a">已结束</div> | ||
| 21 | + {{else}} | ||
| 22 | + {{#if needApo}} | ||
| 23 | + {{#if apoStatus}} | ||
| 24 | + <div class="a">立即预约</div> | ||
| 25 | + {{else}} | ||
| 26 | + <div class="disable a">已约满</div> | ||
| 27 | + {{/if}} | ||
| 28 | + {{else}} | ||
| 29 | + <div class="any-time a">免预约</div> | ||
| 30 | + {{/if}} | ||
| 31 | + {{/if}} | ||
| 32 | + </div> | ||
| 33 | + </a> | ||
| 34 | + </div> | ||
| 35 | +</div> |
public/img/activity/trend/err.png
0 → 100644
8.2 KB
public/img/activity/trend/ok.png
0 → 100644
10.3 KB
public/img/activity/trend/package-2.png
0 → 100644
1.94 KB
public/img/activity/trend/title-bg.png
0 → 100644
2.33 KB
| @@ -49,6 +49,7 @@ if ($('.chosen-select').length > 0) { | @@ -49,6 +49,7 @@ if ($('.chosen-select').length > 0) { | ||
| 49 | timeResult = indexAct.getAbleTime(); | 49 | timeResult = indexAct.getAbleTime(); |
| 50 | 50 | ||
| 51 | if (timeResult.data) { | 51 | if (timeResult.data) { |
| 52 | + $('.chosen-time').addClass('grey-font'); | ||
| 52 | $('.chosen-time').val(indexAct._formatDay(new Date(timeResult.data * 1000))).addClass('disabled'); | 53 | $('.chosen-time').val(indexAct._formatDay(new Date(timeResult.data * 1000))).addClass('disabled'); |
| 53 | $('.chosen-time').parents('a').attr('href', 'javascript:void(0)'); // eslint-disable-line | 54 | $('.chosen-time').parents('a').attr('href', 'javascript:void(0)'); // eslint-disable-line |
| 54 | window.setCookie('timeStr', timeResult.data); | 55 | window.setCookie('timeStr', timeResult.data); |
public/js/activity/trend-class.page.js
0 → 100644
| 1 | +require('activity/trend/trend.page.css'); | ||
| 2 | +require('activity/trend/share'); | ||
| 3 | + | ||
| 4 | +let tip = require('plugin/tip'); | ||
| 5 | +let classObj = {}; | ||
| 6 | + | ||
| 7 | +classObj = { | ||
| 8 | + init: function() { | ||
| 9 | + let that = this; | ||
| 10 | + | ||
| 11 | + $('.scroll-class .scroll-item').on('click', function() { | ||
| 12 | + let $this = $(this); | ||
| 13 | + let $thisId = $this.attr('id'); | ||
| 14 | + | ||
| 15 | + $this.addClass('active').siblings('span').removeClass('active'); | ||
| 16 | + that.getClass($thisId); | ||
| 17 | + }); | ||
| 18 | + }, | ||
| 19 | + | ||
| 20 | + getClass: function($thisId) { | ||
| 21 | + let classHbs = require('activity/trend/class-list.hbs'); | ||
| 22 | + let typeId = $thisId; | ||
| 23 | + | ||
| 24 | + $.ajax({ | ||
| 25 | + url: '/activity/trend/getClass', | ||
| 26 | + data: { | ||
| 27 | + storeId: window.queryString.storeId, | ||
| 28 | + isFront: window.queryString.isFront, | ||
| 29 | + typeId: typeId | ||
| 30 | + }, | ||
| 31 | + success: function(data) { | ||
| 32 | + let classHtml = classHbs(data); | ||
| 33 | + | ||
| 34 | + $('.class-c').html(classHtml); | ||
| 35 | + }, | ||
| 36 | + error: function() { | ||
| 37 | + tip.show('网络断开了~~'); | ||
| 38 | + } | ||
| 39 | + }); | ||
| 40 | + } | ||
| 41 | +}; | ||
| 42 | + | ||
| 43 | +$( | ||
| 44 | + function() { | ||
| 45 | + classObj.init(); | ||
| 46 | + } | ||
| 47 | +); |
| @@ -100,6 +100,10 @@ $('.order-btn a').on('click', function() { | @@ -100,6 +100,10 @@ $('.order-btn a').on('click', function() { | ||
| 100 | cancelOrder(); | 100 | cancelOrder(); |
| 101 | }); | 101 | }); |
| 102 | 102 | ||
| 103 | +if ($('.fail-pic').length > 0) { | ||
| 104 | + $('html').css('background-color', '#fff'); | ||
| 105 | +} | ||
| 106 | + | ||
| 103 | // 将表单数据存入cookie | 107 | // 将表单数据存入cookie |
| 104 | if ($('#detail-time').length > 0 && window.cookie('detailtTimeStr')) { | 108 | if ($('#detail-time').length > 0 && window.cookie('detailtTimeStr')) { |
| 105 | // 修改预约时间 | 109 | // 修改预约时间 |
| @@ -7,6 +7,7 @@ let indexAct = require('activity/trend/index'); | @@ -7,6 +7,7 @@ let indexAct = require('activity/trend/index'); | ||
| 7 | require('common'); | 7 | require('common'); |
| 8 | 8 | ||
| 9 | require('activity/trend/share'); | 9 | require('activity/trend/share'); |
| 10 | +require('activity/trend/check-vip'); | ||
| 10 | if ($('#map').length > 0) { | 11 | if ($('#map').length > 0) { |
| 11 | require('activity/trend/map'); | 12 | require('activity/trend/map'); |
| 12 | } | 13 | } |
| @@ -17,6 +18,16 @@ $( | @@ -17,6 +18,16 @@ $( | ||
| 17 | window.setCookie('travelType', '3'); | 18 | window.setCookie('travelType', '3'); |
| 18 | } | 19 | } |
| 19 | 20 | ||
| 21 | + if ($('.kids-pic').length > 0) { | ||
| 22 | + $('html').css('background-color', '#fff'); | ||
| 23 | + } | ||
| 24 | + if ($('.success').length > 0) { | ||
| 25 | + $('html').css('background-color', '#fff'); | ||
| 26 | + } | ||
| 27 | + if ($('.err-c').length > 0) { | ||
| 28 | + $('html').css('background-color', '#fff'); | ||
| 29 | + } | ||
| 30 | + | ||
| 20 | // 风格详情页图片点击放大 | 31 | // 风格详情页图片点击放大 |
| 21 | $('.pull-pic-list .box').on('click', function() { | 32 | $('.pull-pic-list .box').on('click', function() { |
| 22 | let thisClick = $(this).index(); | 33 | let thisClick = $(this).index(); |
| @@ -24,6 +35,12 @@ $( | @@ -24,6 +35,12 @@ $( | ||
| 24 | indexAct.pullPicBig(thisClick); | 35 | indexAct.pullPicBig(thisClick); |
| 25 | }); | 36 | }); |
| 26 | 37 | ||
| 38 | + $('.detail-pic').on('click', function() { | ||
| 39 | + let thisClick = $(this).index(); | ||
| 40 | + | ||
| 41 | + indexAct.pullPicBig(thisClick); | ||
| 42 | + }); | ||
| 43 | + | ||
| 27 | // 瀑布流 | 44 | // 瀑布流 |
| 28 | if ($('.pull-pic-list').length > 0) { | 45 | if ($('.pull-pic-list').length > 0) { |
| 29 | indexAct.pullPic(); | 46 | indexAct.pullPic(); |
| @@ -44,14 +61,14 @@ $( | @@ -44,14 +61,14 @@ $( | ||
| 44 | $('#' + openId).addClass('active'); | 61 | $('#' + openId).addClass('active'); |
| 45 | }); | 62 | }); |
| 46 | 63 | ||
| 47 | - $('.tab .tab-top span').on('click', function() { | ||
| 48 | - let $this = $(this); | ||
| 49 | - let tabIndex = $this.index(); | 64 | + // $('.tab .tab-top span').on('click', function() { |
| 65 | + // let $this = $(this); | ||
| 66 | + // let tabIndex = $this.index(); | ||
| 50 | 67 | ||
| 51 | - $this.addClass('active').siblings('span').removeClass('active'); | ||
| 52 | - $this.parents('.tab').find('.tab-item:eq(' + tabIndex + ')').show().siblings('.tab-item').hide(); | ||
| 53 | - }); | 68 | + // $this.addClass('active').siblings('span').removeClass('active'); |
| 69 | + // $this.parents('.tab').find('.tab-item:eq(' + tabIndex + ')').show().siblings('.tab-item').hide(); | ||
| 70 | + // }); | ||
| 54 | 71 | ||
| 55 | - $('.tab-item:first').show(); | 72 | + // $('.tab-item:first').show(); |
| 56 | } | 73 | } |
| 57 | ); | 74 | ); |
public/js/activity/trend/check-vip.js
0 → 100644
| 1 | +let checkObj = {}; | ||
| 2 | + | ||
| 3 | +checkObj = { | ||
| 4 | + init: function() { | ||
| 5 | + let that = this; | ||
| 6 | + let thisVip = ''; | ||
| 7 | + let limitVip = String($('.check-vip').data('vip')); | ||
| 8 | + | ||
| 9 | + $('.check-vip').on('click', function() { | ||
| 10 | + that.getVip().then(result => { | ||
| 11 | + if (result === 400) { | ||
| 12 | + let newUrl = '//m.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href); | ||
| 13 | + | ||
| 14 | + location.href = newUrl; | ||
| 15 | + } else { | ||
| 16 | + thisVip = result; | ||
| 17 | + if ((limitVip === '-1') || (limitVip.indexOf(thisVip) >= 0)) { | ||
| 18 | + let href = $('.check-vip').attr('href'); | ||
| 19 | + | ||
| 20 | + window.location.href = href; | ||
| 21 | + } else { | ||
| 22 | + window.location.href = 'http://m.yohobuy.com/activity/trend/err'; | ||
| 23 | + } | ||
| 24 | + } | ||
| 25 | + }); | ||
| 26 | + return false; | ||
| 27 | + }); | ||
| 28 | + }, | ||
| 29 | + getVip: function() { | ||
| 30 | + return $.ajax({ | ||
| 31 | + url: '/activity/trend/getVip', | ||
| 32 | + data: {} | ||
| 33 | + }).then(result => { | ||
| 34 | + let thisVip = ''; | ||
| 35 | + | ||
| 36 | + if (result && result.data) { | ||
| 37 | + thisVip = result.data.vipLevel; | ||
| 38 | + return thisVip; | ||
| 39 | + } else { | ||
| 40 | + return result.code; | ||
| 41 | + } | ||
| 42 | + }); | ||
| 43 | + } | ||
| 44 | +}; | ||
| 45 | + | ||
| 46 | +$( | ||
| 47 | + function() { | ||
| 48 | + checkObj.init(); | ||
| 49 | + } | ||
| 50 | +); |
| @@ -259,19 +259,23 @@ function pullPicBig(cIndex) { | @@ -259,19 +259,23 @@ function pullPicBig(cIndex) { | ||
| 259 | 259 | ||
| 260 | function chosenDefault() { | 260 | function chosenDefault() { |
| 261 | if ($('.class-detail').length > 0) { | 261 | if ($('.class-detail').length > 0) { |
| 262 | + clearCookieArr(3); | ||
| 262 | window.setCookie('chosenClass', $('.class-detail').find('.name').text()); | 263 | window.setCookie('chosenClass', $('.class-detail').find('.name').text()); |
| 263 | window.setCookie('packageId', $('.class-detail').find('.name').attr('id')); | 264 | window.setCookie('packageId', $('.class-detail').find('.name').attr('id')); |
| 264 | } | 265 | } |
| 265 | if ($('.adviser-info').find('.name').length > 0) { | 266 | if ($('.adviser-info').find('.name').length > 0) { |
| 267 | + clearCookieArr(3); | ||
| 266 | window.setCookie('chosenCutter', $('.adviser-info').find('.name').text()); | 268 | window.setCookie('chosenCutter', $('.adviser-info').find('.name').text()); |
| 267 | window.setCookie('chosenAdviser', $('.adviser-info').find('.name').text()); | 269 | window.setCookie('chosenAdviser', $('.adviser-info').find('.name').text()); |
| 268 | window.setCookie('cutterId', $('.cutter-id').val()); | 270 | window.setCookie('cutterId', $('.cutter-id').val()); |
| 269 | } | 271 | } |
| 270 | if ($('.style-detail').length > 0) { | 272 | if ($('.style-detail').length > 0) { |
| 273 | + clearCookieArr(3); | ||
| 271 | window.setCookie('styleId', window.queryString.id); | 274 | window.setCookie('styleId', window.queryString.id); |
| 272 | window.setCookie('chosenStyle', ' ' + decodeURI(window.queryString.styleName) + ' '); | 275 | window.setCookie('chosenStyle', ' ' + decodeURI(window.queryString.styleName) + ' '); |
| 273 | } | 276 | } |
| 274 | if ($('.package-detail').length > 0 && $('.foot-btn').length > 0) { | 277 | if ($('.package-detail').length > 0 && $('.foot-btn').length > 0) { |
| 278 | + clearCookieArr(3); | ||
| 275 | window.setCookie('chosenPackage', $('.package-detail').find('.name').text()); | 279 | window.setCookie('chosenPackage', $('.package-detail').find('.name').text()); |
| 276 | window.setCookie('packageLimit', $('.package-detail').find('.limit').val()); | 280 | window.setCookie('packageLimit', $('.package-detail').find('.limit').val()); |
| 277 | window.setCookie('packageStyle', $('.package-detail').find('.styleid').val()); | 281 | window.setCookie('packageStyle', $('.package-detail').find('.styleid').val()); |
| @@ -2,7 +2,6 @@ $( | @@ -2,7 +2,6 @@ $( | ||
| 2 | function() { | 2 | function() { |
| 3 | // 地图初始化 | 3 | // 地图初始化 |
| 4 | let w_height = $(window).height(); | 4 | let w_height = $(window).height(); |
| 5 | - let h_height = $('.yoho-header').height(); | ||
| 6 | let mapPic = decodeURI(window.queryString.pic); | 5 | let mapPic = decodeURI(window.queryString.pic); |
| 7 | let mapName = decodeURI(window.queryString.name); | 6 | let mapName = decodeURI(window.queryString.name); |
| 8 | let napAdr = decodeURI(window.queryString.adr); | 7 | let napAdr = decodeURI(window.queryString.adr); |
| @@ -26,7 +25,7 @@ $( | @@ -26,7 +25,7 @@ $( | ||
| 26 | }); | 25 | }); |
| 27 | let map = ''; | 26 | let map = ''; |
| 28 | 27 | ||
| 29 | - $('#map').css('height', (w_height - h_height) + 'px'); | 28 | + $('#map').css('height', w_height + 'px'); |
| 30 | map = new window.BMap.Map('map'); | 29 | map = new window.BMap.Map('map'); |
| 31 | 30 | ||
| 32 | // 百度地图API功能 | 31 | // 百度地图API功能 |
| @@ -37,7 +37,7 @@ if ((window.queryString.typeStatus === '3') && ($('.adviser-info').length > 0)) | @@ -37,7 +37,7 @@ if ((window.queryString.typeStatus === '3') && ($('.adviser-info').length > 0)) | ||
| 37 | share({ | 37 | share({ |
| 38 | title: '潮流顾问介绍-' + $('.trend-c').find('.name:eq(0)').text(), | 38 | title: '潮流顾问介绍-' + $('.trend-c').find('.name:eq(0)').text(), |
| 39 | desc: $('.trend-c').find('.intro:eq(0)').text(), | 39 | desc: $('.trend-c').find('.intro:eq(0)').text(), |
| 40 | - imgUrl: urlHttp($('.trend-c').find('.pic:eq(0)').attr('src')) | 40 | + imgUrl: urlHttp($('.trend-c').find('.pic:eq(0)').data('pic')) |
| 41 | }); | 41 | }); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| @@ -118,7 +118,7 @@ if ($('.share-cutter').length > 0) { | @@ -118,7 +118,7 @@ if ($('.share-cutter').length > 0) { | ||
| 118 | share({ | 118 | share({ |
| 119 | title: '发型师介绍-' + $('.trend-c').find('.name:eq(0)').text(), | 119 | title: '发型师介绍-' + $('.trend-c').find('.name:eq(0)').text(), |
| 120 | desc: $('.trend-c').find('.info:eq(0)').text(), | 120 | desc: $('.trend-c').find('.info:eq(0)').text(), |
| 121 | - imgUrl: urlHttp($('.trend-c').find('.pic').attr('src')) | 121 | + imgUrl: urlHttp($('.trend-c').find('.pic').data('pic')) |
| 122 | }); | 122 | }); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| @@ -178,6 +178,7 @@ if ($('.share-class').length > 0) { | @@ -178,6 +178,7 @@ if ($('.share-class').length > 0) { | ||
| 178 | 178 | ||
| 179 | // 订单列表页，订单详情页 | 179 | // 订单列表页，订单详情页 |
| 180 | if ($('.share-order').length > 0) { | 180 | if ($('.share-order').length > 0) { |
| 181 | + $('html').css('background-color', '#ebebeb'); | ||
| 181 | share({ | 182 | share({ |
| 182 | title: $('.trend-c').find('.share-info').attr('data-name'), | 183 | title: $('.trend-c').find('.share-info').attr('data-name'), |
| 183 | desc: $('.trend-c').find('.share-info').attr('data-intro'), | 184 | desc: $('.trend-c').find('.share-info').attr('data-intro'), |
| @@ -110,7 +110,9 @@ $.ajax({ | @@ -110,7 +110,9 @@ $.ajax({ | ||
| 110 | withCredentials: true | 110 | withCredentials: true |
| 111 | }, | 111 | }, |
| 112 | data: { | 112 | data: { |
| 113 | - shop_id: shopId | 113 | + shop_id: shopId, |
| 114 | + order: '0', | ||
| 115 | + type: 'default' | ||
| 114 | }, | 116 | }, |
| 115 | success: function(result) { | 117 | success: function(result) { |
| 116 | let $result = $(result); | 118 | let $result = $(result); |
| @@ -3,11 +3,23 @@ | @@ -3,11 +3,23 @@ | ||
| 3 | @import "layout/swiper"; | 3 | @import "layout/swiper"; |
| 4 | @import "map"; | 4 | @import "map"; |
| 5 | 5 | ||
| 6 | +html { | ||
| 7 | + background-color: #ebebeb; | ||
| 8 | +} | ||
| 9 | + | ||
| 6 | .trend-c.map-c { | 10 | .trend-c.map-c { |
| 7 | padding: 0; | 11 | padding: 0; |
| 8 | margin: 0; | 12 | margin: 0; |
| 9 | } | 13 | } |
| 10 | 14 | ||
| 15 | +.dialog-box { | ||
| 16 | + background: hsla(100, 100%, 100%, 1) !important; | ||
| 17 | +} | ||
| 18 | + | ||
| 19 | +.dialog-right-btn { | ||
| 20 | + border-radius: 0 !important; | ||
| 21 | +} | ||
| 22 | + | ||
| 11 | .trend-c { | 23 | .trend-c { |
| 12 | width: 100%; | 24 | width: 100%; |
| 13 | position: relative; | 25 | position: relative; |
| @@ -15,6 +27,64 @@ | @@ -15,6 +27,64 @@ | ||
| 15 | background-color: #ebebeb; | 27 | background-color: #ebebeb; |
| 16 | margin-bottom: 88px; | 28 | margin-bottom: 88px; |
| 17 | 29 | ||
| 30 | + .font-normal { | ||
| 31 | + font-weight: normal !important; | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + .center { | ||
| 35 | + text-align: center; | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + &.change-bottom { | ||
| 39 | + margin-bottom: 0; | ||
| 40 | + padding-bottom: 88px; | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | + .err-c { | ||
| 44 | + background-color: #fff; | ||
| 45 | + padding-top: 100px; | ||
| 46 | + | ||
| 47 | + .pic { | ||
| 48 | + background-image: resolve("activity/trend/err.png"); | ||
| 49 | + width: 175px; | ||
| 50 | + height: 175px; | ||
| 51 | + margin: 0 auto; | ||
| 52 | + background-size: 100% 100%; | ||
| 53 | + } | ||
| 54 | + | ||
| 55 | + .tips { | ||
| 56 | + text-align: center; | ||
| 57 | + line-height: 100px; | ||
| 58 | + color: #444; | ||
| 59 | + font-size: 24px; | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + .detail-pic { | ||
| 64 | + margin: 20px 0; | ||
| 65 | + } | ||
| 66 | + | ||
| 67 | + .push-style { | ||
| 68 | + .pic { | ||
| 69 | + position: relative; | ||
| 70 | + } | ||
| 71 | + | ||
| 72 | + .title { | ||
| 73 | + color: #fff; | ||
| 74 | + font-size: 38px; | ||
| 75 | + position: absolute; | ||
| 76 | + bottom: 0; | ||
| 77 | + left: 0; | ||
| 78 | + background-image: resolve("activity/trend/title-bg.png"); | ||
| 79 | + width: 100%; | ||
| 80 | + height: 255px; | ||
| 81 | + background-size: 100% 100%; | ||
| 82 | + line-height: 400px; | ||
| 83 | + padding-left: 30px; | ||
| 84 | + font-weight: 500; | ||
| 85 | + } | ||
| 86 | + } | ||
| 87 | + | ||
| 18 | .opacity { | 88 | .opacity { |
| 19 | opacity: 0.6; | 89 | opacity: 0.6; |
| 20 | } | 90 | } |
| @@ -35,7 +105,7 @@ | @@ -35,7 +105,7 @@ | ||
| 35 | padding-top: 200px; | 105 | padding-top: 200px; |
| 36 | 106 | ||
| 37 | .success-pic { | 107 | .success-pic { |
| 38 | - background-image: resolve("channel/student/success.png"); | 108 | + background-image: resolve("activity/trend/ok.png"); |
| 39 | width: 200px; | 109 | width: 200px; |
| 40 | height: 200px; | 110 | height: 200px; |
| 41 | background-size: 100%; | 111 | background-size: 100%; |
| @@ -56,7 +126,7 @@ | @@ -56,7 +126,7 @@ | ||
| 56 | 126 | ||
| 57 | .tip { | 127 | .tip { |
| 58 | color: #666; | 128 | color: #666; |
| 59 | - font-size: 20px; | 129 | + font-size: 24px; |
| 60 | text-align: center; | 130 | text-align: center; |
| 61 | line-height: 50px; | 131 | line-height: 50px; |
| 62 | } | 132 | } |
| @@ -65,12 +135,13 @@ | @@ -65,12 +135,13 @@ | ||
| 65 | display: block; | 135 | display: block; |
| 66 | width: 400px; | 136 | width: 400px; |
| 67 | height: 80px; | 137 | height: 80px; |
| 68 | - border: solid 4px #444; | 138 | + border: solid 1px #444; |
| 69 | border-radius: 10px; | 139 | border-radius: 10px; |
| 70 | text-align: center; | 140 | text-align: center; |
| 71 | - line-height: 80px; | 141 | + line-height: 70px; |
| 72 | margin: 50px auto 0; | 142 | margin: 50px auto 0; |
| 73 | font-size: 30px; | 143 | font-size: 30px; |
| 144 | + color: #444; | ||
| 74 | } | 145 | } |
| 75 | 146 | ||
| 76 | img { | 147 | img { |
| @@ -87,21 +158,20 @@ | @@ -87,21 +158,20 @@ | ||
| 87 | 158 | ||
| 88 | .pull-pic-list { | 159 | .pull-pic-list { |
| 89 | width: 100%; | 160 | width: 100%; |
| 90 | - margin-top: 30px; | ||
| 91 | position: relative; | 161 | position: relative; |
| 92 | 162 | ||
| 93 | .box { | 163 | .box { |
| 94 | position: relative; | 164 | position: relative; |
| 95 | float: left; | 165 | float: left; |
| 96 | - width: 315px; | ||
| 97 | - margin: 0 15px; | 166 | + width: 335px; |
| 167 | + margin-right: 20px; | ||
| 98 | } | 168 | } |
| 99 | 169 | ||
| 100 | img { | 170 | img { |
| 101 | width: 100%; | 171 | width: 100%; |
| 102 | - border-radius: 10px; | 172 | + border-radius: 4px; |
| 103 | padding: 0; | 173 | padding: 0; |
| 104 | - margin-bottom: 30px; | 174 | + margin-bottom: 20px; |
| 105 | } | 175 | } |
| 106 | } | 176 | } |
| 107 | 177 | ||
| @@ -113,22 +183,25 @@ | @@ -113,22 +183,25 @@ | ||
| 113 | padding-bottom: 0; | 183 | padding-bottom: 0; |
| 114 | } | 184 | } |
| 115 | 185 | ||
| 186 | + &.trend-c.no-mg { | ||
| 187 | + margin-bottom: 0; | ||
| 188 | + } | ||
| 189 | + | ||
| 116 | .package-top { | 190 | .package-top { |
| 117 | line-height: 80px; | 191 | line-height: 80px; |
| 118 | color: #d0021b; | 192 | color: #d0021b; |
| 119 | font-size: 28px; | 193 | font-size: 28px; |
| 120 | padding: 0 30px; | 194 | padding: 0 30px; |
| 121 | - margin-bottom: 10px; | ||
| 122 | - background-color: #fff; | ||
| 123 | - border-bottom: solid 1px #e0e0e0; | 195 | + background-color: #f4f4f4; |
| 124 | 196 | ||
| 125 | span { | 197 | span { |
| 126 | width: 31px; | 198 | width: 31px; |
| 127 | height: 31px; | 199 | height: 31px; |
| 128 | display: inline-block; | 200 | display: inline-block; |
| 129 | - background-image: url("/activity/trend/package.png"); | ||
| 130 | - vertical-align: middle; | 201 | + background-image: resolve("activity/trend/package-2.png"); |
| 202 | + vertical-align: text-bottom; | ||
| 131 | background-size: 100%; | 203 | background-size: 100%; |
| 204 | + margin-bottom: 2px; | ||
| 132 | } | 205 | } |
| 133 | } | 206 | } |
| 134 | 207 | ||
| @@ -143,8 +216,8 @@ | @@ -143,8 +216,8 @@ | ||
| 143 | border-radius: 50%; | 216 | border-radius: 50%; |
| 144 | overflow: hidden; | 217 | overflow: hidden; |
| 145 | -webkit-appearance: none; | 218 | -webkit-appearance: none; |
| 146 | - width: 30px; | ||
| 147 | - height: 30px; | 219 | + width: 32px; |
| 220 | + height: 32px; | ||
| 148 | background-size: 100%; | 221 | background-size: 100%; |
| 149 | background-image: resolve("activity/trend/diy.png"); | 222 | background-image: resolve("activity/trend/diy.png"); |
| 150 | vertical-align: text-top; | 223 | vertical-align: text-top; |
| @@ -157,8 +230,8 @@ | @@ -157,8 +230,8 @@ | ||
| 157 | input.diy-2 { | 230 | input.diy-2 { |
| 158 | border: 0; | 231 | border: 0; |
| 159 | -webkit-appearance: none; | 232 | -webkit-appearance: none; |
| 160 | - width: 30px; | ||
| 161 | - height: 30px; | 233 | + width: 32px; |
| 234 | + height: 32px; | ||
| 162 | background-size: 100%; | 235 | background-size: 100%; |
| 163 | background-image: resolve("activity/trend/diy-2.png"); | 236 | background-image: resolve("activity/trend/diy-2.png"); |
| 164 | vertical-align: text-top; | 237 | vertical-align: text-top; |
| @@ -183,6 +256,7 @@ | @@ -183,6 +256,7 @@ | ||
| 183 | .box-padding { | 256 | .box-padding { |
| 184 | padding: 30px; | 257 | padding: 30px; |
| 185 | background-color: #fff; | 258 | background-color: #fff; |
| 259 | + padding-top: 0; | ||
| 186 | } | 260 | } |
| 187 | 261 | ||
| 188 | .big-title { | 262 | .big-title { |
| @@ -192,10 +266,19 @@ | @@ -192,10 +266,19 @@ | ||
| 192 | background-color: #fff; | 266 | background-color: #fff; |
| 193 | color: #444; | 267 | color: #444; |
| 194 | font-size: 32px; | 268 | font-size: 32px; |
| 195 | - border-bottom: solid 1px #e0e0e0; | ||
| 196 | - border-top: solid 1px #e0e0e0; | ||
| 197 | - margin-top: 30px; | 269 | + border-bottom: solid 1px #f4f4f4; |
| 270 | + margin-top: 20px; | ||
| 198 | font-weight: bold; | 271 | font-weight: bold; |
| 272 | + position: relative; | ||
| 273 | + | ||
| 274 | + .more { | ||
| 275 | + font-weight: normal; | ||
| 276 | + line-height: 88px; | ||
| 277 | + position: absolute; | ||
| 278 | + top: 0; | ||
| 279 | + right: 30px; | ||
| 280 | + color: #444; | ||
| 281 | + } | ||
| 199 | } | 282 | } |
| 200 | 283 | ||
| 201 | .big-title-2 { | 284 | .big-title-2 { |
| @@ -215,9 +298,7 @@ | @@ -215,9 +298,7 @@ | ||
| 215 | position: relative; | 298 | position: relative; |
| 216 | line-height: 88px; | 299 | line-height: 88px; |
| 217 | background-color: #fff; | 300 | background-color: #fff; |
| 218 | - border-bottom: solid 1px #e0e0e0; | ||
| 219 | - border-top: solid 1px #e0e0e0; | ||
| 220 | - margin: 30px 0; | 301 | + margin: 20px 0; |
| 221 | 302 | ||
| 222 | .red { | 303 | .red { |
| 223 | font-size: 28px; | 304 | font-size: 28px; |
| @@ -227,26 +308,41 @@ | @@ -227,26 +308,41 @@ | ||
| 227 | } | 308 | } |
| 228 | 309 | ||
| 229 | .left-title { | 310 | .left-title { |
| 230 | - line-height: 100px; | ||
| 231 | - color: #4a4a4a; | ||
| 232 | - font-size: 38px; | 311 | + height: 110px; |
| 312 | + line-height: 120px; | ||
| 313 | + color: #444; | ||
| 314 | + font-size: 46px; | ||
| 233 | font-weight: bold; | 315 | font-weight: bold; |
| 316 | + background-color: #fff; | ||
| 234 | } | 317 | } |
| 235 | 318 | ||
| 236 | .content { | 319 | .content { |
| 237 | clear: both; | 320 | clear: both; |
| 238 | background-color: #fff; | 321 | background-color: #fff; |
| 322 | + padding-top: 40px; | ||
| 323 | + font-size: 32px; | ||
| 239 | 324 | ||
| 240 | img { | 325 | img { |
| 241 | - margin-bottom: 30px; | 326 | + margin-bottom: 20px; |
| 242 | width: 100%; | 327 | width: 100%; |
| 243 | } | 328 | } |
| 244 | 329 | ||
| 245 | p { | 330 | p { |
| 246 | - margin-bottom: 30px; | 331 | + margin-bottom: 20px; |
| 332 | + word-wrap: break-word; | ||
| 333 | + font-size: 32px; | ||
| 334 | + line-height: 50px; | ||
| 247 | } | 335 | } |
| 248 | } | 336 | } |
| 249 | 337 | ||
| 338 | + .no-pd-top { | ||
| 339 | + padding-top: 0 !important; | ||
| 340 | + } | ||
| 341 | + | ||
| 342 | + .no-border { | ||
| 343 | + border-bottom: 0; | ||
| 344 | + } | ||
| 345 | + | ||
| 250 | .content-padding { | 346 | .content-padding { |
| 251 | padding: 0 30px 30px; | 347 | padding: 0 30px 30px; |
| 252 | } | 348 | } |
| @@ -269,11 +365,9 @@ | @@ -269,11 +365,9 @@ | ||
| 269 | 365 | ||
| 270 | .article { | 366 | .article { |
| 271 | .article-item { | 367 | .article-item { |
| 272 | - border-top: solid 1px #e0e0e0; | ||
| 273 | - border-bottom: solid 1px #e0e0e0; | ||
| 274 | padding: 30px 0 0; | 368 | padding: 30px 0 0; |
| 275 | background-color: #fff; | 369 | background-color: #fff; |
| 276 | - margin-bottom: 30px; | 370 | + margin-bottom: 20px; |
| 277 | 371 | ||
| 278 | .pic { | 372 | .pic { |
| 279 | display: block; | 373 | display: block; |
| @@ -286,29 +380,31 @@ | @@ -286,29 +380,31 @@ | ||
| 286 | } | 380 | } |
| 287 | 381 | ||
| 288 | .title { | 382 | .title { |
| 289 | - font-size: 38px; | 383 | + font-size: 46px; |
| 290 | color: #4a4a4a; | 384 | color: #4a4a4a; |
| 291 | - padding: 25px 30px; | ||
| 292 | - line-height: 45px; | 385 | + padding: 0 30px; |
| 386 | + line-height: 120px; | ||
| 387 | + height: 110px; | ||
| 293 | font-weight: bold; | 388 | font-weight: bold; |
| 294 | } | 389 | } |
| 295 | 390 | ||
| 296 | .tip { | 391 | .tip { |
| 297 | - font-size: 28px; | 392 | + font-size: 32px; |
| 298 | color: #444; | 393 | color: #444; |
| 299 | padding: 0 30px 30px; | 394 | padding: 0 30px 30px; |
| 300 | - line-height: 44px; | 395 | + line-height: 50px; |
| 301 | 396 | ||
| 302 | .a { | 397 | .a { |
| 303 | width: 120px; | 398 | width: 120px; |
| 304 | - height: 30px; | 399 | + height: 32px; |
| 305 | display: inline-block; | 400 | display: inline-block; |
| 306 | color: #b0b0b0; | 401 | color: #b0b0b0; |
| 307 | border: solid 1px #b0b0b0; | 402 | border: solid 1px #b0b0b0; |
| 308 | line-height: 30px; | 403 | line-height: 30px; |
| 309 | text-align: center; | 404 | text-align: center; |
| 310 | - border-radius: 14px; | 405 | + border-radius: 20px; |
| 311 | font-size: 22px; | 406 | font-size: 22px; |
| 407 | + font-weight: 500; | ||
| 312 | } | 408 | } |
| 313 | } | 409 | } |
| 314 | 410 | ||
| @@ -317,15 +413,16 @@ | @@ -317,15 +413,16 @@ | ||
| 317 | } | 413 | } |
| 318 | 414 | ||
| 319 | .list { | 415 | .list { |
| 320 | - margin-top: 30px; | 416 | + margin-top: 20px; |
| 321 | 417 | ||
| 322 | .list-item { | 418 | .list-item { |
| 323 | - padding: 0 30px; | 419 | + padding-right: 30px; |
| 420 | + margin-left: 30px; | ||
| 324 | display: block; | 421 | display: block; |
| 325 | line-height: 88px; | 422 | line-height: 88px; |
| 326 | - border-top: solid 1px #e0e0e0; | 423 | + border-top: solid 1px #f4f4f4; |
| 327 | position: relative; | 424 | position: relative; |
| 328 | - font-size: 25px; | 425 | + font-size: 28px; |
| 329 | color: #444; | 426 | color: #444; |
| 330 | } | 427 | } |
| 331 | } | 428 | } |
| @@ -336,20 +433,26 @@ | @@ -336,20 +433,26 @@ | ||
| 336 | display: block; | 433 | display: block; |
| 337 | position: relative; | 434 | position: relative; |
| 338 | height: 88px; | 435 | height: 88px; |
| 339 | - line-height: 88px; | 436 | + line-height: 83px; |
| 340 | font-size: 32px; | 437 | font-size: 32px; |
| 341 | color: #444; | 438 | color: #444; |
| 342 | - padding: 0 30px; | 439 | + padding-right: 30px; |
| 440 | + margin-left: 30px; | ||
| 343 | background-color: #fff; | 441 | background-color: #fff; |
| 344 | - border-bottom: solid 1px #e0e0e0; | ||
| 345 | - margin-bottom: 30px; | ||
| 346 | - margin-top: -30px; | 442 | + border-top: solid 1px #f4f4f4; |
| 443 | + } | ||
| 444 | + | ||
| 445 | + .more-article-c { | ||
| 446 | + background-color: #fff; | ||
| 447 | + margin-bottom: 20px; | ||
| 448 | + } | ||
| 449 | + | ||
| 450 | + .more-article2 { | ||
| 451 | + margin-top: 0; | ||
| 347 | } | 452 | } |
| 348 | 453 | ||
| 349 | .appointment { | 454 | .appointment { |
| 350 | background-color: #fff; | 455 | background-color: #fff; |
| 351 | - border-top: solid 1px #e0e0e0; | ||
| 352 | - margin-bottom: 30px; | ||
| 353 | 456 | ||
| 354 | .title { | 457 | .title { |
| 355 | height: 88px; | 458 | height: 88px; |
| @@ -371,37 +474,48 @@ | @@ -371,37 +474,48 @@ | ||
| 371 | padding: 30px; | 474 | padding: 30px; |
| 372 | 475 | ||
| 373 | .title { | 476 | .title { |
| 374 | - line-height: 45px; | ||
| 375 | - padding: 25px 0; | 477 | + line-height: 120px; |
| 478 | + height: 110px; | ||
| 376 | color: #4a4a4a; | 479 | color: #4a4a4a; |
| 377 | - font-size: 38px; | 480 | + font-size: 46px; |
| 378 | font-weight: bold; | 481 | font-weight: bold; |
| 379 | } | 482 | } |
| 380 | } | 483 | } |
| 381 | 484 | ||
| 382 | .class .class-item { | 485 | .class .class-item { |
| 383 | - border-top: solid 1px #e0e0e0; | ||
| 384 | - border-bottom: solid 1px #e0e0e0; | ||
| 385 | padding: 30px; | 486 | padding: 30px; |
| 386 | - margin-bottom: 30px; | 487 | + margin-bottom: 20px; |
| 387 | background-color: #fff; | 488 | background-color: #fff; |
| 388 | 489 | ||
| 389 | .pic { | 490 | .pic { |
| 491 | + position: relative; | ||
| 492 | + display: block; | ||
| 493 | + | ||
| 390 | img { | 494 | img { |
| 391 | width: 100%; | 495 | width: 100%; |
| 496 | + min-height: 200px; | ||
| 392 | } | 497 | } |
| 393 | } | 498 | } |
| 394 | 499 | ||
| 395 | - .info { | ||
| 396 | - line-height: 65px; | 500 | + .tag { |
| 501 | + color: #fff; | ||
| 502 | + line-height: 60px; | ||
| 503 | + background-color: #000; | ||
| 504 | + padding: 0 25px; | ||
| 505 | + position: absolute; | ||
| 506 | + font-size: 24px; | ||
| 507 | + bottom: 0; | ||
| 508 | + left: 0; | ||
| 509 | + } | ||
| 397 | 510 | ||
| 511 | + .info { | ||
| 398 | .name { | 512 | .name { |
| 399 | color: #444; | 513 | color: #444; |
| 400 | font-size: 38px; | 514 | font-size: 38px; |
| 401 | float: left; | 515 | float: left; |
| 402 | width: 500px; | 516 | width: 500px; |
| 403 | - line-height: 50px; | ||
| 404 | - padding: 10px 0 5px; | 517 | + line-height: 95px; |
| 518 | + height: 90px; | ||
| 405 | font-weight: bold; | 519 | font-weight: bold; |
| 406 | } | 520 | } |
| 407 | 521 | ||
| @@ -411,21 +525,29 @@ | @@ -411,21 +525,29 @@ | ||
| 411 | float: right; | 525 | float: right; |
| 412 | width: 190px; | 526 | width: 190px; |
| 413 | text-align: right; | 527 | text-align: right; |
| 414 | - line-height: 50px; | ||
| 415 | - padding: 10px 0 5px; | 528 | + line-height: 82px; |
| 529 | + padding-right: 10px; | ||
| 530 | + font-weight: 500; | ||
| 416 | 531 | ||
| 417 | span { | 532 | span { |
| 418 | font-size: 30px; | 533 | font-size: 30px; |
| 419 | - padding-right: 10px; | 534 | + padding-right: 6px; |
| 420 | } | 535 | } |
| 421 | } | 536 | } |
| 422 | 537 | ||
| 538 | + .price-2 { | ||
| 539 | + font-size: 30px; | ||
| 540 | + } | ||
| 541 | + | ||
| 423 | .free { | 542 | .free { |
| 424 | text-align: right; | 543 | text-align: right; |
| 425 | float: right; | 544 | float: right; |
| 426 | color: #d0021b; | 545 | color: #d0021b; |
| 427 | font-size: 30px; | 546 | font-size: 30px; |
| 428 | width: 160px; | 547 | width: 160px; |
| 548 | + line-height: 90px; | ||
| 549 | + font-weight: 500; | ||
| 550 | + padding-right: 10px; | ||
| 429 | } | 551 | } |
| 430 | } | 552 | } |
| 431 | 553 | ||
| @@ -478,6 +600,12 @@ | @@ -478,6 +600,12 @@ | ||
| 478 | } | 600 | } |
| 479 | } | 601 | } |
| 480 | 602 | ||
| 603 | + .class-detail { | ||
| 604 | + .class-item { | ||
| 605 | + padding-top: 10px !important; | ||
| 606 | + } | ||
| 607 | + } | ||
| 608 | + | ||
| 481 | .foot-btn { | 609 | .foot-btn { |
| 482 | width: 100%; | 610 | width: 100%; |
| 483 | height: 88px; | 611 | height: 88px; |
| @@ -500,15 +628,13 @@ | @@ -500,15 +628,13 @@ | ||
| 500 | } | 628 | } |
| 501 | 629 | ||
| 502 | .apt-info { | 630 | .apt-info { |
| 503 | - height: 200px; | 631 | + min-height: 200px; |
| 504 | background-color: #fff; | 632 | background-color: #fff; |
| 505 | - border-top: solid 1px #e0e0e0; | ||
| 506 | - border-bottom: solid 1px #e0e0e0; | ||
| 507 | - margin: 30px 0; | 633 | + margin: 20px 0; |
| 508 | padding: 10px 30px; | 634 | padding: 10px 30px; |
| 509 | 635 | ||
| 510 | div { | 636 | div { |
| 511 | - font-size: 26px; | 637 | + font-size: 28px; |
| 512 | color: #444; | 638 | color: #444; |
| 513 | line-height: 60px; | 639 | line-height: 60px; |
| 514 | position: relative; | 640 | position: relative; |
| @@ -516,7 +642,7 @@ | @@ -516,7 +642,7 @@ | ||
| 516 | } | 642 | } |
| 517 | 643 | ||
| 518 | .chosen-2 { | 644 | .chosen-2 { |
| 519 | - margin-bottom: 30px; | 645 | + margin-bottom: 20px; |
| 520 | } | 646 | } |
| 521 | 647 | ||
| 522 | .chosen { | 648 | .chosen { |
| @@ -525,8 +651,9 @@ | @@ -525,8 +651,9 @@ | ||
| 525 | .chose-item { | 651 | .chose-item { |
| 526 | display: block; | 652 | display: block; |
| 527 | line-height: 88px; | 653 | line-height: 88px; |
| 528 | - border-bottom: solid 1px #e0e0e0; | ||
| 529 | - padding: 0 30px; | 654 | + border-bottom: solid 1px #f4f4f4; |
| 655 | + margin-left: 30px; | ||
| 656 | + padding-right: 30px; | ||
| 530 | 657 | ||
| 531 | label { | 658 | label { |
| 532 | font-size: 28px; | 659 | font-size: 28px; |
| @@ -535,22 +662,35 @@ | @@ -535,22 +662,35 @@ | ||
| 535 | } | 662 | } |
| 536 | } | 663 | } |
| 537 | 664 | ||
| 665 | + .chose-item-2 { | ||
| 666 | + margin-left: 0; | ||
| 667 | + border-bottom: solid 1px #f4f4f4 !important; | ||
| 668 | + } | ||
| 669 | + | ||
| 538 | .select { | 670 | .select { |
| 539 | .label { | 671 | .label { |
| 540 | display: inline-block; | 672 | display: inline-block; |
| 541 | width: 150px; | 673 | width: 150px; |
| 542 | font-size: 28px; | 674 | font-size: 28px; |
| 543 | color: #444; | 675 | color: #444; |
| 676 | + line-height: 88px; | ||
| 544 | } | 677 | } |
| 545 | 678 | ||
| 546 | .inp { | 679 | .inp { |
| 547 | display: inline-block; | 680 | display: inline-block; |
| 548 | width: 500px; | 681 | width: 500px; |
| 549 | border: 0; | 682 | border: 0; |
| 550 | - line-height: 88px; | ||
| 551 | - height: 88px; | 683 | + line-height: 85px; |
| 684 | + height: 85px; | ||
| 552 | text-align: right; | 685 | text-align: right; |
| 553 | padding-right: 10px; | 686 | padding-right: 10px; |
| 687 | + color: #444 !important; | ||
| 688 | + z-index: -1; | ||
| 689 | + background-color: #fff !important; | ||
| 690 | + } | ||
| 691 | + | ||
| 692 | + .grey-font { | ||
| 693 | + color: #b0b0b0 !important; | ||
| 554 | } | 694 | } |
| 555 | 695 | ||
| 556 | .chosen-style { | 696 | .chosen-style { |
| @@ -574,6 +714,7 @@ | @@ -574,6 +714,7 @@ | ||
| 574 | padding: 22px 0; | 714 | padding: 22px 0; |
| 575 | height: 80px; | 715 | height: 80px; |
| 576 | font-size: 28px; | 716 | font-size: 28px; |
| 717 | + color: #444; | ||
| 577 | } | 718 | } |
| 578 | 719 | ||
| 579 | .inp-s { | 720 | .inp-s { |
| @@ -586,8 +727,8 @@ | @@ -586,8 +727,8 @@ | ||
| 586 | 727 | ||
| 587 | a { | 728 | a { |
| 588 | display: inline-block; | 729 | display: inline-block; |
| 589 | - width: 40px; | ||
| 590 | - height: 40px; | 730 | + width: 42px; |
| 731 | + height: 42px; | ||
| 591 | background-size: 100%; | 732 | background-size: 100%; |
| 592 | vertical-align: middle; | 733 | vertical-align: middle; |
| 593 | } | 734 | } |
| @@ -616,16 +757,24 @@ | @@ -616,16 +757,24 @@ | ||
| 616 | 757 | ||
| 617 | textarea { | 758 | textarea { |
| 618 | padding: 20px 15px; | 759 | padding: 20px 15px; |
| 619 | - border: solid 1px #bdbdbd; | 760 | + border: solid 1px #f4f4f4; |
| 620 | border-radius: 5px; | 761 | border-radius: 5px; |
| 621 | width: 690px; | 762 | width: 690px; |
| 622 | min-height: 180px; | 763 | min-height: 180px; |
| 623 | resize: none; | 764 | resize: none; |
| 624 | line-height: 40px; | 765 | line-height: 40px; |
| 766 | + box-shadow: 0 0 0 rgba(0, 0, 0, 0); | ||
| 767 | + -webkit-appearance: none; | ||
| 625 | } | 768 | } |
| 626 | } | 769 | } |
| 627 | } | 770 | } |
| 628 | 771 | ||
| 772 | + .chosen { | ||
| 773 | + .chose-item:last-child { | ||
| 774 | + border-bottom: 0; | ||
| 775 | + } | ||
| 776 | + } | ||
| 777 | + | ||
| 629 | .need-know { | 778 | .need-know { |
| 630 | padding: 0 30px; | 779 | padding: 0 30px; |
| 631 | color: #444; | 780 | color: #444; |
| @@ -633,9 +782,10 @@ | @@ -633,9 +782,10 @@ | ||
| 633 | padding-bottom: 30px; | 782 | padding-bottom: 30px; |
| 634 | 783 | ||
| 635 | input { | 784 | input { |
| 636 | - height: 30px; | ||
| 637 | - width: 30px; | 785 | + height: 32px; |
| 786 | + width: 32px; | ||
| 638 | vertical-align: middle; | 787 | vertical-align: middle; |
| 788 | + margin-bottom: 3px; | ||
| 639 | } | 789 | } |
| 640 | 790 | ||
| 641 | a { | 791 | a { |
| @@ -698,7 +848,7 @@ | @@ -698,7 +848,7 @@ | ||
| 698 | } | 848 | } |
| 699 | 849 | ||
| 700 | .time-nav { | 850 | .time-nav { |
| 701 | - border-bottom: solid 1px #e0e0e0; | 851 | + border-bottom: solid 1px #f4f4f4; |
| 702 | width: 750px; | 852 | width: 750px; |
| 703 | background-color: #fff; | 853 | background-color: #fff; |
| 704 | height: 100px; | 854 | height: 100px; |
| @@ -738,10 +888,11 @@ | @@ -738,10 +888,11 @@ | ||
| 738 | display: block; | 888 | display: block; |
| 739 | height: 170px; | 889 | height: 170px; |
| 740 | line-height: 110px; | 890 | line-height: 110px; |
| 741 | - width: 100%; | ||
| 742 | position: relative; | 891 | position: relative; |
| 743 | - border-bottom: solid 1px #e0e0e0; | 892 | + border-bottom: solid 1px #f4f4f4; |
| 744 | padding: 30px; | 893 | padding: 30px; |
| 894 | + padding-left: 0; | ||
| 895 | + margin-left: 30px; | ||
| 745 | 896 | ||
| 746 | .pic { | 897 | .pic { |
| 747 | height: 100px; | 898 | height: 100px; |
| @@ -801,8 +952,7 @@ | @@ -801,8 +952,7 @@ | ||
| 801 | height: 88px; | 952 | height: 88px; |
| 802 | background-size: 100%; | 953 | background-size: 100%; |
| 803 | background-image: resolve("activity/trend/date-type.png"); | 954 | background-image: resolve("activity/trend/date-type.png"); |
| 804 | - border-top: solid 1px #e0e0e0; | ||
| 805 | - border-bottom: solid 1px #e0e0e0; | 955 | + border-top: solid 1px #f4f4f4; |
| 806 | } | 956 | } |
| 807 | } | 957 | } |
| 808 | 958 | ||
| @@ -874,7 +1024,7 @@ | @@ -874,7 +1024,7 @@ | ||
| 874 | color: #444; | 1024 | color: #444; |
| 875 | text-align: center; | 1025 | text-align: center; |
| 876 | line-height: 40px; | 1026 | line-height: 40px; |
| 877 | - margin-top: 30px; | 1027 | + margin-top: 20px; |
| 878 | } | 1028 | } |
| 879 | } | 1029 | } |
| 880 | } | 1030 | } |
| @@ -888,14 +1038,15 @@ | @@ -888,14 +1038,15 @@ | ||
| 888 | font-size: 32px; | 1038 | font-size: 32px; |
| 889 | color: #444; | 1039 | color: #444; |
| 890 | padding: 0 30px; | 1040 | padding: 0 30px; |
| 891 | - border-top: solid 1px #e0e0e0; | ||
| 892 | - border-bottom: solid 1px #e0e0e0; | 1041 | + border-top: solid 1px #f4f4f4; |
| 1042 | + border-bottom: solid 1px #f4f4f4; | ||
| 893 | background-color: #fff; | 1043 | background-color: #fff; |
| 894 | - margin-bottom: 30px; | 1044 | + margin-bottom: 20px; |
| 895 | display: block; | 1045 | display: block; |
| 896 | 1046 | ||
| 897 | input { | 1047 | input { |
| 898 | margin-right: 20px; | 1048 | margin-right: 20px; |
| 1049 | + margin-top: 2px; | ||
| 899 | } | 1050 | } |
| 900 | 1051 | ||
| 901 | .min-price { | 1052 | .min-price { |
| @@ -905,18 +1056,19 @@ | @@ -905,18 +1056,19 @@ | ||
| 905 | 1056 | ||
| 906 | span { | 1057 | span { |
| 907 | font-size: 40px; | 1058 | font-size: 40px; |
| 1059 | + padding-right: 6px; | ||
| 908 | } | 1060 | } |
| 909 | } | 1061 | } |
| 910 | } | 1062 | } |
| 911 | 1063 | ||
| 912 | .chosen-list { | 1064 | .chosen-list { |
| 913 | - border-top: solid 1px #e0e0e0; | 1065 | + border-top: solid 1px #f4f4f4; |
| 914 | background-color: #fff; | 1066 | background-color: #fff; |
| 915 | } | 1067 | } |
| 916 | 1068 | ||
| 917 | .chosen-list .item { | 1069 | .chosen-list .item { |
| 918 | padding: 30px; | 1070 | padding: 30px; |
| 919 | - border-bottom: solid 1px #e0e0e0; | 1071 | + border-bottom: solid 1px #f4f4f4; |
| 920 | display: block; | 1072 | display: block; |
| 921 | 1073 | ||
| 922 | input { | 1074 | input { |
| @@ -936,7 +1088,7 @@ | @@ -936,7 +1088,7 @@ | ||
| 936 | } | 1088 | } |
| 937 | 1089 | ||
| 938 | .info { | 1090 | .info { |
| 939 | - width: 500px; | 1091 | + width: 498px; |
| 940 | float: left; | 1092 | float: left; |
| 941 | 1093 | ||
| 942 | .name { | 1094 | .name { |
| @@ -963,7 +1115,7 @@ | @@ -963,7 +1115,7 @@ | ||
| 963 | 1115 | ||
| 964 | a { | 1116 | a { |
| 965 | display: block; | 1117 | display: block; |
| 966 | - margin-bottom: 30px; | 1118 | + margin-bottom: 20px; |
| 967 | 1119 | ||
| 968 | img { | 1120 | img { |
| 969 | border-radius: 10px; | 1121 | border-radius: 10px; |
| @@ -974,7 +1126,7 @@ | @@ -974,7 +1126,7 @@ | ||
| 974 | .swiper-c { | 1126 | .swiper-c { |
| 975 | background-color: #fff; | 1127 | background-color: #fff; |
| 976 | padding-top: 30px; | 1128 | padding-top: 30px; |
| 977 | - border-bottom: solid 1px #e0e0e0; | 1129 | + border-bottom: solid 1px #f4f4f4; |
| 978 | 1130 | ||
| 979 | .swiper-container { | 1131 | .swiper-container { |
| 980 | padding-bottom: 80px; | 1132 | padding-bottom: 80px; |
| @@ -1004,7 +1156,7 @@ | @@ -1004,7 +1156,7 @@ | ||
| 1004 | .swiper-slide { | 1156 | .swiper-slide { |
| 1005 | width: 690px; | 1157 | width: 690px; |
| 1006 | margin: 0 5px; | 1158 | margin: 0 5px; |
| 1007 | - border: solid 1px #e0e0e0; | 1159 | + border: solid 1px #f4f4f4; |
| 1008 | 1160 | ||
| 1009 | .limit-pic { | 1161 | .limit-pic { |
| 1010 | width: 688px; | 1162 | width: 688px; |
| @@ -1015,7 +1167,6 @@ | @@ -1015,7 +1167,6 @@ | ||
| 1015 | 1167 | ||
| 1016 | img { | 1168 | img { |
| 1017 | width: 688px; | 1169 | width: 688px; |
| 1018 | - min-height: 432px; | ||
| 1019 | height: auto; | 1170 | height: auto; |
| 1020 | } | 1171 | } |
| 1021 | 1172 | ||
| @@ -1089,28 +1240,19 @@ | @@ -1089,28 +1240,19 @@ | ||
| 1089 | } | 1240 | } |
| 1090 | 1241 | ||
| 1091 | .tab { | 1242 | .tab { |
| 1092 | - margin-top: 30px; | 1243 | + margin-top: 20px; |
| 1093 | 1244 | ||
| 1094 | .tab-top { | 1245 | .tab-top { |
| 1095 | line-height: 38px; | 1246 | line-height: 38px; |
| 1096 | - border-bottom: solid 1px #e0e0e0; | ||
| 1097 | background-color: #fff; | 1247 | background-color: #fff; |
| 1098 | 1248 | ||
| 1099 | span { | 1249 | span { |
| 1100 | display: inline-block; | 1250 | display: inline-block; |
| 1101 | - width: 355px; | 1251 | + width: 100%; |
| 1102 | text-align: center; | 1252 | text-align: center; |
| 1103 | - color: #b0b0b0; | 1253 | + color: #444; |
| 1104 | font-size: 32px; | 1254 | font-size: 32px; |
| 1105 | margin: 25px 0; | 1255 | margin: 25px 0; |
| 1106 | - | ||
| 1107 | - &:first-child { | ||
| 1108 | - border-right: solid 1px #e0e0e0; | ||
| 1109 | - } | ||
| 1110 | - } | ||
| 1111 | - | ||
| 1112 | - span.active { | ||
| 1113 | - color: #444; | ||
| 1114 | } | 1256 | } |
| 1115 | } | 1257 | } |
| 1116 | 1258 | ||
| @@ -1122,7 +1264,7 @@ | @@ -1122,7 +1264,7 @@ | ||
| 1122 | width: 330px; | 1264 | width: 330px; |
| 1123 | height: 330px; | 1265 | height: 330px; |
| 1124 | float: left; | 1266 | float: left; |
| 1125 | - margin-bottom: 30px; | 1267 | + margin-bottom: 20px; |
| 1126 | 1268 | ||
| 1127 | &:nth-child(odd) { | 1269 | &:nth-child(odd) { |
| 1128 | margin-right: 30px; | 1270 | margin-right: 30px; |
| @@ -1142,12 +1284,10 @@ | @@ -1142,12 +1284,10 @@ | ||
| 1142 | } | 1284 | } |
| 1143 | 1285 | ||
| 1144 | .package-item { | 1286 | .package-item { |
| 1145 | - padding: 30px 30px 0; | 1287 | + padding: 40px 30px 0; |
| 1146 | line-height: 45px; | 1288 | line-height: 45px; |
| 1147 | - margin-bottom: 10px; | ||
| 1148 | background-color: #fff; | 1289 | background-color: #fff; |
| 1149 | - border-top: solid 1px #e0e0e0; | ||
| 1150 | - border-bottom: solid 1px #e0e0e0; | 1290 | + border-bottom: solid 1px #f4f4f4; |
| 1151 | list-style-type: none; | 1291 | list-style-type: none; |
| 1152 | 1292 | ||
| 1153 | .top { | 1293 | .top { |
| @@ -1164,21 +1304,24 @@ | @@ -1164,21 +1304,24 @@ | ||
| 1164 | 1304 | ||
| 1165 | .price { | 1305 | .price { |
| 1166 | color: #d0021b; | 1306 | color: #d0021b; |
| 1167 | - font-size: 40px; | 1307 | + font-size: 50px; |
| 1168 | float: right; | 1308 | float: right; |
| 1169 | width: 25%; | 1309 | width: 25%; |
| 1170 | overflow: hidden; | 1310 | overflow: hidden; |
| 1171 | height: 45px; | 1311 | height: 45px; |
| 1172 | text-align: right; | 1312 | text-align: right; |
| 1313 | + padding-right: 10px; | ||
| 1314 | + font-weight: 500; | ||
| 1173 | 1315 | ||
| 1174 | span { | 1316 | span { |
| 1175 | font-size: 30px; | 1317 | font-size: 30px; |
| 1318 | + padding-right: 6px; | ||
| 1176 | } | 1319 | } |
| 1177 | } | 1320 | } |
| 1178 | } | 1321 | } |
| 1179 | 1322 | ||
| 1180 | .main { | 1323 | .main { |
| 1181 | - padding-bottom: 30px; | 1324 | + padding-bottom: 40px; |
| 1182 | margin-top: 20px; | 1325 | margin-top: 20px; |
| 1183 | 1326 | ||
| 1184 | p { | 1327 | p { |
| @@ -1190,7 +1333,7 @@ | @@ -1190,7 +1333,7 @@ | ||
| 1190 | 1333 | ||
| 1191 | .foot { | 1334 | .foot { |
| 1192 | line-height: 88px; | 1335 | line-height: 88px; |
| 1193 | - border-top: solid 1px #e0e0e0; | 1336 | + border-top: solid 1px #f4f4f4; |
| 1194 | padding: 0 30px; | 1337 | padding: 0 30px; |
| 1195 | } | 1338 | } |
| 1196 | 1339 | ||
| @@ -1199,6 +1342,10 @@ | @@ -1199,6 +1342,10 @@ | ||
| 1199 | } | 1342 | } |
| 1200 | } | 1343 | } |
| 1201 | 1344 | ||
| 1345 | + .package-item:last-child { | ||
| 1346 | + border-bottom: 0; | ||
| 1347 | + } | ||
| 1348 | + | ||
| 1202 | .package-item.only { | 1349 | .package-item.only { |
| 1203 | border-bottom: 0; | 1350 | border-bottom: 0; |
| 1204 | margin-bottom: 0; | 1351 | margin-bottom: 0; |
| @@ -1212,7 +1359,7 @@ | @@ -1212,7 +1359,7 @@ | ||
| 1212 | .style-c { | 1359 | .style-c { |
| 1213 | .top { | 1360 | .top { |
| 1214 | line-height: 60px; | 1361 | line-height: 60px; |
| 1215 | - border-bottom: solid 1px #e0e0e0; | 1362 | + border-bottom: solid 1px #f4f4f4; |
| 1216 | font-size: 24px; | 1363 | font-size: 24px; |
| 1217 | color: #444; | 1364 | color: #444; |
| 1218 | padding: 0 30px; | 1365 | padding: 0 30px; |
| @@ -1231,7 +1378,7 @@ | @@ -1231,7 +1378,7 @@ | ||
| 1231 | padding-bottom: 30px; | 1378 | padding-bottom: 30px; |
| 1232 | 1379 | ||
| 1233 | li { | 1380 | li { |
| 1234 | - margin: 30px 15px 0; | 1381 | + margin: 20px 15px 0; |
| 1235 | height: 56px; | 1382 | height: 56px; |
| 1236 | line-height: 56px; | 1383 | line-height: 56px; |
| 1237 | font-size: 24px; | 1384 | font-size: 24px; |
| @@ -1256,19 +1403,23 @@ | @@ -1256,19 +1403,23 @@ | ||
| 1256 | } | 1403 | } |
| 1257 | 1404 | ||
| 1258 | ul.later { | 1405 | ul.later { |
| 1259 | - margin-top: 30px; | ||
| 1260 | - border-top: solid 1px #e0e0e0; | 1406 | + margin-top: 20px; |
| 1407 | + border-top: solid 1px #f4f4f4; | ||
| 1261 | } | 1408 | } |
| 1262 | } | 1409 | } |
| 1263 | 1410 | ||
| 1264 | .cutter { | 1411 | .cutter { |
| 1412 | + background-color: #fff; | ||
| 1413 | + | ||
| 1265 | .cutter-item { | 1414 | .cutter-item { |
| 1266 | position: relative; | 1415 | position: relative; |
| 1267 | background-color: #fff; | 1416 | background-color: #fff; |
| 1268 | display: block; | 1417 | display: block; |
| 1269 | padding: 30px; | 1418 | padding: 30px; |
| 1270 | - border-bottom: solid 1px #e0e0e0; | 1419 | + border-bottom: solid 1px #f4f4f4; |
| 1271 | line-height: 100px; | 1420 | line-height: 100px; |
| 1421 | + margin-left: 20px; | ||
| 1422 | + padding-left: 0; | ||
| 1272 | 1423 | ||
| 1273 | .pic { | 1424 | .pic { |
| 1274 | width: 100px; | 1425 | width: 100px; |
| @@ -1285,7 +1436,7 @@ | @@ -1285,7 +1436,7 @@ | ||
| 1285 | padding-left: 30px; | 1436 | padding-left: 30px; |
| 1286 | 1437 | ||
| 1287 | .name { | 1438 | .name { |
| 1288 | - font-size: 38px; | 1439 | + font-size: 32px; |
| 1289 | color: #444; | 1440 | color: #444; |
| 1290 | line-height: 50px; | 1441 | line-height: 50px; |
| 1291 | font-weight: bold; | 1442 | font-weight: bold; |
| @@ -1295,6 +1446,7 @@ | @@ -1295,6 +1446,7 @@ | ||
| 1295 | font-size: 28px; | 1446 | font-size: 28px; |
| 1296 | color: #b0b0b0; | 1447 | color: #b0b0b0; |
| 1297 | line-height: 50px; | 1448 | line-height: 50px; |
| 1449 | + word-wrap: break-word; | ||
| 1298 | } | 1450 | } |
| 1299 | } | 1451 | } |
| 1300 | 1452 | ||
| @@ -1305,11 +1457,19 @@ | @@ -1305,11 +1457,19 @@ | ||
| 1305 | float: left; | 1457 | float: left; |
| 1306 | font-size: 50px; | 1458 | font-size: 50px; |
| 1307 | padding-right: 20px; | 1459 | padding-right: 20px; |
| 1460 | + font-weight: 500; | ||
| 1308 | 1461 | ||
| 1309 | span { | 1462 | span { |
| 1310 | - font-size: 30px; | 1463 | + font-size: 24px; |
| 1464 | + padding-right: 6px; | ||
| 1311 | } | 1465 | } |
| 1312 | } | 1466 | } |
| 1467 | + | ||
| 1468 | + &:last-child { | ||
| 1469 | + margin-left: 0; | ||
| 1470 | + padding-left: 30px; | ||
| 1471 | + border-bottom: 0; | ||
| 1472 | + } | ||
| 1313 | } | 1473 | } |
| 1314 | } | 1474 | } |
| 1315 | 1475 | ||
| @@ -1321,7 +1481,7 @@ | @@ -1321,7 +1481,7 @@ | ||
| 1321 | } | 1481 | } |
| 1322 | 1482 | ||
| 1323 | .price { | 1483 | .price { |
| 1324 | - width: 190px; | 1484 | + width: 188px; |
| 1325 | padding-right: 0; | 1485 | padding-right: 0; |
| 1326 | } | 1486 | } |
| 1327 | } | 1487 | } |
| @@ -1329,12 +1489,14 @@ | @@ -1329,12 +1489,14 @@ | ||
| 1329 | .display-list { | 1489 | .display-list { |
| 1330 | background-color: #fff; | 1490 | background-color: #fff; |
| 1331 | padding: 30px; | 1491 | padding: 30px; |
| 1492 | + padding-right: 10px; | ||
| 1493 | + padding-top: 0; | ||
| 1332 | } | 1494 | } |
| 1333 | 1495 | ||
| 1334 | .order-pic { | 1496 | .order-pic { |
| 1335 | height: 30px; | 1497 | height: 30px; |
| 1336 | width: 100%; | 1498 | width: 100%; |
| 1337 | - margin-top: 30px; | 1499 | + margin-top: 20px; |
| 1338 | position: relative; | 1500 | position: relative; |
| 1339 | padding-top: 15px; | 1501 | padding-top: 15px; |
| 1340 | 1502 | ||
| @@ -1365,9 +1527,7 @@ | @@ -1365,9 +1527,7 @@ | ||
| 1365 | display: block; | 1527 | display: block; |
| 1366 | padding: 30px; | 1528 | padding: 30px; |
| 1367 | background-color: #fff; | 1529 | background-color: #fff; |
| 1368 | - margin: 30px 0; | ||
| 1369 | - border-bottom: solid 1px #e0e0e0; | ||
| 1370 | - border-top: solid 1px #e0e0e0; | 1530 | + margin: 20px 0; |
| 1371 | 1531 | ||
| 1372 | .info { | 1532 | .info { |
| 1373 | width: 550px; | 1533 | width: 550px; |
| @@ -1408,7 +1568,6 @@ | @@ -1408,7 +1568,6 @@ | ||
| 1408 | color: #444; | 1568 | color: #444; |
| 1409 | font-size: 34px; | 1569 | font-size: 34px; |
| 1410 | line-height: 88px; | 1570 | line-height: 88px; |
| 1411 | - border-bottom: silid 1px #e0e0e0; | ||
| 1412 | background-color: #fff; | 1571 | background-color: #fff; |
| 1413 | padding: 0 30px; | 1572 | padding: 0 30px; |
| 1414 | font-weight: bold; | 1573 | font-weight: bold; |
| @@ -1416,10 +1575,8 @@ | @@ -1416,10 +1575,8 @@ | ||
| 1416 | 1575 | ||
| 1417 | .detail-list { | 1576 | .detail-list { |
| 1418 | padding: 0 30px; | 1577 | padding: 0 30px; |
| 1419 | - margin: 30px 0; | 1578 | + margin: 20px 0; |
| 1420 | background-color: #fff; | 1579 | background-color: #fff; |
| 1421 | - border-top: solid 1px #e0e0e0; | ||
| 1422 | - border-bottom: solid 1px #e0e0e0; | ||
| 1423 | 1580 | ||
| 1424 | .order-a { | 1581 | .order-a { |
| 1425 | display: block; | 1582 | display: block; |
| @@ -1430,7 +1587,7 @@ | @@ -1430,7 +1587,7 @@ | ||
| 1430 | line-height: 88px; | 1587 | line-height: 88px; |
| 1431 | color: #4a4a4a; | 1588 | color: #4a4a4a; |
| 1432 | position: relative; | 1589 | position: relative; |
| 1433 | - border-bottom: solid 1px #e0e0e0; | 1590 | + border-bottom: solid 1px #f4f4f4; |
| 1434 | 1591 | ||
| 1435 | &:last-child { | 1592 | &:last-child { |
| 1436 | border-bottom: 0; | 1593 | border-bottom: 0; |
| @@ -1448,7 +1605,7 @@ | @@ -1448,7 +1605,7 @@ | ||
| 1448 | 1605 | ||
| 1449 | .tip-top { | 1606 | .tip-top { |
| 1450 | color: #b0b0b0; | 1607 | color: #b0b0b0; |
| 1451 | - font-size: 24px; | 1608 | + font-size: 28px; |
| 1452 | line-height: 80px; | 1609 | line-height: 80px; |
| 1453 | } | 1610 | } |
| 1454 | 1611 | ||
| @@ -1467,11 +1624,47 @@ | @@ -1467,11 +1624,47 @@ | ||
| 1467 | } | 1624 | } |
| 1468 | } | 1625 | } |
| 1469 | 1626 | ||
| 1627 | + .list-item:nth-last-child(2) { | ||
| 1628 | + border-bottom: 0; | ||
| 1629 | + } | ||
| 1630 | + | ||
| 1470 | .list-item.padding { | 1631 | .list-item.padding { |
| 1471 | padding-bottom: 30px; | 1632 | padding-bottom: 30px; |
| 1472 | } | 1633 | } |
| 1473 | } | 1634 | } |
| 1474 | 1635 | ||
| 1636 | + .big-list { | ||
| 1637 | + .big { | ||
| 1638 | + font-weight: 500; | ||
| 1639 | + } | ||
| 1640 | + } | ||
| 1641 | + | ||
| 1642 | + .tip-limit { | ||
| 1643 | + min-height: 50px; | ||
| 1644 | + height: auto !important; | ||
| 1645 | + line-height: 40px; | ||
| 1646 | + } | ||
| 1647 | + | ||
| 1648 | + .detail-list-2 { | ||
| 1649 | + padding-right: 0; | ||
| 1650 | + | ||
| 1651 | + .list-item { | ||
| 1652 | + padding-right: 30px; | ||
| 1653 | + } | ||
| 1654 | + } | ||
| 1655 | + | ||
| 1656 | + .detail-list-3 { | ||
| 1657 | + padding-right: 0; | ||
| 1658 | + | ||
| 1659 | + .package-item { | ||
| 1660 | + padding-right: 30px !important; | ||
| 1661 | + } | ||
| 1662 | + | ||
| 1663 | + a { | ||
| 1664 | + padding-right: 30px !important; | ||
| 1665 | + } | ||
| 1666 | + } | ||
| 1667 | + | ||
| 1475 | .icon-pic { | 1668 | .icon-pic { |
| 1476 | display: inline-block; | 1669 | display: inline-block; |
| 1477 | margin-right: 10px; | 1670 | margin-right: 10px; |
| @@ -1481,19 +1674,20 @@ | @@ -1481,19 +1674,20 @@ | ||
| 1481 | height: 30px; | 1674 | height: 30px; |
| 1482 | } | 1675 | } |
| 1483 | 1676 | ||
| 1484 | - .icon-pic.shop { | ||
| 1485 | - background-image: resolve("activity/trend/shop.png"); | ||
| 1486 | - background-size: 100% 100%; | 1677 | + .iconfont.adr { |
| 1678 | + color: #b0b0b0; | ||
| 1487 | } | 1679 | } |
| 1488 | 1680 | ||
| 1489 | - .icon-pic.adr { | ||
| 1490 | - background-image: resolve("activity/trend/adr.png"); | ||
| 1491 | - background-size: 100% 100%; | 1681 | + .iconfont.tel { |
| 1682 | + color: #b0b0b0; | ||
| 1492 | } | 1683 | } |
| 1493 | 1684 | ||
| 1494 | - .icon-pic.tel { | ||
| 1495 | - background-image: resolve("activity/trend/tel.png"); | ||
| 1496 | - background-size: 100% 100%; | 1685 | + .iconfont.shop { |
| 1686 | + color: #b0b0b0; | ||
| 1687 | + } | ||
| 1688 | + | ||
| 1689 | + .iconfont.time { | ||
| 1690 | + color: #b0b0b0; | ||
| 1497 | } | 1691 | } |
| 1498 | 1692 | ||
| 1499 | .icon-pic.tip { | 1693 | .icon-pic.tip { |
| @@ -1560,4 +1754,83 @@ | @@ -1560,4 +1754,83 @@ | ||
| 1560 | font-size: 28px !important; | 1754 | font-size: 28px !important; |
| 1561 | } | 1755 | } |
| 1562 | } | 1756 | } |
| 1757 | + | ||
| 1758 | + .scroll-class { | ||
| 1759 | + width: 100%; | ||
| 1760 | + height: 80px; | ||
| 1761 | + border-bottom: solid 1px #f4f4f4; | ||
| 1762 | + background-color: #fff; | ||
| 1763 | + overflow-x: scroll; | ||
| 1764 | + overflow-y: hidden; | ||
| 1765 | + white-space: nowrap; | ||
| 1766 | + padding: 0 25px; | ||
| 1767 | + | ||
| 1768 | + &::-webkit-scrollbar { | ||
| 1769 | + display: none; | ||
| 1770 | + } | ||
| 1771 | + | ||
| 1772 | + .scroll-item { | ||
| 1773 | + height: 80px; | ||
| 1774 | + line-height: 80px; | ||
| 1775 | + border-bottom: solid 4PX #fff; | ||
| 1776 | + display: inline-block; | ||
| 1777 | + padding: 0 30px; | ||
| 1778 | + font-size: 30px; | ||
| 1779 | + color: #ccc; | ||
| 1780 | + } | ||
| 1781 | + | ||
| 1782 | + .scroll-item.active { | ||
| 1783 | + border-bottom: solid 4PX #444; | ||
| 1784 | + color: #444; | ||
| 1785 | + } | ||
| 1786 | + } | ||
| 1787 | + | ||
| 1788 | + .article-2 { | ||
| 1789 | + .article { | ||
| 1790 | + &:last-child { | ||
| 1791 | + .article-item { | ||
| 1792 | + margin-bottom: 0; | ||
| 1793 | + border-bottom: 0; | ||
| 1794 | + } | ||
| 1795 | + } | ||
| 1796 | + } | ||
| 1797 | + } | ||
| 1798 | + | ||
| 1799 | + .adviser-c { | ||
| 1800 | + .adviser:last-child { | ||
| 1801 | + .adviser-item { | ||
| 1802 | + padding-left: 30px; | ||
| 1803 | + margin-left: 0; | ||
| 1804 | + } | ||
| 1805 | + } | ||
| 1806 | + } | ||
| 1807 | + | ||
| 1808 | + .class-detail { | ||
| 1809 | + .class-item { | ||
| 1810 | + border-bottom: 0; | ||
| 1811 | + margin-bottom: 0; | ||
| 1812 | + } | ||
| 1813 | + } | ||
| 1814 | + | ||
| 1815 | + .chosen-package { | ||
| 1816 | + padding-top: 10px; | ||
| 1817 | + | ||
| 1818 | + .package-item { | ||
| 1819 | + margin-bottom: 20px; | ||
| 1820 | + padding-right: 0; | ||
| 1821 | + border-bottom: 0; | ||
| 1822 | + | ||
| 1823 | + .top { | ||
| 1824 | + padding-right: 30px; | ||
| 1825 | + } | ||
| 1826 | + | ||
| 1827 | + .main { | ||
| 1828 | + padding-right: 30px; | ||
| 1829 | + } | ||
| 1830 | + | ||
| 1831 | + .foot { | ||
| 1832 | + padding-right: 30px; | ||
| 1833 | + } | ||
| 1834 | + } | ||
| 1835 | + } | ||
| 1563 | } | 1836 | } |
-
Please register or login to post a comment