2-21-1

manifest.json

@@ -2,8 +2,8 @@
     "name" : "宏根蒂",
     "appid" : "__UNI__D811809",
     "description" : "",
-    "versionName" : "1.1.4",
-    "versionCode" : 114,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/user/award.vue

@@ -13,7 +13,8 @@
 			</view>
 			<view class="moneybtn-box">
 				<view class="money-btn"></view>
-				<view class="money-btn" @click="navto('/pages/user/withdrawal')">佣金提现</view>
+				<view class="money-btn" v-if="userInfo.level >= 2" @click="navto('/pages/user/withdrawal')">佣金提现</view>
+				<view class="money-btn" v-else></view>
 			</view>
 		</view>
 		<view class="info-box flex">

pages/user/jf.vue

@@ -19,22 +19,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="info-box flex">
-			<!-- <view class="info-item">
-				<view class="info-font">冻结中</view>
-				<view class="info-num">111</view>
-			</view> -->
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ sr }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ zc }}</view>
-			</view>
-		</view>
+		
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
@@ -174,13 +159,13 @@ export default {
 					console.log(data, '123456');
 					obj.sr = data.sr;
 					obj.zc = data.zc;
-					if (data.list.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data.list);
+					if (data.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data);
 						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					//判断是否还有数据, 有改为more, 没有改为noMore
-					if (navItem.limit == data.list.length) {
+					if (navItem.limit == data.length) {
 						navItem.loadingType = 'more';
 						return;
 					} else {
@@ -275,7 +260,7 @@ page {
 .money-box {
 	position: relative;
 	z-index: 2;
-	padding-top: 70rpx;
+	padding-top: 100rpx;
 	color: #ffffff;
 	text-align: center;
 	.money {

pages/user/shareQrCode.vue

@@ -13,9 +13,26 @@
 		</view> -->
 		<!-- <canvas :style="{ width: canvasW + 'px', height: canvasH + 'px',}" canvas-id="myCanvas" id="myCanvas"></canvas> -->
 		<canvas :style="{ width:  '600rpx', height: '1066rpx',}" canvas-id="myCanvas" id="myCanvas" class="hb"></canvas>
-		<view class="" v-if="fina">
+		<!-- <view class="" v-if="fina">
 			<button text="保存图片" @click="saveShareQrcode">保存图片</button>
 		</view>
+		<view class="" v-if="fina">
+			<button text="保存图片" @click="saveShareQrcode">分享链接</button>
+		</view> -->
+		<view class="btm-btn" v-if="fina">
+			<view class="btn" @click="comfirm">
+				<image src="../../static/icon/fzlj.png" mode=""></image>
+				<view class="">
+					复制邀请链接
+				</view>
+			</view>
+			<view class="btn" @click="saveShareQrcode">
+				<image src="../../static/icon/fxhb.png" mode=""></image>
+				<view class="">
+					保存分享海报
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -82,6 +99,53 @@
 			}
 		},
 		methods: {
+			uniCopy(content) {
+				/**
+				 * 小程序端 和 app端的复制逻辑
+				 */
+				//#ifndef H5
+				uni.setClipboardData({
+					data: content,
+					success: function() {
+						console.log('success');
+						return true;
+					}
+				});
+				//#endif
+			
+				/**
+				 * H5端的复制逻辑
+				 */
+				// #ifdef H5
+				if (!document.queryCommandSupported('copy')) {
+					//为了兼容有些浏览器 queryCommandSupported 的判断
+					// 不支持
+					return false;
+				}
+				let textarea = document.createElement('textarea');
+				textarea.value = content;
+				textarea.readOnly = 'readOnly';
+				document.body.appendChild(textarea);
+				textarea.select(); // 选择对象
+				textarea.setSelectionRange(0, content.length); //核心
+				let result = document.execCommand('copy'); // 执行浏览器复制命令
+				textarea.remove();
+				return result;
+				// #endif
+			},
+			comfirm() {
+				const result = this.uniCopy(this.val);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+			},
 			qrR(res) {
 				this.erweimasrc = res
 				console.log(res, 'erweima');
@@ -295,4 +359,28 @@
 		margin: 0 auto;
 		margin-top: 30upx;
 	}
+	
+	.btm-btn {
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		height: 200rpx;
+		display: flex;
+		background-color: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		.btn {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-size: 26rpx;
+			
+			image {
+				width: 66rpx;
+				height: 66rpx;
+				margin-bottom: 20rpx;
+			}
+		}
+	}
 </style>

pages/user/team.vue

@@ -17,10 +17,20 @@
 				<view class="money">{{ userInfo.spread_count|| '0' }}</view>
 				<view>我的推广人数</view>
 			</view>
-			<view class="money-box flex" style="padding: 20rpx 40rpx;" @click="navto('/pages/user/pushList')">
+		<!-- 	<view class="money-box flex" style="padding: 20rpx 40rpx;" @click="navto('/pages/user/pushList')">
 				<view>下级消费记录</view>
-				<!-- <view>直推人数：{{ztcount}}</view> -->
-			</view>
+			</view> -->
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">直推业绩</view>
+				<view class="info-num">{{recommend.numberCount || '0'}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">团队业绩</view>
+				<view class="info-num">{{group.numberCount || '0'}}</view>
+			</view>
 		</view>
 		<!-- <view class="time-in">
 			<picker mode="date" @change="bindStartDateChange">
@@ -104,7 +114,9 @@
 			});
 		},
 		data() {
-			return {
+			return {
+				recommend: {},
+				group: {},
 				// 头部图高度
 				maxheight: '',
 				tabCurrentIndex: 0,
@@ -143,12 +155,14 @@
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
 			...mapState(['baseURL'])
 		},
-		onLoad(options) {},
+		onLoad(options) {
+			this.loadData();
+		},
 		onShow() {
-			this.loadData();
-			getPushList().then(res => {
-				console.log(res)
-			})
+			
+			// getPushList().then(res => {
+			// 	console.log(res)
+			// })
 		},
 		methods: {
 			bindStartDateChange(e) {
@@ -203,7 +217,9 @@
 						}else {
 							navItem.loadingType = 'noMore'
 						}
-						navItem.loaded = true
+						navItem.loaded = true
+						obj.group = data.group
+						obj.recommend = data.recommend
 						// console.log(data);
 						// this.teamcount = data.team_count
 						// this.ztcount = data.zt_count
@@ -553,5 +569,40 @@
 			line-height: 50rpx;
 			color: #fff;
 		}
+	}
+	.info-box {
+		width: 670rpx;
+		height: 186rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+		margin: -100rpx auto 20rpx;
+		position: relative;
+		z-index: 2;
+		.info-item {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 1;
+			.info-font {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #999999;
+			}
+			.info-num {
+				margin-top: 30rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #181818;
+			}
+		}
+		.shu {
+			width: 2rpx;
+			height: 74rpx;
+			background: #dcdfe6;
+		}
 	}
 </style>

pages/user/user.vue

@@ -51,7 +51,7 @@
 					</view>
 					<view class="oitem-font">我的佣金</view>
 				</view>
-				<view class="oitem" @click="navTo('/pages/user/scoreAccumulate')">
+				<view class="oitem" @click="navTo('/pages/user/jf')">
 					<view class="oitem-val">
 						{{ userInfo.integral || '0.00' }}
 					</view>