1-28-1

api/pool.js

@@ -0,0 +1,17 @@
+import request from "@/utils/request.js";
+
+export function getPool(data) {
+	return request({
+		url: '/api/pool/index',
+		method: 'get',
+		data
+	});
+}
+
+export function getPoolDetail(data) {
+	return request({
+		url: '/api/pool/info',
+		method: 'get',
+		data
+	});
+}

api/user.js

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-import { upFilse } from '@/utils/request';
+import {
+	upFilse
+} from '@/utils/request';
 //用户修改信息
 export function edit(data) {
 	return request({
@@ -7,150 +9,168 @@ export function edit(data) {
 		method: 'post',
 		data
 	});
-}
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
-// 获取用户信息
-export function getUserInfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
-}
-
-// 用户分享图
-export function spreadBanner(data) {
-	return request({
-		url: '/api/spread/banner',
-		method: 'get',
-		data
-	});
-}
-
-// 获取地址列表
-export function getAddressList(data) {
-	return request({
-		url: '/api/address/list',
-		method: 'get',
-		data
-	});
-}
-// 修改地址
-export function addressEdit(data) {
-	return request({
-		url: '/api/address/edit',
-		method: 'post',
-		data
-	});
-}
-// 删除地址
-export function addressDel(data) {
-	return request({
-		url: '/api/address/del',
-		method: 'post',
-		data
-	});
-}
-// 设为默认地址
-export function setAddressDefault(data) {
-	return request({
-		url: '/api/address/default/set',
-		method: 'post',
-		data
-	});
-}
-// 购物车列表
-export function getCartList(data) {
-	return request({
-		url: '/api/cart/list',
-		method: 'get',
-		data
-	});
-}
-
-// 修改购物车数量
-export function getCartNum(data) {
-	return request({
-		url: '/api/cart/num',
-		method: 'post',
-		data
-	});
-}
-//删除购物车
-export function cartDel(data) {
-	return request({
-		url: '/api/cart/del',
-		method: 'post',
-		data
-	});
-}
-//获取收藏夹列表
-export function getcollectList(data) {
-	return request({
-		url: '/api/collect/user',
-		method: 'get',
-		data
-	});
-}
-// 取消收藏
-export function delcollect(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-
+}
+// 订单统计信息
+export function orderData(data) {
+	return request({
+		url: '/api/order/data',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUserInfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+
+// 用户分享图
+export function spreadBanner(data) {
+	return request({
+		url: '/api/spread/banner',
+		method: 'get',
+		data
+	});
+}
+
+// 获取地址列表
+export function getAddressList(data) {
+	return request({
+		url: '/api/address/list',
+		method: 'get',
+		data
+	});
+}
+// 修改地址
+export function addressEdit(data) {
+	return request({
+		url: '/api/address/edit',
+		method: 'post',
+		data
+	});
+}
+// 删除地址
+export function addressDel(data) {
+	return request({
+		url: '/api/address/del',
+		method: 'post',
+		data
+	});
+}
+// 设为默认地址
+export function setAddressDefault(data) {
+	return request({
+		url: '/api/address/default/set',
+		method: 'post',
+		data
+	});
+}
+// 购物车列表
+export function getCartList(data) {
+	return request({
+		url: '/api/cart/list',
+		method: 'get',
+		data
+	});
+}
+
+// 修改购物车数量
+export function getCartNum(data) {
+	return request({
+		url: '/api/cart/num',
+		method: 'post',
+		data
+	});
+}
+//删除购物车
+export function cartDel(data) {
+	return request({
+		url: '/api/cart/del',
+		method: 'post',
+		data
+	});
+}
+//获取收藏夹列表
+export function getcollectList(data) {
+	return request({
+		url: '/api/collect/user',
+		method: 'get',
+		data
+	});
+}
+// 取消收藏
+export function delcollect(data) {
+	return request({
+		url: '/api/collect/del',
+		method: 'post',
+		data
+	});
+}
+
+
 //上传图片
-export function upload(data){
+export function upload(data) {
 	return upFilse({
-		url:'/api/upload/image',
-		method:'post',
+		url: '/api/upload/image',
+		method: 'post',
 		data
 	})
-}
+}
 
 
 //上传图片
-export function repurchase(data){
+export function repurchase(data) {
 	return request({
-		url:'/api/user/repurchase',
-		method:'get',
+		url: '/api/user/repurchase',
+		method: 'get',
 		data
 	})
 }
 
-// 推广的人数
-export function getSpreadPeople(data) {
-	return request({
-		url: '/api/spread/people',
-		method: 'post',
-		data
-	})
+// 推广的人数
+export function getSpreadPeople(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'post',
+		data
+	})
+}
+
+// 获取用户名称
+export function nickname(data) {
+	return request({
+		url: '/api/nickname',
+		method: 'get',
+		data
+	});
+}
+
+export function transfer(data) {
+	return request({
+		url: '/api/transfer',
+		method: 'post',
+		data
+	});
 }
 
-// 获取用户名称
-export function nickname(data) {
+//获取会员
+export function getVip(data) {
 	return request({
-		url: '/api/nickname',
+		url: '/api/level/lst',
 		method: 'get',
 		data
 	});
 }
 
-export function transfer(data) {
-        return request({
-                url: '/api/transfer',
-                method: 'post',
-                data
-        });
-}
+//开通会员
+export function becomeVip(data) {
+	return request({
+		url: '/api/level/recharge',
+		method: 'post',
+		data
+	});
+}

manifest.json

@@ -73,7 +73,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://fh.liuniu946.com/api",
+                    "target" : "http://fh.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -353,6 +353,12 @@
 			"style": {
 				"navigationBarTitleText": "积分明细"
 			}
+		},
+		{
+			"path": "pages/user/vip",
+			"style": {
+				"navigationBarTitleText": "开通代言人"
+			}
 		},
 		{
 			"path": "pages/order/order",

pages/money/pay.vue

@@ -5,14 +5,14 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<!-- <view class="type-item b-b" @click="changePayType(1)">
+			<view class="type-item b-b" @click="changePayType(1)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view> -->
+				<label class="radio"><radio value="" color="#d8a668" :checked="payType == 1"></radio></label>
+			</view>
 			<!-- #ifdef APP-PLUS -->
 			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>

pages/order/createOrder.vue

@@ -93,10 +93,10 @@
 				<text class="cell-tit clamp">优惠金额</text>
 				<text class="cell-tip red">-￥35</text>
 			</view> -->
-			<view class="yt-list-cell b-b" v-if="gtype == 0">
+			<!-- <view class="yt-list-cell b-b" v-if="gtype == 0">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color="#d8a668" :checked="checkedPoints" /></view>
-			</view>
+			</view> -->
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">运费</text>
 				<text class="cell-tip">{{ Postage }}</text>

pages/set/address.vue

@@ -15,44 +15,58 @@
 					<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: item.is_default == 1 }"></view>
 					<text class="text">设为默认地址</text>
 				</view>
-				<view class="operation">
+				<view class="operation" v-if="userInfo.address_edit == 1">
 					<view @click.stop="addAddress('edit', item)">
 						<text class="iconfont iconedit"></text>
 						<text class="text">编辑</text>
 					</view>
 					<view class="blank"></view>
-					<view @click.stop="delAddress(item)">
+					<!-- <view @click.stop="delAddress(item)">
 						<text class="iconfont icondelete"></text>
 						<text class="text">删除</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
-		<button class="add-btn" @click="addAddress('add')">新增地址</button>
+		<button class="add-btn" @click="addAddress('add')" v-if="couldAdd">新增地址</button>
 	</view>
 </template>
 
 <script>
-import { getAddressList,setAddressDefault,addressDel } from '@/api/user.js';
+import { getAddressList,setAddressDefault,addressDel,getUserInfo } from '@/api/user.js';
 export default {
 	data() {
-		return {
+		return {
+			userInfo: {},
 			source: 0,
-			addressList: []
+			addressList: [],
+			couldAdd: false
 		};
 	},
 	onLoad(option) {
 		this.source = option.source||0
-		this.loadAddress();
+		this.loadAddress();
+		this.getUserInfo()
 	},
-	methods: {
+	methods: {
+		getUserInfo() {
+			getUserInfo().then(({data}) => {
+				console.log(data)
+				this.userInfo = data
+			})
+		},
 		// 加载地址
 		loadAddress() {
 			getAddressList({
 				page: 1,
 				limit: 100
 			}).then(({ data }) => {
-				this.addressList = data;
+				this.addressList = data;
+				if(data.length == 0) {
+					this.couldAdd = true
+				}else {
+					this.couldAdd = false
+				}
 			});
 		},
 		// 设为默认地址
@@ -97,7 +111,8 @@ export default {
 		//添加或修改成功之后回调
 		refreshList() {
 			// 重新加载地址
-			this.loadAddress()
+			this.loadAddress()
+			this.getUserInfo()
 		}
 	}
 };

pages/user/award.vue

@@ -1,344 +1,396 @@
-<template>
-	<view class="content">
-		<view class="content-money">
+<template>
+	<view class="content">
+		<view class="content-money">
 			<view class="money-box">
-				<image src="../../static/img/jfbg.png" mode="" class="bg"></image>
-				<view class="text"></view>
-				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>		
-			</view>
-			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view> -->
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
-					<text>统计</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('./withdrawal')">
-					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
-					<text>提现</text>
-				</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':maxheight}" 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 class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.title }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
+				<image src="../../static/img/jfbg.png" mode="" class="bg"></image>
+				<view class="text"></view>
+				<view class="money">{{ userInfo.brokerage_price | getMoneyStyle }}</view>
+			</view>
+			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view> -->
+			<!-- <view class="flex buttom-box">
+				<view class="buttom" @click="navto('/pages/money/recharge')">
+					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
+					<text>统计</text>
+				</view>
+				<view class="interval"></view>
+				<view class="buttom" @click="navto('./withdrawal')">
+					<view class="icon"><image src="/static/icon/i7.png" mode="aspectFill" class="icon-img"></image></view>
+					<text>提现</text>
+				</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':maxheight}" 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 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">
+							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
 		</swiper>
 		<view class="btm-wrap">
 			<view class="btn" @click="navto('./withdrawal')">
 				立即提现
 			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { mapState, mapMutations } from 'vuex';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	computed: {
-		...mapState('user',['userInfo'])
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.maxheight = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.maxheight);
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		spreadCommission,
+		userBalance
+	} from '@/api/wallet.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	import empty from '@/components/empty';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		components: {
+			empty,
+			uniLoadMore
+		},
+		onReady(res) {
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.maxheight = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.maxheight);
+					});
+				},
+				fail: res => {}
+			});
+		},
+		data() {
+			return {
+				
+				userInfo: {},
+				// 头部图高度
+				maxheight: '',
+				tabCurrentIndex: 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.getUserInfo()
+			this.loadData();
+			//获取用户余额
+			userBalance({}).then(({
+				data
+			}) => {
+				this.money = data.commissionCount;
+			});
+		},
+		methods: {
+			...mapMutations('user',['setUserInfo']),
+			navto(e) {
+				uni.navigateTo({
+					url: e
 				});
 			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight:'',
-			tabCurrentIndex: 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();
-		//获取用户余额
-		userBalance({}).then(({ data }) => {
-			this.money = data.commissionCount;
-		});
-	},
-	methods: {
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		async loadData(source) {
-			//这里时将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state+3;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			//修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					if(data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						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: #ffffff;
-	height: 100%;
-}
-.content-money {
-	padding-bottom: 30rpx;
-	background: $page-color-base;
-	.moneyTx{
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #FFFFFF;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #FFFFFF;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.buttom-box {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		padding: 20rpx 0;
-		border-radius: $border-radius-sm;
-		margin-top: -60rpx;
-		.buttom {
-			font-size: $font-lg;
-			flex-grow: 1;
-		}
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-.money-box {
-	background-color: $base-color;
-	padding-top: var(--status-bar-height);
-	height: 368rpx;
-	color: #ffffff;
-	text-align: center;
-	position: relative;
-	.bg {
-		position: absolute;
+			getUserInfo() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
+						this.userInfo = data
+					})
+			},
+			async loadData(source) {
+				//这里时将订单挂载到tab列表下
+				let index = this.tabCurrentIndex;
+				let navItem = this.navList[index];
+				let state = navItem.state + 3;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				//修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+
+				spreadCommission({
+							page: navItem.page,
+							limit: navItem.limit
+						},
+						state
+					)
+					.then(({
+						data
+					}) => {
+						if (data.length > 0) {
+							navItem.orderList = navItem.orderList.concat(data[0].list);
+							console.log(navItem.orderList);
+							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: #ffffff;
+		height: 100%;
+	}
+
+	.content-money {
+		padding-bottom: 30rpx;
+		background: $page-color-base;
+
+		.moneyTx {
+			position: absolute;
+			top: 150rpx;
+			right: 0rpx;
+			width: 150rpx;
+			padding: 10rpx 30rpx;
+			border: 2px solid #FFFFFF;
+			border-top-left-radius: 99rpx;
+			border-bottom-left-radius: 99rpx;
+			color: #FFFFFF;
+			line-height: 1;
+			font-size: $font-base;
+		}
+
+		.buttom-box {
+			background-color: #ffffff;
+			text-align: center;
+			margin: 0 30rpx;
+			padding: 20rpx 0;
+			border-radius: $border-radius-sm;
+			margin-top: -60rpx;
+
+			.buttom {
+				font-size: $font-lg;
+				flex-grow: 1;
+			}
+
+			.interval {
+				width: 2px;
+				height: 60rpx;
+				background-color: #eeeeee;
+			}
+
+			.icon {
+				height: 50rpx;
+				width: 48rpx;
+				margin: 0 auto;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+
+	.money-box {
+		background-color: $base-color;
+		padding-top: var(--status-bar-height);
+		height: 368rpx;
+		color: #ffffff;
+		text-align: center;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			width: 750rpx;
+			height: 400rpx;
+			top: 0;
+			left: 0;
+		}
+
+		.text {
+			padding-top: 147rpx;
+			font-size: $font-sm;
+			position: relative;
+		}
+
+		.money {
+			font-size: 80rpx;
+			position: relative;
+		}
+	}
+
+	.navbar {
+		display: flex;
+		height: 40px;
+		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: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: #000;
+				font-weight: bold;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid rgba(154, 94, 25, 1);
+			}
+				}
+		}
+	}
+
+	//列表
+
+	.swiper-box {
+		padding-top: 10rpx;
+		padding-bottom: 143rpx;
+
+		.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: rgba(239, 58, 85, 1);
+				font-size: $font-lg;
+			}
+		}
+	}
+
+	.list-scroll-content {
+		height: 100%;
+	}
+
+	.content {
+		height: 100%;
+
+		.empty-content {
+			background-color: #ffffff;
+		}
+	}
+
+	.btm-wrap {
+		height: 140rpx;
 		width: 750rpx;
-		height: 400rpx;
-		top: 0;
+		position: fixed;
+		bottom: 0;
 		left: 0;
-	}
-	.text {
-		padding-top: 147rpx;
-		font-size: $font-sm;
-		position: relative;
-	}
-	.money {
-		font-size: 80rpx;
-		position: relative;
-	}
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	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: $font-color-dark;
-		position: relative;
-		&.current {
-			color: #000;
-			font-weight: bold;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid rgba(154, 94, 25, 1);
-			}
-		}
-	}
-}
-//列表
-
-.swiper-box {
-	padding-top: 10rpx;
-	padding-bottom: 143rpx;
-	.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: rgba(239, 58, 85, 1);
-			font-size: $font-lg;
-		}
-	}
-}
-.list-scroll-content {
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-.btm-wrap {
-	height: 140rpx;
-	width: 750rpx;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	background-color: #fff;
+		background-color: #fff;
+	
 	.btn {
-		width: 674rpx;
-		height: 88rpx;
-		line-height: 88rpx;
-		margin: auto;
-		background: linear-gradient(-22deg, #9A5E19, #9A5E19);
-		border-radius: 44rpx;
-		text-align: center;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
+			width: 674rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			margin: auto;
+			background: linear-gradient(-22deg, #9A5E19, #9A5E19);
+			border-radius: 44rpx;
+			text-align: center;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
 	}
-}
 </style>

pages/user/user.vue

@@ -50,6 +50,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="open-m" @click="navTo('/pages/user/vip')" v-if="userInfo.uid && userInfo.level <= 2">
+			<image src="../../static/img/open-m.png" mode=""></image>
+		</view>
 		<!-- <scroll-view class="content-box" scroll-y="true"> -->
 		<!-- <template v-if="userInfo.level >= 1">
 				<view class="show-time" >
@@ -149,8 +152,8 @@
 
 					<uni-list-item title="推广海报" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/tuiguang.png">
 					</uni-list-item>
-					<uni-list-item title="资金池" @click="navTo('/pages/user/zjc')" thumb="/static/icon/zjc-u.png">
-					</uni-list-item>
+					<!-- <uni-list-item title="资金池" @click="navTo('/pages/user/zjc')" thumb="/static/icon/zjc-u.png">
+					</uni-list-item> -->
 					<uni-list-item title="交易密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/icon/img06.png"></uni-list-item>
 					<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/dizhi.png">
 					</uni-list-item>
@@ -515,7 +518,7 @@
 
 	.cover-container {
 		background: $page-color-base;
-		margin-top: 165rpx;
+		// margin-top: 165rpx;
 		padding: 0 30rpx;
 		position: relative;
 		background: #f5f5f5;
@@ -908,4 +911,17 @@
 			}
 		}
 	}
+	.open-m {
+		
+		width: 710rpx;
+		height: 90rpx;
+		margin: auto;
+		margin-top: 165rpx;
+		// background: linear-gradient(73deg, #FFFFFF 0%, #FFFBEB 0%, #FFF1DA 0%, #FED591 100%);
+		border-radius: 20rpx;
+		image {
+			width: 710rpx;
+			height: 90rpx;
+		}
+	}
 </style>

pages/user/vip.vue

@@ -0,0 +1,767 @@
+<template>
+	<view class="contet">
+		<!-- <view class="jg" style="height: 20rpx;background-color: #fff;"></view> -->
+		<view class="" style="background-color: #fff;padding-top: 40rpx;position: relative;">
+			<image src="../../static/img/ktbg.png" mode=""
+				style="position: absolute;top: 0;width: 750rpx;height: 200rpx;"></image>
+			<view class="card" style="position: relative;">
+				<view class="card-top flex">
+					<view class="avtur">
+						<image :src="userInfo.avatar || '/static/error/missing-face.png'" mode=""></image>
+					</view>
+					<view class="main">
+						<view class="name">{{ userInfo.nickname }}</view>
+						<view class="tip" v-if="userInfo.level == 0">尚未开通会员</view>
+					</view>
+				</view>
+				<view class="now-wrap">
+					立即开通
+				</view>
+				<view class="card-info">
+					<view class="info-tit">
+						代言人
+					</view>
+					<view class="info-val">
+						￥20000起 终身代言人
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="vip">
+			<view class="system-title">
+				<view class="img" style="margin-right: 45rpx;">
+					<image class="img" src="../../static/img/vip-left.png"></image>
+				</view>
+				<view class="title">代言人特权</view>
+				<view class="img" style="margin-left: 45rpx;">
+					<image class="img" src="../../static/img/vip-right.png"></image>
+				</view>
+			</view>
+			<view class="item-box flex">
+				<view class="item" v-for="(item, index) in viplist" :key="index">
+					<image :src="item.pic" mode=""></image>
+					<view class="item-title">{{ item.title }}</view>
+					<view class="item-tip">{{ item.tip }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="vip">
+			<view class="system-title">
+				<view class="img" style="margin-right: 45rpx;">
+					<image class="img" src="../../static/img/vip-left.png"></image>
+				</view>
+				<view class="title">选择代言人</view>
+				<view class="img" style="margin-left: 45rpx;">
+					<image class="img" src="../../static/img/vip-right.png"></image>
+				</view>
+			</view>
+			<view class="money-box flex">
+				<view class="money" v-for="(item, index) in payList" @click="changevip(item, index)"
+					:class="{ current: index == choose }">
+					<view class="money-name">{{ item.explain }}</view>
+					<view class="now-money">
+						￥
+						<text>{{ item.money }}</text>
+					</view>
+					<view class="bf-money">￥{{ item.yuan }}</view>
+					<view class="money-tip" :class="{ moneyc: index == choose }">
+						<!-- <image src="../../static/img/good.png" mode=""></image> -->
+						立省{{ item.sq }}元
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottom-btn">
+			<view class="btm-left">
+				开通即享代言人特权
+			</view>
+			<view class="btm-right" @click="readyPay()">
+				马上开通
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		becomeVip,
+		getVip,
+		setUserRed,
+		claseauto
+	} from '@/api/user.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	export default {
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		},
+		data() {
+			return {
+				level_id: 3,
+				money: '',
+
+				choose: 0,
+				payList: [],
+				viplist: [{
+						pic: '../../static/icon/zdpt.png',
+						title: '佣金奖励',
+						tip: '更多佣金奖励'
+					},
+					{
+						pic: '../../static/icon/ktqy.png',
+						title: '专属折扣',
+						tip: '优享会员独享'
+					},
+					{
+						pic: '../../static/icon/yjlhb.png',
+						title: '团队奖励',
+						tip: '更多团队奖励'
+					}
+				],
+			}
+		},
+		onLoad() {
+			this.getVip()
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			getUserInfoA() {
+
+			},
+			// 获取会员等级列表
+			getVip() {
+				getVip({}).then(({
+					data
+				}) => {
+					data.forEach((sj, index) => {
+						console.log(sj, '123456');
+						if (sj.explain == '村代') {
+							sj.level = 5;
+						}
+						if (sj.explain == '镇代') {
+							sj.level = 4;
+						}
+						if (sj.explain == '区代') {
+							sj.level = 3;
+						}
+						sj.sq = (sj.money * 0.33).toFixed(0);
+						sj.yuan = (sj.sq * 1 + sj.money * 1).toFixed(2);
+					});
+					this.payList = data;
+					// 设置默认选中的对象
+					this.level_id = data[0].id;
+					this.money = data[0].money;
+					console.log(this.payList);
+				});
+			},
+			changevip(item, index) {
+				this.level_id = item.id;
+				this.level = item.level;
+				this.choose = index;
+				this.money = item.money;
+				this.myProvincial = {
+					id: 0,
+					name: ''
+				};
+			},
+			getUserInfoB() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
+						uni.showToast({
+							title:'购买成功',
+							duration:2000
+						});
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 800);
+						// uni.showModal({
+							
+						// })
+						// if (data.wx_qr) {
+						// 	uni.navigateTo({
+						// 		url: '/pages/vip/success'
+						// 	});
+						// } else {
+						// 	this.$api.msg('请完善会员信息')
+						// 	setTimeout(() => {
+						// 		uni.navigateTo({
+						// 			url: '/pages/set/userdata'
+						// 		});
+						// 	}, 1000);
+						// }
+
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			// 开通会员
+			readyPay() {
+
+				let obj = this;
+				if (obj.userInfo.level > 0) {
+					return obj.$api.msg('您已开通会员')
+				}
+				getUserInfo()
+					.then(({
+						data
+					}) => {
+
+						this.setUserInfo(data);
+						if (data.now_money * 1 < obj.money * 1) {
+							return obj.$api.msg('您的余额不足')
+						} else {
+							obj.payLoding = true;
+							obj.froms = uni.getStorageSync('weichatBrowser') || '';
+							uni.showLoading({
+								title: '支付中',
+								mask: true
+							});
+							let data = {
+								pay_type: 'yue',
+								level_id: obj.level_id,
+								// #ifdef H5
+								from: obj.froms ? 'weixin' : 'H5', //来源
+								// #endif
+								// #ifdef MP-WEIXIN
+								from: 'routine', //来源
+								// #endif
+								// #ifdef APP-PLUS
+								from: 'app' //来源
+								// #endif
+							};
+							console.log(data, '传值');
+							becomeVip(data).then(({
+								data
+							}) => {
+								console.log('fufei', data);
+								uni.hideLoading();
+
+								if (data.status == 'PAY_ERROR') {
+									console.log(data);
+								}
+								if (data.status == 'SUCCESS') {
+
+									obj.getUserInfoB();
+								}
+								console.log('-----', data);
+								let da = data.result.jsConfig;
+								if (obj.payName == 'weixin' || obj.payName == 'routine') {
+									// let da = data.result.jsConfig;
+									console.log('--da--', da);
+									let data = {
+										// #ifdef H5
+										timestamp: da.timestamp,
+										// #endif
+										// #ifdef MP
+										timeStamp: da.timestamp,
+										// #endif
+										nonceStr: da.nonceStr,
+										package: da.package,
+										signType: da.signType,
+										paySign: da.paySign,
+										success: function(res) {
+											console.log(res);
+											obj.getUserInfoB();
+										},
+										fail: e => {
+											console.log(e);
+										}
+									};
+									console.log('--data--', data);
+									// #ifdef MP
+									wx.requestPayment(data);
+									// #endif
+									// #ifdef H5
+									if (obj.payName == 'weixin') {
+										weixinObj.chooseWXPay(data);
+									}
+									// #endif
+								}
+
+								uni.hideLoading();
+								// #ifdef H5
+								if (data.status == 'PAY_ERROR') {
+									console.log(data);
+								}
+								if (data.status == 'SUCCESS') {
+
+									obj.getUserInfoB();
+								}
+								// #endif
+							});
+						}
+					})
+
+				// try {
+				// 	let obj = this;
+				// 	obj.payLoding = true;
+				// 	// #ifdef H5
+				// 	// 获取当前是否为微信浏览器
+				// 	obj.froms = uni.getStorageSync('weichatBrowser') || '';
+				// 	// #endif
+				// 	uni.showLoading({
+				// 		title: '支付中',
+				// 		mask: true
+				// 	});
+				// 	let data = {
+				// 		pay_type: 'yue',
+				// 		level_id: 1,
+				// 		// #ifdef H5
+				// 		from: obj.froms ? 'weixin' : 'H5', //来源
+				// 		// #endif
+				// 		// #ifdef MP-WEIXIN
+				// 		from: 'routine', //来源
+				// 		// #endif
+				// 		// #ifdef APP-PLUS
+				// 		from: 'app' //来源
+				// 		// #endif
+				// 	};
+				// 	console.log(data, '传值');
+				// 	becomeVip(data).then(({
+				// 		data
+				// 	}) => {
+				// 		console.log('fufei', data);
+				// 		uni.hideLoading();
+
+				// 		if (data.status == 'PAY_ERROR') {
+				// 			console.log(data);
+				// 		}
+				// 		if (data.status == 'SUCCESS') {
+
+				// 			obj.getUserInfoB();
+				// 		}
+				// 		console.log('-----', data);
+				// 		let da = data.result.jsConfig;
+				// 		if (obj.payName == 'weixin' || obj.payName == 'routine') {
+				// 			// let da = data.result.jsConfig;
+				// 			console.log('--da--', da);
+				// 			let data = {
+				// 				// #ifdef H5
+				// 				timestamp: da.timestamp,
+				// 				// #endif
+				// 				// #ifdef MP
+				// 				timeStamp: da.timestamp,
+				// 				// #endif
+				// 				nonceStr: da.nonceStr,
+				// 				package: da.package,
+				// 				signType: da.signType,
+				// 				paySign: da.paySign,
+				// 				success: function(res) {
+				// 					console.log(res);
+				// 					obj.getUserInfoB();
+				// 				},
+				// 				fail: e => {
+				// 					console.log(e);
+				// 				}
+				// 			};
+				// 			console.log('--data--', data);
+				// 			// #ifdef MP
+				// 			wx.requestPayment(data);
+				// 			// #endif
+				// 			// #ifdef H5
+				// 			if (obj.payName == 'weixin') {
+				// 				weixinObj.chooseWXPay(data);
+				// 			}
+				// 			// #endif
+				// 		}
+
+				// 		uni.hideLoading();
+				// 		// #ifdef H5
+				// 		if (data.status == 'PAY_ERROR') {
+				// 			console.log(data);
+				// 		}
+				// 		if (data.status == 'SUCCESS') {
+
+				// 			obj.getUserInfoB();
+				// 		}
+				// 		// #endif
+				// 	});
+				// } catch (e) {
+				// 	console.log('fufiecw', e);
+				// 	//TODO handle the exception
+				// }
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		position: relative;
+		margin: auto;
+		z-index: 10;
+		width: 655rpx;
+		height: 324rpx;
+		background: linear-gradient(225deg, #ffeed2 0%, #fed591 100%);
+		border-radius: 24rpx;
+		padding: 28rpx 25rpx 30rpx 36rpx;
+
+		.now-wrap {
+			width: 190rpx;
+			line-height: 69rpx;
+			background: #C09852;
+			border-radius: 35rpx;
+			position: absolute;
+			top: 39rpx;
+			right: 25rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #F6DCA9;
+			text-align: center;
+
+		}
+
+		.card-top {
+			justify-content: flex-start;
+
+			.avtur {
+				width: 90rpx;
+				height: 90rpx;
+				border-radius: 50%;
+				margin-right: 10rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+				}
+			}
+
+			.name {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.tip {
+				font-size: 20rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				opacity: 0.52;
+			}
+		}
+
+		.btn {
+			position: absolute;
+			top: 40rpx;
+			right: 24rpx;
+			width: 190rpx;
+			height: 69rpx;
+			background: #3a3a3b;
+			border-radius: 35rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 69rpx;
+			text-align: center;
+		}
+
+		.card-info {
+			height: 120rpx;
+			position: absolute;
+			bottom: 30rpx;
+			left: 43rpx;
+
+			.info-tit {
+				line-height: 70rpx;
+				font-size: 40rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+
+			.info-val {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #343434;
+			}
+		}
+	}
+
+	.hyjl {
+		background-color: #fff;
+		padding: 30rpx 30rpx 0;
+		margin-bottom: 20rpx;
+
+		.jl-tit {
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #000000;
+		}
+	}
+
+	.tool {
+		flex-wrap: wrap;
+		justify-content: flex-start;
+		align-items: center;
+
+		.tool-item {
+			width: 33.3%;
+			height: 160rpx;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+
+			.tool-img {
+				width: 45rpx;
+				height: 45rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.tool-name {
+				padding-top: 20rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #505050;
+			}
+		}
+
+		.tool-item1 {
+			background: #FAFBFF;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+			width: 222rpx;
+			height: 298rpx;
+			background: #FAFBFF;
+			border-radius: 10rpx;
+
+			.tool-name {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #7B7B7B;
+			}
+
+			.bold {
+				font-weight: bold;
+				color: #000;
+			}
+
+			.tool-img {
+				width: 157rpx;
+				height: 112rpx;
+				margin-top: 37rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+	}
+
+	.bottom-btn {
+		display: flex;
+		align-items: flex-end;
+		position: fixed;
+		bottom: 0;
+		text-align: center;
+
+		.btm-left {
+			width: 750rpx - 280rpx;
+			line-height: 100rpx;
+			background-color: #34332F;
+			color: #fff;
+		}
+
+		.btm-right {
+			width: 280rpx;
+			line-height: 108rpx;
+
+			background: #EFD4A1;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #5A5A5A;
+		}
+	}
+
+	.vip {
+		margin-top: 20rpx;
+		background: #ffffff;
+		padding-bottom: 54rpx;
+
+		.system-title {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding-top: 40rpx;
+
+			.title {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1d2023;
+			}
+
+			.img {
+				width: 170rpx;
+				height: 2rpx;
+				display: block;
+			}
+		}
+
+		.item-box {
+			margin-top: 40rpx;
+			justify-content: center;
+			align-items: center;
+
+			.item {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				image {
+					width: 100rpx;
+					height: 100rpx;
+				}
+
+				.item-title {
+					margin-top: 14rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.item-tip {
+					margin-top: 10rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		}
+
+		.money-box {
+			margin-top: 40rpx;
+			justify-content: center;
+			align-items: center;
+			padding: 0 25rpx 160rpx 0rpx;
+
+			.current {
+				border: 1rpx solid #fed591 !important;
+				background: #fff8ec !important;
+			}
+
+			.money {
+				margin-left: 22rpx;
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 204rpx;
+				height: 296rpx;
+				background: #f5f5f5;
+				border: 1rpx solid #ffffff;
+				border-radius: 20rpx;
+				position: relative;
+
+				.tj {
+					position: absolute;
+					top: 0;
+					left: 0;
+					width: 90rpx;
+					height: 44rpx;
+					text-align: center;
+					line-height: 44rpx;
+					font-size: 25rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+
+					.tj-bg {
+						width: 90rpx;
+						height: 44rpx;
+					}
+
+					text {
+						display: inline-block;
+						position: relative;
+						top: -56rpx;
+					}
+				}
+
+				.money-name {
+					margin-top: 58rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #644931;
+				}
+
+				.now-money {
+					font-size: 22rpx;
+					font-family: FZCuHeiSongS-B-GB;
+					font-weight: 400;
+					color: #f7cf9c;
+
+					text {
+						font-size: 40rpx;
+					}
+				}
+
+				.bf-money {
+					font-size: 33rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #9a5a12;
+					opacity: 0.35;
+				}
+
+				.moneyc {
+					background: #f7cf9c !important;
+					color: #ffffff !important;
+				}
+
+				.money-tip {
+					margin-top: 10rpx;
+					width: 180rpx;
+					height: 45rpx;
+					background: #f5f5f5;
+					border: 1px solid #f7cf9c;
+					border-radius: 23rpx;
+					padding: 5rpx 10rpx;
+					font-size: 25rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #f7cf9c;
+
+					image {
+						position: relative;
+						top: 2rpx;
+						width: 23rpx;
+						height: 23rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/user/zjc.vue

@@ -1,83 +1,88 @@
 <template>
 	<view class="content">
 		<view class="jg" style="height: 20rpx;background-color: #f8f6f7;"></view>
-		<view class="zjc-item" v-for="item in navList" @click="navto('/pages/user/zjcdetail?type=' + item.path)">
+		<view class="zjc-item" v-for="item in navList" @click="navto('/pages/user/zjcdetail?type=' + item.type + '&name=' + item.title)">
 			<view class="zjc-top flex">
 				<image src="../../static/icon/zjc-logo.png" mode="" class="zjc-logo"></image>
-				<view class="zjc-name">{{item.name}}</view>
+				<view class="zjc-name">{{item.title}}</view>
 				<image src="../../static/img/img74.png" mode="" class="zjc-more"></image>
 			</view>
 			<view class="zjc-btm flex">
 				<view class="btn-item">
 					<view class="item-name">累计数量</view>
-					<view class="item-val">{{item.cum || 0}}</view>
+					<view class="item-val">{{item.total_amount || 0}}</view>
 				</view>
 				<view class="btn-item" style="text-align: center;">
 					<view class="item-name">人数</view>
-					<view class="item-val">{{item.num || 0}}</view>
+					<view class="item-val">{{item.user_cts || 0}}</view>
 				</view>
 				<view class="btn-item" style="text-align: right;">
 					<view class="item-name">人均可分</view>
-					<view class="item-val">{{item.ave || 0}}</view>
+					<view class="item-val">{{item.bonus || 0}}</view>
 				</view>
 			</view>
 		</view>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
+	import {
+		getPool
+	} from '@/api/pool.js'
 	export default {
 		data() {
 			return {
-				navList: [{
-					name: '399资金池',
-					path: '0',
-					mun: '',//人数
-					ave: '',//平均
-					cum: ''//累计
-				},{
-					name: '4980资金池',
-					path: '1',
-					mun: '',
-					ave: '',
-					cum: ''
-				},{
-					name: '20000资金池',
-					path: '2',
-					mun: '',
-					ave: '',
-					cum: ''
-				},{
-					name: '60000资金池',
-					path: '3',
-					mun: '',
-					ave: '',
-					cum: ''
-				},{
-					name: '100000资金池',
-					path: '4',
-					mun: '',
-					ave: '',
-					cum: ''
-				}],
+				navList: [],
+				loaded: 0,
 			}
 		},
+		onLoad() {
+			this.getZjcs()
+		},
 		methods: {
 			navto(url) {
 				console.log(url)
 				uni.navigateTo({
-					url:url
+					url: url
+				})
+			},
+			getZjcs() {
+				for (let i = 0; i < 5; i++) {
+					this.getZjc(i)
+				}
+
+			},
+			getZjc(type) {
+				let obj = this
+				getPool({
+					type: type
+				}).then(res => {
+					console.log(res)
+					if (res.data.length > 0) {
+						obj.navList.push(res.data[0])
+						console.log(obj.navList[type],'type')
+					} else {
+						// obj.navList.push({
+						// 	total_amount: 0,
+						// 	user_cts: 0,
+						// 	bonus: 0
+						// })
+					}
+					// obj.loaded = obj.loaded + 1
+					// console.log(obj.loaded ,'obj.loaded++')
+					// console.log(obj.navList)
 				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	page {
 		background-color: #fff;
 		height: 100%;
 	}
+
 	.zjc-item {
 		margin: auto;
 		width: 700rpx;
@@ -87,16 +92,19 @@
 		border-radius: 20rpx;
 		padding-left: 10rpx;
 		padding-right: 20rpx;
+
 		.zjc-top {
 			height: 52rpx;
-			
+
 			line-height: 52rpx;
 			font-size: 36rpx;
+
 			.zjc-logo {
 				width: 52rpx;
 				height: 52rpx;
 				flex-shrink: 0;
 			}
+
 			.zjc-name {
 				// width: 500rpx;
 				flex-grow: 1;
@@ -104,17 +112,20 @@
 				padding-left: 10rpx;
 				font-weight: bold;
 			}
+
 			.zjc-more {
 				flex-shrink: 0;
 				width: 22rpx;
 				height: 38rpx;
 			}
 		}
+
 		.zjc-btm {
 			padding: 20rpx 0;
+
 			.btn-item {
 				flex-grow: 1;
 			}
 		}
-	}
+	}
 </style>

pages/user/zjcdetail.vue

@@ -6,7 +6,7 @@
 				{{all || 0}}
 			</view>
 		</view>
-		<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" :style="{'heihgt': height}">
+		<scroll-view class="scorll-wrap" scroll-y @scrolltolower="loadData" :style="{'height': height}">
 			<!-- 空白页 -->
 			<!-- <empty v-if="loaded == true && list.length === 0"></empty> -->
 		 
@@ -19,12 +19,12 @@
 							<text>{{ item.nickname }}</text>
 						</view>
 						<view class="time">
-							<text>{{ item.time }}</text>
+							<text>{{ item.phone | phone}}</text>
 						</view>
 					</view>
 				</view>
 			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
+			<!-- <uni-load-more :status="loadingType"></uni-load-more> -->
 		</scroll-view>
 	</view>
 </template>
@@ -32,7 +32,9 @@
 <script>
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
-	
+	import {
+		getPoolDetail
+	} from '@/api/pool.js'
 	export default {
 		data() {
 			return {
@@ -42,22 +44,42 @@
 				loadingType: 'more',
 				page: 1,
 				limit: 10,
-				loaded: true
+				loaded: true,
+				type: 0,
+				name: ''
+			}
+		},
+		filters: {
+			phone(val) {
+				let str = ''
+				if(val) {
+					val = "" + val;
+					str = val.substr(0,3) + "****" + val.substr(7)
+				}
+				return str
 			}
 		},
 		components: {
 			uniLoadMore,
 			empty
 		},
+		onLoad(opt) {
+			this.name = opt.name
+			this.type = opt.type
+			uni.setNavigationBarTitle({
+			　　title:this.name
+			})
+			this.loadData()
+		},
 		onReady(res) {
 			var _this = this;
 			uni.getSystemInfo({
 				success: resu => {
 					const query = uni.createSelectorQuery();
-					query.select('.list-scroll-content').boundingClientRect();
+					query.select('.scorll-wrap').boundingClientRect();
 					query.exec(function(res) {
-						_this.maxheight = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.maxheight);
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
 					});
 				},
 				fail: res => {}
@@ -65,7 +87,13 @@
 		},
 		methods: {
 			loadData() {
-				
+				let obj =this
+				getPoolDetail({
+					type: obj.type
+				}).then(({data}) => {
+					obj.list = data.item.data
+					obj.all = data.total_amount
+				})
 			}
 		}
 	}
@@ -73,7 +101,7 @@
 
 <style lang="scss" scoped>
 	.v-top {
-		position: relative;
+		// position: relative;
 		height: 470rpx;
 		width: 750rpx;
 		.top-bg {
@@ -90,8 +118,52 @@
 			color: #fff;
 			text-align: center;
 		}
-		.list-scroll-content {
-			position: relative;
+		
+	}
+	.scorll-wrap {
+		// background-color: red;
+	}
+	.order-item {
+		// margin-top: 20rpx;
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			width: 100%;
+			.title-avatar{
+				width: 100rpx;
+				height: 100rpx;
+				margin-right: 25rpx;
+				image{
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+			.list_tpl{
+				width: 85%;
+				.title {
+					font-size: $font-lg;
+					color: $font-color-base;
+					overflow:hidden;            //超出的文本隐藏
+					text-overflow:ellipsis;     //溢出用省略号显示
+					white-space:nowrap;
+					 justify-content: flex-start;
+					image {
+						margin-left: 9rpx;
+						width: 147rpx;
+						height: 32rpx;
+					}
+				}
+				.time {
+					margin-top: 15rpx;
+					font-size: 22rpx;
+					color: $font-color-light;
+				}
+			}
+		}
+		.money {
+			color: #DB1935;
+			font-size: $font-lg;
 		}
 	}
 </style>

unpackage/dist/build/h5/index.html

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