diff --git a/src/api/https/order.ts b/src/api/https/order.ts index 7ab2e94..a1c4d8f 100644 --- a/src/api/https/order.ts +++ b/src/api/https/order.ts @@ -475,7 +475,7 @@ const order = { /** - * 发票设置 饿百 + * 发票设置 淘宝闪购 * @Title 批量更新门店发票设置 * @Description 批量更新门店发票设置 * @Param token header string true "认证token" @@ -502,7 +502,7 @@ const order = { /** - * @Title 查询门店开票申请 饿百 + * @Title 查询门店开票申请 淘宝闪购 * @Description 批量更新店铺开票申请 * @Param token header string true "认证token" * @Param vendorId formData string true "平台ID" diff --git a/src/manifest.json b/src/manifest.json index ef5c41f..a670e41 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "name": "京西菜市商家版", "appid": "__UNI__F9A47D3", - "description": "1、商户通过京西平台同时管理美团、饿了么、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", + "description": "1、商户通过京西平台同时管理美团、淘宝闪购、京东等多个外卖平台实现一键上架、下架、修改、删除多个平台商品；2、商户通过京西平台可以同时对、美团专送、达达、顺丰同城等多个专送平台召唤偶骑手", "versionName": "1.3.0", "versionCode": 130, "transformPx": false, 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 c2e476d..e269e2b 100644 --- a/src/pages/goods-manager/childPages/right-main/right-main.vue +++ b/src/pages/goods-manager/childPages/right-main/right-main.vue @@ -81,7 +81,7 @@ (sku.ebaiSyncStatus & 2) !== 2 && (sku.ebaiSyncStatus & 4) !== 4 " - >饿佰:该商品无法修改价格,请联系运营修改淘宝闪购:该商品无法修改价格,请联系运营修改 diff --git a/src/pages/merchant/index.vue b/src/pages/merchant/index.vue index 4ccab85..09dc61a 100644 --- a/src/pages/merchant/index.vue +++ b/src/pages/merchant/index.vue @@ -36,7 +36,7 @@ 京西到家商家版App全新上架，系统更加稳定，功能更加齐全，订单通知更加及时，请往手机自带应用商店搜索【京西到家】进行安装使用！京西菜市（京西到家）商家版App全新上架，系统更加稳定，功能更加齐全，订单通知更加及时，请往手机自带应用商店搜索【京西菜市】/ 【京西到家】进行安装使用！ - + 我知道了 diff --git a/src/pages/merchant/options/options.ts b/src/pages/merchant/options/options.ts index 2f29b1c..15300b4 100644 --- a/src/pages/merchant/options/options.ts +++ b/src/pages/merchant/options/options.ts @@ -216,7 +216,7 @@ function options() { function openAppOrApplet() { uni.jxAlert({ title: '提示', - content: '下载链接复制成功，请到浏览器进行下载，或者到手机应用商店搜索【京西菜市】进行下载！', + content: '下载链接复制成功，请到浏览器进行下载，或者到手机应用商店搜索【京西菜市】/【京西到家】进行下载！', success: () => { uni.setClipboardData({ data: 'https://www.jxc4.com/managerApp/downApp.html' diff --git a/src/pages/merchant/userInfo/userInfo.ts b/src/pages/merchant/userInfo/userInfo.ts index 6f1b1e1..5d79e9e 100644 --- a/src/pages/merchant/userInfo/userInfo.ts +++ b/src/pages/merchant/userInfo/userInfo.ts @@ -124,7 +124,7 @@ function userInfo() { function downApp() { uni.jxAlert({ title: '提示', - content: '下载链接复制成功，请到浏览器进行下载，或者到手机应用商店搜索【京西菜市】进行下载！', + content: '下载链接复制成功，请到浏览器进行下载，或者到手机应用商店搜索【京西菜市】/【京西到家】进行下载！', success: () => { uni.setClipboardData({ data: 'https://www.jxc4.com/managerApp/downApp.html' diff --git a/src/pages/merchant/userInfo/userInfo.vue b/src/pages/merchant/userInfo/userInfo.vue index 80189fb..5f1244a 100644 --- a/src/pages/merchant/userInfo/userInfo.vue +++ b/src/pages/merchant/userInfo/userInfo.vue @@ -70,7 +70,7 @@ moreColor="#e70808" showGetMore @click="downApp" - text="京西到家商家版App全新上架，系统更加稳定，功能更加齐全，订单通知更加及时，请往手机自带应用商店搜索【京西到家】进行安装使用！" + text="京西菜市（京西到家）商家版App全新上架，系统更加稳定，功能更加齐全，订单通知更加及时，请往手机自带应用商店搜索【京西菜市】/【京西到家】进行安装使用！" /> diff --git a/src/pages/message/index.vue b/src/pages/message/index.vue index 0259252..87067b3 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 e60d3fa..2888deb 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 b8f89ff..db705c0 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 d0c528e..58088fd 100644 --- a/src/store/useStoreInfoStore/getters.ts +++ b/src/store/useStoreInfoStore/getters.ts @@ -54,7 +54,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 d2c8971..c4d3f58 100644 --- a/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts +++ b/src/subPages/merchantChild/setInvoiceEB/setInvoiceEB.ts @@ -120,8 +120,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 7dbbfaa..f3f8f22 100644 --- a/src/subPages/merchantChild/setUp/setUp.vue +++ b/src/subPages/merchantChild/setUp/setUp.vue @@ -129,7 +129,7 @@ 未知状态 - 饿百IM单聊状态 + 淘宝闪购IM单聊状态 - 发票设置（饿百） + 发票设置（淘宝闪购） diff --git a/src/subPages/messageChild/msgChat/msgChat.ts b/src/subPages/messageChild/msgChat/msgChat.ts index f4b1b5c..efd1f58 100644 --- a/src/subPages/messageChild/msgChat/msgChat.ts +++ b/src/subPages/messageChild/msgChat/msgChat.ts @@ -59,7 +59,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..3eca641 100644 --- a/src/subPages/orderChild/getPhone/getPhone.vue +++ b/src/subPages/orderChild/getPhone/getPhone.vue @@ -40,7 +40,7 @@ const phoneList = ref>([ }, { icon: 'https://image.jxc4.com/image/8ac4b05dfef6b18639489d32cd421551.png', - company: '饿佰运营', + company: '淘宝闪购运营', name: phoneData.operatorName3 || '暂无', mobild: phoneData.operatorPhone3, }, diff --git a/src/subPages/orderChild/orderDetail/orderDetail.ts b/src/subPages/orderChild/orderDetail/orderDetail.ts index 66f05c7..276873a 100644 --- a/src/subPages/orderChild/orderDetail/orderDetail.ts +++ b/src/subPages/orderChild/orderDetail/orderDetail.ts @@ -262,7 +262,7 @@ function orderDetailFn() { /*************************************************************** - * 饿佰订单号 + * 饿百订单号 */ const elemIDPre = computed(() => { return orderData.value.vendorOrderID2 ? orderData.value.vendorOrderID2.slice(0, orderData.value.vendorOrderID2.length - 4) : '' diff --git a/src/utils/bluetoothPrinter/printerTemplate.ts b/src/utils/bluetoothPrinter/printerTemplate.ts index 6f45e79..ca197a5 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)}`) } // 分割线 @@ -242,7 +242,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)}`) } // 分割线 @@ -422,7 +422,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)}`) } // 分割线 @@ -595,10 +595,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 cf8b87f..ba8404f 100644 --- a/src/utils/configCms.ts +++ b/src/utils/configCms.ts @@ -161,10 +161,10 @@ export default { "-4": "已删除" }, "ebaiSupplierID": { - "2233065879": "饿百好菜", - "2267230126": "饿百果园", - "1921188187760": "饿百商超", - "22267134648": "饿百菜市" + "2233065879": "淘宝闪购好菜", + "2267230126": "淘宝闪购果园", + "1921188187760": "淘宝闪购商超", + "22267134648": "淘宝闪购菜市" }, "ebaiSupplierInfo": { "2233065879": { @@ -358,7 +358,7 @@ export default { "userApplyCancelWaitMinute": 30 }, "3": { - "chineseName": "饿百新零售", + "chineseName": "淘宝闪购新零售", "userApplyCancelWaitMinute": 15 } }, @@ -480,8 +480,8 @@ export default { "vendorName": { "0": "京东到家", "1": "美团外卖", - "2": "饿了么", - "3": "饿百新零售", + "2": "淘宝闪购", + "3": "淘宝闪购新零售", "4": "银豹", "5": "京东商城", "9": "京西商城",