Authored by 石坚

camel个人中心

@@ -91,7 +91,7 @@ const getUserReturn = (uid, page) => { @@ -91,7 +91,7 @@ const getUserReturn = (uid, page) => {
91 } : false; 91 } : false;
92 92
93 data.list.forEach(item => { 93 data.list.forEach(item => {
94 - item.orderGoods = item.goods; 94 + item.order_goods = item.goods;
95 item.createTime = item.order_create_time; 95 item.createTime = item.order_create_time;
96 item.hidePrice = true; 96 item.hidePrice = true;
97 item.showStatus = true; 97 item.showStatus = true;
@@ -101,9 +101,9 @@ const getUserReturn = (uid, page) => { @@ -101,9 +101,9 @@ const getUserReturn = (uid, page) => {
101 }); 101 });
102 item.type = typeIndex[item.refund_type]; 102 item.type = typeIndex[item.refund_type];
103 103
104 - item.orderGoods.forEach(good => { 104 + item.order_goods.forEach(good => {
105 let cnAlphabet = good.cn_alphabet ? good.cn_alphabet : ''; 105 let cnAlphabet = good.cn_alphabet ? good.cn_alphabet : '';
106 - 106 +
107 good.hidePrice = true; 107 good.hidePrice = true;
108 good.goodUrl = helpers.urlFormat(`/product/pro_${good.product_id}_${good.goods_id}/${cnAlphabet}.html`); // eslint-disable-line 108 good.goodUrl = helpers.urlFormat(`/product/pro_${good.product_id}_${good.goods_id}/${cnAlphabet}.html`); // eslint-disable-line
109 }); 109 });
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 {{/ promotion_formulas }} 44 {{/ promotion_formulas }}
45 <p class="payment-amount"> 45 <p class="payment-amount">
46 <span class="tip">实付金额:</span> 46 <span class="tip">实付金额:</span>
47 - <span class="amount">¥{{promotion_amount}}</span> 47 + <span class="amount">¥{{payment_amount}}</span>
48 </p> 48 </p>
49 {{#if showPaid}} 49 {{#if showPaid}}
50 <p class="paid"> 50 <p class="paid">