5-23

manifest.json

@@ -111,7 +111,7 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://lnpt.frp.liuniu946.com/api",
-                    "target" : "http://xxl.liuniu946.com/api",
+                    "target" : "https://xxl.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages/redirect/redirect.vue

@@ -31,9 +31,11 @@ export default {
 		loadH5() {
 			let obj = this;
 			let url = window.location.href;
-			let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
+			let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
+			let spread = uni.getStorageSync('spread') || ''
 			wechatAuth({
-				code: code,
+				code: code,
+				spread: spread
 			}).then(({ data }) => {
 				obj.wchatAuth(data);
 			}).catch((e) => {

pages/user/team.vue

@@ -18,6 +18,16 @@
 				<view>我的推广人数</view>
 			</view>
 		</view>
+		<view class="flex buttom-box">
+			<view class="buttom"  @click="tabClick(0)">
+				<view class="money">{{all || 0}}</view>
+				<text class="text" :class="{ current: tabCurrentIndex === 0 }">一级推广</text>
+			</view>
+			<view class="buttom"  @click="tabClick(1)">
+				<view class="money">{{totalLevel || 0}}</view>
+				<text class="text" :class="{ current: tabCurrentIndex === 1 }">二级推广</text>
+			</view>
+		</view>
 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300"
 			@change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -90,9 +100,18 @@
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: '间接推荐',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
 				}],
 				all: '',
-				list: ''
+				list: '',
+				totalLevel: ''
 			};
 		},
 		computed: {
@@ -132,13 +151,15 @@
 				navItem.loadingType = 'loading';
 				myspread({
 						page: navItem.page,
-						limit: navItem.limit
+						limit: navItem.limit,
+						grade:state
 					})
 					.then(({
 						data
 					}) => {
 						console.log(data);
 						this.all = data.total;
+						this.totalLevel = data.totalLevel
 						if (data.list.length > 0) {
 							this.list = data.list;
 							navItem.orderList = navItem.orderList.concat(data.list);
@@ -389,4 +410,73 @@
 			background: #dddddd;
 		}
 	}
+	.navbar {
+		margin-top: 20rpx;
+		display: flex;
+		height: 88rpx;
+		padding: 0 5px;
+		background: #fff;
+		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+	
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: #999999;
+			position: relative;
+	
+			&.current {
+				color: #000;
+	
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #fe5b38;
+				}
+			}
+		}
+	}
+	.buttom-box {
+		position: relative;
+		background-color: #ffffff;
+		text-align: center;
+		padding: 30rpx 0;
+		.buttom {
+			flex-grow: 1;
+		}
+		.money{
+			
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #ffc11d;
+		}
+		.text {
+			padding-bottom: 26rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+			&.current {
+				border-bottom: 2px solid #ffc11d;
+			}
+		}
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
 </style>

pages/user/user.vue

@@ -17,7 +17,7 @@
 					<view class="user-font">
 						<view class="name clamp" v-if="userInfo.nickname">{{ userInfo.nickname }}</view>
 						<view class="name clamp" v-else>游客</view>
-						<view class="phone" v-if="userInfo.phone">{{ userInfo.phone }}</view>
+						<view class="phone" v-if="userInfo.spread_nickname">推荐人：{{ userInfo.spread_nickname }}</view>
 						<view class="phone" v-if="userInfo.uid">邀请码：{{ userInfo.uid }}</view>
 					</view>
 				</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.58012eb0.js></script><script src=/index/static/js/index.582791bf.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/wap/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/wap/static/js/chunk-vendors.58012eb0.js></script><script src=/wap/static/js/index.e1755007.js></script></body></html>