zoujing/YGChatCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zoujing:9cc7b48d36d42f443a62aa897e1eccb7d818f5f8
Branches Tags
zoujing:main
zoujing:fix-812
..
compare: zoujing:0bffc08a93598a4848c03d643b98d7ccb3a30b35
Branches Tags
zoujing:main
zoujing:fix-812

13 Commits
9cc7b48d36 ... 0bffc08a93

Author SHA1 Message Date
duanshuwen
0bffc08a93 fix: 退款异常问题修复 2025-10-07 17:59:25 +08:00
duanshuwen
f095e12b46 fix: 还原退款 2025-10-07 17:24:07 +08:00
duanshuwen
f95a51cad8 fix: 退款问题修复 2025-10-07 17:19:45 +08:00
duanshuwen
500c44ebea fix: 待支付|再次预定交互逻辑调整 2025-10-07 16:31:35 +08:00
duanshuwen
3646870695 feat: 修复商品下单节流 2025-10-07 14:26:17 +08:00
duanshuwen
56f7f9d426 feat: 字体大小16px替换全局变量 2025-10-06 17:35:29 +08:00
duanshuwen
637c5f674b feat: 圆角50px替换全局变量 2025-10-06 17:30:17 +08:00
duanshuwen
dad5c4cc5e feat: 圆角50%替换全局变量|颜色#999替换全局变量 2025-10-06 17:25:28 +08:00
duanshuwen
6f477f3513 feat: 订单卡片图片图标替换成字体图标 2025-10-06 13:25:45 +08:00
duanshuwen
c8e51e4975 feat: 替换sass版本，定义全局样式，实现简单的页面布局操作，比如颜色、边距、圆角等 2025-10-06 13:13:16 +08:00
duanshuwen
e0f0e90635 feat: 样式优化 2025-10-05 16:24:17 +08:00
duanshuwen
59c8fd515b feat: 订单样式优化 2025-10-05 15:59:39 +08:00
duanshuwen
e58ded9b84 feat: 优化订单详情滚动交互 2025-10-05 11:54:09 +08:00
121 changed files with 15492 additions and 1486 deletions
Show Stats Expand all files Collapse all files

4
.npmrc Normal file
View File

@ -0,0 +1,4 @@
registry=https://registry.npmmirror.com
sass_binary_site=https://cdn.npmmirror.com/binaries/node-sass
shamefully-hoist=true

12097
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -72,7 +72,7 @@
"@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001", "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001",
"@vue/runtime-core": "^3.4.21", "@vue/runtime-core": "^3.4.21",
"@vue/tsconfig": "^0.1.3", "@vue/tsconfig": "^0.1.3",
"sass": "^1.93.0", "sass": "1.58.3",
"vite": "5.2.8" "vite": "5.2.8"
} }
} }

2
src/components/AddCarCrad/index.vue
View File

