fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit f5834498fcb6c7da2d1d8fd8dee93b9aa252fb16 2 parents 6688714a c80f6574

Merge branch 'develop' into release/1.0

Inline Side-by-side
Showing 20 changed files with 44 additions and 81 deletions
@@ -32,7 +32,7 @@ yoho币 | /me/mycurrency | @@ -32,7 +32,7 @@ yoho币 | /me/mycurrency |
32 意见反馈 | /me/feedback | 32 意见反馈 | /me/feedback |
33 关于我们 | /me/about | 33 关于我们 | /me/about |
34 物流详情 | /me/logistic?order_code=1609827614 | 34 物流详情 | /me/logistic?order_code=1609827614 |
35 -退换货物流详情| /me/logistic?order_code=1609827614&type=refund| 35 +退换货物流详情| /me/logistic?order_code=1609827614&id=3&type=refund|change
36 -------------------------------------------------------------------------------- 36 --------------------------------------------------------------------------------
37 37
38 ### order 常亮 38 ### order 常亮
@@ -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',
@@ -149,7 +149,8 @@ const order = { @@ -149,7 +149,8 @@ const order = {
149 orderModel.getOrderLogisticdate({ 149 orderModel.getOrderLogisticdate({
150 uid: req.user.uid || '', 150 uid: req.user.uid || '',
151 type: req.query.type || '', 151 type: req.query.type || '',
152 - order_code: req.query.orderCode 152 + order_code: req.query.orderCode,
  153 + id: req.query.id
153 }).then(result => { 154 }).then(result => {
154 res.json(result); 155 res.json(result);
155 }); 156 });
@@ -92,6 +92,7 @@ exports.deleteOrder = (orderCode, uid) => { @@ -92,6 +92,7 @@ exports.deleteOrder = (orderCode, uid) => {
92 * @param {[int]} order_code 订单号 92 * @param {[int]} order_code 订单号
93 * @param {[int]} uid 用户uid 93 * @param {[int]} uid 用户uid
94 * @param {[string]} type 退换货物流(退货：refund,换货：change) 94 * @param {[string]} type 退换货物流(退货：refund,换货：change)
  95 + * @param {[int]} id 退换货申请ID(type为refund | change，才有效)
95 * @return {[array]} 96 * @return {[array]}
96 */ 97 */
97 exports.getOrderLogisticdate = (params) => { 98 exports.getOrderLogisticdate = (params) => {
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 "express-handlebars": "^3.0.0", 28 "express-handlebars": "^3.0.0",
29 "express-session": "^1.14.0", 29 "express-session": "^1.14.0",
30 "influxdb-winston": "^1.0.1", 30 "influxdb-winston": "^1.0.1",
31 - "lodash": "^4.14.2", 31 + "lodash": "^4.15.0",
32 "memcached": "^2.2.1", 32 "memcached": "^2.2.1",
33 "moment": "^2.14.1", 33 "moment": "^2.14.1",
34 "morgan": "^1.7.0", 34 "morgan": "^1.7.0",
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 "winston": "^2.2.0", 39 "winston": "^2.2.0",
40 "winston-daily-rotate-file": "^1.1.4", 40 "winston-daily-rotate-file": "^1.1.4",
41 "yoho-md5": "^2.0.0", 41 "yoho-md5": "^2.0.0",
42 - "yoho-node-lib": "0.0.38" 42 + "yoho-node-lib": "0.0.40"
43 }, 43 },
44 "devDependencies": { 44 "devDependencies": {
45 "autoprefixer": "^6.4.0", 45 "autoprefixer": "^6.4.0",
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 "babel-plugin-transform-runtime": "^6.12.0", 48 "babel-plugin-transform-runtime": "^6.12.0",
49 "babel-preset-es2015": "^6.13.2", 49 "babel-preset-es2015": "^6.13.2",
50 "babel-runtime": "^6.11.6", 50 "babel-runtime": "^6.11.6",
51 - "eslint": "^3.2.2", 51 + "eslint": "^3.3.0",
52 "eslint-config-yoho": "^1.0.1", 52 "eslint-config-yoho": "^1.0.1",
53 "eslint-plugin-html": "^1.5.2", 53 "eslint-plugin-html": "^1.5.2",
54 "extract-text-webpack-plugin": "^1.0.1", 54 "extract-text-webpack-plugin": "^1.0.1",
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 "stylelint-processor-html": "^1.0.0", 82 "stylelint-processor-html": "^1.0.0",
83 "vue": "1.0.26", 83 "vue": "1.0.26",
84 "vue-infinite-scroll": "0.2.3", 84 "vue-infinite-scroll": "0.2.3",
85 - "vue-lazyload": "^0.4.5", 85 + "vue-lazyload": "^0.4.6",
86 "vue-loader": "^8.5.3", 86 "vue-loader": "^8.5.3",
87 "vue-swipe": "0.2.6", 87 "vue-swipe": "0.2.6",
88 "vue-touch": "1.1.0", 88 "vue-touch": "1.1.0",
@@ -223,7 +223,7 @@ gulp.task('webpack', ['assets'], (done) => { @@ -223,7 +223,7 @@ gulp.task('webpack', ['assets'], (done) => {
223 const proConfig = Object.assign({}, webpackConfig, { 223 const proConfig = Object.assign({}, webpackConfig, {
224 vue: { 224 vue: {
225 postcss: { 225 postcss: {
226 - plugins: postcssPlugin(env.dev), 226 + plugins: postcssPlugin(env.pro),
227 options: { 227 options: {
228 parser: require('postcss-scss') 228 parser: require('postcss-scss')
229 } 229 }
@@ -158,7 +158,7 @@ const matchHeader = (path, qs, titleMap) => { @@ -158,7 +158,7 @@ const matchHeader = (path, qs, titleMap) => {
158 158
159 if (/\/me\/logistic$/.test(path)) { 159 if (/\/me\/logistic$/.test(path)) {
160 header = titleMap[1]; 160 header = titleMap[1];
161 - header.title.des = '物流详情'; 161 + header.title.des = '物流信息';
162 return header; 162 return header;
163 } 163 }
164 164
@@ -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
@@ -51,6 +51,5 @@ @@ -51,6 +51,5 @@
51 p { 51 p {
52 text-align: center; 52 text-align: center;
53 font-size: 24px; 53 font-size: 24px;
54 - font-family: BrownStd Regular;  
55 } 54 }
56 } 55 }
@@ -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>&yen;{{product.goodsPrice}}</p> 33 <p>&yen;{{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
@@ -5,6 +5,12 @@ @@ -5,6 +5,12 @@
5 </template> 5 </template>
6 <style> 6 <style>
7 .product-header { 7 .product-header {
  8 + &.ghost {
  9 + .blk-header-title {
  10 + visibility: hidden;
  11 + }
  12 + }
  13 +
8 .blk-header-gap { 14 .blk-header-gap {
9 display: none; 15 display: none;
10 } 16 }
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 title: result.shopName, 90 title: result.shopName,
91 des: shareSubTitle, 91 des: shareSubTitle,
92 url: shareUrl, 92 url: shareUrl,
93 - img: result.shopLogo ? result.shopLogo : '', 93 + img: result.shopLogo ? result.shopLogo.replace(/{width}/g, 120).replace(/{height}/g, 80) : '',
94 isBlkShop: result.isBlkShop, 94 isBlkShop: result.isBlkShop,
95 domain: locationQuery.domain, 95 domain: locationQuery.domain,
96 brandName: result.brandName, 96 brandName: result.brandName,