fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by lea guo
Commit 0123f7534b8ebc54a45f4ca7ecf93d5c8aa6a94a 2 parents b260913f 689e1e4f

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

Inline Side-by-side
Showing 2 changed files with 97 additions and 64 deletions
... ... @@ -260,10 +260,11 @@ export default {
price: price,
desc: '保证金',
onCloseAction() {
that.clearData();
that.$router.replace({
name: 'PriceChangeEntry',
name: 'InSaleOrderList',
params: {
orderId: result.data.productId
code: result.data.orderCode
}
});
}
... ... @@ -276,6 +277,24 @@ export default {
}
// console.log(result);
},
clearData() { // 清空数据状态
this.platformFeeModalVisible = false;
this.platformFee = {
amount: '-¥0',
appraiseFee: '¥0.00',
packageFee: '¥0.00',
serviceFee: '¥0.00',
goodsPaymentRatePercent: '0.00%',
payChannelPercentage: '0.00%'
};
this.bankTransferFee = '-¥0';
this.income = '¥0';
this.errorTip = '';
this.chgPrice = '';
this.calced = false;
this.earnestMoney = '¥0';
this.isAgree = false;
}
}
};
... ... @@ -528,7 +547,6 @@ export default {
width: 100%;
border-top: 1px solid #f0f0f0;
background-color: #fff;
padding: 20px 48px;
a {
display: inline-block;
... ...
... ... @@ -71,67 +71,82 @@ export default {
order: result
});
} else {
result = { alg: 'SALT_MD5',
code: 200,
data:
{ attributes: 1,
bankTransferFee: '-￥0.29',
bidType: 0,
buttons: [ [Object], [Object] ],
createTime: '2019-10-08 16:57:48',
earnestMoney: 1.16,
earnestMoneyStr: '￥1.16',
goodsInfo:
{ batchNo: 1232760577857,
bidType: 0,
colorName: '黑色',
entryFlag: false,
goodImg:
'http://img11.static.yhbimg.com/goodsimg/2019/02/25/10/018b0d26a7e4bc0b39a93c329dd8c13d8e.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',
goodPrice: '29.00',
leastPrice: 29,
leastPriceOfSkuTips: '最低现货价￥29',
price: 29,
productId: 10001266,
productName: 'Air Jordan 1 复刻黑绿脚趾 范闲',
sizeName: '37',
skup: 19356,
storageId: 10090816 },
income: '￥28.69',
isAdvance: 'N',
isPaid: 1,
orderCode: 1232760577857,
payStartTime: 1570525068,
payment: 2,
paymentStr: '支付宝',
platformFee:
{ amount: '-￥0.02',
appraiseFee: '￥0.01',
goodsPaymentRatePercent: '0.00%',
packageFee: '￥0.01',
payChannelPercentage: '1.00%',
serviceFee: '￥0.00' },
secendLevelCreateTime: 1570525068,
statusDetail:
{ detailDesc: '商品出售中，待买家购买',
expressShow: false,
paymentTips: '交易成功后自动退还',
statuStr: '出售中',
status: 1 },
submitOrderTimeStr: '2019-10-08 16:57:48',
uid: 349709,
userAddress:
{ address: '嘉陵江东街18号南京国家广告产****17楼',
address_id: 2396242,
area: '江苏省 南京市 建邺区 建邺区新城科技园',
areaCode: '320105400',
consignee: '*骏',
isUpdate: 'N',
mobile: '138****0257',
phone: '',
zipCode: '' } },
md5: '6ae15b6dee1a7ac6ba39244894671ad5',
message: '订单详情' };
result = {
"alg": "SALT_MD5",
"code": 200,
"data": {
"attributes": 1,
"bankTransferFee": "-￥0.19",
"bidType": 0,
"buttons": [{
"code": "not_sold",
"confirmTips": "您确定不卖此商品么？取消后保证金将原路退还至您的账户",
"name": "NOT_SOLD",
"text": "不卖了"
}, {
"code": "not_entry_change_price",
"name": "NOT_ENTRY_CHANGE_PRICE",
"text": "调价"
}],
"createTime": "2019-10-09 18:01:23",
"earnestMoney": 0.76,
"earnestMoneyStr": "￥0.76",
"goodsInfo": {
"batchNo": 1233499619151,
"bidType": 0,
"colorName": "黑色",
"entryFlag": false,
"goodImg": "http://img11.static.yhbimg.com/goodsimg/2019/02/25/10/018b0d26a7e4bc0b39a93c329dd8c13d8e.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80",
"goodPrice": "19.00",
"leastPrice": 19.00,
"leastPriceOfSkuTips": "最低现货价￥19",
"price": 19.00,
"productId": 10001266,
"productName": "Air Jordan 1 复刻黑绿脚趾 范闲",
"sizeName": "37",
"skup": 19466,
"storageId": 10090816
},
"income": "￥18.79",
"isAdvance": "N",
"isPaid": 1,
"orderCode": 1233499619151,
"payStartTime": 1570615283,
"payment": 9,
"paymentStr": "手机网站支付宝",
"platformFee": {
"amount": "-￥0.02",
"appraiseFee": "￥0.01",
"goodsPaymentRatePercent": "0.00%",
"packageFee": "￥0.01",
"payChannelPercentage": "1.00%",
"serviceFee": "￥0.00"
},
"secendLevelCreateTime": 1570615283,
"statusDetail": {
"detailDesc": "商品出售中，待买家购买",
"expressShow": false,
"paymentTips": "交易成功后自动退还",
"statuStr": "出售中",
"status": 1
},
"submitOrderTimeStr": "2019-10-09 18:01:23",
"uid": 349709,
"userAddress": {
"address": "嘉陵江东街18号南京国家广告产****17楼",
"address_id": 2396242,
"area": "江苏省 南京市 建邺区 建邺区新城科技园",
"areaCode": "320105400",
"consignee": "*骏",
"isUpdate": "N",
"mobile": "138****0257",
"phone": "",
"zipCode": ""
}
},
"md5": "ab14db14196b6213d05d288179ecf9e2",
"message": "订单详情"
};
commit(Types.FETCH_NOENTRY_ORDER_PRODUCT_SUCCESS, {
order: result
... ...