From 937730558ce4a861499597a0f22ed806c8656d09 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 14 Aug 2024 18:01:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=92=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/purchase_product_offer.js | 5 + config/app.js | 4 +- pageQuota/purchase_product_offer/index.vue | 210 +++++++++++++++++++++ pages.json | 7 + pages/my/my.vue | 2 +- pagesOrder/settle/settle.vue | 16 +- 6 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 api/purchase_product_offer.js create mode 100644 pageQuota/purchase_product_offer/index.vue diff --git a/api/purchase_product_offer.js b/api/purchase_product_offer.js new file mode 100644 index 0000000..83e8260 --- /dev/null +++ b/api/purchase_product_offer.js @@ -0,0 +1,5 @@ +import request from '@/utils/request'; + +export const purchaseProductOfferLists = (data) => { + return request.get('/purchase_product_offer/purchaseproductoffer/lists', data); +} \ No newline at end of file diff --git a/config/app.js b/config/app.js index f1f7802..5657b7c 100644 --- a/config/app.js +++ b/config/app.js @@ -3,9 +3,9 @@ let WSS_URL import store from "@/store/user.js" // 环境 // let env = "dev" -let env = "prod" +// let env = "prod" // let env = "release"; -// let env = "local"; +let env = "local"; switch (env) { case 'dev': diff --git a/pageQuota/purchase_product_offer/index.vue b/pageQuota/purchase_product_offer/index.vue new file mode 100644 index 0000000..30b3c4a --- /dev/null +++ b/pageQuota/purchase_product_offer/index.vue @@ -0,0 +1,210 @@ + + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 5c4b519..e9e6a40 100644 --- a/pages.json +++ b/pages.json @@ -306,6 +306,13 @@ "navigationBarTitleText": "余额明细", "enablePullDownRefresh": true } + }, + { + "path" : "purchase_product_offer/index", + "style" : + { + "navigationBarTitleText" : "采购商品列表" + } } ] } diff --git a/pages/my/my.vue b/pages/my/my.vue index 16cc26c..8289072 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -124,7 +124,7 @@ - + diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue index b1f8337..6c4e350 100644 --- a/pagesOrder/settle/settle.vue +++ b/pagesOrder/settle/settle.vue @@ -92,7 +92,7 @@ ¥{{ c_price(orderInfo.pay_price, 0) }}.{{ c_price(orderInfo.pay_price, 1) }} - + @@ -101,15 +101,21 @@ 优惠减免 - + ¥{{ c_price(orderInfo.frozen_money, 0) }}.{{ c_price(orderInfo.frozen_money, 1) }} + + + 优惠返还 - + ¥{{ c_price(orderInfo.activity_price, 0) }}.{{ c_price(orderInfo.activity_price, 1) }} + + + @@ -260,10 +266,10 @@ const userInfo = useUserStore().userInfo; const shop_Info = ref({}) - + // 用户选择的门店信息 let STORE_INFO = uni.getStorageSync('STORE_INFO'); - if (STORE_INFO){ + if (STORE_INFO) { shop_Info.value = JSON.parse(STORE_INFO) }