调整
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
]
|
||||
},
|
||||
"condition": {
|
||||
"urlFilter": "||xc.rqlis.com:888"
|
||||
"urlFilter": "||xc.rqlis.com"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -4,7 +4,7 @@ import store from '@/store'
|
||||
|
||||
|
||||
var instance = axios.create({
|
||||
baseURL: process.env.NODE_ENV === 'production' ? 'http://124.71.2.127:10248' : 'http://124.71.2.127:10248',
|
||||
baseURL: process.env.NODE_ENV === 'production' ? 'http://temu.jjcp52.com' : 'http://124.71.2.127:10248',
|
||||
timeout: 50000,
|
||||
validateStatus: function (status) {
|
||||
return status < 500
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
"*://*.geiwohuo.com/",
|
||||
"*://*.ltwebstatic.com/",
|
||||
"*://*.goodcang.com/",
|
||||
"*://*.rqlis.com*"
|
||||
"*://*.rqlis.com/"
|
||||
],
|
||||
"permissions": [
|
||||
"cookies",
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
"*://*.shein.com/",
|
||||
"*://*.geiwohuo.com/",
|
||||
"*://*.ltwebstatic.com/",
|
||||
"*://*.rqlis.com"
|
||||
"*://*.rqlis.com/"
|
||||
],
|
||||
"permissions": [
|
||||
"cookies",
|
||||
|
||||
@@ -108,15 +108,19 @@ export function transform(leftData) {
|
||||
"valueExtendInfo": ""
|
||||
});
|
||||
rightSkuItem.productSkuId = 0;
|
||||
if (!leftSkuItem.productSkuWhExtAttr) {
|
||||
rightSkuItem.productSkuWhExtAttrReq = null
|
||||
} else {
|
||||
rightSkuItem.productSkuWhExtAttrReq = {
|
||||
"productSkuVolumeReq": leftSkuItem.productSkuWhExtAttr.productSkuVolume,
|
||||
"productSkuWeightReq": leftSkuItem.productSkuWhExtAttr.productSkuWeight,
|
||||
"productSkuBarCodeReqs": leftSkuItem.productSkuWhExtAttr.productSkuBarCodes,
|
||||
"productSkuVolumeReq": leftSkuItem.productSkuWhExtAttr?.productSkuVolume,
|
||||
"productSkuWeightReq": leftSkuItem.productSkuWhExtAttr?.productSkuWeight,
|
||||
"productSkuBarCodeReqs": leftSkuItem.productSkuWhExtAttr?.productSkuBarCodes,
|
||||
"productSkuSensitiveAttrReq": {
|
||||
"isSensitive": leftSkuItem.productSkuWhExtAttr.productSkuSensitiveAttr.isSensitive,
|
||||
"sensitiveList": leftSkuItem.productSkuWhExtAttr.productSkuSensitiveAttr.sensitiveList},
|
||||
"productSkuSensitiveLimitReq": leftSkuItem.productSkuWhExtAttr.productSkuSensitiveLimit,
|
||||
"isSensitive": leftSkuItem.productSkuWhExtAttr?.productSkuSensitiveAttr.isSensitive,
|
||||
"sensitiveList": leftSkuItem.productSkuWhExtAttr?.productSkuSensitiveAttr.sensitiveList},
|
||||
"productSkuSensitiveLimitReq": leftSkuItem.productSkuWhExtAttr?.productSkuSensitiveLimit,
|
||||
};
|
||||
}
|
||||
rightSkuItem.currencyType = leftSkuItem.currencyType;
|
||||
|
||||
rightSkcItem.productSkuReqs.push(rightSkuItem);
|
||||
|
||||
@@ -107,8 +107,19 @@
|
||||
:tableData="orderDataList"
|
||||
:col-configs="orderColConfig"
|
||||
height="700"
|
||||
:isShowPagination="false"
|
||||
:size="100"
|
||||
:current.sync="form.current"
|
||||
:size.sync="form.size"
|
||||
:total="orderTotal"
|
||||
@getList="getOrderList"
|
||||
style="margin-top: 8px;">
|
||||
<el-table-column slot="options" label="操作" align="center" fixed="right" width="140px">
|
||||
<template v-slot="{ row }">
|
||||
<div class="table-options">
|
||||
<el-button type="text" v-if="form.status == '1'" @click="toSend(row)">重新发货</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</ai-table>
|
||||
</ai-card>
|
||||
<AiDialog
|
||||
@@ -197,6 +208,7 @@
|
||||
return {
|
||||
isShow: false,
|
||||
orderDataList: [],
|
||||
orderTotal: 0,
|
||||
colConfigs: [
|
||||
{ type: "selection", width: '70px', align: 'left' },
|
||||
{ slot: 'productName' },
|
||||
@@ -225,7 +237,9 @@
|
||||
],
|
||||
form: {
|
||||
warehouseId: 'XinCang',
|
||||
status: ''
|
||||
status: '',
|
||||
current: 1,
|
||||
size: 100
|
||||
},
|
||||
mallId: '',
|
||||
mallName: '',
|
||||
@@ -319,6 +333,7 @@
|
||||
}
|
||||
}).then(res => {
|
||||
this.orderDataList = res.data.records
|
||||
this.orderTotal = res.data.total
|
||||
})
|
||||
},
|
||||
handleClick (e) {
|
||||
@@ -516,6 +531,10 @@
|
||||
params['invoice[product_declared_value][]'] = ''
|
||||
params['invoice[product_weight][]'] = ''
|
||||
|
||||
if (obj.details[0].warehouseCode == 'UAXC002') {
|
||||
params.courier = 'USPS'
|
||||
}
|
||||
|
||||
for (let i = 0; i < obj.details.length; i++) {
|
||||
params[`platform_barcode[${obj.details[i].productId}]`] = ''
|
||||
params[`product_title_en[${obj.details[i].productId}]`] = obj.details[i].productTitleEn
|
||||
|
||||
Reference in New Issue
Block a user