yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.新增团油确认订单页面

Browse Source
yj-dev
杨杰 3 years ago
parent 13f517750f
commit 3c0ac798b8
4 changed files with 108 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 85
      pages.json
  2. 52
      pages/goods/refuel-confirm/refuel-confirm.vue
  3. 2
      pages/goods/refuel-details/refuel-details.vue
  4. 24
      uni.scss

85
pages.json
Unescape View File

@ -1,42 +1,16 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path" : "pages/goods/refuel-confirm/refuel-confirm", "path": "pages/goods/refuel-confirm/refuel-confirm",
"style" : "style": {
{ "navigationBarTitleText": "确认订单",
"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" :
{
"navigationBarTitleText": "加油站列表",
"navigationBarBackgroundColor": "#0083f5", "navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5", "backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, }, {
{
"path": "pages/tabBar/home/home", "path": "pages/tabBar/home/home",
"style": { "style": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
@ -55,8 +29,40 @@
}] }]
} }
} }
}, {
"path": "pages/user/order_details/order_details",
"style": {
// "navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#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": {
"navigationBarTitleText": "加油站列表",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
}
}, },
{ {
"path": "pages/goods/store-list/store-list", "path": "pages/goods/store-list/store-list",
"style": { "style": {
@ -336,15 +342,6 @@
"backgroundColorTop": "#f3f3f3", "backgroundColorTop": "#f3f3f3",
"backgroundColorBottom": "#ffffff" "backgroundColorBottom": "#ffffff"
} }
}, {
"path": "pages/user/order_details/order_details",
"style": {
// "navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
}
}, { }, {
"path": "pages/goods/recording/recording", "path": "pages/goods/recording/recording",
"style": { "style": {
@ -417,7 +414,7 @@
} }
} }
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

52
pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -1,8 +1,40 @@
<template> <template>
<view> <view>
<view class="width90 height90 backcorfff"> <!-- 头部 -->
<view class="width100 height120 backcorfff">
<image src="../../../static/img/noorder.png" class="flleft conImg mart10 margle10"></image>
<view class="conCont paddtop15">
<view class="font20 fontwig6 fcor333 text1 paddtright10">乌江能源加油站(大一型国企)</view>
<view class="font14 fcor999 text2 paddtop5 paddtright10">贵州省贵阳市什么什么大道65号</view>
<view class="font20 fontwig6 fcoreb5 paddtop5">￥6.40
<text class="margle10 slogan font14">￥6.38</text>
</view>
</view>
</view>
<!-- //订单详情 -->
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
油号\油枪
</view>
<view class="flright width40 fotct">
92#/2号
</view>
</view> </view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
加油金额
</view>
<view class="flright width40 fotct">
500
</view>
</view>
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
<view class="width95 paddleft10 font14 fcor999 mart5">1.<text class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款。</view>
<view class="width95 paddleft10 font14 fcor999 mart5">2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。</view>
<!-- 底部按钮 --> <!-- 底部按钮 -->
<view class="footer"> <view class="footer">
<view class="width50 flleft fcoreb5 padleft15 font15"> <view class="width50 flleft fcoreb5 padleft15 font15">
@ -28,7 +60,19 @@
<style lang="less"> <style lang="less">
page { page {
background-color: #f8f8f8; background-color: #f7f7f7;
}
.conImg{
width: 100px;
height: 100px;
border-radius: 8px;
}
.conCont{
margin-left: 115px;
}
.slogan {
color: #807c87;
text-decoration: line-through;
} }
.footer { .footer {
position: fixed; position: fixed;
@ -43,7 +87,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.reBtn{ .reBtn{
width: 100px; width: 110px;
background-color: #089bf5; background-color: #089bf5;
color: #FFFFFF; color: #FFFFFF;
text-align: center; text-align: center;

2
pages/goods/refuel-details/refuel-details.vue
Unescape View File

@ -306,7 +306,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.reBtn{ .reBtn{
width: 100px; width: 110px;
background-color: #089bf5; background-color: #089bf5;
color: #FFFFFF; color: #FFFFFF;
text-align: center; text-align: center;

24
uni.scss
Unescape View File

@ -148,6 +148,10 @@ $uni-font-size-paragraph:30upx;
margin-left: 6px; margin-left: 6px;
} }
.margle10 {
margin-left: 10px;
}
.margle20 { .margle20 {
margin-left: 20px; margin-left: 20px;
} }
@ -270,6 +274,10 @@ $uni-font-size-paragraph:30upx;
.width50 { .width50 {
width: 50%; width: 50%;
}
.width40 {
width: 40%;
} }
.width60 { .width60 {
@ -290,7 +298,6 @@ $uni-font-size-paragraph:30upx;
width: 20%; width: 20%;
} }
.width15 { .width15 {
width: 15%; width: 15%;
} }
@ -316,10 +323,6 @@ $uni-font-size-paragraph:30upx;
height: 45px; height: 45px;
} }
.height40{
height: 40px;
}
.height22{ .height22{
height: 22px; height: 22px;
} }
@ -359,6 +362,12 @@ $uni-font-size-paragraph:30upx;
.height40 { .height40 {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
}
.heightl60 {
height: 60px;
line-height: 60px;
} }
@ -444,7 +453,10 @@ $uni-font-size-paragraph:30upx;
} }
/* 向上下内间距 */ /* 向上下内间距 */
.paddtop5 {
padding-top: 5px;
}
.paddtop10 { .paddtop10 {
padding-top: 10px; padding-top: 10px;
} }

Write Preview
Loading…
Cancel
Save