代码合并

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

App.vue

@@ -1,6 +1,6 @@
 <script>
-import { init } from '@/api/init.js';
+import { ref } from 'vue';  
-import http from '@/http/http.js';
+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({
+		commonType(919).then(res=>{
-			url: '/common/type/919'
+			uni.setStorageSync('isExamine', res.value);
-		}).then((res) => {
+		})
-			if (res.code == 0) {
+		// 热搜词
-				uni.setStorageSync('isExamine', res.data.value);
+		commonType(249).then(res=>{
-			}
+			uni.setStorageSync('moreSearch', res.value)
-		});
+		})
+		
 	},
 	onHide: function () {
 		console.log('App Hide');

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,
+	})
+}
+
 /**
  * 获取用户信息
  */

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) {

pages/login/download.vue

@@ -29,33 +29,32 @@
 	})
 	
 	onLoad(() => {
-		let u = navigator.userAgent;
-		if ( u.indexOf('iPhone') > -1) {
 		// #ifdef H5
+		let u = window.navigator.userAgent;
+		if ( uni.getSystemInfoSync().platform == 'ios') {
 			data.confirmBtn = "跳转网页版首页"
-			// #endif
 		}
-		
 		if ( u.toLowerCase().indexOf('micromessenger') !== -1) {
 			data.isWeixin = true
 		}
+		// #endif
 	})
 	
 	
 	function download() { 
-		var u = navigator.userAgent;
+		console.log(uni.getSystemInfoSync().platform == 'android')
-		if (u.indexOf('Android') > -1 || u.indexOf('Adr') > -1) {
+		if (uni.getSystemInfoSync().platform == 'android') {
 			commonType(49).then(res => {
-				if (res.code === 0) {
+				console.log(res)
-					if (res.data && res.data.value) {
+				if (res && res.value) {
 					// #ifndef H5
-						plus.runtime.openURL(res.data.value, function(res) {
+					plus.runtime.openURL(res.value, function(res) {
 						
 					});
 					// #endif
 					// #ifdef H5
 					uni.setClipboardData({
-							data: res.data.value,
+						data: res.value,
 						success: r => {
 							// this.$queue.showToast('邀请码复制成功');
 							uni.showToast({
@@ -64,23 +63,21 @@
 							});
 						}
 					});
-						window.location.href = res.data.value;
+					window.location.href = res.value;
 					// #endif
 				}
-				}
 			});
 		} else {
 			commonType(50).then(res => {
-				if (res.code === 0) {
+				if (res && res.value) {
-					if (res.data && res.data.value) {
 					// #ifndef H5
-						plus.runtime.openURL(res.data.value, function(res) {
+					plus.runtime.openURL(res.value, function(res) {
 						
 					});
 					// #endif
 					// #ifdef H5
 					uni.setClipboardData({
-							data: res.data.value,
+						data: res.value,
 						success: r => {
 							uni.showToast({
 								title: '邀请码复制成功',
@@ -95,7 +92,6 @@
 					// window.location.href = res.data.value;
 					// #endif
 				}
-				}
 			});
 		}
 	}

pages/login/register.vue

@@ -61,7 +61,7 @@
 		count: 60,
 		relation: "",
 		invitation: '',
-		registerCode: '',
+		isregisterCode: '',
 		qdCodeion: '', //渠道码
 		checked: false,
 	})
@@ -72,7 +72,7 @@
 		if (options.invitation ) { data.invitation = options.invitation }
 		
 		let res = await commonType(3)
-		data.registerCode = res.value
+		data.isregisterCode = res.value
 	})
 	
 	/**
@@ -171,7 +171,7 @@
 			code,
 			checked,
 			invitation,
-			registerCode,
+			isregisterCode,
 			qdCodeion
 		} = data;
 		if (!mobile) {
@@ -206,7 +206,7 @@
 			})
 			return
 		}
-		if (invitation.length == 0 && registerCode == '是') {
+		if (invitation.length == 0 && isregisterCode == '是') {
 			uni.showToast({
 				title: '请输入邀请码',
 				icon: 'none',
@@ -308,7 +308,7 @@
 		position: absolute;
 		left: 0;
 		right: 0;
-		bottom: 78rpx;
+		bottom: 178rpx;
 		
 	}
 	.cuIcon::before{

pages/me/withdraw/index.vue

@@ -1,11 +1,17 @@
 <template>
 	<view class="container">
-		<!-- <view class="navs" style="width: 100%;height: 96rpx;"></view> -->
+		 <up-navbar title="申请提现"
-		<view class="nav">
+		            @rightClick="data.ruleShow = true"
-			<up-icon name="arrow-left" color="#fff" size="20" @click="back"></up-icon>
+					bgColor="rgb(255, 117, 129)"
-			<view class="navTitle">申请提现</view>
+					leftIconColor="#FFF"
-			<view class="ruleBtn" @click="data.ruleShow = true">规则</view>
+					:titleStyle ="{color:'#FFF'}" >
+				<template #right>
+				     <view class="u-p-r-30 u-flex u-col-center" style="color: #fff;">
+				     	<text class="rule-btn" @click="data.ruleShow = true">规则</text>
 				     </view>
+				</template>
+		</up-navbar>
+	
 		<view class="content">
 			<view class="title">可提现总额</view>
 			<view class="mayMoney">¥ {{ data.mayMoney }}</view>

pages/share/index.vue

@@ -49,11 +49,11 @@
 					</view>
 					<view @click="goNav('/pages/me/withdraw/moneyList?moneyType=2&viewType=1')">
 						<view class="">金币收益</view>
-						<!-- <view class="text-red u-m-t-16 "><text class=" u-font-40">{{earning.inviteGoldMoney||0}}</text></view> -->
+						<view class="text-red u-m-t-16 "><text class=" u-font-40">{{data.earning.inviteGoldMoney||0}}</text></view>
 					</view>
 					<view @click="goNav('/pages/me/withdraw/moneyList?moneyType=1&viewType=1')">
 						<view class="">红包收益</view>
-						<!-- <view class="text-red u-m-t-16 "><text class=" u-font-40">{{earning.inviteMoney||0}}</text></view> -->
+						<view class="text-red u-m-t-16 "><text class=" u-font-40">{{data.earning.inviteMoney||0}}</text></view>
 					</view>
 				</view>
 				<view class="u-m-t-16 u-p-b-32" style="text-align: center;color: #999;">好友签到成功可额外获得1元现金红包</view>

pages/task/index.vue

@@ -18,7 +18,9 @@
 			<view>
 				<view v-for="item in datas.signInList" :key="item.id"
 					:style="item.status == 1 ? 'color:#EFA765' : 'color:#999'">
+					<text class="" style="font-size: 28rpx;">
 						{{ item.status == 1 ? '已签到' : '待签到' }}
+					</text>
 					<view :style="item.status == 1 ? 'color:#999' : 'color:#EFA765'">
 						{{ item.signDay.substr(5, 8) }}
 					</view>
@@ -44,11 +46,12 @@
 						:style="{ backgroundColor: item.buttonBgColor, color: item.buttonFontColor }"
 						@tap="goNav(item)">
 						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : (
-							item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }} </view>
+							item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
+					</view>
 					<view v-else class="btn  disabled">
 						{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}`
-									: (item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }} <view
+									: (item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
-									v-if="item.buttonUnderContent && item.buttonUnderUrl" class=" tip"
+						<view v-if="item.buttonUnderContent && item.buttonUnderUrl" class=" tip"
 							@tap="goNav(item, item.buttonUnderUrl)">
 							{{ item.buttonUnderContent }}
 						</view>
@@ -66,16 +69,22 @@
 </template>
 
 <script setup>
-import {
+	import {
 		reactive,
-	getCurrentInstance, nextTick
+		getCurrentInstance,
-} from "vue";
+		nextTick
-import {
+	} from "vue";
-	onShow, onReachBottom
+	import {
-} from '@dcloudio/uni-app'
+		onShow,
-import { getUserSignData, selectTaskCenter, taskReceive } from '@/api/task/index.js'
+		onReachBottom
-const currentInstance = getCurrentInstance()
+	} from '@dcloudio/uni-app'
-let datas = reactive({
+	import {
+		getUserSignData,
+		selectTaskCenter,
+		taskReceive
+	} from '@/api/task/index.js'
+	const currentInstance = getCurrentInstance()
+	let datas = reactive({
 		signDays: 0,
 		signInList: [],
 		list: [],
@@ -84,17 +93,17 @@ let datas = reactive({
 		urlCallback: {},
 		adRewardedVideo: true,
 
-})
+	})
-onShow(() => {
+	onShow(() => {
 		getTaskdata()
 		getsignIn()
 
 		// nextTick(() => {
 		// currentInstance.ctx.$refs.adRewardedVideo.load();
 		// })
-})
+	})
-//广告播放成功回调
+	//广告播放成功回调
-async function onadclose(e) {
+	async function onadclose(e) {
 		const detail = e.detail
 		if (detail && detail.isEnded) {
 			// 正常播放结束
@@ -114,8 +123,8 @@ async function onadclose(e) {
 		} else {
 			// 播放中途退出
 		}
-}
+	}
-async function goNav(item, url) {
+	async function goNav(item, url) {
 		// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
 		// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
 		if (url) {
@@ -133,7 +142,9 @@ async function goNav(item, url) {
 		} else {
 			if (item.jumpType == 0) {
 				if (item.title.indexOf("新人福利") != -1) {
-				let res = await taskReceive({ id: item.id })
+					let res = await taskReceive({
+						id: item.id
+					})
 					if (res.code == 0) {
 						uni.showToast({
 							title: res.id == 15 ? '签到成功' : '领取成功',
@@ -170,7 +181,8 @@ async function goNav(item, url) {
 					buttonUrl = item.buttonUrl + '?source=3'
 				}
 				if (item.title && item.title.indexOf('每月打卡奖励2') != -1) {
-				buttonUrl = `${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
+					buttonUrl =
+						`${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}`
 				}
 
 				uni.navigateTo({
@@ -184,18 +196,19 @@ async function goNav(item, url) {
 			}
 		}
 
-}
+	}
-function onadload(e) {
+
+	function onadload(e) {
 		datas.adRewardedVideo = true;
-}
+	}
-// 获得签到
+	// 获得签到
-async function getsignIn() {
+	async function getsignIn() {
 		let res = await getUserSignData()
 		datas.signInList = res.recordList
 		datas.signDays = res.signDays
-}
+	}
-// 获取任务列表
+	// 获取任务列表
-async function getTaskdata() {
+	async function getTaskdata() {
 		let res = await selectTaskCenter()
 		if (!datas.isExamine) {
 			let arrData = []
@@ -209,21 +222,20 @@ async function getTaskdata() {
 		} else {
 			datas.list = res
 		}
-}
+	}
-
 </script>
 
 <style scoped lang="scss">
-.u-absolute {
+	.u-absolute {
 		position: absolute;
-}
+	}
 
-.task_bg {
+	.task_bg {
 		width: 100% !important;
 		height: 494rpx !important;
-}
+	}
 
-.icon {
+	.icon {
 		position: relative;
 		padding: 32rpx;
 
@@ -249,20 +261,17 @@ async function getTaskdata() {
 			top: -40rpx;
 			position: relative;
 		}
-}
+	}
 
-.contentTop {
+	.contentTop {
 		border-radius: 16rpx;
 		top: -115rpx;
-	padding: 28rpx;
+		padding: 20rpx;
-
-
 		margin-bottom: 32rpx;
 		position: relative;
 		background-color: #ffffff;
 		color: #666666;
-	margin-left: 32rpx;
+		margin: 32rpx;
-	margin-right: 32rpx;
 
 		>view:first-child {
 			>image {
@@ -313,9 +322,9 @@ async function getTaskdata() {
 				}
 			}
 		}
-}
+	}
 
-.content {
+	.content {
 		border-radius: 16rpx;
 		top: -115rpx;
 		padding: 28rpx;
@@ -411,5 +420,5 @@ async function getTaskdata() {
 		.cell:last-child {
 			border-bottom: none;
 		}
-}
+	}
 </style>