diff --git a/src/clinic/clinicPatientUser/prescription.tsx b/src/clinic/clinicPatientUser/prescription.tsx index 7b9d507..dcb3276 100644 --- a/src/clinic/clinicPatientUser/prescription.tsx +++ b/src/clinic/clinicPatientUser/prescription.tsx @@ -4,12 +4,11 @@ import {Button, Cell, CellGroup, Space, Empty, ConfigProvider, Tag} from '@nutui import {View, Text} from '@tarojs/components' import {ClinicPrescription} from "@/api/clinic/clinicPrescription/model"; import { - pageClinicPrescription, - removeClinicPrescription + pageClinicPrescription } from "@/api/clinic/clinicPrescription"; import {copyText} from "@/utils/common"; -import {ShopGoods} from "@/api/shop/shopGoods/model"; -import {buildSingleGoodsOrder, PaymentHandler} from "@/utils/payment"; +import {PaymentHandler} from "@/utils/payment"; +import {OrderCreateRequest} from "@/api/shop/shopOrder/model"; const ClinicPrescriptionList = () => { const [list, setList] = useState([]) @@ -39,15 +38,14 @@ const ClinicPrescriptionList = () => { /** * 统一支付入口 */ - const onPay = async (goods: ShopGoods) => { + const onPay = async (item: ClinicPrescription) => { + const orderData = { + ...item + } + console.log(orderData,'统一支付入口统一支付入口统一支付入口') try { - // 构建订单数据 - const orderData = buildSingleGoodsOrder( - ); - // 执行支付 await PaymentHandler.pay(orderData, 1); - } catch (error: any) { } }; diff --git a/src/pages/index/Role.tsx b/src/pages/index/Role.tsx index 80a2cdd..fb92ad4 100644 --- a/src/pages/index/Role.tsx +++ b/src/pages/index/Role.tsx @@ -1,8 +1,5 @@ -import {Space, Image} from '@nutui/nutui-react-taro' -import {Loading} from '@nutui/nutui-react-taro' import Taro from '@tarojs/taro' -import {View, Text} from '@tarojs/components' -import {goTo} from "@/utils/navigation" +import {View} from '@tarojs/components' import {useShopInfo} from "@/hooks/useShopInfo" import './Role.scss' import navTo from "@/utils/common"; @@ -12,22 +9,10 @@ const Page = () => { const [isDoctor, setIsDoctor] = useState(false) // 使用 useShopInfo hooks 获取导航数据 const { - loading: shopLoading, error, - getNavigation } = useShopInfo() // 获取顶部导航菜单 - const navigation = getNavigation() - const home = navigation.topNavs.find(item => item.model == 'index') - const navItems = navigation.topNavs.filter(item => item.parentId == home?.navigationId) || [] - - const onNav = (item: any) => { - if (item.path) { - return goTo(`${item.path}`) - } - } - useEffect(() => { setIsDoctor(Taro.getStorageSync('Doctor') || Taro.getStorageSync('Doctor') == 'true') }, []); diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 36ccd81..756e61c 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -3,7 +3,6 @@ import Taro from '@tarojs/taro'; import {useShareAppMessage} from "@tarojs/taro" import {useEffect, useState} from "react"; import {getShopInfo} from "@/api/layout"; -import Menu from "./Menu"; import Banner from "./Banner"; import {checkAndHandleInviteRelation, hasPendingInvite} from "@/utils/invite"; import './index.scss'