fe / yoho-blk · Commits

Go to a project

Authored by zhangxiaoru
Commit e1336da565aea2a7880fb5164c85d24183737d35 1 parent 30cbdbbc

exchange

Inline Side-by-side
Showing 3 changed files with 122 additions and 13 deletions
@@ -81,12 +81,47 @@ const detailExchange = (req, res) => { @@ -81,12 +81,47 @@ const detailExchange = (req, res) => {
81 content: { 81 content: {
82 nav: mcHandler.getMeCrumb('我的退/换货'), 82 nav: mcHandler.getMeCrumb('我的退/换货'),
83 navigation: mcHandler.getSideMenu('我的退/换货'), 83 navigation: mcHandler.getSideMenu('我的退/换货'),
84 - banner: 'http://placehold.it/{width}x{height}'  
85 -  
86 - // exchange: {  
87 -  
88 -  
89 - // } 84 + banner: 'http://placehold.it/{width}x{height}',
  85 +
  86 + exchange: {
  87 + // audit: true,
  88 + // through: false,
  89 + // send: true,
  90 + finish: true,
  91 + way: '上门送货',
  92 + goods: [
  93 + {
  94 + img: '',
  95 + name: 'fdefwfwefwrefverfref',
  96 + color: '',
  97 + size: '',
  98 + num: '',
  99 + reason: '',
  100 + exchangeColor: '蓝色',
  101 + exchangeSize: 'M'
  102 + },
  103 + {
  104 + img: '',
  105 + name: 'fdefwfwefwrefverfref',
  106 + color: '',
  107 + size: '',
  108 + num: '',
  109 + reason: '',
  110 + exchangeColor: '蓝色',
  111 + exchangeSize: 'M'
  112 + }
  113 + ],
  114 + reasonInfo: [
  115 + {
  116 + problem: '太小了',
  117 + img: ''
  118 + },
  119 + {
  120 + problem: '太小了',
  121 + img: ''
  122 + }
  123 + ]
  124 + }
90 } 125 }
91 }); 126 });
92 }; 127 };
1 -{{!-- {{# exchange}} --}} 1 +{{# exchange}}
2 <div class="exchange-detail-page"> 2 <div class="exchange-detail-page">
  3 + {{#if audit}}
3 <p class="state"><span class="iconfont">&#xe618;</span>换货申请审核中</p> 4 <p class="state"><span class="iconfont">&#xe618;</span>换货申请审核中</p>
  5 + {{/if}}
  6 +
  7 + {{#if through}}
  8 + <p class="state"><span class="iconfont">&#xe60f;</span>换货申请已通过</p>
  9 + {{/if}}
  10 +
  11 + {{#if send}}
  12 + <p class="state"><span class="iconfont">&#xe61a;</span>换货商品已发出</p>
  13 + {{/if}}
  14 +
  15 + {{#if finish}}
  16 + <p class="state"><span class="iconfont">&#xe60f;</span>换货完成</p>
  17 + {{/if}}
4 18
5 <div class="way"> 19 <div class="way">
  20 +
  21 + {{#if finish}}
  22 + <p class="contact">如有疑问，请联系<span class="iconfont">&#xe61c;</span>在线客服</p>
  23 + {{else}}
6 <p class="way-title">您已选择{{way}}</p> 24 <p class="way-title">您已选择{{way}}</p>
7 <p>请将商品连同吊牌、包装、发货单（如无发货单，您可找张白纸上注明订单编号，收货人姓名及手机号码）、发票（如有）、赠品（如有）一并保存， 25 <p>请将商品连同吊牌、包装、发货单（如无发货单，您可找张白纸上注明订单编号，收货人姓名及手机号码）、发票（如有）、赠品（如有）一并保存，
8 如有遗漏将影响您的退换货进度，敬请谅解 26 如有遗漏将影响您的退换货进度，敬请谅解
9 </p> 27 </p>
  28 + {{/if}}
  29 +
  30 + {{#if audit}}
10 <p class="cancel">如果您不想换货了，您可以<span class="cancel-btn">取消申请</span></p> 31 <p class="cancel">如果您不想换货了，您可以<span class="cancel-btn">取消申请</span></p>
  32 + {{/if}}
  33 +
  34 + {{#if finish}}
  35 + <div class="order">
  36 + <span class="check">查看</span>
  37 + <span class="exchange-order">换货订单</span>
  38 + </div>
  39 + {{/if}}
11 </div> 40 </div>
12 41
13 <div class="adress"> 42 <div class="adress">
@@ -20,6 +49,8 @@ @@ -20,6 +49,8 @@
20 </div> 49 </div>
21 </div> 50 </div>
22 51
  52 + <span class="exchange-goods">换货商品</span>
  53 +
23 <div class="good-info"> 54 <div class="good-info">
24 <div class="table"> 55 <div class="table">
25 <ul class="header"> 56 <ul class="header">
@@ -30,11 +61,12 @@ @@ -30,11 +61,12 @@
30 </div> 61 </div>
31 62
32 <div class="table"> 63 <div class="table">
  64 + {{# goods}}
33 <div class="table-body"> 65 <div class="table-body">
34 <div class="goods-info"> 66 <div class="goods-info">
35 <img class="lazy" data-original="{{image img 70 90}}"> 67 <img class="lazy" data-original="{{image img 70 90}}">
36 <div class="info"> 68 <div class="info">
37 - <p class="good-name">{{!-- {{name}} --}}fdefwfwefwrefverfref</p> 69 + <p class="good-name">{{name}}</p>
38 <p>颜色：{{color}}&nbsp;尺码：{{size}}</p> 70 <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
39 <p>×{{num}}</p> 71 <p>×{{num}}</p>
40 </div> 72 </div>
@@ -43,18 +75,21 @@ @@ -43,18 +75,21 @@
43 <p class="reason">{{reason}}发错货</p> 75 <p class="reason">{{reason}}发错货</p>
44 </div> 76 </div>
45 <div class="common-column special-border operation"> 77 <div class="common-column special-border operation">
46 - <p class="subtext">color: 蓝色<br>size: M</p> 78 + <p class="subtext">color: {{exchangeColor}}<br>size: {{exchangeSize}}</p>
47 </div> 79 </div>
48 </div> 80 </div>
  81 + {{/ goods}}
  82 + {{# reasonInfo}}
49 <div class="reason-info"> 83 <div class="reason-info">
50 - <span>问题描述：太小了</span> 84 + <span>问题描述：{{problem}}</span>
51 <div class="reason-img">照片凭证： 85 <div class="reason-img">照片凭证：
52 <div class="evidence"> 86 <div class="evidence">
53 <img src="{{image img 70 90}}"> 87 <img src="{{image img 70 90}}">
54 </div> 88 </div>
55 </div> 89 </div>
56 </div> 90 </div>
  91 + {{/ reasonInfo}}
57 </div> 92 </div>
58 </div> 93 </div>
59 </div> 94 </div>
60 -{{!-- {{/ exchange}} --}}  
  95 +{{/ exchange}}
@@ -45,11 +45,44 @@ @@ -45,11 +45,44 @@
45 text-align: center; 45 text-align: center;
46 margin-top: 10px; 46 margin-top: 10px;
47 } 47 }
  48 +
  49 + .contact {
  50 + line-height: 50px;
  51 +
  52 + span {
  53 + margin-left: 20px;
  54 + }
  55 +
  56 + .iconfont {
  57 + font-size: 12px;
  58 + margin-right: 5px;
  59 + }
  60 + }
  61 + }
  62 +
  63 + .order {
  64 + margin: 23px 0 10px 0;
  65 + height: 50px;
  66 + line-height: 50px;
  67 + overflow: hidden;
  68 + }
  69 +
  70 + .check {
  71 + display: block;
  72 + height: 25px;
  73 + width: 70px;
  74 + background: #1b1b1b;
  75 + color: #fff;
  76 + line-height: 25px;
  77 + text-align: center;
  78 + margin-top: 10px;
  79 + float: left;
  80 + margin-right: 20px;
48 } 81 }
49 82
50 .adress { 83 .adress {
51 overflow: hidden; 84 overflow: hidden;
52 - margin-top: 30px; 85 + margin: 30px 0 20px 0;
53 font-size: 14px; 86 font-size: 14px;
54 border-bottom: 1px solid #eee; 87 border-bottom: 1px solid #eee;
55 88
@@ -84,6 +117,12 @@ @@ -84,6 +117,12 @@
84 } 117 }
85 } 118 }
86 119
  120 + .exchange-goods {
  121 + font-size: 16px;
  122 + height: 50px;
  123 + line-height: 50px;
  124 + }
  125 +
87 .table { 126 .table {
88 width: 100%; 127 width: 100%;
89 128
@@ -170,7 +209,7 @@ @@ -170,7 +209,7 @@
170 209
171 .reason-info { 210 .reason-info {
172 overflow: hidden; 211 overflow: hidden;
173 - padding: 25px 0 0 20px; 212 + padding: 25px 0 30px 20px;
174 width: 100%; 213 width: 100%;
175 border: 1px solid #eee; 214 border: 1px solid #eee;
176 border-top: none; 215 border-top: none;