Authored by lea guo

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -260,10 +260,11 @@ export default { @@ -260,10 +260,11 @@ export default {
260 price: price, 260 price: price,
261 desc: '保证金', 261 desc: '保证金',
262 onCloseAction() { 262 onCloseAction() {
  263 + that.clearData();
263 that.$router.replace({ 264 that.$router.replace({
264 - name: 'PriceChangeEntry', 265 + name: 'InSaleOrderList',
265 params: { 266 params: {
266 - orderId: result.data.productId 267 + code: result.data.orderCode
267 } 268 }
268 }); 269 });
269 } 270 }
@@ -276,6 +277,24 @@ export default { @@ -276,6 +277,24 @@ export default {
276 } 277 }
277 278
278 // console.log(result); 279 // console.log(result);
  280 + },
  281 + clearData() { // 清空数据状态
  282 + this.platformFeeModalVisible = false;
  283 + this.platformFee = {
  284 + amount: '-¥0',
  285 + appraiseFee: '¥0.00',
  286 + packageFee: '¥0.00',
  287 + serviceFee: '¥0.00',
  288 + goodsPaymentRatePercent: '0.00%',
  289 + payChannelPercentage: '0.00%'
  290 + };
  291 + this.bankTransferFee = '-¥0';
  292 + this.income = '¥0';
  293 + this.errorTip = '';
  294 + this.chgPrice = '';
  295 + this.calced = false;
  296 + this.earnestMoney = '¥0';
  297 + this.isAgree = false;
279 } 298 }
280 } 299 }
281 }; 300 };
@@ -528,7 +547,6 @@ export default { @@ -528,7 +547,6 @@ export default {
528 width: 100%; 547 width: 100%;
529 border-top: 1px solid #f0f0f0; 548 border-top: 1px solid #f0f0f0;
530 background-color: #fff; 549 background-color: #fff;
531 - padding: 20px 48px;  
532 550
533 a { 551 a {
534 display: inline-block; 552 display: inline-block;
@@ -71,67 +71,82 @@ export default { @@ -71,67 +71,82 @@ export default {
71 order: result 71 order: result
72 }); 72 });
73 } else { 73 } else {
74 - result = { alg: 'SALT_MD5',  
75 - code: 200,  
76 - data:  
77 - { attributes: 1,  
78 - bankTransferFee: '-¥0.29',  
79 - bidType: 0,  
80 - buttons: [ [Object], [Object] ],  
81 - createTime: '2019-10-08 16:57:48',  
82 - earnestMoney: 1.16,  
83 - earnestMoneyStr: '¥1.16',  
84 - goodsInfo:  
85 - { batchNo: 1232760577857,  
86 - bidType: 0,  
87 - colorName: '黑色',  
88 - entryFlag: false,  
89 - goodImg:  
90 - 'http://img11.static.yhbimg.com/goodsimg/2019/02/25/10/018b0d26a7e4bc0b39a93c329dd8c13d8e.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',  
91 - goodPrice: '29.00',  
92 - leastPrice: 29,  
93 - leastPriceOfSkuTips: '最低现货价¥29',  
94 - price: 29,  
95 - productId: 10001266,  
96 - productName: 'Air Jordan 1 复刻黑绿脚趾 范闲',  
97 - sizeName: '37',  
98 - skup: 19356,  
99 - storageId: 10090816 },  
100 - income: '¥28.69',  
101 - isAdvance: 'N',  
102 - isPaid: 1,  
103 - orderCode: 1232760577857,  
104 - payStartTime: 1570525068,  
105 - payment: 2,  
106 - paymentStr: '支付宝',  
107 - platformFee:  
108 - { amount: '-¥0.02',  
109 - appraiseFee: '¥0.01',  
110 - goodsPaymentRatePercent: '0.00%',  
111 - packageFee: '¥0.01',  
112 - payChannelPercentage: '1.00%',  
113 - serviceFee: '¥0.00' },  
114 - secendLevelCreateTime: 1570525068,  
115 - statusDetail:  
116 - { detailDesc: '商品出售中,待买家购买',  
117 - expressShow: false,  
118 - paymentTips: '交易成功后自动退还',  
119 - statuStr: '出售中',  
120 - status: 1 },  
121 - submitOrderTimeStr: '2019-10-08 16:57:48',  
122 - uid: 349709,  
123 - userAddress:  
124 - { address: '嘉陵江东街18号南京国家广告产****17楼',  
125 - address_id: 2396242,  
126 - area: '江苏省 南京市 建邺区 建邺区新城科技园',  
127 - areaCode: '320105400',  
128 - consignee: '*骏',  
129 - isUpdate: 'N',  
130 - mobile: '138****0257',  
131 - phone: '',  
132 - zipCode: '' } },  
133 - md5: '6ae15b6dee1a7ac6ba39244894671ad5',  
134 - message: '订单详情' }; 74 + result = {
  75 + "alg": "SALT_MD5",
  76 + "code": 200,
  77 + "data": {
  78 + "attributes": 1,
  79 + "bankTransferFee": "-¥0.19",
  80 + "bidType": 0,
  81 + "buttons": [{
  82 + "code": "not_sold",
  83 + "confirmTips": "您确定不卖此商品么?取消后保证金将原路退还至您的账户",
  84 + "name": "NOT_SOLD",
  85 + "text": "不卖了"
  86 + }, {
  87 + "code": "not_entry_change_price",
  88 + "name": "NOT_ENTRY_CHANGE_PRICE",
  89 + "text": "调价"
  90 + }],
  91 + "createTime": "2019-10-09 18:01:23",
  92 + "earnestMoney": 0.76,
  93 + "earnestMoneyStr": "¥0.76",
  94 + "goodsInfo": {
  95 + "batchNo": 1233499619151,
  96 + "bidType": 0,
  97 + "colorName": "黑色",
  98 + "entryFlag": false,
  99 + "goodImg": "http://img11.static.yhbimg.com/goodsimg/2019/02/25/10/018b0d26a7e4bc0b39a93c329dd8c13d8e.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80",
  100 + "goodPrice": "19.00",
  101 + "leastPrice": 19.00,
  102 + "leastPriceOfSkuTips": "最低现货价¥19",
  103 + "price": 19.00,
  104 + "productId": 10001266,
  105 + "productName": "Air Jordan 1 复刻黑绿脚趾 范闲",
  106 + "sizeName": "37",
  107 + "skup": 19466,
  108 + "storageId": 10090816
  109 + },
  110 + "income": "¥18.79",
  111 + "isAdvance": "N",
  112 + "isPaid": 1,
  113 + "orderCode": 1233499619151,
  114 + "payStartTime": 1570615283,
  115 + "payment": 9,
  116 + "paymentStr": "手机网站支付宝",
  117 + "platformFee": {
  118 + "amount": "-¥0.02",
  119 + "appraiseFee": "¥0.01",
  120 + "goodsPaymentRatePercent": "0.00%",
  121 + "packageFee": "¥0.01",
  122 + "payChannelPercentage": "1.00%",
  123 + "serviceFee": "¥0.00"
  124 + },
  125 + "secendLevelCreateTime": 1570615283,
  126 + "statusDetail": {
  127 + "detailDesc": "商品出售中,待买家购买",
  128 + "expressShow": false,
  129 + "paymentTips": "交易成功后自动退还",
  130 + "statuStr": "出售中",
  131 + "status": 1
  132 + },
  133 + "submitOrderTimeStr": "2019-10-09 18:01:23",
  134 + "uid": 349709,
  135 + "userAddress": {
  136 + "address": "嘉陵江东街18号南京国家广告产****17楼",
  137 + "address_id": 2396242,
  138 + "area": "江苏省 南京市 建邺区 建邺区新城科技园",
  139 + "areaCode": "320105400",
  140 + "consignee": "*骏",
  141 + "isUpdate": "N",
  142 + "mobile": "138****0257",
  143 + "phone": "",
  144 + "zipCode": ""
  145 + }
  146 + },
  147 + "md5": "ab14db14196b6213d05d288179ecf9e2",
  148 + "message": "订单详情"
  149 + };
135 150
136 commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_SUCCESS, { 151 commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_SUCCESS, {
137 order: result 152 order: result