From 508c0e3ff2ee99c0ec8daa4fae7099c36aafdfd1 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Tue, 12 Jul 2022 17:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=AD=E7=89=A9=E8=BD=A6?=
=?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E6=8E=A8=E4=BB=8B=E5=95=86=E5=93=81=EF=BC=9B=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=8B=89=E5=88=B7?=
=?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=E3=80=81=E5=AF=B9=E6=8E=A5=E6=94=AF?=
=?UTF-8?q?=E4=BB=98=E6=88=90=E5=8A=9F=E3=80=81=E7=89=A9=E6=B5=81=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E9=A1=B5=E9=9D=A2=EF=BC=9B=E5=AF=B9=E6=8E=A5=E6=88=91?=
=?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E5=BE=85=E5=8F=91=E8=B4=A7=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E3=80=81=E8=BF=90=E8=BE=93=E4=B8=AD=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/common.scss | 6 ++
components/pay.vue | 105 +++++++++++++++++++++++++++++++
pages.json | 6 +-
pages/account/myOrders.vue | 79 +++++++++++++----------
pages/category/productList.vue | 4 ++
pages/order/confirmation.vue | 11 +++-
pages/order/details.vue | 14 +++--
pages/order/logisticsDetails.vue | 66 +++++++++----------
pages/order/paySuccess.vue | 77 ++++++++++++++++++++---
pages/productDetails/index.vue | 3 +
pages/shippingCart/index.vue | 53 ++++++++++++++--
11 files changed, 328 insertions(+), 96 deletions(-)
create mode 100644 components/pay.vue
diff --git a/common/common.scss b/common/common.scss
index f9dffed..35608c8 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -371,6 +371,12 @@
height:340rpx ;
background-color: #999999;
margin-bottom: 37.33rpx;
+
+ .recommend_content_item_image_name{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
image{
width: 100%;
height: 100%;
diff --git a/components/pay.vue b/components/pay.vue
new file mode 100644
index 0000000..5443ec3
--- /dev/null
+++ b/components/pay.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 7a0d7c7..5351880 100644
--- a/pages.json
+++ b/pages.json
@@ -115,7 +115,8 @@
"path": "pages/order/paySuccess",
"style": {
"navigationBarTitleText": "Pay success",
- "navigationBarBackgroundColor":"#FFFFFF"
+ "navigationBarBackgroundColor":"#FFFFFF",
+ "enablePullDownRefresh":true
}
},
{
@@ -185,7 +186,8 @@
{
"path": "pages/shippingCart/index",
"style": {
- "titleNView":false
+ "titleNView":false,
+ "enablePullDownRefresh":true
}
},
{
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index 02348d6..ebc6fff 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -21,7 +21,7 @@
-
+
@@ -54,7 +54,7 @@
-
+
@@ -69,60 +69,61 @@
-
-
-
-
-
-
-
- To be shipped
-
- order#20245512141212
-
-
+
+
+
+ To be shipped
+
+ order#{{item.order_sn}}
+
-
-
-
-
-
-
- 2 ltems
-
+
+
+
+
+
+
- total:US$12.5
+
+ {{item.order_goods.length}} ltems
+
+
+ total:US${{item.order_amount}}
-
-
+
+
+
+
Shipped
- order#20245512141212
+ order#{{item.order_sn}}
-
+
-
+
+
+
- Adidas Yeezy Boost 350 V2 DazzlingBlue Black GY7164 Men's
+ {{item1.goods_name}}
- Multicolor;41
+ {{item1.goods_attr |goodsAttr}}
- ×2
+ ×{{item1.goods_number}}
- total:US$12.5
+ total:US${{item.order_amount}}
-
+
@@ -130,6 +131,12 @@
+
+
+
+
+
+
@@ -451,6 +458,7 @@
}
})
},
+
getList(){
let data={_action:'getuserorders',page_index:1,page_size:10,payingstatus:'',status:''}
defaultRequest2(data).then(res=>{
@@ -466,6 +474,11 @@
},
onLoad() {
this.getList()
+ },
+ filters:{
+ goodsAttr(e){
+ return e.replace(/\s\n/g,';');
+ }
}
}
diff --git a/pages/category/productList.vue b/pages/category/productList.vue
index 4377e06..56a7fc4 100644
--- a/pages/category/productList.vue
+++ b/pages/category/productList.vue
@@ -201,7 +201,11 @@
if(!this.isReachBottom)return
this.query.page_index++
this.getList(1)
+ },
+ onPullDownRefresh(){
+ uni.stopPullDownRefresh()
}
+
}