Showing
7 changed files
with
27 additions
and
72 deletions
@@ -10,7 +10,7 @@ const notLoginTip = '抱歉,您暂未登录!'; | @@ -10,7 +10,7 @@ const notLoginTip = '抱歉,您暂未登录!'; | ||
10 | 10 | ||
11 | const order = { | 11 | const order = { |
12 | orders: (req, res) => { | 12 | orders: (req, res) => { |
13 | - const type = req.query.type; | 13 | + const type = req.query.type || 1; |
14 | 14 | ||
15 | res.render('order', { | 15 | res.render('order', { |
16 | module: 'me', | 16 | module: 'me', |
@@ -37,7 +37,7 @@ const yoho = { | @@ -37,7 +37,7 @@ const yoho = { | ||
37 | if (this.isApp) { | 37 | if (this.isApp) { |
38 | document.addEventListener('deviceready', callback); | 38 | document.addEventListener('deviceready', callback); |
39 | } else { | 39 | } else { |
40 | - callback(); | 40 | + return callback(); |
41 | } | 41 | } |
42 | }, | 42 | }, |
43 | 43 | ||
@@ -318,7 +318,8 @@ const yoho = { | @@ -318,7 +318,8 @@ const yoho = { | ||
318 | arguments: args | 318 | arguments: args |
319 | }); | 319 | }); |
320 | } else { | 320 | } else { |
321 | - tip(tipInfo); | 321 | + |
322 | + // tip(tipInfo); | ||
322 | } | 323 | } |
323 | }, | 324 | }, |
324 | 325 |
@@ -3,12 +3,15 @@ | @@ -3,12 +3,15 @@ | ||
3 | padding-top: 20px; | 3 | padding-top: 20px; |
4 | 4 | ||
5 | .coin-total { | 5 | .coin-total { |
6 | - padding: 35px 0; | 6 | + padding: 40px 0; |
7 | background: white; | 7 | background: white; |
8 | text-align: center; | 8 | text-align: center; |
9 | + border-top: 1px solid #eee; | ||
10 | + border-bottom: 1px solid #eee; | ||
9 | 11 | ||
10 | p:first-child { | 12 | p:first-child { |
11 | font-size: 34px; | 13 | font-size: 34px; |
14 | + line-height: 40px; | ||
12 | } | 15 | } |
13 | 16 | ||
14 | p:nth-child(2) { | 17 | p:nth-child(2) { |
@@ -20,6 +23,7 @@ | @@ -20,6 +23,7 @@ | ||
20 | p:last-child { | 23 | p:last-child { |
21 | color: #b0b0b0; | 24 | color: #b0b0b0; |
22 | font-size: 28px; | 25 | font-size: 28px; |
26 | + line-height: 40px; | ||
23 | } | 27 | } |
24 | } | 28 | } |
25 | 29 |
1 | .help { | 1 | .help { |
2 | - overflow: hidden; | ||
3 | - width: 100%; | ||
4 | - height: auto; | ||
5 | - margin-top: 20px; | ||
6 | - | ||
7 | - ul { | ||
8 | - display: block; | ||
9 | - overflow: hidden; | ||
10 | - margin: 0; | ||
11 | - padding-left: 0; | ||
12 | - width: 100%; | ||
13 | - height: auto; | ||
14 | - | ||
15 | - li { | ||
16 | - float: right; | ||
17 | - overflow: hidden; | ||
18 | - width: 100%; | ||
19 | - height: 80px; | ||
20 | - border-bottom: 1px solid #e0e0e0; | ||
21 | - color: #444; | ||
22 | - list-style: none; | ||
23 | - font-size: 28px; | ||
24 | - line-height: 84px; | ||
25 | - | ||
26 | - a:visited { | ||
27 | - color: #444; | ||
28 | - } | ||
29 | - | ||
30 | - .name { | ||
31 | - float: left; | ||
32 | - overflow: hidden; | ||
33 | - padding-left: 5%; | ||
34 | - width: 90%; | ||
35 | - height: 100%; | ||
36 | - } | ||
37 | - | ||
38 | - .icon { | ||
39 | - color: #e0e0e0; | ||
40 | - } | ||
41 | - } | ||
42 | - } | ||
43 | - | ||
44 | - .iconfont { | ||
45 | - color: #fff; | ||
46 | - } | ||
47 | -} | ||
48 | - | ||
49 | -.help-detail-page { | ||
50 | - margin-right: 30px; | ||
51 | - margin-left: 30px; | 2 | + /* 全部重写 */ |
52 | } | 3 | } |
1 | <template> | 1 | <template> |
2 | - <div class="coin-detail"> | 2 | + <div class="coin-detail" v-if="coinList && coinList.length"> |
3 | <p>明细列表</p> | 3 | <p>明细列表</p> |
4 | <ul class="coin-detail-list" v-infinite-scroll="getCoinData()" infinite-scroll-disabled="busy" infinite-scroll-distance="10"> | 4 | <ul class="coin-detail-list" v-infinite-scroll="getCoinData()" infinite-scroll-disabled="busy" infinite-scroll-distance="10"> |
5 | <li v-for="coin in coinList"> | 5 | <li v-for="coin in coinList"> |
@@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
32 | <div class="goods-price"> | 32 | <div class="goods-price"> |
33 | <p>¥{{product.goodsPrice}}</p> | 33 | <p>¥{{product.goodsPrice}}</p> |
34 | <p>×{{product.buyNumber}}</p> | 34 | <p>×{{product.buyNumber}}</p> |
35 | - <p><span class="goods-status">{{product.goodsStatus}}</span></p> | 35 | + <p v-if="product.goodsStatus"><span class="goods-status">{{product.goodsStatus}}</span></p> |
36 | </div> | 36 | </div> |
37 | </a> | 37 | </a> |
38 | </li> | 38 | </li> |
@@ -125,20 +125,20 @@ | @@ -125,20 +125,20 @@ | ||
125 | this.show = true; | 125 | this.show = true; |
126 | this.$set('order', result.data); | 126 | this.$set('order', result.data); |
127 | this.genderSel = genderSelect([{ | 127 | this.genderSel = genderSelect([{ |
128 | - key: this.order.isSupportRefund, | ||
129 | - val: this.order.isSupportRefund === 'Y' ? '申请退货' : '申请退货(已过期限)', | ||
130 | - url: '/me/return/refund?orderCode=' + this.order.orderCode, | ||
131 | - disabled: this.order.isSupportRefund !== 'Y' | ||
132 | - }, { | ||
133 | - key: this.order.isSupportExchange, | ||
134 | - val: this.order.isSupportExchange === 'Y' ? '申请换货' : '申请换货(已过期限)', | ||
135 | - url: '/me/return/exchange?orderCode=' + this.order.orderCode, | ||
136 | - disabled: this.order.isSupportExchange !== 'Y' | ||
137 | - }, { | ||
138 | - key: 'onlineService', | ||
139 | - val: '在线客服', | ||
140 | - url: '/me/service' | ||
141 | - } | 128 | + key: this.order.isSupportRefund, |
129 | + val: this.order.isSupportRefund === 'Y' ? '申请退货' : '申请退货(已过期限)', | ||
130 | + url: '/me/return/refund?orderCode=' + this.order.orderCode, | ||
131 | + disabled: this.order.isSupportRefund !== 'Y' | ||
132 | + }, { | ||
133 | + key: this.order.isSupportExchange, | ||
134 | + val: this.order.isSupportExchange === 'Y' ? '申请换货' : '申请换货(已过期限)', | ||
135 | + url: '/me/return/exchange?orderCode=' + this.order.orderCode, | ||
136 | + disabled: this.order.isSupportExchange !== 'Y' | ||
137 | + }, { | ||
138 | + key: 'onlineService', | ||
139 | + val: '在线客服', | ||
140 | + url: '/me/service' | ||
141 | + } | ||
142 | ]); | 142 | ]); |
143 | if (Number(this.order.status) === 0) { | 143 | if (Number(this.order.status) === 0) { |
144 | this.getCancelReason(); | 144 | this.getCancelReason(); |
@@ -153,7 +153,7 @@ | @@ -153,7 +153,7 @@ | ||
153 | }); | 153 | }); |
154 | }, | 154 | }, |
155 | reasonChange() { | 155 | reasonChange() { |
156 | - if (this.cancelbusy) { | 156 | + if (this.cancelbusy) { |
157 | return false; | 157 | return false; |
158 | } | 158 | } |
159 | 159 |
-
Please register or login to post a comment