From aab7debcb5676d0985b2b7f3ca8410dc2ebd9c05 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 27 Sep 2021 14:47:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/newdetail/newdetail.vue | 83 ++++++++-----
pages/point/exchangeRecord/exchangeRecord.vue | 116 +++++++++++++++---
pages/shop/seckillList.vue | 2 +-
3 files changed, 150 insertions(+), 51 deletions(-)
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index 5cd32e0..b48da00 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -1,7 +1,7 @@
-
+
剩余支付时间：
@@ -39,17 +39,17 @@
- 精品超市
+ {{order_details.from}}
-
-
+
+
- 爱他美较大婴儿配方奶粉较大配方奶粉较2段
- 500g
+ {{item.item_name}}
+ {{item.item_meta.specs_text}}
- ¥385
- x 2
+ ¥{{item.total_yuan}}
+ x {{item.quantity}}
@@ -57,7 +57,7 @@
积分数量
- 385
+ {{order_details.redeem_point}}
@@ -71,50 +71,50 @@
订单总价
- ¥375
+ ¥{{order_details.total_yuan}}
商品订单编号
- 75894375395739345
- 复制
+ {{order_details.order_no}}
+ 复制
-
- 订单编号
- 75894375395739345
-
创建时间
- 2021-09-07 10:21:38
+ {{order_details.created_at}}
-
+
- 兑换状态
- 兑换成功
+ 订单状态
+ {{order_details.status_text}}
支付方式
- 余额支付
+ {{order_details.payment_text}}
-
+
收货方式
邮寄
+
+ 收货方式
+ 自提
+
支付时间
- 2021-09-07 10:21:38
+ {{order_details.pay_time}}
-
+
-
+
待发货
@@ -138,7 +138,7 @@
-
+
待收货
@@ -150,7 +150,7 @@
-
+
已完成
@@ -168,7 +168,9 @@
data(){
return {
type: 'default' ,// point积分订单详情, default默认普通商品订单详情
- time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime()
+ time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime(),
+ order_no: '',
+ order_details: ''
}
},
components: {
@@ -176,11 +178,32 @@
},
onLoad(options){
this.type = options.type || this.type;
+ this.order_no = options.order_id;
+ if(this.order_no) {
+ this.getOrderDetails();
+ }
},
methods: {
+ // 点击复制
+ copy(text) {
+ uni.setClipboardData({
+ data: text
+ });
+ },
dateFinish(){
console.log("倒计时结束");
},
+ getOrderDetails() {
+ this.$http.get({
+ api: 'api/order/'+this.order_no,
+ header: {
+ Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
+ }
+ }).then(res => {
+ this.order_details = res.data.data
+ console.log(this.order_details);
+ })
+ },
}
}
diff --git a/pages/point/exchangeRecord/exchangeRecord.vue b/pages/point/exchangeRecord/exchangeRecord.vue
index 7359bdb..b3b2aba 100644
--- a/pages/point/exchangeRecord/exchangeRecord.vue
+++ b/pages/point/exchangeRecord/exchangeRecord.vue
@@ -4,29 +4,38 @@
-
-
-
-
- 精品超市
-
-
-
-
-
- 爱他美较大婴儿配方奶粉较大配方奶粉较2段
-
- 1件；900g
- 385
+
+
+
+
+
+ {{item.from}}
+
+
+
+
+
+ {{item2.item_name}}
+
+ {{item2.item_meta.specs_text}}
+ {{item2.total_yuan}}
+
+
+ {{item.status_text}}
+
+
-
- 兑换成功
- 删除订单
+
+
+ {{ loadingText }}
+
-
+
@@ -35,15 +44,82 @@
export default {
data(){
return {
- value: ''
+ value: '',
+ list: [],
+ page: 1,
+ isPage: true,
+ loadingClass: true,
+ loadingText: '正在加载中',
+ scrollH: 0,
+ nav_height: 0,
+ isRefresher: true,
+ pageSize: 10
+ }
+ },
+ computed: {
+ autoHeight(){
+ return `calc(${this.scrollH}px - ${this.nav_height}px - 180rpx)`;
}
},
onLoad(){
-
+ let info = uni.getSystemInfoSync();
+ this.scrollH = info.screenHeight;
+ this.getPointOrder()
},
methods: {
+ // 页面触底，加载下一页
+ onScrolltolower(){
+ if(this.isPage){
+ this.page = this.page + 1;
+ this.getPointOrder();
+ }
+ },
+ // 下拉刷新处理
+ refreshFn(options){
+ this.page = 1;
+ this.isPage = true;
+ this.loadingClass = true;
+ this.list = []
+ this.loadingText = '正在加载中';
+ this.getPointOrder(options);
+ },
+ // scroll-view 下拉刷新
+ onRefresherrefresh(){
+ this.isRefresher = true;
+ this.refreshFn({type: 'scrollRefresh'});
+ },
customClick(event){
console.log(event)
+ },
+ getPointOrder(options = {}){
+ this.$http.get({
+ api: 'api/order/point/list',
+ header: {
+ Authorization: `Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjVkYTY5YjM5NWFhYzM5NzVmMzI3ZTEwZDEyMzAzZjI5MzE4ZmU2OGE2Njg0MTU0MWVjMjQ2NWM4ZWJkYjRlMTUwMmY1NWM0NDlkOTcxZDdjIn0.eyJhdWQiOiIzIiwianRpIjoiNWRhNjliMzk1YWFjMzk3NWYzMjdlMTBkMTIzMDNmMjkzMThmZTY4YTY2ODQxNTQxZWMyNDY1YzhlYmRiNGUxNTAyZjU1YzQ0OWQ5NzFkN2MiLCJpYXQiOjE2MzIzODY3NDAsIm5iZiI6MTYzMjM4Njc0MCwiZXhwIjoxNjYzOTIyNzQwLCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.am-szF_sZcjtyOnEJT1DHMnr1hjAZ90MJc1Pc3AD3FrcQU5xb-u43ddL70ZmM3OxxLTZlmrB8OA3XJYREMtcz26MzwOMfopB9A5AH1EjHiFCV_368cq4ZpXNFi_Sn_LrY9Wje0-WMvkznF8tbrdCNrZn5YyIV47cwEnUNQrrREX4OhcgrSfNvwnh8_O_fueBwws9yY3tTlvVB7-AvG2urFI5XCzygsE3llE0wxF5ZJO1T5QRYLDse2BQ3d9feFzO5_7FiVspKr8DrJUlZP-Zz02UgIDIA_PX0UO2M0KeBwqPYq2d5uEnXT8or7K9coSnHRqbbr4qn6iczxDu4ofM58oCcaPycbtI3RvP2SMZuWmX8fXw-T99XltK_uJEU_wlIkrjvabzyo3tkrxRrwmzJEb3Yf4Lbah_xtfi24Nsu9SRjdw8YoiF6YhuuU5YaOn-wLltgmugfYpkFpEOneVAxoMjkm5IxZAJYMXF-DeSpdOoiTmuIRZYX4GDa55s_31r0YMyF6IIQNUvOjHHk-sJSHG0kPd5QivLP7dxE5XndwyFKAOeM97X2TjdYMhJz0EBCyS4Y_pI6AFWsxJkKsa0aqvBAeJyOV9k8kbYwtPeeBhBNsDWSlGBEZYMcoAv-C-IBZzd7gu2Ceh_MJPItrnsvj8W43Cv1TwxD26bJyt9EUY`
+ },
+ data: {
+ page: this.page
+ }
+ }).then(res => {
+ console.log("----", res);
+ let isPage = this.page < res.data.meta.pagination.total_pages?true:false;
+ this.isPage = isPage;
+ if(!isPage) {
+ this.loadingClass = false;
+ this.loadingText = '没有更多数据啦~';
+ }
+ if(options.type == 'pageRefresh') {
+ uni.stopPullDownRefresh();
+ }else if(options.type == 'scrollRefresh') {
+ this.isRefresher = false;
+ }
+ if(this.page == 1) {
+ this.list = res.data.data;
+ }else {
+ this.list.push(...res.data.data);
+ }
+
+ })
}
}
}
diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue
index 39747e2..9b1ddb0 100644
--- a/pages/shop/seckillList.vue
+++ b/pages/shop/seckillList.vue
@@ -67,7 +67,7 @@
onScrolltolower(){
if(this.isPage){
this.page = this.page + 1;
- this.getMyActivity();
+ this.getSeckillList();
}
},
// 下拉刷新处理
From 61294e5a86ed998b5d25686c82831536d751d130 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Mon, 27 Sep 2021 15:10:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E8=B4=B9?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/newdetail/newdetail.vue | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index b48da00..f843e70 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -27,13 +27,13 @@
查看详情
-
+
- 王小二
- 18284385380
+ {{order_details.accept_name}}
+ {{order_details.mobile}}
- 广西壮族自治区-南宁市-青秀区-民族大道民族大道民族大道民族大道民族大道民族大道15号
+ {{order_details.address_name}}{{order_details.address}}
@@ -59,6 +59,14 @@
积分数量
{{order_details.redeem_point}}
+
+ 应付运费
+ +¥{{order_details.payable_freight}}
+
+
+ 实付运费
+ +¥{{order_details.real_freight}}
+