diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 4d905b6..06e591c 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -58,7 +58,7 @@
订单编号:{{row.orderNo}}
-
+
下单时间 : {{row.createTime | formatDate('-')}}
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index b9fc1d8..3f136fb 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -15,7 +15,7 @@
-
+
@@ -25,26 +25,45 @@
{{typeText[orderList.orderStatus]}}
-
- {{orderList.statusDesc}}
+
-
- 取餐号: {{item.code}}
-
- 手机尾号:
- {{item.phone}}
+
+ {{item.code}}
+ 尾号{{item.phone}}
-
- 取餐号: {{item.code}}
+
+ {{item.code}}
+ 取餐码
-
- 查看手机号
+
+ 订单已准备完毕，喜欢您再来
+
+
+
+ 请至柜台凭取餐码取餐
+ 如有询问手机尾号请点击右侧按钮查看
+
+
+
+ 查看手机尾号
+
+
+ 隐藏手机尾号
+
+
+
+
+
{{item.code}}
@@ -54,20 +73,14 @@
{{orderList.statusDesc}}
-
-
-
-
-
-
+
+
+ 充值明细
+
+
南充麦当劳潆华南路餐厅
@@ -90,84 +103,86 @@
¥{{item.goodsPrice}}
-
- 共 {{coutnums}} 件 小计:
-
- ¥{{orderList.totalPrice}}
-
- ¥{{orderList.totalPrice}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 商品小计
+ 金额 ¥{{orderList.totalPrice}}
-
+
+ 优惠券 ¥ {{orderList.deductionPrice}}
+
+
+ 积分抵扣 ¥ {{(orderList.payGold / 100).toFixed(2)}}
+
+
+
+
+
+ 实付 ¥ {{orderList.payPrice}}
+
+
-
-
+
+
+
订单信息
-
- 订单号
- {{orderList.orderNo}}
+ 交易单号
+ {{orderList.orderNo}}
- 支付流水号
- {{orderList.paySerialNo}}
+ 流水号
+ {{orderList.paySerialNo}}
下单时间
- {{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+ {{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
就餐方式
店内就餐
- 打包带走
-
-
-
- 实付金额
- ¥ {{orderList.payPrice}}
-
-
- 积分抵扣
- ¥ {{(orderList.payGold / 100).toFixed(2)}}
-
-
- 优惠券抵扣
- ¥ {{orderList.deductionPrice}}
+ 打包带走
支付方式
- 微信
- 积分
- 工会卡
- 银联支付
-
-
- 联系方式
- {{orderList.remarks}}
+ 微信
+ 积分
+ 工会卡
+ 银联支付
充值手机号
- {{orderList.remarks}}
-
-
- 支付状态
- {{typeText[orderList.orderStatus]}}
-
-
- 取消订单
-
+ {{orderList.remarks}}
+
友情提示
1、如遇到商品售罄，将导致您无法取到所定食物，系统将自动为您安排退款，1个工作日内到账；
2、如遇更多问题，请及时联系在线客服处理。
+
+
+
+
+
+ 再来一单
+
+
@@ -215,8 +230,8 @@
},
methods: {
//修改状态
- updatestu() {
- this.phonestu = 2
+ updatestu(item) {
+ this.phonestu = item;
},
getAllCount() {
this.orderList.highChildOrderList.forEach((food) => {
@@ -393,14 +408,11 @@
.phoneck {
height: 35px;
- width: 120px;
line-height: 35px;
- font-size: 14px;
- border-radius: 39px;
- border: 1px solid #CD2314;
+ font-size: 12px;
box-sizing: border-box;
- color: #CD2314;
- margin: 10px auto;
+ background-color: #0F8FE8;
+ color: #ffffff;
}
.headsbg {
@@ -408,9 +420,22 @@
background: linear-gradient(to bottom, #3da7e7, #e8eff4);
}
+ .borderleft {
+ background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+ }
+
+ .bordertopleft {
+ background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+ }
+
.concont {
- border-radius: 12px 12px 0 0;
- background-image: radial-gradient(6px at bottom right, #f0f0f0 50px, #ffffff);
+ border-radius: 12px 12px 0 0;
+ background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
+ }
+
+ .gooddes {
+ border-radius: 0 0 12px 12px;
+ background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
}
.footbtn {
@@ -444,4 +469,36 @@
border-radius: 25px;
text-align: center;
}
+
+ .bottomstu {
+ position: fixed;
+ bottom: 0px;
+ border-top: 1px solid #cecdcd;
+ }
+
+ .cusservice {
+ height: 30px;
+ width: 90px;
+ margin-right: 20px;
+ border: 1px solid #6c6c6c;
+ border-radius: 25px;
+ }
+
+ .buybtn {
+ height: 30px;
+ width: 90px;
+ line-height: 30px;
+ text-align: center;
+ margin-right: 20px;
+ background-color: #009dff;
+ border-radius: 25px;
+ }
+
+ .medldcode {
+ background-color: #D20507;
+ padding-left: 8px;
+ padding-right: 8px;
+ position: absolute;
+ margin-left: 2px;
+ }
diff --git a/uni.scss b/uni.scss
index a5f8b08..416d983 100644
--- a/uni.scss
+++ b/uni.scss
@@ -110,6 +110,10 @@ $uni-font-size-paragraph:30upx;
.font20 {
font-size: 20px;
}
+
+.font22 {
+ font-size: 22px;
+}
.font24 {
font-size: 24px;
@@ -548,6 +552,10 @@ $uni-font-size-paragraph:30upx;
.height30 {
height: 30px;
line-height: 30px;
+}
+
+.height30h {
+ height: 30px;
}
.height40 {
@@ -835,6 +843,11 @@ $uni-font-size-paragraph:30upx;
display: flex;
}
+.alijusnostart{
+ justify-content: flex-start;
+ display: flex;
+}
+
.alijusend{
justify-content: flex-end;
align-items: center;