fine-tune the new UI theme, merge the code and fixed conflicts

This commit is contained in:
RockYang
2024-12-24 16:13:36 +08:00
26 changed files with 141 additions and 139 deletions

View File

@@ -87,11 +87,12 @@
</el-col>
</el-row>
<el-empty description="暂无数据" v-else :image="nodata" />
<div class="box-card">
<h2 class="headline">消费账单</h2>
<h2 class="headline">消费账单</h2>
<div class="user-order">
<user-order v-if="isLogin" :key="userOrderKey" />
<div class="user-order">
<user-order v-if="isLogin" :key="userOrderKey" />
</div>
</div>
</div>
</div>