2023-11-8

pages/cart/cart.vue

@@ -64,7 +64,7 @@
 				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
 			</view>
 		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar" ></u-tabbar>
+		<u-tabbar activeColor="#333333" inactive-color='#999999' v-model="current" :list="tabbar" ></u-tabbar>
 	</view>
 </template>
 

pages/category/category.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 		</scroll-view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar"></u-tabbar>
+		<u-tabbar activeColor="#333333" inactive-color='#999999' v-model="current" :list="tabbar"></u-tabbar>
 	</view>
 </template>
 

pages/collection/bank.vue

@@ -21,13 +21,13 @@
 				<text>手机号</text>
 				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
 			</view> -->
-			<view class="item">
+			<!-- <view class="item">
 				<text>验证码</text>
 				<view class="login_name flex">
 					<input class="uni-input" v-model="code" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="button" @click="confirm()">确认</view>
 	</view>
@@ -118,9 +118,9 @@ export default {
 			if (!obj.bankname) {
 				return this.$api.msg('请输入所属支行');
 			}
-			if (!obj.code) {
-				return this.$api.msg('请输入验证码');
-			}
+			// if (!obj.code) {
+			// 	return this.$api.msg('请输入验证码');
+			// }
 			auction({
 				type: 3,
 				name: obj.name,
@@ -128,7 +128,7 @@ export default {
 				payment: obj.id,
 				phone:obj.userInfo.phone,
 				bank_name: obj.bankname,
-				captcha:obj.code
+				// captcha:obj.code
 			}).then(e => {
 				obj.$api.msg('修改成功');
 				uni.redirectTo({

pages/collection/wx.vue

@@ -13,13 +13,13 @@
 				<text>手机号</text>
 				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
 			</view>
-			<view class="wx">
+			<!-- <view class="wx">
 				<text>验证码</text>
 				<view class="login_name flex">
 					<input class="uni-input" v-model="captcha" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="erweima">
 				<text>微信收款码</text>
 				<view class="img" @click="uploads()">
@@ -58,7 +58,7 @@
 				name: '',
 				image: '',
 				phone: '',
-				captcha: '',
+				// captcha: '',
 				countDown: 0, //倒计时
 				time: '',
 				upFileLoding:false,
@@ -146,16 +146,16 @@
 				if (!obj.phone) {
 					return this.$api.msg('请输入手机号码');
 				}
-				if (!obj.captcha) {
-					return this.$api.msg('请输入验证码');
-				}
+				// if (!obj.captcha) {
+				// 	return this.$api.msg('请输入验证码');
+				// }
 				auction({
 						type: 1,
 						name: obj.name,
 						payment: obj.code,
 						image: obj.image,
 						phone: obj.phone,
-						captcha: obj.captcha,
+						// captcha: obj.captcha,
 					})
 					.then(e => {
 						obj.$api.msg('修改成功');
@@ -196,7 +196,6 @@
 			}
 
 			input {
-				height: 100rpx;
 				display: inline-block;
 				font-size: 28rpx;
 				font-family: PingFang SC;

pages/collection/zfb.vue

@@ -13,13 +13,13 @@
 				<text>手机号</text>
 				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
 			</view> -->
-			<view class="item top">
+			<!-- <view class="item top">
 				<text>验证码</text>
 				<view class="login_name flex">
 					<input class="uni-input" v-model="code" focus placeholder="请输入验证码" />
 					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="erweima">
 				<text>收款码</text>
 				<view class="img" @click="uploads()">
@@ -61,7 +61,7 @@
 				id: '',
 				phone: '',
 				countDown: 0, //倒计时
-				code: '', //验证码
+				// code: '', //验证码
 				time: '',
 				image: '',
 				upFileLoding:false,
@@ -145,9 +145,9 @@
 				// if (!obj.phone) {
 				// 	return this.$api.msg('请输入手机号码');
 				// }
-				if (!obj.code) {
-					return this.$api.msg('请输入验证码');
-				}
+				// if (!obj.code) {
+				// 	return this.$api.msg('请输入验证码');
+				// }
 				if (!obj.image) {
 					return this.$api.msg('请上传支付凭证');
 				}
@@ -156,7 +156,7 @@
 						name: obj.name,
 						payment: obj.id,
 						phone: obj.userInfo.phone,
-						captcha: obj.code,
+						// captcha: obj.code,
 						image: obj.image,
 					})
 					.then(e => {

pages/hall/gsell.vue

@@ -4,12 +4,12 @@
 			<view class="main-font">购买价格(元)</view>
 			<view class="main-input">{{ (buy * 1).toFixed(2) * 1 }}</view>
 		</view>
-		<view class="center"><calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" :nextMounth="next"></calendar></view>
+		<!-- <view class="center"><calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" :nextMounth="next"></calendar></view> -->
 		<view class="title">今日最高限价{{ (price * 1).toFixed(2) * 1 }}</view>
-		<view class="main">
+		<!-- <view class="main">
 			<view class="main-font">挂售日期</view>
 			<view class="main-input">{{ deta }}</view>
-		</view>
+		</view> -->
 		<view class="main">
 			<view class="main-font">挂售价格(元)</view>
 			<view class="main-input">{{ (price * 1).toFixed(2) * 1 }}</view>
@@ -28,13 +28,13 @@ export default {
 	},
 	data() {
 		return {
-			signList: [],
+			// signList: [],
 			id: '',
 			price: '', //挂售价格
 			buy: '', //购买价格
 			deta: '', //挂售日期
 			fwprice: '', //服务费
-			next: false
+			// next: false
 		};
 	},
 	onLoad(option) {
@@ -48,20 +48,17 @@ export default {
 				this.buy = e.data.price;
 				this.price = e.data.hanging_price;
 				this.fwprice = e.data.anticipate;
-				let arr = e.data.gs_time.split(' ');
-				let brr = arr[0].split('-');
+				// let arr = e.data.gs_time.split(' ');
+				// let brr = arr[0].split('-');
 				// this.signList.push(brr[2] * 1)
-				this.signList.push(brr[2] * 1);
-				let month = new Date().getMonth() + 1;
-				console.log(month, '1234568797321896');
-				if (brr[1] * 1 == month) {
-					this.next = false;
-				} else {
-					this.next = true;
-				}
-				console.log(this.signList);
-				this.deta = brr[1] + '月' + brr[2] + '日';
-				console.log(brr);
+				// this.signList.push(brr[2] * 1);
+				// let month = new Date().getMonth() + 1;
+				// if (brr[1] * 1 == month) {
+				// 	this.next = false;
+				// } else {
+				// 	this.next = true;
+				// }
+				// this.deta = brr[1] + '月' + brr[2] + '日';
 			});
 		},
 		sall() {

pages/hall/halllist.vue

@@ -6,52 +6,14 @@
 				<view class="goback-box" @click="toBack">
 					<image class="goback" src="../../static/img/fanhui.png" mode=""></image>
 				</view>
-				<view class="header">CBB利润前置抢货区</view>
-				<!-- #ifndef APP-PLUS -->
-				<image class="money_bg" src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/87a32202304061420101468.png">
-				</image>
-				<!-- #endif -->
-				<!-- #ifdef APP-PLUS -->
-				<image class="money_bg" src="../../static/img/hinfo-bg1.png"></image>
-				<!-- #endif -->
-				</image>
+				<view class="header">会馆场次</view>
 			</view>
 		</view>
 		<swiper class="hallist-bg" autoplay="true" duration="400" interval="5000">
 			<swiper-item v-for="(item, index) in images" :key="index" class="carousel-item">
-				<image :src="item" />
+				<image class="swimage" :src="item" />
 			</swiper-item>
 		</swiper>
-		<view class="message flex">
-			<image class="message-left" src="../../static/img/hinco.png" mode=""></image>
-			<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false" :more-icon="true"
-				:list="text" @click="goDetails" @getMore="navTo('/pages/index/message?type = 1')"></u-notice-bar>
-		</view>
-		<view class="navbar">
-			<view class="navbar-item" @click="navTo('/pages/money/qudou')">
-				<view class="navbar-font">
-					<image class="navbar-image" src="../../static/img/been.png" mode=""></image>
-					<view class="font">趣豆</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.integral || '0.00' }}</view>
-			</view>
-			<view class="vvv"></view>
-			<view class="navbar-item">
-				<view class="navbar-font" @click="navTo('/pages/user/mygs')">
-					<image class="navbar-image" src="../../static/money/m03.png" mode=""></image>
-					<view class="font">我的收益</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.profit > 0 ? userInfo.profit : '0' }}</view>
-			</view>
-			<view class="vvv"></view>
-			<view class="navbar-item">
-				<view class="navbar-font" @click="navTo('/pages/user/myAppointment')">
-					<image class="navbar-image" src="../../static/money/m04.png" mode=""></image>
-					<view class="font">易趣卷</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.anticipate }}</view>
-			</view>
-		</view>
 		<view class="main" v-for="(item, index) in list" :key="index">
 			<view class="mtitle-english">{{ item.show }}</view>
 			<view class="mmain flex">
@@ -70,8 +32,8 @@
 						<view class="lyy-b-jz flex" v-if="item.daotime == 1" style="font-size: 30rpx; color: #d13737;">
 							已结束</view>
 						<view class="lyy-b-jz flex" v-else>
-							<uni-countdowns color="#FFFFFF" splitor-color="#FECD57" background-color="#FECD57"
-								border-color="#FECD57" :show-day="false" :hour="item.hours" :minute="item.minutes"
+							<uni-countdowns color="#702400" splitor-color="#faf1e6" background-color="#faf1e6"
+								border-color="#faf1e6" :show-day="false" :hour="item.hours" :minute="item.minutes"
 								:second="item.seconds" :index="index" @timeover="isTime"></uni-countdowns>
 						</view>
 					</view>
@@ -80,35 +42,33 @@
 					<image :src="item.image" mode=""></image>
 				</view>
 			</view>
-			<view class="bottom" @click="open(item)">
-				<view class="bottom-font" v-if="item.str == '预约'">立即{{ item.str }}</view>
-				<view class="bottom-font" v-else>{{ item.daotime == 1 ? '立即进入' : '您已预约' }}</view>
-				<image class="bottom-image" src="../../static/img/jt.png" mode=""></image>
+			<view v-if="item.str == '预约'" class="bottom" @click="open(item)">
+				<view class="bottom-font">立即{{ item.str }}</view>
+				<image v-if="item.str == '预约'" class="bottom-image" src="../../static/img/jt.png" mode=""></image>
+			</view>
+			<view class="bottom"  v-else>
+				<view class="bottom-font">{{ item.daotime == 1 ? '立即进入' : '您已预约' }}</view>
 			</view>
 		</view>
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
-				<view class="popup-title">预约需要{{ price }}易趣卷是否立即预约？</view>
+				<view class="popup-title">
+					<view class="title">
+						请选择价格档次
+					</view>
+					<view class="flex-center">
+						<view class="pirice" @click="actionPay=ind" :class="{action:actionPay==ind}" v-for="(item,ind) in price_cate">
+							{{item}}
+						</view>
+					</view>
+				</view>
 				<view class="btn-box">
 					<view class="btn-left" @click="close()">取消</view>
 					<view class="btn-right" @click="appointment()">确定</view>
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="rule" :mask-click="false">
-			<view class="regulation">
-				<view class="regulation_close" @click="$refs.rule.close()">
-					<image src="../../static/icon/guanbi@2x.png" mode=""></image>
-				</view>
-				<view class="regulation_name">会员须知及寄售协议</view>
-				<view class="regulation_main">
-					<scroll-view scroll-y="true" class="scroll-view">
-						<view class="html" v-html="hyxy"></view>
-					</scroll-view>
-				</view>
-				<view class="regulation_btn" @click="xyqd()">已阅读并同意</view>
-			</view>
-		</uni-popup>
+		<u-tabbar activeColor="#333333" inactive-color='#999999' :list="tabbar"></u-tabbar>
 	</view>
 </template>
 
@@ -137,30 +97,29 @@
 	import {
 		timeComputed
 	} from '@/utils/rocessor.js';
+	import {
+		tabbar1
+	} from '@/utils/tabbar.js';
 	export default {
 		components: {
 			uniCountdowns
 		},
 		data() {
 			return {
-				hyxy: '',
+				actionPay:0,
+				tabbar: tabbar1,
 				images: [], //轮播图
 				name: '', //馆名字
 				peoplename: '', //馆长名字
-				price: '', //预约的价格
 				id: '', //预约会场id
-				oid: '', //馆id
+				price_cate: [],
 				page: 1,
 				limit: 10,
 				loadingType: 'more',
-				text: [],
-				article: [],
 				list: [],
 				aliData: {},
 				bankData: {},
 				wx: {},
-				sm: 0,
-				sbly: ''
 			};
 		},
 		filters: {
@@ -184,7 +143,6 @@
 			}
 		},
 		onLoad(option) {
-			this.oid = option.id;
 			this.name = option.name;
 			this.peoplename = option.peoplename;
 		},
@@ -201,30 +159,12 @@
 				this.bankData = data.bank;
 			});
 			this.loadData();
