From 87707a8cc88c79027485b7df7c6dae7a3f23632f Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 26 Mar 2025 11:13:52 +0800 Subject: [PATCH 01/66] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.env b/.env index bc55261..1815838 100644 --- a/.env +++ b/.env @@ -24,9 +24,11 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +VITE_IMAGE_BASE_PATH = http://stgl.pj.gov.cn/api # 信创线上域名 # ******************** start 开发环境 start ******************** VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 +VITE_APP_DEV_SERVICE = http://stgl.pj.gov.cn/api # 信创线上域名 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api # VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 @@ -41,6 +43,7 @@ VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 # VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +VITE_APP_PROD_SERVICE = http://stgl.pj.gov.cn/api # 信创线上域名 # ******************** end 生产环境 end ******************** # VITE_DEV_ENV = dev From 62a90c100a0317661b80b156dd66ffbf79c9a95c Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 26 Mar 2025 14:35:07 +0800 Subject: [PATCH 02/66] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 13 +++++-------- src/pages.json | 1 - src/pages/merchant/food.vue | 2 +- src/pages/pay/scanPay.vue | 35 +++++++++++++++++++++++++++-------- src/pages/tabbar/my.vue | 2 +- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/.env b/.env index 258cc9e..f0a2ee4 100644 --- a/.env +++ b/.env @@ -21,13 +21,13 @@ VITE_OAUTH2_APP_CLIENT='mini:mini' # VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = https://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://220.191.229.171:8090/api # 线上 -VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 #VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 +VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 域名线上 -# ******************** start 开发环境 start ******************** +# ******************** start 开发环境 start **************** #VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api +VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 # VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上 @@ -38,10 +38,7 @@ VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 线上 # ******************** start 生产环境 start **************** #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api -VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api +VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api # 域名线上 # VITE_APP_PROD_SERVICE = http://220.191.229.171:8090/api #VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 -# ******************** end 生产环境 end ******************** - -# VITE_DEV_ENV = dev - VITE_DEV_ENV = prod +# ******************** end 生产环境 end ******************** \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 277aa80..76e0a93 100644 --- a/src/pages.json +++ b/src/pages.json @@ -342,7 +342,6 @@ "iconPath": "", "selectedIconPath": "" } - // { // "pagePath": "pages/tabbar/canteen", // "text": "食堂", diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue index 00cd8fa..a79c3cf 100644 --- a/src/pages/merchant/food.vue +++ b/src/pages/merchant/food.vue @@ -139,7 +139,7 @@ const doProduct = (v: any) => { :gutter="10" :breakpoints="{ 1200: { rowPerView: 4 }, - 800: { rowPerView: 3 }, + 900: { rowPerView: 3 }, 375: { rowPerView: 2 }, }" :hasAroundGutter="false" diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index 19ee234..bf9540c 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -67,6 +67,22 @@ + + + + 共  + {{ Number(amount).toFixed(2) }} +  元 + + @@ -86,6 +102,7 @@ const keyboardLayout = ref([ ]) const scanData = ref<{ id?: string; name?: string }>({}) const disabled = ref(false) +const show = ref(false) onShow(() => { scanData.value = usePayStore().payData @@ -160,16 +177,18 @@ const pay = async () => { if (res.code != 0) { throw new Error() } - - uni.showToast({ title: "支付成功", icon: "success" }) - usePayStore().payData = {} - setTimeout(() => { - router.back() - uni.hideLoading() - }, 1000) + show.value = true + uni.hideLoading() } catch (error: any) { - // uni.showToast({ title: "错误", icon: "error" }) + uni.showToast({ title: "错误", icon: "error" }) uni.hideLoading() } } + +// 支付确认 +const payConfirm = () => { + usePayStore().payData = {} + show.value = false + router.back() +} diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index a1aefd8..48c4c2d 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -178,7 +178,7 @@ const doScanCode = async () => { try { let decodedString: string | undefined = "" if (isDevEnv()) { - decodedString = decodeBase64("eyJpZCI6IjE4ODk0ODM5Mzg0ODQ1MzEyMDEiLCJuYW1lIjoi5rWL6K+V6LaF5biCIn0=") + decodedString = decodeBase64("eyJpZCI6IjE5MDQ3MDUzMDEwNTQ2NzY5OTMiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=") uni.showToast({ title: "开发环境不是浙政钉环境，扫码仅供测试", icon: "none" }) } else { const res: any = await (window as any).dd.scan({ type: "all" }) From 8015c7bf57824068ec9006f4bff167fa1bd5dbae Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 26 Mar 2025 14:52:32 +0800 Subject: [PATCH 03/66] 1 --- src/pages/merchant/food.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/merchant/food.vue b/src/pages/merchant/food.vue index a79c3cf..913eacb 100644 --- a/src/pages/merchant/food.vue +++ b/src/pages/merchant/food.vue @@ -138,8 +138,8 @@ const doProduct = (v: any) => { :list="foodList" :gutter="10" :breakpoints="{ - 1200: { rowPerView: 4 }, - 900: { rowPerView: 3 }, + 1600: { rowPerView: 4 }, + 1200: { rowPerView: 3 }, 375: { rowPerView: 2 }, }" :hasAroundGutter="false" From 56bf1d15a5439ffa16140455cb0113270eddaf30 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 26 Mar 2025 16:33:32 +0800 Subject: [PATCH 04/66] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 7 ++++ src/pages/pay/payComplete.vue | 70 +++++++++++++++++++++++++++++++++++ src/pages/pay/scanPay.vue | 27 +------------- src/sheep/stores/pay.ts | 2 +- 4 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 src/pages/pay/payComplete.vue diff --git a/src/pages.json b/src/pages.json index 76e0a93..23690ce 100644 --- a/src/pages.json +++ b/src/pages.json @@ -287,6 +287,13 @@ "navigationBarTitleText": "支付", "disableScroll": true } + }, + { + "path": "payComplete", + "style": { + "navigationBarTitleText": "支付完成", + "disableScroll": true + } } ] } diff --git a/src/pages/pay/payComplete.vue b/src/pages/pay/payComplete.vue new file mode 100644 index 0000000..ff44af4 --- /dev/null +++ b/src/pages/pay/payComplete.vue @@ -0,0 +1,70 @@ + + + diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index bf9540c..0055bfb 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -67,22 +67,6 @@ - - - - 共  - {{ Number(amount).toFixed(2) }} -  元 - - @@ -102,7 +86,6 @@ const keyboardLayout = ref([ ]) const scanData = ref<{ id?: string; name?: string }>({}) const disabled = ref(false) -const show = ref(false) onShow(() => { scanData.value = usePayStore().payData @@ -177,18 +160,12 @@ const pay = async () => { if (res.code != 0) { throw new Error() } - show.value = true uni.hideLoading() + usePayStore().setPayData({ ...scanData.value, customPrice: Number(amount.value).toFixed(2) }) + router.jump("/pages/pay/payComplete", {}, 2) } catch (error: any) { uni.showToast({ title: "错误", icon: "error" }) uni.hideLoading() } } - -// 支付确认 -const payConfirm = () => { - usePayStore().payData = {} - show.value = false - router.back() -} diff --git a/src/sheep/stores/pay.ts b/src/sheep/stores/pay.ts index c644023..5b4937c 100644 --- a/src/sheep/stores/pay.ts +++ b/src/sheep/stores/pay.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia" export const usePayStore = defineStore("pay", { - state: (): { payData: { id?: string; name?: string } } => { + state: (): { payData: { id?: string; name?: string; customPrice?: number } } => { return { payData: {}, } From d60ff2fbcca85e11f249f0f3886e66fb78c0a3df Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 26 Mar 2025 16:55:39 +0800 Subject: [PATCH 05/66] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pay/payComplete.vue | 78 ++++++++++++++++------------------- src/pages/tabbar/my.vue | 2 +- src/sheep/utils/request.ts | 4 +- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/src/pages/pay/payComplete.vue b/src/pages/pay/payComplete.vue index ff44af4..2a720e8 100644 --- a/src/pages/pay/payComplete.vue +++ b/src/pages/pay/payComplete.vue @@ -1,52 +1,46 @@ diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 48c4c2d..214d977 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -179,7 +179,7 @@ const doScanCode = async () => { let decodedString: string | undefined = "" if (isDevEnv()) { decodedString = decodeBase64("eyJpZCI6IjE5MDQ3MDUzMDEwNTQ2NzY5OTMiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=") - uni.showToast({ title: "开发环境不是浙政钉环境，扫码仅供测试", icon: "none" }) + uni.showToast({ title: "开发环境不是浙政钉环境，扫码仅供测试，收款商家为新县府超市", icon: "none" }) } else { const res: any = await (window as any).dd.scan({ type: "all" }) decodedString = decodeBase64(res.text) diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts index bba1f5c..c4abbe6 100644 --- a/src/sheep/utils/request.ts +++ b/src/sheep/utils/request.ts @@ -61,7 +61,7 @@ const checkAndRefreshToken = async (tokenStorage: any) => { if (!accessToken) return const expiresDate = new Date(accessToken.expiresAt).getTime() - console.log("现在的时间大于过期时间吗：", new Date().getTime() >= expiresDate) + // console.log("现在的时间大于过期时间吗：", new Date().getTime() >= expiresDate) if (new Date().getTime() >= expiresDate) { // try { @@ -193,7 +193,7 @@ const handleErrorResponse = (response: any) => { setTimeout(() => { uni.removeStorageSync(TOKEN_KEY) uni.removeStorageSync(USER_INFO_KEY) - console.log("未授权") + // console.log("未授权") }, 500) break case 424: From d51a9d6111e589c10a84affa935ff8927aad3ee8 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 27 Mar 2025 20:44:22 +0800 Subject: [PATCH 06/66] =?UTF-8?q?=E8=B6=85=E5=B8=82=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=20=E7=94=B5=E8=AF=9D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/pages/merchant/detail.vue | 3 +- src/pages/merchant/food.vue | 6 +-- src/pages/shop/detail.vue | 62 +++++++++++++++++++++++------ src/pages/tabbar/coopShop.vue | 73 +++++++++++++++++++++++++---------- src/pages/tabbar/shop.vue | 73 +++++++++++++++++++++++++---------- 6 files changed, 160 insertions(+), 58 deletions(-) diff --git a/src/App.vue b/src/App.vue index dde7a33..78bd20c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -65,6 +65,7 @@ export default { methods: { _initTabbar() { console.log("环境判断") + console.log(uni.getLaunchOptionsSync()) let appEnv = 1 // 1:浙政钉 2:诗画 diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue index 9523232..f1df8c2 100644 --- a/src/pages/merchant/detail.vue +++ b/src/pages/merchant/detail.vue @@ -287,8 +287,9 @@ const doFood = () => { - + + { :list="foodList" :gutter="10" :breakpoints="{ - 1600: { rowPerView: 4 }, - 1200: { rowPerView: 3 }, - 375: { rowPerView: 2 }, + 1800: { rowPerView: 4 }, + 1400: { rowPerView: 3 }, + 975: { rowPerView: 2 }, }" :hasAroundGutter="false" backgroundColor="#ffffff00" diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 7ccdddc..eabee3c 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -13,22 +13,56 @@ - + - {{ state.detail.name }} + {{ state.detail.name }} {{ state.detail.deptName }} - {{ state.detail.phone }} - - 营业时间： + + + + + {{ state.detail.phone }} + + + {{ state.detail.jobTime == ",," ? "" : "营业时间：" }} {{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }} {{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }} {{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }} - - 地址 + + + + + 地址: {{ state.detail.addressDes }} @@ -37,11 +71,14 @@ - - - + - + + 暂无信息 diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue index a5459c2..dd72892 100644 --- a/src/pages/tabbar/coopShop.vue +++ b/src/pages/tabbar/coopShop.vue @@ -23,11 +23,10 @@ onLoad(() => { app._initTabbar() }) onShow(() => { - pageRef.value && pageRef.value.reload(false) + // pageRef.value && pageRef.value.reload(false) }) const toDetail = async (v: any) => { - return const isLogin = await hooks.useCheckLogin() if (isLogin) { router.jump("/pages/shop/detail", { id: v.id }) @@ -52,25 +51,57 @@ const toDetail = async (v: any) => { @scroll="pageHook.scroll" > - - - - - - {{ v.name }} - {{ v.deptName }} - - {{ v.phone }} - - 营业时间： - {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} - {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} - {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} - - - 地址 - {{ v.addressDes }} - + + + + + {{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }} + {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} + + + + + + {{ v.phone }} + + + 营业时间： + {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} + {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} + {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} + + + + + + 地址: + {{ v.addressDes }} diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index 86d2b2c..00c55fe 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -23,11 +23,10 @@ onLoad(() => { app._initTabbar() }) onShow(() => { - pageRef.value && pageRef.value.reload(false) + // pageRef.value && pageRef.value.reload(false) }) const toDetail = async (v: any) => { - return const isLogin = await hooks.useCheckLogin() if (isLogin) { router.jump("/pages/shop/detail", { id: v.id }) @@ -52,25 +51,57 @@ const toDetail = async (v: any) => { @scroll="pageHook.scroll" > - - - - - - {{ v.name }} - {{ v.deptName }} - - {{ v.phone }} - - 营业时间： - {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} - {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} - {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} - - - 地址 - {{ v.addressDes }} - + + + + + {{ v.name }} + {{ v.deptName }} + + + + + + {{ v.phone }} + + + {{ v.jobTime == ",," ? "" : "营业时间：" }} + {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} + {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} + {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} + + + + + + 地址: + {{ v.addressDes }} From f0a04ecc27328d984f53ea78512a13876ab1bf3f Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 27 Mar 2025 21:07:10 +0800 Subject: [PATCH 07/66] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/detail.vue | 97 ++++++++++++++++++----------------- src/pages/tabbar/coopShop.vue | 90 ++++++++++++++++---------------- src/pages/tabbar/shop.vue | 90 ++++++++++++++++---------------- 3 files changed, 141 insertions(+), 136 deletions(-) diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index eabee3c..737fa5c 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -20,50 +20,52 @@ {{ state.detail.name }} {{ state.detail.deptName }} - - - - - {{ state.detail.phone }} - - - {{ state.detail.jobTime == ",," ? "" : "营业时间：" }} - {{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }} - {{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }} - {{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }} - - - - - - 地址: - {{ state.detail.addressDes }} + + + + + + {{ state.detail.phone }} + + + {{ state.detail.jobTime == ",," ? "" : "营业时间：" }} + {{ state.detail.jobTime?.split(",")[0] ? "早：" + state.detail.jobTime?.split(",")[0] : "" }} + {{ state.detail.jobTime?.split(",")[1] ? "中：" + state.detail.jobTime?.split(",")[1] : "" }} + {{ state.detail.jobTime?.split(",")[2] ? "晚：" + state.detail.jobTime?.split(",")[2] : "" }} + + + + + + 地址: + {{ state.detail.addressDes }} + @@ -107,7 +109,6 @@ /> - 暂无信息 @@ -137,7 +138,7 @@ import { reactive, nextTick, ref } from "vue" import { onLoad, onShow } from "@dcloudio/uni-app" import { isEmpty } from "radash" -import { hooks, router } from "@@/index" +import { router } from "@@/index" import { foodApi, merchantApi, payApi, shopApi } from "@@/api" import zSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue" import zSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue" @@ -178,8 +179,8 @@ onShow(async () => { }) try { await getDetail() - await getShopCar() - await getClassify() + // await getShopCar() + // await getClassify() } catch (error) { uni.showToast({ title: "加载失败", diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue index dd72892..4bf3356 100644 --- a/src/pages/tabbar/coopShop.vue +++ b/src/pages/tabbar/coopShop.vue @@ -58,50 +58,52 @@ const toDetail = async (v: any) => { {{ v.name.length > 7 ? v.name.substring(0, 7) + "..." : v.name }} {{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }} - - - - - {{ v.phone }} - - - 营业时间： - {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} - {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} - {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} - - - - - - 地址: - {{ v.addressDes }} + + + + + + {{ v.phone }} + + + 营业时间： + {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} + {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} + {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} + + + + + + 地址: + {{ v.addressDes }} + diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index 00c55fe..cbca6ab 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -58,50 +58,52 @@ const toDetail = async (v: any) => { {{ v.name }} {{ v.deptName }} - - - - - {{ v.phone }} - - - {{ v.jobTime == ",," ? "" : "营业时间：" }} - {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} - {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} - {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} - - - - - - 地址: - {{ v.addressDes }} + + + + + + {{ v.phone }} + + + {{ v.jobTime == ",," ? "" : "营业时间：" }} + {{ v.jobTime?.split(",")[0] ? "早：" + v.jobTime?.split(",")[0] : "" }} + {{ v.jobTime?.split(",")[1] ? "中：" + v.jobTime?.split(",")[1] : "" }} + {{ v.jobTime?.split(",")[2] ? "晚：" + v.jobTime?.split(",")[2] : "" }} + + + + + + 地址: + {{ v.addressDes }} + From cd61d385bb1f369d7ce15032a7d547d22c770f3f Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 28 Mar 2025 09:20:40 +0800 Subject: [PATCH 08/66] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/shop/detail.vue | 10 +++++++--- src/pages/tabbar/coopShop.vue | 2 +- src/pages/tabbar/shop.vue | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 737fa5c..dfd5ec6 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -17,8 +17,12 @@ - {{ state.detail.name }} - {{ state.detail.deptName }} + + {{ state.detail.name.length > 7 ? state.detail.name.substring(0, 7) + "..." : state.detail.name }} + + + {{ state.detail.deptName.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }} + @@ -38,7 +42,7 @@ p-id="2685" > - {{ state.detail.phone }} + {{ state.detail.phone }} {{ state.detail.jobTime == ",," ? "" : "营业时间：" }} diff --git a/src/pages/tabbar/coopShop.vue b/src/pages/tabbar/coopShop.vue index 4bf3356..7439278 100644 --- a/src/pages/tabbar/coopShop.vue +++ b/src/pages/tabbar/coopShop.vue @@ -76,7 +76,7 @@ const toDetail = async (v: any) => { p-id="2685" > - {{ v.phone }} + {{ v.phone }} 营业时间： diff --git a/src/pages/tabbar/shop.vue b/src/pages/tabbar/shop.vue index cbca6ab..8c9c03e 100644 --- a/src/pages/tabbar/shop.vue +++ b/src/pages/tabbar/shop.vue @@ -76,7 +76,7 @@ const toDetail = async (v: any) => { p-id="2685" > - {{ v.phone }} + {{ v.phone }} {{ v.jobTime == ",," ? "" : "营业时间：" }} From f8481ffbe460c7e793ed55d9ecf739f8d449bcf4 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 28 Mar 2025 09:37:20 +0800 Subject: [PATCH 09/66] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=BE=97=E5=95=86=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/pay/scanPay.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index 0055bfb..2ff1389 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -1,7 +1,7 @@