diff --git a/src/api/https/merchant.ts b/src/api/https/merchant.ts index d4a04ff..992791d 100644 --- a/src/api/https/merchant.ts +++ b/src/api/https/merchant.ts @@ -47,7 +47,7 @@ const merchant = { * @param {object} params 请求参数 storeID int 门店ID vendorID int 厂商ID */ update_store_vendor_map: async (params: AnyObject): Promise => { - return await request.api('v2/store/UpdateStoreVendorMap','PUT',params) + return await request.api('/v2/store/UpdateStoreVendorMap','PUT',params) }, 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 af1096d..78be04f 100644 --- a/src/pages/goods-manager/childPages/right-main/right-main.vue +++ b/src/pages/goods-manager/childPages/right-main/right-main.vue @@ -71,8 +71,7 @@ (sku.mtwmSyncStatus & 2) !== 2 && (sku.mtwmSyncStatus & 4) !== 4 " - >美团:该商品无法修改价格,请联系运营修改 + >美团:该商品无法修改价格,请联系运营修改 若退款造成的损失较大,建议联系顾客,自行上门取回退货。 - 驳回 - 同意 + 驳回 + 同意 @@ -74,7 +74,7 @@ - 查看详情 + 查看详情 diff --git a/src/pages/order-manager/childPages/component/orderListTop.vue b/src/pages/order-manager/childPages/component/orderListTop.vue index b724dbc..af01083 100644 --- a/src/pages/order-manager/childPages/component/orderListTop.vue +++ b/src/pages/order-manager/childPages/component/orderListTop.vue @@ -223,7 +223,7 @@ const cancelTime = ref() const timer = ref() onShow(() => { if (props.item.lockStatus === -5) { - let { purchaseVendorInfo } = store.state.serveInfo.sysInfo as any + let { purchaseVendorInfo } = store.state.serveInfo.serviceInfo as any let { userApplyCancelWaitMinute } = purchaseVendorInfo[props.item.vendorID] let cancelTime1 = new Date(props.item.lockStatusTime).getTime() + diff --git a/src/pages/order-manager/childPages/pending-distribution/pending-distribution.vue b/src/pages/order-manager/childPages/pending-distribution/pending-distribution.vue index af6415b..d415f4f 100644 --- a/src/pages/order-manager/childPages/pending-distribution/pending-distribution.vue +++ b/src/pages/order-manager/childPages/pending-distribution/pending-distribution.vue @@ -35,9 +35,7 @@ - [自提订单] + [自提订单] @@ -60,7 +58,10 @@ > - +