fe / yoho-blk · Commits

Go to a project

Authored by yyq
Commit 1821676b5baaf6125b3d850f167164d1e30677c4 1 parent 330b2979

结构调整

Inline Side-by-side
Showing 7 changed files with 171 additions and 169 deletions
@@ -76,7 +76,7 @@ const refundDetail = (req, res, next) => { @@ -76,7 +76,7 @@ const refundDetail = (req, res, next) => {
76 76
77 returns.getRefundDetailData(applyId, uid).then(result => { 77 returns.getRefundDetailData(applyId, uid).then(result => {
78 res.display('index', { 78 res.display('index', {
79 - page: 'returns-refund', 79 + page: 'refund',
80 content: result 80 content: result
81 }); 81 });
82 }).catch(next); 82 }).catch(next);
@@ -88,7 +88,7 @@ const exchange = (req, res, next) => { @@ -88,7 +88,7 @@ const exchange = (req, res, next) => {
88 88
89 returns.getChangeGoodsList(code, uid).then(result => { 89 returns.getChangeGoodsList(code, uid).then(result => {
90 res.display('index', { 90 res.display('index', {
91 - page: 'returns-change', 91 + page: 'exchange',
92 isMe: true, 92 isMe: true,
93 content: Object.assign({ 93 content: Object.assign({
94 nav: mcHandler.getMeCrumb('我的退/换货'), 94 nav: mcHandler.getMeCrumb('我的退/换货'),
1 {{# refund}} 1 {{# refund}}
2 - {{> returns/returns-status}} 2 + <div class="refund-wrap">
  3 + {{> returns/returns-status}}
3 4
4 - <h4 class="third-title">选择退货商品</h4>  
5 - <div class="refund-goods clearfix" {{# speclialReason}} data-{{id}}="{{@index}}"{{/ speclialReason}}>  
6 - <input id="order-code" type="hidden" value="{{orderCode}}">  
7 - <ul class="goods-header">  
8 - <li class="info">商品信息</li>  
9 - <li class="reason">退货原因</li>  
10 - <li class="num">退货数量</li>  
11 - <li class="price">单价</li>  
12 - </ul> 5 + <h4 class="third-title">选择退货商品</h4>
  6 + <div class="refund-goods clearfix" {{# speclialReason}} data-{{id}}="{{@index}}"{{/ speclialReason}}>
  7 + <input id="order-code" type="hidden" value="{{orderCode}}">
  8 + <ul class="goods-header">
  9 + <li class="info">商品信息</li>
  10 + <li class="reason">退货原因</li>
  11 + <li class="num">退货数量</li>
  12 + <li class="price">单价</li>
  13 + </ul>
13 14
14 - {{# goods}}  
15 - <div class="goods-item clearfix">  
16 - <div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div>  
17 - <div class="img">  
18 - <img class="lazy" data-original="{{image img 70 90}}"> 15 + {{# goods}}
  16 + <div class="goods-item clearfix">
  17 + <div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div>
  18 + <div class="img">
  19 + <img class="lazy" data-original="{{image img 70 90}}">
  20 + </div>
  21 + <div class="info">
  22 + <p>{{name}}</p>
  23 + <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
  24 + <p>×{{num}}</p>
  25 + </div>
  26 + <div class="reason">
  27 + <select class="refund-reason">
  28 + <option>选择退款原因</option>
  29 + {{# reasonList}}
  30 + <option value="{{id}}">{{name}}</option>
  31 + {{/ reasonList}}
  32 + </select>
  33 + </div>
  34 + <div class="num">
  35 + <span class="iconfont">&#xe621;</span>
  36 + <input type="text" value="{{num}}" readonly="readonly">
  37 + <span class="iconfont">&#xe61f;</span>
  38 + </div>
  39 + <div class="price">¥{{round price 2}}</div>
  40 + {{> returns/special-reason}}
19 </div> 41 </div>
20 - <div class="info">  
21 - <p>{{name}}</p>  
22 - <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>  
23 - <p>×{{num}}</p>  
24 - </div>  
25 - <div class="reason">  
26 - <select class="refund-reason">  
27 - <option>选择退款原因</option>  
28 - {{# reasonList}}  
29 - <option value="{{id}}">{{name}}</option>  
30 - {{/ reasonList}}  
31 - </select>  
32 - </div>  
33 - <div class="num">  
34 - <span class="iconfont">&#xe621;</span>  
35 - <input type="text" value="{{num}}" readonly="readonly">  
36 - <span class="iconfont">&#xe61f;</span>  
37 - </div>  
38 - <div class="price">¥{{round price 2}}</div>  
39 - {{> returns/special-reason}}  
40 - </div>  
41 - {{/ goods}}  
42 - </div> 42 + {{/ goods}}
  43 + </div>
43 44
44 - <h4 class="third-title">退款方式</h4> 45 + <h4 class="third-title">退款方式</h4>
45 46
46 - <div class="refund-type">  
47 - <div>  
48 - <label class="type-item ali-item cur" title="支付宝"></label>  
49 - <label class="type-item union-item" title="银行卡"></label> 47 + <div class="refund-type">
  48 + <div>
  49 + <label class="type-item ali-item cur" title="支付宝"></label>
  50 + <label class="type-item union-item" title="银行卡"></label>
  51 + </div>
  52 + <dl class="alipay">
  53 + <dd>账号：<input type="text" class="name" placeholder="收款人支付宝账号"></dd>
  54 + <dd>姓名：<input type="text" class="account" placeholder="姓名"></dd>
  55 + </dl>
  56 + <dl class="unionpay hide">
  57 + <dd>
  58 + 银行：
  59 + <select class="bank">
  60 + <option>中国银行</option>
  61 + <option>中国农业银行</option>
  62 + <option>中国工商银行</option>
  63 + <option>中国建设银行</option>
  64 + </select>
  65 + <input type="text" placeholder="开户支行">
  66 + <span class="blue" class="area">例：江苏省南京市奥体支行</span>
  67 + </dd>
  68 + <dd>账号：<input type="text" class="account" placeholder="收款人银行卡号"></dd>
  69 + <dd>姓名：<input type="text" class="name" placeholder="姓名"></dd>
  70 + </dl>
  71 + </div>
  72 + <div class="opt-btn">
  73 + <span class="apply-tip blue hide">请填写完整</span>
  74 + <div id="apply-btn" class="btn disable">提交申请</div>
50 </div> 75 </div>
51 - <dl class="alipay">  
52 - <dd>账号：<input type="text" class="name" placeholder="收款人支付宝账号"></dd>  
53 - <dd>姓名：<input type="text" class="account" placeholder="姓名"></dd>  
54 - </dl>  
55 - <dl class="unionpay hide">  
56 - <dd>  
57 - 银行：  
58 - <select class="bank">  
59 - <option>中国银行</option>  
60 - <option>中国农业银行</option>  
61 - <option>中国工商银行</option>  
62 - <option>中国建设银行</option>  
63 - </select>  
64 - <input type="text" placeholder="开户支行">  
65 - <span class="blue" class="area">例：江苏省南京市奥体支行</span>  
66 - </dd>  
67 - <dd>账号：<input type="text" class="account" placeholder="收款人银行卡号"></dd>  
68 - <dd>姓名：<input type="text" class="name" placeholder="姓名"></dd>  
69 - </dl>  
70 - </div>  
71 - <div class="opt-btn">  
72 - <span class="apply-tip blue hide">请填写完整</span>  
73 - <div id="apply-btn" class="btn disable">提交申请</div>  
74 </div> 76 </div>
75 {{/ refund}} 77 {{/ refund}}
@@ -113,5 +113,4 @@ @@ -113,5 +113,4 @@
113 @import "order/index"; 113 @import "order/index";
114 @import "return/index"; 114 @import "return/index";
115 @import "currency"; 115 @import "currency";
116 -@import "returns";  
117 @import "exchange"; 116 @import "exchange";
1 .returns-wrap { 1 .returns-wrap {
  2 + font-size: 14px;
  3 +
2 .returns-status { 4 .returns-status {
3 padding: 30px 0 80px; 5 padding: 30px 0 80px;
4 6
@@ -49,8 +51,106 @@ @@ -49,8 +51,106 @@
49 } 51 }
50 } 52 }
51 } 53 }
  54 +
  55 + .third-title {
  56 + font-size: 16px;
  57 + font-weight: bold;
  58 + padding-bottom: 20px;
  59 + }
  60 +
  61 + .special-reason {
  62 + padding-top: 20px;
  63 + display: none;
  64 +
  65 + .left-title {
  66 + width: 150px;
  67 + padding-left: 54px;
  68 +
  69 + .red {
  70 + color: #d93549;
  71 + margin-right: 3px;
  72 + }
  73 + }
  74 +
  75 + .right-content {
  76 + width: 570px;
  77 + }
  78 +
  79 + .mark-text {
  80 + width: 570px;
  81 + height: 120px;
  82 + resize: none;
  83 + border-color: #eee;
  84 + }
  85 +
  86 + .img-wrap,
  87 + .img-upload {
  88 + width: 60px;
  89 + height: 60px;
  90 + border: 1px dashed #eee;
  91 + float: left;
  92 + margin-right: 10px;
  93 + }
  94 +
  95 + .img-upload {
  96 + line-height: 60px;
  97 + text-align: center;
  98 + color: #dfdfdf;
  99 + cursor: pointer;
  100 +
  101 + .iconfont {
  102 + font-size: 34px;
  103 + }
  104 + }
  105 +
  106 + .img-wrap {
  107 + position: relative;
  108 + }
  109 +
  110 + .img-wrap:hover .img-opt {
  111 + display: block;
  112 + }
  113 +
  114 + .img-opt {
  115 + width: 100%;
  116 + height: 20px;
  117 + line-height: 20px;
  118 + background: #555;
  119 + font-size: 12px;
  120 + color: #fff;
  121 + opacity: 0.7;
  122 + position: absolute;
  123 + text-align: center;
  124 + display: none;
  125 +
  126 + > * {
  127 + display: inline-block;
  128 + cursor: pointer;
  129 + }
  130 + }
  131 + }
  132 +
  133 + .opt-btn {
  134 + padding-top: 40px;
  135 + line-height: 40px;
  136 + text-align: right;
  137 +
  138 + .blue {
  139 + margin-right: 10px;
  140 + font-size: 12px;
  141 + }
  142 +
  143 + .btn {
  144 + width: 130px;
  145 + height: 40px;
  146 + line-height: 40px;
  147 + font-size: 16px;
  148 + display: inline-block;
  149 + }
  150 + }
52 } 151 }
53 152
54 @import "list"; 153 @import "list";
55 @import "change"; 154 @import "change";
  155 +@import "refund";
56 @import "refund-detail"; 156 @import "refund-detail";
1 -.returns-wrap {  
2 - font-size: 14px;  
3 -  
4 - .third-title {  
5 - font-size: 16px;  
6 - font-weight: bold;  
7 - padding-bottom: 20px;  
8 - }  
9 -  
10 - .special-reason {  
11 - padding-top: 20px;  
12 - display: none;  
13 -  
14 - .left-title {  
15 - width: 150px;  
16 - padding-left: 54px;  
17 -  
18 - .red {  
19 - color: #d93549;  
20 - margin-right: 3px;  
21 - }  
22 - }  
23 -  
24 - .right-content {  
25 - width: 570px;  
26 - }  
27 -  
28 - .mark-text {  
29 - width: 570px;  
30 - height: 120px;  
31 - resize: none;  
32 - border-color: #eee;  
33 - }  
34 -  
35 - .img-wrap,  
36 - .img-upload {  
37 - width: 60px;  
38 - height: 60px;  
39 - border: 1px dashed #eee;  
40 - float: left;  
41 - margin-right: 10px;  
42 - }  
43 -  
44 - .img-upload {  
45 - line-height: 60px;  
46 - text-align: center;  
47 - color: #dfdfdf;  
48 - cursor: pointer;  
49 -  
50 - .iconfont {  
51 - font-size: 34px;  
52 - }  
53 - }  
54 -  
55 - .img-wrap {  
56 - position: relative;  
57 - }  
58 -  
59 - .img-wrap:hover .img-opt {  
60 - display: block;  
61 - }  
62 -  
63 - .img-opt {  
64 - width: 100%;  
65 - height: 20px;  
66 - line-height: 20px;  
67 - background: #555;  
68 - font-size: 12px;  
69 - color: #fff;  
70 - opacity: 0.7;  
71 - position: absolute;  
72 - text-align: center;  
73 - display: none;  
74 -  
75 - > * {  
76 - display: inline-block;  
77 - cursor: pointer;  
78 - }  
79 - }  
80 - }  
81 -  
82 - .opt-btn {  
83 - padding-top: 40px;  
84 - line-height: 40px;  
85 - text-align: right;  
86 -  
87 - .blue {  
88 - margin-right: 10px;  
89 - font-size: 12px;  
90 - }  
91 -  
92 - .btn {  
93 - width: 130px;  
94 - height: 40px;  
95 - line-height: 40px;  
96 - font-size: 16px;  
97 - display: inline-block;  
98 - }  
99 - }  
100 - 1 +.refund-wrap {
101 .refund-goods { 2 .refund-goods {
102 margin-bottom: 40px; 3 margin-bottom: 40px;
103 4