From db374522f79dfc528830e5b7c58b7bb343c04e1f Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Tue, 24 Jun 2025 18:51:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/platform/BasePlatform.js | 12 +++++-
 common/server/config.js         | 10 +++++
 common/server/other.js          |  2 +
 common/system/request.js        |  2 +
 pages/index/index.vue           | 30 ++++++++++----
 pages/mall/mall.vue             | 29 +++++++++-----
 pages/me/me.vue                 |  9 ++++-
 pages/other/agreement.vue       |  1 +
 pages/other/user-agreement.nvue | 70 +++++++++++++++++++++++++++++++++
 pages/other/user-agreement.vue  | 12 ------
 10 files changed, 145 insertions(+), 32 deletions(-)
 create mode 100644 pages/other/user-agreement.nvue
 delete mode 100644 pages/other/user-agreement.vue

diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index 0f50cb5..318fedb 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -1,4 +1,4 @@
-
+import { getPlatformConfig } from '../server/config';
 /**
  * 多端平台抽象基类（父类）
  * 定义所有端必须实现的方法
@@ -12,10 +12,18 @@ class BasePlatform {
         this.env = ''; // 运行环境标识
         this.config = null;
         this.version = '1.0.0';
+        this.getConfigPromise = null;
     }
     async getConfig() {
 
-        return {};
+        return new Promise(async (resolve, reject) => {
+            if (this.config) {
+                resolve(this.config);
+            } else {
+                this.config = await getPlatformConfig(this.version);
+                resolve(this.config);
+            }
+        });;
     }
     async appData() {
 
diff --git a/common/server/config.js b/common/server/config.js
index b458427..da4f75e 100644
--- a/common/server/config.js
+++ b/common/server/config.js
@@ -1,4 +1,5 @@
 import HttpRequest from "../system/request";
+import { platform } from "../platform/PlatformFactory";
 
 /**
  * 获取系统配置
@@ -8,3 +9,12 @@ export const getConfig = async () => {
     const res = await HttpRequest.getOrCache('/config');
     return res.data;
 }
+/**
+ * 获取平台配置
+ * @param {string} version 版本号
+ * @returns 
+ */
+export const getPlatformConfig = async () => {
+    const res = await HttpRequest.getOrCache('/getPlatformConfig', { version: platform.version }, 500);
+    return res.data;
+}
\ No newline at end of file
diff --git a/common/server/other.js b/common/server/other.js
index 4e93bb7..891b08b 100644
--- a/common/server/other.js
+++ b/common/server/other.js
@@ -24,6 +24,8 @@ export const getAgreement = async (type) => {
         type_id = 5;
     } else if (type == "product") {
         type_id = 32;
+    } else {
+        type_id = type;
     }
     const res = await HttpRequest.get('/getAgreement', {
         type: type_id
diff --git a/common/system/request.js b/common/system/request.js
index 8372c48..83489e2 100644
--- a/common/system/request.js
+++ b/common/system/request.js
@@ -197,11 +197,13 @@ class HttpRequest {
      */
     static async getOrCache(url, data = {}, time = 300, showLoading = false) {
         const cacheKey = 'cache_' + url + '_' + qs.stringify(data);
+        // console.log('getOrCache', cacheKey, '查询缓存');
         const cacheData = getLocalStorage(cacheKey);
         if (cacheData) {
             console.log('getOrCache', cacheKey, '缓存命中');
             return cacheData;
         }
+      
         const res = await HttpRequest.request(url, data, 'GET', showLoading);
         setLocalStorage(cacheKey, res, time);
         return res;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 35900eb..ffff949 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,10 +10,20 @@
 </template>
 
 <script setup>
-import { defineComponent, ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { getConfig } from '@/common/server/config';
-import { navigateTo } from '@/common/system/router';
+import {
+	defineComponent,
+	ref
+} from 'vue'
+import {
+	onLoad
+} from '@dcloudio/uni-app'
+import {
+	getConfig, getPlatformConfig
+} from '@/common/server/config';
+
+import {
+	navigateTo
+} from '@/common/system/router';
 let icon = ref("/static/app-plus/icon_108.png");
 let login_icon = ref("/static/app-plus/index_login.gif");
 let tips_text = ref("正在加载中。。。");
@@ -26,10 +36,13 @@ onLoad(async () => {
 		uni.onNetworkStatusChange(checkNetwork);
 		return;
 	}
-
-	// navigateTo('/pages/news/news');
-	navigateTo('/pages/other/user-agreement?type=user');
-
+	const config = await getPlatformConfig();
+	console.log("config", config);
+	if (config.buildVersion == "105") {
+		navigateTo('/pages/news/news');
+	} else {
+		navigateTo('/pages/other/user-agreement');
+	}
 });
 /**
  * 检查网络状态
@@ -46,6 +59,7 @@ function checkNetwork(res) {
 		tips_text.value = '请检查网络连接';
 	}
 }
+
 </script>
 
 <style lang="scss">
diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue
index e3fa1d3..29cf44b 100644
--- a/pages/mall/mall.vue
+++ b/pages/mall/mall.vue
@@ -70,7 +70,7 @@
 				</view>
 
 			</view>
-
+			
 			<template #empty>
 				<no-data />
 			</template>
@@ -79,6 +79,8 @@
 			</template>
 		</z-paging>
 	</z-paging-swiper>
+	<!-- 使用支付弹窗组件 -->
+	<payment-popup ref="paymentPopup_ref" :onSuccess="onPaymentSuccess" />
 </template>
 
 <script setup>
@@ -86,6 +88,7 @@ import { ref } from 'vue';
 const paging = ref(null);
 import { getProductList, getBannerList } from '@/common/server/product';
 import TextSearch from '@/components/youdas-container/text-search.vue';
+import paymentPopup from '@/components/youdas-container/payment-popup.vue';
 
 // 响应式数据
 const topDataList = ref([
@@ -93,7 +96,7 @@ const topDataList = ref([
 let isSearch = ref(false);
 const dataList = ref([]);
 const searchKeyword = ref(''); // 搜索关键词
-
+let paymentPopup_ref = ref(null);
 // 跳转到商品详情页
 const goToDetail = (item) => {
 	uni.navigateTo({
@@ -103,8 +106,7 @@ const goToDetail = (item) => {
 
 // 购买商品
 const buyProduct = (item, event) => {
-	// 阻止事件冒泡
-	event.stopPropagation();
+
 
 	// 检查库存
 	if (item.stock <= 0) {
@@ -114,12 +116,12 @@ const buyProduct = (item, event) => {
 		});
 		return;
 	}
-
+	paymentPopup_ref.value.open(item.id);
 	// 添加到购物车或直接购买的逻辑
-	uni.showToast({
-		title: '已添加到购物车',
-		icon: 'success'
-	});
+	// uni.showToast({
+	// 	title: '已添加到购物车',
+	// 	icon: 'success'
+	// });
 };
 
 // 处理搜索
@@ -151,6 +153,15 @@ onLoad(async () => {
 	const bannerList = await getBannerList();
 	topDataList.value = bannerList;
 });
+const onPaymentSuccess = () => {
+	uni.showToast({
+		title: '支付成功',
+		icon: 'success'
+	});
+	paymentPopup_ref.value.close();
+	paging.value.reload();
+	// 可以在这里添加支付成功后的处理逻辑，比如跳转到订单页面等
+};
 </script>
 
 <style lang="scss">
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 3b8294d..c949d5d 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -157,6 +157,13 @@ const loadMenu = async () => {
 		},
 		{
 			id: 5,
+			title: "商品退换货",
+			onClick: (res) => {
+				yds.navigateToAgreement("29");
+			}
+		},
+		{
+			id: 6,
 			title: "用户协议",
 			onClick: (res) => {
 				yds.navigateToAgreement("user");
@@ -206,7 +213,7 @@ const loadMenu = async () => {
 <style lang="scss">
 .content {
 	width: 100%;
-	height: 100vh;
+	min-height: 100vh;
 	display: flex;
 	flex-direction: column;
 	background-color: #F7F7F7;
diff --git a/pages/other/agreement.vue b/pages/other/agreement.vue
index 510330b..4bf0d61 100644
--- a/pages/other/agreement.vue
+++ b/pages/other/agreement.vue
@@ -24,6 +24,7 @@ const loadData = async (type) => {
         pageTitle.value = "隐私政策";
     }
     const res = await getAgreement(type);
+    console.log("res", res);
     if (res) {
         agreementContent.value = res.content;
         if (pageTitle.value == "") {
diff --git a/pages/other/user-agreement.nvue b/pages/other/user-agreement.nvue
new file mode 100644
index 0000000..839c655
--- /dev/null
+++ b/pages/other/user-agreement.nvue
@@ -0,0 +1,70 @@
+<template>
+	<view class="container">
+		<view class="navbar" :style="{ 'height': statusBarHeight }"></view>
+		<web-view v-if="webviewurl" ref="webview" class="webview" :src="webviewurl"
+			@onPostMessage="handlePostMessage"></web-view>
+	</view>
+</template>
+
+<script setup>
+import {
+	ref
+} from 'vue'
+import {
+	onLoad
+} from '@dcloudio/uni-app'
+import {
+	platform
+} from '@/common/platform/PlatformFactory';
+import {
+	getPlatformConfig
+} from '@/common/server/config';
+let webview = ref(null);
+let webviewurl = ref("");
+
+getPlatformConfig().then(res => {
+	webviewurl.value = res.userAgreement;
+});
+const windowInfo = uni.getWindowInfo();
+console.log(windowInfo);
+let statusBarHeight = windowInfo.statusBarHeight + "px";
+// webview向外部发送消息
+const handlePostMessage = async (data) => {
+	console.log("接收到消息：", data, data.detail.data);
+	if (data.detail.data && data.detail.data[0]) {
+		let detailData = data.detail.data[0];
+		if (detailData.action == "pay") {
+			const res = await platform.pay(detailData.data);
+			evalJs({
+				action: "pay",
+				data: res.isPay,
+				callback: detailData.callback
+			});
+		}
+	}
+}
+// 调用 webview 内部逻辑
+const evalJs = (data) => {
+	let json = JSON.stringify(data || {});
+	console.log("yds_postMessage", json);
+	webview.value.evalJS("window.yds_postMessage('" + json + "')");
+}
+</script>
+<style>
+.container {
+	flex: 1;
+	flex-direction: column;
+	/* 竖向排列 */
+}
+
+.navbar {
+	height: 40px;
+	/* 导航栏高度 */
+	background-color: #fff;
+}
+
+.webview {
+	flex: 1;
+	/* 自动占满剩余空间 */
+}
+</style>
\ No newline at end of file
diff --git a/pages/other/user-agreement.vue b/pages/other/user-agreement.vue
deleted file mode 100644
index 532b672..0000000
--- a/pages/other/user-agreement.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <web-view :src="url"></web-view>
-</template>
-
-<script setup>
-let url = ref("");
-onLoad((options) => {
-    url.value = "http://testweb.zfunbox.cn/";
-});
-</script>
-
-<style lang="scss" scoped></style>
\ No newline at end of file