From 74043c55aec5fe5c5353122cdad1a68ac3e0142c Mon Sep 17 00:00:00 2001 From: liushiwei <499672082@qq.com> Date: Tue, 5 Nov 2024 21:20:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/rules_12.json | 2 +- src/api/index.js | 2 +- src/manifest.development.json | 2 +- src/manifest.production.json | 2 +- src/utils/product.js | 22 +++++++++++++--------- src/view/semi/SemiSendGoods_XC.vue | 23 +++++++++++++++++++++-- 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/public/rules_12.json b/public/rules_12.json index 05d05b4..1b391fa 100644 --- a/public/rules_12.json +++ b/public/rules_12.json @@ -18,7 +18,7 @@ ] }, "condition": { - "urlFilter": "||xc.rqlis.com:888" + "urlFilter": "||xc.rqlis.com" } } ] \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 2c87fbb..df645c0 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -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 diff --git a/src/manifest.development.json b/src/manifest.development.json index 06001b6..ce8644f 100644 --- a/src/manifest.development.json +++ b/src/manifest.development.json @@ -23,7 +23,7 @@ "*://*.geiwohuo.com/", "*://*.ltwebstatic.com/", "*://*.goodcang.com/", - "*://*.rqlis.com*" + "*://*.rqlis.com/" ], "permissions": [ "cookies", diff --git a/src/manifest.production.json b/src/manifest.production.json index 2083464..46b960f 100644 --- a/src/manifest.production.json +++ b/src/manifest.production.json @@ -22,7 +22,7 @@ "*://*.shein.com/", "*://*.geiwohuo.com/", "*://*.ltwebstatic.com/", - "*://*.rqlis.com" + "*://*.rqlis.com/" ], "permissions": [ "cookies", diff --git a/src/utils/product.js b/src/utils/product.js index 99a5bc9..9154766 100644 --- a/src/utils/product.js +++ b/src/utils/product.js @@ -108,15 +108,19 @@ export function transform(leftData) { "valueExtendInfo": "" }); rightSkuItem.productSkuId = 0; - rightSkuItem.productSkuWhExtAttrReq = { - "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, - }; + if (!leftSkuItem.productSkuWhExtAttr) { + rightSkuItem.productSkuWhExtAttrReq = null + } else { + rightSkuItem.productSkuWhExtAttrReq = { + "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, + }; + } rightSkuItem.currencyType = leftSkuItem.currencyType; rightSkcItem.productSkuReqs.push(rightSkuItem); diff --git a/src/view/semi/SemiSendGoods_XC.vue b/src/view/semi/SemiSendGoods_XC.vue index 87b3eec..68a9e6a 100644 --- a/src/view/semi/SemiSendGoods_XC.vue +++ b/src/view/semi/SemiSendGoods_XC.vue @@ -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;"> + + + { 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 From 5ece8b562f413932fca0878c5b425636a2261312 Mon Sep 17 00:00:00 2001 From: liushiwei <499672082@qq.com> Date: Tue, 5 Nov 2024 21:27:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 2 +- src/view/login/Forget.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index df645c0..030265f 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -4,7 +4,7 @@ import store from '@/store' var instance = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? 'http://temu.jjcp52.com' : 'http://124.71.2.127:10248', + baseURL: process.env.NODE_ENV === 'production' ? 'http://124.71.2.127:8888' : 'http://124.71.2.127:10248', timeout: 50000, validateStatus: function (status) { return status < 500 diff --git a/src/view/login/Forget.vue b/src/view/login/Forget.vue index b1ed9e1..ecb31c9 100644 --- a/src/view/login/Forget.vue +++ b/src/view/login/Forget.vue @@ -78,7 +78,7 @@ import CryptoJS from 'crypto-js' this.$refs.form.validate((valid) => { if (valid) { if (this.form.password != this.form.repassword) { - this.$message.success('两次密码输入不一致'); + this.$message.error('两次密码输入不一致'); return; } this.btnLoading = true