From 7d025ad8c35528d9ebd1ec741ed5eed72f9e7995 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Thu, 5 Sep 2024 18:00:43 +0800
Subject: [PATCH] =?UTF-8?q?vip=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
page_vip/card_his.vue | 140 ++++++++++++
page_vip/myVip_index.vue | 32 ++-
page_vip/vip_his.vue | 173 +++++++++++++++
page_vip/vip_index.vue | 7 +-
pages.json | 18 ++
pages/index/index.vue | 2 +-
pages/my.vue | 423 +++++++++++++++++++++++-------------
pages_admin/admin_worke.vue | 2 +-
8 files changed, 625 insertions(+), 172 deletions(-)
create mode 100644 page_vip/card_his.vue
create mode 100644 page_vip/vip_his.vue
diff --git a/page_vip/card_his.vue b/page_vip/card_his.vue
new file mode 100644
index 0000000..0341694
--- /dev/null
+++ b/page_vip/card_his.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+ 电单车15天5次卡
+
+
+ 3.9 元
+
+
+
+ 2024-07-28 17:39:50
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_vip/myVip_index.vue b/page_vip/myVip_index.vue
index 6eb0bb7..681257e 100644
--- a/page_vip/myVip_index.vue
+++ b/page_vip/myVip_index.vue
@@ -4,36 +4,36 @@
height='45'>
-
+
- 电单车15天5次卡
+ {{item.couponName}}
- 有效期至2024-08-04
+ 有效期至{{formatDate(item.expirationTime) }}
- 剩余次数 5
+ 剩余次数 {{item.limitNum}}
-
+
- 电单车15天5次卡
+ {{item.couponName}}
- 有效期至2024-08-04
+ 有效期至{{formatDate(item.expirationTime) }}
已过期
-
+
- 有效期至2024-08-28
+ 有效期至{{formatDate(item.expirationTime) }}
-
+
- 有效期至2024-08-28
+ 有效期至{{formatDate(item.expirationTime) }}
@@ -72,6 +72,14 @@
}
});
},
+ formatDate(dateString) {
+ if (!dateString) return '';
+ const date = new Date(dateString);
+ const year = date.getFullYear();
+ const month = (date.getMonth() + 1).toString().padStart(2, '0'); // 月份从0开始，需要加1
+ const day = date.getDate().toString().padStart(2, '0');
+ return `${year}-${month}-${day}`;
+ },
getcard(){
let data={
userId:this.userinfo.userId
@@ -81,7 +89,7 @@
if (res.code == 200) {
this.CouponLists = res.data
- } else {
+ } else {
// uni.showToast({
// title: res.msg,
// icon: 'none',
diff --git a/page_vip/vip_his.vue b/page_vip/vip_his.vue
new file mode 100644
index 0000000..ef1d639
--- /dev/null
+++ b/page_vip/vip_his.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+ 月卡会员
+
+
+
+
+
+
+
+ 购买时长：1个月
+
+
+ 有效期：2024-07-29 至 2024-08-29
+
+
+ 支付时间：2024-07-29 13:59
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_vip/vip_index.vue b/page_vip/vip_index.vue
index cca9e8d..a56159f 100644
--- a/page_vip/vip_index.vue
+++ b/page_vip/vip_index.vue
@@ -26,7 +26,7 @@
月卡会员{{ daysUntilExpiration }}天后到期
-
+
购买记录 >
@@ -104,6 +104,11 @@
this.getCouponLists()
},
methods: {
+ topage(){
+ uni.navigateTo({
+ url:'/page_vip/vip_his'
+ })
+ },
calculateDaysUntilExpiration() {
const currentDate = new Date();
const expirationDate = new Date(this.userinfo.expirationTime);
diff --git a/pages.json b/pages.json
index 33b680c..dc97f81 100644
--- a/pages.json
+++ b/pages.json
@@ -241,6 +241,24 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "vip_his",
+ "style" :
+ {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "card_his",
+ "style" :
+ {
+ "navigationBarTitleText": "上传",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 38a9ef6..ff896a0 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4404,7 +4404,7 @@
});
},
fail(err) {
- that.closePay()
+ // that.closePay()
that.ispaid = false
// 支付失败逻辑
uni.showToast({
diff --git a/pages/my.vue b/pages/my.vue
index 76062f9..8b4f26e 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -1,12 +1,14 @@
-
+
-
-
+
+
@@ -31,14 +33,14 @@
-
+
-
+
-
+
押金
@@ -54,7 +56,7 @@
-
+
我的订单
@@ -191,44 +193,60 @@
-
-
+
+
+
押金
-
-
-
+
+
+
+
实名认证
-
-
+
+
+
用车指南
-
-
+
+
+
客服服务
-
+
月卡会员
- 仅需￥{{CarkTypeList[0].retailPrice }}，可享30天免费骑行权益
+ 仅需￥{{CarkTypeList[0].retailPrice }}，可享30天免费骑行权益
+
-
+
+ 月卡会员
+ 月卡会员{{ daysUntilExpiration }}天后到期
+
+ 立即续费
+
+
+
- {{item.name}}
+ {{item.name}}
{{item.retailPrice}}元
@@ -244,36 +262,42 @@
-
-
-
+
+
+
+
我的订单
-
+
-
-
-
+
+
+
+
问题上报
-
+
-
-
+
+
+
帮助中心
-
+
-
+
运维人员
-
+
-
+
管理人员
-
+
@@ -293,8 +317,8 @@
background: {
backgroundColor: 'transparent'
},
- backcolor:{
- color:'#ffffff'
+ backcolor: {
+ color: '#ffffff'
},
info: {},
totype: 0,
@@ -303,9 +327,10 @@
deptId: 0,
statusBarHeight: 0,
navBarHeight: 0,
- areaInfo:{},
- CouponList:[],
- CarkTypeList:[]
+ areaInfo: {},
+ CouponList: [],
+ CarkTypeList: [],
+ daysUntilExpiration: 0 // 剩余天数
@@ -344,18 +369,28 @@
}
},
methods: {
- tobuy(){
+ calculateDaysUntilExpiration() {
+ const currentDate = new Date();
+ const expirationDate = new Date(this.userinfo.expirationTime);
+
+ // 计算时间差（毫秒）
+ const timeDifference = expirationDate - currentDate;
+
+ // 将毫秒转换为天
+ this.daysUntilExpiration = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+ },
+ tobuy() {
uni.navigateTo({
- url:'/page_vip/buyCard'
+ url: '/page_vip/buyCard'
})
},
getarea() {
let id = uni.getStorageSync('areaId');
this.$u.get("/app/area/" + id).then((res) => {
-
+
if (res.code == 200) {
this.areaInfo = res.data
-
+
} else {
// uni.showToast({
// title: res.msg,
@@ -365,15 +400,15 @@
}
});
},
- getCouponList(){
- let data={
- type:'3,4'
+ getCouponList() {
+ let data = {
+ type: '3,4'
}
- this.$u.get("/app/couponList",data ).then((res) => {
-
+ this.$u.get("/app/couponList", data).then((res) => {
+
if (res.code == 200) {
this.CouponList = res.data
-
+
} else {
// uni.showToast({
// title: res.msg,
@@ -383,15 +418,15 @@
}
});
},
- getCarkType(){
- let data={
- type:'1'
+ getCarkType() {
+ let data = {
+ type: '1'
}
- this.$u.get("/app/couponList",data ).then((res) => {
-
+ this.$u.get("/app/couponList", data).then((res) => {
+
if (res.code == 200) {
this.CarkTypeList = res.data
-
+
} else {
// uni.showToast({
// title: res.msg,
@@ -401,31 +436,31 @@
}
});
},
- layout(){
+ layout() {
this.$u.post('/logout').then((res) => {
if (res.code == 200) {
// 获取所有缓存键
- const keys = uni.getStorageInfoSync().keys;
-
- // 指定要保留的缓存键
- const preserveKey = 'deptId'; // 替换为你想要保留的缓存键
-
- // 遍历所有缓存键并删除除指定键以外的所有键
- keys.forEach(key => {
- if (key !== preserveKey) {
- uni.removeStorageSync(key);
- }
- });
-
- // 进行重定向
- uni.redirectTo({
- url: '/pages/index/index'
- });
+ const keys = uni.getStorageInfoSync().keys;
+
+ // 指定要保留的缓存键
+ const preserveKey = 'deptId'; // 替换为你想要保留的缓存键
+
+ // 遍历所有缓存键并删除除指定键以外的所有键
+ keys.forEach(key => {
+ if (key !== preserveKey) {
+ uni.removeStorageSync(key);
+ }
+ });
+
+ // 进行重定向
+ uni.redirectTo({
+ url: '/pages/index/index'
+ });
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
-
+
},
topage(num) {
if (num == 0) {
@@ -484,18 +519,18 @@
url: '/page_user/khfw/khfw'
})
} else if (num == 11) {
- if(info.idCard==''){
+ if (info.idCard == '') {
uni.navigateTo({
url: '/page_user/idcard_test'
})
- }else{
+ } else {
uni.showToast({
title: '实名授权已完成',
icon: 'none',
duration: 2000
});
}
-
+
}
},
@@ -541,6 +576,7 @@
this.getCarkType()
this.$store.commit('SET_USERID', res.user.userId);
this.info = res.user
+ // this.calculateDaysUntilExpiration()
if (info.role != 1) {
this.getareaList()
}
@@ -615,80 +651,142 @@
.page {
width: 750rpx;
+
.fee_box {
- margin-top: 18rpx;
- position: relative;
- margin-left: 38rpx;
- width: 680rpx;
- height: 288rpx;
- background-image: url('https://lxnapi.ccttiot.com/bike/img/static/ugciMYClSGgJxP8HYoRU');
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
+ margin-top: 18rpx;
+ position: relative;
+ margin-left: 38rpx;
+ width: 680rpx;
+ height: 288rpx;
+ background-image: url('https://lxnapi.ccttiot.com/bike/img/static/ugciMYClSGgJxP8HYoRU');
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+
.auto_box::-webkit-scrollbar {
display: none;
}
- .auto_box {
- padding-left: 24rpx;
- display: flex;
- overflow-x: auto; /* 允许横向滚动 */
- flex-wrap: nowrap; /* 禁止换行，保持所有元素在一行 */
- position: absolute;
- top: 90rpx;
- width: 100%; /* 根据需要调整宽度 */
- height: auto; /* 根据内容自动调整高度 */
-
- .auto_li {
- position: relative;
- padding: 24rpx 28rpx;
- margin-right: 22rpx;
- width: 408rpx;
- height: 176rpx;
- flex-shrink: 0; /* 防止子元素被压缩 */
- background-image: url('https://lxnapi.ccttiot.com/bike/img/static/ui88NWy9R1j2zFGojdHU');
- background-size: cover;
- background-position: center;
- .txt1{
- width: 100%;
- font-weight: 600;
- font-size: 32rpx;
- color: #495E74;
- }
- .txt2{
- font-weight: 400;
- font-size: 24rpx;
- color: #495E74;
- }
- .buy_btn{
- position: absolute;
- right: 26rpx;
- bottom: 38rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- width: 132rpx;
- height: 50rpx;
- background: #495E74;
- border-radius: 25rpx 25rpx 25rpx 25rpx;
- font-weight: 500;
- font-size: 28rpx;
- color: #FFF3DB;
- }
- }
- }
+
+ .auto_box {
+ padding-left: 24rpx;
+ display: flex;
+ overflow-x: auto;
+ /* 允许横向滚动 */
+ flex-wrap: nowrap;
+ /* 禁止换行，保持所有元素在一行 */
+ position: absolute;
+ top: 90rpx;
+ width: 100%;
+ /* 根据需要调整宽度 */
+ height: auto;
+ /* 根据内容自动调整高度 */
+
+ .auto_li {
+ position: relative;
+ padding: 24rpx 28rpx;
+ margin-right: 22rpx;
+ width: 408rpx;
+ height: 176rpx;
+ flex-shrink: 0;
+ /* 防止子元素被压缩 */
+ background-image: url('https://lxnapi.ccttiot.com/bike/img/static/ui88NWy9R1j2zFGojdHU');
+ background-size: cover;
+ background-position: center;
+
+ .txt1 {
+ width: 100%;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #495E74;
+ }
+
+ .txt2 {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #495E74;
+ }
+
+ .buy_btn {
+ position: absolute;
+ right: 26rpx;
+ bottom: 38rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 132rpx;
+ height: 50rpx;
+ background: #495E74;
+ border-radius: 25rpx 25rpx 25rpx 25rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #FFF3DB;
+ }
+ }
+ }
}
- .vip_box{
+
+ .vip_box1 {
+ position: relative;
+ margin-left: 38rpx;
+ width: 680rpx;
+ height: 158rpx;
+ background-image: url('https://lxnapi.ccttiot.com/bike/img/static/uiaiNkMy7221n3bk2ta0');
+ background-size: cover;
+ /* 背景图片等比缩放以覆盖整个容器 */
+ background-position: center;
+ /* 背景图片居中显示 */
+ background-repeat: no-repeat;
+
+ .txt1 {
+ top: 20rpx;
+ left: 17
+
+ 1rpx;
+ position: absolute;
+ font-weight: 500;
+ font-size: 39rpx;
+ color: #B07C1E;
+ }
+
+ .txt2 {
+ position: absolute;
+ left: 171rpx;
+ bottom: 20rpx;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #B07C1E;
+ }
+
+ .btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ top: 18rpx;
+ right: 23rpx;
+ width: 150rpx;
+ height: 43rpx;
+ border-radius: 31rpx 31rpx 31rpx 31rpx;
+ border: 1rpx solid #B07C1E;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #B07C1E;
+ }
+ }
+
+ .vip_box {
position: relative;
margin-left: 38rpx;
width: 680rpx;
height: 158rpx;
background-image: url('https://lxnapi.ccttiot.com/bike/img/static/uw6bYgjn1bS1ayNm6VI9');
- background-size: cover;
+ background-size: cover;
/* 背景图片等比缩放以覆盖整个容器 */
background-position: center;
/* 背景图片居中显示 */
background-repeat: no-repeat;
- .txt1{
+
+ .txt1 {
top: 20rpx;
left: 100rpx;
position: absolute;
@@ -696,7 +794,8 @@
font-size: 44rpx;
color: #FFE09E;
}
- .txt2{
+
+ .txt2 {
position: absolute;
right: 74rpx;
bottom: 10rpx;
@@ -705,18 +804,20 @@
color: #FFE09E;
}
}
- .btns{
+
+ .btns {
display: flex;
align-items: center;
justify-content: center;
width: 680rpx;
height: 90rpx;
- background: #64B6A7 ;
+ background: #64B6A7;
color: #fff;
font-size: 36rpx;
border-radius: 20rpx;
margin: 40rpx auto;
}
+
.fixed {
z-index: 999;
position: fixed;
@@ -734,7 +835,7 @@
width: 750rpx;
// background: #fff;
height: 184rpx;
-
+
.topbox {
width: 750rpx;
// background: #fff;
@@ -763,7 +864,7 @@
font-size: 32rpx;
color: #FFFFFF;
width: 100%;
- text-shadow: 0px 8px 20px rgba(0,0,0,0.3);
+ text-shadow: 0px 8px 20px rgba(0, 0, 0, 0.3);
}
.phone {
@@ -772,22 +873,24 @@
font-weight: 400;
font-size: 20rpx;
color: #FFFFFF;
- text-shadow: 0px 8px 20px rgba(0,0,0,0.3);
+ text-shadow: 0px 8px 20px rgba(0, 0, 0, 0.3);
}
}
}
}
}
- .type_cont{
-
+
+ .type_cont {
+
width: 680rpx;
padding: 58rpx 54rpx;
// height: 608rpx;
background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
- margin: 0 auto;
+ margin: 0 auto;
margin-top: 30rpx;
- .type_li{
+
+ .type_li {
width: 100%;
display: flex;
align-items: center;
@@ -795,42 +898,47 @@
font-weight: 400;
font-size: 32rpx;
color: #2F3240;
- image{
+
+ image {
width: 44rpx;
height: 44rpx;
margin-right: 20rpx;
}
- .icon-xiangyou1{
+
+ .icon-xiangyou1 {
margin-left: auto;
color: #2F3240;
font-size: 36rpx;
}
-
+
}
}
- .tocont{
+
+ .tocont {
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-around;
- margin: 0 auto;
+ margin: 0 auto;
margin-top: 100rpx;
width: 680rpx;
height: 176rpx;
background: #fff;
border-radius: 20rpx 20rpx 20rpx 20rpx;
- .cont_li{
+
+ .cont_li {
width: 112rpx;
display: flex;
flex-wrap: wrap;
justify-content: center;
-
- image{
+
+ image {
margin-top: 10rpx;
width: 44rpx;
height: 44rpx;
}
- .txt{
+
+ .txt {
width: 112rpx;
text-align: center;
font-weight: 400;
@@ -839,6 +947,7 @@
}
}
}
+
.btnbg {
width: 750rpx;
// background: #4C97E7;
diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue
index 0456911..6779586 100644
--- a/pages_admin/admin_worke.vue
+++ b/pages_admin/admin_worke.vue
@@ -30,7 +30,7 @@
财务报表
-
+
设备管理