@ -25,5 +25,5 @@ const props = defineProps({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/Calender/index.vue
View File

@ -474,5 +474,5 @@ onBeforeUnmount(() => {
<style lang="scss" scoped> <style lang="scss" scoped>
// 引入样式文件 // 引入样式文件
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/Calender/styles/index.scss
View File

@ -80,7 +80,7 @@ $font-size-label: 10px;
justify-content: center; justify-content: center;
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 50%; border-radius: $uni-border-radius-circle;
transition: background-color 0.2s; transition: background-color 0.2s;
&:active { &:active {

2
src/components/CheckBox/index.vue
View File

@ -40,5 +40,5 @@ const onChange = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/CommandWrapper/index.vue
View File

@ -14,5 +14,5 @@ defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/CommandWrapper/styles/index.scss
View File

@ -7,5 +7,5 @@
.command-text { .command-text {
color: #fff; color: #fff;
font-size: 14px; font-size: $uni-font-size-base;
} }

2
src/components/CreateServiceOrder/index.vue
View File

@ -252,5 +252,5 @@ onMounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

36
src/components/CreateServiceOrder/styles/index.scss
View File

@ -3,10 +3,10 @@
} }
.order-header { .order-header {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
margin-bottom: 10px; margin-bottom: 10px;
color: #333; color: $uni-text-color;
} }
.order-content { .order-content {
@ -28,7 +28,7 @@
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-right: 8px; margin-right: 8px;
border-radius: 50%; border-radius: $uni-border-radius-circle;
background-color: #ffa500; background-color: #ffa500;
display: flex; display: flex;
align-items: center; align-items: center;
@ -36,9 +36,9 @@
} }
.order-description { .order-description {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
color: #333; color: $uni-text-color;
} }
.order-line { .order-line {
@ -54,7 +54,7 @@
top: -8px; top: -8px;
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 50px; border-radius: $uni-border-radius-50px;
background-color: #eff6fa; background-color: #eff6fa;
} }
@ -75,8 +75,8 @@
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }
.detail-label { .detail-label {
@ -85,15 +85,15 @@
} }
.detail-value { .detail-value {
color: #333; color: $uni-text-color;
} }
.detail-input { .detail-input {
border: none; border: none;
outline: none; outline: none;
width: calc(100% - 80px); width: calc(100% - 80px);
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -101,8 +101,8 @@
border: none; border: none;
outline: none; outline: none;
width: 100%; width: 100%;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }
.order-button { .order-button {
@ -110,7 +110,7 @@
height: 42px; height: 42px;
background: linear-gradient(90deg, #ff7e00, #ffba00); background: linear-gradient(90deg, #ff7e00, #ffba00);
color: #fff; color: #fff;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 600; font-weight: 600;
border-radius: 20px; border-radius: 20px;
margin-top: 20px; margin-top: 20px;
@ -131,9 +131,9 @@
.order-button-secondary { .order-button-secondary {
flex: 1; flex: 1;
height: 42px; height: 42px;
background: linear-gradient(90deg, #0256FF, #00A6FF); background: linear-gradient(90deg, #0256ff, #00a6ff);
color: #fff; color: #fff;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 600; font-weight: 600;
border: none; border: none;
border-radius: 20px; border-radius: 20px;
@ -148,7 +148,7 @@
height: 42px; height: 42px;
background: linear-gradient(90deg, #ff7e00, #ffba00); background: linear-gradient(90deg, #ff7e00, #ffba00);
color: #fff; color: #fff;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 600; font-weight: 600;
border-radius: 20px; border-radius: 20px;
display: flex; display: flex;
@ -160,7 +160,7 @@
margin-bottom: 12px; margin-bottom: 12px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: $uni-font-size-base;
color: #ed6a0c; color: #ed6a0c;
} }

2
src/components/Divider/index.vue
View File

@ -3,5 +3,5 @@
</template> </template>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

50
src/components/Divider/styles/index.scss
View File

@ -1,30 +1,36 @@
.divider { .divider {
height: 1px; height: 1px;
margin: 0 10px; margin: 0 10px;
background: linear-gradient(to right, #eee, #eee 5px, transparent 5px, transparent); background: linear-gradient(
to right,
#eee,
#eee 5px,
transparent 5px,
transparent
);
background-size: 10px 100%; background-size: 10px 100%;
position: relative; position: relative;
&::before, &::after { // &::before, &::after {
position: absolute; // position: absolute;
content: ''; // content: '';
height: 12px; // height: 12px;
width: 6px; // width: 6px;
background-color: #E2EDF2;
top: 50%;
transform: translateY(-50%);
}
&::before { // background-color: #E2EDF2;
border-radius: 0 20px 20px 0; // top: 50%;
top: 0; // transform: translateY(-50%);
left: -10px; // }
}
&::after { // &::before {
border-radius: 20px 0 0 20px; // border-radius: 0 20px 20px 0;
top: 0; // top: 0;
right: -10px; // left: -10px;
} // }
}
// &::after {
// border-radius: 20px 0 0 20px;
// top: 0;
// right: -10px;
// }
}

2
src/components/Feedback/index.vue
View File

@ -141,5 +141,5 @@ onMounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

26
src/components/Feedback/styles/index.scss
View File

@ -3,10 +3,10 @@
} }
.order-header { .order-header {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
margin-bottom: 10px; margin-bottom: 10px;
color: #333; color: $uni-text-color;
} }
.order-content { .order-content {
@ -22,8 +22,8 @@
display: flex; display: flex;
align-items: start; align-items: start;
margin-bottom: 12px; margin-bottom: 12px;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }
.detail-label { .detail-label {
@ -32,14 +32,14 @@
} }
.detail-value { .detail-value {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }
.detail-textarea { .detail-textarea {
width: 100%; width: 100%;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
border-radius: 4px; border-radius: 4px;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 8px; padding: 8px;
@ -49,8 +49,8 @@
border: none; border: none;
outline: none; outline: none;
width: 100%; width: 100%;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding-left: 8px; padding-left: 8px;
} }
@ -59,7 +59,7 @@
width: 300px; width: 300px;
height: 42px; height: 42px;
color: #fff; color: #fff;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 600; font-weight: 600;
border-radius: 21px; border-radius: 21px;
margin-top: 24px; margin-top: 24px;
@ -69,7 +69,7 @@
} }
.submit-button { .submit-button {
background: linear-gradient(90deg, #ff7e00, #ffba00); background: linear-gradient(179deg, #00a6ff 0%, #0256ff 100%);
} }
.look-button { .look-button {
@ -80,7 +80,7 @@
margin-bottom: 12px; margin-bottom: 12px;
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: $uni-font-size-base;
color: #ed6a0c; color: #ed6a0c;
} }

2
src/components/FormCard/index.vue
View File

@ -175,5 +175,5 @@ defineExpose({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/components/FormCard/styles/index.scss
View File

@ -1,7 +1,7 @@
// SASS 变量定义 // SASS 变量定义
$form-primary-color: #00a6ff; $form-primary-color: #00a6ff;
$form-error-color: #ff4d4f; $form-error-color: #ff4d4f;
$form-text-color: #333; $form-text-color: $uni-text-color;
$form-label-color: #86909c; $form-label-color: #86909c;
$form-border-color: #ddd; $form-border-color: #ddd;
$form-input-border-color: #ddd; $form-input-border-color: #ddd;
@ -48,7 +48,7 @@ $form-transition: all 0.2s ease;
.form-title { .form-title {
margin-left: 8px; margin-left: 8px;
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 500; font-weight: 500;
color: $form-primary-color; color: $form-primary-color;
flex: 1; flex: 1;
@ -85,7 +85,7 @@ $form-transition: all 0.2s ease;
} }
.form-label { .form-label {
font-size: 14px; font-size: $uni-font-size-base;
color: $form-label-color; color: $form-label-color;
width: 50px; width: 50px;
flex-shrink: 0; flex-shrink: 0;
@ -95,7 +95,7 @@ $form-transition: all 0.2s ease;
.form-input { .form-input {
flex: 1; flex: 1;
font-size: 14px; font-size: $uni-font-size-base;
color: $form-text-color; color: $form-text-color;
border: none; border: none;
border-bottom: 1px solid $form-input-border-color; border-bottom: 1px solid $form-input-border-color;
@ -127,7 +127,7 @@ $form-transition: all 0.2s ease;
} }
.form-error { .form-error {
font-size: 12px; font-size: $uni-font-size-sm;
color: $form-error-color; color: $form-error-color;
margin-top: 6px; margin-top: 6px;
margin-left: 60px; margin-left: 60px;

2
src/components/GoodDetail/index.vue
View File

@ -58,5 +58,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use './styles/index.scss'; @import "./styles/index.scss";
</style> </style>

6
src/components/GoodDetail/styles/index.scss
View File

@ -23,8 +23,8 @@
flex-shrink: 0; flex-shrink: 0;
.module-title { .module-title {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
text-align: center; text-align: center;
word-wrap: break-word; word-wrap: break-word;
margin-left: 4px; margin-left: 4px;
@ -33,7 +33,7 @@
.module-desc { .module-desc {
flex: 1; flex: 1;
font-size: 12px; font-size: $uni-font-size-sm;
color: #666; color: #666;
line-height: 1.5; line-height: 1.5;
margin-top: 4px; margin-top: 4px;

8
src/components/ImageSwiper/index.vue
View File

@ -47,7 +47,11 @@
:id="`thumbnail-${index}`" :id="`thumbnail-${index}`"
@click="handleThumbnailClick(index)" @click="handleThumbnailClick(index)"
> >
<image class="thumbnail-image" :src="thumb.photoUrl" mode="aspectFill"></image> <image
class="thumbnail-image"
:src="thumb.photoUrl"
mode="aspectFill"
></image>
<text>{{ thumb.photoName }}</text> <text>{{ thumb.photoName }}</text>
</view> </view>
</view> </view>
@ -159,5 +163,5 @@ const handleSwiperChange = (e) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/ImageSwiper/styles/index.scss
View File

@ -19,7 +19,7 @@
right: 8px; right: 8px;
z-index: 10; z-index: 10;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
border-radius: 50px; border-radius: $uni-border-radius-50px;
padding: 3px 8px; padding: 3px 8px;
font-size: 8px; font-size: 8px;
color: #fff; color: #fff;

2
src/components/LocationCard/index.vue
View File

@ -48,5 +48,5 @@ const openMap = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/components/LocationCard/styles/index.scss
View File

@ -7,8 +7,8 @@
background-size: cover; background-size: cover;
background-position: center; background-position: center;
border-radius: 20px; border-radius: 20px;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
@ -30,15 +30,15 @@
} }
.location-label { .location-label {
color: #333; color: $uni-text-color;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
} }
.address-text { .address-text {
margin-top: 4px; margin-top: 4px;
color: #666; color: #666;
font-size: 12px; font-size: $uni-font-size-sm;
font-weight: 400; font-weight: 400;
} }

2
src/components/LocationInfo/index.vue
View File

@ -42,5 +42,5 @@ const openMap = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/components/LocationInfo/styles/index.scss
View File

@ -1,8 +1,8 @@
.store-address { .store-address {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
text { text {
flex: 1; flex: 1;

8
src/components/ModuleTitle/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="module-header mb12"> <view class="module-header mb12">
<text class="module-title">{{ title }}</text> <text class="module-title">{{ title }}</text>
<image class="underline" src="./images/wave_icon.png" mode="aspectFill"/> <image class="underline" src="./images/wave_icon.png" mode="aspectFill" />
</view> </view>
</template> </template>
@ -9,11 +9,11 @@
defineProps({ defineProps({
title: { title: {
type: String, type: String,
default: '图片详情' default: "图片详情",
} },
}); });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/OrderCardItem/index.vue
View File

@ -48,5 +48,5 @@ const orderStatusText = computed(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

16
src/components/OrderCardItem/styles/index.scss
View File

@ -15,7 +15,7 @@
.order-icon { .order-icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%; border-radius: $uni-border-radius-circle;
background-color: #ffa500; background-color: #ffa500;
display: flex; display: flex;
align-items: center; align-items: center;
@ -24,18 +24,18 @@
} }
.order-title { .order-title {
font-size: 16px; font-size: $uni-font-size-lg;
color: #333; color: $uni-text-color;
} }
.order-status { .order-status {
font-size: 14px; font-size: $uni-font-size-base;
padding: 5px 10px; padding: 5px 10px;
border-radius: 15px; border-radius: 15px;
} }
.status-canceled { .status-canceled {
color: #999; color: $uni-text-color-grey;
border: 1px solid #999; border: 1px solid #999;
} }
@ -70,12 +70,12 @@
} }
.detail-label { .detail-label {
font-size: 14px; font-size: $uni-font-size-base;
color: #666; color: #666;
margin-right: 10px; margin-right: 10px;
} }
.detail-value { .detail-value {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }

52
src/components/Privacy/index.vue
View File

@ -3,14 +3,23 @@
<view class="content"> <view class="content">
<view class="title">隐私保护指引</view> <view class="title">隐私保护指引</view>
<view class="des"> <view class="des">
请您仔细阅读并充分理解<text class="link" @click="handleOpenPrivacyContract">{{ privacyContractName }}</text> 请您仔细阅读并充分理解<text
，如您同意前述协议的全部内容，请点击“同意”开始使用。<text class="cancel">如您不同意，将被限制使用部分功能，或将在您使用具体功能前再次询问以取得您的授权同意。</text> class="link"
@click="handleOpenPrivacyContract"
>{{ privacyContractName }}</text
>
，如您同意前述协议的全部内容，请点击“同意”开始使用。<text class="cancel"
>如您不同意，将被限制使用部分功能，或将在您使用具体功能前再次询问以取得您的授权同意。</text
>
</view> </view>
<view class="btns"> <view class="btns">
<button class="reject" @click="handleDisagree">拒绝</button> <button class="reject" @click="handleDisagree">拒绝</button>
<button class="agree" open-type="agreePrivacyAuthorization" <button
@agreeprivacyauthorization="handleAgreePrivacyAuthorization"> class="agree"
open-type="agreePrivacyAuthorization"
@agreeprivacyauthorization="handleAgreePrivacyAuthorization"
>
同意 同意
</button> </button>
</view> </view>
@ -19,11 +28,11 @@
</template> </template>
<script setup> <script setup>
import { ref } from 'vue' import { ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
const showPrivacy = ref(true) const showPrivacy = ref(true);
const privacyContractName = ref('隐私保护指引') const privacyContractName = ref("隐私保护指引");
onShow(() => { onShow(() => {
// 条件编译微信小程序 // 条件编译微信小程序
@ -34,7 +43,7 @@ onShow(() => {
console.log("cj隐私配置", res); console.log("cj隐私配置", res);
if (res.errMsg == "getPrivacySetting:ok" && res.needAuthorization) { if (res.errMsg == "getPrivacySetting:ok" && res.needAuthorization) {
privacyContractName.value = res.privacyContractName; privacyContractName.value = res.privacyContractName;
showPrivacy.value = res.needAuthorization showPrivacy.value = res.needAuthorization;
} }
}, },
}); });
@ -44,36 +53,33 @@ onShow(() => {
// #ifdef MP-TOUTIAO // #ifdef MP-TOUTIAO
uni.getPrivacySetting({ uni.getPrivacySetting({
success: (res) => { success: (res) => {
console.log(res) console.log(res);
} },
}) });
// #endif // #endif
}) });
// 拒绝 // 拒绝
const handleDisagree = () => { const handleDisagree = () => {
showPrivacy.value = false showPrivacy.value = false;
} };
// 同意 // 同意
const handleAgreePrivacyAuthorization = () => { const handleAgreePrivacyAuthorization = () => {
showPrivacy.value = false showPrivacy.value = false;
} };
// 打开隐私保护指引 // 打开隐私保护指引
const handleOpenPrivacyContract = () => { const handleOpenPrivacyContract = () => {
// 条件编译微信小程序 // 条件编译微信小程序
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
wx.openPrivacyContract({ wx.openPrivacyContract({
fail: () => { } fail: () => {},
}) });
// #endif // #endif
} };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/components/Privacy/styles/index.scss
View File

@ -43,7 +43,7 @@
.reject, .reject,
.agree { .agree {
border-radius: 50px; border-radius: $uni-border-radius-50px;
width: 45%; width: 45%;
border: none; border: none;
font-size: 18px; font-size: 18px;
@ -57,7 +57,7 @@
.reject { .reject {
color: #000; color: #000;
background-color: #f5f5f5; background-color: #f5f5f5;
border-radius: 50px; border-radius: $uni-border-radius-50px;
} }
.agree { .agree {

2
src/components/ResponseIntro/index.vue
View File

@ -17,5 +17,5 @@ defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/components/ResponseIntro/styles/index.scss
View File

@ -4,8 +4,8 @@
.response-intro-text { .response-intro-text {
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: $uni-font-size-base;
color: #333333; color: $uni-text-color;
line-height: 20px; line-height: 20px;
text-align: justify; text-align: justify;
} }

2
src/components/ResponseWrapper/index.vue
View File

@ -7,5 +7,5 @@
<script setup></script> <script setup></script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/components/ServiceTipsWord/index.vue
View File

@ -36,5 +36,5 @@ const handleClick = (type) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

6
src/components/ServiceTipsWord/styles/index.scss
View File

@ -9,7 +9,7 @@
} }
.header-text { .header-text {
font-size: 12px; font-size: $uni-font-size-sm;
color: #6b84a2; color: #6b84a2;
} }
@ -46,8 +46,8 @@
rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.5),
rgba(255, 255, 255, 1) rgba(255, 255, 255, 1)
); );
font-size: 12px; font-size: $uni-font-size-sm;
font-weight: 500; font-weight: 500;
color: #00a6ff; color: #00a6ff;
border-radius: 50px; border-radius: $uni-border-radius-50px;
} }

2
src/components/Speech/RecordingWaveBtn.vue
View File

@ -109,7 +109,7 @@ defineExpose({
align-items: center; align-items: center;
background-color: #00a6ff; background-color: #00a6ff;
height: 44px; height: 44px;
border-radius: 50px; border-radius: $uni-border-radius-50px;
} }
.audio-visualizer { .audio-visualizer {

2
src/components/Stepper/index.vue
View File

@ -59,5 +59,5 @@ const increase = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/components/Stepper/styles/index.scss
View File

@ -5,7 +5,7 @@
.stepper-text { .stepper-text {
width: 40px; width: 40px;
font-size: 16px; font-size: $uni-font-size-lg;
color: #333; color: $uni-text-color;
text-align: center; text-align: center;
} }

2
src/components/SumCard/index.vue
View File

@ -25,5 +25,5 @@ defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

8
src/components/SumCard/styles/index.scss
View File

@ -19,15 +19,15 @@
.sum-label { .sum-label {
font-size: 15px; font-size: 15px;
color: #333; color: $uni-text-color;
} }
.sum-value { .sum-value {
font-size: 14px; font-size: $uni-font-size-base;
color: #999; color: $uni-text-color-grey;
} }
.sum-discount { .sum-discount {
font-size: 14px; font-size: $uni-font-size-base;
color: #ff5722; color: #ff5722;
} }

2
src/components/TagsGroup/index.vue
View File

@ -11,5 +11,5 @@ const tags = ["门票套餐", "民俗活动", "车程路况"];
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

6
src/components/TagsGroup/styles/index.scss
View File

@ -7,7 +7,7 @@
background-color: #fff; background-color: #fff;
border-radius: 10px; border-radius: 10px;
padding: 8px 16px; padding: 8px 16px;
font-size: 12px; font-size: $uni-font-size-sm;
color: #00A6FF; color: #00a6ff;
white-space: nowrap; white-space: nowrap;
} }

97
src/components/TopNavBar/index.vue
View File

@ -1,22 +1,27 @@
<template> <template>
<view :class="navBarClass" :style="navBarStyle"> <view :class="navBarClass" :style="navBarStyle">
<!-- 状态栏占位 --> <!-- 状态栏占位 -->
<view :style="{ height: statusBarHeight + 'px' }" v-if="!hideStatusBar"></view> <view
:style="{ height: statusBarHeight + 'px' }"
v-if="!hideStatusBar"
></view>
<!-- 导航栏内容 --> <!-- 导航栏内容 -->
<view class="nav-bar-content" :style="{ height: navBarHeight + 'px' }"> <view class="nav-bar-content" :style="{ height: navBarHeight + 'px' }">
<!-- 左侧返回按钮 --> <!-- 左侧返回按钮 -->
<view class="nav-bar-left" @click="handleBack" v-if="showBack"> <view class="nav-bar-left" @click="handleBack" v-if="showBack">
<uni-icons type="left" size="20" :color="backIconColor" /> <uni-icons type="left" size="20" :color="backIconColor" />
</view> </view>
<!-- 中间标题区域 --> <!-- 中间标题区域 -->
<view :class="['nav-bar-center', `nav-bar-center--${titleAlign}`]"> <view :class="['nav-bar-center', `nav-bar-center--${titleAlign}`]">
<slot name="title"> <slot name="title">
<text class="nav-bar-title" :style="{ color: titleColor }">{{ title }}</text> <text class="nav-bar-title" :style="{ color: titleColor }">{{
title
}}</text>
</slot> </slot>
</view> </view>
<!-- 右侧操作区域 --> <!-- 右侧操作区域 -->
<view class="nav-bar-right"> <view class="nav-bar-right">
<slot name="right"></slot> <slot name="right"></slot>
@ -26,108 +31,114 @@
</template> </template>
<script setup> <script setup>
import { computed, onMounted, ref } from 'vue' import { computed, onMounted, ref } from "vue";
// 定义props // 定义props
const props = defineProps({ const props = defineProps({
// 标题文本 // 标题文本
title: { title: {
type: String, type: String,
default: '' default: "",
}, },
// 是否固定在顶部 // 是否固定在顶部
fixed: { fixed: {
type: Boolean, type: Boolean,
default: false default: false,
},
// 是否添加阴影
shadow: {
type: Boolean,
default: true,
}, },
// 是否显示返回按钮 // 是否显示返回按钮
showBack: { showBack: {
type: Boolean, type: Boolean,
default: true default: true,
}, },
// 背景颜色 // 背景颜色
backgroundColor: { backgroundColor: {
type: String, type: String,
default: '#ffffff' default: "#ffffff",
}, },
// 标题颜色 // 标题颜色
titleColor: { titleColor: {
type: String, type: String,
default: '#333333' default: "#333333",
}, },
// 返回按钮图标颜色 // 返回按钮图标颜色
backIconColor: { backIconColor: {
type: String, type: String,
default: '#333333' default: "#333333",
}, },
// 是否隐藏状态栏占位 // 是否隐藏状态栏占位
hideStatusBar: { hideStatusBar: {
type: Boolean, type: Boolean,
default: false default: false,
}, },
// 自定义z-index // 自定义z-index
zIndex: { zIndex: {
type: Number, type: Number,
default: 999 default: 999,
}, },
// 标题对齐方式 // 标题对齐方式
titleAlign: { titleAlign: {
type: String, type: String,
default: 'center', // 'center' | 'left' default: "center", // 'center' | 'left'
validator: (value) => ['center', 'left'].includes(value) validator: (value) => ["center", "left"].includes(value),
} },
}) });
// 定义emits // 定义emits
const emit = defineEmits(['back']) const emit = defineEmits(["back"]);
// 系统信息 // 系统信息
const statusBarHeight = ref(0) const statusBarHeight = ref(0);
const navBarHeight = ref(44) // 默认导航栏高度 const navBarHeight = ref(44); // 默认导航栏高度
// 获取系统信息 // 获取系统信息
onMounted(() => { onMounted(() => {
const systemInfo = uni.getSystemInfoSync() const systemInfo = uni.getSystemInfoSync();
statusBarHeight.value = systemInfo.statusBarHeight || 0 statusBarHeight.value = systemInfo.statusBarHeight || 0;
// 根据平台设置导航栏高度 // 根据平台设置导航栏高度
if (systemInfo.platform === 'ios') { if (systemInfo.platform === "ios") {
navBarHeight.value = 44 navBarHeight.value = 44;
} else { } else {
navBarHeight.value = 48 navBarHeight.value = 48;
} }
}) });
// 计算导航栏样式类 // 计算导航栏样式类
const navBarClass = computed(() => { const navBarClass = computed(() => {
return [ return [
'top-nav-bar', "top-nav-bar",
{ {
'top-nav-bar--fixed': props.fixed "top-nav-bar--fixed": props.fixed,
} "has-shadow": props.shadow,
] },
}) ];
});
// 计算导航栏样式 // 计算导航栏样式
const navBarStyle = computed(() => { const navBarStyle = computed(() => {
return { return {
backgroundColor: props.backgroundColor, backgroundColor: props.backgroundColor,
zIndex: props.zIndex zIndex: props.zIndex,
} };
}) });
// 处理返回事件 // 处理返回事件
const handleBack = () => { const handleBack = () => {
emit('back') emit("back");
// 如果没有监听back事件，默认执行返回上一页 // 如果没有监听back事件，默认执行返回上一页
if (!emit('back')) { if (!emit("back")) {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1,
}) });
} }
} };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/components/TopNavBar/styles/index.scss
View File

@ -1,8 +1,11 @@
// TopNavBar 组件样式 // TopNavBar 组件样式
.top-nav-bar { .top-nav-bar {
width: 100%; width: 100%;
background-color: #ffffff; background-color: $uni-bg-color;
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1);
&.has-shadow {
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.1);
}
&--fixed { &--fixed {
position: fixed; position: fixed;
@ -44,6 +47,7 @@
.nav-bar-center { .nav-bar-center {
flex: 1; flex: 1;
height: 30px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -71,7 +75,7 @@
.nav-bar-title { .nav-bar-title {
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
color: #333333; color: $uni-text-color;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;

2
src/pages-order/order/components/CustomEmpty/index.vue
View File

@ -22,5 +22,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages-order/order/components/CustomEmpty/styles/index.scss
View File

@ -14,6 +14,6 @@
.empty-text { .empty-text {
margin-top: 10px; margin-top: 10px;
font-size: 14px; font-size: $uni-font-size-base;
color: #666666; color: #666666;
} }

2
src/pages-order/order/components/GoodsInfo/index.vue
View File

@ -123,5 +123,5 @@ const formatServiceAmount = (amount) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages-order/order/components/NoticeInfo/index.vue
View File

@ -26,5 +26,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages-order/order/components/NoticeInfo/styles/index.scss
View File

@ -7,7 +7,7 @@
.notice-title { .notice-title {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 500; font-weight: 500;
color: #333; color: $uni-text-color;
} }

6
src/pages-order/order/components/OrderCard/InfoRow.vue
View File

@ -31,15 +31,15 @@ const props = defineProps({
} }
.label { .label {
font-size: 12px; font-size: $uni-font-size-sm;
color: #666666; color: #666666;
flex-shrink: 0; flex-shrink: 0;
margin-right: 8px; margin-right: 8px;
} }
.value { .value {
font-size: 14px; font-size: $uni-font-size-base;
color: #333333; color: $uni-text-color;
flex: 1; flex: 1;
} }
</style> </style>

BIN
src/pages-order/order/components/OrderCard/images/arrow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 549 B

15
src/pages-order/order/components/OrderCard/index.vue
View File

@ -7,11 +7,14 @@
<view class="order-title"> <view class="order-title">
{{ orderData.workOrderTypeName || orderData.commodityName }} {{ orderData.workOrderTypeName || orderData.commodityName }}
</view> </view>
<image
v-if="props.orderData.orderType !== undefined" <uni-icons
class="arrow-icon" class="arrow-icon"
src="./images/arrow.png" v-if="props.orderData.orderType !== undefined"
></image> type="right"
color="#999"
size="16"
/>
</view> </view>
<view <view
v-if="orderData.status !== 'pending'" v-if="orderData.status !== 'pending'"
@ -33,7 +36,7 @@
</template> </template>
<script setup> <script setup>
import { defineProps, defineExpose } from "vue"; import { defineProps } from "vue";
import Divider from "@/components/Divider/index.vue"; import Divider from "@/components/Divider/index.vue";
import OrderCardContent from "./OrderCardContent.vue"; import OrderCardContent from "./OrderCardContent.vue";
import serviceIcon from "./images/service.png"; import serviceIcon from "./images/service.png";
@ -117,5 +120,5 @@ const handleCardClick = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

11
src/pages-order/order/components/OrderCard/styles/index.scss
View File

@ -4,6 +4,11 @@
box-shadow: 0px 3px 8px 0 rgba(0, 0, 0, 0.12); box-shadow: 0px 3px 8px 0 rgba(0, 0, 0, 0.12);
margin: 12px; margin: 12px;
transition: all 0.3s ease; transition: all 0.3s ease;
mask: radial-gradient(circle at 0 57px, #0000 6px, red 0),
radial-gradient(circle at right 57px, #0000 6px, red 0);
mask-size: 50%;
mask-position: 0, 100%;
mask-repeat: no-repeat;
&:active { &:active {
transform: scale(0.98); transform: scale(0.98);
@ -36,9 +41,9 @@
} }
.order-title { .order-title {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
color: #333333; color: $uni-text-color;
line-height: 1.4; line-height: 1.4;
} }
@ -51,7 +56,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 6px 16px; padding: 6px 16px;
border-radius: 20px; border-radius: 20px;
font-size: 12px; font-size: $uni-font-size-sm;
font-weight: 500; font-weight: 500;
&.tag-0 { &.tag-0 {

135
src/pages-order/order/components/OrderInfo/index.vue
View File

@ -27,7 +27,7 @@
v-if="shouldShowButton" v-if="shouldShowButton"
:class="['reserve-button', { loading: isLoading }]" :class="['reserve-button', { loading: isLoading }]"
:disabled="isLoading" :disabled="isLoading"
@click="handleButtonClick" @click="handleButtonClick(orderData)"
> >
{{ isLoading ? "处理中..." : buttonText }} {{ isLoading ? "处理中..." : buttonText }}
</button> </button>
@ -52,7 +52,7 @@ const PAY_WAY_MAP = {
const isLoading = ref(false); const isLoading = ref(false);
// 定义事件发射器 // 定义事件发射器
const emit = defineEmits(["show-refund-popup"]); const emit = defineEmits(["show-refund-popup", "pay-success"]);
const props = defineProps({ const props = defineProps({
orderData: { orderData: {
@ -80,7 +80,7 @@ const formattedAmount = computed(() => {
return amount ? `${parseFloat(amount).toFixed(2)}` : "0.00"; return amount ? `${parseFloat(amount).toFixed(2)}` : "0.00";
}); });
// 按钮文案逻辑 // 按钮文案逻辑，订单状态 0-待支付 1-待确认 2-待使用 3-已取消 4-退款中 5-已关闭 6-已完成
const buttonText = computed(() => { const buttonText = computed(() => {
const status = props.orderData.orderStatus; const status = props.orderData.orderStatus;
switch (status) { switch (status) {
@ -88,62 +88,109 @@ const buttonText = computed(() => {
return "立即支付"; return "立即支付";
case "2": // 待使用状态 case "2": // 待使用状态
return "申请退款"; return "申请退款";
default: // 其他状态 case "3": // 已取消状态
case "5": // 已关闭状态
case "6": // 已完成状态
return "再次预定"; return "再次预定";
} }
}); });
// 是否显示按钮（退款中状态不显示） // 是否显示按钮（待支付、待使用、已取消、已关闭、已完成）
const shouldShowButton = computed(() => { const shouldShowButton = computed(() => {
return props.orderData.orderStatus !== "4"; // 4-退款中 const status = props.orderData.orderStatus;
return ["0", "2", "3", "5", "6"].includes(status);
}); });
// 处理按钮点击事件 // 处理按钮点击事件
const handleButtonClick = async () => { const handleButtonClick = async (orderData) => {
if (isLoading.value) return; // 防止重复点击 if (isLoading.value) return; // 防止重复点击
const status = props.orderData.orderStatus;
const orderId = props.orderData.orderId;
// 支付方式
const payWay = props.orderData.payWay;
// 支付渠道
const paySource = "1";
if (status === "2") {
// 情况2：待使用状态，显示退款弹窗
emit("show-refund-popup");
return; // 直接返回，不执行后续代码
}
try { try {
isLoading.value = true; isLoading.value = true;
// 情况1：待支付状态或其他状态，先预下单再支付 const status = orderData.orderStatus;
// 第一步：预下单
const res = await orderPayNow({ orderId, payWay, paySource });
console.log(res);
// 仅作为示例，非真实参数信息。 if (status === "2") {
uni.requestPayment({ // 情况2：待使用状态，显示退款弹窗
provider: "wxpay", emit("show-refund-popup");
timeStamp: String(Date.now()), return; // 直接返回，不执行后续代码
nonceStr: "A1B2C3D4E5", }
package: "prepay_id=wx20180101abcdefg",
signType: "MD5", // 再次预定跳转商品详情
paySign: "", if (["3", "5", "6"].includes(status)) {
success: (res) => { uni.navigateTo({
console.log("success:" + JSON.stringify(res)); url: `/pages/goods/index?commodityId=${orderData.commodityId}`,
}, });
fail: (err) => { }
console.log("fail:" + JSON.stringify(err));
}, // 待支付状态，调用支付接口
}); if (status === "0") {
const orderId = orderData.orderId;
const payWay = orderData.payWay;
const paySource = orderData.paySource;
const res = await orderPayNow({ orderId, payWay, paySource });
console.log("确认订单---2:", res);
// 检查接口返回数据
if (!res || !res.data) {
uni.showToast({
title: "订单创建失败，请重试",
icon: "none",
duration: 2000,
});
return;
}
const { data } = res;
const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
// 验证支付参数是否完整
if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
console.error("支付参数不完整:", {
nonceStr: !!nonceStr,
packageVal: !!packageVal,
paySign: !!paySign,
signType: !!signType,
timeStamp: !!timeStamp,
});
uni.showToast({
title: "支付参数错误，请重试",
icon: "none",
duration: 2000,
});
return;
}
// 调用微信支付
uni.requestPayment({
provider: "wxpay",
timeStamp: String(timeStamp), // 确保为字符串类型
nonceStr: String(nonceStr),
package: String(packageVal), // 确保为字符串类型
signType: String(signType),
paySign: String(paySign),
success: () => {
uni.showToast({
title: "支付成功",
icon: "success",
duration: 2000,
success: () => {
emit("pay-success");
},
});
},
fail: (err) => {
uni.showToast({
title: "支付失败，请重试",
icon: "none",
duration: 2000,
});
},
});
}
} catch (error) { } catch (error) {
console.error("操作失败:", error); console.error("操作失败:", error);
uni.showToast({
title: error.message || "操作失败，请重试",
icon: "none",
});
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }
@ -157,5 +204,5 @@ const openFeedback = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

72
src/pages-order/order/components/OrderInfo/styles/index.scss
View File

@ -1,14 +1,9 @@
@use "sass:color";
// SASS变量定义，提高可维护性和编译性能
// 颜色系统 // 颜色系统
$order-bg-color: #fff; $order-bg-color: #fff;
$text-color-primary: #333; $text-color-primary: #333;
$text-color-secondary: #666; $text-color-secondary: #666;
$text-color-accent: #ff5722; $text-color-accent: #ff5722;
$button-color: #00a6ff; $button-color: #00a6ff;
$button-hover-color: color.scale($button-color, $lightness: -16%);
$button-disabled-color: #ccc; $button-disabled-color: #ccc;
$border-color: #ececec; $border-color: #ececec;
$shadow-color: rgba(0, 0, 0, 0.08); $shadow-color: rgba(0, 0, 0, 0.08);
@ -33,16 +28,6 @@ $font-weight-semibold: 600;
$transition-fast: 0.2s ease; $transition-fast: 0.2s ease;
$transition-normal: 0.3s ease; $transition-normal: 0.3s ease;
// 动画关键帧
@keyframes loading-spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
.order-info { .order-info {
background-color: $order-bg-color; background-color: $order-bg-color;
border-radius: $order-border-radius; border-radius: $order-border-radius;
@ -127,55 +112,15 @@ $transition-normal: 0.3s ease;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50px; border-radius: $uni-border-radius-50px;
height: $button-height; height: $button-height;
font-size: $font-size-medium; font-size: $font-size-medium;
font-weight: $font-weight-medium; font-weight: $font-weight-medium;
margin-top: $spacing-large; margin-top: $spacing-large;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
transition: all $transition-normal;
letter-spacing: 0.5px; letter-spacing: 0.5px;
// 按钮波纹效果
&::before {
content: "";
position: absolute;
top: 50%;
left: 50%;
width: 0;
height: 0;
background: rgba(255, 255, 255, 0.3);
border-radius: 50%;
transform: translate(-50%, -50%);
transition: width 0.6s, height 0.6s;
}
&:hover {
background: linear-gradient(
135deg,
$button-hover-color 0%,
color.scale($button-hover-color, $lightness: -11.9%) 100%
);
transform: translateY(-2px);
box-shadow: 0 4px 16px rgba($button-color, 0.4);
&::before {
width: 300px;
height: 300px;
}
}
&:active {
transform: translateY(-1px);
box-shadow: 0 2px 8px rgba($button-color, 0.3);
}
&:focus {
outline: none;
box-shadow: 0 0 0 3px rgba($button-color, 0.3);
}
&:disabled { &:disabled {
background: $button-disabled-color; background: $button-disabled-color;
cursor: not-allowed; cursor: not-allowed;
@ -198,21 +143,6 @@ $transition-normal: 0.3s ease;
&::before { &::before {
display: none; display: none;
} }
// 加载动画
&::after {
content: "";
position: absolute;
left: 50%;
top: 50%;
width: 16px;
height: 16px;
margin: -8px 0 0 -8px;
border: 2px solid transparent;
border-top: 2px solid #fff;
border-radius: 50%;
animation: loading-spin 1s linear infinite;
}
} }
} }

2
src/pages-order/order/components/OrderQrcode/index.vue
View File

@ -31,5 +31,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages-order/order/components/OrderQrcode/styles/index.scss
View File

@ -1,5 +1,5 @@
.order-qrcode { .order-qrcode {
background: #ffffff; background-color: $uni-bg-color;
border-radius: 10px; border-radius: 10px;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
@ -10,7 +10,7 @@
margin-bottom: 12px; margin-bottom: 12px;
text { text {
font-size: 12px; font-size: $uni-font-size-sm;
color: #666666; color: #666666;
line-height: 17px; line-height: 17px;
margin-top: 4px; margin-top: 4px;

2
src/pages-order/order/components/OrderStatusInfo/index.vue
View File

@ -85,5 +85,5 @@ const statusDescription = computed(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages-order/order/components/OrderStatusInfo/styles/index.scss
View File

@ -24,5 +24,5 @@
} }
.status-description { .status-description {
font-size: 12px; font-size: $uni-font-size-sm;
} }

8
src/pages-order/order/components/RefundPopup/index.vue
View File

@ -98,7 +98,7 @@ const refundAmount = computed(() => {
}); });
// 是否可退款 // 是否可退款
const isRefundable = computed(() => !props.orderData.refundable); const isRefundable = computed(() => props.orderData.refundable);
// 按钮文件 // 按钮文件
const btnText = computed(() => (isRefundable.value ? "点击退款" : "我知道了")); const btnText = computed(() => (isRefundable.value ? "点击退款" : "我知道了"));
@ -113,9 +113,9 @@ const commodityPurchaseInstruction = computed(() => {
}); });
// 方法定义 // 方法定义
const show = () => popupRef.value.open(); const show = () => popupRef.value && popupRef.value.open();
const hide = () => popupRef.value.close(); const hide = () => popupRef.value && popupRef.value.close();
// 监听modelValue变化 // 监听modelValue变化
watch( watch(
@ -150,5 +150,5 @@ const handleConfirmClick = (text) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

20
src/pages-order/order/components/RefundPopup/styles/index.scss
View File

@ -25,9 +25,9 @@
} }
&__title { &__title {
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 500; font-weight: 500;
color: #333; color: $uni-text-color;
line-height: 22px; line-height: 22px;
margin-bottom: 12px; margin-bottom: 12px;
text-align: center; text-align: center;
@ -40,7 +40,7 @@
margin-bottom: 4px; margin-bottom: 4px;
.amount-symbol { .amount-symbol {
font-size: 12px; font-size: $uni-font-size-sm;
color: #ff6a00; color: #ff6a00;
} }
@ -51,14 +51,14 @@
} }
.amount-unit { .amount-unit {
font-size: 12px; font-size: $uni-font-size-sm;
color: #ff6a00; color: #ff6a00;
} }
} }
&__amount-label { &__amount-label {
font-size: 12px; font-size: $uni-font-size-sm;
color: #333; color: $uni-text-color;
margin-bottom: 16px; margin-bottom: 16px;
} }
@ -67,15 +67,15 @@
margin-bottom: 16px; margin-bottom: 16px;
.policy-title { .policy-title {
font-size: 14px; font-size: $uni-font-size-base;
color: #007aff; color: #007aff;
font-weight: 600; font-weight: 600;
margin-bottom: 8px; margin-bottom: 8px;
} }
.policy-content { .policy-content {
font-size: 12px; font-size: $uni-font-size-sm;
color: #333333; color: $uni-text-color;
line-height: 22px; line-height: 22px;
text-align: justify; text-align: justify;
} }
@ -94,7 +94,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 16px; font-size: $uni-font-size-lg;
transition: all 0.3s ease; transition: all 0.3s ease;
outline: none; outline: none;

2
src/pages-order/order/components/Tabs/index.vue
View File

@ -271,5 +271,5 @@ defineExpose({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

18
src/pages-order/order/components/Tabs/styles/index.scss
View File

@ -21,7 +21,7 @@
} }
.tab-text { .tab-text {
font-size: 14px; font-size: $uni-font-size-base;
color: #666; color: #666;
font-weight: 400; font-weight: 400;
transition: all 0.3s ease; transition: all 0.3s ease;
@ -29,14 +29,14 @@
} }
.tab-text-active { .tab-text-active {
color: #333; color: $uni-text-color;
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 600; font-weight: 600;
} }
.tab-item-active { .tab-item-active {
.tab-text { .tab-text {
color: #333; color: $uni-text-color;
font-weight: 600; font-weight: 600;
} }
} }
@ -46,13 +46,14 @@
bottom: 0; bottom: 0;
height: 3px; height: 3px;
min-height: 3px; /* 确保最小高度 */ min-height: 3px; /* 确保最小高度 */
background-color: #007AFF; background-color: #007aff;
border-radius: 10px; border-radius: 10px;
transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1), width 0.3s cubic-bezier(0.4, 0, 0.2, 1); transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1),
width 0.3s cubic-bezier(0.4, 0, 0.2, 1);
z-index: 1; z-index: 1;
transform: translateZ(0); /* 启用硬件加速 */ transform: translateZ(0); /* 启用硬件加速 */
will-change: left, width; /* 优化动画性能 */ will-change: left, width; /* 优化动画性能 */
/* 初始状态：未初始化时隐藏 */ /* 初始状态：未初始化时隐藏 */
opacity: 0; opacity: 0;
width: 15px; /* 默认宽度15px */ width: 15px; /* 默认宽度15px */
@ -64,7 +65,6 @@
opacity: 1; opacity: 1;
} }
/* 点击效果 */ /* 点击效果 */
.tab-item:active { .tab-item:active {
opacity: 0.7; opacity: 0.7;
@ -97,4 +97,4 @@
.tab-indicator.animating { .tab-indicator.animating {
animation: tabSwitch 0.3s ease-out; animation: tabSwitch 0.3s ease-out;
} }

2
src/pages-order/order/components/UserInfo/index.vue
View File

@ -92,5 +92,5 @@ const formatPhone = (phone) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/pages-order/order/components/UserInfo/styles/index.scss
View File

@ -5,7 +5,7 @@
} }
.user-info-title { .user-info-title {
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 600; font-weight: 600;
margin-bottom: 14px; margin-bottom: 14px;
} }
@ -17,12 +17,12 @@
} }
.label { .label {
font-size: 14px; font-size: $uni-font-size-base;
color: #666; color: #666;
margin-right: 8px; margin-right: 8px;
} }
.value { .value {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }

97
src/pages-order/order/detail.vue
View File

@ -1,32 +1,49 @@
<template> <template>
<view class="order-detail-wrapper"> <view class="order-detail-page">
<uni-icons type="left" size="20" color="#fff" @click="goBack" /> <TopNavBar
titleAlign="center"
:backgroundColor="backgroundColor"
:backIconColor="backIconColor"
:shadow="shadow"
fixed
>
<template #title>
{{ title }}
</template>
</TopNavBar>
<OrderStatusInfo :orderData="orderData" /> <view class="order-detail-wrapper">
<OrderQrcode <OrderStatusInfo :orderData="orderData" />
v-if="orderData.orderStatus === '2'" <OrderQrcode
size="132" v-if="orderData.orderStatus === '2'"
unit="px" size="132"
:val="orderData.orderId" unit="px"
/> :val="orderData.orderId"
<GoodsInfo :orderData="orderData" /> />
<UserInfo :orderData="orderData" /> <GoodsInfo :orderData="orderData" />
<NoticeInfo :orderData="orderData" /> <UserInfo :orderData="orderData" />
<OrderInfo :orderData="orderData" @show-refund-popup="showRefundPopup" /> <NoticeInfo :orderData="orderData" />
<OrderInfo
:orderData="orderData"
@show-refund-popup="showRefundPopup"
@pay-success="handlePaySuccess"
/>
<!-- 退款状态显示 --> <!-- 退款状态显示 -->
<RefundPopup <RefundPopup
v-model="refundVisible" v-model="refundVisible"
:orderData="orderData" :orderData="orderData"
@confirm="handleRefundConfirm" @confirm="handleRefundConfirm"
/> />
</view>
</view> </view>
</template> </template>
<script setup> <script setup>
import { ref } from "vue"; import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad, onPageScroll } from "@dcloudio/uni-app";
import { userOrderDetail, orderRefund } from "@/request/api/OrderApi"; import { userOrderDetail, orderRefund } from "@/request/api/OrderApi";
import TopNavBar from "@/components/TopNavBar/index.vue";
import OrderQrcode from "./components/OrderQrcode/index.vue"; import OrderQrcode from "./components/OrderQrcode/index.vue";
import OrderStatusInfo from "./components/OrderStatusInfo/index.vue"; import OrderStatusInfo from "./components/OrderStatusInfo/index.vue";
import GoodsInfo from "./components/GoodsInfo/index.vue"; import GoodsInfo from "./components/GoodsInfo/index.vue";
@ -38,20 +55,35 @@ import RefundPopup from "./components/RefundPopup/index.vue";
const refundVisible = ref(false); const refundVisible = ref(false);
const orderData = ref({}); const orderData = ref({});
onLoad(async ({ orderId }) => { onLoad(({ orderId }) => getOrderDetail(orderId));
const res = await userOrderDetail({ orderId });
// 获取订单详情
const getOrderDetail = async (orderId) => {
const res = await userOrderDetail({ orderId });
orderData.value = res.data; orderData.value = res.data;
console.log(res); console.log(res);
});
// 返回上一页
const goBack = () => {
uni.navigateBack({
delta: 1,
});
}; };
// 监听页面滚动事件
const backgroundColor = ref("transparent");
const backIconColor = ref("#fff");
const title = ref("");
const shadow = ref(false);
onPageScroll(({ scrollTop }) => {
// 当滚动到顶部时，显示返回按钮
if (scrollTop <= 0) {
backgroundColor.value = "transparent";
backIconColor.value = "#fff";
title.value = "";
shadow.value = false;
} else {
backgroundColor.value = "#ffffff";
backIconColor.value = "#333333";
title.value = "订单详情";
shadow.value = true;
}
});
// 显示退款弹窗 // 显示退款弹窗
const showRefundPopup = () => { const showRefundPopup = () => {
refundVisible.value = true; refundVisible.value = true;
@ -79,8 +111,13 @@ const handleRefundConfirm = async ({ orderId }) => {
}); });
} }
}; };
// 再次预定
const handlePaySuccess = ({ orderId }) => {
getOrderDetail(orderId);
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/detail.scss"; @import "./styles/detail.scss";
</style> </style>

2
src/pages/goods/components/DateSelector/index.vue
View File

@ -63,5 +63,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/pages/goods/components/DateSelector/styles/index.scss
View File

@ -16,15 +16,15 @@
top: -12rpx; top: -12rpx;
left: 24rpx; left: 24rpx;
font-size: 20rpx; font-size: 20rpx;
color: #999999; color: $uni-text-color-grey;
background: #ffffff; background-color: $uni-bg-color;
padding: 0 8rpx; padding: 0 8rpx;
z-index: 1; z-index: 1;
} }
.date-box { .date-box {
padding: 20rpx 24rpx; padding: 20rpx 24rpx;
background: #ffffff; background-color: $uni-bg-color;
border-radius: 16rpx; border-radius: 16rpx;
border: 2rpx solid #f0f0f0; border: 2rpx solid #f0f0f0;
display: flex; display: flex;
@ -41,7 +41,7 @@
.date-text { .date-text {
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: $uni-text-color;
} }
.day-text { .day-text {
@ -61,4 +61,4 @@
.nights-text { .nights-text {
font-size: 24rpx; font-size: 24rpx;
color: #666666; color: #666666;
} }

2
src/pages/goods/components/GoodConfirm/index.vue
View File

@ -369,5 +369,5 @@ defineExpose({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

30
src/pages/goods/components/GoodConfirm/styles/index.scss
View File

@ -15,7 +15,7 @@
.header-title { .header-title {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
color: #333; color: $uni-text-color;
flex: 1; flex: 1;
text-align: center; text-align: center;
} }
@ -62,9 +62,9 @@
justify-content: space-between; justify-content: space-between;
.goods-title { .goods-title {
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 500; font-weight: 500;
color: #333; color: $uni-text-color;
line-height: 22px; line-height: 22px;
margin-bottom: 8px; margin-bottom: 8px;
display: -webkit-box; display: -webkit-box;
@ -79,7 +79,7 @@
margin-bottom: 12px; margin-bottom: 12px;
.currency { .currency {
font-size: 14px; font-size: $uni-font-size-base;
color: #ff6b35; color: #ff6b35;
font-weight: 500; font-weight: 500;
} }
@ -92,8 +92,8 @@
} }
.price-desc { .price-desc {
font-size: 14px; font-size: $uni-font-size-base;
color: #999; color: $uni-text-color-grey;
font-weight: 400; font-weight: 400;
margin-left: 12px; margin-left: 12px;
} }
@ -107,9 +107,9 @@
} }
.service-title { .service-title {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
color: #333; color: $uni-text-color;
} }
.goods-service-item { .goods-service-item {
@ -120,16 +120,16 @@
.service-label, .service-label,
.service-value { .service-value {
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
} }
.service-label { .service-label {
color: #333; color: $uni-text-color;
} }
.service-value { .service-value {
color: #999; color: $uni-text-color-grey;
} }
} }
} }
@ -166,8 +166,8 @@
} }
.total-count { .total-count {
font-size: 12px; font-size: $uni-font-size-sm;
color: #333; color: $uni-text-color;
} }
.total-price { .total-price {
@ -178,7 +178,7 @@
&::before { &::before {
content: "¥"; content: "¥";
font-size: 12px; font-size: $uni-font-size-sm;
} }
} }
@ -189,7 +189,7 @@
color: #fff; color: #fff;
border: none; border: none;
border-radius: 24px; border-radius: 24px;
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: 600; font-weight: 600;
display: flex; display: flex;
align-items: center; align-items: center;

3
src/pages/goods/components/GoodInfo/index.vue
View File

@ -47,9 +47,8 @@ const facilitiesList = computed(() => {
return []; return [];
}); });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

8
src/pages/goods/components/GoodInfo/styles/index.scss
View File

@ -8,8 +8,8 @@
margin-bottom: 12px; margin-bottom: 12px;
.title { .title {
font-size: 16px; font-size: $uni-font-size-lg;
color: #333; color: $uni-text-color;
font-weight: 600; font-weight: 600;
line-height: 1.4; line-height: 1.4;
flex: 0 280px; flex: 0 280px;
@ -54,8 +54,8 @@
border-radius: 6px; border-radius: 6px;
.facility-text { .facility-text {
font-size: 12px; font-size: $uni-font-size-sm;
color: #333; color: $uni-text-color;
line-height: 1; line-height: 1;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;

20
src/pages/goods/index.vue
View File

@ -70,6 +70,7 @@ import {
commodityDailyPriceList, commodityDailyPriceList,
orderPay, orderPay,
} from "@/request/api/GoodsApi"; } from "@/request/api/GoodsApi";
import { ThrottleUtils } from "@/utils";
import TopNavBar from "@/components/TopNavBar/index.vue"; import TopNavBar from "@/components/TopNavBar/index.vue";
import ImageSwiper from "@/components/ImageSwiper/index.vue"; import ImageSwiper from "@/components/ImageSwiper/index.vue";
import GoodInfo from "./components/GoodInfo/index.vue"; import GoodInfo from "./components/GoodInfo/index.vue";
@ -122,6 +123,19 @@ const goodsInfo = async (params) => {
commodityId: goodsData.value.commodityId, commodityId: goodsData.value.commodityId,
}); });
} }
if (goodsData.value.commodityStatus !== "1") {
uni.showModal({
title: "温馨提示",
content: "商品已下架，是否返回上一页？",
success: (res) => {
if (res.confirm) {
uni.navigateBack({ delta: 1 });
}
},
});
return;
}
}; };
const configGoodsData = () => { const configGoodsData = () => {
@ -164,7 +178,7 @@ const showConfirmPopup = () => {
}; };
// 处理确认订单 // 处理确认订单
const handleConfirmOrder = async (orderData) => { const handleConfirmOrder = ThrottleUtils.createThrottle(async (orderData) => {
console.log("确认订单---1:", orderData); console.log("确认订单---1:", orderData);
const { goodsData } = orderData; const { goodsData } = orderData;
// 购买的商品id // 购买的商品id
@ -260,7 +274,7 @@ const handleConfirmOrder = async (orderData) => {
}); });
}, },
}); });
}; }, 1000);
// 处理关闭弹窗 // 处理关闭弹窗
const handleCloseConfirm = () => { const handleCloseConfirm = () => {
@ -349,5 +363,5 @@ const handleDateSelect = (data) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

58
src/pages/goods/styles/index.scss
View File

@ -1,7 +1,4 @@
@use "sass:color";
$button-color: #00a6ff; $button-color: #00a6ff;
$button-hover-color: color.scale($button-color, $lightness: -16%);
.goods-container { .goods-container {
display: flex; display: flex;
@ -37,8 +34,8 @@ $button-hover-color: color.scale($button-color, $lightness: -16%);
flex-shrink: 0; flex-shrink: 0;
.module-title { .module-title {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
text-align: center; text-align: center;
word-wrap: break-word; word-wrap: break-word;
margin-left: 4px; margin-left: 4px;
@ -47,7 +44,7 @@ $button-hover-color: color.scale($button-color, $lightness: -16%);
.module-desc { .module-desc {
flex: 1; flex: 1;
font-size: 12px; font-size: $uni-font-size-sm;
color: #666; color: #666;
line-height: 1.5; line-height: 1.5;
margin-top: 4px; margin-top: 4px;
@ -94,8 +91,8 @@ $button-hover-color: color.scale($button-color, $lightness: -16%);
} }
.label { .label {
font-size: 14px; font-size: $uni-font-size-base;
color: #333; color: $uni-text-color;
} }
.price { .price {
@ -106,7 +103,7 @@ $button-hover-color: color.scale($button-color, $lightness: -16%);
&::before { &::before {
content: "¥"; content: "¥";
font-size: 12px; font-size: $uni-font-size-sm;
} }
} }
@ -119,53 +116,14 @@ $button-hover-color: color.scale($button-color, $lightness: -16%);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 50px; border-radius: $uni-border-radius-50px;
height: 42px; height: 42px;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
transition: all 0.3s ease; transition: all 0.3s ease;
letter-spacing: 0.5px; letter-spacing: 0.5px;
margin-left: auto; margin-left: auto;
// 按钮波纹效果
&::before {
content: "";
position: absolute;
top: 50%;
left: 50%;
width: 0;
height: 0;
background: rgba(255, 255, 255, 0.3);
border-radius: 50%;
transform: translate(-50%, -50%);
transition: width 0.6s, height 0.6s;
}
&:hover {
background: linear-gradient(
135deg,
$button-hover-color 0%,
color.scale($button-hover-color, $lightness: -11.9%) 100%
);
transform: translateY(-2px);
box-shadow: 0 4px 16px rgba($button-color, 0.4);
&::before {
width: 300px;
height: 300px;
}
}
&:active {
transform: translateY(-1px);
box-shadow: 0 2px 8px rgba($button-color, 0.3);
}
&:focus {
outline: none;
box-shadow: 0 0 0 3px rgba($button-color, 0.3);
}
} }
} }

2
src/pages/index/components/chat/ChatCardAi/index.vue
View File

@ -66,5 +66,5 @@ watch(
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatCardMine/index.vue
View File

@ -16,5 +16,5 @@ defineProps({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatCardOther/index.vue
View File

@ -16,5 +16,5 @@ defineProps({
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages/index/components/chat/ChatCardOther/styles/index.scss
View File

@ -8,7 +8,7 @@
overflow-x: hidden; // ✅ 防止横向撑开 overflow-x: hidden; // ✅ 防止横向撑开
text { text {
font-size: 14px; font-size: $uni-font-size-base;
color: #333333; color: $uni-text-color;
} }
} }

2
src/pages/index/components/chat/ChatInputArea/index.vue
View File

@ -244,5 +244,5 @@ defineExpose({ focusInput });
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

10
src/pages/index/components/chat/ChatInputArea/styles/index.scss
View File

@ -2,7 +2,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
border-radius: 22px; border-radius: 22px;
background-color: #ffffff; background-color: $uni-bg-color;
box-shadow: 0px 0px 20px 0px rgba(52, 25, 204, 0.05); box-shadow: 0px 0px 20px 0px rgba(52, 25, 204, 0.05);
margin: 0 12px; margin: 0 12px;
margin-bottom: 8px; margin-bottom: 8px;
@ -29,12 +29,12 @@
.hold-to-talk-button { .hold-to-talk-button {
width: 100%; width: 100%;
height: 44px; height: 44px;
color: #333333; color: $uni-text-color;
font-size: 16px; font-size: $uni-font-size-lg;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
background-color: #ffffff; background-color: $uni-bg-color;
transition: all 0.2s ease; transition: all 0.2s ease;
user-select: none; user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
@ -68,7 +68,7 @@
width: 100%; width: 100%;
max-height: 92px; max-height: 92px;
min-height: 22px; min-height: 22px;
font-size: 16px; font-size: $uni-font-size-lg;
line-height: 22px; line-height: 22px;
margin: 6px 0; margin: 6px 0;

2
src/pages/index/components/chat/ChatMainList/index.vue
View File

@ -802,5 +802,5 @@ const resetConfig = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatMoreTips/index.vue
View File

@ -39,5 +39,5 @@ const sendReply = (text) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages/index/components/chat/ChatMoreTips/styles/index.scss
View File

@ -15,7 +15,7 @@
border-radius: 8px; border-radius: 8px;
margin: 4px; margin: 4px;
box-shadow: 0 2px 5px 0px rgba(0, 0, 0, 0.1); box-shadow: 0 2px 5px 0px rgba(0, 0, 0, 0.1);
background-color: #ffffff; background-color: $uni-bg-color;
padding: 2px 12px; padding: 2px 12px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -25,7 +25,7 @@
.more-tips-item-title { .more-tips-item-title {
font-weight: 500; font-weight: 500;
font-size: 12px; font-size: $uni-font-size-sm;
color: #00a6ff; color: #00a6ff;
line-height: 24px; line-height: 24px;
text-align: center; text-align: center;

2
src/pages/index/components/chat/ChatQuickAccess/index.vue
View File

@ -96,5 +96,5 @@ const initData = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatQuickAccess/styles/index.scss
View File

@ -50,7 +50,7 @@
text { text {
font-weight: 500; font-weight: 500;
font-size: 12px; font-size: $uni-font-size-sm;
color: #201f32; color: #201f32;
line-height: 16px; line-height: 16px;
} }

2
src/pages/index/components/chat/ChatTopBgImg/index.vue
View File

@ -5,5 +5,5 @@
<script></script> <script></script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatTopNavBar/index.vue
View File

@ -33,5 +33,5 @@ const closeDrawer = (e) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/chat/ChatTopWelcome/index.vue
View File

@ -49,5 +49,5 @@ const backgroundStyle = computed(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/drawer/DrawerHome/index.vue
View File

@ -50,5 +50,5 @@ onUnmounted(() => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/drawer/DrawerHome/styles/index.scss
View File

@ -15,7 +15,7 @@
.title { .title {
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
color: #333333; color: $uni-text-color;
} }
.close-icon { .close-icon {

2
src/pages/index/components/drawer/MineSetting/index.vue
View File

@ -115,5 +115,5 @@ const handleLogout = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

6
src/pages/index/components/drawer/MineSetting/styles/index.scss
View File

@ -27,12 +27,12 @@
.avatar-row .avatar { .avatar-row .avatar {
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
border-radius: 50%; border-radius: $uni-border-radius-circle;
} }
.label { .label {
font-size: 28rpx; font-size: 28rpx;
color: #333; color: $uni-text-color;
} }
.value { .value {
@ -59,7 +59,7 @@
height: 42px; height: 42px;
margin-top: 40px; margin-top: 40px;
background-color: #fff; background-color: #fff;
color: #333; color: $uni-text-color;
border-radius: 8rpx; border-radius: 8rpx;
border: none; border: none;
} }

2
src/pages/index/components/loading/DotLoading.vue
View File

@ -18,7 +18,7 @@
display: inline-block; display: inline-block;
width: 3px; width: 3px;
height: 3px; height: 3px;
border-radius: 50%; border-radius: $uni-border-radius-circle;
margin-right: 3px; margin-right: 3px;
background: #333333; background: #333333;
animation: wave 1.3s linear infinite; animation: wave 1.3s linear infinite;

2
src/pages/index/components/module/ActivityListComponent/index.vue
View File

@ -45,5 +45,5 @@ const handleClick = (item) => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages/index/components/module/ActivityListComponent/styles/index.scss
View File

@ -27,8 +27,8 @@
right: 12px; right: 12px;
bottom: 12px; bottom: 12px;
background-color: #ffeb00; background-color: #ffeb00;
color: #333; color: $uni-text-color;
font-size: 14px; font-size: $uni-font-size-base;
font-weight: 500; font-weight: 500;
padding: 4px 12px; padding: 4px 12px;
border-radius: 20px; border-radius: 20px;

2
src/pages/index/components/module/AttachListComponent/index.vue
View File

@ -41,5 +41,5 @@ onMounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

4
src/pages/index/components/module/AttachListComponent/styles/index.scss
View File

@ -5,7 +5,7 @@
} }
.tag-item { .tag-item {
background-color: #ffffff; background-color: $uni-bg-color;
border-radius: 8px; border-radius: 8px;
padding: 4px 10px; padding: 4px 10px;
margin-right: 8px; margin-right: 8px;
@ -17,5 +17,5 @@
.tag-text { .tag-text {
color: #00a6ff; /* 蓝色文字，可根据设计调整 */ color: #00a6ff; /* 蓝色文字，可根据设计调整 */
font-size: 14px; font-size: $uni-font-size-base;
} }

2
src/pages/index/components/module/DetailCardCompontent/index.vue
View File

@ -26,5 +26,5 @@ const props = defineProps({
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

2
src/pages/index/components/module/DetailCardGoodsContentList/index.vue
View File

@ -69,5 +69,5 @@ const placeOrderHandle = (item) => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "./styles/index.scss"; @import "./styles/index.scss";
</style> </style>

8
src/pages/index/components/module/DetailCardGoodsContentList/styles/index.scss
View File

@ -15,7 +15,7 @@
flex-direction: column; flex-direction: column;
align-items: start; align-items: start;
width: 188px; width: 188px;
background-color: #ffffff; background-color: $uni-bg-color;
border-radius: 10px; border-radius: 10px;
margin-right: 8px; margin-right: 8px;
padding-bottom: 12px; padding-bottom: 12px;
@ -26,7 +26,7 @@
left: 8px; left: 8px;
background: #ffe7b2; background: #ffe7b2;
color: #b97a00; color: #b97a00;
font-size: 12px; font-size: $uni-font-size-sm;
padding: 2px 8px; padding: 2px 8px;
border-radius: 4px; border-radius: 4px;
z-index: 2; z-index: 2;
@ -60,7 +60,7 @@
} }
.card-title { .card-title {
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: bold; font-weight: bold;
color: #222; color: #222;
width: 100%; width: 100%;
@ -113,7 +113,7 @@
.card-price { .card-price {
color: #ff6600; color: #ff6600;
font-size: 16px; font-size: $uni-font-size-lg;
font-weight: bold; font-weight: bold;
} }
.card-unit { .card-unit {

Some files were not shown because too many files have changed in this diff Show More