From 0dd632eaff7c3c8a47eaf1de2b76be861cd6948b Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 13 Jan 2025 10:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json |  2 +-
 App.vue                | 23 +++++-----
 api/user/user.js       | 11 +++++
 pages/index/index.vue  | 96 +++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 120 insertions(+), 12 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 15f1188..e466870 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
diff --git a/App.vue b/App.vue
index efea306..8cabee7 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,6 @@
 <script>
-import { init } from '@/api/init.js';
-import http from '@/http/http.js';
+import { ref } from 'vue';  
+import { init,commonType } from '@/api/init.js';
 export default {
 	onLaunch: function () {
 		console.log('App Launch');
@@ -11,17 +11,20 @@ export default {
 		// } else {
 		// 	uni.setStorageSync('isAI', false)
 		// }
+		
+		
+		
 	},
 	onShow: function () {
-		init();
 		// ios是否在审核
-		http.request({
-			url: '/common/type/919'
-		}).then((res) => {
-			if (res.code == 0) {
-				uni.setStorageSync('isExamine', res.data.value);
-			}
-		});
+		commonType(919).then(res=>{
+			uni.setStorageSync('isExamine', res.value);
+		})
+		// 热搜词
+		commonType(249).then(res=>{
+			uni.setStorageSync('moreSearch', res.value)
+		})
+		
 	},
 	onHide: function () {
 		console.log('App Hide');
diff --git a/api/user/user.js b/api/user/user.js
index 93846b2..90028ef 100644
--- a/api/user/user.js
+++ b/api/user/user.js
@@ -1,5 +1,16 @@
 import http from '@/http/http.js'
 
+
+/**
+ * 获取APP版本信息
+ */
+export const selectNewApp = (data) => {
+	return http.request({
+		url: '/user/selectNewApp',
+		data: data,
+	})
+}
+
 /**
  * 获取用户信息
  */
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 13eed30..6754292 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -53,6 +53,15 @@
 			</scroll-view>
 		</view>
 	</u-modal>
+	 
+	<u-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText" @confirm='confirmUpdateVersion'
+		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)" @cancel="datas.version.show = false">
+		<view class="" style="padding-top: 30rpx;text-align: left;">
+			<scroll-view scroll-y="true" style="max-height: 50vh;">
+				<rich-text style="color:#666" :nodes="datas.version.content"></rich-text>
+			</scroll-view>
+		</view>
+	</u-modal>
 </template>
 
 <script setup>
@@ -65,6 +74,9 @@ import {
 	onReachBottom
 } from '@dcloudio/uni-app'
 import contentlist from './components/contentlist.vue'
+import { selectNewApp } from '@/api/user/user.js';
+import config from '@/commons/config.js';
+import { linkTo } from '@/utils/app.js';
 let datas = reactive({
 	noticeList: [], //公告列表
 
@@ -78,9 +90,18 @@ let datas = reactive({
 	rule_content: '', // 首页弹窗内容
 
 	//ios是否在审核 1是审核
-	isExamine: uni.getStorageSync('isExamine')
+	isExamine: uni.getStorageSync('isExamine'),
+	
+	version: {
+		show: false,
+		title: "",
+		content: "",
+		confirmText: "",
+		cancelText: "",
+	}
 })
 onLoad(() => {
+	versionUpdate()
 	getMsg()
 	getrecomVideo()
 	getPop()
@@ -90,6 +111,79 @@ onReachBottom(() => {
 	++datas.page
 	getrecomVideo()
 })
+function versionUpdate(){
+	//#ifdef APP-PLUS
+	plus.screen.lockOrientation('portrait-primary'); //竖屏正方向锁定
+	//获取当前系统版本信息
+	plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
+		//请求后台接口 解析数据 对比版本
+		selectNewApp().then(res => {
+			res = res[0];
+			let version;
+			if (uni.getSystemInfoSync().platform == 'android') {
+				version = res.version
+			}
+			if (uni.getSystemInfoSync().platform == 'ios') {
+				version = res.iosVersion
+			}
+			console.log(widgetInfo.version+'---'+version)
+			version = res.version
+			 // && uni.getSystemInfoSync().platform == 'android'
+			if (widgetInfo.version < version) {
+				let downloadLink = '';
+				let androidLink = res.androidWgtUrl;
+				let iosLink = res.iosWgtUrl;
+				datas.version.show = true;
+				datas.version.title = "发现新版本";
+				datas.version.content = res.des;  
+				if (res.method == "true") {
+					datas.version.confirmText = "立即更新"
+				} else {
+					datas.version.confirmText = "立即更新"
+					datas.version.cancelText = "下次更新"
+					
+				}
+			}
+		});
+	});
+	//#endif
+}
+function confirmUpdateVersion(){
+	// plus.runtime.openURL(config.baseUrl + '/pages/login/appEq')
+	linkTo('/pages/login/download')
+	return
+	uni.showLoading({
+		title: '下载中...',
+		mask: true
+	});
+	if (uni.getSystemInfoSync().platform == 'android') {
+		uni.downloadFile({
+			url: androidLink,
+			success: downloadResult => {
+				console.log(downloadResult)
+				if (downloadResult.statusCode === 200) {
+					plus.runtime .install(
+							downloadResult.tempFilePath, {
+								force: false
+							},
+							d => {
+								console.log('install success...');
+								plus.runtime
+									.restart();
+							},
+							e => {
+								console.log(e)
+								console.error('install fail...');
+							}
+						);
+				}
+			}
+		});
+	}
+	if (uni.getSystemInfoSync().platform == 'ios') {
+		plus.runtime.openURL(iosLink, function(res) {});
+	}
+}
 // 跳转公告链接
 function goMsg(url) {
 	// if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {