From 19cb5a64cb1f63a27ed0f742681bf3d35232b248 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Thu, 19 Sep 2024 22:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  5 ++-
 pages/gamll/index.vue                         | 17 ++++++++-
 pages/member/index.vue                        | 35 +++++++++++++++----
 pages/serve/index.vue                         |  5 +++
 .../components/u-sticky/u-sticky.vue          |  1 +
 5 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index ed19371..22bbaa1 100644
--- a/pages.json
+++ b/pages.json
@@ -1380,7 +1380,10 @@
 		"navigationBarBackgroundColor": "#ffffff",
 		"navigationBarTitleText": "",
 		"navigationBarTextStyle": "black",
-		"backgroundTextStyle": "dark"
+		"backgroundTextStyle": "dark",
+		"app-plus": {
+		  "titleNView": false
+		}
 	},
 	"easycom": {
 		"autoscan": true,
diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index bace59e..e29434b 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -268,7 +268,12 @@
 				retail: '',
 				wholesale: '',
 				scrollTop: 0,
+				// #ifdef H5
+				heightTop: 0,
+				// #endif
+				// #ifndef H5
 				heightTop:136,
+				// #endif
 			}
 		},
 		onLoad() {
@@ -303,7 +308,9 @@
 				const query = uni.createSelectorQuery().in(this);
 				query.select('.navbarHeight ').boundingClientRect(data => {
 					if (data) {
+						// #ifndef H5
 						this.heightTop=this.pxToRpx(data.height)
+						// #endif
 					}
 				}).exec();
 			},
@@ -577,7 +584,12 @@
 				let that = this;
 				let pames = {
 					retail_type: this.tabIndex == 0 ? 10 : 20,
-					client: 'MP-WEIXIN',
+					// #ifdef H5
+					client: 'H5'
+					// #endif
+					// #ifndef H5
+					client: 'MP-WEIXIN'
+					// #endif
 				}
 				let {
 					status,
@@ -1045,6 +1057,9 @@
 					width: 10%;
 					border-top: 1rpx solid #e4e7ed;
 				}
+				.u-td {
+					line-height: 2;
+				}
 
 				::v-deep .box_name {
 					background: #D6D6D6;
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 87e30e1..c4f00bc 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -235,15 +235,21 @@
 				}
 			},
 			async getMemberInfo(type) {
+				// #ifdef H5
+				let params = {
+					client: 'H5'
+				}
+				// #endif
+				// #ifndef H5
+				let params = {
+					client: 'MP-WEIXIN'
+				}
+				// #endif
 				const {
 					status,
 					data,
 					message
-				} = (this.type == 'hy' ? await member.info({
-					client: 'MP-WEIXIN'
-				}) : await member.dealerPriceList({
-					client: 'MP-WEIXIN'
-				}));
+				} = (this.type == 'hy' ? await member.info(params) : await member.dealerPriceList(params));
 				if (status == 200) {
 					if (type === 'toast') {
 						if (((this.type == 'fx'&& this.personal.user_type == 30) || (this.type == 'hy' && this.personal.user_type == 20)) && this.personal.fx_effective_time !== data.list.personal.fx_effective_time) {
@@ -278,7 +284,12 @@
 				let params = {
 					identity_id: this.info.identity_id,
 					method: 'huifu',
+					// #ifdef H5
+					client: 'H5'
+					// #endif
+					// #ifndef H5
 					client: 'MP-WEIXIN'
+					// #endif
 				}
 				member.submit(params)
 					.then(result => {
@@ -297,7 +308,12 @@
 					data
 				} = await member.submit({
 					method: 'wechat',
-					client: "MP-WEIXIN",
+					// #ifdef H5
+					client: 'H5',
+					// #endif
+					// #ifndef H5
+					client: 'MP-WEIXIN',
+					// #endif
 					identity_id: this.info.identity_id,
 				})
 				if (status == 200) {
@@ -337,7 +353,12 @@
 					message
 				} = await member.submit({
 					method: 'balance',
-					client: "MP-WEIXIN",
+					// #ifdef H5
+					client: 'H5',
+					// #endif
+					// #ifndef H5
+					client: 'MP-WEIXIN',
+					// #endif
 					identity_id: this.info.identity_id,
 				})
 				if (status == 200) {
diff --git a/pages/serve/index.vue b/pages/serve/index.vue
index 9ae3d73..f2f45e5 100644
--- a/pages/serve/index.vue
+++ b/pages/serve/index.vue
@@ -97,7 +97,12 @@
 			getMemberList() {
 				const that = this;
 				const params = {
+					// #ifdef H5
+					client: 'H5'
+					// #endif
+					// #ifndef H5
 					client: 'MP-WEIXIN'
+					// #endif
 				}
 				member.info(params)
 					.then(res => {
diff --git a/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue b/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue
index 583a22c..94d64d2 100644
--- a/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue
+++ b/uni_modules/vk-uview-ui/components/u-sticky/u-sticky.vue
@@ -107,6 +107,7 @@
 				// #ifndef H5
 				this.stickyTop = this.offsetTop != 0 ? uni.upx2px(this.offsetTop) : 0;
 				// #endif
+				console.log(uni.upx2px(this.offsetTop),this.h5NavHeight, this.stickyTop);
 
 				this.disconnectObserver('contentObserver');
 				this.$uGetRect('.' + this.elClass).then((res) => {