diff --git a/pages.json b/pages.json
index 637ce5d..a633afc 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
{
"path": "pages/order/index/onlineorder",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "在线商城订单",
"navigationStyle": "custom"
}
},
diff --git a/pages/order/index/onlineorder.vue b/pages/order/index/onlineorder.vue
index e230834..29e6846 100644
--- a/pages/order/index/onlineorder.vue
+++ b/pages/order/index/onlineorder.vue
@@ -61,47 +61,24 @@
-
-
-
-
-
+
-
+
-
-
- 订单编号783974398749328
-
-
-
- 精品超市
-
+
+
+ -￥250
+ 线上-商城内消费
-
-
-
-
- 爱他美较大婴儿配方奶粉较大婴儿配方奶粉较大婴儿配方奶粉2段 900g
-
- 1件；900g
- ￥385
-
-
-
-
- 订单关闭
- 删除订单
-
+
+ ¥374.38
+ 2021-09-01 18:27:58
{{tabItem.loadingText}}
-
@@ -345,6 +322,9 @@
computed: {
autoHeight(){
return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 120rpx - 120rpx)`;
+ },
+ autoHeightTwo(){
+ return `calc(${this.scrollH}px - ${this.nav_height}px - 86rpx - 90rpx)`;
}
},
onLoad(){
@@ -513,6 +493,18 @@
padding: 0 65rpx 0 65rpx;
}
+ .item{
+ width: 686rpx;
+ height: max-content;
+ background: #F4F8F8;
+ border-radius: 10rpx;
+ // margin-bottom: 30rpx;
+ margin-top: 30rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
+ line-height: 1;
+ }
+
/deep/.u-scroll-box {
display: flex;
justify-content: center;
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index 9ad6d8c..fa47a59 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -53,12 +53,12 @@
商城订单
-
+
全部订单
-
+
待付款
@@ -120,7 +120,7 @@
},{
name: '积分商城订单',
icon: 'icon-huiyuan',
- path: ''
+ path: '/pages/point/exchangeRecord/exchangeRecord'
}]
}
}