-			this.isSm();
-			this.gethyxy();
 		},
 		computed: {
 			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			gethyxy() {
-				details({}, 2).then(({
-					data
-				}) => {
-					data.content = data.content.replace(/nowrap/gi, 'wrap');
-					this.hyxy = data.content;
-				});
-			},
-			isSm() {
-				rate({}).then(e => {
-					this.sm = e.data.is_auth;
-					if (e.data.is_auth == 3) {
-						this.sbly = e.data.off;
-					}
-				});
-			},
 			loadData() {
 				const obj = this;
 				if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
@@ -234,7 +174,6 @@
 				auction_list({
 					page: obj.page,
 					limit: obj.limit,
-					auction_gu_id: obj.oid
 				}).then(({
 					data
 				}) => {
@@ -242,6 +181,7 @@
 					console.log(data);
 					data.data.forEach(e => {
 						let now_time = timeComputed(e.time);
+						this.price_cate = data.price_cate;
 						console.log(e.time, now_time);
 						e.hours = now_time.hours;
 						e.minutes = now_time.minutes;
@@ -273,41 +213,6 @@
 				});
 			},
 			open(item) {
-				if (this.sm == 0) {
-					uni.showModal({
-						title: '提示',
-						content: '您未实名认证无法参与，是否前去实名认证？',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/user/approve'
-								});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-					return;
-				}
-				if (this.sm == 1) {
-					return this.$api.msg('实名认证正在审核中请耐心等待');
-				}
-				if (this.sm == 3) {
-					uni.showModal({
-						title: '提示',
-						content: '申请失败,原因' + this.sbly + '是否重新申请',
-						success: function(res) {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pages/user/approve'
-								});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-					return;
-				}
 				if (this.wx == '' && this.aliData == '' && this.bankData == '') {
 					uni.showModal({
 						title: '提示',
@@ -327,27 +232,23 @@
 				// 场次是否已经预约sta=1未预约
 				if (item.sta != 1) {
 					this.id = item.id;
-					advance({
-							id: item.id
-						})
-						.then(e => {
-							console.log(e, 'success');
-							this.nav();
-						})
-						.catch(e => {
-							console.log(e, 'fail');
-						});
+					this.nav();
+					// advance({
+					// 		id: item.id
+					// 	})
+					// 	.then(e => {
+					// 		console.log(e, 'success');
+					// 		this.nav();
+					// 	})
+					// 	.catch(e => {
+					// 		console.log(e, 'fail');
+					// 	});
 				} else {
-					this.price = item.anticipate;
 					this.id = item.id;
-					// this.$refs.popup.open();
-					this.$refs.rule.open();
+					this.$refs.popup.open();
+					// this.appointment();
 				}
 			},
-			xyqd() {
-				this.$refs.rule.close();
-				this.$refs.popup.open();
-			},
 			goDetails(e) {
 				console.log(e, '123456');
 				uni.navigateTo({
@@ -355,7 +256,6 @@
 				});
 			},
 			close() {
-				this.price = '';
 				this.id = '';
 				this.$refs.popup.close();
 			},
@@ -375,14 +275,14 @@
 			},
 			appointment() {
 				subscribe({
-						id: this.id
+						id: this.id,
+						price: this.price_cate[this.actionPay]
 					})
 					.then(({
 						data
 					}) => {
 						this.$api.msg('预约成功');
 						console.log(data);
-						this.price = '';
 						this.$refs.popup.close();
 						this.page = 1;
 						this.limit = 10;
@@ -392,7 +292,6 @@
 						this.updata();
 					})
 					.catch(e => {
-						this.price = '';
 						this.$refs.popup.close();
 						console.log(e);
 					});
@@ -416,7 +315,7 @@
 	};
 </script>
 
-<style lang="less">
+<style lang="scss">
 	page,
 	.center {
 		height: auto;
@@ -430,14 +329,11 @@
 	}
 
 	.money-box {
-		color: #ffffff;
+		color:$font-color-dark;
 		text-align: center;
 		position: relative;
 
 		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
 			width: 100%;
 			height: 80rpx;
 			font-size: 32rpx;
@@ -601,10 +497,11 @@
 		}
 
 		.bottom {
+			margin: 0 auto;
 			margin-top: 32rpx;
-			width: 380rpx;
-			height: 64rpx;
-			background: #d13737;
+			width: 440rpx;
+			height: 80rpx;
+			background: linear-gradient(90deg, #C38E4F, #ECC697);
 			border-radius: 20rpx;
 			display: flex;
 			justify-content: center;
@@ -629,46 +526,53 @@
 		width: 582rpx;
 		background: #ffffff;
 		border-radius: 20rpx;
-		padding: 118rpx 20rpx 30rpx;
+		// padding: 118rpx 20rpx 30rpx;
 
 		.popup-title {
+			padding: 30rpx;
 			text-align: center;
-			font-size: 42rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #0c1732;
+			.title {
+				font-size: $font-lg;
+				padding-bottom: 30rpx;
+			}
+
+			.pirice {
+				font-weight: bold;
+				line-height: 70rpx;
+				min-width: 140rpx;
+				height: 70rpx;
+				border: 1px solid #9ea6ba;
+				&.action{
+					 color: #FFF;
+					 background-color: $u-type-primary;
+					 border-color: $u-type-primary;
+				}
+			}
 		}
 
 		.btn-box {
-			padding-top: 90rpx;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
+			border-top: 1px solid $border-color-light;
+			font-size: 34rpx;
+			text-align: center;
+			font-weight: 500;
+			line-height: 78rpx;
 
-			.btn-left {
-				width: 248rpx;
+			.btn-left,
+			.btn-right {
+				flex-grow: 1;
 				height: 78rpx;
-				border: 2rpx solid #dc262b;
-				border-radius: 10rpx;
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #dc262b;
-				text-align: center;
-				line-height: 78rpx;
+			}
+
+			.btn-left {
+				color: $font-color-dark;
 			}
 
 			.btn-right {
-				width: 248rpx;
-				height: 78rpx;
-				background: #dc262b;
-				border-radius: 10rpx;
-				font-size: 34rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
+				background: $u-type-primary;
 				color: #ffffff;
-				text-align: center;
-				line-height: 78rpx;
 			}
 		}
 	}
@@ -705,11 +609,11 @@
 	.hallist-bg {
 		position: relative;
 		z-index: 10;
-		margin: -280rpx auto 0;
+		margin: 0 auto;
 		width: 702rpx;
 		height: 300rpx;
 		border-radius: 14rpx;
-
+		overflow: hidden;
 		image {
 			width: 100%;
 			height: 100%;

pages/hall/hallpay.vue

@@ -14,7 +14,7 @@
 				<!-- <image class="top-image" src="../../static/img/copy.png" mode=""></image> -->
 			</view>
 
-			<view v-if="status == 1">
+			<!-- <view v-if="status == 1">
 				<view class="downtime" v-if="stopTime.stopTimeH < 0 || stopTime.stopTimeM < 0 || stopTime.stopTimeS < 0">订单已过期</view>
 				<view class="downtime" v-else>
 					<uni-countdowns
@@ -28,7 +28,7 @@
 						:second="stopTime.stopTimeS"
 					></uni-countdowns>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="product flex">
 			<image class="product-image" :src="info.image" mode=""></image>
@@ -213,7 +213,8 @@ export default {
 	},
 	onLoad(option) {
 		this.id = option.ordid;
-		this.getpayTime();
+		this.loadData();
+		// this.getpayTime();
 		if (option.type) {
 			this.type = option.type;
 		}
@@ -236,12 +237,12 @@ export default {
 				console.log(e);
 			});
 		},
-		getpayTime() {
-			time().then(({ data }) => {
-				this.payTime = data.tow_time * 1 * 60;
-				this.loadData();
-			});
-		},
+		// getpayTime() {
+		// 	time().then(({ data }) => {
+		// 		this.payTime = data.tow_time * 1 * 60;
+		// 		this.loadData();
+		// 	});
+		// },
 		loadData() {
 			user_auction_order({ type: 1, order_id: this.id }).then(({ data }) => {
 				let time = data.time * 1 > data.radd_time * 1 ? data.time : data.radd_time;

pages/index/artDetail.vue

@@ -0,0 +1,109 @@
+<template>
+	<view class="center">
+		<!-- <view class="title clamp">{{ item.title }}</view>
+		<view class="time">{{ item.add_time }}</view> -->
+		<view class="main" v-for="(ls, index) in item.content" :key="index">
+			<view v-if="ls.type == 'rich-text'" v-html="ls.value" class="main"></view>
+			<video v-if="ls.type == 'video' && ls.value" :src="ls.value" style="width:100%;height: 300px" frameborder="0"></video>
+		</view>
+	</view>
+</template>
+
+<script>
+import { details } from '@/api/user.js';
+export default {
+	data() {
+		return {
+			id: '',
+			item: ''
+		};
+	},
+	onLoad(option) {
+		this.id = option.id;
+		this.loadData();
+	},
+	
+	methods: {
+		loadData() {
+			details({}, this.id).then(({ data }) => {
+				console.log(data);
+				data.content = data.content.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img').replace(/<div/g, '<div style="max-width: 50% !important;"');
+				data.content = this.getVideo(data.content);
+				this.item = data;
+				uni.setNavigationBarTitle({
+					title: data.title
+				})
+			});
+		},
+		// 富文本视频解析
+		getVideo(data) {
+			let videoList = [];
+			let videoReg = /<video.*?(?:>|\/>)/gi; //匹配到字符串中的 video 标签
+			let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i; //匹配到字符串中的 video 标签 的路径
+			let arr = data.match(videoReg) || []; // arr 为包含所有video标签的数组
+			let articleList = data.split('</video>'); // 把字符串  从视频标签分成数组
+			arr.forEach((item, index) => {
+				var src = item.match(srcReg);
+				videoList.push(src[1]); //所要显示的字符串中 所有的video 标签 的路径
+			});
+			let needArticleList = [];
+			articleList.forEach((item, index) => {
+				if (item != '' && item != undefined) {
+					//  常见的标签渲染
+					needArticleList.push({
+						type: 'rich-text',
+						value: item + '</video>'
+					});
+				}
+				let articleListLength = articleList.length; // 插入到原有video 标签位置
+				if (index < articleListLength && videoList[index] != undefined) {
+					needArticleList.push({
+						type: 'video',
+						value: videoList[index]
+					});
+				}
+			});
+			return needArticleList;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+		min-height: 100%;
+		height: auto;
+	}
+.center {
+	min-height: 100%;
+	height: auto;
+	background: #ffffff;
+	padding: 10rpx 24rpx 0;
+}
+.title {
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+.time {
+	font-size: 24rpx;
+	font-family: PingFangSC;
+	font-weight: 500;
+	color: #999999;
+	margin-top: 40rpx;
+}
+.main {
+	// margin-top: 60rpx;
+}
+/deep/ .main {
+	.rich-img {
+		width: 100% !important;
+		height: auto;
+	}
+	* {
+		max-width: 100% !important;
+	}
+}
+</style>

pages/index/index.vue

@@ -1,167 +1,120 @@
 <template>
 	<view class="center">
-		<view class="top">
-			<view class="vheigh"></view>
-			<!-- <view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">进货系统</view>
-			</view> -->
-			<!-- <image class="top-bg" src="../../static/img/top-bg.png" mode=""></image> -->
-			<view class="top-main flex">
-				<view class="search-box flex" @click="clickSearch()">
-					<image class="search" src="../../static/img/search.png" mode=""></image>
-					<view class="search-font">输入关键词搜索</view>
+		<view class="topcontent padding-b-30">
+			<view class="top">
+				<view class="vheigh"></view>
+				<view class="top-main flex">
+					<view class="search-box flex" @click="clickSearch()">
+						<image class="search" src="../../static/img/search.png" mode=""></image>
+						<view class="search-font">输入关键词搜索</view>
+					</view>
 				</view>
 			</view>
-		</view>
-		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
-				@click="bannerNavToUrl(item)">
-				<image :src="item.pic" />
-			</swiper-item>
-		</swiper>
-		<view class="stre flex">
-			<view class="ic-text flex">
-				<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
-				<view class="ic-wen">自用购物优惠</view>
-			</view>
-			<view class="ic-text flex">
-				<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
-				<view class="ic-wen">分享好友赚钱</view>
-			</view>
-			<view class="ic-text flex">
-				<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
-				<view class="ic-wen">超值正品优惠</view>
-			</view>
-		</view>
-		
-		<view class="zhishi  flex">
-			<view class="zhishi-item">
-				<image class="zhishi-ic" src="../../static/icon/shou-tro.png" mode=""></image>
-				<view class="zhishi-te">行业介绍</view>
-			</view>
-			<view class="zhishi-item">
-				<image class="zhishi-ic" src="../../static/icon/shou-we.png" mode=""></image>
-				<view class="zhishi-te">关于我们</view>
-			</view>
-			<view class="zhishi-item">
-				<image class="zhishi-ic" src="../../static/icon/shou-kefu.png" mode=""></image>
-				<view class="zhishi-te">联系客服</view>
-			</view>
-			<view class="zhishi-item">
-				<image class="zhishi-ic" src="../../static/icon/firend.png" mode=""></image>
-				<view class="zhishi-te">邀请好友</view>
-			</view>
-		</view>
-		
-		<view class="tongz flex">
-			<view>
-				<view class="tongz-bg">
-					<image src="../../static/img/tongz-bg.png" mode=""></image>
+			<swiper class="carousel" autoplay="true" duration="400" interval="5000">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+					@click="bannerNavToUrl(item)">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper>
+			<view class="stre flex">
+				<view class="ic-text flex">
+					<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
+					<view class="ic-wen">自用购物优惠</view>
 				</view>
-				<view class="tongz-left flex">
-					<image class="image-left" src="../../static/icon/shou-gonggao.png" mode=""></image>
-					<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false"
-						:more-icon="true" :list="text" @click="goDetails"
-						@getMore="nav('/pages/index/message?type=1')"></u-notice-bar>
+				<view class="ic-text flex">
+					<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
+					<view class="ic-wen">分享好友赚钱</view>
 				</view>
-			</view>
-		</view>
-		<view class="navbar flex">
-			<view class="navbar-item" v-for="(item, index) in navbarList[0].children"
-				@click="nav('/pages/product/list?tid=' + item.id)">
-				<image class="nitem-image" :src="item.pic" mode=""></image>
-				<view class="nitem-font">{{ item.cate_name }}</view>
-			</view>
-		</view>
-		<view class="shingle" v-if="list">
-			<view class="shingle-top flex">
-				<view class="shingle-title">CBB潮贝抢货通道</view>
-				<view class="shingle-btn" @click="nav('/pages/hall/hall')">
-					更多CBB代理团队
-					<text>></text>
+				<view class="ic-text flex">
+					<image class="ic-tubiao" src="../../static/icon/shou-ic.png" mode=""></image>
+					<view class="ic-wen">超值正品优惠</view>
 				</view>
 			</view>
-			<view class="shingle-main" @click="navTo(list)">
-				<view class="shingle-bg">
-					<image :src="list.image" mode=""></image>
-				</view>
-				<view class="shinglem-title flex">
-					<image class="tbg" src="../../static/img/tbg-left.png" mode=""></image>
-					<view class="shinglemt-center">
-						<image class="address" src="../../static/img/address.png" mode=""></image>
-						<view class="shingle-font">{{ list.name || 'null' }}</view>
+			<view class="zhishi  flex">
+				<navigator url="/pages/index/artDetail?id=5">
+					<view class="zhishi-item">
+						<image class="zhishi-ic" src="../../static/icon/shou-tro.png" mode=""></image>
+						<view class="zhishi-te">行业介绍</view>
 					</view>
-					<image class="tbg" src="../../static/img/tbg-right.png" mode=""></image>
+				</navigator>
+				<navigator url="/pages/index/artDetail?id=6">
+					<view class="zhishi-item">
+						<image class="zhishi-ic" src="../../static/icon/shou-we.png" mode=""></image>
+						<view class="zhishi-te">关于我们</view>
+					</view>
+				</navigator>
+				<view class="zhishi-item" @click="openKf">
+					<image class="zhishi-ic" src="../../static/icon/shou-kefu.png" mode=""></image>
+					<view class="zhishi-te">联系客服</view>
 				</view>
-				<view class="shingle-mmain flex">
-					<view class="smmain-item">
-						<view class="smitem-top">开放中</view>
-						<view class="smitem-bottom">状态</view>
+				<navigator url="/pages/user/shareQrCode">
+					<view class="zhishi-item">
+						<image class="zhishi-ic" src="../../static/icon/firend.png" mode=""></image>
+						<view class="zhishi-te">邀请好友</view>
 					</view>
-					<view class="shu"></view>
-					<view class="smmain-item">
-						<view class="smitem-top clamp">{{ list.nickname }}</view>
-						<view class="smitem-bottom">CBB潮倍贝</view>
+				</navigator>
+			</view>
+			<view class="tongz">
+				<view class="tongz-left flex padding-l-30">
+					<image class="image-left" src="../../static/icon/shou-gonggao.png" mode=""></image>
+					<u-notice-bar class="notice" mode="vertical" type="none" :volume-icon="false" :more-icon="true"
+						:list="text" @click="goDetails" @getMore="nav('/pages/index/message?type=1')"></u-notice-bar>
+				</view>
+			</view>
+			<view class="product-list flex">
+				<template v-for="(item,ind) in dataList">
+					<view class="list-left" v-if="ind==0">
+						<navigator :url="`/pages/index/artDetail?id=${item.id}`">
+							<image class="imgleft" :src="item.image_input[0]" mode="scaleToFill"></image>
+						</navigator>
 					</view>
-					<view class="shu"></view>
-					<view class="smmain-item">
-						<view class="people flex">
-							<view class="peopleitem" v-for="item in 1">
-								<image src="../../static/img/busy.png" mode=""></image>
-							</view>
-							<view class="peopleitem" v-for="item in 4">
-								<image src="../../static/img/leisure.png" mode=""></image>
-							</view>
-						</view>
-						<view class="smitem-bottom">流畅</view>
+				</template>
+				<view class="list-right flex" v-if="dataList.length>1">
+					<view class="item" v-for="(item,ind) in dataList" v-if="ind>0">
+						<navigator :url="`/pages/index/artDetail?id=${item.id}`">
+							<image class="imgleft" :src="item.image_input[0]" mode="scaleToFill"></image>
+						</navigator>
 					</view>
 				</view>
-				<image class="right-bottom" src="../../static/img/right-bottom.png" mode=""></image>
 			</view>
 		</view>
-		<view class="shop" @click="nav('/pages/store/store')">
-			<view class="shop-title">
-				<image class="shop-title-icon" src="../../static/icon/index1.png" mode=""></image>
-				<view class="shop-title-font">本地生活</view>
-			</view>
-			<!-- #ifndef APP-PLUS -->
-			<view class="shop-main">
-				<image src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/59b8e202304061437149756.png" mode=""></image>
+		<view class="bottom-box margin-t-30">
+			<view class="bottom-title padding-b-30">
+				<image class="image" src="../../static/img/image-title.png" mode="scaleToFill"></image>
 			</view>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<view class="shop-main">
-				<image src="../../static/img/index-shop.png" mode=""></image>
+			<swiper previous-margin='150rpx' next-margin='150rpx' class="product-art-list" circular autoplay
+				duration="400" interval="5000" @change='changeBottom'>
+				<swiper-item v-for="(item, index) in article" :key="index" class="product-art-item">
+					<navigator :url="`/pages/index/artDetail?id=${item.id}`">
+						<view class="image-box">
+							<image class="image" :src="item.image_input[0]" />
+						</view>
+					</navigator>
+				</swiper-item>
+			</swiper>
+			<view class="product-detail">
+				{{article[actionArtInd].synopsis}}
 			</view>
-			<!-- #endif -->
 		</view>
-		<view class="product" v-for="(item, index) in navbarList[0].children">
-			<view class="seckill-title flex">
-				<view class="seckill-left flex">
-					<view class="seckill-font">{{ item.cate_name }}</view>
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				<view class="img">
+					<image src="../../static/img/img009.png" mode=""></image>
 				</view>
-				<view class="seckill-right" @click="nav('/pages/product/list?tid=' + item.id)">
-					<view class="seckill-rfont">更多</view>
-					<image class="seckill-back" src="../../static/img/back.png" mode=""></image>
-				</view>
-			</view>
-			<view class="priduct-main">
-				<view class="priduct-item" v-for="itm in item.product" :key="itm.id" @click="navToDetailPage(itm)">
-					<view class="priduct-main-image">
-						<image :src="itm.image" mode="scaleToFill"></image>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
 					</view>
-					<view class="priduct-main-name clamp margin-c-20">{{ itm.store_name }}</view>
-					<view class="priduct-main-price">
-						<view class="price" v-if="item.integral != 0">￥{{ itm.price * 1 }} + {{ itm.integral }}趣豆</view>
-						<view class="price" v-else>￥{{ itm.price }}</view>
+					<view class="nocancel">客服VX:{{ kefu }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">取消</view>
+						<view class="comfirm" @click="comfirm(kefu)">复制微信</view>
 					</view>
 				</view>
 			</view>
-		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar"></u-tabbar>
+		</uni-popup>
+		<u-tabbar activeColor="#333333" inactive-color='#999999' v-model="current" :list="tabbar"></u-tabbar>
 	</view>
 </template>
 
@@ -201,20 +154,14 @@
 			return {
 				current: 0,
 				tabbar: tabbar1,
-				titleNViewBackground: '',
-				swiperCurrent: 0,
-				swiperLength: 0,
 				longitude: '', //经度
 				latitude: '', //纬度
-				dataList: '',
 				carouselList: [], //轮播图列表
-				text: [],
-				article: [],
-				list: {},
-				stop: [],
-				navbarList: [{
-					child: []
-				}]
+				text: [], //公告
+				article: [], //精品展示
+				dataList: [], //产品介绍
+				kefu: '',
+				actionArtInd: 0, //默认选中的精品展示对象
 			};
 		},
 		onPullDownRefresh() {
@@ -227,60 +174,54 @@
 		},
 		onShow() {
 			this.loadData();
-			this.getnavbar();
 			this.getaddress();
 		},
 		methods: {
 			...mapMutations(['setLat', 'setLon', 'setChoose']),
-			getnavbar() {
-				let obj = this;
-				getCategoryList({})
-					.then(({
-						data
-					}) => {
-						data[0].children.forEach(e => {
-							getProducts({
-								page: 1,
-								limit: 2,
-								sid: e.id
-							}).then(info => {
-								obj.$set(e, 'product', info.data);
-							});
-						});
-						this.navbarList = data;
-						console.log(data, '123456');
-					})
-					.catch(err => {
-						console.log(err);
-					});
+			// 底部轮播图切换
+			changeBottom(res) {
+				this.actionArtInd = res.detail.current;
+				console.log(res);
+			},
+			// 打开客服
+			openKf() {
+				this.$refs.popupkf.open();
+			},
+			// 关闭客服
+			cancel() {
+				this.$refs.popupkf.close();
 			},
 			loadData() {
 				article({}, 1).then(({
 					data
 				}) => {
-					data.forEach(e => {
-						this.text.push(e.synopsis);
-					});
-					this.article = data;
+					this.text = data.map((e) => {
+						return e.synopsis
+					})
 				});
-				auction_gu({
-						pages: 1,
-						limit: 1
+				// 精品展示
+				article({}, 2).then(({
+					data
+				}) => {
+					this.article = data.map((e) => {
+						e.imageurl = e.image_input[0];
+						return e
 					})
-					.then(({
-						data
-					}) => {
-						this.list = data[0];
+				});
+				// 产品介绍
+				article({}, 3).then(({
+					data
+				}) => {
+					this.dataList = data.map((e) => {
+						return e
 					})
-					.catch(e => {
-						console.log(e);
-					});
+				});
 				loadIndexs({})
 					.then(({
 						data
 					}) => {
 						let goods = data.info;
-						this.dataList = goods.bastList; //精品推荐
+						// this.dataList = goods.bastList; //精品推荐
 						this.carouselList = data.banner;
 					})
 					.catch(e => {});
@@ -374,12 +315,6 @@
 					}
 				});
 			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
 			// 點擊搜索框
 			clickSearch() {
 				uni.navigateTo({
@@ -404,51 +339,12 @@
 </script>
 
 <style lang="scss">
-	page,
 	.center {
-		min-height: 100%;
-		height: auto;
-		background: #ffffff;
+		padding-bottom: 30rpx;
 	}
 
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
+	.topcontent {
+		background-color: #FFFFFF;
 	}
 
 	.vheigh {
@@ -518,14 +414,17 @@
 			height: 276rpx;
 		}
 	}
+
 	.ic-text {
 		margin: 0 60rpx 0 40rpx;
+
 		.ic-tubiao {
 			width: 27rpx;
 			height: 27rpx;
 			margin-top: 16rpx;
 			margin-right: 10rpx;
 		}
+
 		.ic-wen {
 			width: 121rpx;
 			height: 20rpx;
@@ -534,13 +433,16 @@
 			margin-top: 5rpx;
 		}
 	}
+
 	.zhishi {
+		padding: 30rpx;
+
 		.zhishi-item {
-			margin: 40rpx 38rpx auto ;
 			.zhishi-ic {
 				width: 90rpx;
 				height: 90rpx;
 			}
+
 			.zhishi-te {
 				font-size: 24rpx;
 				color: #666666;
@@ -549,29 +451,19 @@
 	}
 
 	.tongz {
-		width: 690rpx;
 		height: 70rpx;
-		margin: 32rpx auto 0;
-		padding: 18rpx 30rpx 18rpx 24rpx;
+		margin: 0 30rpx 30rpx 30rpx;
+
+		border-radius: 20rpx;
+		overflow: hidden;
 		align-items: center;
 		position: relative;
-
-		.tongz-bg {
-			position: absolute;
-			top: 0;
-			right: 0;
-			left: 0;
-			width: 690rpx;
-			height: 70rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
+		background-color: #F8F8FA;
 
 		.tongz-left {
-			width: 640rpx;
+			.notice {
+				flex-grow: 1;
+			}
 
 			.image-left {
 				width: 28rpx;
@@ -600,326 +492,153 @@
 		}
 	}
 
-	.navbar {
-		justify-content: flex-start;
-		flex-wrap: wrap;
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
 
-		.navbar-item {
-			margin-top: 42rpx;
-			width: 25%;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
 			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.nitem-image {
-				width: 90rpx;
-				height: 90rpx;
-			}
+			justify-content: center;
 
-			.nitem-font {
-				margin-top: 10rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #0c1732;
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
 			}
 		}
-	}
-
-	.shingle {
-		width: 750rpx;
-		background: #f8f8f8;
-		border-radius: 10rpx;
-		margin: 60rpx auto 0rpx;
-		padding: 44rpx 50rpx 40rpx;
-
-		.shingle-top {
-			padding-left: 2rpx;
-
-			.shingle-title {
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #dc262b;
-			}
 
-			.shingle-btn {
-				width: 250rpx;
-				height: 50rpx;
-				border: 2rpx solid #dc262b;
-				border-radius: 10rpx;
-				padding: 0 16rpx;
-				text-align: left;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #dc262b;
-				line-height: 50rpx;
-
-				text {
-					display: inline-block;
-					padding-left: 6rpx;
-				}
-			}
-		}
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
 
-		.shingle-main {
-			margin: 20rpx auto;
-			width: 650rpx;
-			height: 206rpx;
-			position: relative;
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
 
-			.shingle-bg {
-				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				width: 650rpx;
-				height: 206rpx;
+				.title {}
 
 				image {
-					width: 650rpx;
-					height: 206rpx;
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
 				}
 			}
 
-			.shinglem-title {
-				position: relative;
-				z-index: 2;
-				justify-content: center;
-				height: 70rpx;
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
 
-				.tbg {
-					height: 70rpx;
-					width: 40rpx;
-				}
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
 
-				.shinglemt-center {
+				// justify-content: space-around;
+				.cancel {
 					display: flex;
 					align-items: center;
-					background: rgba(220, 38, 43, 0.66);
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
 				}
 
-				.address {
-					width: 28rpx;
-					height: 30rpx;
-				}
-
-				.shingle-font {
-					font-size: 36rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #ffffff;
-					line-height: 70rpx;
-					margin-left: 14rpx;
-				}
-			}
-
-			.shingle-mmain {
-				position: relative;
-				z-index: 2;
-				margin-top: 30rpx;
-
-				.smmain-item {
-					width: 33%;
+				.comfirm {
+					margin-left: 32rpx;
 					display: flex;
-					flex-direction: column;
 					align-items: center;
-
-					.smitem-top {
-						text-align: center;
-						width: 90%;
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #ffffff;
-					}
-
-					.smitem-bottom {
-						margin-top: 10rpx;
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #ffffff;
-					}
-
-					.people {
-						justify-content: center;
-
-						.peopleitem {
-							width: 24rpx;
-							height: 34rpx;
-
-							image {
-								width: 100%;
-								height: 100%;
-							}
-						}
-					}
-				}
-
-				.shu {
-					width: 2rpx;
-					height: 70rpx;
-					background: #ffffff;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
 				}
 			}
-
-			.right-bottom {
-				position: absolute;
-				z-index: 2;
-				right: 0;
-				bottom: 0;
-				width: 94rpx;
-				height: 92rpx;
-			}
 		}
 	}
 
-	.shop {
-		background: #ffffff;
-		padding: 32rpx 30rpx 20rpx;
-
-		.shop-title {
-			display: flex;
-			align-items: center;
+	.product-list {
+		padding: 0 30rpx;
+		line-height: 0;
+		align-items: stretch;
 
-			.shop-title-icon {
-				width: 36rpx;
-				height: 36rpx;
-			}
-
-			.shop-title-font {
-				margin-left: 20rpx;
-				font-size: 34rpx;
-				color: #303133;
-				font-weight: bold;
+		.list-left {
+			.imgleft {
+				width: 306rpx;
+				height: 319rpx;
 			}
 		}
 
-		.shop-main {
-			margin: 20rpx auto 0;
-			border-radius: 40rpx;
-			width: 100%;
-			height: 286rpx;
+		.list-right {
+			flex-direction: column;
 
-			image {
-				width: 100%;
-				height: 100%;
+			.imgleft {
+				width: 366rpx;
+				height: 152rpx;
 			}
 		}
 	}
 
-	.seckill-title {
-		padding: 32rpx 30rpx 0;
-	}
-
-	.seckill-left {
-		justify-content: flex-start;
+	.bottom-box {
+		padding: 30rpx 0;
+		background-color: #FFFFFF;
 
-		.seckill-inco {
-			width: 36rpx;
-			height: 36rpx;
-			flex-shrink: 0;
-		}
+		.bottom-title {
+			text-align: center;
 
-		.seckill-font {
-			margin-left: 8rpx;
-			font-size: 40rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-
-		.djs {
-			margin-left: 12rpx;
-			font-size: 20rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #dc262b;
-		}
-	}
-
-	.seckill-right {
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-
-		.seckill-rfont {
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			margin-right: 8rpx;
-		}
-
-		.seckill-back {
-			width: 10rpx;
-			height: 20rpx;
-		}
-	}
-
-	.product {
-		background: #f0f0f0;
-	}
-
-	.priduct-main {
-		margin-top: 38rpx;
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 32rpx;
-
-		.priduct-item {
-			width: 48%;
-			background-color: #ffffff;
-			border-radius: 12rpx;
-			margin-bottom: 24rpx;
-
-			&:nth-child(2n + 1) {
-				margin-right: 24rpx;
-			}
-
-			.priduct-main-image {
-				width: 100%;
-				height: 330rpx;
-				// background: red;
-				border-radius: 3px;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-				}
+			.image {
+				width: 609rpx;
+				height: 31rpx;
 			}
+		}
 
-			.priduct-main-name {
-				font-size: $font-base;
-				color: $font-color-dark;
-				font-weight: bold;
-				line-height: 80rpx;
-			}
-
-			.priduct-main-price {
-				display: flex;
-				justify-content: space-between;
-				padding: 0 16rpx 12rpx;
-
-				.price {
-					font-size: 36rpx;
-					font-weight: bold;
-					color: #fd3b39;
-				}
+		.product-art-list {
+			.product-art-item {
+				.image-box {
+					text-align: center;
 
-				.cart-icon {
-					image {
-						width: 44rpx;
-						height: 44rpx;
+					.image {
+						width: 432rpx;
+						height: 432rpx;
 					}
 				}
 			}
 		}
+
+		.product-detail {
+			margin: 30rpx;
+			height: 4em;
+			overflow: hidden;
+			text-indent: 2em;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 4;
+			-webkit-box-orient: vertical;
+		}
 	}
 </style>

pages/index/messageInfo.vue

@@ -72,6 +72,7 @@ export default {
 .center {
 	width: 100%;
 	height: 100%;
+	background-color: #FFF;
 }
 .title {
 	padding: 30rpx 30rpx 0 24rpx;

pages/money/success.vue

@@ -33,12 +33,16 @@ export default {
 			let url
 			if(this.type == 1){
 				url = '/pages/order/order?state=1'
+				uni.navigateTo({
+					url: url
+				})
 			}else if(this.type == 2) {
 				url = '/pages/order/order?state=3'
+				uni.switchTab({
+					url
+				})
 			}
-			uni.navigateTo({
-				url: url
-			})
+			
 		}
 	}
 }

pages/navigation/bdjj.vue

@@ -1,485 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">报单奖金</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/icon/bdjj.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ yj || 0 }}</view>
-				<view>我的余额</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge || '0' }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum || '0' }}</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>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.mark }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getMoneyStyle,
-		getTime
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	import {
-		extractBank,
-	} from '@/api/wallet.js';
-	import {
-		bill_info
-	} from '@/api/index.js'
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		onReady(res) {
-			var _this = this;
-			console.log(_this.userInfo);
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				yj: '',
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {
-			this.yj = options.money
-		},
-		onShow() {
-			this.loadData();
-		},
-		methods: {
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				//这里时将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				//修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				bill_info({
-						page: navItem.page,
-						limit: navItem.limit,
-						title: '报单推荐奖',
-						pm: state
-					})
-					.then(({
-						data
-					}) => {
-						this.recharge = data.sum;
-						if (data.list.length > 0) {
-							if (state == 1) {
-								data.list.forEach(e => {
-									e.add_time = getTime(e.add_time)
-								})
-								navItem.orderList = navItem.orderList.concat(data.list);
-							}
-							navItem.page++;
-						}
-						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.list.length) {
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f1f1f1;
-		height: 100%;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content-money {
-		position: relative;
-		height: 480rpx;
-
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.body-title {
-			height: 80rpx;
-			text-align: center;
-			font-size: 35rpx;
-			position: relative;
-
-			.header {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fffeff;
-				height: 80rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-				z-index: 9;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
-		}
-	}
-
-	.info-box {
-		width: 670rpx;
-		height: 186rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -80rpx auto 0;
-		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;
-		}
-	}
-
-	.money-box {
-		position: relative;
-		z-index: 2;
-		/* #ifdef H5 */
-		padding-top: 90rpx;
-		/* #endif */
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		height: 200rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		padding-top: 40rpx;
-		/* #endif */
-
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-	.moneybtn-box {
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		padding: 0rpx 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-
-		.money-btn {
-			display: flex;
-			align-items: center;
-
-			.money-btn-icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-
-			.money-font {
-				margin-left: 10rpx;
-			}
-		}
-	}
-
-	.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: 50rpx;
-					height: 6rpx;
-					background: linear-gradient(30deg, #FF4C4C, #FE6238);
-					border-radius: 4rpx;
-				}
-			}
-		}
-	}
-
-	//列表
-	.swiper-box {
-		.order-item:last-child {
-			margin-bottom: 60rpx;
-		}
-
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
-				text-align: right;
-
-				.status {
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	.list-scroll-content {
-		background: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btn-box {
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(0deg, #2e58ff, #32c6ff);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #ffffff;
-		text-align: center;
-		line-height: 88rpx;
-		position: fixed;
-		bottom: 48rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-	}
-</style>

pages/navigation/fhsy.vue

@@ -1,459 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">分红收益</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/icon/fhsy.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ yj || 0 }}</view>
-				<view>当前余额</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge || '0' }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum || '0' }}</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>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.mark }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getMoneyStyle,
-		getTime
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	import {
-		extractBank,
-	} from '@/api/wallet.js';
-	import {
-		bill_info
-	} from '@/api/index.js'
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		onReady(res) {
-			var _this = this;
-			console.log(_this.userInfo);
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				yj: '',
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {
-			this.yj = options.money
-		},
-		onShow() {
-			this.loadData();
-		},
-		methods: {
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				//这里时将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				//修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				bill_info({
-						page: navItem.page,
-						limit: navItem.limit,
-						title: '报单日分红',
-						pm: state
-					})
-					.then(({
-						data
-					}) => {
-						this.recharge = data.sum;
-						if (data.list.length > 0) {
-							if (state == 1) {
-								data.list.forEach(e => {
-									e.add_time = getTime(e.add_time)
-								})
-								navItem.orderList = navItem.orderList.concat(data.list);
-							}
-							navItem.page++;
-						}
-						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.list.length) {
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f1f1f1;
-		height: 100%;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content-money {
-		position: relative;
-		height: 480rpx;
-
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.body-title {
-			height: 80rpx;
-			text-align: center;
-			font-size: 35rpx;
-			position: relative;
-
-			.header {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fffeff;
-				height: 80rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-				z-index: 9;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
-		}
-	}
-
-	.info-box {
-		width: 670rpx;
-		height: 186rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -80rpx auto 0;
-		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;
-		}
-	}
-
-	.money-box {
-		position: relative;
-		z-index: 2;
-		/* #ifdef H5 */
-		padding-top: 90rpx;
-		/* #endif */
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		height: 200rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		padding-top: 40rpx;
-		/* #endif */
-
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-	.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: 50rpx;
-					height: 6rpx;
-					background: linear-gradient(30deg, #FF4C4C, #FE6238);
-					border-radius: 4rpx;
-				}
-			}
-		}
-	}
-
-	//列表
-	.swiper-box {
-		.order-item:last-child {
-			margin-bottom: 60rpx;
-		}
-
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
-				text-align: right;
-
-				.status {
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	.list-scroll-content {
-		background: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btn-box {
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(0deg, #2e58ff, #32c6ff);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #ffffff;
-		text-align: center;
-		line-height: 88rpx;
-		position: fixed;
-		bottom: 48rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-	}
-</style>

pages/navigation/index.vue

@@ -1,391 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<view class="vheigh"></view>
-			<image class="top-bg" src="../../static/img/top-bg.png" mode=""></image>
-			<view class="top-main flex">
-				<view class="search-box flex" @click="clickSearch()">
-					<image class="search" src="../../static/img/search.png" mode=""></image>
-					<view class="search-font">输入关键词搜索</view>
-				</view>
-			</view>
-		</view>
-		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
-				@click="bannerNavToUrl(item)">
-				<image :src="item.pic" />
-			</swiper-item>
-		</swiper>
-		<view class="tongz flex">
-			<view>
-				<view class="tongz-bg">
-					<image src="../../static/img/tongz-bg.png" mode=""></image>
-				</view>
-				<view class="tongz-left flex">
-					<image class="image-left" src="../../static/img/ling.png" mode=""></image>
-					<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false"
-						:more-icon="false" :list="text"></u-notice-bar>
-				</view>
-			</view>
-		</view>
-		<view class="navbar">
-			<view class="nav-item" @click="nav('/pages/index/index')">
-				<image class="nav-img" src="../../static/img/newbanner.png" mode=""></image>
-			</view>
-			<view class="nav-item" @click="nav('/pages/navigation/main')">
-				<image class="nav-img" src="../../static/img/oldbanner.png" mode=""></image>
-			</view>
-		</view>
-		<view class="box margin-t-30 flex">
-			<view class="leftbox flex">
-				<view class="flex-center">
-					<view class="title">
-						{{ticketBase.fullname}}
-					</view>
-				</view>
-				<view class="num flex">
-					<image class="tip" src="../../static/img/wpicon.png" mode="scaleToFill"></image>
-					<text class="chines margin-l-10">
-						价格(CNY):
-					</text>
-					<text class="onStrong margin-r-10">
-						{{ticketBase.CurPrice}}
-					</text>
-					<image class="tip tipr" src="../../static/img/wpicon.png" mode="scaleToFill"></image>
-				</view>
-			</view>
-			<view class="right flex-center">
-				<view class="righttext flex-center">
-					<view class="rightNumBox">
-
-						<text class="font-size-sm" v-if="ticketBase.CurrentGains>0">+</text>
-						<text class="font-size-sm" v-if="ticketBase.CurrentGains<0">-</text>
-						{{ticketBase.CurrentGains}}
-						<text class="font-size-sm">%</text>
-					</view>
-				</view>
-				<view class="text">
-					近24小时涨跌幅
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef H5 -->
-		<view class="btm">
-			<a href="https://beian.miit.gov.cn" class="a-pm">备案编号:浙ICP备2022017146号 </a>
-		</view>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	import {
-		loadIndexs,
-		store_list
-	} from '@/api/index.js';
-	import {
-		getTicket
-	} from '@/api/quick.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				current: 0,
-				titleNViewBackground: '',
-				swiperCurrent: 0,
-				swiperLength: 0,
-				carouselList: [], //轮播图列表
-				text: ['双模式 双系统  开创第三代新零售'],
-				ticketBase: {}
-			};
-		},
-		onShow() {
-			this.loadData();
-			this.getTicket()
-		},
-		methods: {
-			...mapMutations(['setLat', 'setLon', 'setChoose']),
-			getTicket() {
-				getTicket()
-					.then(
-						(res) => {
-							console.log(res);
-							this.ticketBase = res.data.v;
-							this.ticketBase.CurrentGains = +this.ticketBase.CurrentGains
-						}
-					).catch(
-						(err) => {
-							console.log(err);
-						}
-					)
-			},
-			loadData() {
-				loadIndexs({})
-					.then(({
-						data
-					}) => {
-						let goods = data.info;
-						this.dataList = goods.bastList; //精品推荐
-						this.carouselList = data.banner;
-					})
-					.catch(e => {});
-			},
-			nav(url) {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
-			// 點擊搜索框
-			clickSearch() {
-				uni.navigateTo({
-					url: '/pages/product/search'
-				});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.box {
-		border-radius: 10rpx;
-		line-height: 1;
-		margin: 0 30rpx;
-		background-image: url("../../static/img/indwxWp.png");
-		background-size: 100% auto;
-		background-repeat: no-repeat;
-		position: relative;
-		height: 230rpx;
-		align-items: stretch;
-
-		.leftbox {
-			flex-grow: 1;
-			padding: 20rpx 0;
-			flex-direction: column;
-
-			.title {
-				padding: 6rpx 20rpx;
-				border-radius: 50rpx;
-				font-size: $font-sm;
-				color: #FFF;
-				border: 1px solid #FFF;
-			}
-
-			.num {
-				font-size: $font-lg;
-				text-align: center;
-				color: $color-red;
-				height: 80rpx;
-				.onStrong{
-					font-size: 36rpx;
-				}
-				.chines {
-					color: #FFF;
-				}
-
-				.tip {
-					width: 80rpx;
-					height: 6rpx;
-
-					&.tipr {
-						transform: rotate(180deg);
-					}
-				}
-			}
-		}
-
-
-		.right {
-			flex-shrink: 0;
-			width: 200rpx;
-			flex-direction: column;
-			color: #FFF;
-
-			.righttext {
-				width: 130rpx;
-				height: 130rpx;
-				border-radius: 1000rpx;
-					border: 1px solid #FFF;
-				.rightNumBox {
-					font-size: 40rpx;
-				}
-			}
-
-			.text {
-				margin-top: 20rpx;
-				font-size: $font-sm;
-				text-shadow: 2px 2px 1px red;
-			}
-		}
-
-
-	}
-
-	page,
-	.center {
-		min-height: 100%;
-		height: auto;
-		background: #ffffff;
-	}
-
-	.vheigh {
-		height: var(--status-bar-height);
-		background-color: $base-color;
-	}
-
-	.top {
-		position: relative;
-		width: 100%;
-		height: 360rpx;
-
-		.top-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-
-		.top-main {
-			position: relative;
-			z-index: 2;
-			padding: 30rpx;
-
-			.search-box {
-				justify-content: center;
-				width: 698rpx;
-				height: 60rpx;
-				background: rgba(255, 240, 245, 0.4);
-				box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
-				border-radius: 30rpx;
-
-				.search {
-					width: 34rpx;
-					height: 34rpx;
-				}
-
-				.search-font {
-					margin-left: 14rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ffffff;
-				}
-			}
-		}
-	}
-
-	.carousel {
-		width: 700rpx;
-		height: 276rpx;
-		/* #ifndef APP-PLUS */
-		margin: -240rpx auto 0;
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		margin: -180rpx auto 0;
-		/* #endif */
-		border-radius: 40rpx;
-
-		image {
-			border-radius: 40rpx;
-			width: 700rpx;
-			height: 276rpx;
-		}
-	}
-
-	.tongz {
-		width: 690rpx;
-		height: 70rpx;
-		margin: 32rpx auto 0;
-		padding: 18rpx 30rpx 18rpx 24rpx;
-		align-items: center;
-		position: relative;
-
-		.tongz-bg {
-			position: absolute;
-			top: 0;
-			right: 0;
-			left: 0;
-			width: 690rpx;
-			height: 70rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.tongz-left {
-			width: 640rpx;
-
-			.image-left {
-				width: 28rpx;
-				height: 34rpx;
-			}
-
-			.tongz-font {
-				margin-left: 22rpx;
-				font-size: 28rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #0f253a;
-			}
-		}
-
-		.tongz-right {
-			position: relative;
-			z-index: 11;
-			width: 12rpx;
-			height: 26rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.nav-item {
-		width: 698rpx;
-		height: 219rpx;
-		background: linear-gradient(150deg, #F5BE41 0%, #DF4226 100%);
-		border-radius: 14rpx;
-		margin: 40rpx auto 0;
-
-		.nav-img {
-			width: 100%;
-			height: 100%;
-			border-radius: 14rpx;
-		}
-	}
-
-	.btm {
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 50rpx;
-		line-height: 50rpx;
-		text-align: center;
-
-		.a-pm {
-			text-decoration: none;
-			width: 100%;
-			height: 50rpx;
-			line-height: 50rpx;
-			color: navigator;
-		}
-	}
-</style>

pages/navigation/main.vue

@@ -1,451 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<view class="vheigh"></view>
-			<image class="top-bg" src="../../static/img/top-bg.png" mode=""></image>
-			<view class="top-main flex">
-				<view class="search-box flex" @click="clickSearch()">
-					<image class="search" src="../../static/img/search.png" mode=""></image>
-					<view class="search-font">输入关键词搜索</view>
-				</view>
-			</view>
-		</view>
-		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
-				@click="bannerNavToUrl(item)">
-				<image :src="item.pic" />
-			</swiper-item>
-		</swiper>
-		<view class="tongz flex">
-			<view>
-				<view class="tongz-bg">
-					<image src="../../static/img/tongz-bg.png" mode=""></image>
-				</view>
-				<view class="tongz-left flex">
-					<image class="image-left" src="../../static/img/ling.png" mode=""></image>
-					<u-notice-bar style="width: 100%;" mode="vertical" type="none" :volume-icon="false"
-						:more-icon="false" :list="text"></u-notice-bar>
-				</view>
-			</view>
-		</view>
-		<view class="navbar-box">
-			<view class="navbar-title">
-				<image class="navbar-icon" src="../../static/icon/title-icon.png" mode=""></image>
-				<view class="navbar-font">
-					分红数据
-				</view>
-			</view>
-			<view class="navbar-main">
-				<view class="navbar-item">
-					<view class="item-num">{{now_jjfh}}</view>
-					<view class="item-font">当前分红基金</view>
-				</view>
-				<view class="xian"></view>
-				<view class="navbar-item">
-					<view class="item-num">{{now_num}}</view>
-					<view class="item-font">当前每股股价</view>
-				</view>
-				<view class="xian"></view>
-				<view class="navbar-item">
-					<view class="item-num">{{my_num}}</view>
-					<view class="item-font">我的当前股数</view>
-				</view>
-				<view class="xian"></view>
-				<view class="navbar-item">
-					<view class="item-num">{{my_money}}</view>
-					<view class="item-font">我的当前分红</view>
-				</view>
-			</view>
-		</view>
-		<view class="main-box">
-			<view class="main-item" @click="nav('/pages/navigation/bdjj?money='+bd_money)">
-				<image class="main-image" src="../../static/icon/n1.png" mode="widthFix"></image>
-				<view class="main-num">￥{{bd_money}}</view>
-				<view class="main-font">报单奖金</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/navigation/tdjj?money='+team_money)">
-				<image class="main-image" src="../../static/icon/n2.png" mode="widthFix"></image>
-				<view class="main-num">￥{{team_money}}</view>
-				<view class="main-font">团队奖金</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/navigation/fhsy?money='+fh_money)">
-				<image class="main-image" src="../../static/icon/n3.png" mode="widthFix"></image>
-				<view class="main-num">￥{{fh_money}}</view>
-				<view class="main-font">分红收益</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/navigation/team')">
-				<image class="main-image" src="../../static/icon/n4.png" mode="widthFix"></image>
-				<view class="main-num">{{team}}</view>
-				<view class="main-font">我的团队</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/user/shareQrCode')">
-				<image class="main-image" src="../../static/icon/n5.png" mode="widthFix"></image>
-				<view class="main-font">邀请好友</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/set/userinfo')">
-				<image class="main-image" src="../../static/icon/n6.png" mode="widthFix"></image>
-				<view class="main-font">个人资料</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/money/withdrawal?way=brokerage_price')">
-				<image class="main-image" src="../../static/icon/n7.png" mode="widthFix"></image>
-				<view class="main-font">发起提现</view>
-			</view>
-			<view class="main-item" @click="nav('/pages/navigation/productlist')">
-				<image class="main-image" src="../../static/icon/n8.png" mode="widthFix"></image>
-				<view class="main-font">产品咨讯</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		loadIndexs,
-		order_info
-	} from '@/api/index.js';
-	import {
-		link
-	} from '@/api/user.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				current: 0,
-				titleNViewBackground: '',
-				swiperCurrent: 0,
-				swiperLength: 0,
-				carouselList: [], //轮播图列表
-				text: ['双模式 双系统  开创第三代新零售'],
-				now_jjfh: 0,
-				now_num: 0,
-				my_num: 0,
-				my_money: 0,
-				bd_money: 0,
-				team_money: 0,
-				fh_money: 0,
-				team: 0,
-				timers: '',
-			};
-		},
-		onShow() {
-			this.loadData();
-		},
-		onHide() {
-			clearTimeout(this.timers);
-			console.log(this.timers, 'onhide');
-		},
-		// 监听页面卸载
-		onUnload() {
-			// 关闭倒计时
-			clearTimeout(this.timers);
-			console.log(this.timers, 'unload');
-		},
-		// 监听页面后退
-		onBackPress() {
-			// 关闭倒计时
-			clearTimeout(this.timers);
-			console.log(this.timers, 'back');
-		},
-		methods: {
-			...mapMutations(['setLat', 'setLon', 'setChoose']),
-			loadData() {
-				this.getorder()
-				loadIndexs({})
-					.then(({
-						data
-					}) => {
-						let goods = data.info;
-						this.dataList = goods.bastList; //精品推荐
-						this.carouselList = data.banner;
-					})
-					.catch(e => {});
-				link({
-						page: 1,
-						limit: 1,
-					})
-					.then(({
-						data
-					}) => {
-						this.team = data.total + data.totalLevel
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			getorder() {
-				order_info({}).then(({
-					data
-				}) => {
-					this.timers = setTimeout(this.getorder, 1000);
-					this.now_jjfh = data.sum;
-					this.now_num = data.every_piece;
-					this.my_num = data.user_piece;
-					this.my_money = data.award;
-					this.bd_money = data.recommend_award;
-					this.team_money = data.group_award;
-					this.fh_money = data.day_award;
-					console.log(this.timers);
-				})
-			},
-			nav(url) {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
-			// 點擊搜索框
-			clickSearch() {
-				uni.navigateTo({
-					url: '/pages/product/search'
-				});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.center {
-		min-height: 100%;
-		height: auto;
-		background: #ffffff;
-	}
-
-	.vheigh {
-		height: var(--status-bar-height);
-		background-color: $base-color;
-	}
-
-	.top {
-		position: relative;
-		width: 100%;
-		height: 360rpx;
-
-		.top-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-
-		.top-main {
-			position: relative;
-			z-index: 2;
-			padding: 30rpx;
-
-			.search-box {
-				justify-content: center;
-				width: 698rpx;
-				height: 60rpx;
-				background: rgba(255, 240, 245, 0.4);
-				box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
-				border-radius: 30rpx;
-
-				.search {
-					width: 34rpx;
-					height: 34rpx;
-				}
-
-				.search-font {
-					margin-left: 14rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ffffff;
-				}
-			}
-		}
-	}
-
-	.carousel {
-		width: 700rpx;
-		height: 276rpx;
-		/* #ifndef APP-PLUS */
-		margin: -240rpx auto 0;
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		margin: -180rpx auto 0;
-		/* #endif */
-		border-radius: 40rpx;
-
-		image {
-			border-radius: 40rpx;
-			width: 700rpx;
-			height: 276rpx;
-		}
-	}
-
-	.tongz {
-		width: 690rpx;
-		height: 70rpx;
-		margin: 32rpx auto 0;
-		padding: 18rpx 30rpx 18rpx 24rpx;
-		align-items: center;
-		position: relative;
-
-		.tongz-bg {
-			position: absolute;
-			top: 0;
-			right: 0;
-			left: 0;
-			width: 690rpx;
-			height: 70rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.tongz-left {
-			width: 640rpx;
-
-			.image-left {
-				width: 28rpx;
-				height: 34rpx;
-			}
-
-			.tongz-font {
-				margin-left: 22rpx;
-				font-size: 28rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #0f253a;
-			}
-		}
-
-		.tongz-right {
-			position: relative;
-			z-index: 11;
-			width: 12rpx;
-			height: 26rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.navbar-box {
-		width: 700rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		padding: 30rpx 0;
-		margin: 40rpx auto 0;
-	}
-
-	.navbar-title {
-		display: flex;
-		align-items: center;
-		padding: 0 26rpx 20rpx;
-		border-bottom: 1px solid #f5f5f5;
-
-		.navbar-icon {
-			width: 30rpx;
-			height: 26rpx;
-		}
-
-		.navbar-font {
-			margin-left: 10rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-
-	.navbar-main {
-		padding-top: 45rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		line-height: 1;
-
-		.xian {
-			width: 1rpx;
-			height: 31rpx;
-			background: #333333;
-		}
-
-		.navbar-item {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.item-num {
-				font-size: 39rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
-			}
-
-			.item-font {
-				margin-top: 20rpx;
-				font-size: 21rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-			}
-		}
-	}
-
-	.main-box {
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		padding: 10rpx 24rpx;
-	}
-
-	.main-item {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		width: 342rpx;
-		height: 200rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin-top: 20rpx;
-		line-height: 1;
-
-		.main-image {
-			width: 68rpx;
-		}
-
-		.main-num {
-			margin-top: 20rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-		}
-
-		.main-font {
-			margin-top: 20rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #4D4D4D;
-			line-height: 21rpx;
-		}
-	}
-</style>

pages/navigation/product.vue

@@ -1,111 +0,0 @@
-<template>
-	<view class="center">
-		<view class="main" v-if="art != ''" v-for="(ls, index) in art.content" :key="index">
-			<view v-if="ls.type == 'rich-text'" v-html="ls.value" class="main-item"></view>
-			<view style="width:100%;height: 300px;" v-if="ls.type == 'video' && ls.value">
-				<view v-if="ls.jd == 1" style="width:100%;height: 300px; background: black;" @click="djbf(ls)">
-					<image style="width:100%;height: 300px;" src="../../static/img/spfm.png" mode=""></image>
-				</view>
-				<video :src="ls.value" autoplay v-if="ls.jd ==2" style="width:100%;height: 300px;">
-				</video>
-			</view>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		details
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				id: '',
-				art: '',
-			};
-		},
-		onLoad(option) {
-			this.id = option.id;
-			this.loadData();
-		},
-		methods: {
-			loadData() {
-				details({}, this.id).then(({
-					data
-				}) => {
-					data.content = data.content.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g,
-						'<p class="pHeight"><img');
-					data.content = this.getVideo(data.content);
-					this.art = data;
-					console.log(this.art, 'nierong');
-				});
-			},
-			djbf(opt) {
-				console.log(opt, '2222');
-				if (opt.jd == 1) {
-					opt.jd = 2
-				}
-				if (opt.jd == 2) {
-					opt.jd = 1
-				}
-			},
-			// 富文本视频解析
-			getVideo(data) {
-				console.log(data, '源数据')
-				let videoList = [];
-				let videoReg = /<video.*?(?:>|\/>)/gi; //匹配到字符串中的 video 标签
-				let srcReg = /src=[\'\"]?([^\'\"]*)[\'\"]?/i; //匹配到字符串中的 video 标签 的路径
-				let arr = data.match(videoReg) || []; // arr 为包含所有video标签的数组
-				let articleList = data.split('</video>'); // 把字符串  从视频标签分成数组
-				arr.forEach((item, index) => {
-					var src = item.match(srcReg);
-					videoList.push(src[1]); //所要显示的字符串中 所有的video 标签 的路径
-				});
-				let needArticleList = [];
-				articleList.forEach((item, index) => {
-					if (item != '' && item != undefined) {
-						let wuvideo = item.split('<video')
-						let js = wuvideo[0].replace('<video', '')
-						//  常见的标签渲染
-						needArticleList.push({
-							type: 'rich-text',
-							value: js
-						});
-					}
-					let articleListLength = articleList.length; // 插入到原有video 标签位置
-					if (index < articleListLength && videoList[index] != undefined) {
-						needArticleList.push({
-							type: 'video',
-							jd: 1,
-							value: videoList[index]
-						});
-					}
-				});
-				console.log(needArticleList, '完成');
-				return needArticleList;
-			}
-		}
-	};
-</script>
-
-<style lang="less">
-	.center {
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.main {
-		padding: 10rpx;
-		display: flex;
-		flex-direction: column;
-	}
-
-	/deep/ .main {
-		.rich-img {
-			width: 100% !important;
-			height: auto;
-		}
-	}
-</style>

pages/navigation/productlist.vue

@@ -1,82 +0,0 @@
-<template>
-	<view class="center">
-		<view class="massage" v-for="(item, index) in list" :key="index"
-			@click="nav('/pages/navigation/product?id=' + item.id)">
-			<image class="list-prc" :src="item.image_input[0]" mode=""></image>
-			<view class="info">
-				<view class="title">{{ item.title }}</view>
-				<view class="time">{{ item.add_time }}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		article
-	} from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				list: [],
-				type: ''
-			};
-		},
-		onLoad(opt) {
-			let obj = this;
-			article({
-				page: 1,
-				limit: 1000
-			}, 5).then(({
-				data
-			}) => {
-				this.list = data;
-			});
-		},
-		methods: {
-			nav(url) {
-				uni.navigateTo({
-					url
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="less">
-	.center {
-		background: #f3f3f3;
-	}
-
-	.massage {
-		background: #ffffff;
-		padding: 30rpx;
-		border-bottom: 1px solid #e9e9e9;
-		display: flex;
-		align-items: center;
-
-		.list-prc {
-			width: 120rpx;
-			height: 120rpx;
-		}
-
-		.info {
-			margin-left: 10rpx;
-		}
-
-		.title {
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-		}
-
-		.time {
-			margin-top: 18rpx;
-			font-size: 20rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-		}
-	}
-</style>

pages/navigation/tdjj.vue

@@ -1,481 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">团队奖金</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/icon/tdjj.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ yj || 0 }}</view>
-				<view>我的余额</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge || '0' }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum || '0' }}</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>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.mark }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getTime
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	import {
-		extractBank,
-	} from '@/api/wallet.js';
-	import {
-		bill_info
-	} from '@/api/index.js'
-	export default {
-		components: {
-			empty,
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		onReady(res) {
-			var _this = this;
-			console.log(_this.userInfo);
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				yj: '',
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [{
-						state: 1,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {
-			this.yj = options.money
-		},
-		onShow() {
-			this.loadData();
-		},
-		methods: {
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				//这里时将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				//修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				bill_info({
-						page: navItem.page,
-						limit: navItem.limit,
-						title: '报单团队奖',
-						pm: state
-					})
-					.then(({
-						data
-					}) => {
-						this.recharge = data.sum;
-						if (data.list.length > 0) {
-							if (state == 1) {
-								data.list.forEach(e => {
-									e.add_time = getTime(e.add_time)
-								})
-								navItem.orderList = navItem.orderList.concat(data.list);
-							}
-							navItem.page++;
-						}
-						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.list.length) {
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f1f1f1;
-		height: 100%;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content-money {
-		position: relative;
-		height: 480rpx;
-
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.body-title {
-			height: 80rpx;
-			text-align: center;
-			font-size: 35rpx;
-			position: relative;
-
-			.header {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fffeff;
-				height: 80rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-				z-index: 9;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
-		}
-	}
-
-	.info-box {
-		width: 670rpx;
-		height: 186rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -80rpx auto 0;
-		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;
-		}
-	}
-
-	.money-box {
-		position: relative;
-		z-index: 2;
-		/* #ifdef H5 */
-		padding-top: 90rpx;
-		/* #endif */
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		height: 200rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		padding-top: 40rpx;
-		/* #endif */
-
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-	.moneybtn-box {
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		padding: 0rpx 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-
-		.money-btn {
-			display: flex;
-			align-items: center;
-
-			.money-btn-icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-
-			.money-font {
-				margin-left: 10rpx;
-			}
-		}
-	}
-
-	.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: 50rpx;
-					height: 6rpx;
-					background: linear-gradient(30deg, #FF4C4C, #FE6238);
-					border-radius: 4rpx;
-				}
-			}
-		}
-	}
-
-	//列表
-	.swiper-box {
-		.order-item:last-child {
-			margin-bottom: 60rpx;
-		}
-
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-
-			.money {
-				color: #fd5b23;
-				font-size: $font-lg;
-				text-align: right;
-
-				.status {
-					color: $font-color-light;
-				}
-			}
-		}
-	}
-
-	.list-scroll-content {
-		background: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btn-box {
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(0deg, #2e58ff, #32c6ff);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #ffffff;
-		text-align: center;
-		line-height: 88rpx;
-		position: fixed;
-		bottom: 48rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-	}
-</style>

pages/navigation/team.vue

@@ -1,492 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">我的团队</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/icon/team.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ yj || 0 }}</view>
-				<view>我的团队人数</view>
-			</view>
-		</view>
-		<view class="info-box flex">
-			<view class="info-item" :class="{ current: tabCurrentIndex == 0 }" @click="tabClick(0)">
-				<view class="info-num">{{ recharge || '0' }}</view>
-				<view class="info-font">一代人数</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item" :class="{ current: tabCurrentIndex == 1 }" @click="tabClick(1)">
-				<view class="info-num">{{ orderStatusSum || '0' }}</view>
-				<view class="info-font">二代人数</view>
-			</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-							<view class="title-box flex_item">
-								<view class="title-avatar">
-									<image :src="item.avatar|| '../../static/img/login-title.png'"></image>
-								</view>
-								<view class="list_tpl">
-									<view class="title">
-										<view class="title-name clamp">{{ item.nickname }}</view>
-									</view>
-									<view class="time">
-										<text>{{ item.time }}</text>
-									</view>
-								</view>
-								<!-- <view class="list-left">
-									<view class="money">
-										<text>{{ item.numberCount == null ? '未购买' : item.numberCount + '元' }}</text>
-									</view>
-								</view> -->
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	import empty from '@/components/empty';
-	import {
-		link
-	} from '@/api/user.js';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		onReady(res) {
-			var _this = this;
-			console.log(_this.userInfo);
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				yj: '',
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [{
-						state: 0,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {},
-		onShow() {
-			this.loadData();
-		},
-		methods: {
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			async loadData(source) {
-				const obj = this
-				//这里时将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				//修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				link({
-						page: navItem.page,
-						limit: navItem.limit,
-						grade: state
-					})
-					.then(({
-						data
-					}) => {
-						obj.yj = data.total + data.totalLevel
-						obj.recharge = data.total
-						obj.orderStatusSum = data.totalLevel
-						if (data.list.length > 0) {
-							navItem.orderList = navItem.orderList.concat(data.list);
-							navItem.page++;
-						}
-						//判断是否还有数据, 有改为more, 没有改为noMore
-						if (navItem.limit == data.length) {
-							navItem.loadingType = 'more';
-							return;
-						} else {
-							navItem.loadingType = 'noMore';
-						}
-						uni.hideLoading();
-						this.$set(navItem, 'loaded', true);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange');
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f1f1f1;
-		height: 100%;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content-money {
-		position: relative;
-		height: 480rpx;
-
-		.content-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 750rpx;
-			height: 480rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.body-title {
-			height: 80rpx;
-			text-align: center;
-			font-size: 35rpx;
-			position: relative;
-
-			.header {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100%;
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #fffeff;
-				height: 80rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-				z-index: 9;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.goback-box {
-				position: absolute;
-				left: 18rpx;
-				top: 0;
-				height: 80rpx;
-				display: flex;
-				align-items: center;
-			}
-
-			.goback {
-				z-index: 100;
-				width: 34rpx;
-				height: 34rpx;
-			}
-		}
-	}
-
-	.info-box {
-		width: 670rpx;
-		height: 186rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -80rpx auto 0;
-		position: relative;
-		z-index: 2;
-
-		.info-item {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			line-height: 1;
-			position: relative;
-			height: 186rpx;
-
-			&.current {
-				color: #000;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 100rpx;
-					height: 6rpx;
-					background: linear-gradient(30deg, #FF4C4C, #FE6238);
-					border-radius: 4rpx;
-				}
-			}
-
-			.info-font {
-				margin-top: 20rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
-			}
-
-			.info-num {
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FF4C4C;
-			}
-		}
-
-		.shu {
-			width: 2rpx;
-			height: 74rpx;
-			background: #dcdfe6;
-		}
-	}
-
-	.money-box {
-		position: relative;
-		z-index: 2;
-		/* #ifdef H5 */
-		padding-top: 90rpx;
-		/* #endif */
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		height: 200rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		padding-top: 40rpx;
-		/* #endif */
-
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-
-
-	//列表
-	.swiper-box {
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				width: 100%;
-
-				.title-avatar {
-					flex-shrink: 0;
-					width: 100rpx;
-					height: 100rpx;
-					margin-right: 25rpx;
-					border-radius: 100%;
-
-					image {
-						width: 100%;
-						height: 100%;
-						border-radius: 100%;
-					}
-				}
-
-				.list_tpl {
-					width: 74%;
-
-					.title {
-						display: flex;
-						justify-content: flex-start;
-						font-size: $font-lg;
-						color: $font-color-base;
-						overflow: hidden; //超出的文本隐藏
-						text-overflow: ellipsis; //溢出用省略号显示
-						white-space: nowrap;
-						line-height: 1;
-						text-align: center;
-
-						.title-name {
-							max-width: 60%;
-						}
-
-						.dl {
-							margin-left: 10rpx;
-							width: 93rpx;
-							height: 32rpx;
-							border-radius: 16rpx;
-
-							image {
-								width: 93rpx;
-								height: 32rpx;
-								border-radius: 16rpx;
-							}
-						}
-
-						.class {
-							display: inline-block;
-							margin-left: 10rpx;
-							padding: 6rpx;
-							text-align: center;
-							border: 1px solid #2e58ff;
-							border-radius: 16rpx;
-							font-size: 20rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #2e58ff;
-						}
-					}
-
-					.time {
-						font-size: $font-base;
-						color: $font-color-light;
-					}
-				}
-			}
-
-			.list-left {
-				width: 50%;
-			}
-
-			.money {
-				text-align: right;
-				color: #db1935;
-				font-size: $font-lg;
-			}
-		}
-	}
-
-	.list-scroll-content {
-		background: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btn-box {
-		width: 674rpx;
-		height: 88rpx;
-		background: linear-gradient(0deg, #2e58ff, #32c6ff);
-		border-radius: 44rpx;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #ffffff;
-		text-align: center;
-		line-height: 88rpx;
-		position: fixed;
-		bottom: 48rpx;
-		left: 0;
-		right: 0;
-		margin: 0 auto;
-	}
-</style>

pages/order/order.vue

@@ -2,9 +2,6 @@
 	<view class="content">
 		<view class="order-title">
 			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
 				<view class="header">我的订单</view>
 			</view>
 			<view class="roder-content">
@@ -59,17 +56,19 @@
 							实付款
 							<text class="price">{{ moneyNum(item.price) }}</text>
 						</view>
-						<view class="action-box b-t" v-if="item.stateTip == '待支付'"><button @click.stop="pay(item)"
-								class="action-btn recom">立即支付</button></view>
-						<view class="action-box b-t" v-if="item.stateTip == '待审核'"><button @click.stop="pay(item)"
-								class="action-btn recom">修改凭证</button></view>
-						<view class="action-box b-t" v-if="item.stateTip == '待挂售' && tabItem.state != 0">
-							<button @click.stop="gsell(item)"
-								class="action-btn recom">{{ item.frozen == 0 ? '立即挂售' : '冻结中' }}</button>
+						<view class="action-box b-t flex">
+							<view class="time">
+								创建时间：{{item.create_time}}
+							</view>
+							<view >
+								<button v-if="item.stateTip == '待支付'" @click.stop="pay(item)" class="action-btn recom">立即支付</button>
+								<button v-else-if="item.stateTip == '待挂售' && tabItem.state != 0" @click.stop="gsell(item)" class="action-btn recom">{{ item.frozen == 0 ? '立即挂售' : '冻结中' }}</button>
+								<button v-else-if="item.stateTip == '待审核'" @click.stop="pay(item)" class="action-btn recom">修改凭证</button>
+							</view>
 						</view>
 					</view>
 
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					<u-loadmore  class="margin-t-30" :status="tabItem.loadingType" />
 				</scroll-view>
 			</swiper-item>
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList1" :key="tabIndex"
@@ -108,7 +107,7 @@
 								<view class="buy-name">{{ item.nickname }}</view>
 								<view class="phone">{{ item.phone }}</view>
 							</view>
-							<view v-if="!item.status && item.status != 0">
+							<view class="padding-b-10" v-if="!item.status && item.status != 0">
 								<view class="buy-info">
 									<view class="font">挂售价格：{{ item.hanging_price }}</view>
 								</view>
@@ -125,22 +124,32 @@
 							<view class="" style="color: #0F253A;font-weight: bold;font-size: 26rpx;" v-else>买家未上传支付凭证
 							</view>
 						</view>
-						<view class="action-box b-t" v-if="item.status == 1"><button @click.stop="call(item)"
-								class="action-btn recom">联系买家</button></view>
-						<view class="action-box b-t" v-if="item.status == 2">
+						<view class="action-box b-t flex" v-if="item.status == 1">
+							<view class="time">
+								创建时间：{{item.create_time}}
+							</view>
+							<button @click.stop="call(item)"
+								class="action-btn recom">联系买家</button>
+							</view>
+						<view class="action-box b-t flex" v-if="item.status == 2">
+							<view class="time">
+								{{item.create_time}}
+							</view>
+							<view class="flex">
 							<button @click.stop="appeal(item)"
 								class="action-btn recom">{{ item.appeal == 0 ? '申诉' : '取消申诉' }}</button>
-							<button @click.stop="orderPay(item)" class="action-btn recom">通过</button>
+							<button @click.stop="orderPay(item)" class="action-btn recom margin-l-20">通过</button>
+							</view>
 						</view>
 						<!-- <view class="action-box b-t" v-if="!item.status && item.status != 0"><button
 								@click.stop="cancel(item)" class="action-btn recom">取消挂售</button></view> -->
 					</view>
 
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					<u-loadmore  class="margin-t-30" :status="tabItem.loadingType" />
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<!-- <u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar> -->
+		<u-tabbar activeColor="#333333" inactive-color='#999999' :list="tabbar"></u-tabbar>
 	</view>
 </template>
 
@@ -160,7 +169,7 @@
 		revoke
 	} from '@/api/order.js';
 	import {
-		tabbar
+		tabbar1
 	} from '@/utils/tabbar.js';
 	export default {
 		components: {
@@ -170,8 +179,7 @@
 			return {
 				loading: false, //判断是否在点击
 				height: '', //第一层swiper高度
-				tabbar: tabbar,
-				current: 1, //底部tabar选中的icon对象
+				tabbar: tabbar1,
 				currentIndex: 0, //当前选中的第一级0为我要买单，1我要卖单
 				tabCurrentIndex: 0, //当前选中的第二级别我要买单选中项
 				tabCurrentIndex1: 0, //当前选中的第二级别我要卖单选中项
@@ -185,7 +193,7 @@
 				navList: [{
 						state: 0,
 						text: '全部',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -194,7 +202,7 @@
 					{
 						state: 1,
 						text: '待支付',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -203,7 +211,7 @@
 					{
 						state: 2,
 						text: '待审核',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -212,7 +220,7 @@
 					{
 						state: 4,
 						text: '待挂售',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -222,7 +230,7 @@
 				navList1: [{
 						state: 0,
 						text: '全部',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -231,7 +239,7 @@
 					{
 						state: 4,
 						text: '售卖中',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -240,7 +248,7 @@
 					{
 						state: 1,
 						text: '待支付',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -249,7 +257,7 @@
 					{
 						state: 2,
 						text: '待审核',
-						loadingType: 'more',
+						loadingType: 'loadmore',
 						orderList: [],
 						isnew: 1, //判断是否有新的订单
 						page: 1, //当前页数
@@ -390,7 +398,7 @@
 				if (item.appeal == 0) {
 					uni.showModal({
 						title: '提示',
-						content: '提交申诉后会导致画被冻结，是否继续提交申诉',
+						content: '提交申诉后会导致被冻结，是否继续提交申诉',
 						success: function(res) {
 							if (res.confirm) {
 								uni.showLoading({
@@ -536,9 +544,9 @@
 					navItem.orderList = [];
 					navItem.page = 1;
 					navItem.limit = 10;
-					navItem.loadingType = 'more';
+					navItem.loadingType = 'loadmore';
 				}
-				if (navItem.loadingType === 'noMore') {
+				if (navItem.loadingType === 'nomore') {
 					//防止重复加载
 					return;
 				}
@@ -555,6 +563,7 @@
 						}) => {
 							let arr = data.map(e => {
 								console.log(e);
+								e.create_time = e.create_time.split(' ')[0];
 								if (state == 4) {
 									e.stateTip = '待挂售';
 									e.stateTipColor = '#fa436a';
@@ -577,11 +586,11 @@
 							navItem.page++;
 							if (navItem.limit == data.length) {
 								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'more';
+								navItem.loadingType = 'loadmore';
 								return;
 							} else {
 								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'noMore';
+								navItem.loadingType = 'nomore';
 							}
 							uni.hideLoading();
 							this.$set(navItem, 'loaded', true);
@@ -622,11 +631,11 @@
 							navItem.page++;
 							if (navItem.limit == data.length) {
 								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'more';
+								navItem.loadingType = 'loadmore';
 								return;
 							} else {
 								//判断是否还有数据， 有改为 more， 没有改为noMore
-								navItem.loadingType = 'noMore';
+								navItem.loadingType = 'nomore';
 							}
 							uni.hideLoading();
 							this.$set(navItem, 'loaded', true);
@@ -853,8 +862,9 @@
 		display: flex;
 		flex-direction: column;
 		background: #fff;
-		margin-top: 16rpx;
-
+		margin: 16rpx 30rpx 0 30rpx;
+		border-radius: 20rpx;
+		overflow: hidden;
 		.i-top {
 			display: flex;
 			align-items: center;
@@ -915,7 +925,6 @@
 		.goods-box-single {
 			display: flex;
 			padding: 20rpx 30rpx;
-			background: #f7f7f7;
 
 			.goods-img {
 				display: block;
@@ -976,11 +985,9 @@
 			.buy-info {
 				display: flex;
 				align-items: center;
-				margin-top: 20rpx;
 
 				.font {
-					font-size: 32rpx;
-					font-family: PingFang SC;
+					font-size: $font-base;
 					font-weight: 500;
 					color: #333333;
 				}
@@ -1066,11 +1073,12 @@
 
 		.action-box {
 			padding: 0 30rpx;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
 			height: 100rpx;
 			position: relative;
+			.time{
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
 		}
 
 		.refuse {
@@ -1101,11 +1109,8 @@
 		}
 
 		.action-btn {
-			width: 160rpx;
+			min-width: 160rpx;
 			height: 60rpx;
-			margin: 0;
-			margin-left: 24rpx;
-			padding: 0;
 			text-align: center;
 			line-height: 60rpx;
 			font-size: $font-sm + 2rpx;

pages/public/login.vue

@@ -201,9 +201,9 @@
 							obj.setUserInfo(e.data);
 							// let ur = uni.getStorageSync('present')|| '/pages/index/index';
 							//成功跳转首页
-							uni.navigateTo({
-								url: '/pages/navigation/index',
-							});
+							uni.switchTab({
+								url: '/pages/index/index',
+							})
 						});
 					})
 					.catch(function(e) {

pages/set/set.vue

@@ -2,8 +2,8 @@
 	<view class="container">
 		<uni-list>
 			<uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')"></uni-list-item>
-			<uni-list-item title="收货地址" @click="navTo('/pages/set/address')"></uni-list-item>
-			<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')"></uni-list-item>
+			<!-- <uni-list-item title="收货地址" @click="navTo('/pages/set/address')"></uni-list-item> -->
+			<!-- <uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')"></uni-list-item> -->
 			<uni-list-item title="修改登录密码" @click="navTo('/pages/public/forget')"></uni-list-item>
 		</uni-list>
 		<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>

pages/user/myfans.vue

@@ -1,91 +1,77 @@
 <template>
 	<view class="content">
-		<view class="top-fan">
-			<image src="../../static/img/myfans.png" mode=""></image>
-		</view>
-		<view class="fans-base flex">
-			<view class="base-item">
-				<view class="base-item-val">
-					{{fans.count || 0}}
-				</view>
-				<view class="base-item-name">
-					我的粉丝
-				</view>
-			</view>
-			<view class="jg"></view>
-			<view class="base-item">
-				<view class="base-item-val">
-					{{fans.active || 0}}
-				</view>
-				<view class="base-item-name">
-					活跃粉丝
-				</view>
+		<view class="content-money flex">
+			<view class="money-box">
+				<view class="money">{{ userInfo.spread_count|| '0' }}</view>
+				<view>我的推广人数</view>
 			</view>
-			<view class="jg"></view>
-			<view class="base-item">
-				<view class="base-item-val">
-					{{fans.money || 0}}
-				</view>
-				<view class="base-item-name">
-					总成交额
-				</view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.achievement|| '0' }}</view>
+				<view>总业绩</view>
 			</view>
 		</view>
-		<view class="fans-tit">
-			我的粉丝列表
-		</view>
-		<view class="fans-list-tit flex">
-			<view class="list-item">
-				姓名
-			</view>
-			<view class="list-item">
-				ID
+		<!-- <view class="time-in">
+			<picker mode="date" @change="bindStartDateChange">
+				<input type="text" v-model="start_time" class="showtime" placeholder="请输入开始时间" disabled>
+			</picker>
+			<picker mode="date" @change="bindEndDateChange">
+				<input type="text" v-model="end_time" class="showtime" placeholder="请输入结束时间" disabled>
+			</picker>
+			<view class="search" @click="loadData('reload')">
+				搜索
 			</view>
-			<view class="list-item">
-				当日业绩
+		</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="list-item">
-				粉丝数
+			<view class="buttom"  @click="tabClick(1)">
+				<view class="money">{{totalLevel || 0}}</view>
+				<text class="text" :class="{ current: tabCurrentIndex === 1 }">二级推广</text>
 			</view>
-		</view>
-		<scroll-view scroll-y="true" class="swiper-box" :style="{'height':height}" @scrolltolower="getMyfans()">
-			<view class="fans-list-val flex" v-for="(item,index) in list"
-				:style="{'background':index%2 ==0 ? '#F9F9F9':'#fff'}">
-				<view class="list-item clamp">
-					{{item.real_name||item.nickname}}
-				</view>
-				<view class="list-item">
-					{{item.uid}}
-				</view>
-				<view class="list-item">
-					{{item.money}}
-				</view>
-				<view class="list-item">
-					{{item.count}}
-				</view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view>
+		</view> -->
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300"
+			@change="changeTab" disable-touch>
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" :style="{ height: maxheight }" scroll-y>
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+						<view class="title-box flex_item">
+							<view class="title-avatar">
+								<image :src="item.avatar"></image>
+							</view>
+							<view class="list_tpl">
+								<view class="title">
+									<view class="title-name clamp">{{ item.nickname }}</view>
+								</view>
+								<view class="time">
+									<text>{{item.phone}}</text>
+								</view>
+								<view class="time">
+									<text>订单数:{{item.orderCount || '0'}} 消费金额:{{item.numberCount || '0'}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
 	</view>
 </template>
-
 <script>
 	import {
-		getMyfans
-	} from '@/api/user.js'
+		getMyfans,
+	} from '@/api/user.js';
+	import empty from '@/components/empty';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	export default {
-		data() {
-			return {
-				height: '',
-				list: [],
-				page: 1,
-				limit: 10,
-				fans: {},
-				loadingType: 'more'
-			}
-		},
-		onLoad() {
-			this.getMyfans()
+		components: {
+			empty
 		},
 		onReady(res) {
 			var _this = this;
@@ -94,151 +80,446 @@
 					const query = uni.createSelectorQuery();
 					query.select('.swiper-box').boundingClientRect();
 					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						_this.height = resu.windowHeight - res[0].top + 'px';
+						_this.maxheight = resu.windowHeight - res[0].top + 'px';
 						console.log('打印页面的剩余高度', _this.height);
 					});
 				},
 				fail: res => {}
 			});
 		},
+		data() {
+			return {
+				// 头部图高度
+				maxheight: '',
+				tabCurrentIndex: 0,
+				navList: [{
+						state: 0,
+						text: '直接推荐',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 ,//每次信息条数
+						loaded: false
+					},
+					{
+						state: 1,
+						text: '间接推荐',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 ,//每次信息条数
+						loaded: false
+					}
+				],
+				all: '',
+				list: '',
+				totalLevel: '',
+				order: '',
+				zt_order: '',
+				jt_order: '',
+				teamcount: '',
+				ztcount: '',
+				start_time: '',
+				end_time: ''
+			};
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+			...mapState(['baseURL'])
+		},
+		onLoad(options) {},
+		onShow() {
+			this.loadData();
+		},
 		methods: {
-			getMyfans() {
+			bindStartDateChange(e) {
+				console.log(e)
+				this.start_time = e.detail.value
+			},
+			bindEndDateChange(e) {
+				console.log(e)
+				this.end_time = e.detail.value
+			},
+			// 页面跳转
+			navto(e) {
+				uni.navigateTo({
+					url: e
+				});
+			},
+			//获取收入支出信息
+			async loadData(source) {
 				let obj = this
-				if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-					return
+				//这里是将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				let state = navItem.state;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
 				}
-
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				if(source == 'reload') {
+					navItem.orderList = []
+				}
+				// if (navItem.loadingType === 'noMore') {
+				// 	//防止重复加载
+				// 	return;
+				// }
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
 				getMyfans({
-					page: obj.page,
-					limit: obj.limit
-				}).then(res => {
-					console.log(res)
-					obj.fans = res.data;
-					let ar = res.data.user.map((item)=>{
-						if(item.real_name.length>2){
-							let str =item.real_name.slice(1,item.real_name.length-1);
-							let str2 = str.replace(/.*/g,'*');
-							item.real_name =item.real_name.slice(0,1)+str2+item.real_name.slice(item.real_name.length-1);
-						}else if(item.real_name.length==2){
-							item.real_name =item.real_name.slice(0,1)+"*";
+					page: navItem.page,
+					limit: navItem.limit,
+					grade: navItem.state
+					})
+					.then(({
+						data
+					}) => {
+						navItem.orderList = navItem.orderList.concat(data.list)
+						if(data.list.lenght == navItem.limit) {
+							navItem.loadingType = 'more'
+						}else {
+							navItem.loadingType = 'noMore'
 						}
-						return item
+						navItem.loaded = true
+						// console.log(data);
+						// this.teamcount = data.team_count
+						// this.ztcount = data.zt_count
+						// this.order = data.order
+						// this.zt_order = data.zt_order
+						// this.jt_order = data.jt_order
+						// this.totalLevel = data.totalLevel
+						// navItem.orderList = data.list;
+						// navItem.loadingType = 'noMore'
 					})
-					obj.list = obj.list.concat(res.data.user)
-					obj.page++
-					if (res.data.user.length == obj.limit) {
-						obj.loadingType = 'more'
-					} else {
-						obj.loadingType = 'noMore'
-					}
-				})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			//swiper 切换
+			changeTab(e) {
+				this.tabCurrentIndex = e.target.current;
+				this.loadData('tabChange');
+			},
+			//顶部tab点击
+			tabClick(index) {
+				this.tabCurrentIndex = index;
+			},
+			// 点击返回 我的页面
+			toBack() {
+				uni.switchTab({
+					url: '/pages/user/user'
+				});
 			}
 		}
-
-	}
+	};
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	page {
-		background-color: #f3f5f4;
+		background: #f8f8f8;
 		height: 100%;
 	}
 
-	.content {
-		background-color: #f3f5f4;
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background: #5dbc7c;
 	}
 
-	.top-fan {
+	.content-money {
 		position: relative;
-		width: 750rpx;
-		height: 336rpx;
-
-		image {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
+		justify-content: space-around;
+		padding-bottom: 40rpx;
+		.body-title {
+			height: 80rpx;
+			text-align: center;
+			font-size: 35rpx;
+			position: relative;
+
+			.header {
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #6B4216;
+				height: 80rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+				z-index: 9;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.goback-box {
+				position: absolute;
+				left: 18rpx;
+				top: 0;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+			}
+
+			.goback {
+				z-index: 100;
+				width: 34rpx;
+				height: 34rpx;
+			}
 		}
 	}
 
-	.fans-base {
+	.money-box {
 		position: relative;
 		z-index: 2;
-		width: 702rpx;
-		height: 210rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -147rpx auto 0;
+		padding-top: 90rpx;
+		color: #6B4216;
 		text-align: center;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #666666;
-
-		.jg {
-			width: 2rpx;
-			height: 96rpx;
-			background: #DCDCDC;
+
+		.money {
+			font-size: 72rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #6B4216;
 		}
 
-		.base-item {
-			flex-grow: 1;
+		.text {
+			font-size: 30rpx;
+		}
+	}
+
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		background-color: #fff;
+		margin: 0rpx 30rpx 30rpx 30rpx;
+		border-radius: 10rpx;
+		.title-box {
+			width: 100%;
+
+			.title-avatar {
+				flex-shrink: 0;
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 25rpx;
+				border-radius: 100%;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+
+			.list_tpl {
+				width: 85%;
+
+				.title {
+					display: flex;
+					justify-content: flex-start;
+					font-size: $font-lg;
+					color: $font-color-base;
+					overflow: hidden; //超出的文本隐藏
+					text-overflow: ellipsis; //溢出用省略号显示
+					white-space: nowrap;
+					line-height: 1;
+					text-align: center;
+
+					.title-name {
+						max-width: 40%;
+					}
 
-			.base-item-val {
-				font-size: 50rpx;
+					.dl {
+						margin-left: 10rpx;
+						width: 93rpx;
+						height: 32rpx;
+						border-radius: 16rpx;
+
+						image {
+							width: 93rpx;
+							height: 32rpx;
+							border-radius: 16rpx;
+						}
+					}
+
+					.class {
+						display: inline-block;
+						margin-left: 10rpx;
+						padding: 6rpx;
+						text-align: center;
+						border: 1px solid #2e58ff;
+						border-radius: 16rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #2e58ff;
+					}
+				}
+
+				.time {
+					font-size: $font-lg;
+					color: $font-color-light;
+				}
+			}
+		}
+
+		.money {
+			width: 50%;
+			text-align: right;
+			color: #db1935;
+			font-size: $font-lg;
+		}
+	}
+
+	.yeji {
+		position: relative;
+		margin: -72rpx auto 0;
+		width: 690rpx;
+		height: 143rpx;
+		background: #ffffff;
+		box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+		border-radius: 10rpx;
+		display: flex;
+		align-items: center;
+
+		.yeji-a {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.yeji-top {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.yeji-buttom {
+				font-size: 42rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #0C1732;
+				color: #333333;
 			}
 		}
+
+		.border {
+			width: 1rpx;
+			height: 51rpx;
+			background: #dddddd;
+		}
 	}
 
-	.fans-tit {
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #0C1732;
-		padding: 45rpx 0 29rpx 40rpx;
+	.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;
+				}
+			}
+		}
 	}
 
-	.fans-list-tit {
-		width: 710rpx;
-		height: 100rpx;
-		background: #FFE1E2;
-		border-radius: 20rpx 20rpx 0px 0px;
-		margin: auto;
+	.buttom-box {
+		position: relative;
+		background-color: #ffffff;
 		text-align: center;
-		;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #DC262B;
-
-		.list-item {
-			width: 25%;
-			flex-shrink: 0;
+		padding: 30rpx 0;
+
+		.buttom {
+			flex-grow: 1;
 		}
-	}
 
-	.fans-list-val {
-		width: 710rpx;
+		.money {
+
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #ff4173;
+		}
+
+		.text {
+			padding-bottom: 26rpx;
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #666666;
+
+			&.current {
+				border-bottom: 2px solid #ff4173;
+			}
+		}
+
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.time-in {
+		display: flex;
+		margin-top: 20rpx;
 		height: 100rpx;
-		margin: auto;
-		text-align: center;
-		;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #0C1732;
-
-		.list-item {
-			// flex-grow: 1;
-			width: 25%;
-			flex-shrink: 0;
+		justify-content: space-around;
+		align-items: center;
+		background-color: #fff;
+		.showtime {
+			display: inline-block;
+			width: 300rpx;
+			height: 85rpx;
+			background-color: #eee;
+			border: 1px solid #999;
+			border-radius: 20rpx;
+			color: #000;
+			font-size: 32rpx;
+			padding-left: 20rpx;
+		}
+		.search {
+			width: 100rpx;
+			height: 50rpx;
+			border-radius: 50rpx;
+			background-color: #ff4575;
+			font-size: 32rpx;
+			text-align: center;
+			line-height: 50rpx;
+			color: #fff;
 		}
 	}
-</style>
+</style>

pages/user/shareQrCode.vue

@@ -1,165 +1,295 @@
 <template>
 	<view class="container">
-		<image @longtap="bc_code" class="backImg" :src="backImg"></image>
-		<view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view>
+		<swiper
+			class="posters-box"
+			:autoplay="false"
+			:circular="false"
+			:interval="3000"
+			:duration="500"
+			@change="bindchange"
+			previous-margin="40px"
+			next-margin="40px">
+			<block
+				v-for="(item, index) in shareList"
+				:key="index">
+				<swiper-item>
+					<!-- #ifndef MP -->
+					<image
+						class="slide-image"
+						:class="swiperIndex == index ? 'active' : 'quiet'"
+						mode="aspectFill"
+						:src="item.wap_poster"></image>
+					<!-- #endif -->
+
+					<!-- #ifdef MP -->
+					<image
+						class="slide-image"
+						:class="swiperIndex == index ? 'active' : 'quiet'"
+						mode="aspectFill"
+						:src="item.poster"></image>
+					<!-- #endif -->
+				</swiper-item>
+			</block>
+		</swiper>
+		<!-- #ifndef MP -->
+		<div class="preserve">
+			<div class="line"></div>
+			<div class="tip">长按保存图片</div>
+			<div class="line"></div>
+		</div>
+		<!-- #endif -->
+
+		<!-- #ifdef MP -->
+		<view
+			class="keep"
+			@click="savePosterPath"
+			>长按保存图片</view
+		>
+		<!-- #endif -->
 	</view>
 </template>
 
 <script>
-	import {
-		spreadBanner
-	} from '@/api/user.js';
+	import { spreadBanner } from "@/api/user.js";
+	import { mapState } from "vuex";
 	export default {
-		// components: { tkiQrcode },
+		// #ifdef MP
+		onShareAppMessage: function (res) {
+			// 保存邀请人
+			let path = "/pages/index/index?" + "spread=" + this.userInfo.uid;
+			let data = {
+				path: path,
+				imageUrl: this.poster,
+				title: this.userInfo.nickname +'邀请您加入',
+			};
+			return data;
+		},
+		// #endif
 		data() {
 			return {
-				url: '',
-				backImg: '',
-				userInfo: '',
-				iswei: 1
+				shareList: [],
+				swiperIndex: 0,
+				poster: "", // 当前海报
 			};
 		},
-		onLoad() {
-			this.spread();
+		onLoad(option) {
+			this.loadData();
 		},
 		computed: {
-			cpSize() {
-				if (this.unit == 'upx') {
-					return uni.upx2px(this.size);
-				} else {
-					return this.size;
-				}
-			}
+			...mapState("user", ["userInfo"]),
 		},
 		methods: {
-			spread() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				let obj = this;
-				//#ifdef H5
-				let ua = navigator.userAgent.toLowerCase(); //获取判断用的对象
-				console.log(ua, '123456');
-				if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-					obj.iswei = 2;
-					console.log('weixin');
-				}
-				//#endif 
-				spreadBanner({
-					//#ifdef H5
-					type: obj.iswei == 2 ? 2 : 3,
-					//#endif
-					//#ifdef MP
-					type: 1,
-					//#endif
-					//#ifdef APP-PLUS
-					type: 3
-					//#endif
-				}).then(({
-					data
-				}) => {
-					console.log(data);
-					//#ifdef MP
-					obj.backImg = data[0].poster;
-					//#endif
-					//#ifdef H5
-					obj.backImg = data[0].wap_poster;
-					//#endif
-					//#ifdef APP-PLUS
-					obj.backImg = data[0].wap_poster;
-					//#endif
-					uni.hideLoading();
-				});
+			bindchange(e) {
+				let shareList = this.shareList;
+				this.swiperIndex = e.detail.current;
+				// #ifdef MP
+				this.poster = shareList[this.swiperIndex].poster;
+				// #endif
+				console.log(this.poster);
 			},
-			bc_code() {
+
+			// 保存海报
+			savePosterPath: function () {
 				let that = this;
-				console.log('保存二维码', this.backImg);
+				if (that.poster == "") {
+					that.poster = that.shareList[0].poster;
+				}
 				uni.downloadFile({
-					//获得二维码的临时地址
-					url: this.backImg,
-					success: res => {
-						//console.log('获取url',res)
-						if (res.statusCode == 200) {
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath, //传入临时地址
-								success() {
-									that.$api.msg('保存成功'); //封装的提示
+					url: that.poster,
+					success(resFile) {
+						if (resFile.statusCode === 200) {
+							uni.getSetting({
+								success(res) {
+									if (
+										!res.authSetting[
+											"scope.writePhotosAlbum"
+										]
+									) {
+										uni.authorize({
+											scope: "scope.writePhotosAlbum",
+											success() {
+												uni.saveImageToPhotosAlbum({
+													filePath:
+														resFile.tempFilePath,
+													success: function (res) {
+														return that.$api.msg(
+															 this.$t("huiyuan.b4")
+														);
+													},
+													fail: function (res) {
+														return that.$api.msg(
+															res.errMsg
+														);
+													},
+													complete: function (res) {},
+												});
+											},
+											fail() {
+												uni.showModal({
+													title: this.$t("huiyuan.b5"),
+													content:
+														 this.$t("huiyuan.b6"),
+													success(res) {
+														if (res.confirm) {
+															uni.openSetting({
+																success:
+																	function (
+																		res
+																	) {
+																		console.log(
+																			res.authSetting
+																		);
+																	},
+															});
+														} else if (res.cancel) {
+															return that.$api.msg(
+																 this.$t("huiyuan.b7")
+															);
+														}
+													},
+												});
+											},
+										});
+									} else {
+										uni.saveImageToPhotosAlbum({
+											filePath: resFile.tempFilePath,
+											success: function (res) {
+												return that.$api.msg(
+													 this.$t("huiyuan.b8")
+												);
+											},
+											fail: function (res) {
+												return that.$api.msg(
+													res.errMsg
+												);
+											},
+											complete: function (res) {},
+										});
+									}
 								},
-								fail() {
-									that.$api.msg('保存失败');
-								}
+								fail(res) {},
 							});
+						} else {
+							return that.$api.msg(resFile.errMsg);
 						}
-					}
+					},
+					fail(res) {
+						return that.$api.msg(res.errMsg);
+					},
 				});
-			}
-		}
+			},
+
+			// #ifdef MP-WEIXIN
+			// 保存画图图片到本地
+			seav(url) {
+				uni.showLoading({
+					title:  '保存中',
+					mask: true,
+				});
+				uni.saveImageToPhotosAlbum({
+					filePath: this.poster,
+					complete(result) {
+						uni.hideLoading();
+						console.log(result);
+						uni.showToast({
+							title:  '保存成功',
+							duration: 2000,
+							icon: "none",
+						});
+					},
+				});
+			},
+			// #endif
+
+			// 获取海报
+			loadData() {
+				let obj = this;
+				uni.showLoading({
+					title: "获取中",
+					mask: true,
+				});
+				spreadBanner({
+					// #ifdef H5
+					type: 2,
+					// #endif
+					// #ifdef MP
+					type: 1,
+					// #endif
+				})
+					.then(res => {
+						uni.hideLoading();
+						obj.shareList = res.data;
+						console.log("obj.shareList", obj.shareList);
+					})
+					.catch(err => {
+						uni.hideLoading();
+					});
+			},
+		},
 	};
 </script>
 
 <style lang="scss">
 	page {
-		width: 100%;
-		min-height: 100%;
-
-		.container {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.backImg {
-		position: absolute;
-		width: 100%;
+		background: #a3a3a3;
 		height: 100%;
 	}
 
-	.portrait {
+	.container {
 		width: 100%;
-		text-align: center;
-		padding-top: 80rpx;
-		padding-bottom: 30rpx;
 
-		image {
-			width: 250rpx;
-			height: 250rpx;
+		.posters-box {
+			width: 100%;
+			height: 1000rpx;
+			margin-top: 40rpx;
+
+			.slide-image {
+				width: 100%;
+				height: 100%;
+				border-radius: 15rpx;
+			}
+		}
+
+		.posters-box .slide-image.active {
+			transform: none;
+			transition: all 0.2s ease-in 0s;
 		}
-	}
 
-	.text {
-		text-align: center;
-		width: 100%;
-		color: #ffffff;
-		font-size: 55rpx;
-		letter-spacing: 15rpx;
-	}
+		.posters-box .slide-image.quiet {
+			transform: scale(0.8333333);
+			transition: all 0.2s ease-in 0s;
+		}
 
-	.uid-name {
-		padding: 50rpx 0rpx;
-		text-align: center;
-		width: 100%;
-		color: #ffffff;
+		.keep {
+			font-size: 30rpx;
+			background: $base-color;
+			color: #fff;
+			width: 600rpx;
+			height: 80rpx;
+			border-radius: 50rpx;
+			text-align: center;
+			line-height: 80rpx;
+			margin: 38rpx auto;
+		}
 	}
 
-	.copy-btn {
-		color: #ffffff;
-		background-color: #4ba6ed;
-		border-radius: 50rpx;
-		width: 170rpx;
-		line-height: 70rpx;
-		margin: 0rpx auto;
+	.preserve {
+		color: #fff;
 		text-align: center;
-	}
+		margin-top: 38rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 
-	.tki-qrcode {
-		position: fixed;
-		bottom: 10%;
-		left: 30%;
-	}
+		.line {
+			width: 100rpx;
+			height: 1px;
+			background-color: #fff;
+		}
 
-	canvas {
-		width: 150px;
-		height: 150px;
-		margin: auto;
+		.tip {
+			margin: 0 20rpx;
+			font-size: 28rpx;
+		}
 	}
 </style>

pages/user/user.vue

@@ -2,48 +2,36 @@
 	<view class="container">
 		<view class="vheigh"></view>
 		<view class="user-top">
-			<!-- #ifndef APP-PLUS -->
-			<!-- <image src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/bf48a202304061504282861.png" mode=""
-				class="user-top-bg"></image> -->
-				<image src="../../static/img/use-bg.png" mode=""
-					class="user-top-bg"></image>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<image src="../../static/img/user-bg.png" mode="" class="user-top-bg"></image>
-			<!-- #endif -->
-			<view class="user-info" @click="navTo('/pages/set/set')">
-				<view class="avatar">
-					<image class="avatarimg" :src="userInfo.avatar || '/static/error/missing-face.png'" mode=""></image>
-					<image v-if="sm != 0" class="real" src="../../static/img/real.png" mode=""></image>
-				</view>
-				<view class="name">{{ userInfo.nickname || '游客' }}</view>
-				<!-- <view class="phone flex" v-if="userInfo.uid">
-					<view class="phone-font">ID号：{{ userInfo.uid }}</view>
-				</view> -->
-				<view class="vip" v-if="userInfo.level_name">
-					<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
-					<view class="vip-title">{{ userInfo.level_name }}</view>
-				</view>
-			</view>
-			<view class="sy-box flex">
-				<view class="sy-item" @click="navTo('/pages/user/mygs')">
-					<view class="sy-item-val">{{ userInfo.brokeage_price > 0 ? userInfo.brokeage_price : '0' }}</view>
-					<view class="sy-item-name">我的奖金</view>
-				</view>
-				<!-- <view class="jg"></view> -->
-				<!-- <view class="sy-item" @click="navTo('/pages/user/myyue')">
-					<view class="sy-item-val">{{ userInfo.now_money || '0.00' }}</view>
-					<view class="sy-item-name">我的余额</view>
-				</view> -->
-				<view class="jg"></view>
-				<view class="sy-item" @click="navTo('/pages/money/qudou')">
-					<view class="sy-item-val">{{ userInfo.integral || '0.00' }}</view>
-					<view class="sy-item-name">我的积分</view>
+			<view class="userinfo">
+				<view class="user-info" @click="navTo('/pages/set/set')">
+					<view class="avatar">
+						<image class="avatarimg" :src="userInfo.avatar || '/static/error/missing-face.png'" mode=""></image>
+						<image v-if="sm != 0" class="real" src="../../static/img/real.png" mode=""></image>
+					</view>
+					<view class="name">{{ userInfo.nickname || '游客' }}</view>
+					<!-- <view class="phone flex" v-if="userInfo.uid">
+						<view class="phone-font">ID号：{{ userInfo.uid }}</view>
+					</view> -->
+					<view class="vip" v-if="userInfo.level_name">
+						<image class="vip-bg" src="../../static/img/vip.png" mode=""></image>
+						<view class="vip-title">{{ userInfo.level_name }}</view>
+					</view>
 				</view>
-				<view class="jg"></view>
-				<view class="sy-item" @click="navTo('/pages/user/myAppointment')">
-					<view class="sy-item-val">{{ userInfo.orderStatusNum.sum_price || '0.00' }}</view>
-					<view class="sy-item-name">消费总额</view>
+				<view class="sy-box flex">
+					<view class="sy-item" @click="navTo('/pages/user/mygs')">
+						<view class="sy-item-val">{{ userInfo.brokeage_price > 0 ? userInfo.brokeage_price : '0' }}</view>
+						<view class="sy-item-name">我的奖金</view>
+					</view>
+					<view class="jg"></view>
+					<view class="sy-item" @click="navTo('/pages/money/qudou')">
+						<view class="sy-item-val">{{ userInfo.integral || '0.00' }}</view>
+						<view class="sy-item-name">我的积分</view>
+					</view>
+					<view class="jg"></view>
+					<view class="sy-item">
+						<view class="sy-item-val">{{ userInfo.sum_pay || '0.00' }}</view>
+						<view class="sy-item-name">消费总额</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -56,7 +44,7 @@
 			</view>
 			<view class="qd-btn" :class="{ qded: qded }" @click="qded ? '' : goQd()">{{ qded ? '已签到' : '立即签到' }}</view>
 		</view> -->
-		<view class="tool-box flex">
+		<!-- <view class="tool-box flex">
 			<view class="tool-item flex" v-for="itemt in toolList" :key="itemt.id" @click="useTool(itemt)"
 				v-if="itemt.id != 't7' || userInfo.staff">
 				<view class="tool-item-img">
@@ -65,24 +53,19 @@
 				</view>
 				<view class="tool-item-name">{{ itemt.name }}</view>
 			</view>
-		</view>
-		<uni-list class="tool-list">
+		</view> -->
+		<uni-list class="tool-list margin-t-30">
+			<uni-list-item class="item" title="邀请好友" @click="navTo('/pages/user/shareQrCode')"
+				thumb="/static/icon/user_pick.png"></uni-list-item>
+			<uni-list-item class="item" title="我的粉丝" @click="navTo('/pages/user/myfans')"
+				thumb="/static/icon/user_name.png"></uni-list-item>
 			<uni-list-item class="item" title="收款信息" @click="navTo('/pages/collection/collection')"
 				thumb="/static/icon/user_page.png"></uni-list-item>
-			<uni-list-item class="item" title="实名认证" @click="navTo('/pages/user/approve')"
-				thumb="/static/icon/user_name.png"></uni-list-item>
-			<uni-list-item class="item" title="收货地址" @click="navTo('/pages/set/address')"
-				thumb="/static/icon/user_address.png"></uni-list-item>
 			<uni-list-item class="item" title="客服" @click="openKf()" thumb="/static/icon/user_serve.png"></uni-list-item>
 			<uni-list-item class="item" title="设置" @click="navTo('/pages/set/set')" thumb="/static/icon/user_set.png"></uni-list-item>
-			<!-- #ifdef H5 -->
-			<uni-list-item class="item" title="绑定手机" @click="navTo('/pages/set/phone')"
-				thumb="/static/icon/user_bind.png"></uni-list-item>
-			<!-- #endif -->
-			<!-- <uni-list-item title="关于我们" @click="navTo('/pages/user/about')" thumb="/static/icon/img09.png"></uni-list-item> -->
 		</uni-list>
-		<view class="page-btm" style="padding-top: 20rpx;">©2022 杭州尚视拍卖有限公司 版权所有</view>
-		<view class="page-btm" style="padding-bottom: 10rpx;">浙ICP备2022017146号-2</view>
+		<!-- <view class="page-btm" style="padding-top: 20rpx;">©2022 杭州尚视拍卖有限公司 版权所有</view>
+		<view class="page-btm" style="padding-bottom: 10rpx;">浙ICP备2022017146号-2</view> -->
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
 				<view class="img">
@@ -101,7 +84,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="popupqd" type="center">
+		<!-- <uni-popup ref="popupqd" type="center">
 			<view class="popup">
 				<view class="popup-dox">
 					<image class="popup-logo" src="../../static/img/sign-popup.png"></image>
@@ -113,11 +96,8 @@
 				</view>
 				<view class="popup-btn" @click="closeQd">知道了</view>
 			</view>
-			<!-- <view class="close_icon" @click="close">
-				<image src="../../static/img/Close.png"></image>
-			</view> -->
-		</uni-popup>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar"></u-tabbar>
+		</uni-popup> -->
+		<u-tabbar activeColor="#333333" inactive-color='#999999' :list="tabbar"></u-tabbar>
 	</view>
 </template>
 <script>
@@ -160,7 +140,6 @@
 				money: '', //保存当前月份
 				year: '', //保存当前年份
 				day: '', //保存当前日期
-				current: 4,
 				tabbar: tabbar1,
 				qded: false, //是否已签到
 				text: '', //客服微信
@@ -451,25 +430,25 @@
 				this.navTo(e.path);
 			},
 			// 签到弹窗
-			goQd() {
-				integral({})
-					.then(e => {
-						this.integral = console.log(e);
-						// 改为已签到
-						this.qded = true;
-						this.today_integral = e.data.integral;
-						this.actionDay++;
-						this.sum_integral = +this.sum_integral + +e.data.integral;
-						this.$refs.popupqd.open();
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
+			// goQd() {
+			// 	integral({})
+			// 		.then(e => {
+			// 			this.integral = console.log(e);
+			// 			// 改为已签到
+			// 			this.qded = true;
+			// 			this.today_integral = e.data.integral;
+			// 			this.actionDay++;
+			// 			this.sum_integral = +this.sum_integral + +e.data.integral;
+			// 			this.$refs.popupqd.open();
+			// 		})
+			// 		.catch(e => {
+			// 			console.log(e);
+			// 		});
+			// },
 			// 关闭签到弹窗
-			closeQd() {
-				this.$refs.popupqd.close();
-			},
+			// closeQd() {
+			// 	this.$refs.popupqd.close();
+			// },
 			// 打开客服
 			openKf() {
 				this.$refs.popupkf.open();
@@ -752,41 +731,34 @@
 	}
 
 	.user-top {
-		height:620rpx;
-		position: relative;
-
-		.user-top-bg {
-			width: 750rpx;
-			height: 660rpx;
-			// width: 100%;
-			// position: absolute;
+		background-image: url("../../static/img/use-bg.png");
+		background-size:750rpx auto;
+		background-repeat: no-repeat;
+		padding: 60rpx 30rpx 0rpx 30rpx;
+		.userinfo{
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
 		}
 
 		.user-info {
-			width: 750rpx;
-			position: absolute;
-			top: 66rpx;
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
 			align-items: center;
+			padding: 30rpx;
 
 			.avatar {
-				position: relative;
 				width: 134rpx;
 				height: 134rpx;
 				border-radius: 50%;
-
+				overflow: hidden;
 				.avatarimg {
-					border-radius: 50%;
 					width: 134rpx;
 					height: 134rpx;
 				}
 
 				.real {
-					position: absolute;
 					bottom: 0;
-					left: 10rpx;
 					width: 120rpx;
 					height: 34rpx;
 				}
@@ -795,9 +767,6 @@
 			.name {
 				margin-top: 20rpx;
 				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ffffff;
 			}
 
 			.phone {
@@ -867,25 +836,18 @@
 		}
 
 		.sy-box {
-			position: absolute;
 			bottom: 105rpx;
 			height: 148rpx;
-			width: 750rpx;
 			.sy-item {
 				flex-grow: 1;
 				text-align: center;
 				font-size: 28rpx;
-				font-family: PingFang SC;
 				font-weight: 500;
-				color: #ffffff;
-
-				.sy-item-val {}
 			}
 
 			.jg {
 				width: 2rpx;
 				height: 68rpx;
-				background-color: #fff;
 			}
 		}
 	}