From d2a0a72c438e78b2134b3745129f75c82f52b0a5 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 6 Oct 2024 16:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/navbar.vue                 | 18 ++++-----
 mixins/list.js                             |  6 +++
 pages.json                                 | 63 ++++++++++++++++++++++++------
 pages_order/mine/address.vue               |  3 ++
 pages_order/mine/volunteer.vue             |  2 +-
 pages_order/product/productDetail.vue      |  5 ++-
 pages_order/service/StudyAndPathDetail.vue |  3 ++
 pages_order/service/StudyFurther.vue       |  3 --
 pages_order/service/experience.vue         |  3 --
 pages_order/service/heritagePath.vue       |  2 +-
 pages_order/service/situation.vue          |  3 ++
 11 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index a7526b9..909f33c 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="navbar"
-	:style="{backgroundColor : bgColor}">
+<!-- 	<view class="navbar"
+	:style="{backgroundColor : bgColor}"> -->
 		<view class="title"
 		:style="{backgroundColor : bgColor}">
 			<view class="left">
@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		
-	</view>
+	<!-- </view> -->
 </template>
 
 <script>
@@ -81,13 +81,13 @@
 
 
 <style lang="scss" scoped>
-.navbar{
-	width: 100%;
-	height: 120rpx;
-	padding-top: var(--status-bar-height);
-}
+// .navbar{
+// 	width: 100%;
+// 	height: 120rpx;
+// 	padding-top: var(--status-bar-height);
+// }
 .title{
-	position: fixed;
+	position: sticky;
 	top: 0;
 	left: 0;
 	padding-top: calc(var(--status-bar-height) + 20rpx);
diff --git a/mixins/list.js b/mixins/list.js
index e2bb324..29a2bd3 100644
--- a/mixins/list.js
+++ b/mixins/list.js
@@ -27,6 +27,12 @@ export default {
 			list : [],
 		}
 	},
+	onPullDownRefresh() {
+		this.getData()
+	},
+	onShow() {
+		this.getData()
+	},
 	onReachBottom() {
 		this.loadMoreData()
 	},
diff --git a/pages.json b/pages.json
index 8a546ee..b625d17 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,8 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh" : true
 			}
 		},
 		{
@@ -36,10 +37,16 @@
 				"path": "mine/runningWater"
 			},
 			{
-				"path": "mine/address"
+				"path": "mine/address",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "product/productDetail"
+				"path": "product/productDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "order/refundsOrExchange"
@@ -63,25 +70,43 @@
 				"path": "service/carefree"
 			},
 			{
-				"path": "service/applyRelic"
+				"path": "service/applyRelic",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/tellList"
+				"path": "service/tellList",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/experience"
+				"path": "service/experience",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/following"
+				"path": "service/following",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "mine/subscribe"
 			},
 			{
-				"path": "product/productList"
+				"path": "product/productList",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/StudyFurther"
+				"path": "service/StudyFurther",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "service/situation"
@@ -90,16 +115,28 @@
 				"path": "order/orderSubscribe"
 			},
 			{
-				"path": "service/StudyAndPathDetail"
+				"path": "service/StudyAndPathDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/reservationDetail"
+				"path": "service/reservationDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/heritagePath"
+				"path": "service/heritagePath",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "service/articleDetail"
+				"path": "service/articleDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "service/help"
diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue
index 6b01cc0..4fc08ca 100644
--- a/pages_order/mine/address.vue
+++ b/pages_order/mine/address.vue
@@ -45,6 +45,9 @@
 		onShow() {
 			this.getAddressList()
 		},
+		onPullDownRefresh() {
+			this.getAddressList()
+		},
 		methods: {
 
 			//获取地址列表
diff --git a/pages_order/mine/volunteer.vue b/pages_order/mine/volunteer.vue
index a20dce3..d98c70e 100644
--- a/pages_order/mine/volunteer.vue
+++ b/pages_order/mine/volunteer.vue
@@ -178,7 +178,7 @@
 					input {
 						flex: 1;
 						height: 100%;
-						color: rgb(192, 196, 204);
+						color: #000;
 						background-color: #fff;
 						font-size: 24rpx;
 						padding: 0 20rpx;
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 110fcc0..d26fa0e 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -85,6 +85,9 @@
 		onShow() {
 			this.getData()
 		},
+		onPullDownRefresh() {
+			this.getData()
+		},
 		onShareAppMessage(res) {
 		    return {
 		      title: this.productDetail.waresTitle,
@@ -105,8 +108,8 @@
 					waresId: this.productId
 				},
 				res => {
+					uni.stopPullDownRefresh()
 					if (res.code == 200) {
-						console.log(res);
 						this.productDetail = res.result
 					}
 				})
diff --git a/pages_order/service/StudyAndPathDetail.vue b/pages_order/service/StudyAndPathDetail.vue
index cb54d9b..0a8c8fe 100644
--- a/pages_order/service/StudyAndPathDetail.vue
+++ b/pages_order/service/StudyAndPathDetail.vue
@@ -88,6 +88,9 @@
 		onShow() {
 			this.getData()
 		},
+		onPullDownRefresh() {
+			this.getData()
+		},
 		onShareAppMessage(res) {
 		    return {
 		      title: this.dict.title,
diff --git a/pages_order/service/StudyFurther.vue b/pages_order/service/StudyFurther.vue
index 859d360..0c920f0 100644
--- a/pages_order/service/StudyFurther.vue
+++ b/pages_order/service/StudyFurther.vue
@@ -54,9 +54,6 @@
 		onLoad() {
 			this.queryParams.amusementType = 1
 		},
-		onShow() {
-			this.getData()
-		},
 		methods: {
 			setPath(i){
 				this.getData()
diff --git a/pages_order/service/experience.vue b/pages_order/service/experience.vue
index 70df915..86be1a7 100644
--- a/pages_order/service/experience.vue
+++ b/pages_order/service/experience.vue
@@ -47,9 +47,6 @@
 		},
 		onLoad() {
 		},
-		onShow() {
-			this.getData()
-		},
 		methods: {
 			toUrl(item){
 				this.$utils.navigateTo(`/pages_order/service/articleDetail?id=${item.id}&type=experience`)
diff --git a/pages_order/service/heritagePath.vue b/pages_order/service/heritagePath.vue
index 6880e72..dece6ef 100644
--- a/pages_order/service/heritagePath.vue
+++ b/pages_order/service/heritagePath.vue
@@ -65,7 +65,7 @@
 			this.queryParams.isPay = 1
 			this.queryParams.amusementType = 0
 		},
-		onShow() {
+		onPullDownRefresh() {
 			this.getData()
 		},
 		methods: {
diff --git a/pages_order/service/situation.vue b/pages_order/service/situation.vue
index 4bb6cf7..187cd95 100644
--- a/pages_order/service/situation.vue
+++ b/pages_order/service/situation.vue
@@ -69,6 +69,9 @@
 		onReachBottom() {
 			this.loadMoreData()
 		},
+		onPullDownRefresh() {
+			this.queryAreaList()
+		},
 		methods: {
 			queryAreaList(){
 				this.$api('queryAreaList', res => {