From 0c5aa2ba6ad374b8d3feb95908934bbca47e82b7 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 24 Apr 2023 11:44:07 +0800
Subject: [PATCH] update-11.43
---
components/goods-list/goods-list.vue | 4 +--
components/no-more/no-more.vue | 8 ++++--
pages.json | 9 +++++--
.../classify/goods-search/goods-search.vue | 3 ++-
.../classify/order/orderDetail.vue | 26 ++++++++++---------
.../classify/order/wuliuPupup/wuliuPupup.vue | 6 ++---
.../settleAccounts/settleAccounts.vue | 6 ++---
uni.scss | 4 ++-
8 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index a76f6e2..9e22e4b 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -109,7 +109,7 @@
-
+
@@ -243,7 +243,7 @@
},
deep:true, // 深度监听
- immediate:false, // 初始化监听
+ immediate:true, // 初始化监听
},
},
diff --git a/components/no-more/no-more.vue b/components/no-more/no-more.vue
index ebef887..1e7b6e1 100644
--- a/components/no-more/no-more.vue
+++ b/components/no-more/no-more.vue
@@ -1,5 +1,5 @@
-
+
———— {{msg}} ————
@@ -14,6 +14,10 @@
msg:{
type:String,
default:"我是有底线的"
+ },
+ bgColor:{
+ type:String,
+ default:"#f6f6f6"
}
},
@@ -27,7 +31,7 @@
color:#ccc !important;
padding: 40rpx;
text-align: center;
- background-color: #f6f6f6;
+ /* background-color: #f6f6f6; */
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c9984a2..eba1b05 100644
--- a/pages.json
+++ b/pages.json
@@ -1093,7 +1093,9 @@
"path": "classify/goods-search/goods-search",
"style": {
"navigationBarTitleText": "搜索",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7"
}
},
{
@@ -1142,7 +1144,10 @@
"path": "classify/order/orderDetail",
"style": {
"navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3da7e7",
+ "backgroundColorTop": "#3da7e7",
+ "navigationBarTextStyle": "white"
}
},
{
diff --git a/physical-merchants/classify/goods-search/goods-search.vue b/physical-merchants/classify/goods-search/goods-search.vue
index 0a904d6..8401955 100644
--- a/physical-merchants/classify/goods-search/goods-search.vue
+++ b/physical-merchants/classify/goods-search/goods-search.vue
@@ -131,6 +131,7 @@
}
.nav-search {
- padding: 10px;
+ padding: 20px;
+ background: linear-gradient(to bottom, #3da7e7, #FFFFFF) no-repeat;
}
diff --git a/physical-merchants/classify/order/orderDetail.vue b/physical-merchants/classify/order/orderDetail.vue
index eb9c85b..061db92 100644
--- a/physical-merchants/classify/order/orderDetail.vue
+++ b/physical-merchants/classify/order/orderDetail.vue
@@ -38,7 +38,7 @@
-->
-
+
@@ -126,9 +126,10 @@
实付 ¥{{recinfo.payRealPrice}}
+
-
+
+
下单时间
{{recinfo.createTime | formatDate('-')}}
-
+
-
+ -->
+
-
+
-
+
收货信息
@@ -168,7 +170,7 @@
-
+
订单编号
{{orderId}}
@@ -202,10 +204,10 @@
-
+
-
+
收货信息
@@ -215,7 +217,7 @@
-
+
订单编号
{{orderId}}
@@ -668,7 +670,7 @@
.btn {
height: 20px;
- padding: 5px;
+ padding: 5px 10px;
border-radius: 15px;
margin-left: 15px;
border: 1px solid #666666;
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
index eba84fb..2c5dd90 100644
--- a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
+++ b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
@@ -16,11 +16,11 @@
-
+
-
-
+
+
diff --git a/physical-merchants/settleAccounts/settleAccounts.vue b/physical-merchants/settleAccounts/settleAccounts.vue
index 82c930f..b8def35 100644
--- a/physical-merchants/settleAccounts/settleAccounts.vue
+++ b/physical-merchants/settleAccounts/settleAccounts.vue
@@ -156,7 +156,7 @@
- 小计:¥{{priceSettle}}
+ 小计:¥{{priceSettle | numFormat}}
@@ -186,8 +186,8 @@
送至: {{addressDetail.regionName+" "+addressDetail.address}}
-
- 合计:¥{{priceSettle}}
+
+ 合计:¥{{priceSettle | numFormat}}
去支付
diff --git a/uni.scss b/uni.scss
index 81f8e0d..71a1571 100644
--- a/uni.scss
+++ b/uni.scss
@@ -790,7 +790,9 @@ $uni-font-size-paragraph:30upx;
.pd-main{
padding:20rpx;
}
-
+.pd-lr{
+ padding:0 20rpx;
+}
/* 左悬浮 */
.flleft {
float: left;