2021-11-8

components/uni-countdown/uni-countdown.vue

@@ -94,7 +94,7 @@
 				} else {
 					this.timeUp()
 				}
-				hour = hour + (day*24)
+				hour = hour
 				if (day < 10) {
 					day = '0' + day
 				}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "BYTC",
     "appid" : "__UNI__F3A92A0",
     "description" : "",
-    "versionName" : "1.2.1",
-    "versionCode" : 121,
+    "versionName" : "1.2.4",
+    "versionCode" : 124,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/index/index.vue

@@ -36,14 +36,15 @@
 <script>
 import baseNav from '@/pages/public/nav.vue';
 import { mapState, mapMutations } from 'vuex';
-import { activityList } from '@/api/active.js';
+import { activityList,activitys } from '@/api/active.js';
 import { article } from '@/api/index.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+
 import { getApplyList } from '../../api/apply.js';
 import store from '../../store/index.js';
 export default {
 	components: {
-		baseNav
+		baseNav,
 	},
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
@@ -61,6 +62,7 @@ export default {
 			list: [],
 			image: ['../../static/img/index/youhui1.png', '../../static/img/index/youhui2.png'],
 			revenueList: [],
+			isShow:false,
 			tabbar: [
 				{
 					iconPath: '../../static/tabBar/home.png',
@@ -87,6 +89,12 @@ export default {
 	},
 	onShow() {
 		if (this.hasLogin) {
+			activitys({},1).then(e =>{
+				console.log(e.data.income,'11111')
+				if(e.data.income >= 10000){
+					obj.isShow = true
+				}
+			})
 			this.loadData();
 		} else {
 			let obj = this;
@@ -112,8 +120,12 @@ export default {
 			});
 		},
 		loadData() {
+			const obj = this;
 			activityList({}).then(({ data }) => {
 				this.list = data.list;
+				if(!obj.isShow){
+					this.list.pop()
+				}
 			});
 			article({
 				page: 1,
@@ -125,14 +137,12 @@ export default {
 					arr.push(e.synopsis);
 				});
 				this.showList = arr;
-				console.log(this.showList);
 			});
 			getApplyList({
 				page: 1,
 				limit: 1,
 				status: 0
 			}).then(({ data }) => {
-				console.log(data,'1111')
 				this.tabbar[1].count = data.count
 			});
 		},

pages/user/team.vue

@@ -93,10 +93,15 @@ export default {
 		//返回
 
 		loadData() {
+			uni.showLoading({
+				title: '加载中。。。',
+				mask: true
+			});
 			const obj = this;
 			children({}, this.id).then(({ data }) => {
 				this.childList = data;
 				console.log(data);
+				uni.hideLoading()
 			});
 		},
 		async findChildren(item) {

pages/user/user.vue

@@ -33,7 +33,7 @@
 				<view class="tt-txt">{{ $t('hea.syzx') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
-			<view class="tt-box" @click="navTo('/pages/user/shareQrCode')">
+			<view class="tt-box" v-if="isVip != -1" @click="navTo('/pages/user/shareQrCode')">
 				<image src="../../static/img/share.png" class="tt-icon1" mode=""></image>
 				<view class="tt-txt">{{ $t('hea.fxhy') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
@@ -43,6 +43,10 @@
 				<view class="tt-txt">{{ $t('hea.lxkf') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
+			<view class="tt-box" v-if="isGood">
+				倒计时：
+				<uni-countdown color="#FFF" background-color="#f5c786" :day="ls.stopTimeD" :hour="ls.stopTimeH" :minute="ls.stopTimeM" :second="ls.stopTimeS" :showColon="false" splitorColor="#FFF"></uni-countdown>
+			</view>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="popup-box">
@@ -78,6 +82,8 @@ import { mapState, mapMutations } from 'vuex';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { getApplyList } from '../../api/apply.js';
 import { getUserInfo } from '@/api/user.js';
+import { timeComputed } from '@/utils/rocessor.js';
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
 export default {
 	data() {
 		return {
@@ -85,6 +91,8 @@ export default {
 			text1: 'BYTCKF33',
 			text2: 'BYTCKF67',
 			isVip: -1,
+			ls: [],
+			isGood: false,
 			tabbar: [
 				{
 					iconPath: '../../static/tabBar/home.png',
@@ -154,27 +162,35 @@ export default {
 				.then(({ data }) => {
 					console.log(data, 'UserInfo+++++++++++++++++');
 					this.isVip = -1;
+					let date =  (new Date()).getTime();
+					date = (data.jointime + (48 * 3600))*1000 - date
+					console.log(date,'nowtime')
+					if (date > 0){
+						this.isGood = true;
+						this.timeComputed(data.jointime + (48 * 3600), this.ls);
+					}else {
+						this.isGood = false;
+					}
 					if (data.activity[0].my_join) {
-						console.log(333)
-						if (data.activity[0].my_join.status == '1'){
+						if (data.activity[0].my_join.status == '1') {
 							this.isVip = 0;
-						}else {
-							console.log(data.activity[0].my_join.status,'123')
-							this.isVip = -1
+						} else {
+							console.log(data.activity[0].my_join.status, '123');
+							this.isVip = -1;
 						}
 					}
 					if (data.activity[1].my_join) {
-						console.log(222)
+						console.log(222);
 						if (data.activity[1].my_join.status == '2') {
-							console.log(111)
+							console.log(111);
 							this.isVip = 2;
-						}else if (data.activity[1].my_join.status == '1'){
+						} else if (data.activity[1].my_join.status == '1') {
 							this.isVip = 1;
-						}else {
-							console.log(data.activity[0].my_join.status)
+						} else {
+							console.log(data.activity[0].my_join.status);
 						}
 					}
-					
+
 					this.setUserInfo(data);
 				})
 				.catch(e => {
@@ -185,8 +201,8 @@ export default {
 				limit: 1,
 				status: 0
 			}).then(({ data }) => {
-				console.log(data,'1111')
-				this.tabbar[1].count = data.count
+				console.log(data, '1111');
+				this.tabbar[1].count = data.count;
 			});
 		},
 		navTo(url) {
@@ -212,16 +228,16 @@ export default {
 		},
 		tocall(type) {
 			// #ifdef APP-PLUS
-			console.log(type)
-			let text ='';
-			if(type == '1'){
-				text = this.text
+			console.log(type);
+			let text = '';
+			if (type == '1') {
+				text = this.text;
 			}
-			if(type == '2'){
-				text = this.text1
+			if (type == '2') {
+				text = this.text1;
 			}
-			if(type == '3'){
-				text = this.text2
+			if (type == '3') {
+				text = this.text2;
 			}
 			uni.setClipboardData({
 				data: text,
@@ -239,6 +255,18 @@ export default {
 				}
 			});
 			// #endif
+		},
+		// 计算倒计时时间
+		timeComputed(da, ar) {
+			let obj = this;
+			// 计算时间，保存需要多少时间到期
+			let stopTime = timeComputed(da);
+			console.log(stopTime);
+			ar.stopTimeD = stopTime.day;
+			ar.stopTimeH = stopTime.hours;
+			console.log(ar.stopTimeH);
+			ar.stopTimeM = stopTime.minutes;
+			ar.stopTimeS = stopTime.seconds;
 		}
 	}
 };
@@ -313,6 +341,7 @@ page,
 		height: 100rpx;
 		display: flex;
 		align-items: center;
+		color: #ffffff;
 		border-bottom: 1px solid #838383;
 		.tt-icon1 {
 			width: 42rpx;

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/fd50b530-2fc0-11ec-969e-bd52ee0082ac
+https://ide.dcloud.net.cn/build/download/d8135600-385d-11ec-8402-67ad53fdab8d

utils/rocessor.js

@@ -41,7 +41,7 @@ export function timeComputed(time) {
 	// 获取当前时间
 	const actTime = (new Date()).getTime();
 	// 获取到期时间
-	let stopTime = time - actTime;
+	let stopTime = time*1000 - actTime;
 	// 判断是否小于0
 	if (stopTime < 0) {
 		stopTime = stopTime * -1