代码优化

vedio/common/services/userServices.js

@@ -240,6 +240,22 @@ function logout(callback, exprireOut = false) {
 	// }
 }
 
+
+const KEY_STORAGE_ACTIVITY = "ACTIVITY"
+let LOCAL_ACTIVITY;
+
+function saveActivity(activity) {
+	LOCAL_ACTIVITY = activity;
+	saveStorage(KEY_STORAGE_ACTIVITY, activity);
+}
+
+function readaActivity() {
+	if (!LOCAL_ACTIVITY) {
+		LOCAL_ACTIVITY = readStorage(KEY_STORAGE_ACTIVITY)
+	}
+	return LOCAL_ACTIVITY;
+}
+
 const KEY_STORAGE_TOKEN = "TOKEN"
 let LOCAL_TOKEN;
 
@@ -315,8 +331,8 @@ function removeUserInfoChangeWatch(observer) {
 }
 
 // 展示登录弹窗
-function showLoginView() {
-	
+function showLoginView() {
+
 	reLaunch(`loading`)
 
 	// postNotification(KEY_NOTIFICATION_LOGIN_SHOW, {
@@ -339,4 +355,6 @@ module.exports = {
 	removeUserInfoChangeWatch,
 	saveToken,
 	readToken,
+	saveActivity,
+	readaActivity
 }
\ No newline at end of file

vedio/page-subs/sub_A/book-content/book-content.vue

@@ -62,7 +62,8 @@
 		watchUserInfoChange,
 		removeUserInfoChangeWatch,
 		refreshUserInfo,
-		postPhone
+		postPhone,
+		readaActivity
 	} from "../../../common/services/userServices.js"
 	import {
 		noticeCollectionListChange,
@@ -250,6 +251,10 @@
 					// setTimeout(() => {
 					// uni.stopPullDownRefresh();
 					if (success) {
+						if (readaActivity() != 1) {
+							data.isUnlock = 1
+						}
+
 						this.bookData = new BookDetail(data);
 						// console.log('bookData=' + JSON.stringify(this.bookData));
 					}

vedio/pages/home.vue

-<template>
+<template>
 	<view v-if="localActiviteFlag==1" class="body">
 		<view style="height: 92%;">
 			<bookshelf v-show="currentPage==0" ref="shelf" v-on:showEditBarH="showEditBarH" />
@@ -156,7 +156,7 @@
 					} else if (this.currentPage == 3) {
 						this.$refs.user.show();
 					}
-				} else {
+				} else {
 					this.$refs.recommend2.show();
 				}
 			},

vedio/pages/loading.vue

@@ -38,7 +38,8 @@
 
 <script>
 	import {
-		saveToken
+		saveToken,
+		saveActivity
 	} from '../common/services/userServices.js'
 
 	import {
@@ -69,23 +70,22 @@
 		},
 		onShow(options) {
 			this.ttLoging()
-
+			this.isVipStatus()
 		},
 		methods: {
 			isVipStatus() {
-				this.post({
-					url: '/user/baseMsg',
-					showLoading: false,
-					success: ({
-						data
-					}) => {
-						if (data.expireTime > 0) {
-							this.isVip = true
-						} else {
-							this.isVip = false
+				if (this.sourceType == 'android' && this.localToken) {
+					let that = this;
+					this.post({
+						url: '/vip/getVipProducts/cyc/forVApp',
+						showLoading: false,
+						success: ({
+							data
+						}) => {
+							that.isVip = data.vip
 						}
-					}
-				});
+					});
+				}
 			},
 			ttLoging() {
 				var that = this;
@@ -128,6 +128,7 @@
 							}) => {
 								app.globalData.userId = data.idcode;
 								saveToken(data.token)
+								saveActivity(data.activiteFlag)
 								// saveToken(
 								// 	'A5CFAE67AF32E71D10CA6127546E82C20A8DE7C0EAAA5697BEEC2AC2E333F9945F433703067DF5142735505C42F58997'
 								// )
@@ -199,9 +200,9 @@
 					appId: "wxbd687630cd02ce1d",
 					path: 'pages/index/index',
 					extraData: wxData.params,
-					success(res) {
-						setTimeout(() => {
-							that.isVipStatus()
+					success(res) {
+						setTimeout(() => {
+							that.isVipStatus()
 						}, 1000);
 					},
 					fail(res) {