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

1.修改订单页面2.0

Browse Source
yj-dev
杨杰 2 years ago
parent a2c977b64e
commit daaa71c3ae
5 changed files with 69 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. 5
      pages.json
  2. 4
      pages/tabBar/home/home.vue
  3. 39
      pages/user/coupon/coupon.vue
  4. 76
      qianzhu-KFC/order-details/order-details.vue
  5. BIN
      qianzhu-KFC/static/imgs/desloca.png

5
pages.json
Unescape View File

@ -868,7 +868,10 @@
"path": "order-details/order-details", "path": "order-details/order-details",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3da7e7",
"backgroundColorTop": "#3da7e7",
"navigationBarTextStyle": "white"
} }
}, { }, {

4
pages/tabBar/home/home.vue
Unescape View File

@ -760,7 +760,9 @@
this.currentSwiper = event.detail.current; this.currentSwiper = event.detail.current;
}, },
test(item) { test(item) {
let a = item % 2; uni.navigateTo({
url:'../../user/news/news'
})
}, },
eheckStu(item) { eheckStu(item) {

39
pages/user/coupon/coupon.vue
Unescape View File

@ -22,8 +22,8 @@
<!-- content --> <!-- content -->
<view class="carrier"> <view class="carrier">
<view class="left"> <view class="left">
<view class="alijusstart"> <view class="alijusstart" style="margin-top: -7px;">
<view class="alijus width50 font12 fotct fcorfff" <view class="alijus font12 fotct fcorfff"
style="width: 70px;height: 20px;background-color: #3ecbb0;margin-right: 2px;"> style="width: 70px;height: 20px;background-color: #3ecbb0;margin-right: 2px;">
<image src="../../../static/img/user/user15.png" mode="widthFix" class="icon12"> <image src="../../../static/img/user/user15.png" mode="widthFix" class="icon12">
</image> </image>
@ -279,6 +279,10 @@
uni.navigateTo({ uni.navigateTo({
url: '/member-Recharge/choicepage/choicepage' url: '/member-Recharge/choicepage/choicepage'
}) })
} else if (e.highDiscount.useScope == 7) {
uni.navigateTo({
url: '../../goods/refuel/refuel'
})
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
@ -534,7 +538,6 @@
animation: closeMenu 0.15s linear both; animation: closeMenu 0.15s linear both;
} }
background-color: #fff;
position: absolute; position: absolute;
width: 100%; width: 100%;
padding: 0 0; padding: 0 0;
@ -543,7 +546,9 @@
flex-wrap: nowrap; flex-wrap: nowrap;
.left { .left {
width: 100%; background-color: #fff;
width: 72%;
background-image: radial-gradient(6px at top right, #f5f5f5 50px, #ffffff);
.title { .title {
width: 90%; width: 90%;
@ -552,8 +557,9 @@
} }
.term { .term {
width: 90%; width: 95%;
margin: 0 5%; background-image: radial-gradient(6px at bottom right, #f5f5f5 50px, #ffffff);
margin-left: 5%;
font-size: 26upx; font-size: 26upx;
color: #999; color: #999;
} }
@ -591,7 +597,8 @@
flex-shrink: 0; flex-shrink: 0;
width: 28%; width: 28%;
color: #fff; color: #fff;
background: linear-gradient(to right, #ec625c, #ee827f); background: linear-gradient(to right, #66c4ff, #009DFF);
background-image: radial-gradient(6px at bottom left, #f5f5f5 50px, #009DFF);
&.invalid { &.invalid {
background: linear-gradient(to right, #aaa, #999); background: linear-gradient(to right, #aaa, #999);
@ -609,18 +616,18 @@
} }
.ticket { .ticket {
background-image: radial-gradient(6px at top left, #f5f5f5 50px, #009DFF);
padding-top: 1vw; padding-top: 1vw;
justify-content: center; justify-content: center;
align-items: baseline; align-items: baseline;
height: 6vw;
.num { .num {
font-size: 42upx; font-size: 60upx;
font-weight: 600; font-weight: 600;
} }
.unit { .unit {
font-size: 24upx; font-size: 28upx;
} }
} }
@ -631,15 +638,15 @@
} }
.use { .use {
width: 50%; width: 70%;
height: 40upx; height: 60rpx;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 24upx; font-size: 28rpx;
background-color: #fff; background-color: #fff;
color: #ee827f; color: #009DFF;
border-radius: 40upx; border-radius: 40rpx;
padding: 0 10upx; padding: 0 10rpx;
} }
} }
} }

76
qianzhu-KFC/order-details/order-details.vue
Unescape View File

@ -1,19 +1,17 @@
<template> <template>
<view> <view>
<view class="width100 paddtop10 paddbotm10 headsbg backcorfff fotct" v-if="orderList.orderStatus == 1"> <view class="width100 paddtop10 paddbotm10 backcorfff fotct" v-if="orderList.orderStatus == 1">
<view class="height20"></view> <view class="height20"></view>
<view class="headstu font18 fontwig6"> <view class="headstu font18 fontwig6">
{{countdownm}}:{{countdowns}} {{countdownm}}:{{countdowns}}
</view> </view>
<view class="width100 font18 colorc72 mart5"> <!-- <view class="width100 font18 colorc72 mart5">
{{typeText[orderList.orderStatus]}} {{typeText[orderList.orderStatus]}}
</view> </view> -->
<view class="width100 font13 fcor666 mart5">若超时未支付,订单将自动取消</view> <view class="width100 font13 fcor666 mart10">若超时未支付,订单将自动取消</view>
<view class="stubtn mart15 backcorf2f6" v-if="typeid == 9" @click="jumppay()">立即支付</view>
<!-- <view class="stubtn mart15 backcorf2f6" v-if="colorc3 == 9">¥ {{orderList.payPrice}}</view> <!-- <view class="stubtn mart15 backcorf2f6" v-if="colorc3 == 9">¥ {{orderList.payPrice}}</view>
<view class="stubtn mart15 backcorf2f6" v-if="typeid == 4 || typeid == 10">¥ {{orderList.payPrice}}</view> --> <view class="stubtn mart15 backcorf2f6" v-if="typeid == 4 || typeid == 10">¥ {{orderList.payPrice}}</view> -->
<view class="stubtn mart15" v-if="typeid == 4 || typeid == 10" style="background-color: #c72a20;" <view class="stubtn mart15" style="background-color: #0F8FE8;" @click="jumppay()">立即支付
@click="jumppay()">立即支付
</view> </view>
</view> </view>
@ -22,13 +20,13 @@
v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3"> v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3">
<image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image> <image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image>
</view> </view>
<view class="width100 font18 fcor666 mart15" <view class="width100 font18 fcorfff mart15"
v-if=" orderList.orderStatus != 2 && orderList.orderStatus != 3"> v-if=" orderList.orderStatus != 2 && orderList.orderStatus != 3">
{{typeText[orderList.orderStatus]}} {{typeText[orderList.orderStatus]}}
</view> </view>
<view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10"> <view v-if="(orderList.orderStatus == 2 || orderList.orderStatus == 3 ) && typeid != 10">
<view class="fotct font14 width100 fcor999">您的取餐码为</view> <view class="fotct font16 width100 fcorfff">{{orderList.statusDesc}}</view>
<view v-if="typeid == 4 && orderList.list && phonestu == 2"> <view v-if="typeid == 4 && orderList.list && phonestu == 2">
<view class="width90 alijusstart mart10" v-for="(item,index) in orderList.list" :key='index'> <view class="width90 alijusstart mart10" v-for="(item,index) in orderList.list" :key='index'>
<view class="font14 width50 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text> <view class="font14 width50 fcor666">取餐号: <text class="colorc3 font18">{{item.code}}</text>
@ -44,8 +42,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view> <!-- <view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view> -->
<view class="phoneck" v-if="typeid == 4 && orderList.list && phonestu == 1" @click="updatestu">查看手机号</view> <view class="phoneck" v-if="typeid == 4 && orderList.list && phonestu == 1" @click="updatestu">查看手机号
</view>
<view v-if="typeid == 9 && orderList.object.orderItems[0].code"> <view v-if="typeid == 9 && orderList.object.orderItems[0].code">
<view class="fotct font18 width100 mart10 color2f6f43" <view class="fotct font18 width100 mart10 color2f6f43"
v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view> v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view>
@ -55,11 +54,11 @@
</view> </view>
<view class="fotct font20 width100 mart10 color2f6f43" <view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view> v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view>
<view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view> <!-- <view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view>
<view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view> <view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view>
<view class="fotct font13 width100 mart5 colorc3">注:平台取餐手机号皆为虚拟号码</view> <view class="fotct font13 width100 mart5 colorc3">注:平台取餐手机号皆为虚拟号码</view> -->
<view class="fotct font20 width100 mart10 color2f6f43" <!-- <view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view> v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view> -->
</view> </view>
</view> </view>
@ -67,23 +66,21 @@
注:约5分钟后取餐,请尽快到餐厅取餐哦 注:约5分钟后取餐,请尽快到餐厅取餐哦
</view> --> </view> -->
<view class="concont width94 mart10 backcorfff"> <view class="concont width94 mart20 backcorfff">
<view class="width94 paddtop10 font16 fontwig6" v-if="typeid == 10"> <view class="width94 paddtop15 font16 fontwig6 alijusstart">
充值明细 <image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image> 南充麦当劳潆华南路餐厅
</view> </view>
<view class="width94 paddtop10 font16 fontwig6" v-else> <view class="width100 mart5">
餐品明细 <view class="width90 alijusstart mart15" v-for="(item,index) in orderList.highChildOrderList"
</view>
<view class="width100 bor-botm1 mart10 marb10"></view>
<view class="width100">
<view class="width90 alijusstart mart10 bor-botm1" v-for="(item,index) in orderList.highChildOrderList"
:key="index"> :key="index">
<view class="width30"> <view class="width30">
<image :src="item.goodsImg" v-if="item.goodsImg" mode="widthFix" class="width100"></image> <image :src="item.goodsImg" v-if="item.goodsImg" mode="widthFix" class="width100"></image>
<image src="../static/imgs/vipcz.png" v-else mode="widthFix" class="width90w"></image> <image src="../static/imgs/vipcz.png" v-else mode="widthFix" class="width90w"></image>
</view> </view>
<view class="width40 font13 fcor666">{{item.goodsName}}</view> <view class="width50 font13 fcor666">
<view class="width10 font12 fcor999">x{{item.saleCount}}</view> <view>{{item.goodsName}}</view>
<view class="font12 fcor999">{{item.saleCount}} 份</view>
</view>
<view class="width20"> <view class="width20">
<view class="width100 fcor333 font12">¥<text <view class="width100 fcor333 font12">¥<text
class="fontwig6 font16">{{item.goodsActualPrice}}</text> class="fontwig6 font16">{{item.goodsActualPrice}}</text>
@ -101,8 +98,9 @@
¥{{orderList.totalPrice}}</text> ¥{{orderList.totalPrice}}</text>
</view> </view>
</view> </view>
</view>
<view class="width96 mart10 marb5" style="border:1px dashed #f4f4f4;"></view>
</view>
<view class="concont width94 mart10 backcorfff marb30"> <view class="concont width94 mart10 backcorfff marb30">
<view class="width94 alijusstart paddtop10 font14 fcor666"> <view class="width94 alijusstart paddtop10 font14 fcor666">
订单信息 订单信息
@ -356,15 +354,16 @@
} }
.headstu { .headstu {
width: 80px; width: 90px;
height: 80px; height: 90px;
line-height: 80px; line-height: 90px;
text-align: center; text-align: center;
border-radius: 50%; border-radius: 50%;
background-color: #faf1f1; background-color: #C6DEF4;
color: #c72a20; color: #0189E7;
margin-left: 40%; margin-left: auto;
border: 1px solid #c72a20; margin-right: auto;
border: 1px solid #0096FF;
} }
.headotherstu { .headotherstu {
@ -373,7 +372,8 @@
line-height: 80px; line-height: 80px;
text-align: center; text-align: center;
border-radius: 50%; border-radius: 50%;
margin-left: 40%; margin-left: auto;
margin-right: auto;
background-color: #999999; background-color: #999999;
} }
@ -404,11 +404,13 @@
} }
.headsbg { .headsbg {
border-radius: 0 0 30px 30px; // border-radius: 0 0 30px 30px;
background: linear-gradient(to bottom, #3da7e7, #e8eff4);
} }
.concont { .concont {
border-radius: 12px; border-radius: 12px 12px 0 0;
background-image: radial-gradient(6px at bottom right, #f0f0f0 50px, #ffffff);
} }
.footbtn { .footbtn {

BIN
qianzhu-KFC/static/imgs/desloca.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 904 B

Write Preview
Loading…
Cancel
Save