diff --git a/src/apis/APIsync.js b/src/apis/APIsync.js index b0f210a..d8ca4d6 100644 --- a/src/apis/APIsync.js +++ b/src/apis/APIsync.js @@ -73,17 +73,17 @@ export const APISyncStores = async (json, noLoading = true) => { } } -// 同步京狗商品库存 -export const APISyncJGStoresSkus = async (json, noLoading = true) => { - try { - let res = await api('v2/sync/SyncJdsStoresSkus', { - method: 'PUT', - data: json2query(json), - noLoading - }) - return res - } catch (e) { - console.error('SyncStores', e) - throw e - } -} +// // 同步京狗商品库存 +// export const APISyncJGStoresSkus = async (json, noLoading = true) => { +// try { +// let res = await api('v2/sync/SyncJdsStoresSkus', { +// method: 'PUT', +// data: json2query(json), +// noLoading +// }) +// return res +// } catch (e) { +// console.error('SyncStores', e) +// throw e +// } +// } diff --git a/src/components/cmp/storePick/index.vue b/src/components/cmp/storePick/index.vue index 1814105..121f62c 100644 --- a/src/components/cmp/storePick/index.vue +++ b/src/components/cmp/storePick/index.vue @@ -55,7 +55,7 @@ {{ data.id }} 京 - 狗 + 美 饿 西 diff --git a/src/components/cmp/storePickNew/storePickContent.vue b/src/components/cmp/storePickNew/storePickContent.vue index d1a0c5d..25da9b5 100644 --- a/src/components/cmp/storePickNew/storePickContent.vue +++ b/src/components/cmp/storePickNew/storePickContent.vue @@ -55,7 +55,7 @@ {{ data.id }} 京 - 狗 + 美 饿 西 diff --git a/src/components/goodmanager/goodAndCatManager/cmp-cat-manager.vue b/src/components/goodmanager/goodAndCatManager/cmp-cat-manager.vue index e58dd6d..089c1ab 100644 --- a/src/components/goodmanager/goodAndCatManager/cmp-cat-manager.vue +++ b/src/components/goodmanager/goodAndCatManager/cmp-cat-manager.vue @@ -254,14 +254,14 @@
- +
- -
+
--> 0) return await store.dispatch('getCate',{vendorID:0,parentID:-1}) break - case 'JG': - // 京狗 - if(this.jGCategoryData && this.jGCategoryData.length>0) return - await store.dispatch('getCate',{vendorID:5,parentID:-1}) - break + // case 'JG': + // // 京狗 + // if(this.jGCategoryData && this.jGCategoryData.length>0) return + // await store.dispatch('getCate',{vendorID:5,parentID:-1}) + // break case 'MT': // 美团 if(this.mTCategoryData && this.mTCategoryData.length>0) return @@ -1049,12 +1049,12 @@ this.showjdCatError = false; } } else if (ref === "editorjgCategoryID") { - // 京狗 - if (this.$refs[ref].currentValue.length === 0) { - this.showjgCatError = true; - } else { - this.showjgCatError = false; - } + // // 京狗 + // if (this.$refs[ref].currentValue.length === 0) { + // this.showjgCatError = true; + // } else { + // this.showjgCatError = false; + // } } else if (ref === "editoreBaiCategoryID") { // 饿百 if (this.$refs[ref].currentValue.length === 0) { diff --git a/src/components/goodmanager/jdCatManager/jd-cat-manager.vue b/src/components/goodmanager/jdCatManager/jd-cat-manager.vue index e7a7b53..cdb8969 100644 --- a/src/components/goodmanager/jdCatManager/jd-cat-manager.vue +++ b/src/components/goodmanager/jdCatManager/jd-cat-manager.vue @@ -689,17 +689,17 @@ export default { this.jdCatLevel2 = jDcat.filter((item) => item.level === 2); this.jdCatLevel3 = jDcat.filter((item) => item.level === 3); } - if (!jGcat) { - this.$message({ - message: "[获取京狗分类列表失败] " + jGcat.desc, - type: "warning", - center: true, - }); - } else { - this.jgCatLevel1 = jGcat.filter((item) => item.level === 1); - this.jgCatLevel2 = jGcat.filter((item) => item.level === 2); - this.jgCatLevel3 = jGcat.filter((item) => item.level === 3); - } + // if (!jGcat) { + // this.$message({ + // message: "[获取京狗分类列表失败] " + jGcat.desc, + // type: "warning", + // center: true, + // }); + // } else { + // this.jgCatLevel1 = jGcat.filter((item) => item.level === 1); + // this.jgCatLevel2 = jGcat.filter((item) => item.level === 2); + // this.jgCatLevel3 = jGcat.filter((item) => item.level === 3); + // } // 判断饿分类是否获取成功 if (!eBaicat) { this.$message({ @@ -752,23 +752,23 @@ export default { }); this.jdCatData = jdCatData; // 组合京狗分类 - // 把三级挂载到二级上 - let jgCatData = this.jgCatLevel1; - let temjgCat = this.jgCatLevel2; - temjgCat.forEach((le2) => { - let level3 = this.jgCatLevel3.filter( - (le3) => Number(le3.parentID) === Number(le2.vendorCategoryID) - ); - le2.children = level3; - }); - // 把二级挂载到一级上 - jgCatData.forEach((le1) => { - let level2 = temjgCat.filter( - (le2) => Number(le2.parentID) === Number(le1.vendorCategoryID) - ); - le1.children = level2; - }); - this.jgCatData = jgCatData; + // // 把三级挂载到二级上 + // let jgCatData = this.jgCatLevel1; + // let temjgCat = this.jgCatLevel2; + // temjgCat.forEach((le2) => { + // let level3 = this.jgCatLevel3.filter( + // (le3) => Number(le3.parentID) === Number(le2.vendorCategoryID) + // ); + // le2.children = level3; + // }); + // // 把二级挂载到一级上 + // jgCatData.forEach((le1) => { + // let level2 = temjgCat.filter( + // (le2) => Number(le2.parentID) === Number(le1.vendorCategoryID) + // ); + // le1.children = level2; + // }); + // this.jgCatData = jgCatData; // 组合饿百分类 // 把三级挂载到二级上 let eBaiCatData = this.eBaiCatLevel1; @@ -880,28 +880,28 @@ export default { } }, // 京狗分类转换 - switchJgCat() { - if (this.currentPick.jdsCategoryID) { - let leaf = this.currentPick.jdsCategoryID + ""; - let parent = this.jgCatLevel3.filter( - (item) => Number(item.vendorCategoryID) === Number(leaf) - )[0] - ? this.jgCatLevel3.filter( - (item) => Number(item.vendorCategoryID) === Number(leaf) - )[0].parentID - : ""; - let parentparent = this.jgCatLevel2.filter( - (item) => Number(item.vendorCategoryID) === Number(parent) - )[0] - ? this.jgCatLevel2.filter( - (item) => Number(item.vendorCategoryID) === Number(parent) - )[0].parentID - : ""; - return [parentparent, parent, leaf]; - } else { - return []; - } - }, + // switchJgCat() { + // if (this.currentPick.jdsCategoryID) { + // let leaf = this.currentPick.jdsCategoryID + ""; + // let parent = this.jgCatLevel3.filter( + // (item) => Number(item.vendorCategoryID) === Number(leaf) + // )[0] + // ? this.jgCatLevel3.filter( + // (item) => Number(item.vendorCategoryID) === Number(leaf) + // )[0].parentID + // : ""; + // let parentparent = this.jgCatLevel2.filter( + // (item) => Number(item.vendorCategoryID) === Number(parent) + // )[0] + // ? this.jgCatLevel2.filter( + // (item) => Number(item.vendorCategoryID) === Number(parent) + // )[0].parentID + // : ""; + // return [parentparent, parent, leaf]; + // } else { + // return []; + // } + // }, // eBai分类转换 switcheBaiCat() { if (this.currentPick.ebaiCategoryID) { @@ -1472,11 +1472,11 @@ export default { } } else if (ref === "editorjgCategoryID") { // 京狗 - if (this.$refs[ref].currentValue.length === 0) { - this.showjgCatError = true; - } else { - this.showjgCatError = false; - } + // if (this.$refs[ref].currentValue.length === 0) { + // this.showjgCatError = true; + // } else { + // this.showjgCatError = false; + // } } else if (ref === "editoreBaiCategoryID") { // 饿百 if (this.$refs[ref].currentValue.length === 0) { @@ -1539,14 +1539,14 @@ export default { jdCatID = jdCatID[jdCatID.length - 1]; } // 保存京狗分类数组 - let jgCatID = ""; - if ( - this.$refs.editorjgCategoryID && - this.$refs.editorjgCategoryID.currentValue.length - ) { - jgCatID = this.$refs.editorjgCategoryID.currentValue; - jgCatID = jgCatID[jgCatID.length - 1]; - } + // let jgCatID = ""; + // if ( + // this.$refs.editorjgCategoryID && + // this.$refs.editorjgCategoryID.currentValue.length + // ) { + // jgCatID = this.$refs.editorjgCategoryID.currentValue; + // jgCatID = jgCatID[jgCatID.length - 1]; + // } // 保存饿百分类数组 let eBaiCatID = ""; if ( diff --git a/src/components/goodmanager/jxGoodManager/goodSet/goodSet.vue b/src/components/goodmanager/jxGoodManager/goodSet/goodSet.vue index aa47839..6570cc6 100644 --- a/src/components/goodmanager/jxGoodManager/goodSet/goodSet.vue +++ b/src/components/goodmanager/jxGoodManager/goodSet/goodSet.vue @@ -239,7 +239,7 @@ - + - + @@ -690,13 +690,13 @@ export default { price:0, // 商品价格 sellPoint:"", // 商品卖点 preparationTime:0, // 饿百准备时长 - jdsStockSwitch:1, // 京狗库存开关 + // jdsStockSwitch:1, // 京狗库存开关 places:[], // 城市 isGlobal: 0, // 是否全国 categoryID:291, // 京西一级分类 默认为暂无分类,勿删 categoryID2: 0, // 京西二级分类 jdCategoryID:"", // 京东分类绑定 - jdsCategoryID:"", // 京狗分类绑定 + // jdsCategoryID:"", // 京狗分类绑定 mtwmCategoryID:"", // 美团分类绑定 ddCategoryID:"", // 抖店分类绑定 ebaiCategoryID:"", // 饿百分类绑定 @@ -829,7 +829,7 @@ export default { if(reqSkuName.jdCategoryID) await this.getClass('JD') // 京东 - if(reqSkuName.jdsCategoryID) await this.getClass('JG') // 京狗 + // if(reqSkuName.jdsCategoryID) await this.getClass('JG') // 京狗 if(reqSkuName.mtwmCategoryID) { this.specialPictures = reqSkuName.specialPictures ? JSON.parse(reqSkuName.specialPictures) : "" diff --git a/src/components/goodmanager/jxGoodManager/jx-goods-manager.vue b/src/components/goodmanager/jxGoodManager/jx-goods-manager.vue index 3f7d330..4beb597 100644 --- a/src/components/goodmanager/jxGoodManager/jx-goods-manager.vue +++ b/src/components/goodmanager/jxGoodManager/jx-goods-manager.vue @@ -191,11 +191,11 @@ export default { if(this.jDCategoryData && this.jDCategoryData.length>0) return await store.dispatch('getCate',{vendorID:0,parentID:-1}) break - case 'JG': - // 京狗 - if(this.jGCategoryData && this.jGCategoryData.length>0) return - await store.dispatch('getCate',{vendorID:5,parentID:-1}) - break + // case 'JG': + // // 京狗 + // if(this.jGCategoryData && this.jGCategoryData.length>0) return + // await store.dispatch('getCate',{vendorID:5,parentID:-1}) + // break case 'MT': // 美团 if(this.mTCategoryData && this.mTCategoryData.length>0) return diff --git a/src/components/goodmanager/store-cat-manager.vue b/src/components/goodmanager/store-cat-manager.vue index acbdb53..212dc1e 100644 --- a/src/components/goodmanager/store-cat-manager.vue +++ b/src/components/goodmanager/store-cat-manager.vue @@ -164,7 +164,6 @@ :inline="true" size="small"> - {{parentPath}} @@ -177,41 +176,6 @@
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - 返回 @@ -386,79 +283,7 @@ - - -
- - - - - - - - - - - - - - - - - - - - -
@@ -774,17 +599,17 @@ export default { this.jdCatLevel2 = jDcat.filter((item) => item.level === 2); this.jdCatLevel3 = jDcat.filter((item) => item.level === 3); } - if (!jGcat) { - this.$message({ - message: "[获取京狗分类列表失败] " + jGcat.desc, - type: "warning", - center: true, - }); - } else { - this.jgCatLevel1 = jGcat.filter((item) => item.level === 1); - this.jgCatLevel2 = jGcat.filter((item) => item.level === 2); - this.jgCatLevel3 = jGcat.filter((item) => item.level === 3); - } + // if (!jGcat) { + // this.$message({ + // message: "[获取京狗分类列表失败] " + jGcat.desc, + // type: "warning", + // center: true, + // }); + // } else { + // this.jgCatLevel1 = jGcat.filter((item) => item.level === 1); + // this.jgCatLevel2 = jGcat.filter((item) => item.level === 2); + // this.jgCatLevel3 = jGcat.filter((item) => item.level === 3); + // } // 判断饿分类是否获取成功 if (!eBaicat) { this.$message({ @@ -968,28 +793,28 @@ export default { } }, // 京狗分类转换 - switchJgCat() { - if (this.currentPick.jdsCategoryID) { - let leaf = this.currentPick.jdsCategoryID + ""; - let parent = this.jgCatLevel3.filter( - (item) => Number(item.vendorCategoryID) === Number(leaf) - )[0] - ? this.jgCatLevel3.filter( - (item) => Number(item.vendorCategoryID) === Number(leaf) - )[0].parentID - : ""; - let parentparent = this.jgCatLevel2.filter( - (item) => Number(item.vendorCategoryID) === Number(parent) - )[0] - ? this.jgCatLevel2.filter( - (item) => Number(item.vendorCategoryID) === Number(parent) - )[0].parentID - : ""; - return [parentparent, parent, leaf]; - } else { - return []; - } - }, + // switchJgCat() { + // if (this.currentPick.jdsCategoryID) { + // let leaf = this.currentPick.jdsCategoryID + ""; + // let parent = this.jgCatLevel3.filter( + // (item) => Number(item.vendorCategoryID) === Number(leaf) + // )[0] + // ? this.jgCatLevel3.filter( + // (item) => Number(item.vendorCategoryID) === Number(leaf) + // )[0].parentID + // : ""; + // let parentparent = this.jgCatLevel2.filter( + // (item) => Number(item.vendorCategoryID) === Number(parent) + // )[0] + // ? this.jgCatLevel2.filter( + // (item) => Number(item.vendorCategoryID) === Number(parent) + // )[0].parentID + // : ""; + // return [parentparent, parent, leaf]; + // } else { + // return []; + // } + // }, // eBai分类转换 switcheBaiCat() { if (this.currentPick.ebaiCategoryID) { @@ -1616,11 +1441,11 @@ export default { } } else if (ref === "editorjgCategoryID") { // 京狗 - if (this.$refs[ref].currentValue.length === 0) { - this.showjgCatError = true; - } else { - this.showjgCatError = false; - } + // if (this.$refs[ref].currentValue.length === 0) { + // this.showjgCatError = true; + // } else { + // this.showjgCatError = false; + // } } else if (ref === "editoreBaiCategoryID") { // 饿百 if (this.$refs[ref].currentValue.length === 0) { @@ -1682,15 +1507,15 @@ export default { jdCatID = this.$refs.editorjdCategoryID.currentValue; jdCatID = jdCatID[jdCatID.length - 1]; } - // 保存京狗分类数组 - let jgCatID = ""; - if ( - this.$refs.editorjgCategoryID && - this.$refs.editorjgCategoryID.currentValue.length - ) { - jgCatID = this.$refs.editorjgCategoryID.currentValue; - jgCatID = jgCatID[jgCatID.length - 1]; - } + // // 保存京狗分类数组 + // let jgCatID = ""; + // if ( + // this.$refs.editorjgCategoryID && + // this.$refs.editorjgCategoryID.currentValue.length + // ) { + // jgCatID = this.$refs.editorjgCategoryID.currentValue; + // jgCatID = jgCatID[jgCatID.length - 1]; + // } // 保存饿百分类数组 let eBaiCatID = ""; if ( diff --git a/src/components/menu/leftbar.vue b/src/components/menu/leftbar.vue index ff097f3..f4a10b5 100644 --- a/src/components/menu/leftbar.vue +++ b/src/components/menu/leftbar.vue @@ -200,10 +200,10 @@ export default { name: "同步平台门店", path: "/syncstore", }, - { - name: "同步京狗商品库存", - path: "/syncjggoods", - }, + // { + // name: "同步京狗商品库存", + // path: "/syncjggoods", + // }, // { // name: '删除平台有京西没有', // path: '/syncdeletegoods', diff --git a/src/components/ordermanager/order-manager.vue b/src/components/ordermanager/order-manager.vue index ffbf314..e6fda1b 100644 --- a/src/components/ordermanager/order-manager.vue +++ b/src/components/ordermanager/order-manager.vue @@ -373,8 +373,8 @@
手动召唤配送
- 京狗订单召唤京东物流 +
取消三方运单
@@ -1487,25 +1487,25 @@ export default { } }); }, - handleCallJGWL(order) { - this.$confirm("是否对京狗订单召唤京东物流", "确认").then( - async (confirm) => { - if (confirm) { - try { - await api("v2/order/SendJdwlForJdsOrder", { - method: "POST", - data: `vendorOrderID=${order.vendorOrderID}`, - }); - this.$toast("召唤成功"); - } catch (e) { - msgWarning(e); - } finally { - hideLoad(); - } - } - } - ); - }, + // handleCallJGWL(order) { + // this.$confirm("是否对京狗订单召唤京东物流", "确认").then( + // async (confirm) => { + // if (confirm) { + // try { + // await api("v2/order/SendJdwlForJdsOrder", { + // method: "POST", + // data: `vendorOrderID=${order.vendorOrderID}`, + // }); + // this.$toast("召唤成功"); + // } catch (e) { + // msgWarning(e); + // } finally { + // hideLoad(); + // } + // } + // } + // ); + // }, cancelCreateWaybill: function () { this.createWaybillOrder = {}; this.showCreateWaybill = false; diff --git a/src/components/storegoodsmanager/store-goods-manager.vue b/src/components/storegoodsmanager/store-goods-manager.vue index a5e531f..d945779 100644 --- a/src/components/storegoodsmanager/store-goods-manager.vue +++ b/src/components/storegoodsmanager/store-goods-manager.vue @@ -1199,7 +1199,7 @@ export default { // 9: ["西", "jxID", "jxSyncStatus", "jxPrice", "jxLockTime"], 14: ["抖", "ddID", "ddSyncStatus", "ddPrice", "ddLockTime"], 16: ["淘", "taoID", "taoSyncStatus", "taoPrice", "taoLockTime"], - 5: ["狗", "jdsID", "jdsSyncStatus", "jdsPrice", "jdsLockTime"], + // 5: ["狗", "jdsID", "jdsSyncStatus", "jdsPrice", "jdsLockTime"], }; }, maxStoresLength() { @@ -2317,8 +2317,8 @@ export default { json["京东同步状态"] = sku.jdSyncStatus; json["美团skuID"] = sku.mtwmID; json["美团同步状态"] = sku.mtwmSyncStatus; - json["京狗skuID"] = sku.jdsID; - json["京狗同步状态"] = sku.jdsSyncStatus; + // json["京狗skuID"] = sku.jdsID; + // json["京狗同步状态"] = sku.jdsSyncStatus; json["商品规格"] = skuName.unit; json["商品库存"] = sku.stock; json["商品货架码"] = sku.locationCode && sku.locationCode !== 'EMPTY_VALUE' ? sku.locationCode : ''; @@ -2328,7 +2328,7 @@ export default { json["美团平台价(单位:分)"] = sku.mtwmPrice; json["饿百平台价(单位:分)"] = sku.ebaiPrice; json["抖店平台价(单位:分)"] = sku.ybPrice; - json["京狗平台价(单位:分)"] = sku.jdsPrice; + // json["京狗平台价(单位:分)"] = sku.jdsPrice; json["规格数值"] = sku.specQuality; json["规格单位"] = sku.specUnit; json["门店可售状态"] = sku.storeSkuStatus ? "可售" : "不可售"; diff --git a/src/components/storemanager/dialog/editorVendorStore.vue b/src/components/storemanager/dialog/editorVendorStore.vue index a2f8ff1..0d4d8bc 100644 --- a/src/components/storemanager/dialog/editorVendorStore.vue +++ b/src/components/storemanager/dialog/editorVendorStore.vue @@ -1587,10 +1587,10 @@ export default { } }) }, - //切换京狗绑定门店 - jgStoreIDchange(num) { - this.getStoreVendorMaoWay(Number(num[0]) - 1) - }, + // //切换京狗绑定门店 + // jgStoreIDchange(num) { + // this.getStoreVendorMaoWay(Number(num[0]) - 1) + // }, async getStoreVendorMaoWay(index, changeAuthAddress) { if (this.vendorQuery.isBind) { getStoreVendorMap( diff --git a/src/components/storemanager/jx-store-manager.vue b/src/components/storemanager/jx-store-manager.vue index 9ee3635..e798937 100644 --- a/src/components/storemanager/jx-store-manager.vue +++ b/src/components/storemanager/jx-store-manager.vue @@ -101,7 +101,7 @@
-
+
饿 百:
- -
+ +
item.vendorID === 0) jdID = arr0.length === 0 ? '' : arr0[0].vendorStoreID @@ -2734,16 +2734,16 @@ export default { jxPack = arr9[0].pricePercentagePack || '' } // jg - let arr5 = item.StoreMaps.filter((item) => item.vendorID === 5) - jgID = arr5.length === 0 ? '' : arr5[0].vendorStoreID - if (arr5.length > 0) { - jgName = arr5[0].vendorStoreName || arr5[0].storeName - jgStatus = - item.status === 0 - ? '临时休息' - : this.switchStatus(arr5[0].status) - jgPack = arr5[0].pricePercentagePack || '' - } + // let arr5 = item.StoreMaps.filter((item) => item.vendorID === 5) + // jgID = arr5.length === 0 ? '' : arr5[0].vendorStoreID + // if (arr5.length > 0) { + // jgName = arr5[0].vendorStoreName || arr5[0].storeName + // jgStatus = + // item.status === 0 + // ? '临时休息' + // : this.switchStatus(arr5[0].status) + // jgPack = arr5[0].pricePercentagePack || '' + // } } // CourierMaps let deliveryMt = '' @@ -2791,7 +2791,7 @@ export default { let MtbussinessStatus = '' let EbbussinessStatus = '' let jdbussinessStatus = '' - let jdsbussinessStatus = '' + // let jdsbussinessStatus = '' let vendorObj = { 1: '上线', '-1': '下线', @@ -2805,8 +2805,8 @@ export default { MtbussinessStatus = vendorObj[itemVendorStore.isOnline + ''] if (itemVendorStore.vendorID === 3) EbbussinessStatus = vendorObj[itemVendorStore.isOnline + ''] - if (itemVendorStore.vendorID === 5) - jdsbussinessStatus = vendorObj[itemVendorStore.isOnline + ''] + // if (itemVendorStore.vendorID === 5) + // jdsbussinessStatus = vendorObj[itemVendorStore.isOnline + ''] } } // arr @@ -2878,10 +2878,10 @@ export default { jxName, jxStatus, jxPack, - jgID, - jgName, - jgStatus, - jgPack, + // jgID, + // jgName, + // jgStatus, + // jgPack, deliveryMt, deliveryMtStatus, deliveryMtOpenStatus, @@ -2903,7 +2903,7 @@ export default { jdbussinessStatus, MtbussinessStatus, EbbussinessStatus, - jdsbussinessStatus + // jdsbussinessStatus ] // 销量 if (this.isSearchOrderCount) { diff --git a/src/components/system/system-tool-p.vue b/src/components/system/system-tool-p.vue index 83f69da..e5b0032 100644 --- a/src/components/system/system-tool-p.vue +++ b/src/components/system/system-tool-p.vue @@ -39,7 +39,7 @@ 京东 美团 饿百 - 京狗 + 提 交
diff --git a/src/config.js b/src/config.js index 309c8ac..a6ebd73 100644 --- a/src/config.js +++ b/src/config.js @@ -6,8 +6,8 @@ export const backstageVer = '1.0.76' * v1 正式服 * v2 beta */ -export const apiEdition = process.env.NODE_ENV === 'development' ? 'v2' : 'v2' // 这串是在线上运行的，下面改成自己判断的了，不行就换回来 -// export const apiEdition = 'v1' // 这串是开发时候用=的，下面改成自己判断的了，不行就换回来 +// export const apiEdition = process.env.NODE_ENV === 'development' ? 'v2' : 'v2' // 这串是在线上运行的，下面改成自己判断的了，不行就换回来 +export const apiEdition = 'v1' // 这串是开发时候用=的，下面改成自己判断的了，不行就换回来 @@ -40,11 +40,11 @@ export const ConVendorNameMap = new Map() name: '淘鲜达', nick: '淘' }) - .set(5, { - vendorID: 5, - name: '京狗', - nick: '狗' - }) + // .set(5, { + // vendorID: 5, + // name: '京狗', + // nick: '狗' + // }) .set(9, { vendorID: 9, name: '京西', @@ -76,11 +76,11 @@ export const ConVendorName = [ name: '淘鲜达', nick: '淘' }, - { - vendorID: 5, - name: '京狗', - nick: '狗' - }, + // { + // vendorID: 5, + // name: '京狗', + // nick: '狗' + // }, { vendorID: 9, name: '京西', @@ -130,11 +130,11 @@ export const ConVendorNameWm = [ name: '淘鲜达', nick: '淘' }, - { - vendorID: 5, - name: '京狗', - nick: '狗' - }, + // { + // vendorID: 5, + // name: '京狗', + // nick: '狗' + // }, { vendorID: 9, name: '京西', diff --git a/src/pages/report/report-user/index.vue b/src/pages/report/report-user/index.vue index f53f603..b108272 100644 --- a/src/pages/report/report-user/index.vue +++ b/src/pages/report/report-user/index.vue @@ -118,10 +118,12 @@ export default { { value: 3, label: '饿百' - }, { - value: 5, - label: '京狗' - }], + }, + // { + // value: 5, + // label: '京狗' + // } + ], page: 1, totalCount: 0, dialogMsgShow: false, diff --git a/src/pages/report/report-vip-user/index.vue b/src/pages/report/report-vip-user/index.vue index c3b2be9..862b50f 100644 --- a/src/pages/report/report-vip-user/index.vue +++ b/src/pages/report/report-vip-user/index.vue @@ -249,10 +249,12 @@ export default { { value: 3, label: '饿百' - }, { - value: 5, - label: '京狗' - }], + }, + // { + // value: 5, + // label: '京狗' + // } + ], page: 1, totalCount: 0, dialogMsgShow: false, diff --git a/src/pages/sync/sync-jg-goods/index.vue b/src/pages/sync/sync-jg-goods/index.vue index 22ce298..0de88fd 100644 --- a/src/pages/sync/sync-jg-goods/index.vue +++ b/src/pages/sync/sync-jg-goods/index.vue @@ -65,8 +65,8 @@ border v-model="searchForm.isContinueWhenError">单个失败继续 - - 提 交 + + 提 交
@@ -77,7 +77,7 @@ import StoresPick from "@/components/cmp/storePick/index.vue"; import {showLoad, hideLoad} from '@/tools/loading.js' // import {json2Excel, importExcel2} from '@/tools/excel.js' import syncMsg from '@/tools/syncMsg' -import {APISyncJGStoresSkus} from '@/apis/APIsync.js' +// import {APISyncJGStoresSkus} from '@/apis/APIsync.js' import msgWarning from '@/tools/msgwarning' import {mapGetters} from 'vuex' export default { @@ -124,24 +124,24 @@ export default { isAsync isContinueWhenError */ - // 点击查询按钮 - submitForm () { - this.$refs.searchForm.validate(async valid => { - if (valid) { - try { - showLoad() - let res = await APISyncJGStoresSkus({ - ...this.searchForm - }) - syncMsg(res) - } catch (e) { - msgWarning(e) - } finally { - hideLoad() - } - } - }) - }, + // // 点击查询按钮 + // submitForm () { + // this.$refs.searchForm.validate(async valid => { + // if (valid) { + // try { + // showLoad() + // let res = await APISyncJGStoresSkus({ + // ...this.searchForm + // }) + // syncMsg(res) + // } catch (e) { + // msgWarning(e) + // } finally { + // hideLoad() + // } + // } + // }) + // }, // 修改storeIDs updateStoreIDs (arr) { this.searchForm.storeIDs = arr diff --git a/src/router/index.js b/src/router/index.js index c78b641..73083a3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -622,14 +622,14 @@ const router = new Router({ title: '同步平台门店' } }, - { - path: 'syncjggoods', - name: 'syncjggoods', - component: () => import('@/pages/sync/sync-jg-goods'), - meta: { - title: '同步京狗商品库存' - } - }, + // { + // path: 'syncjggoods', + // name: 'syncjggoods', + // component: () => import('@/pages/sync/sync-jg-goods'), + // meta: { + // title: '同步京狗商品库存' + // } + // }, // { // path: 'toolgroupmanager', // name: 'ToolGroupManager', diff --git a/src/store/index.js b/src/store/index.js index 52f184f..f5f6f41 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -339,12 +339,12 @@ export default new Vuex.Store({ commitName:'SET_eBCategory' } break - case 5: - valueNew = { - name:'京狗', - commitName:'SET_jGCategory' - } - break + // case 5: + // valueNew = { + // name:'京狗', + // commitName:'SET_jGCategory' + // } + // break // case 9: // valueNew = { // name:'京西',