diff --git a/src/components/Comments/index.module.scss b/src/components/Comments/index.module.scss
index 55d2415..5d028af 100644
--- a/src/components/Comments/index.module.scss
+++ b/src/components/Comments/index.module.scss
@@ -44,10 +44,19 @@
}
}
.list {
- padding: 12px 20px;
+ // padding: 12px 20px;
+ padding: 12px 0;
& > .commentItem {
- padding-bottom: 12px;
+ // padding-bottom: 12px;
+ padding: 0 0 12px 20px;
+ box-sizing: border-box;
+ &.weight_super.blink::after {
+ padding: 0;
+ top: -5px;
+ left: 0;
+ border-radius: initial;
+ }
}
.commentItem {
@@ -56,6 +65,7 @@
justify-content: space-between;
gap: 8px;
position: relative;
+ width: 100%;
&.blink::after {
content: "";
diff --git a/src/components/Comments/index.tsx b/src/components/Comments/index.tsx
index 67c6c39..1066eb3 100644
--- a/src/components/Comments/index.tsx
+++ b/src/components/Comments/index.tsx
@@ -187,7 +187,8 @@ function CommentItem(props: {
))}
diff --git a/src/order_pages/orderList/index.config.ts b/src/order_pages/orderList/index.config.ts
index 7824187..90cbfa0 100644
--- a/src/order_pages/orderList/index.config.ts
+++ b/src/order_pages/orderList/index.config.ts
@@ -1,4 +1,5 @@
export default definePageConfig({
navigationBarTitleText: '订单列表',
+ navigationStyle: 'custom',
navigationBarBackgroundColor: '#FAFAFA'
})
\ No newline at end of file
diff --git a/src/order_pages/orderList/index.module.scss b/src/order_pages/orderList/index.module.scss
index 4d2f470..98099a5 100644
--- a/src/order_pages/orderList/index.module.scss
+++ b/src/order_pages/orderList/index.module.scss
@@ -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;
diff --git a/src/order_pages/orderList/index.tsx b/src/order_pages/orderList/index.tsx
index 3a6a303..fc59b8c 100644
--- a/src/order_pages/orderList/index.tsx
+++ b/src/order_pages/orderList/index.tsx
@@ -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 (
+
{
},
"list"
)?.map((obj) => (
-
+ {obj.text}
+
+
))}
diff --git a/src/services/commentServices.ts b/src/services/commentServices.ts
index 474107a..b037620 100644
--- a/src/services/commentServices.ts
+++ b/src/services/commentServices.ts
@@ -54,7 +54,7 @@ export interface ToggleLikeType {
class CommentService {
// 查询评论列表
async getComments(req: { game_id: number, page: number, pageSize: number }): Promise> {
- return httpService.post("/comments/list", req, { showLoading: true });
+ return httpService.post("/comments/list", req, { showLoading: false });
}
// 发表评论
diff --git a/src/services/detailService.ts b/src/services/detailService.ts
index 5811751..67a78ea 100644
--- a/src/services/detailService.ts
+++ b/src/services/detailService.ts
@@ -106,7 +106,7 @@ class GameDetailService {
"/games/detail",
{ id },
{
- showLoading: true,
+ showLoading: false,
},
);
}
diff --git a/src/services/evaluateService.ts b/src/services/evaluateService.ts
index 55e73de..60ca1fd 100644
--- a/src/services/evaluateService.ts
+++ b/src/services/evaluateService.ts
@@ -112,7 +112,7 @@ class EvaluateService {
// 获取最后一次(最新)测试结果
async getLastResult(): Promise> {
- return httpService.post("/ntrp/last_result", {}, { showLoading: true });
+ return httpService.post("/ntrp/last_result", {}, { showLoading: false });
}
// 更新NTRP等级