diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index 624fcef4d..bd4a49eff 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -185,8 +185,8 @@
{
"path": "orderSuccess/index",
"style": {
- "navigationBarTitleText": "支付完成页",
- "navigationStyle": "custom"
+ "navigationBarTitleText": "支付结果"
+
}
}
]
@@ -355,4 +355,4 @@
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/cardDetails/detailed.vue b/gasStation-uni/pagesHome/cardDetails/detailed.vue
index 867b7a6f0..545f80124 100644
--- a/gasStation-uni/pagesHome/cardDetails/detailed.vue
+++ b/gasStation-uni/pagesHome/cardDetails/detailed.vue
@@ -1,12 +1,176 @@
-
+
+
+ 储值卡
+ 当前余额(元)
+ 123456.98
+
+
+ 类型筛选
+ 全部时间
+
+
+
+
+
+
+
+ 会员消费
+ -199.00
+
+
+ 储值卡
+ 余额123456.98
+
+
+ 中建锦绣二期站
+ 2024-09-09 16:45:09
+
+
+
+
+
+
+
+
+
+ 会员消费
+ -199.00
+
+
+ 储值卡
+ 余额123456.98
+
+
+ 中建锦绣二期站
+ 2024-09-09 16:45:09
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/cardDetails/index.vue b/gasStation-uni/pagesHome/cardDetails/index.vue
index 77c3787ad..f2cf6f08f 100644
--- a/gasStation-uni/pagesHome/cardDetails/index.vue
+++ b/gasStation-uni/pagesHome/cardDetails/index.vue
@@ -25,7 +25,7 @@
立即充值
-
+
余额明细
@@ -131,6 +131,11 @@
},
setIndex(index) {
this.windex = index
+ },
+ godetail() {
+ uni.navigateTo({
+ url: '/pagesHome/cardDetails/detailed'
+ })
}
}
}
diff --git a/gasStation-uni/pagesRefuel/orderSuccess/index.vue b/gasStation-uni/pagesRefuel/orderSuccess/index.vue
index d5ca92efe..e386ed428 100644
--- a/gasStation-uni/pagesRefuel/orderSuccess/index.vue
+++ b/gasStation-uni/pagesRefuel/orderSuccess/index.vue
@@ -1,25 +1,40 @@
-
@@ -29,41 +44,41 @@
export default {
data() {
return {
- timestamp:3,
- timer:{},
- orderNo:"",
+ timestamp: 3,
+ timer: {},
+ orderNo: "",
}
},
onLoad(e) {
- if (e.orderNo){
+ if (e.orderNo) {
this.orderNo = e.orderNo
}
- this.countdown()
+ // this.countdown()
},
methods: {
- goOrderInfo(){
+ goOrderInfo() {
clearInterval(this.timer)
uni.navigateTo({
url: '/pagesMy/details/details?orderNo=' + this.orderNo,
})
},
// 倒计时刷新
- countdown(){
+ countdown() {
let _this = this
this.timer = setInterval(() => {
- // countdown减1
- _this.timestamp--;
- // 如果倒计时为0,清除定时器
- if(_this.timestamp === 0) {
- if (_this.orderNo){
+ // countdown减1
+ _this.timestamp--;
+ // 如果倒计时为0,清除定时器
+ if (_this.timestamp === 0) {
+ if (_this.orderNo) {
_this.goOrderInfo()
- }else{
+ } else {
_this.goBack()
}
-
+
clearInterval(this.timer)
_this.timestamp = 3
- }
+ }
}, 1000);
},
goBack() {
@@ -81,14 +96,14 @@
.content {
background: white;
}
-
+
.container {
width: 100%;
height: 100vh;
box-sizing: border-box;
- padding-top: 88px;
+
}
-
+
.my-header {
width: 100%;
height: 88px;
@@ -100,13 +115,33 @@
box-sizing: border-box;
padding: 0px 15px;
padding-top: 40px;
-
+
.my-icons {
width: 20px;
-
+
}
-
+
position: fixed;
top: 0px;
}
+
+ .m_num {
+ font-size: 30px;
+ color: #333333;
+ }
+
+ .m_bs {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 5px 15px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .x_ {
+ width: 95%;
+ border-bottom: 1px solid #EEEEEE;
+ margin: 5px auto;
+ }
\ No newline at end of file
diff --git a/gasStation-uni/static/icon/hycz.png b/gasStation-uni/static/icon/hycz.png
new file mode 100644
index 000000000..37f94b1d6
Binary files /dev/null and b/gasStation-uni/static/icon/hycz.png differ
diff --git a/gasStation-uni/static/icon/hyxf.png b/gasStation-uni/static/icon/hyxf.png
new file mode 100644
index 000000000..adea97fee
Binary files /dev/null and b/gasStation-uni/static/icon/hyxf.png differ
diff --git a/gasStation-uni/static/icon/zfcg.png b/gasStation-uni/static/icon/zfcg.png
new file mode 100644
index 000000000..3082c2247
Binary files /dev/null and b/gasStation-uni/static/icon/zfcg.png differ
diff --git a/gasStation-uni/unpackage/dist/dev/mp-weixin/static/icon/zfcg.png b/gasStation-uni/unpackage/dist/dev/mp-weixin/static/icon/zfcg.png
new file mode 100644
index 000000000..3082c2247
Binary files /dev/null and b/gasStation-uni/unpackage/dist/dev/mp-weixin/static/icon/zfcg.png differ