Skip to content

Commit f947d6d

Browse files
bailicangdubailicangdu
committed
update
1 parent 734f742 commit f947d6d

File tree

7 files changed

+90
-11
lines changed

7 files changed

+90
-11
lines changed

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,9 @@ npm run build
231231
232232
> 开发环境 macOS 10.12.3 Chrome 55
233233
234-
>  推荐另一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
234+
> 如有问题请直接在 Issues 中提问，或者可以加我的QQ 1264889788
235+
236+
>  另外推荐一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
235237
236238

237239

‎index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<symbol viewBox="0 0 40 40" id="vip"><path d="M7 33.4c0 1.1.9 1.6 2 1.6h22c1.1 0 2-.5 2-1.6V31H7v2.4z"></path><path d="M32.1 14.3c-.6 2.3-2.6 4-5.1 4-2.9 0-5.3-2.3-5.3-5.2v-.2c-.5.2-1 .3-1.6.3-.6 0-1.1-.1-1.7-.3v.2c0 2.9-2.4 5.2-5.3 5.2-2.5 0-4.6-1.7-5.1-4.1-.5.4-1.2.6-1.8.6-.3 0-.5.1-.8 0L7.2 29h26l1.7-14.2c-.3.1-.5.1-.8.1-.8 0-1.5-.2-2-.6z" class="st0"></path><ellipse cx="20.1" cy="8.2" rx="3.2" ry="3.2"></ellipse><ellipse cx="6.4" cy="10.5" rx="2.4" ry="2.4"></ellipse><ellipse cx="33.8" cy="10.5" rx="2.4" ry="2.4"></ellipse></symbol>
121121
<symbol viewBox="0 0 40 40" id="download"><path d="M30 5H10c-2.8 0-5 2.2-5 5v20c0 2.8 2.2 5 5 5h20c2.8 0 5-2.2 5-5V10c0-2.8-2.2-5-5-5zm-3.9 22.7c-.1.2-.3.4-.6.5-4.3 2.8-10.1 1.6-13-2.8-2.8-4.3-1.6-10.2 2.8-13 4.3-2.8 10.2-1.6 13 2.8.2.2.3.5.4.8.1.2 0 .5-.2.7l-8.8 5.7c-.2.2-.6.1-.7-.2l-.5-.7c-.4-.6-.2-1.5.4-1.9l5.6-3.6c.2-.2.3-.5.2-.7l-.1-.1c-2.2-1.8-5.4-2.1-7.9-.4-3.1 2-4 6.1-2 9.2 2 3.1 6.1 4 9.2 2 .6-.4 1.3-.2 1.7.4l.3.7c.1.2.4.5.2.6zm3.1-4.4l-.9.6c-.2.2-.6.1-.7-.2L26.5 22c-.2-.2-.1-.6.2-.7l1.8-1.1c.2-.2.6-.1.7.2l.6.9c.3.6.1 1.5-.6 2z"></path></symbol>
122122
<symbol viewBox="0 0 40 40" id="service"><g id="service_XMLID_1_"><path id="service_XMLID_6_" d="M32.2 9.5c-.2-.7-.1-.7-.4-.9-1.7-1.2-5.3.2-6.7 1.9-.8-3.8-3.8-6.1-4.7-5.9-.9-.2-4 2.1-4.8 5.9-1.3-1.7-5-3.1-6.7-1.9-.1.1-.5.6-.5.7C5.4 20.7 15 24.6 19 25.7v8.7c0 .7.3 1.2 1 1.2s1-.5 1-1.2v-8.6c4-1 14.2-4.8 11.2-16.3z"></path><path id="service_XMLID_7_" d="M6 25c-.9 0-1.6.7-1.6 1.5.1.8.7 1.5 1.6 1.5 3.1 0 6.5 1.5 8.5 3.7.3.3.7.6 1.1.6.4 0 .7-.1 1-.4.6-.6.6-1.6.1-2.3C14.1 26.8 10 25 6 25z"></path><path id="service_XMLID_8_" d="M34.6 25c-4 0-8.1 1.9-10.7 4.6-.6.6-.5 1.6.1 2.2.3.3.7.4 1 .4.4 0 .8-.3 1.1-.6 2-2.1 5.3-3.7 8.4-3.7h.1c.8 0 1.5-.7 1.5-1.5 0-.7-.7-1.4-1.5-1.4z"></path></g><path d="M0 0h40v40H0z" class="st1"></path></symbol>
123+
<symbol viewBox="0 0 120 120" id="select"><circle cx="60" cy="60" r="60"></circle><path fill="#FFF" d="M63.84 84.678a1.976 1.976 0 0 1-.387.545l-7.975 7.976a1.996 1.996 0 0 1-2.829-.005L24.172 64.716a2.005 2.005 0 0 1-.005-2.828l7.976-7.976a1.996 1.996 0 0 1 2.828.005l19.015 19.015L91.498 35.42a1.991 1.991 0 0 1 2.823 0l7.976 7.977c.784.784.78 2.043 0 2.823L63.84 84.678z"></path></symbol>
123124
</defs>
124125
</svg>
125126
<router-view></router-view>

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"less": "^2.7.1",
3838
"less-loader": "^2.2.3",
3939
"node-gyp": "^3.4.0",
40+
"node-sass": "^4.5.0",
4041
"opn": "^4.0.2",
4142
"ora": "^0.3.0",
4243
"sass": "^0.5.0",
@@ -60,4 +61,4 @@
6061
"node": ">= 4.0.0",
6162
"npm": ">= 3.0.0"
6263
}
63-
}
64+
}

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

