Skip to content

Commit 679c0d4

Browse files
bailicangdubailicangdu
committed
update
1 parent 13500ba commit 679c0d4

15 files changed

Lines changed: 296 additions & 258 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ npm run build
7777

7878
## 效果演示
7979

80-
#### (演示demo是上个月版本，使用的是模拟数据，ios会出现卡顿的现象，且很多已修复的bug未更新，最新效果请clone代码并运行，可以获取真实的官网数据。我会尽快更新demo);
80+
#### (演示demo是上个月版本，使用的是模拟数据，ios会出现卡顿的现象，且很多已修复的bug未更新，最新效果请clone代码并运行，我会尽快更新demo);
8181

8282
[demo地址](http://test.fe.ptdev.cn/elm/)（请用chrome手机模式预览）
8383

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"description": "vue2-elm",
55
"author": "maguohua <1264889788@qq.com>",
66
"private": true,
7+
"license": "Apache",
78
"scripts": {
89
"dev": "node build/dev-server.js",
910
"build": "node build/build.js"

‎src/page/balance/balance.vue‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<template>
2+
<div class="rating_page">
3+
<head-top head-title="我的余额" go-back='true'></head-top>
4+
<section>我的余额</section>
5+
<alert-tip v-if="showAlert" @closeTip="showAlert = false" :alertText="alertText"></alert-tip>
6+
<loading v-show="showLoading"></loading>
7+
</div>
8+
</template>
9+
10+
<script>
11+
import headTop from 'src/components/header/head'
12+
import {mapState, mapMutations} from 'vuex'
13+
import {payRequest} from 'src/service/getData'
14+
import alertTip from 'src/components/common/alertTip'
15+
import loading from 'src/components/common/loading'
16+
17+
export default {
18+
data(){
19+
return{
20+
showAlert: false,
21+
alertText: null,
22+
showLoading: true,
23+
}
24+
},
25+
mounted(){
26+
this.initData();
27+
},
28+
components: {
29+
headTop,
30+
alertTip,
31+
loading,
32+
},
33+
computed: {
34+
...mapState([
35+
'userInfo',
36+
]),
37+
},
38+
methods: {
39+
...mapMutations([
40+
'CLEAR_CART'
41+
]),
42+
async initData(){
43+
44+
}
45+
}
46+
}
47+
</script>
48+
49+
<style lang="scss" scoped>
50+
@import 'src/style/mixin';
51+
52+
.rating_page{
53+
padding-top: 1.95rem;
54+
p, span{
55+
font-family: Helvetica Neue,Tahoma,Arial;
56+
}
57+
}
58+
59+
</style>

src/page/profile/children/benefit.vue renamed to src/page/benefit/benefit.vue

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
<template>
2-
<div class="page_container">
2+
<div class="rating_page">
33
<head-top head-title="我的优惠" go-back='true'></head-top>
4-
<section>我的优惠</section>
4+
<section>我的余额</section>
5+
<alert-tip v-if="showAlert" @closeTip="showAlert = false" :alertText="alertText"></alert-tip>
6+
<loading v-show="showLoading"></loading>
57
</div>
68
</template>
79

810
<script>
911
import headTop from 'src/components/header/head'
1012
import {mapState, mapMutations} from 'vuex'
11-
import {getOrderList} from 'src/service/getData'
13+
import {payRequest} from 'src/service/getData'
14+
import alertTip from 'src/components/common/alertTip'
15+
import loading from 'src/components/common/loading'
1216
1317
export default {
1418
data(){
1519
return{
16-
20+
showAlert: false,
21+
alertText: null,
22+
showLoading: true,
1723
}
1824
},
1925
mounted(){
20-
26+
this.initData();
27+
},
28+
components: {
29+
headTop,
30+
alertTip,
31+
loading,
2132
},
2233
computed: {
2334
...mapState([
24-
'userInfo',
35+
'userInfo',
2536
]),
2637
},
27-
components: {
28-
headTop,
29-
},
3038
methods: {
3139
...mapMutations([
32-
'SAVE_AVANDER'
40+
'CLEAR_CART'
3341
]),
42+
async initData(){
43+
44+
}
3445
}
3546
}
3647
</script>
3748

3849
<style lang="scss" scoped>
3950
@import 'src/style/mixin';
4051
41-
.page_container{
42-
position: absolute;
43-
top: 0;
44-
left: 0;
45-
right: 0;
46-
bottom: 0;
47-
background-color: #fff;
48-
z-index: 202;
52+
.rating_page{
4953
padding-top: 1.95rem;
5054
p, span{
5155
font-family: Helvetica Neue,Tahoma,Arial;

‎src/page/confirmOrder/children/payment.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<p class="time">{{remaining}}</p>
88
<footer class="order_detail" v-if="payDetail.resultData">
99
<span>详情</span>
10-
<span>¥ {{(payDetail.resultData.orderInfo.orderAmount/100).toFixed(2)}}</span>
10+
<span>¥ {{cartPrice.toFixed(2) || (payDetail.resultData.orderInfo.orderAmount/100).toFixed(2)}}</span>
1111
</footer>
1212
</section>
1313
</section>
@@ -77,7 +77,7 @@
7777
props:[],
7878
computed: {
7979
...mapState([
80-
'orderMessage', 'userInfo', 'shopid'
80+
'orderMessage', 'userInfo', 'shopid', 'cartPrice'
8181
]),
8282
remaining: function (){
8383
let minute = parseInt(this.countNum/60);

‎src/page/points/points.vue‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<template>
2+
<div class="rating_page">
3+
<head-top head-title="我的余额" go-back='true'></head-top>
4+
<section>我的余额</section>
5+
<alert-tip v-if="showAlert" @closeTip="showAlert = false" :alertText="alertText"></alert-tip>
6+
<loading v-show="showLoading"></loading>
7+
</div>
8+
</template>
9+
10+
<script>
11+
import headTop from 'src/components/header/head'
12+
import {mapState, mapMutations} from 'vuex'
13+
import {payRequest} from 'src/service/getData'
14+
import alertTip from 'src/components/common/alertTip'
15+
import loading from 'src/components/common/loading'
16+
17+
export default {
18+
data(){
19+
return{
20+
showAlert: false,
21+
alertText: null,
22+
showLoading: true,
23+
}
24+
},
25+
mounted(){
26+
this.initData();
27+
},
28+
components: {
29+
headTop,
30+
alertTip,
31+
loading,
32+
},
33+
computed: {
34+
...mapState([
35+
'userInfo',
36+
]),
37+
},
38+
methods: {
39+
...mapMutations([
40+
'CLEAR_CART'
41+
]),
42+
async initData(){
43+
44+
}
45+
}
46+
}
47+
</script>
48+
49+
<style lang="scss" scoped>
50+
@import 'src/style/mixin';
51+
52+
.rating_page{
53+
padding-top: 1.95rem;
54+
p, span{
55+
font-family: Helvetica Neue,Tahoma,Arial;
56+
}
57+
}
58+
59+
</style>

‎src/page/profile/children/balance.vue‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/page/profile/children/points.vue‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)