fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit 2f161b789a49e47eb985bdd2979ac7ced44091c2 1 parent bd40373d

修改部分： 个人中心 ＋ 订单

Inline Side-by-side
Showing 19 changed files with 215 additions and 217 deletions
@@ -36,7 +36,7 @@ const component = { @@ -36,7 +36,7 @@ const component = {
36 nickName: Object.keys(proData).length ? proData.nickname : '登录/注册' 36 nickName: Object.keys(proData).length ? proData.nickname : '登录/注册'
37 }; 37 };
38 38
39 - return res.json(global.yoho.camelCase(Object.assign(result, data[1]))); 39 + return res.json(Object.assign(result, data[1]));
40 }).catch(next); 40 }).catch(next);
41 }, 41 },
42 mydetails: (req, res, next) => { 42 mydetails: (req, res, next) => {
@@ -14,7 +14,7 @@ const exchange = { @@ -14,7 +14,7 @@ const exchange = {
14 }, { 14 }, {
15 cache: true, 15 cache: true,
16 code: 200 16 code: 200
17 - }).then(global.yoho.camelCase); 17 + });
18 }, 18 },
19 19
20 // 加载用户可选择的退货方式列表 20 // 加载用户可选择的退货方式列表
@@ -26,7 +26,7 @@ const exchange = { @@ -26,7 +26,7 @@ const exchange = {
26 }, { 26 }, {
27 cache: true, 27 cache: true,
28 code: 200 28 code: 200
29 - }).then(global.yoho.camelCase); 29 + });
30 }, 30 },
31 31
32 submitExchange(uid, params) { 32 submitExchange(uid, params) {
@@ -35,7 +35,7 @@ const exchange = { @@ -35,7 +35,7 @@ const exchange = {
35 method: 'app.change.submit' 35 method: 'app.change.submit'
36 }, params); 36 }, params);
37 37
38 - return api.post('', data).then(global.yoho.camelCase); 38 + return api.post('', data);
39 }, 39 },
40 40
41 /** 41 /**
@@ -48,7 +48,7 @@ const exchange = { @@ -48,7 +48,7 @@ const exchange = {
48 uid: uid, 48 uid: uid,
49 id: id, 49 id: id,
50 method: 'app.change.cancel' 50 method: 'app.change.cancel'
51 - }).then(global.yoho.camelCase); 51 + });
52 } 52 }
53 }; 53 };
54 54
@@ -18,7 +18,7 @@ exports.getFavProductData = (uid, page, limit) => { @@ -18,7 +18,7 @@ exports.getFavProductData = (uid, page, limit) => {
18 }, { 18 }, {
19 code: 200 19 code: 200
20 }).then(result => { 20 }).then(result => {
21 - return result.data ? global.yoho.camelCase(result.data) : {}; 21 + return result.data || {};
22 }); 22 });
23 }; 23 };
24 24
@@ -41,7 +41,7 @@ exports.getFavBrandData = (uid, gender, page, limit) => { @@ -41,7 +41,7 @@ exports.getFavBrandData = (uid, gender, page, limit) => {
41 }, { 41 }, {
42 code: 200 42 code: 200
43 }).then(result => { 43 }).then(result => {
44 - return result.data ? global.yoho.camelCase(result.data) : {}; 44 + return result.data || {};
45 }); 45 });
46 }; 46 };
47 47
@@ -60,4 +60,4 @@ exports.favoriteDelete = (uid, favId, type) => { @@ -60,4 +60,4 @@ exports.favoriteDelete = (uid, favId, type) => {
60 type: type, 60 type: type,
61 fav_id: favId 61 fav_id: favId
62 }); 62 });
63 -}; 63 +};
@@ -24,7 +24,7 @@ exports.getOrders = (param) => { @@ -24,7 +24,7 @@ exports.getOrders = (param) => {
24 method: 'app.SpaceOrders.get' 24 method: 'app.SpaceOrders.get'
25 }, param); 25 }, param);
26 26
27 - return api.get('', param).then(camelCase); 27 + return api.get('', param);
28 }; 28 };
29 29
30 /** 30 /**
@@ -38,7 +38,7 @@ exports.getOrderDetail = (uid, orderCode) => { @@ -38,7 +38,7 @@ exports.getOrderDetail = (uid, orderCode) => {
38 method: 'app.SpaceOrders.detail', 38 method: 'app.SpaceOrders.detail',
39 order_code: orderCode, 39 order_code: orderCode,
40 uid: uid 40 uid: uid
41 - }).then(camelCase); 41 + });
42 }; 42 };
43 43
44 /** 44 /**
@@ -127,7 +127,7 @@ exports.getCoins = (uid) => { @@ -127,7 +127,7 @@ exports.getCoins = (uid) => {
127 return api.get('', { 127 return api.get('', {
128 uid: uid, 128 uid: uid,
129 method: 'app.yohocoin.total' 129 method: 'app.yohocoin.total'
130 - }).then(camelCase); 130 + });
131 }; 131 };
132 132
133 /** 133 /**
@@ -143,7 +143,7 @@ exports.getCoinDetail = (uid, page, limit) => { @@ -143,7 +143,7 @@ exports.getCoinDetail = (uid, page, limit) => {
143 page: page, 143 page: page,
144 limit: limit, 144 limit: limit,
145 method: 'app.yohocoin.lists' 145 method: 'app.yohocoin.lists'
146 - }).then(camelCase); 146 + });
147 }; 147 };
148 148
149 /** 149 /**
@@ -153,5 +153,5 @@ exports.getCoinDetail = (uid, page, limit) => { @@ -153,5 +153,5 @@ exports.getCoinDetail = (uid, page, limit) => {
153 exports.getCancelReason = () => { 153 exports.getCancelReason = () => {
154 return api.get('', { 154 return api.get('', {
155 method: 'app.SpaceOrders.closeReasons' 155 method: 'app.SpaceOrders.closeReasons'
156 - }).then(camelCase);  
157 -}; 156 + });
  157 +};
@@ -13,13 +13,13 @@ const refund = { @@ -13,13 +13,13 @@ const refund = {
13 }, { 13 }, {
14 cache: true, 14 cache: true,
15 code: 200 15 code: 200
16 - }).then(global.yoho.camelCase); 16 + });
17 }, 17 },
18 submitRefundData(uid, params) { 18 submitRefundData(uid, params) {
19 return api.post('', Object.assign({ 19 return api.post('', Object.assign({
20 method: 'app.refund.submit', 20 method: 'app.refund.submit',
21 uid: uid, 21 uid: uid,
22 - }, params)).then(global.yoho.camelCase); 22 + }, params));
23 }, 23 },
24 getExpressCompany() { 24 getExpressCompany() {
25 return api.get('', { 25 return api.get('', {
@@ -47,7 +47,7 @@ const refund = { @@ -47,7 +47,7 @@ const refund = {
47 uid: uid, 47 uid: uid,
48 }, { 48 }, {
49 code: 200 49 code: 200
50 - }).then(global.yoho.camelCase); 50 + });
51 }, 51 },
52 getRefundDetail(id, uid) { 52 getRefundDetail(id, uid) {
53 return api.get('', { 53 return api.get('', {
@@ -56,7 +56,7 @@ const refund = { @@ -56,7 +56,7 @@ const refund = {
56 uid: uid, 56 uid: uid,
57 }, { 57 }, {
58 code: 200 58 code: 200
59 - }).then(global.yoho.camelCase); 59 + });
60 }, 60 },
61 61
62 /** 62 /**
@@ -74,7 +74,7 @@ const refund = { @@ -74,7 +74,7 @@ const refund = {
74 method: 'app.refund.getList' 74 method: 'app.refund.getList'
75 }, param); 75 }, param);
76 76
77 - return api.get('', param).then(global.yoho.camelCase); 77 + return api.get('', param);
78 }, 78 },
79 79
80 /** 80 /**
@@ -88,8 +88,8 @@ const refund = { @@ -88,8 +88,8 @@ const refund = {
88 uid: uid, 88 uid: uid,
89 id: id, 89 id: id,
90 method: 'app.refund.cancel' 90 method: 'app.refund.cancel'
91 - }).then(global.yoho.camelCase); 91 + });
92 } 92 }
93 }; 93 };
94 94
95 -module.exports = refund; 95 +module.exports = refund;
@@ -57,9 +57,9 @@ module.exports = (Vue) => { @@ -57,9 +57,9 @@ module.exports = (Vue) => {
57 57
58 switch (kind) { 58 switch (kind) {
59 case 'collection': 59 case 'collection':
60 - productId = product.productId;  
61 - goodsId = product.goodsId;  
62 - cnAlphabet = product.cnAlphabet; 60 + productId = product.product_id;
  61 + goodsId = product.goods_id;
  62 + cnAlphabet = product.cn_alphabet;
63 break; 63 break;
64 default: 64 default:
65 productId = product.productId; 65 productId = product.productId;
@@ -198,4 +198,4 @@ module.exports = (Vue) => { @@ -198,4 +198,4 @@ module.exports = (Vue) => {
198 198
199 return en + cn; 199 return en + cn;
200 }); 200 });
201 -}; 201 +};
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 this.busy = false; 50 this.busy = false;
51 if (result.data.coinlist.length > 0) { 51 if (result.data.coinlist.length > 0) {
52 this.$set('coinList', this.coinList.concat(result.data.coinlist)); 52 this.$set('coinList', this.coinList.concat(result.data.coinlist));
53 - this.pageTotal = result.data.pageTotal; 53 + this.pageTotal = result.data.page_total;
54 } 54 }
55 } 55 }
56 }).fail(() => { 56 }).fail(() => {
@@ -87,8 +87,8 @@ @@ -87,8 +87,8 @@
87 }).then(res => { 87 }).then(res => {
88 const self = this; 88 const self = this;
89 89
90 - if (res.data && res.data.goodsList) {  
91 - res.data.goodsList.forEach((product, index) => { 90 + if (res.data && res.data.goods_list) {
  91 + res.data.goods_list.forEach((product, index) => {
92 product.checked = false; 92 product.checked = false;
93 product.change = null; 93 product.change = null;
94 product.reason = { 94 product.reason = {
@@ -96,20 +96,20 @@ @@ -96,20 +96,20 @@
96 }; 96 };
97 product.imageList = []; 97 product.imageList = [];
98 98
99 - self.indexMap[product.productId] = index; // 生成映射 99 + self.indexMap[product.product_id] = index; // 生成映射
100 }); 100 });
101 101
102 - this.$set('goodsArr', res.data.goodsList); 102 + this.$set('goodsArr', res.data.goods_list);
103 this.$set('exchangeData', res.data); 103 this.$set('exchangeData', res.data);
104 this.$set('address', res.data.address); 104 this.$set('address', res.data.address);
105 105
106 reasonConfig.specialReasons = []; 106 reasonConfig.specialReasons = [];
107 - res.data.specialExchangeReason.forEach(obj => reasonConfig.specialReasons.push(obj.id)); 107 + res.data.special_exchange_reason.forEach(obj => reasonConfig.specialReasons.push(obj.id));
108 reasonConfig.reasons = [{ 108 reasonConfig.reasons = [{
109 id: 0, 109 id: 0,
110 name: '请选择' 110 name: '请选择'
111 - }].concat(res.data.exchangeReason);  
112 - reasonConfig.specialNotice = res.data.specialNoticeBo; 111 + }].concat(res.data.exchange_reason);
  112 + reasonConfig.specialNotice = res.data.special_notice;
113 } 113 }
114 }); 114 });
115 }, 115 },
@@ -124,13 +124,13 @@ @@ -124,13 +124,13 @@
124 124
125 yoho.goAddress({ 125 yoho.goAddress({
126 type: '1', 126 type: '1',
127 - addressid: this.address.addressId 127 + addressid: this.address.address_id
128 }, (address) => { 128 }, (address) => {
129 if (address) { 129 if (address) {
130 self.$set('address', { 130 self.$set('address', {
131 - addressId: address.address_id, 131 + address_id: address.address_id,
132 area: address.area, 132 area: address.area,
133 - zipCode: address.zip_code, 133 + zip_code: address.zip_code,
134 mobile: address.mobile, 134 mobile: address.mobile,
135 address: address.address, 135 address: address.address,
136 consignee: address.consignee 136 consignee: address.consignee
@@ -168,11 +168,11 @@ @@ -168,11 +168,11 @@
168 submitData() { 168 submitData() {
169 const data = { 169 const data = {
170 order_code: this.orderCode, 170 order_code: this.orderCode,
171 - address_id: this.address.addressId, 171 + address_id: this.address.address_id,
172 address: this.address.address, 172 address: this.address.address,
173 consignee_name: this.address.consignee, 173 consignee_name: this.address.consignee,
174 - area_code: this.address.areaCode,  
175 - zip_code: this.address.zipCode, 174 + area_code: this.address.area_code,
  175 + zip_code: this.address.zip_code,
176 mobile: this.address.mobile, 176 mobile: this.address.mobile,
177 delivery_tpye: this.deliveryTpye, 177 delivery_tpye: this.deliveryTpye,
178 app_type: 1, 178 app_type: 1,
@@ -182,11 +182,11 @@ @@ -182,11 +182,11 @@
182 this.selectedGoods.forEach(good => { 182 this.selectedGoods.forEach(good => {
183 183
184 data.goods.push({ 184 data.goods.push({
185 - product_skn: good.productSkn,  
186 - product_skc: good.productSkc,  
187 - product_sku: good.productSku,  
188 - goods_type: good.goodsTypeId,  
189 - last_price: good.lastPrice, 185 + product_skn: good.product_skn,
  186 + product_skc: good.product_skc,
  187 + product_sku: good.product_sku,
  188 + goods_type: good.goods_type_id,
  189 + last_price: good.last_price,
190 exchange_reason: good.reason.id, 190 exchange_reason: good.reason.id,
191 remark: good.remark || '', 191 remark: good.remark || '',
192 evidence_images: good.imageList || '', 192 evidence_images: good.imageList || '',
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 data 244 data
245 }).then(result => { 245 }).then(result => {
246 if (result.code === 200) { 246 if (result.code === 200) {
247 - returnUtil.applySuccuss(self.page, result.data.applyId); 247 + returnUtil.applySuccuss(self.page, result.data.apply_id);
248 } else { 248 } else {
249 Modal.alert(result.message); 249 Modal.alert(result.message);
250 } 250 }
@@ -266,7 +266,7 @@ @@ -266,7 +266,7 @@
266 }) 266 })
267 .then(result => { 267 .then(result => {
268 $.each(result.data, (index, obj) => { 268 $.each(result.data, (index, obj) => {
269 - if (obj.isDefault === 'Y') { 269 + if (obj.is_default === 'Y') {
270 self.$set('deliveryTpye', obj.id); 270 self.$set('deliveryTpye', obj.id);
271 return false; 271 return false;
272 } 272 }
1 <template> 1 <template>
2 <div class="return-form exchange-form"> 2 <div class="return-form exchange-form">
3 <product :product="product"></product> 3 <product :product="product"></product>
4 - <div class="field" @click="openFeatureSelector(product.productId)"> 4 + <div class="field" @click="openFeatureSelector(product.product_id)">
5 换货的颜色尺码 5 换货的颜色尺码
6 <div class="right"> 6 <div class="right">
7 <span class="change" v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span> 7 <span class="change" v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span>
@@ -46,10 +46,10 @@ @@ -46,10 +46,10 @@
46 46
47 created() { 47 created() {
48 this.$set('product.change', { 48 this.$set('product.change', {
49 - color: this.product.colorName,  
50 - size: this.product.sizeName,  
51 - goodsId: this.product.goodsId,  
52 - sku: this.product.productSku 49 + color: this.product.color_name,
  50 + size: this.product.size_name,
  51 + goodsId: this.product.goods_id,
  52 + sku: this.product.product_sku
53 }); 53 });
54 } 54 }
55 }; 55 };
@@ -97,25 +97,25 @@ @@ -97,25 +97,25 @@
97 tab: 'brand' 97 tab: 'brand'
98 } 98 }
99 }).then(data => { 99 }).then(data => {
100 - if ($.isEmptyObject(data) || data.pageTotal === 0) { 100 + if ($.isEmptyObject(data) || data.page_total === 0) {
101 this.busy = true; 101 this.busy = true;
102 } else { 102 } else {
103 - if (data.pageTotal && this.page === data.pageTotal) { 103 + if (data.page_total && this.page === data.page_total) {
104 this.busy = true; 104 this.busy = true;
105 } else { 105 } else {
106 this.busy = false; 106 this.busy = false;
107 } 107 }
108 108
109 - const list = data.brandList || []; 109 + const list = data.brand_list || [];
110 110
111 list.forEach(o => { 111 list.forEach(o => {
112 - if (!this.keys[o.brandId]) {  
113 - this.keys[o.brandId] = true; 112 + if (!this.keys[o.brand_id]) {
  113 + this.keys[o.brand_id] = true;
114 this.brandData.push({ 114 this.brandData.push({
115 - fav_id: o.brandId,  
116 - shopid: o.shopId,  
117 - imgUrl: o.brandIco,  
118 - brandName: o.brandName, 115 + fav_id: o.brand_id,
  116 + shopid: o.shop_id,
  117 + imgUrl: o.brand_ico,
  118 + brandName: o.brand_name,
119 down: o.status === 0 119 down: o.status === 0
120 }); 120 });
121 } 121 }
@@ -100,35 +100,35 @@ @@ -100,35 +100,35 @@
100 page: ++this.page 100 page: ++this.page
101 } 101 }
102 }).then(data => { 102 }).then(data => {
103 - if ($.isEmptyObject(data) || data.pageTotal === 0) { 103 + if ($.isEmptyObject(data) || data.page_total === 0) {
104 this.busy = true; 104 this.busy = true;
105 } else { 105 } else {
106 - this.busy = this.page === data.pageTotal; 106 + this.busy = this.page === data.page_total;
107 107
108 - const list = data.productList || []; 108 + const list = data.product_list || [];
109 109
110 list.forEach(o => { 110 list.forEach(o => {
111 - if (!o.productSkn) { 111 + if (!o.product_skn) {
112 return; 112 return;
113 } 113 }
114 114
115 - if (!this.keys[o.productId]) {  
116 - this.keys[o.productId] = true; 115 + if (!this.keys[o.product_id]) {
  116 + this.keys[o.product_id] = true;
117 117
118 let discountPrice = false; 118 let discountPrice = false;
119 119
120 - if (Number(o.marketPrice) - Number(o.salesPrice) > 0) {  
121 - discountPrice = '¥' + Number(Math.max(o.salesPrice, 0)).toFixed(2); 120 + if (Number(o.market_price) - Number(o.sales_price) > 0) {
  121 + discountPrice = '¥' + Number(Math.max(o.sales_price, 0)).toFixed(2);
122 } 122 }
123 123
124 this.productData.push({ 124 this.productData.push({
125 - fav_id: o.productId,  
126 - goodsId: o.goodsId,  
127 - cnAlphabet: o.cnAlphabet,  
128 - productId: o.productId, 125 + fav_id: o.product_id,
  126 + goods_id: o.goodsId,
  127 + cn_alphabet: o.cnAlphabet,
  128 + product_id: o.product_id,
129 imgUrl: o.image, 129 imgUrl: o.image,
130 - title: o.productName,  
131 - price: '¥' + Number(Math.max(o.marketPrice, 0)).toFixed(2), 130 + title: o.product_name,
  131 + price: '¥' + Number(Math.max(o.market_price, 0)).toFixed(2),
132 discountPrice: discountPrice, 132 discountPrice: discountPrice,
133 sellOut: o.storage <= 0, 133 sellOut: o.storage <= 0,
134 invalidGoods: o.status === 0 134 invalidGoods: o.status === 0
@@ -19,45 +19,45 @@ @@ -19,45 +19,45 @@
19 <a class="type-item auth" href="/me/order?type=2"> 19 <a class="type-item auth" href="/me/order?type=2">
20 <span class="icon icon-wait-pay"></span> 20 <span class="icon icon-wait-pay"></span>
21 <br>待付款 21 <br>待付款
22 - <span class="num" v-if="data.waitPayNum">{{data.waitPayNum}}</span> 22 + <span class="num" v-if="data.wait_pay_num">{{data.wait_pay_num}}</span>
23 </a> 23 </a>
24 <a class="type-item auth" href='/me/order?type=3'> 24 <a class="type-item auth" href='/me/order?type=3'>
25 <span class="icon icon-wait-cargo"></span> 25 <span class="icon icon-wait-cargo"></span>
26 <br>待发货 26 <br>待发货
27 - <span class="num" v-if="data.waitCargoNum">{{data.waitCargoNum}}</span> 27 + <span class="num" v-if="data.wait_cargo_num">{{data.wait_cargo_num}}</span>
28 </a> 28 </a>
29 <a class="type-item auth" href="/me/order?type=4"> 29 <a class="type-item auth" href="/me/order?type=4">
30 <span class="icon icon-send-cargo"></span> 30 <span class="icon icon-send-cargo"></span>
31 <br>待收货 31 <br>待收货
32 - <span class="num" v-if="data.sendCargoNum">{{data.sendCargoNum}}</span> 32 + <span class="num" v-if="data.send_cargo_num">{{data.send_cargo_num}}</span>
33 </a> 33 </a>
34 <a class="type-item auth" href="/me/return"> 34 <a class="type-item auth" href="/me/return">
35 <span class="icon icon-refund-exchange"></span> 35 <span class="icon icon-refund-exchange"></span>
36 <br>退换货 36 <br>退换货
37 - <span class="num" v-if="data.refundExchangeNum">{{data.refundExchangeNum}}</span> 37 + <span class="num" v-if="data.refund_exchange_num">{{data.refund_exchange_num}}</span>
38 </a> 38 </a>
39 </div> 39 </div>
40 </div> 40 </div>
41 <div class="group-list"> 41 <div class="group-list">
42 <a class="glist-item auth" id="address"> 42 <a class="glist-item auth" id="address">
43 地址管理 43 地址管理
44 - <span class="num">{{data.addressNum}} <span class="icon icon-right"></span></span> 44 + <span class="num">{{data.address_num}} <span class="icon icon-right"></span></span>
45 </a> 45 </a>
46 </div> 46 </div>
47 <div class="group-list"> 47 <div class="group-list">
48 <a class="glist-item auth" href="/me/collection"> 48 <a class="glist-item auth" href="/me/collection">
49 收藏的商品 49 收藏的商品
50 - <span class="num">{{data.productFavoriteTotal}} <span class="icon icon-right"></span></span> 50 + <span class="num">{{data.product_favorite_total}} <span class="icon icon-right"></span></span>
51 </a> 51 </a>
52 <a class="glist-item auth" href="/me/collection?tab=brand"> 52 <a class="glist-item auth" href="/me/collection?tab=brand">
53 收藏的品牌 53 收藏的品牌
54 - <span class="num">{{data.brandFavoriteTotal}} <span class="icon icon-right"></span></span> 54 + <span class="num">{{data.brand_favorite_total}} <span class="icon icon-right"></span></span>
55 </a> 55 </a>
56 </div> 56 </div>
57 <div class="group-list"> 57 <div class="group-list">
58 <a class="glist-item auth" href="/me/mycurrency"> 58 <a class="glist-item auth" href="/me/mycurrency">
59 有货币 59 有货币
60 - <span class="num">{{data.yohoCoinNum}} <span class="icon icon-right"></span></span> 60 + <span class="num">{{data.yoho_coin_num}} <span class="icon icon-right"></span></span>
61 </a> 61 </a>
62 </div> 62 </div>
63 <div class="group-list"> 63 <div class="group-list">
1 <template> 1 <template>
2 <template v-if="show"> 2 <template v-if="show">
3 <div class="order-status"> 3 <div class="order-status">
4 - <p v-if="order.isCancel === 'Y'">交易已取消</p> 4 + <p v-if="order.is_cancel === 'Y'">交易已取消</p>
5 <p v-else>{{order.status | convertOrderState}}</p> 5 <p v-else>{{order.status | convertOrderState}}</p>
6 - <p v-if="order.isCancel !== 'Y' && order.status == 0 && order.payLefttime != 0">剩余: <span v-count-down :left-time="order.payLefttime"></span>，订单将被取消</p> 6 + <p v-if="order.is_cancel !== 'Y' && order.status == 0 && order.pay_lefttime != 0">剩余: <span v-count-down :left-time="order.pay_lefttime"></span>，订单将被取消</p>
7 </div> 7 </div>
8 <div class="order-address"> 8 <div class="order-address">
9 - <p><span>{{order.userName}}</span><span>{{order.mobile}}</span></p> 9 + <p><span>{{order.user_name}}</span><span>{{order.mobile}}</span></p>
10 <p>{{order.area}} <br>{{order.address}}</p> 10 <p>{{order.area}} <br>{{order.address}}</p>
11 </div> 11 </div>
12 <div class="order-code"> 12 <div class="order-code">
13 - <p>订单号: {{order.orderCode}}</p>  
14 - <p>下单时间: {{order.createTime | convertTime}}</p> 13 + <p>订单号: {{order.order_code}}</p>
  14 + <p>下单时间: {{order.create_time | convertTime}}</p>
15 </div> 15 </div>
16 <div class="order-goods"> 16 <div class="order-goods">
17 <ul> 17 <ul>
18 - <li class="goods-info" v-for="product in order.orderGoods"> 18 + <li class="goods-info" v-for="product in order.order_goods">
19 <a :href="product | goodsUrl 'collection'"> 19 <a :href="product | goodsUrl 'collection'">
20 <div class="img-box"> 20 <div class="img-box">
21 - <img :src="product.goodsImage | resize 49 65">  
22 - <label v-if="product.goodsType === 'gift'">赠品</label>  
23 - <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label> 21 + <img :src="product.goods_image | resize 49 65">
  22 + <label v-if="product.goods_type === 'gift'">赠品</label>
  23 + <label class="price-gift" v-if="product.goods_type === 'price_gift'">加价购</label>
24 </div> 24 </div>
25 <div class="goods-detail"> 25 <div class="goods-detail">
26 - <p class="name">{{product.productName}}</p> 26 + <p class="name">{{product.product_name}}</p>
27 <p class="size"> 27 <p class="size">
28 - <span>颜色:{{product.colorName}}</span>  
29 - <span>尺码:{{product.sizeName}}</span> 28 + <span>颜色:{{product.color_name}}</span>
  29 + <span>尺码:{{product.size_name}}</span>
30 </p> 30 </p>
31 </div> 31 </div>
32 <div class="goods-price"> 32 <div class="goods-price">
33 - <p>&yen;{{product.goodsPrice}}</p>  
34 - <p>×{{product.buyNumber}}</p>  
35 - <p v-if="product.goodsStatus"><span class="goods-status">{{product.goodsStatus}}</span></p> 33 + <p>&yen;{{product.goods_price}}</p>
  34 + <p>×{{product.buy_number}}</p>
  35 + <p v-if="product.goods_status"><span class="goods-status">{{product.goods_status}}</span></p>
36 </div> 36 </div>
37 </a> 37 </a>
38 </li> 38 </li>
@@ -40,20 +40,20 @@ @@ -40,20 +40,20 @@
40 </div> 40 </div>
41 <div class="order-amount"> 41 <div class="order-amount">
42 <ul> 42 <ul>
43 - <li v-for="promotion in order.promotionFormulas">  
44 - <label>{{promotion.promotion}}：</label><span>{{promotion.promotionAmount}}</span> 43 + <li v-for="promotion in order.promotion_formulas">
  44 + <label>{{promotion.promotion}}：</label><span>{{promotion.promotion_amount}}</span>
45 </li> 45 </li>
46 <li class="sum"><label>总计：</label><span>{{order.amount}}</span></li> 46 <li class="sum"><label>总计：</label><span>{{order.amount}}</span></li>
47 </ul> 47 </ul>
48 </div> 48 </div>
49 <div class="order-button" v-show="order.status != 1 && order.status != 2 && order.status != 3"> 49 <div class="order-button" v-show="order.status != 1 && order.status != 2 && order.status != 3">
50 - <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order.orderCode)" class="normal">删除订单</button> 50 + <button v-if="order.is_cancel === 'Y'" @click="deleteOrder(order.order_code)" class="normal">删除订单</button>
51 <template v-else> 51 <template v-else>
52 <button v-if="order.status == 0" @click="cancelOrder()">取消订单</button> 52 <button v-if="order.status == 0" @click="cancelOrder()">取消订单</button>
53 - <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span class="count-down" v-count-down :left-time="order.payLefttime" :callback="autoCancel()"></span></button>  
54 - <a v-if="order.status == 4 || order.status == 5 || order.status == 6" href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>  
55 - <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button>  
56 - <button v-if="order.isSupportRefund == 'Y' || order.isSupportExchange == 'Y'" class="normal" @click="applyRefund()">申请售后</button> 53 + <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 <span class="count-down" v-count-down :left-time="order.pay_lefttime" :callback="autoCancel()"></span></button>
  54 + <a v-if="order.status == 4 || order.status == 5 || order.status == 6" href="/me/logistic?order_code={{order.order_code}}">查看物流</a>
  55 + <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.order_code)">确认收货</button>
  56 + <button v-if="order.is_support_refund == 'Y' || order.is_support_exchange == 'Y'" class="normal" @click="applyRefund()">申请售后</button>
57 </template> 57 </template>
58 </div> 58 </div>
59 </template> 59 </template>
@@ -74,7 +74,6 @@ @@ -74,7 +74,6 @@
74 return { 74 return {
75 show: false, 75 show: false,
76 order: {}, 76 order: {},
77 - options: [],  
78 genderSel: {} 77 genderSel: {}
79 }; 78 };
80 }, 79 },
@@ -130,15 +129,15 @@ @@ -130,15 +129,15 @@
130 this.show = true; 129 this.show = true;
131 this.$set('order', result.data); 130 this.$set('order', result.data);
132 this.genderSel = genderSelect([{ 131 this.genderSel = genderSelect([{
133 - key: this.order.isSupportRefund,  
134 - val: this.order.isSupportRefund === 'Y' ? '申请退货' : '申请退货（已过期限）',  
135 - url: '/me/return/refund?orderCode=' + this.order.orderCode,  
136 - disabled: this.order.isSupportRefund !== 'Y' 132 + key: this.order.is_support_refund,
  133 + val: this.order.is_support_refund === 'Y' ? '申请退货' : '申请退货（已过期限）',
  134 + url: '/me/return/refund?orderCode=' + this.order.order_code,
  135 + disabled: this.order.is_support_refund !== 'Y'
137 }, { 136 }, {
138 - key: this.order.isSupportExchange,  
139 - val: this.order.isSupportExchange === 'Y' ? '申请换货' : '申请换货（已过期限）',  
140 - url: '/me/return/exchange?orderCode=' + this.order.orderCode,  
141 - disabled: this.order.isSupportExchange !== 'Y' 137 + key: this.order.is_support_exchange,
  138 + val: this.order.is_support_exchange === 'Y' ? '申请换货' : '申请换货（已过期限）',
  139 + url: '/me/return/exchange?orderCode=' + this.order.order_code,
  140 + disabled: this.order.is_support_exchange !== 'Y'
142 }, { 141 }, {
143 key: 'onlineService', 142 key: 'onlineService',
144 val: '在线客服', 143 val: '在线客服',
@@ -156,13 +155,13 @@ @@ -156,13 +155,13 @@
156 }, 155 },
157 reasonChange(cr) { 156 reasonChange(cr) {
158 this.orderDetail().cancel({ 157 this.orderDetail().cancel({
159 - orderCode: this.order.orderCode, 158 + orderCode: this.order.order_code,
160 reasonId: cr.id, 159 reasonId: cr.id,
161 reason: cr.reason 160 reason: cr.reason
162 }, (result) => { 161 }, (result) => {
163 if (result.code === 200) { 162 if (result.code === 200) {
164 tip('取消成功'); 163 tip('取消成功');
165 - this.order.isCancel = 'Y'; 164 + this.order.is_cancel = 'Y';
166 yoho.store.set('orderReload', true); 165 yoho.store.set('orderReload', true);
167 } else if (result.code !== 500) { 166 } else if (result.code !== 500) {
168 tip(result.message); 167 tip(result.message);
@@ -184,7 +183,7 @@ @@ -184,7 +183,7 @@
184 }, 183 },
185 autoCancel() { 184 autoCancel() {
186 return () => { 185 return () => {
187 - this.order.isCancel = 'Y'; 186 + this.order.is_cancel = 'Y';
188 yoho.store.set('orderReload', true); 187 yoho.store.set('orderReload', true);
189 }; 188 };
190 }, 189 },
@@ -241,14 +240,14 @@ @@ -241,14 +240,14 @@
241 }, 240 },
242 goBuy(order) { 241 goBuy(order) {
243 let orderDesc = []; 242 let orderDesc = [];
244 - let goods = order.orderGoods || []; 243 + let goods = order.order_goods || [];
245 244
246 goods.forEach((g) => { 245 goods.forEach((g) => {
247 - orderDesc.push(g.productName); 246 + orderDesc.push(g.product_name);
248 }); 247 });
249 248
250 yoho.goPay({ 249 yoho.goPay({
251 - orderid: order.orderCode, 250 + orderid: order.order_code,
252 amount: order.amount, 251 amount: order.amount,
253 orderDesc: orderDesc.join(','), 252 orderDesc: orderDesc.join(','),
254 type: 'orderDetail' 253 type: 'orderDetail'
@@ -4,43 +4,43 @@ @@ -4,43 +4,43 @@
4 <li class="order-item" v-for="(index, order) in orderList"> 4 <li class="order-item" v-for="(index, order) in orderList">
5 <div class="order-detail"> 5 <div class="order-detail">
6 <div class="order-code"> 6 <div class="order-code">
7 - <p>订单号:{{order.orderCode}}</p>  
8 - <p v-if="order.isCancel === 'Y'">交易已取消</p> 7 + <p>订单号:{{order.order_code}}</p>
  8 + <p v-if="order.is_cancel === 'Y'">交易已取消</p>
9 <p v-else>{{order.status | convertOrderState}}</p> 9 <p v-else>{{order.status | convertOrderState}}</p>
10 </div> 10 </div>
11 <div class="order-goods" > 11 <div class="order-goods" >
12 - <div class="goods-info" v-for="goods in order.orderGoods"> 12 + <div class="goods-info" v-for="goods in order.order_goods">
13 <div class="img-box"> 13 <div class="img-box">
14 - <img :src="goods.goodsImage | resize 49 65">  
15 - <label v-if="goods.goodsType === 'gift'">赠品</label>  
16 - <label class="price-gift" v-if="goods.goodsType === 'price_gift'">加价购</label> 14 + <img :src="goods.goods_image | resize 49 65">
  15 + <label v-if="goods.goods_type === 'gift'">赠品</label>
  16 + <label class="price-gift" v-if="goods.goods_type === 'price_gift'">加价购</label>
17 </div> 17 </div>
18 <div class="goods-detail"> 18 <div class="goods-detail">
19 - <p class="name">{{goods.productName}}</p> 19 + <p class="name">{{goods.product_name}}</p>
20 <p class="size"> 20 <p class="size">
21 - <span>颜色:{{goods.colorName}}</span>  
22 - <span>尺码:{{goods.sizeName}}</span> 21 + <span>颜色:{{goods.color_name}}</span>
  22 + <span>尺码:{{goods.size_name}}</span>
23 </p> 23 </p>
24 </div> 24 </div>
25 <div class="goods-price"> 25 <div class="goods-price">
26 - <p>&yen; {{goods.goodsPrice}}</p>  
27 - <p>×{{goods.buyNumber}}</p> 26 + <p>&yen; {{goods.goods_price}}</p>
  27 + <p>×{{goods.buy_number}}</p>
28 </div> 28 </div>
29 - <a href="/me/order/detail?orderCode={{order.orderCode}}"></a> 29 + <a href="/me/order/detail?orderCode={{order.order_code}}"></a>
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="order-option"> 32 <div class="order-option">
33 <div class="goods-total">合计 <b>&yen;{{order.amount}}</b></div> 33 <div class="goods-total">合计 <b>&yen;{{order.amount}}</b></div>
34 <div class="options"> 34 <div class="options">
35 - <button v-if="order.isCancel === 'Y'" @click="deleteOrder(order, index)" class="normal">删除订单</button> 35 + <button v-if="order.is_cancel === 'Y'" @click="deleteOrder(order, index)" class="normal">删除订单</button>
36 <template v-else> 36 <template v-else>
37 <button v-if="order.status == 0" @click="cancelOrder(order)" class="leftpad">取消订单</button> 37 <button v-if="order.status == 0" @click="cancelOrder(order)" class="leftpad">取消订单</button>
38 <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付 38 <button v-if="order.status == 0 " class="countdown" @click="goBuy(order)">去支付
39 - <span class="count-down" v-count-down :left-time="order.payLefttime" :callback="autoCancel(order)"></span> 39 + <span class="count-down" v-count-down :left-time="order.pay_lefttime" :callback="autoCancel(order)"></span>
40 </button> 40 </button>
41 <a v-if="order.status == 4 || order.status == 5 " class="leftpad" 41 <a v-if="order.status == 4 || order.status == 5 " class="leftpad"
42 - href="/me/logistic?order_code={{order.orderCode}}">查看物流</a>  
43 - <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.orderCode)">确认收货</button> 42 + href="/me/logistic?order_code={{order.order_code}}">查看物流</a>
  43 + <button v-if="order.status == 4 || order.status == 5 " class="black" @click="confirmGoods(order.order_code)">确认收货</button>
44 <button v-if="order.status == 6" @click="deleteOrder(order, index)" class="normal">删除订单</button> 44 <button v-if="order.status == 6" @click="deleteOrder(order, index)" class="normal">删除订单</button>
45 </template> 45 </template>
46 </div> 46 </div>
@@ -75,7 +75,6 @@ @@ -75,7 +75,6 @@
75 busy: false, 75 busy: false,
76 emptybox: 'hide', 76 emptybox: 'hide',
77 currentOrder: {}, 77 currentOrder: {},
78 - options: [],  
79 orderList: [] 78 orderList: []
80 }; 79 };
81 }, 80 },
@@ -121,9 +120,9 @@ @@ -121,9 +120,9 @@
121 type: this.type 120 type: this.type
122 } 121 }
123 }).then(result => { 122 }).then(result => {
124 - if (result.data && result.data.orderList.length > 0) {  
125 - this.$set('orderList', this.orderList.concat(result.data.orderList));  
126 - this.pageTotal = result.data.pageTotal; 123 + if (result.data && result.data.order_list.length > 0) {
  124 + this.$set('orderList', this.orderList.concat(result.data.order_list));
  125 + this.pageTotal = result.data.page_total;
127 this.busy = false; 126 this.busy = false;
128 } 127 }
129 128
@@ -136,12 +135,12 @@ @@ -136,12 +135,12 @@
136 }, 135 },
137 reasonChange(cr) { 136 reasonChange(cr) {
138 this.order().cancel({ 137 this.order().cancel({
139 - orderCode: this.currentOrder.orderCode, 138 + orderCode: this.currentOrder.order_code,
140 reasonId: cr.id, 139 reasonId: cr.id,
141 reason: cr.reason 140 reason: cr.reason
142 }, (result) => { 141 }, (result) => {
143 if (result.code === 200) { 142 if (result.code === 200) {
144 - this.currentOrder.isCancel = 'Y'; 143 + this.currentOrder.is_cancel = 'Y';
145 tip('取消成功'); 144 tip('取消成功');
146 } else if (result.code !== 500) { 145 } else if (result.code !== 500) {
147 tip(result.message); 146 tip(result.message);
@@ -152,7 +151,7 @@ @@ -152,7 +151,7 @@
152 }, 151 },
153 autoCancel(order) { 152 autoCancel(order) {
154 return () => { 153 return () => {
155 - order.isCancel = 'Y'; 154 + order.is_cancel = 'Y';
156 }; 155 };
157 }, 156 },
158 order() { 157 order() {
@@ -184,7 +183,7 @@ @@ -184,7 +183,7 @@
184 url: '/me/deleteOrder', 183 url: '/me/deleteOrder',
185 type: 'post', 184 type: 'post',
186 data: { 185 data: {
187 - orderCode: order.orderCode 186 + orderCode: order.order_code
188 } 187 }
189 }).then(result => { 188 }).then(result => {
190 if (result.code === 200) { 189 if (result.code === 200) {
@@ -224,14 +223,14 @@ @@ -224,14 +223,14 @@
224 }, 223 },
225 goBuy(order) { 224 goBuy(order) {
226 let orderDesc = []; 225 let orderDesc = [];
227 - let goods = order.orderGoods || []; 226 + let goods = order.order_goods || [];
228 227
229 goods.forEach((g) => { 228 goods.forEach((g) => {
230 - orderDesc.push(g.productName); 229 + orderDesc.push(g.product_name);
231 }); 230 });
232 231
233 yoho.goPay({ 232 yoho.goPay({
234 - orderid: order.orderCode, 233 + orderid: order.order_code,
235 amount: order.amount, 234 amount: order.amount,
236 orderDesc: orderDesc.join(','), 235 orderDesc: orderDesc.join(','),
237 type: 'orderList' 236 type: 'orderList'
@@ -5,37 +5,37 @@ @@ -5,37 +5,37 @@
5 <div class="order-detail"> 5 <div class="order-detail">
6 <div class="order-code"> 6 <div class="order-code">
7 <div class="code-time"> 7 <div class="code-time">
8 - <p>订单号:{{order.orderCode}}</p>  
9 - <p>申请时间：{{order.orderCreateTime}}</p> 8 + <p>订单号:{{order.order_code}}</p>
  9 + <p>申请时间：{{order.order_create_time}}</p>
10 </div> 10 </div>
11 - <p>{{order.statusName}}</p> 11 + <p>{{order.status_name}}</p>
12 </div> 12 </div>
13 <div class="order-goods"> 13 <div class="order-goods">
14 <div class="goods-info" v-for="product in order.goods"> 14 <div class="goods-info" v-for="product in order.goods">
15 <div class="img-box"> 15 <div class="img-box">
16 - <img :src="product.goodsImage | resize 49 65">  
17 - <label v-if="product.goodsType === 'gift'">赠品</label>  
18 - <label class="price-gift" v-if="product.goodsType === 'price_gift'">加价购</label> 16 + <img :src="product.goods_image | resize 49 65">
  17 + <label v-if="product.goods_type === 'gift'">赠品</label>
  18 + <label class="price-gift" v-if="product.goods_type === 'price_gift'">加价购</label>
19 </div> 19 </div>
20 <div class="goods-detail"> 20 <div class="goods-detail">
21 - <p class="name">{{product.productName}}</p> 21 + <p class="name">{{product.product_name}}</p>
22 <p class="size"> 22 <p class="size">
23 - <span>颜色: {{product.colorName}}</span>  
24 - <span>尺码: {{product.sizeName}}</span> 23 + <span>颜色: {{product.color_name}}</span>
  24 + <span>尺码: {{product.size_name}}</span>
25 </p> 25 </p>
26 </div> 26 </div>
27 <div class="goods-price"> 27 <div class="goods-price">
28 - <p>&yen;{{product.salesPrice}}</p> 28 + <p>&yen;{{product.sales_price}}</p>
29 <p>×1</p> 29 <p>×1</p>
30 </div> 30 </div>
31 - <a v-if="order.refundType === 1" href="/me/return/refund/detail/{{order.id}}"></a>  
32 - <a v-if="order.refundType === 2" href="/me/return/exchange/detail/{{order.id}}"></a> 31 + <a v-if="order.refund_type === 1" href="/me/return/refund/detail/{{order.id}}"></a>
  32 + <a v-if="order.refund_type === 2" href="/me/return/exchange/detail/{{order.id}}"></a>
33 </div> 33 </div>
34 </div> 34 </div>
35 <div class="order-option" v-show="order.canCancel == 'Y'"> 35 <div class="order-option" v-show="order.canCancel == 'Y'">
36 <div class="goods-total"></div> 36 <div class="goods-total"></div>
37 <div class="options"> 37 <div class="options">
38 - <button class="normal" @click="cancelApply(order.id, order.refundType)">取消申请</button> 38 + <button class="normal" @click="cancelApply(order.id, order.refund_type)">取消申请</button>
39 </div> 39 </div>
40 </div> 40 </div>
41 </div> 41 </div>
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 }).then(result => { 101 }).then(result => {
102 if (result.data && result.data.list.length > 0) { 102 if (result.data && result.data.list.length > 0) {
103 this.$set('orderList', this.orderList.concat(result.data.list)); 103 this.$set('orderList', this.orderList.concat(result.data.list));
104 - this.pageTotal = result.data.totalPage; 104 + this.pageTotal = result.data.total_page;
105 this.busy = false; 105 this.busy = false;
106 } 106 }
107 107
1 <template> 1 <template>
2 <template v-if="show"> 2 <template v-if="show">
3 <div class="status-desc"> 3 <div class="status-desc">
4 - <p>{{detail.statusName}}</p>  
5 - <p>申请时间: {{detail.createTime}}</p> 4 + <p>{{detail.status_name}}</p>
  5 + <p>申请时间: {{detail.create_time}}</p>
6 </div> 6 </div>
7 <div class="exchange-progress"> 7 <div class="exchange-progress">
8 <ul> 8 <ul>
@@ -13,12 +13,12 @@ @@ -13,12 +13,12 @@
13 </div> 13 </div>
14 </li> 14 </li>
15 </ul> 15 </ul>
16 - <div v-if="detail.status == 20 && detail.deliveryTpye != 20" 16 + <div v-if="detail.status == 20 && detail.delivery_tpye != 20"
17 class="logistics-detail"> 17 class="logistics-detail">
18 <template v-if="detail.notice"> 18 <template v-if="detail.notice">
19 <a href="/me/logistic?order_code={{sourceOrderCode}}&id={{applyid}}&type={{type}}"> 19 <a href="/me/logistic?order_code={{sourceOrderCode}}&id={{applyid}}&type={{type}}">
20 <h2>{{detail.notice.title}}</h2> 20 <h2>{{detail.notice.title}}</h2>
21 - <p>物流公司: {{detail.notice.expressCompany}}<br>快递单号: {{detail.notice.expressNumber}}</p> 21 + <p>物流公司: {{detail.notice.express_company}}<br>快递单号: {{detail.notice.express_number}}</p>
22 <span class="right"><span class="icon icon-right"></span></span> 22 <span class="right"><span class="icon icon-right"></span></span>
23 </a> 23 </a>
24 </template> 24 </template>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <p class="phone">{{detail.notice.remark}}</p> 29 <p class="phone">{{detail.notice.remark}}</p>
30 </template> 30 </template>
31 </div> 31 </div>
32 - <div v-if="(detail.deliveryTpye === '10' || type ==='refund') && detail.status == 10" 32 + <div v-if="(detail.delivery_tpye === '10' || type ==='refund') && detail.status == 10"
33 class="logistics"> 33 class="logistics">
34 <a href="/me/return/logistics?applyid={{applyid}}&type={{type}}">填写商品寄回的快递信息</a> 34 <a href="/me/return/logistics?applyid={{applyid}}&type={{type}}">填写商品寄回的快递信息</a>
35 </div> 35 </div>
@@ -38,29 +38,29 @@ @@ -38,29 +38,29 @@
38 <h2 v-if="type ==='refund'">退货详情 <i>RETURN DETAILS</i></h2> 38 <h2 v-if="type ==='refund'">退货详情 <i>RETURN DETAILS</i></h2>
39 <h2 v-else>换货详情 <i>EXCHANGE DETAILS</i></h2> 39 <h2 v-else>换货详情 <i>EXCHANGE DETAILS</i></h2>
40 <div class="exchange-product-wrapper"> 40 <div class="exchange-product-wrapper">
41 - <div class="exchange-product" v-for="goods in detail.goodsList"> 41 + <div class="exchange-product" v-for="goods in detail.goods_list">
42 <div class="goods-info"> 42 <div class="goods-info">
43 <div class="img-box"> 43 <div class="img-box">
44 - <img :src="goods.goodsImage | resize 49 65"> 44 + <img :src="goods.goods_image | resize 49 65">
45 </div> 45 </div>
46 <div class="goods-detail"> 46 <div class="goods-detail">
47 - <p class="name">{{goods.productName}}</p> 47 + <p class="name">{{goods.product_name}}</p>
48 <p class="size"> 48 <p class="size">
49 - <span v-if="goods.colorName">颜色: {{goods.colorName}}</span>  
50 - <span v-if="goods.sizeName">尺码: {{goods.sizeName}}</span> 49 + <span v-if="goods.color_name">颜色: {{goods.color_name}}</span>
  50 + <span v-if="goods.size_name">尺码: {{goods.size_name}}</span>
51 </p> 51 </p>
52 </div> 52 </div>
53 <div class="goods-price"> 53 <div class="goods-price">
54 - <p>&yen; {{goods.salesPrice}}</p> 54 + <p>&yen; {{goods.sales_price}}</p>
55 <p>×1</p> 55 <p>×1</p>
56 </div> 56 </div>
57 </div> 57 </div>
58 <div class="exchange-reason"> 58 <div class="exchange-reason">
59 - <p v-if="goods.newColorName || goods.newSizeName">换货颜色尺码: {{goods.newColorName}} {{goods.newSizeName}}</p>  
60 - <p v-if="goods.reasonName">原因: {{goods.reasonName}}</p> 59 + <p v-if="goods.new_color_name || goods.new_size_name">换货颜色尺码: {{goods.new_color_name}} {{goods.new_size_name}}</p>
  60 + <p v-if="goods.reason_name">原因: {{goods.reason_name}}</p>
61 <blockquote v-if="goods.remark">{{goods.remark}}</blockquote> 61 <blockquote v-if="goods.remark">{{goods.remark}}</blockquote>
62 - <ul v-if="goods.evidenceImages.length > 0" class="exchange-img">  
63 - <li v-for="image in goods.evidenceImages"> 62 + <ul v-if="goods.evidence_images.length > 0" class="exchange-img">
  63 + <li v-for="image in goods.evidence_images">
64 <img :src="image | resize 154 154"> 64 <img :src="image | resize 154 154">
65 </li> 65 </li>
66 </ul> 66 </ul>
@@ -69,32 +69,32 @@ @@ -69,32 +69,32 @@
69 </div> 69 </div>
70 </div> 70 </div>
71 <div class="exchange-express" v-if="type ==='refund'"> 71 <div class="exchange-express" v-if="type ==='refund'">
72 - <div class="exchange-address" v-if="detail.returnAmount">  
73 - <p>退款总计: &yen;{{detail.returnAmount}}</p>  
74 - <p class="info">现金: &yen;{{detail.returnAmountTotal}}</p>  
75 - <p v-if="detail.returnYohoCoin" class="info">有货币: &yen;{{detail.returnYohoCoin}}</p>  
76 - <p v-if="detail.returnCouponAmount" class="info">优惠券: &yen;{{detail.returnCouponAmount}}</p> 72 + <div class="exchange-address" v-if="detail.return_amount">
  73 + <p>退款总计: &yen;{{detail.return_amount}}</p>
  74 + <p class="info">现金: &yen;{{detail.return_amount_total}}</p>
  75 + <p v-if="detail.return_yoho_coin" class="info">有货币: &yen;{{detail.return_yoho_coin}}</p>
  76 + <p v-if="detail.return_coupon_amount" class="info">优惠券: &yen;{{detail.return_coupon_amount}}</p>
77 </div> 77 </div>
78 <div class="exchange-type"> 78 <div class="exchange-type">
79 - <span href="" class="primary">退款方式<span class="right">{{detail.returnAmountModeName}}</span> 79 + <span href="" class="primary">退款方式<span class="right">{{detail.return_amount_mode_name}}</span>
80 </span> 80 </span>
81 - <div class="amount-modeinfo" v-if="detail.returnAmountModeInfo && detail.returnAmountModeInfo.length">  
82 - <p v-if="detail.returnAmountModeInfo[0].bankName">银行 <span>{{detail.returnAmountModeInfo[0].bankName}}</span></p>  
83 - <p v-if="detail.returnAmountModeInfo[0].bankCard">卡号 <span>{{detail.returnAmountModeInfo[0].bankCard}}</span></p>  
84 - <p v-if="detail.returnAmountModeInfo[0].payeeName">姓名 <span>{{detail.returnAmountModeInfo[0].payeeName}}</span></p>  
85 - <p v-if="detail.returnAmountModeInfo[0].alipayAccount">账号 <span>{{detail.returnAmountModeInfo[0].alipayAccount}}</span></p>  
86 - <p v-if="detail.returnAmountModeInfo[0].alipayName">姓名 <span>{{detail.returnAmountModeInfo[0].alipayName}}</span></p> 81 + <div class="amount-modeinfo" v-if="detail.return_amount_mode_info && detail.return_amount_mode_info.length">
  82 + <p v-if="detail.return_amount_mode_info[0].bank_name">银行 <span>{{detail.return_amount_mode_info[0].bank_name}}</span></p>
  83 + <p v-if="detail.return_amount_mode_info[0].bank_card">卡号 <span>{{detail.return_amount_mode_info[0].bank_card}}</span></p>
  84 + <p v-if="detail.return_amount_mode_info[0].payee_name">姓名 <span>{{detail.return_amount_mode_info[0].payee_name}}</span></p>
  85 + <p v-if="detail.return_amount_mode_info[0].alipay_account">账号 <span>{{detail.return_amount_mode_info[0].alipay_account}}</span></p>
  86 + <p v-if="detail.return_amount_mode_info[0].alipay_name">姓名 <span>{{detail.return_amount_mode_info[0].alipay_name}}</span></p>
87 </div> 87 </div>
88 - <span class="amount-info" v-if="detail.returnAmountInfo">{{detail.returnAmountInfo}}</span> 88 + <span class="amount-info" v-if="detail.return_amount_info">{{detail.return_amount_info}}</span>
89 </div> 89 </div>
90 </div> 90 </div>
91 <div class="exchange-express" v-else> 91 <div class="exchange-express" v-else>
92 <div class="exchange-address"> 92 <div class="exchange-address">
93 - <p><span>{{detail.consigneeName}}</span><span>{{detail.mobile}}</span></p> 93 + <p><span>{{detail.consignee_name}}</span><span>{{detail.mobile}}</span></p>
94 <p class="info">{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p> 94 <p class="info">{{detail.province}}&nbsp;{{detail.city}}&nbsp;{{detail.county}} <br>{{detail.address}}</p>
95 </div> 95 </div>
96 <div class="exchange-type"> 96 <div class="exchange-type">
97 - <span class="primary">换货方式<span class="right">{{detail.deliveryTpyeName}}</span></span> 97 + <span class="primary">换货方式<span class="right">{{detail.delivery_tpye_name}}</span></span>
98 </div> 98 </div>
99 </div> 99 </div>
100 <div class="exchange-order"> 100 <div class="exchange-order">
@@ -152,12 +152,12 @@ @@ -152,12 +152,12 @@
152 if (res.code === 200) { 152 if (res.code === 200) {
153 this.show = true; 153 this.show = true;
154 this.detail = res.data; 154 this.detail = res.data;
155 - if (!this.detail.goodsList) { 155 + if (!this.detail.goods_list) {
156 return; 156 return;
157 } 157 }
158 158
159 this.id = this.detail.id; 159 this.id = this.detail.id;
160 - this.sourceOrderCode = this.detail.sourceOrderCode; 160 + this.sourceOrderCode = this.detail.source_order_code;
161 } else if (res.code !== 500) { 161 } else if (res.code !== 500) {
162 tip(res.message); 162 tip(res.message);
163 } else { 163 } else {
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 <span class="icon icon-right"></span> 9 <span class="icon icon-right"></span>
10 <select v-model="amount.return_amount_mode" name="amount-mode"> 10 <select v-model="amount.return_amount_mode" name="amount-mode">
11 - <option v-for="mode in refundData.returnAmountMode" :value="mode.id">{{mode.name}}</option> 11 + <option v-for="mode in refundData.return_amount_mode" :value="mode.id">{{mode.name}}</option>
12 </select> 12 </select>
13 </div> 13 </div>
14 14
@@ -42,8 +42,8 @@ @@ -42,8 +42,8 @@
42 </div> 42 </div>
43 </template> 43 </template>
44 </div> 44 </div>
45 - <div v-if="refundData.returnAmountInfo" class="return-amount-info">  
46 - {{refundData.returnAmountInfo}} 45 + <div v-if="refundData.return_amount_info" class="return-amount-info">
  46 + {{refundData.return_amount_info}}
47 </div> 47 </div>
48 </div> 48 </div>
49 </template> 49 </template>
@@ -73,14 +73,14 @@ @@ -73,14 +73,14 @@
73 this.list.forEach(product => { 73 this.list.forEach(product => {
74 if (product.checked) { 74 if (product.checked) {
75 goods.push({ 75 goods.push({
76 - last_price: product.lastPrice, 76 + last_price: product.last_price,
77 remark: product.remark || '', 77 remark: product.remark || '',
78 returned_reason: product.reason.id, 78 returned_reason: product.reason.id,
79 evidence_images: product.imageList || [], 79 evidence_images: product.imageList || [],
80 - goods_type: product.goodsTypeId + '',  
81 - product_skn: product.productSkn,  
82 - product_skc: product.productSkc,  
83 - product_sku: product.productSku 80 + goods_type: product.goods_type_id + '',
  81 + product_skn: product.product_skn,
  82 + product_skc: product.product_skc,
  83 + product_sku: product.product_sku
84 }); 84 });
85 } 85 }
86 }); 86 });
@@ -101,29 +101,29 @@ @@ -101,29 +101,29 @@
101 orderCode: qs.orderCode 101 orderCode: qs.orderCode
102 } 102 }
103 }).then(res => { 103 }).then(res => {
104 - if (res.data && res.data.goodsList) {  
105 - res.data.goodsList.forEach(product => { 104 + if (res.data && res.data.goods_list) {
  105 + res.data.goods_list.forEach(product => {
106 product.checked = false; 106 product.checked = false;
107 product.reason = { 107 product.reason = {
108 id: 0 108 id: 0
109 }; 109 };
110 product.imageList = []; 110 product.imageList = [];
111 }); 111 });
112 - res.data.returnAmountMode.forEach(mode => {  
113 - if (mode.isDefault === 'Y') { 112 + res.data.return_amount_mode.forEach(mode => {
  113 + if (mode.is_default === 'Y') {
114 this.$set('amount.return_amount_mode', mode.id); 114 this.$set('amount.return_amount_mode', mode.id);
115 } 115 }
116 }); 116 });
117 117
118 reasonConfig.specialReasons = []; 118 reasonConfig.specialReasons = [];
119 - res.data.specialReturnReason.forEach(obj => reasonConfig.specialReasons.push(obj.id)); 119 + res.data.special_return_reason.forEach(obj => reasonConfig.specialReasons.push(obj.id));
120 reasonConfig.reasons = [{ 120 reasonConfig.reasons = [{
121 id: 0, 121 id: 0,
122 name: '请选择' 122 name: '请选择'
123 - }].concat(res.data.returnReason);  
124 - reasonConfig.specialNotice = res.data.specialNotice; 123 + }].concat(res.data.return_reason);
  124 + reasonConfig.specialNotice = res.data.special_notice;
125 125
126 - this.list = res.data.goodsList; 126 + this.list = res.data.goods_list;
127 this.$set('refundData', res.data); 127 this.$set('refundData', res.data);
128 } 128 }
129 }); 129 });
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 data: this.submitData 164 data: this.submitData
165 }).then(result => { 165 }).then(result => {
166 if (result.code === 200) { 166 if (result.code === 200) {
167 - returnUtil.applySuccuss(self.page, result.data.applyId); 167 + returnUtil.applySuccuss(self.page, result.data.apply_id);
168 } else { 168 } else {
169 modal.alert(result.message); 169 modal.alert(result.message);
170 } 170 }
1 <template> 1 <template>
2 <div class="product clearfix"> 2 <div class="product clearfix">
3 <div class="checkbox"> 3 <div class="checkbox">
4 - <input type="checkbox" v-model="product.checked" id="checkbox-{{product.goodsId}}">  
5 - <label for="checkbox-{{product.goodsId}}"></label> 4 + <input type="checkbox" v-model="product.checked" id="checkbox-{{product.goods_id}}">
  5 + <label for="checkbox-{{product.goods_id}}"></label>
6 </div> 6 </div>
7 - <img class="image" :src="product.goodsImage | resize 100 130"> 7 + <img class="image" :src="product.goods_image | resize 100 130">
8 <div class="info"> 8 <div class="info">
9 <div class="p-title"> 9 <div class="p-title">
10 - {{product.productName}} 10 + {{product.product_name}}
11 </div> 11 </div>
12 <div class="meta"> 12 <div class="meta">
13 - <span class="color">颜色: {{product.colorName}}</span>  
14 - <span class="size">尺码: {{product.sizeName}}</span> 13 + <span class="color">颜色: {{product.color_name}}</span>
  14 + <span class="size">尺码: {{product.size_name}}</span>
15 </div> 15 </div>
16 </div> 16 </div>
17 <div class="price"> 17 <div class="price">
18 - &yen;{{product.lastPrice}} 18 + &yen;{{product.last_price}}
19 <p class="num"> 19 <p class="num">
20 x1 20 x1
21 </p> 21 </p>
1 <template> 1 <template>
2 <div v-if="product.checked" class="reason"> 2 <div v-if="product.checked" class="reason">
3 - <div v-if="product.isLimitSkn === 'Y'" @click="showTip" class="tip"> 3 + <div v-if="product.is_limit_skn === 'Y'" @click="showTip" class="tip">
4 <span class="icon icon-love"></span> 4 <span class="icon icon-love"></span>
5 {{specialNotice.title}} 5 {{specialNotice.title}}
6 </div> 6 </div>