bimwe/mini-programs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 功能完善: 订单模块的button切边、评论自动跳转、详情页进入个人页前置判断、详情分享卡片取值问题以及部分样式问题

Browse Source
This commit is contained in:
刘杰
2025-10-18 11:23:20 +08:00
parent 9ef35267cf
commit 2ba4586804
13 changed files with 131 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/order_pages/orderDetail/index.module.scss
View File

@@ -274,18 +274,39 @@
margin: 12px 0;
padding: 4px 10px;
height: 28px;
box-sizing: border-box;
border-radius: 999px;
border: 0.5px solid rgba(0, 0, 0, 0.06);
color: #000;
font-size: 12px;
font-style: normal;
font-weight: 600;
line-height: 20px;
letter-spacing: -0.23px;
position: relative;
overflow: hidden;
display: flex;
align-items: center;
justify-content: center;
& > .buttonText {
color: #000;
font-feature-settings: "liga" off, "clig" off;
font-family: "PingFang SC";
font-size: 12px;
font-style: normal;
font-weight: 600;
letter-spacing: -0.23px;
}
& > .transparentButton {
position: absolute;
width: 100%;
height: 100%;
left: 0;
top: 0;
opacity: 0;
}
&:first-child {
background: #000;
color: #fff;
& > .buttonText {
color: #fff;
}
&.payNow {
background-color: #ff3b30;
}
@@ -514,6 +535,8 @@
text-align: center;
// border: 0.5px solid rgba(0, 0, 0, 0.06);
color: #000;
font-feature-settings: "liga" off, "clig" off;
font-family: "PingFang SC";
font-size: 16px;
font-style: normal;
font-weight: 600;

13
src/order_pages/orderDetail/index.tsx
View File

@@ -329,12 +329,17 @@ function GameInfo(props) {
},
"detail"
)?.map((obj) => (
<Button
<View
className={classnames(styles.button, styles[obj.className])}
onClick={obj.action}
>
{obj.text}
</Button>
<Text className={styles.buttonText}>{obj.text}</Text>
<Button
className={styles.transparentButton}
onClick={obj.action}
>
{obj.text}
</Button>
</View>
))}
<View className={styles.customer} onClick={handleCustomerService}>
<Image className={styles.customerIcon} src={CustomerIcon} />

1
src/order_pages/orderList/index.config.ts
View File

@@ -1,4 +1,5 @@
export default definePageConfig({
navigationBarTitleText: '订单列表',
navigationStyle: 'custom',
navigationBarBackgroundColor: '#FAFAFA'
})

50
src/order_pages/orderList/index.module.scss
View File

@@ -1,7 +1,16 @@
@use "~@/scss/images.scss" as img;
.navbar {
box-shadow: none;
& > view > view:nth-child(2) {
justify-content: flex-start;
margin-left: -30px;
}
}
.container {
padding: 12px 12px 40px;
padding: 100px 12px 40px;
background-color: #fafafa;
height: 100vh;
width: 100%;
@@ -298,18 +307,39 @@
& > .button {
padding: 4px 10px;
height: 28px;
box-sizing: border-box;
border-radius: 999px;
border: 0.5px solid rgba(0, 0, 0, 0.06);
color: #000;
font-size: 12px;
font-style: normal;
font-weight: 600;
line-height: 20px;
letter-spacing: -0.23px;
position: relative;
overflow: hidden;
display: flex;
align-items: center;
justify-content: center;
& > .buttonText {
color: #000;
font-feature-settings: "liga" off, "clig" off;
font-family: "PingFang SC";
font-size: 12px;
font-style: normal;
font-weight: 600;
letter-spacing: -0.23px;
}
& > .transparentButton {
position: absolute;
width: 100%;
height: 100%;
left: 0;
top: 0;
opacity: 0;
}
&:last-child {
background: #000;
color: #fff;
& > .buttonText {
color: #fff;
}
&.payNow {
background-color: #ff3b30;
}
@@ -352,10 +382,12 @@
text-align: center;
// border: 0.5px solid rgba(0, 0, 0, 0.06);
color: #000;
font-feature-settings: "liga" off, "clig" off;
font-family: "PingFang SC";
font-size: 16px;
font-style: normal;
font-weight: 600;
line-height: 20px;
line-height: normal;
&:last-child {
background: #000;

21
src/order_pages/orderList/index.tsx
View File

@@ -12,7 +12,7 @@ import orderService, {
} from "@/services/orderService";
import { getStorage, removeStorage, setStorage } from "@/store/storage";
import { handleCustomerService } from "@/services/userService";
import { withAuth, RefundPopup } from "@/components";
import { withAuth, RefundPopup, GeneralNavbar } from "@/components";
import { payOrder, generateOrderActions } from "@/utils";
import emptyContent from "@/static/emptyStatus/publish-empty.png";
import CustomerIcon from "@/static/order/customer.svg";
@@ -258,6 +258,12 @@ const OrderList = () => {
return (
<View className={styles.container}>
<GeneralNavbar
title="订单列表"
backgroundColor="transparent"
titleClassName={styles.titleClassName}
className={styles.navbar}
/>
<ScrollView
scrollY
scrollWithAnimation
@@ -379,15 +385,20 @@ const OrderList = () => {
},
"list"
)?.map((obj) => (
<Button
<View
className={classnames(
styles.button,
styles[obj.className]
)}
onClick={obj.action}
>
{obj.text}
</Button>
<Text className={styles.buttonText}>{obj.text}</Text>
<Button
className={styles.transparentButton}
onClick={obj.action}
>
{obj.text}
</Button>
</View>
))}
</View>
</View>