diff --git a/src/api/https/merchant.ts b/src/api/https/merchant.ts index 05bc9d5..d8914b3 100644 --- a/src/api/https/merchant.ts +++ b/src/api/https/merchant.ts @@ -26,12 +26,12 @@ const merchant = { }, - /** - * 修改线上淘鲜达时间 - */ - update_txd_store: async (params: AnyObject): Promise => { - return await request.api('/v2/store/UpdateTxdStore', 'POST', params) - }, + // /** + // * 修改线上淘鲜达时间 + // */ + // update_txd_store: async (params: AnyObject): Promise => { + // return await request.api('/v2/store/UpdateTxdStore', 'POST', params) + // }, /** diff --git a/src/composables/useGlobalFunc.ts b/src/composables/useGlobalFunc.ts index c857383..8f32e94 100644 --- a/src/composables/useGlobalFunc.ts +++ b/src/composables/useGlobalFunc.ts @@ -431,15 +431,15 @@ function useGlobalFunc() { const storeMaps = computed(() => { return store.state.storeInfo.allStoreInfo }) - function isTxd() { - let state = false - storeMaps.value.StoreMaps.forEach((item: AnyObject) => { - if (item.vendorID == 16) { - state = true - } - }) - return state - } + // function isTxd() { + // let state = false + // storeMaps.value.StoreMaps.forEach((item: AnyObject) => { + // if (item.vendorID == 16) { + // state = true + // } + // }) + // return state + // } //#endregion /** @@ -586,7 +586,7 @@ function useGlobalFunc() { setPrinterStatus, // 查询打印机状态并连接 logOutFn, // 退出登录 isUserAgreementFn, // 提示用户未勾选 - isTxd, // 判断是否有淘鲜达 + // isTxd, // 判断是否有淘鲜达 getMtStoreIMStatus, // 获取美团IM单聊状态 analyEmoji, // 解析emoji表情 isCloudEmoji // 是否含有emoji diff --git a/src/pages/merchant/userInfo/userInfo.ts b/src/pages/merchant/userInfo/userInfo.ts index d06d987..2265bb5 100644 --- a/src/pages/merchant/userInfo/userInfo.ts +++ b/src/pages/merchant/userInfo/userInfo.ts @@ -13,7 +13,7 @@ import { store } from "@/store"; function userInfo() { - const { newMessage, logOutFn, isTxd, getMtStoreIMStatus } = useGlobalFunc() + const { newMessage, logOutFn, getMtStoreIMStatus } = useGlobalFunc() /** diff --git a/src/subPages/merchantChild/setBusinessStatus/setBusinessStatus.ts b/src/subPages/merchantChild/setBusinessStatus/setBusinessStatus.ts index 07851ba..1ee6026 100644 --- a/src/subPages/merchantChild/setBusinessStatus/setBusinessStatus.ts +++ b/src/subPages/merchantChild/setBusinessStatus/setBusinessStatus.ts @@ -22,7 +22,7 @@ export default { const currentTime = ref(0) const storeName = ref('') // 门店名称 - const { isTxd } = useGlobalFunc() + // const { isTxd } = useGlobalFunc() onLoad(async () => { store.commit('storeInfo/jxLoadingFn', true) @@ -140,7 +140,7 @@ export default { }), }; await merchant.update_store(data); - setTxdIngState(1) + // setTxdIngState(1) newAutoEnableAt.value = '' toast("操作成功", 1) // state.value = 1; @@ -165,7 +165,7 @@ export default { }), }; await merchant.update_store(data); - setTxdIngState(-1) + // setTxdIngState(-1) newAutoEnableAt.value = '' // businessStatus.value = item.id toast("操作成功", 1) @@ -178,38 +178,38 @@ export default { } } - /** - * 设置第三方平台 - */ - async function setTxdIngState(type: number) { - if (isTxd()) { - let data = { - vendorOrgCode: 34402634, - txdStores: JSON.stringify({ - flag: [1], - txdStoreID: `JX${getStorage('storeID')}`, - status: type - }) - } - await merchant.update_txd_store(data) - } + // /** + // * 设置第三方平台 + // */ + // async function setTxdIngState(type: number) { + // if (isTxd()) { + // let data = { + // vendorOrgCode: 34402634, + // txdStores: JSON.stringify({ + // flag: [1], + // txdStoreID: `JX${getStorage('storeID')}`, + // status: type + // }) + // } + // await merchant.update_txd_store(data) + // } - // 更新线上平台的营业状态 - let arr = store.state.storeInfo.allStoreInfo.StoreMaps.map((item: AnyObject) => { - if (item.isSync) return item.vendorID + '' - }) + // // 更新线上平台的营业状态 + // let arr = store.state.storeInfo.allStoreInfo.StoreMaps.map((item: AnyObject) => { + // if (item.isSync) return item.vendorID + '' + // }) - arr = arr.filter((item: string) => item !== '9') - if (arr.length > 0) { - let data = { - storeID: getStorage('storeID'), - vendorIDs: arr.join(','), - status: type - } - await merchant.update_vendors_store_states(data); - } - // uni.navigateBack() - } + // arr = arr.filter((item: string) => item !== '9') + // if (arr.length > 0) { + // let data = { + // storeID: getStorage('storeID'), + // vendorIDs: arr.join(','), + // status: type + // } + // await merchant.update_vendors_store_states(data); + // } + // // uni.navigateBack() + // } async function storeRest() { let autoEnableAt = currentTime.value @@ -223,7 +223,7 @@ export default { }), }; await merchant.update_store(data); - setTxdIngState(0) + // setTxdIngState(0) toast("操作成功", 1); popupTime.value.close() businessStatus.value = 0; diff --git a/src/subPages/merchantChild/setBusinessTime/setBusinessTime.ts b/src/subPages/merchantChild/setBusinessTime/setBusinessTime.ts index 05d6d69..139c364 100644 --- a/src/subPages/merchantChild/setBusinessTime/setBusinessTime.ts +++ b/src/subPages/merchantChild/setBusinessTime/setBusinessTime.ts @@ -7,7 +7,7 @@ import { store } from "@/store"; export default { setup() { - const { isTxd } = useGlobalFunc() + // const { isTxd } = useGlobalFunc() // ******************** 时间选择组件操作 ***************************** //#region @@ -143,23 +143,23 @@ export default { // ******************** 修改淘鲜达线上时间 ***************************** //#region - async function setTxdIngTime(time: AnyObject) { - if (isTxd()) { - let data = { - vendorOrgCode: 34402634, - txdStores: JSON.stringify({ - flag: [2], - txdStoreID: `JX${getStorage('storeID')}`, - startTime: time.timer1, - endTime: time.timer2 - }) - } - let res = await merchant.update_txd_store(data) - console.log('ZSW-res', res); - } else { - console.log('此店铺暂无淘鲜达店铺') - } - } + // async function setTxdIngTime(time: AnyObject) { + // if (isTxd()) { + // let data = { + // vendorOrgCode: 34402634, + // txdStores: JSON.stringify({ + // flag: [2], + // txdStoreID: `JX${getStorage('storeID')}`, + // startTime: time.timer1, + // endTime: time.timer2 + // }) + // } + // let res = await merchant.update_txd_store(data) + // console.log('ZSW-res', res); + // } else { + // console.log('此店铺暂无淘鲜达店铺') + // } + // } //#endregion return { diff --git a/src/subPages/merchantChild/setBusinessTime/setBusinessTime.vue b/src/subPages/merchantChild/setBusinessTime/setBusinessTime.vue index 8e11f70..44ab986 100644 --- a/src/subPages/merchantChild/setBusinessTime/setBusinessTime.vue +++ b/src/subPages/merchantChild/setBusinessTime/setBusinessTime.vue @@ -4,7 +4,7 @@ ● 门店营业时间需在配送站点营业时间内才会有骑手配送 ● 如需在此时间范围外营业，请咨询业务经理调整配送方式 ● 第二段营业时间需要在第一段营业时间之后 - ● 淘鲜达仅使用营业时间一 + diff --git a/src/subPages/orderChild/getPhone/getPhone.vue b/src/subPages/orderChild/getPhone/getPhone.vue index 3eca641..d07952a 100644 --- a/src/subPages/orderChild/getPhone/getPhone.vue +++ b/src/subPages/orderChild/getPhone/getPhone.vue @@ -39,7 +39,7 @@ const phoneList = ref>([ mobild: phoneData.operatorPhone2, }, { - icon: 'https://image.jxc4.com/image/8ac4b05dfef6b18639489d32cd421551.png', + 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 ca197a5..ad113f0 100644 --- a/src/utils/bluetoothPrinter/printerTemplate.ts +++ b/src/utils/bluetoothPrinter/printerTemplate.ts @@ -607,8 +607,8 @@ function vendorID2(vendorID: number) { return '微盟' case 14: return '抖音小时购' - case 16: - return '淘鲜达' + // case 16: + // return '淘鲜达' default: return '未知平台' } diff --git a/src/utils/configCms.ts b/src/utils/configCms.ts index 3198e4f..5c94e8b 100644 --- a/src/utils/configCms.ts +++ b/src/utils/configCms.ts @@ -482,7 +482,7 @@ export default { "11": "微盟微商城", "12": "国美", "14": "抖店平台", - "16": "淘鲜达", + // "16": "淘鲜达", "101": "达达众包", "102": "美团配送", "103": "蜂鸟配送",