diff --git a/.env b/.env index e41bf99..b162418 100644 --- a/.env +++ b/.env @@ -17,23 +17,22 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 -VITE_IMAGE_BASE_PATH = http://localhost:9999 -# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 -# VITE_IMAGE_BASE_PATH = http://192.168.101.37:9999 # 邓-本地 +#VITE_IMAGE_BASE_PATH = http://localhost:9999 +# 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 = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** -; VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上 -VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/api -# VITE_APP_DEV_SERVICE = http://192.168.101.50:9999 # 邓-本地 -; VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 +# 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 = 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/ # 线上 # VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上 -; VITE_APP_DEV_SERVICE = http://localhost:9999 +# VITE_APP_DEV_SERVICE = http://localhost:9999 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start **************** @@ -41,8 +40,8 @@ VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/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 = http://220.191.229.171:8090/api -#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 +VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # 信创线上 # ******************** end 生产环境 end ******************** -VITE_DEV_ENV = dev -#VITE_DEV_ENV = prod +# VITE_DEV_ENV = dev +# VITE_DEV_ENV = prod \ No newline at end of file diff --git a/index.html b/index.html index f4e1ded..2ef6934 100644 --- a/index.html +++ b/index.html @@ -1,25 +1,24 @@ - - - - - - - - - -
- - + + + + + + + + + + +
+ + diff --git a/package.json b/package.json index d41bb0c..c99eebd 100644 --- a/package.json +++ b/package.json @@ -62,12 +62,14 @@ "@zebra-ui/swiper": "^2.2.8", "crypto-js": "^4.2.0", "dayjs": "^1.11.13", + "gdt-jsapi": "^1.9.51", "luch-request": "^3.1.1", "pinia": "^2.2.6", "qs": "^6.13.1", "radash": "^12.1.0", "vue": "^3.3.11", "vue-i18n": "^9.1.9", + "vue-waterfall-plugin-next": "^2.6.5", "z-paging": "^2.8.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e22a0c2..15d7fa7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,6 +65,9 @@ importers: dayjs: specifier: ^1.11.13 version: 1.11.13 + gdt-jsapi: + specifier: ^1.9.51 + version: 1.9.51 luch-request: specifier: ^3.1.1 version: 3.1.1 @@ -83,6 +86,9 @@ importers: vue-i18n: specifier: ^9.1.9 version: 9.14.2(vue@3.5.13(typescript@4.9.5)) + vue-waterfall-plugin-next: + specifier: ^2.6.5 + version: 2.6.5 z-paging: specifier: ^2.8.0 version: 2.8.4 @@ -1295,6 +1301,9 @@ packages: '@polka/url@1.0.0-next.28': resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} + '@remax/mini-types@0.1.0': + resolution: {integrity: sha512-bVDcbUrp6p0PZwfS0xGVQS6k9f8B35BtZaYt/W/IGKh7VALYQ+tS2KcytLRmIJ/Vmohaw5ikIRN89I+frPdh4g==} + '@rollup/pluginutils@5.1.4': resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} engines: {node: '>=14.0.0'} @@ -2404,6 +2413,9 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + gdt-jsapi@1.9.51: + resolution: {integrity: sha512-VN1iIK7kJU2g2oxY/n8waCREhWxcVwR8qHAE1keVnUJHI6mTdgTelICzq++niRRCaLqUVWC1pYvftEVgk4sq8A==} + generic-names@4.0.0: resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==} @@ -3846,6 +3858,9 @@ packages: peerDependencies: typescript: '*' + vue-waterfall-plugin-next@2.6.5: + resolution: {integrity: sha512-8ACGbdjoyKLiJfnKXB8h8f9eE14lhyzfI1N1nrfVAIRczSpNY1KRwGOnVXN5OHqheLl3V1C0uVVRPtjTJkHkhw==} + vue@3.5.13: resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==} peerDependencies: @@ -5960,6 +5975,8 @@ snapshots: '@polka/url@1.0.0-next.28': {} + '@remax/mini-types@0.1.0': {} + '@rollup/pluginutils@5.1.4(rollup@4.34.2)': dependencies: '@types/estree': 1.0.6 @@ -7202,6 +7219,11 @@ snapshots: function-bind@1.1.2: {} + gdt-jsapi@1.9.51: + dependencies: + '@babel/runtime': 7.26.7 + '@remax/mini-types': 0.1.0 + generic-names@4.0.0: dependencies: loader-utils: 3.3.1 @@ -8834,6 +8856,8 @@ snapshots: semver: 7.7.1 typescript: 4.9.5 + vue-waterfall-plugin-next@2.6.5: {} + vue@3.5.13(typescript@4.9.5): dependencies: '@vue/compiler-dom': 3.5.13 diff --git a/src/main.ts b/src/main.ts index 1de055c..9b3e559 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,18 +1,17 @@ -import { createSSRApp } from "vue"; -import "uno.css"; -import * as Pinia from "pinia"; +import { createSSRApp } from "vue" +import "uno.css" +import pinia from "../src/sheep/stores/index" -import App from "./App.vue"; -import tmUi from "./uni_modules/tm-ui"; +import App from "./App.vue" +import tmUi from "./uni_modules/tm-ui" export function createApp() { - const app = createSSRApp(App); + const app = createSSRApp(App) - app.use(Pinia.createPinia()); - app.use(tmUi); + app.use(pinia) + app.use(tmUi) - return { - app, - Pinia, - }; + return { + app, + } } diff --git a/src/pages.json b/src/pages.json index d610224..6c100a5 100644 --- a/src/pages.json +++ b/src/pages.json @@ -30,6 +30,20 @@ "disableScroll": true } }, + // { + // "path": "pages/tabbar/flowStatistics", + // "style": { + // "navigationBarTitleText": "流水统计", + // "disableScroll": true + // } + // }, + // { + // "path": "pages/tabbar/individualOrder", + // "style": { + // "navigationBarTitleText": "订单", + // "disableScroll": true + // } + // }, { "path": "pages/tabbar/my", "style": { @@ -256,6 +270,18 @@ } } ] + }, + { + "root": "pages/pay", + "pages": [ + { + "path": "scanPay", + "style": { + "navigationBarTitleText": "", + "disableScroll": true + } + } + ] } ], "globalStyle": { @@ -285,6 +311,18 @@ "iconPath": "static/tabbar/order.png", "selectedIconPath": "static/tabbar/order-select.png" }, + // { + // "pagePath": "pages/tabbar/flowStatistics", + // "text": "流水统计", + // "iconPath": "static/tabbar/order.png", + // "selectedIconPath": "static/tabbar/order-select.png" + // }, + // { + // "pagePath": "pages/tabbar/individualOrder", + // "text": "订单", + // "iconPath": "static/tabbar/order.png", + // "selectedIconPath": "static/tabbar/order-select.png" + // }, { "pagePath": "pages/tabbar/my", "text": "我的", diff --git a/src/pages/boxes/apply.vue b/src/pages/boxes/apply.vue index bddeac2..2aa2273 100644 --- a/src/pages/boxes/apply.vue +++ b/src/pages/boxes/apply.vue @@ -1,215 +1,215 @@ - \ No newline at end of file + diff --git a/src/pages/boxes/detail.vue b/src/pages/boxes/detail.vue index 27cca19..fa80b22 100644 --- a/src/pages/boxes/detail.vue +++ b/src/pages/boxes/detail.vue @@ -1,83 +1,78 @@ - \ No newline at end of file + diff --git a/src/pages/boxes/list.vue b/src/pages/boxes/list.vue index b5581eb..a1c4988 100644 --- a/src/pages/boxes/list.vue +++ b/src/pages/boxes/list.vue @@ -1,5 +1,5 @@ @@ -97,7 +99,7 @@ const doProduct = (v: any) => { height="100%" :fixed="false" v-model="pageHook.list" - :default-page-size="5" + :default-page-size="8" safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @@ -107,7 +109,7 @@ const doProduct = (v: any) => { @scroll="pageHook.scroll" > + - - + + + + + + + diff --git a/src/pages/merchant/product-detail.vue b/src/pages/merchant/product-detail.vue index d20b72d..83b3844 100644 --- a/src/pages/merchant/product-detail.vue +++ b/src/pages/merchant/product-detail.vue @@ -1,87 +1,73 @@ diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue new file mode 100644 index 0000000..f672cd1 --- /dev/null +++ b/src/pages/pay/scanPay.vue @@ -0,0 +1,175 @@ + + + diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue index b42c13a..b75392f 100644 --- a/src/pages/refund/apply.vue +++ b/src/pages/refund/apply.vue @@ -22,9 +22,7 @@ const state = reactive({ selectList: [], }) const uploadApplyPicUrls = ref | string>>([]) // 补充凭证图片 -const applyPicUrls = computed(() => - uploadApplyPicUrls.value.map((item: any) => JSON.parse(item.response).data.url).join(","), -) +const applyPicUrls = computed(() => uploadApplyPicUrls.value.map((item: any) => JSON.parse(item.response).data.url).join(",")) const applyForm = reactive({ way: data.payType[0].type, @@ -154,14 +152,7 @@ const doSubmit = async () => { 售后类型 - + @@ -187,7 +178,6 @@ const doSubmit = async () => { - <<<<<<< HEAD 补充凭证图片 { 注：图片大小不超过5M，最多上传6张 - ======= >>>>>>> c3eaafa5d0575ebd0fa74be0180c5cfe8a9901ea 相关描述 - + diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue index 7979162..7ccdddc 100644 --- a/src/pages/shop/detail.vue +++ b/src/pages/shop/detail.vue @@ -14,24 +14,18 @@ - + - - {{ state.detail.name }} - - - {{ state.detail.deptName }} - + {{ state.detail.name }} + {{ state.detail.deptName }} - {{ state.detail.phone }} - - 营业时间 - - {{ state.detail.jobStartTime }} - ~ - {{ state.detail.jobEndTime }} - + {{ state.detail.phone }} + + 营业时间： + {{ 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] : "" }} 地址 @@ -47,11 +41,7 @@ - + - + @@ -149,9 +134,22 @@ onLoad((options: any) => { } }) onShow(async () => { - await getDetail() - await getShopCar() - await getClassify() + uni.showLoading({ + title: "加载中...", + mask: true, + }) + try { + await getDetail() + await getShopCar() + await getClassify() + } catch (error) { + uni.showToast({ + title: "加载失败", + icon: "error", + }) + } finally { + uni.hideLoading() + } }) const getDetail = async () => { diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue new file mode 100644 index 0000000..b1b18d4 --- /dev/null +++ b/src/pages/tabbar/flowStatistics.vue @@ -0,0 +1,125 @@ + + + diff --git a/src/pages/tabbar/home.vue b/src/pages/tabbar/home.vue index 270bb8c..e32b061 100644 --- a/src/pages/tabbar/home.vue +++ b/src/pages/tabbar/home.vue @@ -1,7 +1,6 @@ diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index ed049d3..9e8f570 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -48,6 +48,8 @@ import { filePath } from "@@/utils/file" import { hooks, router, constant } from "@@/index" import { userApi } from "@@/api" import isDevEnv from "@/sheep/utils/isDevEnv" +import { usePayStore } from "@/sheep/stores/pay" +// import dd from "gdt-jsapi" interface MenuItem { text: string @@ -59,6 +61,7 @@ const state = reactive<{ wallet: any; userInfo: any; menuList: MenuItem[] }>({ wallet: [], userInfo: {}, menuList: [ + { text: "扫一扫", icon: "/static/icon/scan.png", router: "" }, { text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" }, // { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" }, // { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" }, @@ -172,6 +175,40 @@ const doLogout = async () => { uni.showToast({ title: "退出登录成功", icon: "none" }) } +// 扫一扫 +const doScanCode = async () => { + usePayStore().setPayData({}) + try { + const res: any = await (window as any).dd.scan({ type: "all", sourceType: ["camera"], scanType: ["cameraScan"] }) + // const decodedString = decodeBase64("eyJpZCI6IjE4ODk0ODM5Mzg0ODQ1MzEyMDEiLCJuYW1lIjoi5rWL6K+V6LaF5biCIn0=") + const decodedString = decodeBase64(res.text) + if (decodedString) { + const decodedJson = JSON.parse(decodedString) + if (decodedJson?.id && decodedJson?.name) { + usePayStore().setPayData(decodedJson) + router.jump("/pages/pay/scanPay") + } else { + uni.showToast({ + title: "无效的二维码", + icon: "none", + }) + } + } else { + uni.showToast({ + title: "无效的二维码", + icon: "none", + }) + } + } catch (error: any) { + if (error) { + uni.showToast({ + title: error, + icon: "none", + }) + } + } +} + const onTabMenu = async (v: MenuItem, i: number) => { if (i == state.menuList.length - 1) { router.jump(v.router) @@ -179,7 +216,32 @@ const onTabMenu = async (v: MenuItem, i: number) => { } const isLogin = await hooks.useCheckLogin() if (isLogin) { - router.jump(v.router) + if (v.text === "扫一扫") { + await doScanCode() + } else { + router.jump(v.router) + } + } +} + +// 解码base64 +const decodeBase64 = (base64String: string) => { + try { + const decodedBinaryString = atob(base64String) + const uint8Array = new Uint8Array(decodedBinaryString.length) + for (let i = 0; i < decodedBinaryString.length; i++) { + uint8Array[i] = decodedBinaryString.charCodeAt(i) + } + const decoder = new TextDecoder("utf-8") + const decodedString = decoder.decode(uint8Array) + console.log("解码结果", decodedString) + return decodedString + } catch (error) { + console.error("Base64 解码失败:", error) + uni.showToast({ + title: "解码失败，无效的二维码", + icon: "none", + }) } } @@ -208,23 +270,6 @@ onLoad(() => { onShow(() => { getStorageUserInfo() }) - -// { -// "accessToken": { -// "tokenValue": "06d43795-a3ef-4019-a70f-25830e7183a4", -// "issuedAt": "2025-01-24T11:10:30.423604599Z", -// "expiresAt": "2025-01-25T11:10:30.423604599Z", -// "tokenType": { -// "value": "Bearer" -// }, -// "scopes": [] -// }, -// "refreshToken": { -// "tokenValue": "FmRVP4l3d7t3263h9LeKnV8hdU0lPasMuI1wank_EbylRQPNLm7XP4_OtUV-zH9AbMZc9f14Qk2IXhw-33fWMGGKipVY8crbvVyWV5DeAcfeU8fYyQuNDh9rw3Dq0w75", -// "issuedAt": "2025-01-24T11:10:30.423699280Z", -// "expiresAt": "2025-01-31T11:10:30.423699280Z" -// } -// } diff --git a/src/sheep/api/food.ts b/src/sheep/api/food.ts index e29256f..a139f93 100644 --- a/src/sheep/api/food.ts +++ b/src/sheep/api/food.ts @@ -7,8 +7,8 @@ export default { method: "POST", data, params: { - pageNo: data.pageNo, - pagesize: data.pagesize, + current: data.current, + size: data.size, }, custom: { showLoading: false, diff --git a/src/sheep/api/pay.ts b/src/sheep/api/pay.ts index 3174fa2..feb10bf 100644 --- a/src/sheep/api/pay.ts +++ b/src/sheep/api/pay.ts @@ -1,53 +1,64 @@ -import request from "@/sheep/utils/request"; +import request from "@/sheep/utils/request" export default { - // 获得支付订单 - getOrder: (params) => { - return request({ - url: "/pay/order/get", - method: "GET", - params, - }); - }, - // 提交支付订单 - submitOrder: (data) => { - return request({ - url: "/pay/order/submit", - method: "POST", - data, - }); - }, - // 创建硬件订单 - createHardwareOrder: (params) => { - return request({ - url: "/hard/hard-order/app/create-order", - method: "GET", - params, - custom: { - showLoading: false, - }, - }); - }, - // 结算 - submitHardwareOrder: (data) => { - return request({ - url: "/hardware/order/submit-order", - method: "POST", - data, - custom: { - showLoading: false, - }, - }); - }, - // 退款 - refundHardwareOrder: (params) => { - return request({ - url: "/hardware/order/refund", - method: "GET", - params, - custom: { - showLoading: false, - }, - }); - }, -}; + // 获得支付订单 + getOrder: (params) => { + return request({ + url: "/pay/order/get", + method: "GET", + params, + }) + }, + // 提交支付订单 + submitOrder: (data) => { + return request({ + url: "/pay/order/submit", + method: "POST", + data, + }) + }, + // 创建硬件订单 + createHardwareOrder: (params) => { + return request({ + url: "/hard/hard-order/app/create-order", + method: "GET", + params, + custom: { + showLoading: false, + }, + }) + }, + // 创建二维码订单 + createQrCodeOrder: (data): any => { + return request({ + url: "/hard/hard-order/app/create-order-scan-qrcode", + method: "POST", + data, + custom: { + showLoading: false, + }, + }) + }, + // 结算 + submitHardwareOrder: (data) => { + return request({ + url: "/hardware/order/submit-order", + method: "POST", + data, + custom: { + showLoading: false, + }, + }) + }, + // 退款 + refundHardwareOrder: (params) => { + return request({ + url: "/hardware/order/refund", + method: "GET", + params, + custom: { + showLoading: false, + }, + }) + }, +} diff --git a/src/sheep/components/other/custom-waterfalls-flow/custom-waterfalls-flow.vue b/src/sheep/components/other/custom-waterfalls-flow/custom-waterfalls-flow.vue index 79159da..fcbfd92 100644 --- a/src/sheep/components/other/custom-waterfalls-flow/custom-waterfalls-flow.vue +++ b/src/sheep/components/other/custom-waterfalls-flow/custom-waterfalls-flow.vue @@ -1,382 +1,363 @@ diff --git a/src/sheep/stores/index.ts b/src/sheep/stores/index.ts new file mode 100644 index 0000000..f09bd2e --- /dev/null +++ b/src/sheep/stores/index.ts @@ -0,0 +1,8 @@ +// https://pinia.vuejs.org/ +import { createPinia } from "pinia" + +// 创建 +const pinia = createPinia() + +// 导出 +export default pinia diff --git a/src/sheep/stores/pay.ts b/src/sheep/stores/pay.ts new file mode 100644 index 0000000..c644023 --- /dev/null +++ b/src/sheep/stores/pay.ts @@ -0,0 +1,14 @@ +import { defineStore } from "pinia" + +export const usePayStore = defineStore("pay", { + state: (): { payData: { id?: string; name?: string } } => { + return { + payData: {}, + } + }, + actions: { + setPayData(data: any) { + this.payData = data + }, + }, +}) diff --git a/src/sheep/utils/formatMoney.ts b/src/sheep/utils/formatMoney.ts new file mode 100644 index 0000000..4615c6d --- /dev/null +++ b/src/sheep/utils/formatMoney.ts @@ -0,0 +1,21 @@ +/** + * 显示价格把分转换到元 + * @param price + * @returns + */ +export function displayPrice(price: any, suffix: string = "元", fixed = 2) { + if (typeof price === "undefined") return "0.00" + suffix + const parsedNumber = typeof price === "string" ? parseFloat(price) : price + return (parsedNumber / 100.0).toFixed(fixed) + suffix +} + +/** + * 把显示价格改为分 + * @param price + * @returns + */ +export const storePrice = (num: number | string | undefined) => { + if (typeof num === "undefined") return 0 + const parsedNumber = typeof num === "string" ? parseFloat(num) : num + return Math.round(parsedNumber * 100) +} diff --git a/src/sheep/utils/isDevEnv.ts b/src/sheep/utils/isDevEnv.ts index b5bdee1..a081bbe 100644 --- a/src/sheep/utils/isDevEnv.ts +++ b/src/sheep/utils/isDevEnv.ts @@ -1,2 +1,2 @@ -export default () => import.meta.env.VITE_DEV_ENV === "dev" -// export default () => process.env.NODE_ENV === "development" +// export default () => import.meta.env.VITE_DEV_ENV === "dev" +export default () => process.env.NODE_ENV === "development" diff --git a/src/static/icon/scan.png b/src/static/icon/scan.png new file mode 100644 index 0000000..cebbb69 Binary files /dev/null and b/src/static/icon/scan.png differ