diff --git a/gasStation-uni/pagesMy/fleetInfo/fund.vue b/gasStation-uni/pagesMy/fleetInfo/fund.vue
new file mode 100644
index 000000000..9d6105784
--- /dev/null
+++ b/gasStation-uni/pagesMy/fleetInfo/fund.vue
@@ -0,0 +1,372 @@
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+ 可用余额(元)
+ 1299.00
+
+
+ 类型筛选
+ 全部时间
+
+
+
+
+
+
+
+
+ 积分兑换
+ 900
+
+
+ 储值卡
+ 余额120000.00
+
+
+ 中建锦绣二期店
+ 2024-09-09 16:54:09
+
+
+
+
+
+
+
+
+
+ 会员充值
+ 900
+
+
+ 储值卡
+ 余额120000.00
+
+
+ 中建锦绣二期店
+ 2024-09-09 16:54:09
+
+
+
+
+
+
+
+
+
+ 油品
+ 900
+
+
+ 储值卡
+ 余额120000.00
+
+
+ 中建锦绣二期店
+ 2024-09-09 16:54:09
+
+
+
+
+
+
+
+
+
+ 类型筛选
+ 全部时间
+
+
+
+
+
+
+
+ 额度增加
+ +2000.00
+
+
+ 小小(156****6655)
+ 当前额度0.00
+
+
+ 操作人:问问
+ 2024-09-09 16:54:09
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetInfo/index.vue b/gasStation-uni/pagesMy/fleetInfo/index.vue
index 84085bc9f..07aa9d3f1 100644
--- a/gasStation-uni/pagesMy/fleetInfo/index.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/index.vue
@@ -164,6 +164,8 @@
color: white;
border-radius: 50px;
text-align: center;
- margin-top: 40vh;
+ position: absolute;
+ bottom: 60px;
+ left: 10%;
}
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetLimit/index.vue b/gasStation-uni/pagesMy/fleetLimit/index.vue
index 9dec4b9ad..97a4e4db6 100644
--- a/gasStation-uni/pagesMy/fleetLimit/index.vue
+++ b/gasStation-uni/pagesMy/fleetLimit/index.vue
@@ -165,6 +165,8 @@
color: white;
border-radius: 50px;
text-align: center;
- margin-top: 40vh;
+ position: absolute;
+ bottom: 60px;
+ left: 10%;
}
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetMember/addMember.vue b/gasStation-uni/pagesMy/fleetMember/addMember.vue
index 2d11b7e6c..cf5581531 100644
--- a/gasStation-uni/pagesMy/fleetMember/addMember.vue
+++ b/gasStation-uni/pagesMy/fleetMember/addMember.vue
@@ -185,6 +185,8 @@
color: white;
border-radius: 50px;
text-align: center;
- margin-top: 20vh;
+ position: absolute;
+ bottom: 60px;
+ left: 10%;
}
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetMember/index.vue b/gasStation-uni/pagesMy/fleetMember/index.vue
index 8cdae842f..347764287 100644
--- a/gasStation-uni/pagesMy/fleetMember/index.vue
+++ b/gasStation-uni/pagesMy/fleetMember/index.vue
@@ -1,12 +1,23 @@
-
@@ -23,11 +34,10 @@
pageNo: 1,
pageSize: 10,
totalPage: '',
-
+ value: '',
}
},
- onLoad() {
- },
+ onLoad() {},
onPullDownRefresh() {
//下拉刷新
uni.stopPullDownRefresh()
@@ -35,10 +45,7 @@
onReachBottom() {
// 触底加载
if (this.pageNo >= this.totalPage) {
- uni.showToast({
- title: '没有下一页数据',
- icon: 'none'
- })
+
} else {
this.pageNo++
}
@@ -48,7 +55,11 @@
},
methods: {
-
+ goAddFleet() {
+ uni.navigateTo({
+ url: '/pagesMy/fleetMember/addMember'
+ })
+ },
goback() {
uni.navigateBack()
}
@@ -65,7 +76,7 @@
width: 100%;
height: 100vh;
box-sizing: border-box;
- padding-top: 88px;
+ padding: 10px;
}
.my-header {
@@ -89,4 +100,65 @@
position: fixed;
top: 0px;
}
+
+ .but-sub {
+ width: 305px;
+ height: 40px;
+ line-height: 40px;
+ margin: 0 auto;
+ background-color: #FF9655;
+ color: white;
+ border-radius: 50px;
+ text-align: center;
+ position: absolute;
+ bottom: 60px;
+ left: 10%;
+ }
+
+ .box-hang {
+ width: 100%;
+ height: 35px;
+ display: flex;
+ justify-content: space-between;
+ box-sizing: border-box;
+ align-items: center;
+ padding: 0 15px;
+ background: #ffffff;
+ border-radius: 40px;
+ }
+
+ .top-box {
+ width: 100%;
+ height: 70px;
+ background: linear-gradient(135deg, #F77955 0%, #FFA360 100%, #F9C58C 100%);
+ box-sizing: border-box;
+ padding: 10px;
+ margin: 0 auto;
+ color: #fff;
+ margin-top: 10px;
+ }
+
+ .icon_ {
+ width: 60px;
+ height: 16px;
+ background: rgba(255, 255, 255, 0.48);
+ border-radius: 2px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+ font-weight: 500;
+ font-size: 10px;
+ margin-right: 10px;
+ }
+
+ .on-title {
+ font-size: 20px;
+ color: #fff;
+ margin-top: 10px;
+ }
+
+ .d-s {
+ display: flex;
+ }
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetMember/member.vue b/gasStation-uni/pagesMy/fleetMember/member.vue
new file mode 100644
index 000000000..6920e1d12
--- /dev/null
+++ b/gasStation-uni/pagesMy/fleetMember/member.vue
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+ 小明
+ 共享-限制
+ 鲁A123456
+
+
+ 342.55
+
+
+ 编辑信息
+
+
+
+
+
+ 副卡额度(元)
+
+ 342.55
+
+ 调整
+
+
+
+
+
+ *是否开启消费通知
+
+
+
+
+
+ *是否启用
+
+
+
+
+ 注销副卡
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gasStation-uni/static/icon/yp.png b/gasStation-uni/static/icon/yp.png
new file mode 100644
index 000000000..3e84498de
Binary files /dev/null and b/gasStation-uni/static/icon/yp.png differ
diff --git a/gasStation-uni/static/imgs/zj.png b/gasStation-uni/static/imgs/zj.png
new file mode 100644
index 000000000..bd97a6a7a
Binary files /dev/null and b/gasStation-uni/static/imgs/zj.png differ