From 1e318c5065c27d49a7df6c59be0d8b23df630b02 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 28 Mar 2025 13:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=95=86=E5=AE=B6=E6=89=93?= =?UTF-8?q?=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 155 +++++++++++----------- src/pages/apply/foreign-items.vue | 99 ++++++++------ src/pages/apply/foreign-list.vue | 210 +++++++++++++++--------------- src/pages/apply/stride-items.vue | 93 +++++++------ src/pages/apply/stride-list.vue | 192 ++++++++++++++------------- src/pages/boxes/apply-list.vue | 191 ++++++++++++++------------- src/pages/shop/detail.vue | 14 +- src/pages/tabbar/my.vue | 4 +- src/pages/tabbar/order.vue | 2 +- src/pages/wallet/detail.vue | 8 +- 10 files changed, 507 insertions(+), 461 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index a8005d5..028cf07 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,79 +1,80 @@ { - "name" : "", - "appid" : "", - "description" : "浦江县机关事务智慧后勤一体化平台", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "3", - "h5" : { - "router" : { - "base" : "/h5/", - "mode" : "hash" - }, - "title" : "浦江县机关事务智慧后勤一体化平台" - } + "name": "", + "appid": "", + "description": "浦江县机关事务智慧后勤一体化平台", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": {} + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false + }, + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3", + "h5": { + "router": { + "base": "/h5/", + "mode": "hash" + }, + "title": "浦江县机关事务智慧后勤一体化平台" + } } diff --git a/src/pages/apply/foreign-items.vue b/src/pages/apply/foreign-items.vue index b290b83..21f9ee6 100644 --- a/src/pages/apply/foreign-items.vue +++ b/src/pages/apply/foreign-items.vue @@ -1,7 +1,7 @@ - - \ No newline at end of file + diff --git a/src/pages/apply/foreign-list.vue b/src/pages/apply/foreign-list.vue index a35d7f8..55559f0 100644 --- a/src/pages/apply/foreign-list.vue +++ b/src/pages/apply/foreign-list.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/pages/apply/stride-items.vue b/src/pages/apply/stride-items.vue index 98f2dcc..1949161 100644 --- a/src/pages/apply/stride-items.vue +++ b/src/pages/apply/stride-items.vue @@ -1,60 +1,71 @@ - - \ No newline at end of file + diff --git a/src/pages/apply/stride-list.vue b/src/pages/apply/stride-list.vue index 1422acc..4039bc9 100644 --- a/src/pages/apply/stride-list.vue +++ b/src/pages/apply/stride-list.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/pages/boxes/apply-list.vue b/src/pages/boxes/apply-list.vue index 4747812..157f7f7 100644 --- a/src/pages/boxes/apply-list.vue +++ b/src/pages/boxes/apply-list.vue @@ -1,6 +1,6 @@ - diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index dfd5ec6..e133347 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -43,6 +43,9 @@ > {{ state.detail.phone }} + + 联系商家 + {{ state.detail.jobTime == ",," ? "" : "营业时间:" }} @@ -142,7 +145,7 @@ import { reactive, nextTick, ref } from "vue" import { onLoad, onShow } from "@dcloudio/uni-app" import { isEmpty } from "radash" -import { router } from "@@/index" +import { hooks, 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" @@ -260,6 +263,15 @@ const doClassify = async (i: any) => { await getPorduct() } +// 联系商家 +const doPhone = () => { + if (isEmpty(state.detail.phone)) { + uni.showToast({ title: "该商户没有预留电话", icon: "none" }) + return + } + hooks.useMakePhoneCall(state.detail.phone) +} + const getHeight = () => { const rpx = 480 return `calc(100vh - ${uni.upx2px(rpx)}px)` diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 214d977..ce6685a 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -178,8 +178,8 @@ const doScanCode = async () => { try { let decodedString: string | undefined = "" if (isDevEnv()) { - decodedString = decodeBase64("eyJpZCI6IjE5MDQ3MDUzMDEwNTQ2NzY5OTMiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=") - uni.showToast({ title: "开发环境不是浙政钉环境,扫码仅供测试,收款商家为新县府超市", icon: "none" }) + decodedString = decodeBase64("eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=") + 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/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index 4443598..f26f7c8 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -69,7 +69,7 @@ const doRefund = (v: any) => { height="100%" :fixed="false" v-model="pageHook.list" - :default-page-size="5" + :default-page-size="10" safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" diff --git a/src/pages/wallet/detail.vue b/src/pages/wallet/detail.vue index 5033e4e..ce5c934 100644 --- a/src/pages/wallet/detail.vue +++ b/src/pages/wallet/detail.vue @@ -49,7 +49,7 @@ const doTab = (e: any) => { height="100%" :fixed="false" v-model="pageHook.list" - :default-page-size="5" + :default-page-size="10" safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @@ -63,11 +63,7 @@ const doTab = (e: any) => { - + {{ v.title }}