diff --git a/components/wyb-popup/iconfont.css b/components/wyb-popup/iconfont.css
new file mode 100644
index 0000000..3408e9d
--- /dev/null
+++ b/components/wyb-popup/iconfont.css
@@ -0,0 +1,16 @@
+@font-face {font-family: "iconfont";
+ src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAKUAAsAAAAABlAAAAJJAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcApcdgE2AiQDCAsGAAQgBYRtBy8bmwXIrjBu4UkbIjvjLimCmu1EP9KHAd4jgmi/3+zde18toRbpnkUTzRKRUkgQE6RA9xL+tMuG6RYp8bFsgmbcecAB9mDhH67tDS3pQsIsmSbPL7chM1RKsFr5mNDBoUDPJItlaZG8fvhi/tciWcbRfJ7L6U2gA1l9oBz3orEmTRpAvTigAPfCKLISSiNtGLvAJdwn0DCHgMfN/kgLK1jLAvE0p7YWzoUVCparCZWavYV4U6qllxTNa/j5+JeKMEmZWQ1njw1PK39hF+TnFG59QoSADpfI2AEUxFVt+oQpGIc10pYlYF+1wRfTfZfYq12wv86qboEZqLgnpau61VyC21L06V8d9cuJmT795hWPJp8ayHj0wrZNx+/+1Nzdf8MBtu9H2p+tgB5tn/W1PEZvgeD5Xf/if61ZgE9foa3Qz0ttd57gtyh79hS62nKmQlXWDiczp2tqaGAK+we+sZbxPeRDzXiEt2o2RVazQhbsDkpNu6io2UPDNn24aagxRVHHlgkQehaSjg9kPYcs2IvSxENFL0w03ASd2bQW82is0d6iB+YE2ZWCOO5tNKodIN0xe51Vh/wE15t5DGQsUcy1UOB6jg19T1NjSyCsJQcFHkPGJJS1XKC7jaXtVpV4nNS9KGYl16KOrCHbFvIA4wRkLkkg/uitaOn9A4jaYWzrlq6a/ARa25hPDiRG9CBbBtGr616e6faolGGLAMGaxAEFZiGGkUCpn7WAXFsxaURSKeH2oNDXEFvfxL/uGDRY1hT2lKy8Y3KDmgYA') format('woff2')
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 20px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-close:before {
+ content: "\e622";
+}
+
diff --git a/components/wyb-popup/wyb-popup.vue b/components/wyb-popup/wyb-popup.vue
new file mode 100644
index 0000000..2ca14fa
--- /dev/null
+++ b/components/wyb-popup/wyb-popup.vue
@@ -0,0 +1,420 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 37a260f..5341371 100644
--- a/pages.json
+++ b/pages.json
@@ -1,6 +1,30 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
+ "path" : "pages/goods/refuel-confirm/refuel-confirm",
+ "style" :
+ {
+ "navigationBarTitleText": "确认订单",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white",
+ "enablePullDownRefresh": false
+ }
+
+ },{
+ "path" : "pages/goods/refuel-details/refuel-details",
+ "style" :
+ {
+ // 加油站
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": "",
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#0083f5",
+ "backgroundColorTop": "#0083f5",
+ "navigationBarTextStyle": "white"
+ }
+
+ },{
"path" : "pages/goods/refuel/refuel",
"style" :
{
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
new file mode 100644
index 0000000..ee022b4
--- /dev/null
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
new file mode 100644
index 0000000..93b7cda
--- /dev/null
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+ 乌江能源加油站(大一型国企)
+ 贵州省贵阳市什么什么大道65号
+
+
+
+ 1.9km
+
+
+
+ 营业时间 : 00:00-23:59 站内开票
+
+
+
+
+
+
+ 92#
+
+
+ 团购价
+ ¥6.38
+
+
+ 油站价
+ ¥6.88
+
+
+ 国标价
+ ¥6.88
+
+
+
+
+
+ 我要加油
+
+
+ 选择油号
+
+
+ 92#
+
+
+
+
+
+ 选择油枪
+
+
+ 2号
+
+
+
+
+
+
+
+ 加油金额
+
+ ¥
+
+
+ 约0.01L
+
+
+
+
+ {{amount.price}}元
+ 最高优惠¥{{amount.realPrice}}
+
+
+
+
+
+
+
+
+ 选择油号
+ 汽油油号
+
+ {{swiper.value}}
+
+
+
+
+
+
+
+
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index 428af3a..38e80d3 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -6,7 +6,7 @@
-
+
@@ -88,7 +88,7 @@
'defaultSelectedIndex': 0,
'detailList': [{
'title': '全部品牌',
- 'value': '全部品牌'
+ 'value': ''
}, {
'title': '中石化',
'value': '中石化'
@@ -115,7 +115,7 @@
'defaultSelectedIndex': 0,
'detailList': [{
'title': '距离最近',
- 'value': '距离最近'
+ 'value': ''
},
{
'title': '距离最远',
@@ -132,6 +132,9 @@
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
+ 'title': '不限',
+ 'value': ''
+ }, {
'title': '89#',
'value': '89#'
}, {
@@ -154,7 +157,7 @@
'defaultSelectedIndex': 0,
'detailList': [{
'title': '默认排序',
- 'value': '默认排序'
+ 'value': ''
},
{
'title': '发布时间',
@@ -177,6 +180,12 @@
},
methods: {
+ //跳转详情
+ goDetails(){
+ uni.navigateTo({
+ url:'../refuel-details/refuel-details'
+ })
+ },
result(val) {
console.log('filter_result:' + JSON.stringify(val));
this.filterResult = JSON.stringify(val, null, 2)
diff --git a/uni.scss b/uni.scss
index 701076d..d2aed2f 100644
--- a/uni.scss
+++ b/uni.scss
@@ -146,7 +146,12 @@ $uni-font-size-paragraph:30upx;
.margle {
margin-left: 6px;
-}
+}
+
+.margle20 {
+ margin-left: 20px;
+}
+
.marglerig{
margin-right: 5px;
}
@@ -257,10 +262,11 @@ $uni-font-size-paragraph:30upx;
.width70 {
width: 70%;
}
+
+.width85 {
+ width: 85%;
+}
-.width15{
- width: 15%;
-}
.width50 {
width: 50%;
@@ -278,7 +284,20 @@ $uni-font-size-paragraph:30upx;
.width30 {
width: 30%;
-}
+}
+
+.width20 {
+ width: 20%;
+}
+
+
+.width15 {
+ width: 15%;
+}
+.width8 {
+ width: 8%;
+}
+
.width95 {
width: 95%;
@@ -440,6 +459,11 @@ $uni-font-size-paragraph:30upx;
.paddtop15 {
padding-top: 15px;
}
+
+
+.paddtop25 {
+ padding-top: 25px;
+}
.paddleft10 {
padding-left: 10px;