From b06b6a0974783515e00b11a6131d9ce2a4881d05 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Sun, 12 Jan 2025 22:19:30 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=9B=9E=E6=98=BE=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=B6=85?= =?UTF-8?q?=E5=B8=82=E8=AF=A6=E6=83=85=E8=BD=AE=E6=92=AD=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/merchant/components/product-row.vue | 156 +++++---- src/pages/shop/components/product-car.vue | 5 +- src/pages/shop/components/product-row.vue | 5 + src/pages/shop/detail.vue | 6 +- src/sheep/api/shop.ts | 130 ++++---- src/sheep/utils/request.ts | 305 +++++++++--------- 6 files changed, 300 insertions(+), 307 deletions(-) diff --git a/src/pages/merchant/components/product-row.vue b/src/pages/merchant/components/product-row.vue index dafd6ed..1ebeacc 100644 --- a/src/pages/merchant/components/product-row.vue +++ b/src/pages/merchant/components/product-row.vue @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/src/pages/shop/components/product-car.vue b/src/pages/shop/components/product-car.vue index 46dd417..847f001 100644 --- a/src/pages/shop/components/product-car.vue +++ b/src/pages/shop/components/product-car.vue @@ -14,10 +14,12 @@ :key="v.id" :productId="v.productId" :merchantId="v.merchantId" - :picUrl="v.productPic" + :picUrl="filePath(v.productPic)" :productName="v.productName" :productCount="v.productCount" :productPrice="v.productPrice" + :spec="v.spec" + :unit="v.unit" @add="(v) => emit('add', v)" @remove="(v) => emit('remove', v)" /> @@ -31,6 +33,7 @@ - - \ No newline at end of file + From 7b45cdfecd74c83be5b2c8469246a28b73361a89 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 13 Jan 2025 20:41:25 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/pages/merchant/components/product-row.vue | 156 +++++---- src/pages/merchant/detail.vue | 45 ++- src/pages/tabbar/my.vue | 299 +++++++++--------- src/sheep/api/food.ts | 112 ++++--- src/sheep/api/product.ts | 18 +- src/sheep/api/shop.ts | 105 +++--- 7 files changed, 374 insertions(+), 363 deletions(-) diff --git a/package.json b/package.json index d41bb0c..1d34db9 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "vite": "5.2.8", "vue-tsc": "^1.0.24" } -} +} \ No newline at end of file diff --git a/src/pages/merchant/components/product-row.vue b/src/pages/merchant/components/product-row.vue index dafd6ed..625d967 100644 --- a/src/pages/merchant/components/product-row.vue +++ b/src/pages/merchant/components/product-row.vue @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue index 683cc88..906b282 100644 --- a/src/pages/merchant/detail.vue +++ b/src/pages/merchant/detail.vue @@ -50,7 +50,13 @@ const getShopCar = async () => { const _pa = { merchantId: state.detailId, hardType: "CANTEEN" } const { data } = await foodApi.getShopCar(_pa) state.carList = data ?? [] - asyncCarCount(state.shopList) + if (isEmpty(state.carList)) { + state.shopList.forEach((v: any) => { + v.productCount = 0 + }) + } else { + asyncCarCount(state.shopList) + } state.totPrice = state.carList.map((v) => Number(v.totalPrice)).reduce((pre, next) => pre + next, 0) state.totCount = state.carList.map((v) => v.productCount).reduce((pre, next) => pre + next, 0) } @@ -110,22 +116,39 @@ const asyncCarCount = (shopList) => { } const doAdd = async (item: any) => { - chentProductCount(item) + chentProductCount(item, "add") } const remove = async (item: any) => { - chentProductCount(item) + chentProductCount(item, "remove") } -const chentProductCount = async (item: any) => { - const target = state.carList.find((v) => v.productId == item.productId) - const targetIndex = state.carList.findIndex((v) => v.productId == item.productId) - if (target) { - state.carList[targetIndex].productCount = item.productCount - } else { - state.carList.push({ ...item, productId: item.id }) +const chentProductCount = async (item: any, type: "add" | "remove") => { + try { + uni.showLoading({ title: "加载中", mask: true }) + let count = item.productCount + if (type === "add") { + count += 1 + const { code }: any = await foodApi.checkSpuStock({ spuId: item.productId, incrCount: count }) + if (code != 0) throw new Error() + } else if (type === "remove") { + count -= 1 + } + const target = state.carList.find((v) => v.productId == item.productId) + const targetIndex = state.carList.findIndex((v) => v.productId == item.productId) + if (target) { + state.carList[targetIndex].productCount = count + } else { + state.carList.push({ ...item, productId: item.id, productCount: count }) + } + nextTick(async () => { + await updateShopCar() + }) + } catch (e) { + console.error(e) + } finally { + uni.hideLoading() } - nextTick(() => updateShopCar()) } const doClassify = (i: any) => { diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 5f8f6b3..86c1b1d 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -1,171 +1,184 @@ diff --git a/src/sheep/api/food.ts b/src/sheep/api/food.ts index 7c5ba07..e29256f 100644 --- a/src/sheep/api/food.ts +++ b/src/sheep/api/food.ts @@ -1,53 +1,63 @@ -import request from "@/sheep/utils/request"; +import request from "@/sheep/utils/request" export default { - page: (data: any) => - request({ - url: `/canteen/canteenDailyMenu/app/page`, - method: "POST", - data, - params:{ - pageNo: data.pageNo, - pagesize: data.pagesize - }, - custom: { - showLoading: false, - }, - }), - classify: (params: any) => - request({ - url: `/canteen/canteenOnlineCategory/app/getAllSimple`, - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - product: (params: any) => - request({ - url: `/canteen/canteenOnlineSpu/app/getCanteenSpuList`, - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - getShopCar: (params: any) => - request({ - url: `/hard/hard-car/app/mch-detail`, - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - updateShopCar: (data: any) => - request({ - url: `/hard/hard-car/app/save-or-upload`, - method: "POST", - data, - custom: { - showLoading: false, - }, - }), -}; + page: (data: any) => + request({ + url: `/canteen/canteenDailyMenu/app/page`, + method: "POST", + data, + params: { + pageNo: data.pageNo, + pagesize: data.pagesize, + }, + custom: { + showLoading: false, + }, + }), + classify: (params: any) => + request({ + url: `/canteen/canteenOnlineCategory/app/getAllSimple`, + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + product: (params: any) => + request({ + url: `/canteen/canteenOnlineSpu/app/getCanteenSpuList`, + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + getShopCar: (params: any) => + request({ + url: `/hard/hard-car/app/mch-detail`, + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + updateShopCar: (data: any) => + request({ + url: `/hard/hard-car/app/save-or-upload`, + method: "POST", + data, + custom: { + showLoading: false, + }, + }), + checkSpuStock: (params) => { + return request({ + url: "/canteen/canteenOnlineSpu/app/checkSpuStock", + method: "GET", + params, + custom: { + showLoading: false, + }, + }) + }, +} diff --git a/src/sheep/api/product.ts b/src/sheep/api/product.ts index 0e17b45..e653608 100644 --- a/src/sheep/api/product.ts +++ b/src/sheep/api/product.ts @@ -1,11 +1,11 @@ -import request from "@/sheep/utils/request"; +import request from "@/sheep/utils/request" export default { - get: (params) => { - return request({ - url: "/canteen/canteenOnlineSpu/app/getCanteenSpuDetails", - method: "GET", - params, - }); - }, -}; + get: (params) => { + return request({ + url: "/canteen/canteenOnlineSpu/app/getCanteenSpuDetails", + method: "GET", + params, + }) + }, +} diff --git a/src/sheep/api/shop.ts b/src/sheep/api/shop.ts index ce8be34..20f6be5 100644 --- a/src/sheep/api/shop.ts +++ b/src/sheep/api/shop.ts @@ -1,68 +1,41 @@ -import request from "@/sheep/utils/request"; +import request from "@/sheep/utils/request" export default { - getSupermarketSpuCategory: (params: any) => - request({ - url: `/supermarket/supermarketCategory/app/simpleAll`, - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - getSupermarketSpuList: (data: any) => - request({ - url: `/supermarket/supermarketSpu/app/selectListAll`, - method: "POST", - data, - custom: { - showLoading: false, - }, - }), - getSupermarketSpuDetail: (params: any) => - request({ - url: `/supermarket/supermarketSpu/app/SpuDetails`, - method: "GET", - params, - custom: { - showLoading: false, - }, - }), - - // del: (params: any) => - // request({ - // url: `/sys/user/face-delete`, - // method: "DELETE", - // params, - // custom: { - // showLoading: false, - // }, - // }), - // create: (data: any) => - // request({ - // url: `/sys/user/face-create`, - // method: "POST", - // data, - // custom: { - // showLoading: false, - // }, - // }), - // get: (params: any) => - // request({ - // url: `/sys/user/face-get`, - // method: "GET", - // params, - // custom: { - // showLoading: false, - // }, - // }), - // put: (data: any) => - // request({ - // url: `/sys/user/face-update`, - // method: "PUT", - // data, - // custom: { - // showLoading: false, - // }, - // }), -}; + getSupermarketSpuCategory: (params: any) => + request({ + url: `/supermarket/supermarketCategory/app/simpleAll`, + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + getSupermarketSpuList: (data: any) => + request({ + url: `/supermarket/supermarketSpu/app/selectListAll`, + method: "POST", + data, + custom: { + showLoading: false, + }, + }), + getSupermarketSpuDetail: (params: any) => + request({ + url: `/supermarket/supermarketSpu/app/SpuDetails`, + method: "GET", + params, + custom: { + showLoading: false, + }, + }), + checkSpuStock: (params) => { + return request({ + url: "/supermarket/supermarketSpu/app/checkSpuStock", + method: "GET", + params, + custom: { + showLoading: false, + }, + }) + }, +} From e5049a2bbb3499fcfcc616279b94869d9bfcff0a Mon Sep 17 00:00:00 2001 From: ctw <> Date: Mon, 13 Jan 2025 20:44:58 +0800 Subject: [PATCH 04/10] 1 --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 8656828..623b3a0 100644 --- a/.env +++ b/.env @@ -26,8 +26,8 @@ VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地 -#VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 -# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api +#VITE_APP_DEV_SERVICE = http://pjcloud.center.takin.cc # 张 +# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # 线上 # VITE_APP_DEV_SERVICE = http://localhost:9999 # ******************** end 开发环境 end ******************** From ee7f4a6903b481046f372ed9b599ace434ccd5ef Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 14 Jan 2025 10:31:25 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=BA=93=E5=AD=98=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/components/product-car.vue | 1 + src/pages/shop/components/product-row.vue | 8 +++- src/pages/shop/components/product-sku.vue | 33 +++++++++++++--- src/pages/shop/detail.vue | 47 ++++++++++++++++------- 4 files changed, 68 insertions(+), 21 deletions(-) diff --git a/src/pages/shop/components/product-car.vue b/src/pages/shop/components/product-car.vue index 847f001..d75f2fb 100644 --- a/src/pages/shop/components/product-car.vue +++ b/src/pages/shop/components/product-car.vue @@ -13,6 +13,7 @@ v-for="v in carList" :key="v.id" :productId="v.productId" + :spuId="v.spuId" :merchantId="v.merchantId" :picUrl="filePath(v.productPic)" :productName="v.productName" diff --git a/src/pages/shop/components/product-row.vue b/src/pages/shop/components/product-row.vue index a29f49d..17866d2 100644 --- a/src/pages/shop/components/product-row.vue +++ b/src/pages/shop/components/product-row.vue @@ -55,6 +55,7 @@ const emit = defineEmits(["onClickAddToCar", "add", "remove"]) export type Props = { mode?: "default" | "car" productId: string + spuId?: string merchantId: string picUrl: string productName: string @@ -69,6 +70,7 @@ export type Props = { const props = withDefaults(defineProps(), { mode: "default", productId: "", + spuId: "", merchantId: "", picUrl: "", productName: "", @@ -90,14 +92,16 @@ const add = () => { if (props.productCount + 1 >= 99) { return } - emit("add", { productId: props.productId, productCount: props.productCount + 1 }) + // emit("add", { productId: props.productId, productCount: props.productCount + 1 }) + emit("add", { productId: props.productId, productCount: props.productCount, spuId: props.spuId }) } const remove = () => { if (props.productCount - 1 < 0) { return } - emit("remove", { productId: props.productId, productCount: props.productCount - 1 }) + // emit("remove", { productId: props.productId, productCount: props.productCount - 1 }) + emit("remove", { productId: props.productId, productCount: props.productCount, spuId: props.spuId }) } diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue index db6885d..b990164 100644 --- a/src/pages/shop/components/product-sku.vue +++ b/src/pages/shop/components/product-sku.vue @@ -191,12 +191,14 @@ function onSelectSku(skuItem: any) { // changeDisabled(isChecked, propertyId, valueId); } +// 加数量 const handleNumAdd = () => { if (state.goodsCount >= state.goodsDetail.stock) { return } state.goodsCount += 1 } +// 减数量 const handleNumRemove = () => { if (state.goodsCount <= 1) { return @@ -205,18 +207,39 @@ const handleNumRemove = () => { } // 点击加入购物车 -const handleClickAddToCar = () => { - if (state.goodsDetail.stock === 0) { +const handleClickAddToCar = async () => { + // 检查规格选择 + if (!state.selectedSku.id) { uni.showToast({ - title: "库存不足", + title: "请选择规格", icon: "none", duration: 1000, }) return } - if (!state.selectedSku.id) { + // 检查库存 + try { + uni.showLoading({ title: "加载中", mask: true }) + const { code }: any = await shopApi.checkSpuStock({ + spuId: state.goodsDetail.id, + incrCount: state.goodsCount, + }) + if (code != 0) { + return uni.showToast({ + title: "库存不足", + icon: "none", + duration: 1000, + }) + } + } catch (e) { + console.error(e) + } finally { + uni.hideLoading() + } + // 检查库存 + if (state.goodsDetail.stock === 0) { uni.showToast({ - title: "请选择规格", + title: "库存不足", icon: "none", duration: 1000, }) diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index b715463..26ccaf9 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -237,19 +237,38 @@ const onAddToCar = (cartGoodsInfo: any) => { showSkuDialog.value = false } // 同步购物车中的数据 -const chentProductCount = async (item: any) => { - const target = state.carList.find((v) => v.productId == item.productId) - const targetIndex = state.carList.findIndex((v) => v.productId == item.productId) - if (target) { - state.carList[targetIndex].productCount = item.productCount - state.carList[targetIndex].productId = item.productId - console.log("1", state.carList[targetIndex]) - } else { - state.carList.push(item) - console.log("2", item) - } +const chentProductCount = async (item: any, type?: "add" | "remove") => { + try { + console.log("ccccccc", item) - nextTick(() => updateShopCar()) // 保存购物车数据 + uni.showLoading({ title: "加载中", mask: true }) + let count = item.productCount + if (type === "add") { + count += 1 + const { code }: any = await shopApi.checkSpuStock({ spuId: item.spuId, incrCount: count }) + if (code != 0) throw new Error() + } else if (type === "remove") { + count -= 1 + } + + const target = state.carList.find((v) => v.productId == item.productId) + const targetIndex = state.carList.findIndex((v) => v.productId == item.productId) + if (target) { + state.carList[targetIndex].productCount = count + state.carList[targetIndex].productId = item.productId + state.carList[targetIndex].spuId = item.spuId + console.log("1", state.carList[targetIndex]) + } else { + state.carList.push(item) + console.log("2", item) + } + + nextTick(async () => await updateShopCar()) // 保存购物车数据 + } catch (e) { + console.error(e) + } finally { + uni.hideLoading() + } } // 保存购物车数据 const updateShopCar = async () => { @@ -279,10 +298,10 @@ const doVisibleCar = async () => { } const doAdd = async (item: any) => { - chentProductCount(item) + chentProductCount(item, "add") } const doRemove = async (item: any) => { - chentProductCount(item) + chentProductCount(item, "remove") } // 点击提交订单 From 4259d9efe5287c21b6b0592022b8c11a824a23f1 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 14 Jan 2025 10:36:46 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=95=86=E5=93=81sku?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=AC=AC=E4=B8=80=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/components/product-sku.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/shop/components/product-sku.vue b/src/pages/shop/components/product-sku.vue index b990164..2b88015 100644 --- a/src/pages/shop/components/product-sku.vue +++ b/src/pages/shop/components/product-sku.vue @@ -110,6 +110,9 @@ watch( // 获取商品详情 const { data } = await shopApi.getSupermarketSpuDetail({ id: props.productData.productId }) state.goodsDetail = data + if (data.skuList.length > 0) { + state.selectedSku = state.goodsDetail.skuList[0] + } } }, ) From f29c64dc41ecc433ef674eb215e09de432bc68a1 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 14 Jan 2025 11:20:04 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B6=85=E5=B8=82=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/detail.vue | 7 +- src/pages/tabbar/shop.vue | 154 +++++++++++++++++++------------------- 2 files changed, 79 insertions(+), 82 deletions(-) diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 26ccaf9..b2a4f6e 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -14,7 +14,7 @@ - + @@ -24,6 +24,7 @@ {{ state.detail.deptName }} + {{ state.detail.phone }} 营业时间 @@ -32,8 +33,8 @@ {{ state.detail.jobEndTime }} - - 超市地址 + + 地址 {{ state.detail.addressDes }} diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index 7d06868..c4c6a44 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -1,94 +1,90 @@ From e5b78611323c5c5f0dbe74af0ab2e5890a4f71d0 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Tue, 14 Jan 2025 16:27:16 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/detail.vue | 3 +-- src/pages/tabbar/shop.vue | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index b2a4f6e..7979162 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -40,11 +40,10 @@ - - + diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index c4c6a44..ff1aebd 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -77,13 +77,6 @@ const toDetail = async (v: any) => { - - - 推荐理由： - - 实力评分，资历好，规模大。实力评分，资历好，规模大。实力评分，资历好，规模大。 - - From caa9b64e1e0e061bf3f2630fcee5fd7c14fb6603 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 15 Jan 2025 10:54:36 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:=E7=A1=AC=E4=BB=B6=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/tabbar/order.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index 314d4e4..a687daf 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -15,7 +15,7 @@ const data = { { id: 1, name: "未支付", disabled: false }, { id: 5, name: "待核销", disabled: false }, { id: 10, name: "售后", disabled: false }, - { id: 15, name: "已核销", disabled: false }, + { id: 20, name: "已核销", disabled: false }, ], } const state = reactive({ @@ -98,8 +98,8 @@ const doRefund = (v: any) => { 未支付 待核销 - 售后中 - 已核销 + 售后 + 已核销 From 03555091c6166bbf735a3b9231cc4992faf97b2e Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 15 Jan 2025 14:10:12 +0800 Subject: [PATCH 10/10] =?UTF-8?q?feat:=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wallet/apply-detail.vue | 30 ++-- src/pages/wallet/detail.vue | 117 ++++++++------- src/pages/wallet/list.vue | 13 +- src/pages/wallet/recharge.vue | 236 +++++++++++++++--------------- src/sheep/api/wallet.ts | 4 +- 5 files changed, 200 insertions(+), 200 deletions(-) diff --git a/src/pages/wallet/apply-detail.vue b/src/pages/wallet/apply-detail.vue index 1f8b76e..57a4924 100644 --- a/src/pages/wallet/apply-detail.vue +++ b/src/pages/wallet/apply-detail.vue @@ -1,33 +1,23 @@ - - \ No newline at end of file + diff --git a/src/pages/wallet/detail.vue b/src/pages/wallet/detail.vue index 4cdcbe0..5033e4e 100644 --- a/src/pages/wallet/detail.vue +++ b/src/pages/wallet/detail.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue index 5ae9644..76ce397 100644 --- a/src/pages/wallet/list.vue +++ b/src/pages/wallet/list.vue @@ -158,28 +158,25 @@ const doFreeze = async () => { - + {{ v.walletTypeName }} - 冻结审核中 - - 正常 - 已冻结 - + 正常 + 已冻结 ¥{{ hooks.useMoney(v.balance) }} - + 绑定 diff --git a/src/pages/wallet/recharge.vue b/src/pages/wallet/recharge.vue index 562ffa1..1b26eda 100644 --- a/src/pages/wallet/recharge.vue +++ b/src/pages/wallet/recharge.vue @@ -1,156 +1,158 @@ - \ No newline at end of file + diff --git a/src/sheep/api/wallet.ts b/src/sheep/api/wallet.ts index 0754360..d1c6340 100644 --- a/src/sheep/api/wallet.ts +++ b/src/sheep/api/wallet.ts @@ -29,7 +29,7 @@ export default { }), bind: (data: any) => request({ - url: "pay/wallet/bind-card", + url: "wallet/wallet-active/app/bind-card", method: "POST", data, custom: { @@ -38,7 +38,7 @@ export default { }), freeze: (data: any) => request({ - url: "pay/wallet/apply-freeze", + url: "wallet/wallet-freeze/app/apply-freeze", method: "POST", data, custom: {