handle merge
Showing
13 changed files
with
270 additions
and
152 deletions
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | 'use strict'; | 6 | 'use strict'; |
| 7 | const serviceAPI = global.yoho.ServiceAPI; | 7 | const serviceAPI = global.yoho.ServiceAPI; |
| 8 | 8 | ||
| 9 | -// const api = global.yoho.API; | 9 | +const api = global.yoho.API; |
| 10 | const camelCase = global.yoho.camelCase; | 10 | const camelCase = global.yoho.camelCase; |
| 11 | const _ = require('lodash'); | 11 | const _ = require('lodash'); |
| 12 | const Promise = require('bluebird'); | 12 | const Promise = require('bluebird'); |
| @@ -258,31 +258,33 @@ const _processHeadData = (list) => { | @@ -258,31 +258,33 @@ const _processHeadData = (list) => { | ||
| 258 | 258 | ||
| 259 | 259 | ||
| 260 | // 推荐商品 | 260 | // 推荐商品 |
| 261 | -// const _getRelatedData = (id) => { | ||
| 262 | -// return api.get('', { | ||
| 263 | -// query: id, | ||
| 264 | -// method: 'app.search.li' | ||
| 265 | -// }).then((result) => { | ||
| 266 | -// let productList = {}; | ||
| 267 | - | ||
| 268 | -// if (result && result.code === 200) { | ||
| 269 | -// // console.log(result); | ||
| 270 | -// _.forEach(result.data. product_list, function(data) { | ||
| 271 | -// // console.log(data) | ||
| 272 | -// productList.name = data.product_name; | ||
| 273 | -// productList.price = data.sales_price; | ||
| 274 | -// productList.id = data.product_id; | ||
| 275 | -// productList.cnAlphabet = data.cn_alphabet; | ||
| 276 | -// }); | 261 | +const _getRelatedData = () => { |
| 262 | + // console.log(id); | ||
| 263 | + return api.get('', { | ||
| 264 | + query: '51152761,51178582,51146105,51149561,51149414,51082157,51079256', | ||
| 265 | + method: 'app.search.li' | ||
| 266 | + }).then((result) => { | ||
| 267 | + let productList = []; | ||
| 277 | 268 | ||
| 278 | -// // console.log(productList) | ||
| 279 | -// return productList; | ||
| 280 | -// } else { | ||
| 281 | -// logger.error('推荐商品 cood 不是 200'); | ||
| 282 | -// return {}; | ||
| 283 | -// } | ||
| 284 | -// }); | ||
| 285 | -// }; | 269 | + if (result && result.code === 200) { |
| 270 | + | ||
| 271 | + _.forEach(result.data.product_list, function(data) { | ||
| 272 | + productList.push({ | ||
| 273 | + name: data.product_name, | ||
| 274 | + price: data.sales_price, | ||
| 275 | + id: data.product_id, | ||
| 276 | + cnAlphabet: data.cn_alphabet | ||
| 277 | + }); | ||
| 278 | + }); | ||
| 279 | + | ||
| 280 | + // console.log(productList) | ||
| 281 | + return productList; | ||
| 282 | + } else { | ||
| 283 | + logger.error('推荐商品 cood 不是 200'); | ||
| 284 | + return {}; | ||
| 285 | + } | ||
| 286 | + }); | ||
| 287 | +}; | ||
| 286 | 288 | ||
| 287 | /** | 289 | /** |
| 288 | * 详情页文章内容数据处理 | 290 | * 详情页文章内容数据处理 |
| @@ -294,7 +296,8 @@ const _processContentData = (list) => { | @@ -294,7 +296,8 @@ const _processContentData = (list) => { | ||
| 294 | list = camelCase(list); | 296 | list = camelCase(list); |
| 295 | 297 | ||
| 296 | let contentData = { | 298 | let contentData = { |
| 297 | - contents: [] | 299 | + contents: [], |
| 300 | + collecation: [] | ||
| 298 | }; | 301 | }; |
| 299 | 302 | ||
| 300 | _.forEach(list, function(value) { | 303 | _.forEach(list, function(value) { |
| @@ -313,32 +316,46 @@ const _processContentData = (list) => { | @@ -313,32 +316,46 @@ const _processContentData = (list) => { | ||
| 313 | 316 | ||
| 314 | contentData.contents = list; | 317 | contentData.contents = list; |
| 315 | 318 | ||
| 316 | - // console.log(list) | ||
| 317 | - // let collocation = {}; | 319 | + // let idList = ''; |
| 320 | + let formatData = []; | ||
| 318 | 321 | ||
| 319 | - // _.forEach(contentData.contents, function(value) { | ||
| 320 | - // // console.log(value) | 322 | + _.forEach(contentData.contents, function(value) { |
| 321 | 323 | ||
| 322 | - // if (value.goods) { | ||
| 323 | - // console.log(value); | 324 | + if (value.goods) { |
| 324 | 325 | ||
| 325 | - // _.forEach(value.goods.data, function(data) { | 326 | + _.forEach(value.goods.data, function(data) { |
| 326 | 327 | ||
| 327 | - // _getRelatedData(51152761).then((result) => { | 328 | + // idList += data.id + ','; |
| 329 | + // idList = '51152761'; | ||
| 330 | + formatData.push(data); | ||
| 331 | + }); | ||
| 332 | + } | ||
| 333 | + }); | ||
| 328 | 334 | ||
| 329 | -// data = _.assign(data, result); | ||
| 330 | -// data = _.assign(data, { | ||
| 331 | -// link: `${config.siteUrl}/product/pro_${result.id}_${data.productSkc}/${result.cnAlphabet}` | ||
| 332 | -// }); | ||
| 333 | - // }); | ||
| 334 | - // }); | ||
| 335 | - // } | ||
| 336 | - | ||
| 337 | - // if (value.goodsGroup) { | ||
| 338 | - // _.forEach(value.goodsGroup.data, function(data) { | ||
| 339 | - // // console.log(data) | ||
| 340 | - // _.forEach(data.list, function(value) { | ||
| 341 | - // // console.log(value) | 335 | + // console.log(formatData) |
| 336 | + | ||
| 337 | + _getRelatedData().then((result) => { | ||
| 338 | + // formatData.push(result); | ||
| 339 | + // console.log(formatData); | ||
| 340 | + | ||
| 341 | + _.forEach(formatData, function(data, index) { | ||
| 342 | + | ||
| 343 | + data[index] = _.assign(result[index]); | ||
| 344 | + | ||
| 345 | + }); | ||
| 346 | + | ||
| 347 | + // console.log(formatData); | ||
| 348 | + return formatData; | ||
| 349 | + | ||
| 350 | + }).then(() => { | ||
| 351 | + | ||
| 352 | + }); | ||
| 353 | + | ||
| 354 | +// if (value.goodsGroup) { | ||
| 355 | +// _.forEach(value.goodsGroup.data, function(data) { | ||
| 356 | +// // console.log(data) | ||
| 357 | +// _.forEach(data.list, function(value) { | ||
| 358 | +// // console.log(value) | ||
| 342 | // _getRelatedData(51152761).then((result) => { | 359 | // _getRelatedData(51152761).then((result) => { |
| 343 | // // console.log(result) | 360 | // // console.log(result) |
| 344 | // value = _.assign(value, result); | 361 | // value = _.assign(value, result); |
| @@ -348,10 +365,9 @@ const _processContentData = (list) => { | @@ -348,10 +365,9 @@ const _processContentData = (list) => { | ||
| 348 | 365 | ||
| 349 | // // console.log(value) | 366 | // // console.log(value) |
| 350 | // }); | 367 | // }); |
| 351 | - // }); | ||
| 352 | - // }); | ||
| 353 | - // } | ||
| 354 | - // }); | 368 | +// }); |
| 369 | +// }); | ||
| 370 | +// } | ||
| 355 | 371 | ||
| 356 | return contentData; | 372 | return contentData; |
| 357 | }; | 373 | }; |
| @@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
| 42 | </div> | 42 | </div> |
| 43 | {{/ text}} | 43 | {{/ text}} |
| 44 | 44 | ||
| 45 | - {{!-- {{# goods}} | 45 | + {{# goods}} |
| 46 | <div class="related-reco"> | 46 | <div class="related-reco"> |
| 47 | <div class="article-title"> | 47 | <div class="article-title"> |
| 48 | <div class="title-line"></div> | 48 | <div class="title-line"></div> |
| @@ -80,7 +80,7 @@ | @@ -80,7 +80,7 @@ | ||
| 80 | {{/ data}} | 80 | {{/ data}} |
| 81 | </div> | 81 | </div> |
| 82 | </div> | 82 | </div> |
| 83 | - {{/ goodsGroup}} --}} | 83 | + {{/ goodsGroup}} |
| 84 | {{/ content}} | 84 | {{/ content}} |
| 85 | 85 | ||
| 86 | {{#if brands}} | 86 | {{#if brands}} |
| @@ -143,6 +143,7 @@ const exchangeDeatail = (req, res) => { | @@ -143,6 +143,7 @@ const exchangeDeatail = (req, res) => { | ||
| 143 | navigation: mcHandler.getSideMenu('我的退/换货'), | 143 | navigation: mcHandler.getSideMenu('我的退/换货'), |
| 144 | banner: 'http://placehold.it/{width}x{height}', | 144 | banner: 'http://placehold.it/{width}x{height}', |
| 145 | returns: { | 145 | returns: { |
| 146 | + title: '换货详情', | ||
| 146 | exchange: result.exchangeDetail | 147 | exchange: result.exchangeDetail |
| 147 | } | 148 | } |
| 148 | } | 149 | } |
| @@ -234,11 +234,7 @@ const _setRefundGoodList = (data) => { | @@ -234,11 +234,7 @@ const _setRefundGoodList = (data) => { | ||
| 234 | goods.push({ | 234 | goods.push({ |
| 235 | href: helpers.urlFormat(`/product/pro_${value.product_id}_${value.goods_id}/${cnAlphabet}.html`), | 235 | href: helpers.urlFormat(`/product/pro_${value.product_id}_${value.goods_id}/${cnAlphabet}.html`), |
| 236 | img: value.goods_image, | 236 | img: value.goods_image, |
| 237 | - name: _.truncate(value.product_name, { | ||
| 238 | - length: 34, | ||
| 239 | - omission: '...' | ||
| 240 | - }), | ||
| 241 | - title: value.product_name, | 237 | + name: value.product_name, |
| 242 | size: value.size_name, | 238 | size: value.size_name, |
| 243 | color: value.color_name, | 239 | color: value.color_name, |
| 244 | num: 1, // 接口目前不支持 | 240 | num: 1, // 接口目前不支持 |
| @@ -361,11 +357,7 @@ const _setRefundDetailData = (data) => { | @@ -361,11 +357,7 @@ const _setRefundDetailData = (data) => { | ||
| 361 | _.forEach(data.goods_list, value => { | 357 | _.forEach(data.goods_list, value => { |
| 362 | goods.push({ | 358 | goods.push({ |
| 363 | img: value.goods_image, | 359 | img: value.goods_image, |
| 364 | - name: _.truncate(value.product_name, { | ||
| 365 | - length: 34, | ||
| 366 | - omission: '...' | ||
| 367 | - }), | ||
| 368 | - title: value.product_name, | 360 | + name: value.product_name, |
| 369 | size: value.size_name, | 361 | size: value.size_name, |
| 370 | color: value.color_name, | 362 | color: value.color_name, |
| 371 | num: 1, // 接口目前不支持 | 363 | num: 1, // 接口目前不支持 |
| @@ -408,69 +400,6 @@ const _setExpressData = (data) => { | @@ -408,69 +400,6 @@ const _setExpressData = (data) => { | ||
| 408 | }; | 400 | }; |
| 409 | 401 | ||
| 410 | /** | 402 | /** |
| 411 | - * 设置换货详情数据 | ||
| 412 | - * @function _setExchangeDetailData | ||
| 413 | - * @param { Object } data 接口返回换货订单数据 | ||
| 414 | - * @return { Object } 模板渲染换货数据 | ||
| 415 | - */ | ||
| 416 | -const _setExchangeDetailData = (data) => { | ||
| 417 | - data = camelCase(data); | ||
| 418 | - | ||
| 419 | - let list = {}; | ||
| 420 | - | ||
| 421 | - switch (data.status) { | ||
| 422 | - case 0: | ||
| 423 | - Object.assign(list, { | ||
| 424 | - audit: true, | ||
| 425 | - reminder: true | ||
| 426 | - }); | ||
| 427 | - break; | ||
| 428 | - case 10: | ||
| 429 | - Object.assign(list, { | ||
| 430 | - through: true, | ||
| 431 | - reminder: true | ||
| 432 | - }); | ||
| 433 | - | ||
| 434 | - if (data.deliveryTpyeName === '寄回换货') { | ||
| 435 | - Object.assign(list, { | ||
| 436 | - logistics: true, | ||
| 437 | - sendBack: true, | ||
| 438 | - exchangeAddress: returnAddress | ||
| 439 | - }); | ||
| 440 | - } else { | ||
| 441 | - list.inDoor = true; | ||
| 442 | - } | ||
| 443 | - | ||
| 444 | - break; | ||
| 445 | - case 30: | ||
| 446 | - if (data.deliveryTpyeName === '寄回换货') { | ||
| 447 | - list.takeGoods = true; | ||
| 448 | - } | ||
| 449 | - break; | ||
| 450 | - case 50: | ||
| 451 | - Object.assign(list, { | ||
| 452 | - send: true, | ||
| 453 | - reminder: true, | ||
| 454 | - auditSuccess: true | ||
| 455 | - }); | ||
| 456 | - break; | ||
| 457 | - case 40: | ||
| 458 | - Object.assign(list, { | ||
| 459 | - finish: true, | ||
| 460 | - auditSuccess: true | ||
| 461 | - }); | ||
| 462 | - break; | ||
| 463 | - case 91: | ||
| 464 | - list.abolish = true; | ||
| 465 | - break; | ||
| 466 | - default: | ||
| 467 | - break; | ||
| 468 | - } | ||
| 469 | - | ||
| 470 | - return list; | ||
| 471 | -}; | ||
| 472 | - | ||
| 473 | -/** | ||
| 474 | * 获取退货商品信息 | 403 | * 获取退货商品信息 |
| 475 | * @function getRefundGoodsData | 404 | * @function getRefundGoodsData |
| 476 | * @param { number } orderCode 订单号 | 405 | * @param { number } orderCode 订单号 |
| @@ -645,6 +574,93 @@ const getChangeGoodsList = (orderCode, uid) => { | @@ -645,6 +574,93 @@ const getChangeGoodsList = (orderCode, uid) => { | ||
| 645 | }; | 574 | }; |
| 646 | 575 | ||
| 647 | /** | 576 | /** |
| 577 | + * 设置换货详情数据 | ||
| 578 | + * @function _setExchangeDetailData | ||
| 579 | + * @param { Object } data 接口返回换货订单数据 | ||
| 580 | + * @return { Object } 模板渲染换货数据 | ||
| 581 | + */ | ||
| 582 | +const _setExchangeDetailData = (data) => { | ||
| 583 | + data = camelCase(data); | ||
| 584 | + console.log(data); | ||
| 585 | + let list = {}; | ||
| 586 | + | ||
| 587 | + switch (data.status) { | ||
| 588 | + case 0: | ||
| 589 | + if (data.deliveryTpyeName === '寄回换货') { | ||
| 590 | + Object.assign(list, { | ||
| 591 | + audit: true, | ||
| 592 | + reminder: true, | ||
| 593 | + inDoor: false, | ||
| 594 | + sendBack: true, | ||
| 595 | + cancel: true, | ||
| 596 | + location: true | ||
| 597 | + }); | ||
| 598 | + } else { | ||
| 599 | + Object.assign(list, { | ||
| 600 | + audit: true, | ||
| 601 | + reminder: true | ||
| 602 | + }); | ||
| 603 | + } | ||
| 604 | + | ||
| 605 | + break; | ||
| 606 | + case 10: | ||
| 607 | + Object.assign(list, { | ||
| 608 | + through: true, | ||
| 609 | + reminder: true | ||
| 610 | + }); | ||
| 611 | + | ||
| 612 | + if (data.deliveryTpyeName === '寄回换货') { | ||
| 613 | + Object.assign(list, { | ||
| 614 | + logistics: true, | ||
| 615 | + sendBack: true, | ||
| 616 | + exchangeAddress: returnAddress, | ||
| 617 | + cancel: true, | ||
| 618 | + location: true | ||
| 619 | + }); | ||
| 620 | + } else { | ||
| 621 | + list.inDoor = true; | ||
| 622 | + } | ||
| 623 | + | ||
| 624 | + break; | ||
| 625 | + case 20: | ||
| 626 | + | ||
| 627 | + if (data.deliveryTpyeName === '寄回换货') { | ||
| 628 | + Object.assign(list, { | ||
| 629 | + logistics: true | ||
| 630 | + }); | ||
| 631 | + } | ||
| 632 | + | ||
| 633 | + break; | ||
| 634 | + case 30: | ||
| 635 | + if (data.deliveryTpyeName === '寄回换货') { | ||
| 636 | + list.takeGoods = true; | ||
| 637 | + list.auditSuccess = true; | ||
| 638 | + } | ||
| 639 | + break; | ||
| 640 | + case 50: | ||
| 641 | + Object.assign(list, { | ||
| 642 | + send: true, | ||
| 643 | + doubt: true, | ||
| 644 | + auditSuccess: true | ||
| 645 | + }); | ||
| 646 | + break; | ||
| 647 | + case 40: | ||
| 648 | + Object.assign(list, { | ||
| 649 | + finish: true, | ||
| 650 | + auditSuccess: true | ||
| 651 | + }); | ||
| 652 | + break; | ||
| 653 | + case 91: | ||
| 654 | + list.abolish = true; | ||
| 655 | + break; | ||
| 656 | + default: | ||
| 657 | + break; | ||
| 658 | + } | ||
| 659 | + | ||
| 660 | + return list; | ||
| 661 | +}; | ||
| 662 | + | ||
| 663 | +/** | ||
| 648 | * 获取换货详情信息 | 664 | * 获取换货详情信息 |
| 649 | * @function getExchangeDetailData | 665 | * @function getExchangeDetailData |
| 650 | * @param { number } id 换货申请单号 | 666 | * @param { number } id 换货申请单号 |
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | <div class="way"> | 30 | <div class="way"> |
| 31 | 31 | ||
| 32 | {{#if takeGoods}} | 32 | {{#if takeGoods}} |
| 33 | - <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<span class="iconfont"></span>在线客服</p> | 33 | + <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont"></span>在线客服</p></a> |
| 34 | {{/if}} | 34 | {{/if}} |
| 35 | 35 | ||
| 36 | {{#if reminder}} | 36 | {{#if reminder}} |
| @@ -45,28 +45,37 @@ | @@ -45,28 +45,37 @@ | ||
| 45 | {{/if}} | 45 | {{/if}} |
| 46 | {{/if}} | 46 | {{/if}} |
| 47 | 47 | ||
| 48 | - {{#if audit}} | 48 | + {{#if cancel}} |
| 49 | <p class="cancel">如果您不想换货了，您可以<span class="cancel-btn">取消申请</span></p> | 49 | <p class="cancel">如果您不想换货了，您可以<span class="cancel-btn">取消申请</span></p> |
| 50 | {{/if}} | 50 | {{/if}} |
| 51 | 51 | ||
| 52 | - {{#if finish}} | 52 | + {{#if doubt}} |
| 53 | <p class="contact">如有疑问，请联系<span class="iconfont"></span>在线客服</p> | 53 | <p class="contact">如有疑问，请联系<span class="iconfont"></span>在线客服</p> |
| 54 | {{/if}} | 54 | {{/if}} |
| 55 | 55 | ||
| 56 | + {{#if auditSuccess}} | ||
| 57 | + <div class="order"> | ||
| 58 | + <span class="check">查看</span> | ||
| 59 | + <span class="exchange-order">换货订单</span> | ||
| 60 | + </div> | ||
| 61 | + {{/if}} | ||
| 62 | + | ||
| 63 | + </div> | ||
| 64 | + | ||
| 56 | {{#if logistics}} | 65 | {{#if logistics}} |
| 57 | <div class="return-express"> | 66 | <div class="return-express"> |
| 58 | - {{#if number}} | 67 | + {{#if expressNumber}} |
| 59 | <div class="show-content" data-id="{{id}}"> | 68 | <div class="show-content" data-id="{{id}}"> |
| 60 | <h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4> | 69 | <h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4> |
| 61 | <p>请您耐心等待，我们会在收到货物后快速为您处理</p> | 70 | <p>请您耐心等待，我们会在收到货物后快速为您处理</p> |
| 62 | - <p>物流公司：{{company}}</p> | ||
| 63 | - <p>快递单号：{{number}}</p> | 71 | + <p>物流公司：{{ expressCompany}}</p> |
| 72 | + <p>快递单号：{{expressNumber}}</p> | ||
| 64 | </div> | 73 | </div> |
| 65 | {{/if}} | 74 | {{/if}} |
| 66 | 75 | ||
| 67 | - <div class="edit-content{{#if number}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}> | 76 | + <div class="edit-content{{#if expressNumber}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}> |
| 68 | <h4 class="third-title">填写物流</h4> | 77 | <h4 class="third-title">填写物流</h4> |
| 69 | - <p>请您在<span class="blue">7月30日24:00</span>前将商品寄回并填写物流，逾期将自动取消申请</p> | 78 | + <p>请您在<span class="blue">七天内</span>将商品寄回并填写物流，逾期将自动取消申请</p> |
| 70 | <dl class="express-wrap"> | 79 | <dl class="express-wrap"> |
| 71 | <dd> | 80 | <dd> |
| 72 | 物流公司： | 81 | 物流公司： |
| @@ -99,14 +108,6 @@ | @@ -99,14 +108,6 @@ | ||
| 99 | </div> | 108 | </div> |
| 100 | {{/ exchangeAddress}} | 109 | {{/ exchangeAddress}} |
| 101 | 110 | ||
| 102 | - {{#if auditSuccess}} | ||
| 103 | - <div class="order"> | ||
| 104 | - <span class="check">查看</span> | ||
| 105 | - <span class="exchange-order">换货订单</span> | ||
| 106 | - </div> | ||
| 107 | - {{/if}} | ||
| 108 | - </div> | ||
| 109 | - | ||
| 110 | {{#if location}} | 111 | {{#if location}} |
| 111 | <div class="address"> | 112 | <div class="address"> |
| 112 | <p class="address-title">收货地址<span class="modify-btn">修改</span></p> | 113 | <p class="address-title">收货地址<span class="modify-btn">修改</span></p> |
| @@ -31,7 +31,6 @@ | @@ -31,7 +31,6 @@ | ||
| 31 | </div> | 31 | </div> |
| 32 | {{/if}} | 32 | {{/if}} |
| 33 | {{#if showEditOption}} | 33 | {{#if showEditOption}} |
| 34 | - <p class="subtext">评价晒单</p> | ||
| 35 | <a href="{{refundUrl}}" class="{{#if hideChange}}disable{{/if}}"> | 34 | <a href="{{refundUrl}}" class="{{#if hideChange}}disable{{/if}}"> |
| 36 | <p class="subtext">申请退货</p> | 35 | <p class="subtext">申请退货</p> |
| 37 | </a> | 36 | </a> |
| @@ -120,10 +120,10 @@ | @@ -120,10 +120,10 @@ | ||
| 120 | {{# goods}} | 120 | {{# goods}} |
| 121 | <div class="goods-item clearfix"> | 121 | <div class="goods-item clearfix"> |
| 122 | <div class="img"> | 122 | <div class="img"> |
| 123 | - <img class="lazy" title="{{title}}" data-original="{{image img 70 90}}"> | 123 | + <img class="lazy" title="{{name}}" data-original="{{image img 70 90}}"> |
| 124 | </div> | 124 | </div> |
| 125 | <div class="info"> | 125 | <div class="info"> |
| 126 | - <p><span title="{{title}}">{{name}}</span></p> | 126 | + <p class="title" title="{{name}}">{{name}}</p> |
| 127 | <p>颜色：{{color}} 尺码：{{size}}</p> | 127 | <p>颜色：{{color}} 尺码：{{size}}</p> |
| 128 | <p>×{{num}}</p> | 128 | <p>×{{num}}</p> |
| 129 | </div> | 129 | </div> |
| @@ -17,12 +17,12 @@ | @@ -17,12 +17,12 @@ | ||
| 17 | <div class="goods-item clearfix"> | 17 | <div class="goods-item clearfix"> |
| 18 | <div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div> | 18 | <div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div> |
| 19 | <div class="img"> | 19 | <div class="img"> |
| 20 | - <a href="{{href}}" title="{{title}}" target="_blank"> | 20 | + <a href="{{href}}" title="{{name}}" target="_blank"> |
| 21 | <img class="lazy" data-original="{{image img 70 90}}"> | 21 | <img class="lazy" data-original="{{image img 70 90}}"> |
| 22 | </a> | 22 | </a> |
| 23 | </div> | 23 | </div> |
| 24 | <div class="info"> | 24 | <div class="info"> |
| 25 | - <p><a href="{{href}}" class="title" title="{{title}}" target="_blank">{{name}}</a></p> | 25 | + <p><a href="{{href}}" class="title" title="{{name}}" target="_blank">{{name}}</a></p> |
| 26 | <p>颜色：{{color}} 尺码：{{size}}</p> | 26 | <p>颜色：{{color}} 尺码：{{size}}</p> |
| 27 | <p>×{{num}}</p> | 27 | <p>×{{num}}</p> |
| 28 | </div> | 28 | </div> |
| @@ -20,9 +20,16 @@ var id = $mainWrap.data('id'), | @@ -20,9 +20,16 @@ var id = $mainWrap.data('id'), | ||
| 20 | 20 | ||
| 21 | $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件 | 21 | $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件 |
| 22 | 22 | ||
| 23 | +require('yoho-jquery-dotdotdot'); | ||
| 24 | + | ||
| 23 | require('../common/header'); // header | 25 | require('../common/header'); // header |
| 24 | require('../common/return-top'); // return-top | 26 | require('../common/return-top'); // return-top |
| 25 | 27 | ||
| 28 | +// dot | ||
| 29 | +$('.goods-item .title').dotdotdot({ | ||
| 30 | + wrap: 'letter' | ||
| 31 | +}); | ||
| 32 | + | ||
| 26 | function cancelRefundApply() { | 33 | function cancelRefundApply() { |
| 27 | $.ajax({ | 34 | $.ajax({ |
| 28 | type: 'POST', | 35 | type: 'POST', |
| @@ -36,12 +36,19 @@ var checked; | @@ -36,12 +36,19 @@ var checked; | ||
| 36 | 36 | ||
| 37 | $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件 | 37 | $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件 |
| 38 | 38 | ||
| 39 | +require('yoho-jquery-dotdotdot'); | ||
| 40 | + | ||
| 39 | require('../plugins/check'); | 41 | require('../plugins/check'); |
| 40 | require('../common/header'); // header | 42 | require('../common/header'); // header |
| 41 | require('../common/return-top'); // return-top | 43 | require('../common/return-top'); // return-top |
| 42 | 44 | ||
| 43 | lazyload($('img.lazy')); | 45 | lazyload($('img.lazy')); |
| 44 | 46 | ||
| 47 | +// dot | ||
| 48 | +$('.goods-item .title').dotdotdot({ | ||
| 49 | + wrap: 'letter' | ||
| 50 | +}); | ||
| 51 | + | ||
| 45 | function setUnionList(list) { | 52 | function setUnionList(list) { |
| 46 | var i, html = ''; | 53 | var i, html = ''; |
| 47 | 54 |
| @@ -2,6 +2,11 @@ | @@ -2,6 +2,11 @@ | ||
| 2 | .state { | 2 | .state { |
| 3 | font-size: 16px; | 3 | font-size: 16px; |
| 4 | color: #5cb0de; | 4 | color: #5cb0de; |
| 5 | + margin-top: 45px; | ||
| 6 | + display: block; | ||
| 7 | + height: 35px; | ||
| 8 | + line-height: 35px; | ||
| 9 | + margin-bottom: 10px; | ||
| 5 | 10 | ||
| 6 | span { | 11 | span { |
| 7 | font-size: 20px; | 12 | font-size: 20px; |
| @@ -33,12 +38,12 @@ | @@ -33,12 +38,12 @@ | ||
| 33 | } | 38 | } |
| 34 | 39 | ||
| 35 | p { | 40 | p { |
| 36 | - line-height: 22px; | 41 | + line-height: 25px; |
| 42 | + display: block; | ||
| 37 | } | 43 | } |
| 38 | 44 | ||
| 39 | .cancel { | 45 | .cancel { |
| 40 | display: block; | 46 | display: block; |
| 41 | - margin-top: 18px; | ||
| 42 | width: 220px; | 47 | width: 220px; |
| 43 | height: 50px; | 48 | height: 50px; |
| 44 | line-height: 50px; | 49 | line-height: 50px; |
| @@ -133,6 +138,8 @@ | @@ -133,6 +138,8 @@ | ||
| 133 | font-size: 16px; | 138 | font-size: 16px; |
| 134 | height: 50px; | 139 | height: 50px; |
| 135 | line-height: 50px; | 140 | line-height: 50px; |
| 141 | + margin-top: 10px; | ||
| 142 | + display: block; | ||
| 136 | } | 143 | } |
| 137 | 144 | ||
| 138 | .table { | 145 | .table { |
| @@ -153,13 +160,13 @@ | @@ -153,13 +160,13 @@ | ||
| 153 | } | 160 | } |
| 154 | 161 | ||
| 155 | .info { | 162 | .info { |
| 156 | - width: 496px; | 163 | + width: 507px; |
| 157 | text-align: left; | 164 | text-align: left; |
| 158 | } | 165 | } |
| 159 | 166 | ||
| 160 | .st, | 167 | .st, |
| 161 | .op { | 168 | .op { |
| 162 | - width: 206px; | 169 | + width: 200px; |
| 163 | } | 170 | } |
| 164 | } | 171 | } |
| 165 | } | 172 | } |
| @@ -293,7 +300,20 @@ | @@ -293,7 +300,20 @@ | ||
| 293 | } | 300 | } |
| 294 | 301 | ||
| 295 | .edit-content { | 302 | .edit-content { |
| 296 | - margin: 30px 0; | 303 | + margin: 30px 0 10px; |
| 304 | + border-bottom: 1px solid #eee; | ||
| 305 | + | ||
| 306 | + p { | ||
| 307 | + height: 32px; | ||
| 308 | + line-height: 32px; | ||
| 309 | + display: block; | ||
| 310 | + } | ||
| 311 | + } | ||
| 312 | + | ||
| 313 | + .third-title { | ||
| 314 | + height: 35px; | ||
| 315 | + line-height: 35px; | ||
| 316 | + display: block; | ||
| 297 | } | 317 | } |
| 298 | 318 | ||
| 299 | .submit-express { | 319 | .submit-express { |
| @@ -313,4 +333,43 @@ | @@ -313,4 +333,43 @@ | ||
| 313 | } | 333 | } |
| 314 | } | 334 | } |
| 315 | 335 | ||
| 336 | + .express-wrap { | ||
| 337 | + margin-bottom: 10px; | ||
| 338 | + | ||
| 339 | + dd { | ||
| 340 | + height: 35px; | ||
| 341 | + } | ||
| 342 | + | ||
| 343 | + .submit-express { | ||
| 344 | + margin-left: 70px; | ||
| 345 | + } | ||
| 346 | + } | ||
| 347 | + | ||
| 348 | + .show-content { | ||
| 349 | + margin-top: 25px; | ||
| 350 | + padding-bottom: 20px; | ||
| 351 | + border-bottom: 1px solid #eee; | ||
| 352 | + | ||
| 353 | + h4 { | ||
| 354 | + dislay: block; | ||
| 355 | + width: 160px; | ||
| 356 | + height: 30px; | ||
| 357 | + line-height: 30px; | ||
| 358 | + } | ||
| 359 | + | ||
| 360 | + p { | ||
| 361 | + display: block; | ||
| 362 | + height: 25px; | ||
| 363 | + line-height: 25px; | ||
| 364 | + } | ||
| 365 | + | ||
| 366 | + .reset-express { | ||
| 367 | + width: 40px; | ||
| 368 | + height: 20px; | ||
| 369 | + float: right; | ||
| 370 | + line-height: 20px; | ||
| 371 | + margin-top: 5px; | ||
| 372 | + } | ||
| 373 | + } | ||
| 374 | + | ||
| 316 | } | 375 | } |
-
Please register or login to post a comment