From 54de16a6c76c05461f77cefc5ca79d3c051ce346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 19 Jul 2024 13:41:59 +0800
Subject: [PATCH 1/2] 1
---
pages/chooseasong/index.vue | 6 +++---
pages/chooseasong/record.vue | 11 +++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue
index a00d19a..7d194f1 100644
--- a/pages/chooseasong/index.vue
+++ b/pages/chooseasong/index.vue
@@ -32,7 +32,7 @@
-
@@ -430,7 +430,7 @@
.contentclass {
padding: 0rpx 28rpx 215rpx 28rpx;
overflow: auto;
-
+
.contentclassbox {
width: 100%;
padding: 12rpx 24rpx;
@@ -630,7 +630,7 @@
}
.contentupopupboutton {
- padding: 32rpx 70rpx 0 70rpx;
+ padding: 50rpx 70rpx 0 70rpx;
.contentupopupbouttonO {
width: 196rpx;
diff --git a/pages/chooseasong/record.vue b/pages/chooseasong/record.vue
index f24cb61..7fb3e53 100644
--- a/pages/chooseasong/record.vue
+++ b/pages/chooseasong/record.vue
@@ -27,9 +27,12 @@
-
-
+
+
+
+
@@ -52,7 +55,7 @@
size: 10,
status: 'loadmore',
},
- shopId: ''
+ shopId: '10'
};
},
onLoad(e) {
From dc2df55efe56885951e74cf1951c53cfb41f048c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 19 Jul 2024 15:36:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E6=AD=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/navseat.vue | 5 +-
pages/chooseasong/index.vue | 45 ++-----
pages/chooseasong/record.vue | 235 +++++++++++++++++++----------------
3 files changed, 142 insertions(+), 143 deletions(-)
diff --git a/components/navseat.vue b/components/navseat.vue
index 03c15e5..850b636 100644
--- a/components/navseat.vue
+++ b/components/navseat.vue
@@ -108,10 +108,10 @@
}
.navbarcontent {
- position: -webkit-sticky;
- position: sticky;
+ position: relative;
top: 0;
left: 0;
+ width: 100%;
z-index: 9999;
.active {
@@ -136,6 +136,7 @@
.navbar {
position: fixed;
top: 0;
+ left: 0;
width: 100%;
z-index: 99;
diff --git a/pages/chooseasong/index.vue b/pages/chooseasong/index.vue
index 7d194f1..10f4c88 100644
--- a/pages/chooseasong/index.vue
+++ b/pages/chooseasong/index.vue
@@ -1,17 +1,13 @@
-
+
-
-
-
@@ -19,7 +15,6 @@
-
{{item.name}}
{{item.originSinger}}
@@ -36,28 +31,6 @@
color="#999" iconSize="28" />
-
-
+ color='rgba(255, 255, 255, 0.73)' speed='40' fontSize='24'
+ bgColor='transparent'>
@@ -149,7 +123,7 @@
keyWord: '',
form: {
page: 1,
- size: 10,
+ size: 12,
status: 'loadmore',
},
shopId: "11",
@@ -247,7 +221,7 @@
this.list = []
this.is_end = false
this.form.page = 1
- this.form.size = 10
+ this.form.size = 12
this.form.status = 'loadmore'
this.cashierService()
this.apisongsinging()
@@ -277,13 +251,12 @@
} else {
this.list = [...this.list, ...res.data.list];
}
- this.form.status = 'loading';
- if (res.data.pageNum >= res.data.pages) {
+ if (this.form.page > res.data.pages) {
this.form.status = 'nomore';
} else {
- this.form.status = 'loadmore';
+ this.form.status = 'loading';
}
- }, 500)
+ }, 1000)
}
},
// 唤起弹框
@@ -430,7 +403,7 @@
.contentclass {
padding: 0rpx 28rpx 215rpx 28rpx;
overflow: auto;
-
+
.contentclassbox {
width: 100%;
padding: 12rpx 24rpx;
diff --git a/pages/chooseasong/record.vue b/pages/chooseasong/record.vue
index 7fb3e53..0dd3660 100644
--- a/pages/chooseasong/record.vue
+++ b/pages/chooseasong/record.vue
@@ -2,37 +2,43 @@
+ iconcolor="#fff" @Topdistance='Topdistance'>
-
-
-
- {{item.name}}
- 未支付
- 已取消
-
- 前面还有{{item.preCount}}首
- 已支付
+
+
+
+ {{item.name}}
+ 未支付
+ 已取消
+
+ 前面还有{{item.preCount}}首
+ 已支付
+
+ 演唱中
+ 已演唱
- 演唱中
- 已演唱
+
+ ¥{{item.price}}
+
+
+ 下单时间：{{$u.timeFormat(item.create_time,'yyyy-mm-dd hh:MM') || '无'}}
+
+
-
- ¥{{item.price}}
+
+
+
-
- 下单时间：{{$u.timeFormat(item.create_time,'yyyy-mm-dd hh:MM') || '无'}}
+
+
-
-
-
-
-
+
+
@@ -63,13 +69,25 @@
},
mounted() {
setTimeout(() => {
- this.GetTop()
+ this.Topdistance()
}, 200)
},
onShow() {
this.cashierService()
},
methods: {
+ Topdistance(res) {
+ // console.log(res,111)
+ var resdata = res
+ uni.getSystemInfo({
+ success: (data) => {
+ console.log(data)
+ this.Height = data.screenHeight - 32 - resdata + 'px'
+ // console.log(this.Height)
+ // console.log(this.Height)
+ }
+ })
+ },
lower() {
console.log('触底加载')
this.cashierService()
@@ -98,7 +116,7 @@
this.list = [...this.list, ...res.data.list];
}
this.form.status = 'loading';
- if (res.data.pageNum == res.data.pages) {
+ if (this.form.page > res.data.pages) {
this.form.status = 'nomore';
} else {
this.form.status = 'loading';
@@ -114,7 +132,7 @@
console.log(data)
this.$u.getRect('.content').then(res => {
console.log(res, 111)
- this.Height = data.safeArea.height - 36 + 'px'
+ this.Height = data.safeArea.height - 32 + 'px'
// console.log(this.Height)
})
// console.log(this.Height)
@@ -131,110 +149,117 @@
height: 100%;
background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/background.png);
background-size: 100% 100%;
+ overflow: auto;
}
.content {
+ position: relative;
+ z-index: 99;
padding: 32rpx 28rpx 0rpx 28rpx;
-
- .contentbox:nth-child(1) {
- margin-top: 0;
- }
-
- .contentbox {
- position: relative;
- margin-top: 48rpx;
- width: 100%;
- background: rgba(129, 125, 207, 0.2);
- border: 2px solid #828282;
- backdrop-filter: blur(20px);
- border-radius: 24rpx 24rpx 24rpx 24rpx;
-
- .contentboxafter {
- position: absolute;
- bottom: 0;
- width: 482rpx;
- height: 14rpx;
- background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/dibuyin.png);
- background-size: 100% 100%;
- left: 50%;
- transform: translate(-50%, 0);
+ overflow: auto;
+ .scrollview {
+ overflow: auto;
+ .contentbox:nth-child(1) {
+ margin-top: 0;
}
- .contentboxtop {
- padding: 16rpx 24rpx;
- border-bottom: 2rpx solid #F6F6F6;
+ .contentbox {
+ position: relative;
+ margin-top: 48rpx;
+ width: 100%;
+ background: rgba(129, 125, 207, 0.2);
+ border: 2px solid #828282;
+ backdrop-filter: blur(20px);
+ border-radius: 24rpx 24rpx 24rpx 24rpx;
- .contentboxtopname {
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 32rpx;
- color: #fff;
+ .contentboxafter {
+ position: absolute;
+ bottom: 0;
+ width: 482rpx;
+ height: 14rpx;
+ background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/chooseasong/dibuyin.png);
+ background-size: 100% 100%;
+ left: 50%;
+ transform: translate(-50%, 0);
}
- .contentboxtopone {
- display: flex;
- justify-content: flex-start;
- align-items: center;
+ .contentboxtop {
+ padding: 16rpx 24rpx;
+ border-bottom: 2rpx solid #F6F6F6;
- .contentboxtopone_one {
+ .contentboxtopname {
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 24rpx;
- color: #F9DDF9;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #fff;
}
- .contentboxtopone_tow {
- margin-left: 16rpx;
+ .contentboxtopone {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .contentboxtopone_one {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #F9DDF9;
+ }
+
+ .contentboxtopone_tow {
+ margin-left: 16rpx;
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #32AA52;
+ text-shadow: 0px 6px 6px rgba(50, 170, 82, 0.55);
+ }
+ }
+
+ .contentboxtopnametow {
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
+ font-weight: 500;
font-size: 28rpx;
- color: #32AA52;
- text-shadow: 0px 6px 6px rgba(50, 170, 82, 0.55);
+ color: #FF9C39;
+ text-shadow: 0px 4px 4px rgba(255, 156, 57, 0.37);
+ }
+
+ .contentboxtopname_weizhifu {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: rgba(255, 255, 255, 0.5);
+ text-shadow: 0px 4px 4px rgba(255, 255, 255, 0.37);
+ }
+
+ .contentboxtopnametowthere {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ text-shadow: 0px 4px 4px rgba(255, 255, 255, 0.37);
}
}
- .contentboxtopnametow {
+ .contentboxtopO {
+ padding: 0 24rpx;
+ margin-top: 10rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
+ font-weight: 400;
font-size: 28rpx;
- color: #FF9C39;
- text-shadow: 0px 4px 4px rgba(255, 156, 57, 0.37);
+ color: #999999;
}
- .contentboxtopname_weizhifu {
+ .contentboxtopT {
+ padding: 0rpx 24rpx 32rpx 24rpx;
+ margin-top: 16rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 28rpx;
- color: rgba(255, 255, 255, 0.5);
- text-shadow: 0px 4px 4px rgba(255, 255, 255, 0.37);
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #999999;
}
-
- .contentboxtopnametowthere {
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 500;
- font-size: 28rpx;
- color: #FFFFFF;
- text-shadow: 0px 4px 4px rgba(255, 255, 255, 0.37);
- }
- }
-
- .contentboxtopO {
- padding: 0 24rpx;
- margin-top: 10rpx;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 28rpx;
- color: #999999;
- }
-
- .contentboxtopT {
- padding: 0rpx 24rpx 32rpx 24rpx;
- margin-top: 16rpx;
- font-family: Source Han Sans CN, Source Han Sans CN;
- font-weight: 400;
- font-size: 24rpx;
- color: #999999;
}
}
+
}
\ No newline at end of file