From fc2fc8bb1707e42374c4994a82c09eb0f32af123 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 26 Jun 2023 15:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E6=88=90?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BB=B4=E5=BA=A6=EF=BC=88renew=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=9C=89=E4=BC=A0mallId=EF=BC=8C=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E5=85=88=E6=9A=82=E5=AD=98=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=AE=8C?= =?UTF-8?q?=E5=90=8E=E4=BC=9A=E6=B3=A8=E9=87=8A=E6=8E=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/order.js | 4 + libs/util.js | 4 +- order/addCourse/addCourse.vue | 214 ++++++++++++++++++---------- order/editCourse/editCourse.vue | 124 +++++++---------- order/orderDetail/orderDetail.vue | 222 +++++++++++++++++++----------- 5 files changed, 336 insertions(+), 232 deletions(-) diff --git a/apis/modules/order.js b/apis/modules/order.js index 7327a0a..f997b54 100644 --- a/apis/modules/order.js +++ b/apis/modules/order.js @@ -47,4 +47,8 @@ export const publicConfiguration = (data) => { export const bulkShipping = (data) => { return post('nakadai/nakadai/orderOther/bulkShipping', data) +} + +export const queryCitySettlementPrice = (mallId, provinceId, cityId) => { + return post(`nakadai/mallPrice/queryCitySettlementPrice?mallId=${mallId}&provinceId=${provinceId}&cityId=${cityId}`) } \ No newline at end of file diff --git a/libs/util.js b/libs/util.js index 82b2221..01b8b19 100644 --- a/libs/util.js +++ b/libs/util.js @@ -67,9 +67,9 @@ export default { getBmName(val) { return uni.getStorageSync('team').partnerClassificationName }, - // 返回图标。如果有图标,则直接返回,否则判断是否是数据产品,即productType=2,如果是,则取数据图标,否则则显示通用图标,这两个图标都在config/product.js里有配置 + // 返回图标。如果有图标,则直接返回 getIcon(e) { - return e.miniProgramPictureAddress || (e.productType === 2 ? Product.dataIcon : Product.normalIcon) + return e.appletIcon || Product.normalIcon }, // 预览文档 openFile(id) { diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue index 31959a4..ed3fb07 100644 --- a/order/addCourse/addCourse.vue +++ b/order/addCourse/addCourse.vue @@ -4,8 +4,14 @@ -