From bcd5428f82df2022385ce2ec985a2b5f3fb6c7d8 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Tue, 4 Mar 2025 17:10:55 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.04=E5=B7=A5=E4=BD=9C=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E8=BD=AF=E4=BB=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/api/index.js                      |   4 +-
 jiuyi2/common/js/config.js               |   3 +-
 jiuyi2/common/js/util.js                 |   2 +-
 jiuyi2/components/index/appVerUpdate.vue | 111 +++++++++++++++++++++++
 jiuyi2/pages/index/article.vue           |   4 +
 jiuyi2/pages/index/durian.vue            |   5 +
 jiuyi2/pages/index/index.nvue            |   8 ++
 jiuyi2/pages/index/integralMall.vue      |   6 +-
 jiuyi2/pages/index/myTeam.vue            |   5 +
 jiuyi2/vite.config.js                    |   3 +-
 10 files changed, 145 insertions(+), 6 deletions(-)
 create mode 100644 jiuyi2/components/index/appVerUpdate.vue

diff --git a/jiuyi2/api/index.js b/jiuyi2/api/index.js
index b5fb15a7..b2299a9f 100644
--- a/jiuyi2/api/index.js
+++ b/jiuyi2/api/index.js
@@ -103,9 +103,9 @@ const api = {
 	 * 获取未读消息数量
 	 * @param {Object} param
 	 */
-	getNoReadNum() {
+	getAppVersion() {
 		return util.request({
-			url: '/shopify/region/all',
+			url: '/system/appversion/latest',
 			method: 'GET',
 		})
 	},
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index d9448b2f..ea5d4755 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,7 +6,8 @@ const config = {
 	// host: 'h5api',
 	// #endif
 	// #ifndef H5
-	host: 'http://91f.xyz:8080',
+	// host: 'http://91f.xyz:8080',
+	host: 'http://3f609e6a.r24.cpolar.top',
 	// #endif
 	// 支付方式配置
 	payType: {
diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js
index 36f0c9ca..17db9ca8 100644
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@@ -213,7 +213,7 @@ const util = {
 				responseType: params.responseType || 'text',
 				// 请求成功返回
 				success: res => {
-					console.log('request success', url, res, params.data ? params.data : '')
+					// console.log('request success', url, res, params.data ? params.data : '')
 					// 关闭加载效果
 					if (params.load) {
 						uni.hideLoading()
diff --git a/jiuyi2/components/index/appVerUpdate.vue b/jiuyi2/components/index/appVerUpdate.vue
new file mode 100644
index 00000000..83e43dcb
--- /dev/null
+++ b/jiuyi2/components/index/appVerUpdate.vue
@@ -0,0 +1,111 @@
+<script setup>
+	/**
+	 * app版本更新弹窗
+	 */
+
+	import {
+		defineExpose,
+		ref,
+		reactive,
+		getCurrentInstance,
+		computed,
+		nextTick,
+	} from 'vue'
+	// 工具库
+	import util from '@/common/js/util';
+	// api
+	import api from '@/api/index.js'
+
+	const {
+		proxy
+	} = getCurrentInstance()
+	// 云端版本信息
+	const versionCloud = reactive({})
+	// 程序版本信息
+	const versionkApp = reactive({})
+
+	// 初始化
+	function init() {
+		// 获取最新版本信息
+		api.getAppVersion().then(rs => {
+			if (rs.code == 200) {
+				console.log('getAppVersion', rs)
+				// 结果
+				const result = rs.data
+				let system = uni.getSystemInfoSync()
+				Object.assign(versionCloud, result)
+				Object.assign(versionkApp, system)
+				console.log('if', system.appVersionCode, result.versionCode)
+				// 如果需要更新 则打开手机浏览器
+				if (system.appVersionCode < result.versionCode || true) open()
+				return
+			}
+		})
+	}
+
+	// 打开弹窗
+	function open() {
+		proxy.$refs.update.open()
+	}
+
+	// 关闭弹窗
+	function close() {
+		proxy.$refs.update.close()
+	}
+
+	// 更新弹窗点击确认
+	function handleConfirm() {
+		// 下载地址
+		// let downloadUrl = 'https://www.doubao.com/chat/'
+		let downloadUrl = versionCloud.downloadUrl
+		plus.runtime.openURL(downloadUrl, function(res) {
+			console.log('打开浏览器结果：', res);
+		}, function(err) {
+			console.log('打开浏览器失败：', err);
+		});
+	}
+
+	defineExpose({
+		init,
+		open,
+		close,
+	})
+</script>
+
+<template>
+	<uni-popup ref="update" type="center">
+		<view class="updateAlt popMid ptb30 plr30 bfff">
+			<view class="header">
+				<view class="df aic">
+					<image src="/static/logo.png" mode="aspectFit" class="wh120 br10" />
+				</view>
+				<text class="mt30 f48">九亿有新版本啦~</text>
+			</view>
+
+			<view class="main mtb50 mlr20">
+				<text class="f32 c333">最新版本为{{versionCloud.versionName}}</text>
+				<view class="content mt20 ptb30 plr20">
+					<text class="f30 c333">更新说明：</text>
+					<text class="mt10 f26 c666">{{versionCloud.updateContent}}</text>
+				</view>
+			</view>
+
+			<view class="btn focus bar mlr50">
+				<text class="tac cfff f28" @click="handleConfirm">更新</text>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<style lang="scss">
+	// 更新弹窗
+	.updateAlt {
+		width: 600rpx;
+
+		// 内容
+		.content {
+			background-color: #f8f8f8;
+			border-radius: 10rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/jiuyi2/pages/index/article.vue b/jiuyi2/pages/index/article.vue
index b1e74a16..ef465df0 100644
--- a/jiuyi2/pages/index/article.vue
+++ b/jiuyi2/pages/index/article.vue
@@ -36,6 +36,10 @@
 		}).then(rs => {
 			if (rs.code == 200) {
 				Object.assign(wrap, rs.data)
+				// 设置标题
+				uni.setNavigationBarTitle({
+					title: rs.data.agreementType
+				})
 				return
 			}
 			util.alert({
diff --git a/jiuyi2/pages/index/durian.vue b/jiuyi2/pages/index/durian.vue
index 4414ebef..4c591c8f 100644
--- a/jiuyi2/pages/index/durian.vue
+++ b/jiuyi2/pages/index/durian.vue
@@ -317,6 +317,11 @@
 			<view class="btn plus black mt60 mlr60" @click="link('/pages/index/dataCenter/push')">置换流量</view>
 		</view>
 
+		<navigator hover-class="nonwe" :url="'/pages/index/article' + '?id=7'" class="c999 f30 mtb30 fmid">
+			<uni-icons type="info" color="#333" class="mr10" />
+			<text>玩法规则说明</text>
+		</navigator>
+
 		<view class="fill" style="height: 60rpx;"></view>
 	</view>
 
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index 364e4ef3..d4752dc4 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -21,6 +21,8 @@
 	// api
 	import api from '@/api/index.js'
 
+	// 版本更新弹窗
+	import appVerUpdateAlt from '@/components/index/appVerUpdate.vue';
 	// 顶部状态栏
 	import statusBar from '@/components/header/statusBar.vue'
 	// 引入视频
@@ -216,6 +218,10 @@
 		// handleProBuy({
 		// 	productId: 42,
 		// })
+
+		setTimeout(() => {
+			proxy.$refs.appVerUpdateRef.init()
+		}, 1000)
 	})
 
 	onShow(() => {
@@ -830,6 +836,8 @@
 		<footerMenu ref="footerMenuRef" page="index" subject="dark" />
 	</view>
 
+	<!-- app版本更新弹窗 -->
+	<appVerUpdateAlt ref="appVerUpdateRef" />
 	<!-- 快捷收藏 -->
 	<fastCollect ref="fastCollectRef" />
 	<!-- 青少年模式 -->
diff --git a/jiuyi2/pages/index/integralMall.vue b/jiuyi2/pages/index/integralMall.vue
index f78a2614..4732375e 100644
--- a/jiuyi2/pages/index/integralMall.vue
+++ b/jiuyi2/pages/index/integralMall.vue
@@ -113,9 +113,13 @@
 					<view class="btn black f1 ml45" @click="handleItem(item)">{{item.price}}购买</view>
 				</view>
 			</view>
-
 		</view>
 
+		<navigator hover-class="nonwe" :url="'/pages/index/article' + '?id=7'" class="c999 f30 mtb30 fmid">
+			<uni-icons type="info" color="#333" class="mr10" />
+			<text>玩法规则说明</text>
+		</navigator>
+
 		<view class="fill" style="height: 60rpx;"></view>
 	</view>
 
diff --git a/jiuyi2/pages/index/myTeam.vue b/jiuyi2/pages/index/myTeam.vue
index 1994316e..17518191 100644
--- a/jiuyi2/pages/index/myTeam.vue
+++ b/jiuyi2/pages/index/myTeam.vue
@@ -194,6 +194,11 @@
 			</view>
 		</view>
 
+		<navigator hover-class="nonwe" :url="'/pages/index/article' + '?id=7'" class="c999 f30 mtb30 fmid">
+			<uni-icons type="info" color="#333" class="mr10" />
+			<text>玩法规则说明</text>
+		</navigator>
+
 		<view class="fill"></view>
 	</view>
 </template>
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index fc5535df..c135185a 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -3,7 +3,8 @@ import {
 } from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 
-let target = 'http://91f.xyz:8080'
+// let target = 'http://91f.xyz:8080'
+let target = 'http://3f609e6a.r24.cpolar.top'
 
 export default defineConfig({
 	plugins: [uni()],