refactor(clinic): 优化处方支付逻辑并清理无用代码
- 移除处方列表中冗余的商品相关导入 - 简化支付处理函数,直接使用处方对象构建订单数据 - 删除首页菜单组件引用 - 清理角色页面中未使用的UI组件和导航逻辑 - 移除角色页面中多余的加载状态和错误处理属性 - 优化页面结构,提升代码可读性
This commit is contained in:
@@ -4,12 +4,11 @@ import {Button, Cell, CellGroup, Space, Empty, ConfigProvider, Tag} from '@nutui
|
|||||||
import {View, Text} from '@tarojs/components'
|
import {View, Text} from '@tarojs/components'
|
||||||
import {ClinicPrescription} from "@/api/clinic/clinicPrescription/model";
|
import {ClinicPrescription} from "@/api/clinic/clinicPrescription/model";
|
||||||
import {
|
import {
|
||||||
pageClinicPrescription,
|
pageClinicPrescription
|
||||||
removeClinicPrescription
|
|
||||||
} from "@/api/clinic/clinicPrescription";
|
} from "@/api/clinic/clinicPrescription";
|
||||||
import {copyText} from "@/utils/common";
|
import {copyText} from "@/utils/common";
|
||||||
import {ShopGoods} from "@/api/shop/shopGoods/model";
|
import {PaymentHandler} from "@/utils/payment";
|
||||||
import {buildSingleGoodsOrder, PaymentHandler} from "@/utils/payment";
|
import {OrderCreateRequest} from "@/api/shop/shopOrder/model";
|
||||||
|
|
||||||
const ClinicPrescriptionList = () => {
|
const ClinicPrescriptionList = () => {
|
||||||
const [list, setList] = useState<ClinicPrescription[]>([])
|
const [list, setList] = useState<ClinicPrescription[]>([])
|
||||||
@@ -39,15 +38,14 @@ const ClinicPrescriptionList = () => {
|
|||||||
/**
|
/**
|
||||||
* 统一支付入口
|
* 统一支付入口
|
||||||
*/
|
*/
|
||||||
const onPay = async (goods: ShopGoods) => {
|
const onPay = async (item: ClinicPrescription) => {
|
||||||
|
const orderData = {
|
||||||
|
...item
|
||||||
|
}
|
||||||
|
console.log(orderData,'统一支付入口统一支付入口统一支付入口')
|
||||||
try {
|
try {
|
||||||
// 构建订单数据
|
|
||||||
const orderData = buildSingleGoodsOrder(
|
|
||||||
);
|
|
||||||
|
|
||||||
// 执行支付
|
// 执行支付
|
||||||
await PaymentHandler.pay(orderData, 1);
|
await PaymentHandler.pay(orderData, 1);
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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 Taro from '@tarojs/taro'
|
||||||
import {View, Text} from '@tarojs/components'
|
import {View} from '@tarojs/components'
|
||||||
import {goTo} from "@/utils/navigation"
|
|
||||||
import {useShopInfo} from "@/hooks/useShopInfo"
|
import {useShopInfo} from "@/hooks/useShopInfo"
|
||||||
import './Role.scss'
|
import './Role.scss'
|
||||||
import navTo from "@/utils/common";
|
import navTo from "@/utils/common";
|
||||||
@@ -12,22 +9,10 @@ const Page = () => {
|
|||||||
const [isDoctor, setIsDoctor] = useState<boolean>(false)
|
const [isDoctor, setIsDoctor] = useState<boolean>(false)
|
||||||
// 使用 useShopInfo hooks 获取导航数据
|
// 使用 useShopInfo hooks 获取导航数据
|
||||||
const {
|
const {
|
||||||
loading: shopLoading,
|
|
||||||
error,
|
error,
|
||||||
getNavigation
|
|
||||||
} = useShopInfo()
|
} = 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(() => {
|
useEffect(() => {
|
||||||
setIsDoctor(Taro.getStorageSync('Doctor') || Taro.getStorageSync('Doctor') == 'true')
|
setIsDoctor(Taro.getStorageSync('Doctor') || Taro.getStorageSync('Doctor') == 'true')
|
||||||
}, []);
|
}, []);
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import Taro from '@tarojs/taro';
|
|||||||
import {useShareAppMessage} from "@tarojs/taro"
|
import {useShareAppMessage} from "@tarojs/taro"
|
||||||
import {useEffect, useState} from "react";
|
import {useEffect, useState} from "react";
|
||||||
import {getShopInfo} from "@/api/layout";
|
import {getShopInfo} from "@/api/layout";
|
||||||
import Menu from "./Menu";
|
|
||||||
import Banner from "./Banner";
|
import Banner from "./Banner";
|
||||||
import {checkAndHandleInviteRelation, hasPendingInvite} from "@/utils/invite";
|
import {checkAndHandleInviteRelation, hasPendingInvite} from "@/utils/invite";
|
||||||
import './index.scss'
|
import './index.scss'
|
||||||
|
|||||||
Reference in New Issue
Block a user