diff --git a/src/App.ts b/src/App.ts index e564386..e7dac37 100644 --- a/src/App.ts +++ b/src/App.ts @@ -118,9 +118,9 @@ function App() { return 0 case '美团外卖': return 1 - case '饿了么': - return 2 - case '饿百新零售': + // case '淘宝闪购': + // return 2 + case '淘宝闪购新零售': return 3 case '京东商城': return 5 diff --git a/src/manifest.json b/src/manifest.json index c087354..9877fa3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,9 +1,9 @@ { "name" : "京西到家商家版", "appid" : "__UNI__F9A47D3", - "description" : "1、商户通过京西平台同时管理美团、饿了么、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", - "versionName" : "1.9.0", - "versionCode" : 190, + "description" : "1、商户通过京西平台同时管理美团、淘宝闪购、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", + "versionName" : "1.9.1", + "versionCode" : 191, "transformPx" : false, "uni-app" : { "debug" : true diff --git a/src/pages/goods-manager/childPages/right-main/right-main.vue b/src/pages/goods-manager/childPages/right-main/right-main.vue index 85e1b75..2aaf445 100644 --- a/src/pages/goods-manager/childPages/right-main/right-main.vue +++ b/src/pages/goods-manager/childPages/right-main/right-main.vue @@ -80,7 +80,7 @@ (sku.ebaiSyncStatus & 2) !== 2 && (sku.ebaiSyncStatus & 4) !== 4 " - >饿佰:该商品无法修改价格,请联系运营修改淘宝闪购:该商品无法修改价格,请联系运营修改 diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue index 6e05ef9..5b947a0 100644 --- a/src/pages/message/index.vue +++ b/src/pages/message/index.vue @@ -22,7 +22,7 @@ :title=" item.vendorID == 1 ? `【美团${item.orderDesc}】${item.userID === '0' ? '群发消息' : item.userID}` - : `【饿了么】${item.userID}` + : `【淘宝闪购】${item.userID}` " :avatar=" item.vendorID == 1 diff --git a/src/pages/order-manager/childPages/order-filter/order-filter.vue b/src/pages/order-manager/childPages/order-filter/order-filter.vue index 33b9e08..0d12840 100644 --- a/src/pages/order-manager/childPages/order-filter/order-filter.vue +++ b/src/pages/order-manager/childPages/order-filter/order-filter.vue @@ -167,7 +167,7 @@ const vendorArr = ref>([ { id: -1, name: '全部' }, { id: 0, name: '京东到家' }, { id: 1, name: '美团外卖' }, - { id: 3, name: '饿百新零售' }, + { id: 3, name: '淘宝闪购新零售' }, { id: 5, name: '京东商城' }, { id: 9, name: '京西商城' }, ]) @@ -183,7 +183,7 @@ const waybillVendorArr = ref>([ { id: -1, name: '全部' }, { id: 0, name: '京东到家专送' }, { id: 1, name: '美团专送' }, - { id: 3, name: '饿百专送' }, + { id: 3, name: '淘宝闪购专送' }, { id: 101, name: '达达众包' }, { id: 102, name: '美团配送' }, { id: 103, name: '蜂鸟配送' }, diff --git a/src/static/font/iconfont.css b/src/static/font/iconfont.css index 1285975..6a17f08 100644 --- a/src/static/font/iconfont.css +++ b/src/static/font/iconfont.css @@ -14,7 +14,8 @@ } .icon-3 { - background-image: url(https://image.jxc4.com/image/9b6dc6f925111cf1d72175df9669c738.png) + /* background-image: url(https://image.jxc4.com/image/9b6dc6f925111cf1d72175df9669c738.png) */ + background-image: url(https://image.jxc4.com/image/06a27a6503a6695824bf361ded5f1d45.png) } .icon-4 { diff --git a/src/store/useStoreInfoStore/getters.ts b/src/store/useStoreInfoStore/getters.ts index 2dd7f47..8195054 100644 --- a/src/store/useStoreInfoStore/getters.ts +++ b/src/store/useStoreInfoStore/getters.ts @@ -55,7 +55,7 @@ export default { imStatus(state: StoreInfoStoreType, getters: AnyObject) { let str = '' if (getters.imMtStatus.length > 0 && !getters.imMtStatus[0].errMsg && getters.imMtStatus[0].imStatus === 0) str = '美团' - if (getters.imEbStatus.length > 0 && !getters.imEbStatus[0].errMsg && getters.imEbStatus[0].imStatus === 0) str = str ? str + '/饿百':'饿百' + if (getters.imEbStatus.length > 0 && !getters.imEbStatus[0].errMsg && getters.imEbStatus[0].imStatus === 0) str = str ? str + '/淘宝闪购':'淘宝闪购' return str }, diff --git a/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts b/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts index f1a7aaa..1555de4 100644 --- a/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts +++ b/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts @@ -122,8 +122,8 @@ export default { async function saveInvoiceInfo() { try { let findItem = store.getters['storeInfo/platformInfo'].filter((item:AnyObject) => item.vendorID === 3) - if(findItem.length === 0) return toast('未绑定饿百门店',2) - // if(!ebStoreInfo || JSON.stringify(ebStoreInfo) === '{}') return toast('未绑定饿百门店') + if(findItem.length === 0) return toast('未绑定淘宝闪购门店',2) + // if(!ebStoreInfo || JSON.stringify(ebStoreInfo) === '{}') return toast('未绑定淘宝闪购门店') if(+invoice_mode_index.value) invoiceInfo.value.invoice_mode = invoice_mode_array.value[invoice_mode_index.value].value if(+invoice_material_index.value) invoiceInfo.value.invoice_material = invoice_material_array.value[invoice_material_index.value].value if(+invoice_class_index.value) invoiceInfo.value.invoice_class = invoice_class_array.value[invoice_class_index.value].value diff --git a/src/subPages/merchantChild/setUp/setUp.vue b/src/subPages/merchantChild/setUp/setUp.vue index c913488..164253f 100644 --- a/src/subPages/merchantChild/setUp/setUp.vue +++ b/src/subPages/merchantChild/setUp/setUp.vue @@ -150,7 +150,7 @@ 未知状态 - 饿百IM单聊状态 + 淘宝闪购IM单聊状态 - 发票设置（饿百） + 发票设置（淘宝闪购） diff --git a/src/subPages/merchantChild/shareStore/shareStore.vue b/src/subPages/merchantChild/shareStore/shareStore.vue index 91ec787..bc7f679 100644 --- a/src/subPages/merchantChild/shareStore/shareStore.vue +++ b/src/subPages/merchantChild/shareStore/shareStore.vue @@ -116,7 +116,7 @@ async function shareStoreFn( getQrCode(path) } else if (vendorID == 3) { // 饿了么 - shareText.value = '饿了么/微信/支付宝扫码进店/' + shareText.value = '淘宝闪购/微信/支付宝扫码进店/' share.value.open() path = `https://h5.ele.me/newretail/p/shop/?&id=${vendorStoreID}` getQrCode(path) diff --git a/src/subPages/messageChild/msgChat/msgChat.ts b/src/subPages/messageChild/msgChat/msgChat.ts index e5c200f..e85b2a0 100644 --- a/src/subPages/messageChild/msgChat/msgChat.ts +++ b/src/subPages/messageChild/msgChat/msgChat.ts @@ -56,7 +56,7 @@ const msgChatFn = function () { title: useData.vendorID == 1 ? `【美团${useData.orderDesc}】${useData.userID === '0' ? '群发消息' : useData.userID}` - : `【饿了么】${useData.userID}`, + : `【淘宝闪购】${useData.userID}`, }) // 获取聊天数据 diff --git a/src/subPages/orderChild/getPhone/getPhone.vue b/src/subPages/orderChild/getPhone/getPhone.vue index b1be322..d07952a 100644 --- a/src/subPages/orderChild/getPhone/getPhone.vue +++ b/src/subPages/orderChild/getPhone/getPhone.vue @@ -39,8 +39,8 @@ const phoneList = ref>([ mobild: phoneData.operatorPhone2, }, { - icon: 'https://image.jxc4.com/image/8ac4b05dfef6b18639489d32cd421551.png', - company: '饿佰运营', + icon: 'https://image.jxc4.com/image/06a27a6503a6695824bf361ded5f1d45.png', + company: '淘宝闪购运营', name: phoneData.operatorName3 || '暂无', mobild: phoneData.operatorPhone3, }, diff --git a/src/utils/bluetoothPrinter/printerTemplate.ts b/src/utils/bluetoothPrinter/printerTemplate.ts index e6902c3..f57e138 100644 --- a/src/utils/bluetoothPrinter/printerTemplate.ts +++ b/src/utils/bluetoothPrinter/printerTemplate.ts @@ -77,7 +77,7 @@ const printerTemplate = async function (data: AnyObject) { .setSize(1, 2) .setAlign('ct') .printArrayP(30) - .print(`饿百取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) + .print(`淘宝闪购取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) } // 分割线 @@ -240,7 +240,7 @@ const printerTemplate = async function (data: AnyObject) { .setSize(1, 2) .setAlign('ct') .printArrayP(30) - .print(`饿百取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) + .print(`淘宝闪购取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) } // 分割线 @@ -419,7 +419,7 @@ const printerTemplate = async function (data: AnyObject) { .setAlign('ct') .setBold(true) .printArrayP(30) - .print(`饿百取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) + .print(`淘宝闪购取货码: ${tmpOrder.vendorOrderID2.slice(tmpOrder.vendorOrderID2.length - 4)}`) } // 分割线 @@ -591,10 +591,10 @@ function vendorID2(vendorID: number) { return '京东到家' case 1: return '美团外卖' - case 2: - return '饿了么' + // case 2: + // return '淘宝闪购' case 3: - return '饿百新零售' + return '淘宝闪购新零售' case 5: return '京东商城' case 9: diff --git a/src/utils/configCms.ts b/src/utils/configCms.ts index b1a0e0a..34d7a3b 100644 --- a/src/utils/configCms.ts +++ b/src/utils/configCms.ts @@ -162,10 +162,10 @@ export default { "-4": "已删除" }, "ebaiSupplierID": { - "2233065879": "饿百好菜", - "2267230126": "饿百果园", - "1921188187760": "饿百商超", - "22267134648": "饿百菜市" + "2233065879": "淘宝闪购好菜", + "2267230126": "淘宝闪购果园", + "1921188187760": "淘宝闪购商超", + "22267134648": "淘宝闪购菜市" }, "ebaiSupplierInfo": { "2233065879": { @@ -359,7 +359,7 @@ export default { "userApplyCancelWaitMinute": 30 }, "3": { - "chineseName": "饿百新零售", + "chineseName": "淘宝闪购新零售", "userApplyCancelWaitMinute": 15 } }, @@ -478,8 +478,8 @@ export default { "vendorName": { "0": "京东到家", "1": "美团外卖", - "2": "饿了么", - "3": "饿百新零售", + // "2": "淘宝闪购", + "3": "淘宝闪购新零售", "4": "银豹", "5": "京东商城", "9": "京西商城",