diff --git a/frontend/pages/asset-detail/asset-detail.vue b/frontend/pages/asset-detail/asset-detail.vue
index f51fc48..f21655f 100644
--- a/frontend/pages/asset-detail/asset-detail.vue
+++ b/frontend/pages/asset-detail/asset-detail.vue
@@ -235,21 +235,8 @@
- -->
-
-
-
-
-
-
@@ -649,8 +636,7 @@ const loadData = async () => {
loadStickersForAsset(asset.material_relations || asset.materials)
}
- if (asset.remain_time > 0) {
- remainSeconds.value = asset.remain_time;
+ if (asset.exhibition_expire_at) {
startCountdown();
}
console.log(res.data)
@@ -797,11 +783,6 @@ onLoad((options) => {
assetIdParam.value = options?.asset_id || '';
orderIdParam.value = options?.order_id || '';
fromParam.value = options?.from || '';
- studioKindParam.value = options?.studio_kind || '';
- craftConfirmMode.value = fromParam.value === 'craft_confirm';
- if (craftConfirmMode.value) {
- loadCraftConfirm();
- }
});
onShow(() => {
@@ -1153,7 +1134,6 @@ onUnmounted(() => {
color: #fff;
font-family: 'yt', sans-serif;
font-variant-numeric: tabular-nums;
- text-shadow: 0 2px 8px rgba(0, 0, 0, 0.7);
}
/* 收益 */
@@ -1181,30 +1161,6 @@ onUnmounted(() => {
text-shadow: 0 2px 8px rgba(0, 0, 0, 0.7);
}
-/* 收益 */
-.earnings-area {
- display: flex;
- align-items: center;
- gap: 10rpx;
- background: linear-gradient(to bottom right,
- #F0E4B1 0%,
- #F08399 50%,
- #B94E73 100%);
- border-radius: 999rpx;
- box-shadow:
- 0 4rpx 12rpx rgba(255, 143, 158, 0.2),
- inset 0 2rpx 4rpx rgba(255, 255, 255, 0.4);
- padding: 10rpx 28rpx;
-}
-
-.earnings-text {
- font-size: 32rpx;
- font-weight: bold;
- color: #e6e6e6;
- font-family: 'yt', sans-serif;
- font-variant-numeric: tabular-nums;
-}
-
/* 倒计时 */
.countdown-area {
display: flex;
@@ -1555,87 +1511,9 @@ onUnmounted(() => {
margin-bottom: 8rpx;
/* transform: scale(1.2); */
}
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-.craft-confirm-scroll {
- flex: 1;
- height: calc(100vh - 120rpx);
- margin-top: 100rpx;
-}
-
-.craft-card-section {
- margin-top: 24rpx;
-}
-
-.craft-card-wrapper {
- position: relative;
- width: 520rpx;
- height: 680rpx;
- margin: 0 auto;
-}
-
-.craft-lenticular-slot {
- position: absolute;
- left: 50%;
- top: 50%;
- width: 78%;
- height: 82%;
- transform: translate(-50%, -50%) rotate(-6deg);
- z-index: 2;
-}
-
-.craft-lenticular-card {
- width: 100%;
- height: 100%;
-}
-
-.craft-card-image {
- position: absolute;
- left: 50%;
- top: 50%;
- width: 78%;
- height: 82%;
- transform: translate(-50%, -50%) rotate(-6deg);
- z-index: 2;
- border-radius: 16rpx;
-}
-
-.craft-info-row {
- margin-top: 32rpx;
-}
-
-.craft-mint-bar {
- margin: 48rpx 32rpx 80rpx;
-}
-
-.craft-mint-btn {
- width: 100%;
- height: 96rpx;
- line-height: 96rpx;
- border-radius: 48rpx;
- background: linear-gradient(90deg, #ff6b9d 0%, #ffa8c5 100%);
- color: #fff;
- font-size: 32rpx;
- font-weight: bold;
- border: none;
-}
-
-.craft-mint-btn[disabled] {
- opacity: 0.65;
-}
-
-=======
-.visit-text {
+.visit-text{
color: #FFFFFF;
font-size: 16rpx;
}
->>>>>>> ebe57bc078a35ed4c13ccf966c8f7b5af6327c61
-=======
-.visit-text{
- color: #FFFFFF;
- font-size:16rpx;
-}
->>>>>>> af74dd5 (style:修改个人设置页面和藏品详细页的样式)
diff --git a/frontend/utils/api.js b/frontend/utils/api.js
index 31c1b16..da8ab9b 100644
--- a/frontend/utils/api.js
+++ b/frontend/utils/api.js
@@ -10,12 +10,12 @@ const baseURL = 'http://192.168.110.60:8080' // H5 开发用本机
// #ifdef APP-PLUS
// 开发调试:手机和电脑同一WiFi时用这个(改成你电脑IP)
// 上线后:改成实际服务器地址
-// const baseURL = 'http://192.168.110.60:8080'
+const baseURL = 'http://192.168.110.60:8080'
// #endif
// 服务器地址(正式上线用)
// #ifdef APP-PLUS
-const baseURL = 'http://101.132.250.62:8080'
+// const baseURL = 'http://101.132.250.62:8080'
// #endif
// 是否使用模拟数据(开发调试时设为 true,后端API准备好后改为 false)