Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into gaohao

pages/me/index.vue

@@ -176,7 +176,7 @@
 						<u-badge :offset="[0,20]" type="error" :count="numCount"></u-badge>
 					</view>
 					<view class="tool-box-content-item flex align-center justify-center flex-wrap"
-						@click="goNav('/me/jilu/jilu')">
+						@click="goNav('/me/jilu/record')">
 						<view class="tool-box-content-item-img">
 							<image src="../../static/images/me/vlishi.png" mode=""></image>
 						</view>
@@ -251,16 +251,21 @@
 		</u-popup>
 		<!-- 抖音im客服 -->
 		<ttMsg />
-
+		
+		
+		<other-xuanfu></other-xuanfu>
 	</view>
 </template>
 
 <script>
 	import ttMsg from '../../components/ttMsg/ttMsg.vue'
 	import httpsRequest from '../../common/httpRequest.js'
+	import otherXuanfu from '@/components/other-xuafu.vue'
+	
+	
 	export default {
 		components: {
-			ttMsg
+			ttMsg,otherXuanfu
 		},
 		data() {
 			return {
@@ -308,9 +313,9 @@
 			this.token = uni.getStorageSync('token')
 			if (this.token) {
 				this.getMyMoney()
-				this.getJifen()
+				this.getPoints()
 				this.$u.api.userinfo().then(res => {
-					if (res.code == 0 && res.data) {
+					if (res.code === 0 && res.data) {
 						uni.setStorageSync('zhiFuBao', res.data.zhiFuBao)
 						uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName)
 						uni.setStorageSync('userName', res.data.userName)
@@ -327,7 +332,7 @@
 					userId: uni.getStorageSync('userId')
 				}
 				this.$u.api.userVip(data).then(res => {
-					if (res.code == 0 && res.data && res.data.isVip == 2) {
+					if (res.code === 0 && res.data && res.data.isVip === 2) {
 						this.isVIP = true;
 						this.endTime = res.data.endTime
 						uni.setStorageSync('isVIP', true)
@@ -342,7 +347,7 @@
 				this.userName = uni.getStorageSync('userName')
 				this.isVIP = uni.getStorageSync('isVIP')
 				this.getMyLoveNum()
-				this.getMyZhuiNum()
+				this.getMyFansNum()
 			} else {
 				this.isLogin = false
 				this.isVIP = false
@@ -359,10 +364,10 @@
 
 			httpsRequest.getT("app/common/type/919", {}).then(res => {
 				console.log(res);
-				if (res.code == 0) {
+				if (res.code === 0) {
 					const sysInfo = uni.getSystemInfoSync();
-					let isIos = sysInfo.platform == 'ios'
-					this.isShowMoneyPay = !(res.data.value == '1' && isIos)
+					let isIos = sysInfo.platform === 'ios'
+					this.isShowMoneyPay = !(res.data.value === '1' && isIos)
 				}
 			});
 		},
@@ -380,7 +385,7 @@
 					sdkContent: this.kami
 				}
 				this.$Request.postT('/app/sdkInfo/sdkExchange', data).then(res => {
-					if (res.code == 0) {
+					if (res.code === 0) {
 						uni.showToast({
 							title: '兑换成功'
 						})
@@ -389,7 +394,7 @@
 							userId: uni.getStorageSync('userId')
 						}
 						this.$u.api.userVip(datas).then(rest => {
-							if (rest.code == 0 && rest.data && rest.data.isVip == 2) {
+							if (rest.code === 0 && rest.data && rest.data.isVip === 2) {
 								this.isVIP = true;
 								this.endTime = rest.data.endTime
 								uni.setStorageSync('isVIP', true)
@@ -425,7 +430,7 @@
 					classify: 2
 				}
 				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
-					if (res.code == 0) {
+					if (res.code === 0) {
 						this.myLoveNum = res.data.total
 					} else {
 						this.myLoveNum = 0
@@ -433,14 +438,14 @@
 				})
 			},
 			//获取我追剧的数量
-			getMyZhuiNum() {
+			getMyFansNum() {
 				let data = {
 					page: 1,
 					limit: 1,
 					classify: 1
 				}
 				this.$Request.getT('/app/courseCollect/selectByUserId', data).then(res => {
-					if (res.code == 0) {
+					if (res.code === 0) {
 						this.myZhui = res.data.total
 					} else {
 						this.myZhui = 0
@@ -450,9 +455,9 @@
 			/**
 			 * 获取积分
 			 */
-			getJifen() {
+			getPoints() {
 				this.$Request.getT('/app/integral/selectByUserId').then(res => {
-					if (res.code == 0) {
+					if (res.code === 0) {
 						this.jifen = res.data.integralNum
 					} else {
 						this.jifen = 0
@@ -476,7 +481,7 @@
 			 */
 			getMyMoney() {
 				this.$Request.getT('/app/moneyDetails/selectUserMoney').then(res => {
-					if (res.code == 0) {
+					if (res.code === 0) {
 						this.moneyNum = res.data.money
 						this.userInfo = res.data
 						// this.$Request.getT('/app/invite/selectInviteMoney').then(ret => {
@@ -519,15 +524,15 @@
 			goMsg() {
 				let kefu = uni.getStorageSync('kefu'); // 用户端联系方式 1 手机号 2企业微信
 				let kefuPhone = uni.getStorageSync('kefuPhone');
-				if (kefu == 1) {
+				if (kefu === 1) {
 					uni.navigateTo({
 						url: '/me/setting/kefu'
 					})
-				} else if (kefu == 3) {
+				} else if (kefu === 3) {
 					uni.makePhoneCall({
 						phoneNumber: kefuPhone //仅为示例
 					});
-				} else if (kefu == 2) {
+				} else if (kefu === 2) {
 					// #ifdef MP-WEIXIN
 					let that = this
 					try {
@@ -571,7 +576,7 @@
 				console.log(e)
 				let token = uni.getStorageSync('token')
 				if (token) {
-					if (type == 'tabbar') {
+					if (type === 'tabbar') {
 						uni.switchTab({
 							url: e
 						})
@@ -593,10 +598,10 @@
 				this.$u.api.bannerList({
 					classify: '3'
 				}).then(res => {
-					if (res.code == 0 && res.data) {
+					if (res.code === 0 && res.data) {
 						let arr = []
 						res.data.forEach(ret => {
-							if (ret.state == 1) {
+							if (ret.state === 1) {
 								arr.push(ret)
 							}
 						})