Whitespace-only changes.

‎src/page/confirmOrder/confirmOrder.vue

Lines changed: 84 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<section class="pay_way container_style">
2424
<header class="header_style">
2525
<span>支付方式</span>
26-
<div class="more_type">
26+
<div class="more_type" @click="showPayWayFun">
2727
<span>在线支付</span>
2828
<svg class="address_empty_right">
2929
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#arrow-right"></use>
@@ -84,9 +84,21 @@
8484
<p>确认下单</p>
8585
</section>
8686
<transition name="fade">
87-
<div></div>
87+
<div class="cover" v-if="showPayWay" @click="showPayWayFun"></div>
88+
</transition>
89+
<transition name="slid_up">
90+
<div class="choose_type_Container" v-if="showPayWay">
91+
<header>支付方式</header>
92+
<ul>
93+
<li v-for="item in checkoutData.payments" :key="item.id" :class="{choose: payWayId == item.id}">
94+
<span>{{item.name}}<span v-if="!item.is_online_payment">{{item.description}}</span></span>
95+
<svg class="address_empty_right" @click="choosePayWay(item.is_online_payment, item.id)">
96+
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#select"></use>
97+
</svg>
98+
</li>
99+
</ul>
100+
</div>
88101
</transition>
89-
90102
</section>
91103
<loading v-if="showLoading"></loading>
92104
</div>
@@ -105,10 +117,12 @@
105117
return {
106118
geohash: '', //geohash位置信息
107119
shopId: null, //商店id值
108-
showLoading: true,
109-
checkoutData: null,
110-
shopCart: null,
111-
imgBaseUrl,
120+
showLoading: true, //显示加载动画
121+
checkoutData: null,//数据返回值
122+
shopCart: null,//购物车数据
123+
imgBaseUrl, //图片域名
124+
showPayWay: false,//显示付款方式
125+
payWayId: 1,
112126
}
113127
},
114128
created(){
@@ -159,14 +173,23 @@
159173
this.checkoutData = await checkout(this.geohash, [newArr]);
160174
this.showLoading = false;
161175
},
176+
showPayWayFun(){
177+
this.showPayWay = !this.showPayWay;
178+
},
179+
choosePayWay(is_online_payment, id){
180+
if (is_online_payment) {
181+
this.showPayWay = !this.showPayWay;
182+
this.payWayId = id;
183+
}
184+
},
162185
}
163186
}
164187
165188
</script>
166189

167190
<style lang="scss" scoped>
168191
@import '../../style/mixin';
169-
192+
170193
.confirmOrderContainer{
171194
padding-top: 1.95rem;
172195
padding-bottom: 3rem;
@@ -318,10 +341,62 @@
318341
text-align: center;
319342
}
320343
}
344+
.cover{
345+
position: fixed;
346+
top: 0;
347+
bottom: 0;
348+
left: 0;
349+
right: 0;
350+
background-color: rgba(0,0,0,.3);
351+
z-index: 203;
352+
}
353+
.choose_type_Container{
354+
min-height: 10rem;
355+
background-color: #fff;
356+
position: fixed;
357+
bottom: 0;
358+
width: 100%;
359+
z-index: 204;
360+
header{
361+
background-color: #fafafa;
362+
@include sc(.7rem, #333);
363+
text-align: center;
364+
line-height: 2rem;
365+
}
366+
ul{
367+
li{
368+
@include fj;
369+
padding: 0 .7rem;
370+
line-height: 2.5rem;
371+
align-items: center;
372+
span{
373+
@include sc(.7rem, #ccc);
374+
}
375+
svg{
376+
@include wh(.8rem, .8rem);
377+
fill: #eee;
378+
}
379+
}
380+
.choose{
381+
span{
382+
color: #333;
383+
}
384+
svg{
385+
fill: #4cd964;
386+
}
387+
}
388+
}
389+
}
321390
.fade-enter-active, .fade-leave-active {
322-
transition: opacity .5s;
391+
transition: opacity .3s;
323392
}
324393
.fade-enter, .fade-leave-active {
325394
opacity: 0;
326395
}
396+
.slid_up-enter-active, .slid_up-leave-active {
397+
transition: all .3s;
398+
}
399+
.slid_up-enter, .slid_up-leave-active {
400+
transform: translate3d(0,10rem,0)
401+
}
327402
</style>

‎src/style/common.less renamed to ‎src/style/common.scss

File renamed without changes.

‎src/style/mixin.less renamed to ‎src/style/mixin.scss

File renamed without changes.

0 commit comments

Comments
 (0)