接接口

api/active.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 参与保单
+export function activity(data,id) {
+	return request({
+		url: '/api/activity/' + id,
+		method: 'post',
+		data
+	});
+}
+
+// 保单类型列表
+export function activityList(data,id) {
+	return request({
+		url: '/api/activity',
+		method: 'get',
+		data
+	});
+}

api/activity.js

@@ -1,276 +0,0 @@
-import request from "@/utils/request.js";
-/**
- * 
- * 所有活动接口 包括：拼团，砍价，秒杀
- * 
-*/
-// 砍价产品详情
-export function getBargainDetail(data,id) {
-	return request({
-		url: '/api/bargain/detail/' + id,
-		method: 'get',
-		data
-	});
-}
-
-/**
- * 砍价产品详情
- */
-// export function getBargainDetail(id) {
-//   return request.get("bargain/detail/" + id);
-// }
-
-//砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
-export function postBargainHelpCount(data) {
-	return request({
-		url: '/api/bargain/help/count',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格
- */
-// export function postBargainHelpCount(data) {
-//   return request.post("bargain/help/count", data);
-// }
-
-//砍价 开启砍价用户信息
-export function postBargainStartUser(data) {
-	return request({
-		url: '/api/bargain/start/user',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 开启砍价用户信息
- */
-// export function postBargainStartUser(data) {
-//   return request.post("bargain/start/user", data);
-// }
-
-//砍价开启
-export function postBargainStart(data) {
-	return request({
-		url: '/api/bargain/start',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价开启
- */
-// export function postBargainStart(bargainId) {
-//   return request.post("bargain/start", { bargainId: bargainId});
-// }
-
-// 砍价 砍掉金额
-export function postBargainHelpPrice(data) {
-	return request({
-		url: '/api/bargain/help/price',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 砍掉金额
- */
-// export function postBargainHelpPrice(data) {
-//   return request.post("bargain/help/price", data);
-// }
-
-// 砍价 帮助好友砍价
-export function postBargainHelp(data) {
-	return request({
-		url: '/api/bargain/help',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 帮助好友砍价
- */
-// export function postBargainHelp(data) {
-//   return request.post("bargain/help", data);
-// }
-
-// 砍价 砍价帮
-export function postBargainHelpList(data) {
-	return request({
-		url: '/api/bargain/help/list',
-		method: 'post',
-		data
-	});
-}
-
-
-/**
- * 砍价 砍价帮
- */
-// export function postBargainHelpList(data) {
-//   return request.post("bargain/help/list", data);
-// }
-
-// 砍价 观看/分享/参与次数
-export function postBargainShare(data) {
-	return request({
-		url: '/api/bargain/share',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价 观看/分享/参与次数
- */
-// export function postBargainShare(bargainId) {
-//   return request.post("bargain/share", { bargainId: bargainId});
-// }
-
-// 砍价列表(已参与)
-export function getBargainUserList(data) {
-	return request({
-		url: '/api/bargain/user/list',
-		method: 'get',
-		data
-	});
-}
-
-/**
- * 
- * 砍价列表(已参与)
- * @param object data
-*/
-// export function getBargainUserList(data){
-//   return request.get('bargain/user/list',data);
-// }
-
-// 砍价取消
-export function getBargainUserCancel(data) {
-	return request({
-		url: '/api/bargain/user/cancel',
-		method: 'post',
-		data
-	});
-}
-
-/**
- * 砍价取消
- */
-// export function getBargainUserCancel(data) {
-//   return request.post("/bargain/user/cancel", data);
-// }
-
-
-
-
-
-/**
- * 拼团列表
- * 
-*/
-export function getCombinationList(data) {
-  return request.get('combination/list', data,{noAuth:true});
-}
-
-/**
- * 拼团详情
- * 
-*/
-export function getCombinationDetail(id) {
-  return request.get('combination/detail/'+id);
-}
-
-/**
- * 拼团 开团
- */
-export function getCombinationPink(id) {
-  return request.get("combination/pink/" + id);
-}
-
-/**
- * 拼团 取消开团
- */
-export function postCombinationRemove(data) {
-  return request.post("combination/remove",data);
-}
-
-/**
- * 砍价列表
- */
-export function getBargainList(data) {
-  return request.get("bargain/list", data,{noAuth:true});
-}
-
-
-/**
- * 
- * 取消砍价
- * @param int bargainId
-*/
-export function bargainUserCancel(bargainId){
-  return request.post('bargain/user/cancel', { bargainId: bargainId})
-}
-
-/**
- * 秒杀产品时间区间
- * 
-*/
-export function getSeckillIndexTime(){
-  return request.get('seckill/index',{},{noAuth:true});
-}
-
-/**
- * 秒杀产品列表
- * @param int time
- * @param object data
-*/
-export function getSeckillList(time,data){
-  return request.get('seckill/list/'+time,data,{noAuth:true});
-}
-
-/**
- * 秒杀产品详情
- * @param int id
-*/
-export function getSeckillDetail(id){
-  return request.get('seckill/detail/'+id);
-}
-
-/**
- * 砍价海报
- * @param object data
- * 
-*/
-export function getBargainPoster(data){
-  return request.post('bargain/poster',data)
-}
-
-/**
- * 拼团海报
- * @param object data
- * 
-*/
-export function getCombinationPoster(data){
-  return request.post('combination/poster',data)
-}
-
-/**
- * 获取秒杀小程序二维码
- */
-export function seckillCode(id,data) {
-  return request.get("seckill/code/"+id,data);
-}
-
-/**
- * 获取拼团小程序二维码
- */
-export function scombinationCode(id) {
-  return request.get("combination/code/"+id);
-}

api/apply.js

@@ -1,9 +0,0 @@
-import {upFilse} from '@/utils/request'
-import request from '@/utils/request'
-export function upload(data){
-	return upFilse({
-		url:'/api/upload/image',
-		method:'post',
-		data
-	})
-}

api/index.js

@@ -1,30 +1,5 @@
 import request from '@/utils/request'
 
-// 促销商品
-export function groom4(data) {
-	return request({
-		url: '/api/groom/list/4',
-		method: 'get',
-		data
-	});
-}
-// 精品推荐
-export function groom1(data) {
-	return request({
-		url: '/api/groom/list/1',
-		method: 'get',
-		data
-	});
-}
-// 新品首发
-export function groom3(data) {
-	return request({
-		url: '/api/groom/list/3',
-		method: 'get',
-		data
-	});
-}
-
 // 获取首页信息
 export function loadIndexs(data) {
 	return request({
@@ -33,4 +8,3 @@ export function loadIndexs(data) {
 		data
 	});
 }
-

api/order.js

@@ -1,146 +0,0 @@
-import request from '@/utils/request'
-import {upFilse} from '@/utils/request'
-// 订单确认
-export function confirm(data) {
-	return request({
-		url: '/api/order/confirm',
-		method: 'post',
-		data
-	});
-}
-//获取可使用优惠券
-export function couponsOrder(data,price) {
-	return request({
-		url: '/api/coupons/order/'+price,
-		method: 'get',
-		data
-	});
-}
-//获取优惠券列表
-export function getCouponsList(data,types) {
-	//优惠券状态 0全部 1未使用 2已使用
-	return request({
-		url: '/api/coupons/user/'+types,
-		method: 'get',
-		data
-	});
-}
-//提交评论
-export function order_comment(data) {
-	return request({
-		url: '/api/order/comment',
-		method: 'post',
-		data
-	});
-}
-//订单产品信息
-export function product(data) {
-	return request({
-		url: '/api/order/product',
-		method: 'post',
-		data
-	});
-}
-// 快递查询
-export function express_query(data) {
-	return request({
-		url: '/api/order/express_query',
-		method: 'get',
-		data
-	});
-}
-//上传图片
-export function upload(data) {
-	return upFilse({
-		url: '/api/upload/image',
-		method: 'post',
-		data
-	});
-}
-// 订单列表
-export function orderList(data) {
-	return request({
-		url: '/api/order/list',
-		method: 'get',
-		data
-	});
-}
-// 订单详细
-export function orderDetail(data,orderid) {
-	return request({
-		url: '/api/order/detail/'+orderid,
-		method: 'get',
-		data
-	});
-}
-
-// 取消订单
-export function orderCancel(data) {
-	return request({
-		url: '/api/order/cancel',
-		method: 'post',
-		data
-	});
-}
-
-// 删除订单
-export function orderDel(data) {
-	return request({
-		url: '/api/order/del',
-		method: 'get',
-		data
-	});
-}
-// 申请退款
-export function refund(data) {
-	return request({
-		url: '/api/order/refund/verify',
-		method: 'post',
-		data
-	});
-}
-// 退款理由列表
-export function refundReason(data) {
-	return request({
-		url: '/api/order/refund/reason',
-		method: 'get',
-		data
-	});
-}
-
-// 确认收货
-export function orderTake(data) {
-	return request({
-		url: '/api/order/take',
-		method: 'post',
-		data
-	});
-}
-
-// 订单支付
-export function orderPay(data) {
-	return request({
-		url: '/api/order/pay',
-		method: 'post',
-		data
-	});
-}
-
-// 创建订单
-export function createOrderkey(data,key) {
-	return request({
-		url: '/api/order/create/'+key,
-		method: 'post',
-		data
-	});
-}
-
-// 统计订单金额
-export function computedOrderkey(data) {
-	return request({
-		url: '/api/order/computed/'+data.orderkey,
-		method: 'post',
-		data
-	});
-}
-

api/product.js

@@ -1,186 +0,0 @@
-import request from '@/utils/request'
-
-// 获取商品列表
-export function getProducts(data) {
-	// 	{
-	// 参数名称	是否必须	示例	备注
-	// sid			否			二级分类编号
-	// cid			否			一级分类编号（！）
-	// keyword		否			搜索
-	// priceOrder	否			价格排序
-	// salesOrder	否			销量排序
-	// news			否			是否新品
-	// page			否			分页参数起始值
-	// limit		否			分页数步长值
-	// }
-	return request({
-		url: '/api/products',
-		method: 'get',
-		data
-	});
-}
-// 获取商品详情
-export function goodsDetail(data, id) {
-	return request({
-		url: '/api/product/detail/' + id,
-		method: 'get',
-		data
-	});
-}
-
-// 砍价列表
-export function getBargainList(data) {
-	return request({
-		url: '/api/bargain/list',
-		method: 'get',
-		data
-	});
-}
-// 加入购物车
-export function cartAdd(data) {
-	return request({
-		url: '/api/cart/add',
-		method: 'post',
-		data
-	});
-}
-
-// 收藏商品
-export function collectAdd(data) {
-	return request({
-		url: '/api/collect/add',
-		method: 'post',
-		data
-	});
-}
-
-// 取消收藏商品
-export function collectDel(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-// 获取搜搜关键字
-export function searchKeyword(data) {
-	return request({
-		url: '/api/search/keyword',
-		method: 'get',
-		data
-	});
-}
-
-// 获取热门分类信息
-export function groomList(data,type) {
-	// 获取产品类型 1 精品推荐 2 热门榜单 3首发新品 4促销单品
-	return request({
-		url: '/api/groom/list/'+type,
-		method: 'get',
-		data
-	});
-}
-
-
-// 获取秒杀商品详细
-export function seckillGoods(data,id) {
-	return request({
-		url: '/api/seckill/detail/'+id,
-		method: 'get',
-		data
-	});
-}
-
-// 获取拼团商品详细
-export function groupGoods(data,id) {
-	return request({
-		url: '/api/combination/detail/'+id,
-		method: 'get',
-		data
-	});
-}
-
-
-// 获取商品分类
-export function getCategoryList(data) {
-	return request({
-		url: '/api/category',
-		method: 'get',
-		data
-	});
-}
-
-
-// 获取拼团列表
-export function getCombinationList(data) {
-	return request({
-		url: '/api/combination/list',
-		method: 'get',
-		data
-	});
-}
-
-//取消拼团
-export function getCombinationLisRemove(data,id) {
-	return request({
-		url: '/api/combination/remove'+id,
-		method: 'get',
-		data
-	});
-}
-
-//拼团开团页面数据
-export function getCombinationLisPink(data,id) {
-	return request({
-		url: '/api/combination/pink/'+id,
-		method: 'get',
-		data
-	});
-}
-
-// 获取拼团海报
-export function getCombinationPoster(data) {
-	return request({
-		url: '/api/combination/poster',
-		method: 'post',
-		data
-	});
-}
-
-
-// 获取秒杀分类
-export function getSeckillClass(data) {
-	return request({
-		url: '/api/seckill/index',
-		method: 'get',
-		data
-	});
-}
-// 获取秒杀列表
-export function getSeckillList(data,id) {
-	return request({
-		url: '/api/seckill/list/'+id,
-		method: 'get',
-		data
-	});
-}
-
-
-// 产品评价数量和好评度
-export function reply_config(data,id) {
-	return request({
-		url: '/api/reply/config/'+id,
-		method: 'get',
-		data
-	});
-}
-// 获取产品评论
-export function reply_list(data,id) {
-	return request({
-		url: '/api/reply/list/'+id,
-		method: 'get',
-		data
-	});
-}
-

api/set.js

@@ -13,7 +13,7 @@ export function userEdit(data) {
 export function logout(data) {
 	return request({
 		url: '/api/logout',
-		method: 'get',
+		method: 'post',
 		data
 	});
 }

api/user.js

@@ -1,15 +1,6 @@
 import request from '@/utils/request'
 import { upFilse} from '@/utils/request';
 
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
 // 获取用户信息
 export function getUserInfo(data) {
 	return request({
@@ -27,80 +18,6 @@ export function spreadBanner(data) {
 		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 uploads(data) {
@@ -111,4 +28,11 @@ export function uploads(data) {
 	});
 }
 
-
+//查看公排下级
+export function children(data,id) {
+	return request({
+		url:'/api/user/children/' + id,
+		method:'get',
+		data
+	});
+}

pages/index/index.vue

@@ -2,43 +2,22 @@
 	<view class="content">
 		<image src="../../static/img/index/index.png" mode="" class="bg"></image>
 		<view class="box">
-			<view class="discounts">
-				<image src="../../static/img/index/youhui1.png" mode="" class="discounts1"></image>
-				<view class="money">
-					￥<text>{{price}}</text>
-				</view>
-				<view class="baodan" @click="baodan()">
-					<image src="../../static/img/index/baodan1.png" mode=""></image>
-				</view>
-			</view>
-			<view class="earnings-box">
-				<image src="../../static/img/index/vip.png" mode="" class="earnings"></image>
-				<view class="text-box">
-					<view class="textDetail" v-for="(item,index) in revenueList">
-						<view class="textDetail-title">
-							{{index<2?(index+1)+"层收益":(index+1)+"层收益(黑钻VIP会员专属)"}}
-						</view>
-						<view class="textDetail-content">{{item}}</view>
+			<view v-for="(item, index) in list" :key="index">
+				<view class="discounts">
+					<image src="../../static/img/index/youhui1.png" mode="" class="discounts1"></image>
+					<view class="money">
+						￥
+						<text>{{ item.money }}</text>
 					</view>
+					<view class="baodan" @click="baodan(item.id)"><image src="../../static/img/index/baodan1.png" mode=""></image></view>
 				</view>
-			</view>
-			<view class="discounts">
-				<image src="../../static/img/index/youhui1.png" mode="" class="discounts1"></image>
-				<view class="money">
-					￥<text>{{price}}</text>
-				</view>
-				<view class="baodan" @click="baodan()">
-					<image src="../../static/img/index/baodan1.png" mode=""></image>
-				</view>
-			</view>
-			<view class="earnings-box">
-				<image src="../../static/img/index/vip.png" mode="" class="earnings"></image>
-				<view class="text-box">
-					<view class="textDetail" v-for="(item,index) in revenueList">
-						<view class="textDetail-title">
-							{{index<2?(index+1)+"层收益":(index+1)+"层收益(黑钻VIP会员专属)"}}
+				<view class="earnings-box">
+					<image src="../../static/img/index/vip.png" mode="" class="earnings"></image>
+					<view class="text-box">
+						<view class="textDetail" v-for="(ls, index) in revenueList">
+							<view class="textDetail-title">{{ index < 2 ? index + 1 + '层收益' : index + 1 + '层收益(黑钻VIP会员专属)' }}</view>
+							<view class="textDetail-content">{{ ls }}</view>
 						</view>
-						<view class="textDetail-content">{{item}}</view>
 					</view>
 				</view>
 			</view>
@@ -46,141 +25,168 @@
 	</view>
 </template>
 <script>
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		components: {},
-		data() {
-			return {
-				price: 20000,
-				price1: 4000,
-				revenueList: [
-					"5人x2000元=1万元",
-					"25人x2000元=5万元",
-					"125人x2000元=25万元 ",
-					"625人x2000元=125万元",
-					"3125人x2000元=625万元 ",
-					"15625人x2000元=3125万元 ",
-					"78125人x2000元=1.5625亿元"
-				]
-			}
-		},
-		methods: {
-			baodan() {
-				console.log("aaaaa ");
+import { mapState, mapMutations } from 'vuex';
+import { activityList } from '@/api/active.js';
+export default {
+	components: {},
+	computed:{
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	data() {
+		return {
+			price: 20000,
+			list: [],
+			revenueList: [
+				'5人x2000元=1万元',
+				'25人x2000元=5万元',
+				'125人x2000元=25万元 ',
+				'625人x2000元=125万元',
+				'3125人x2000元=625万元 ',
+				'15625人x2000元=3125万元 ',
+				'78125人x2000元=1.5625亿元'
+			]
+		};
+	},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		baodan(id) {
+			if(!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit){
+				console.log(this.userInfo,"11111")
+				uni.showModal({
+				    title: '提示',
+				    content: '您当前未填写银行卡信息和所属银行是否前往填写',
+				    success: function (res) {
+				        if (res.confirm) {
+				           uni.navigateTo({
+								url:'/pages/set/userinfo'
+				           })
+				        } else if (res.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+			}else {
 				uni.navigateTo({
-					url
-				})
+					url:'/pages/index/info?id='+ id
+				});
 			}
+		},
+		loadData(){
+			activityList({}).then(({data}) =>{
+				this.list = data.list
+			})
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-	page {
-		padding: 0;
-		margin: 0;
-		// width: 750rpx;
-		height: 100%;
+page {
+	padding: 0;
+	margin: 0;
+	// width: 750rpx;
+	min-height: 100%;
+}
+
+.content {
+	display: flex;
+	position: relative;
+	flex-direction: column;
+	.bg {
+		position: absolute;
+		width: 100%;
+		height: 6000rpx;
+	}
+	.box {
+		margin-top: 1480rpx;
 	}
 
-	.content {
+	.discounts {
+		margin: 0 30rpx;
 		display: flex;
+		justify-content: center;
 		position: relative;
-		flex-direction: column;
-
-		.bg {
-			position: absolute;
+		width: 690rpx;
+		height: 890rpx;
+		.discounts1 {
 			width: 100%;
-			height: 6000rpx;
-		}
-		.box{
-			margin-top: 1480rpx;
+			height: 100%;
 		}
 
-		.discounts {
-			margin: 0 30rpx;
+		.money {
+			margin: 0 auto;
 			display: flex;
 			justify-content: center;
-			position: relative;
-			width: 690rpx;
-			height: 890rpx;
-
-			.discounts1 {
-				width: 100%;
-				height: 100%;
-			}
+			align-items: center;
+			top: 0;
+			margin-top: 250rpx;
+			font-size: 36rpx;
+			font-family: Source Han Sans CN;
+			font-weight: bold;
+			color: #c63535;
+			line-height: 30rpx;
+			position: absolute;
 
-			.money {
-				margin: 0 auto;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				top: 0;
-				margin-top: 250rpx;
-				font-size: 36rpx;
+			text {
+				font-size: 116rpx;
 				font-family: Source Han Sans CN;
-				font-weight: bold;
-				color: #C63535;
-				line-height: 30rpx;
-				position: absolute;
-
-				text {
-					font-size: 116rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 800;
-					color: #C63535;
-					line-height: 115rpx;
-				}
-			}
-
-			.baodan {
-				position: absolute;
-				top: 690rpx;
-				width: 300rpx;
-				height: 80rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
+				font-weight: 800;
+				color: #c63535;
+				line-height: 115rpx;
 			}
 		}
 
-		.earnings-box {
-			position: relative;
-			margin: 40rpx 30rpx;
-			width: 690rpx;
-			height: 1140rpx;
-			.earnings {
+		.baodan {
+			position: absolute;
+			top: 690rpx;
+			width: 300rpx;
+			height: 80rpx;
+
+			image {
 				width: 100%;
 				height: 100%;
 			}
-			.text-box {
-				position: absolute;
-				top: 184rpx;
-				left: 110rpx;
-				.textDetail {
-					padding-bottom: 69rpx;
-					.textDetail-title {
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #4E2C0E;
-						line-height: 30rpx;
-						padding-bottom: 10rpx;
-					}
+		}
+	}
+
+	.earnings-box {
+		position: relative;
+		margin: 40rpx 30rpx;
+		width: 690rpx;
+		height: 1140rpx;
+		.earnings {
+			width: 100%;
+			height: 100%;
+		}
+		.text-box {
+			position: absolute;
+			top: 184rpx;
+			left: 110rpx;
+			.textDetail {
+				min-height: 134rpx;
+				max-height: 140rpx;
+				overflow: hidden;
+				padding-bottom: 64rpx;
+				.textDetail-title {
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #4e2c0e;
+					line-height: 30rpx;
+					padding-bottom: 10rpx;
+				}
 
-					.textDetail-content {
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #4E2C0E;
-						line-height: 30rpx;
-					}
+				.textDetail-content {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #4e2c0e;
+					line-height: 30rpx;
 				}
 			}
 		}
 	}
+}
 </style>

pages/index/info.vue

@@ -20,7 +20,7 @@
 						<view class="name">111</view>
 					</view>
 				</view>
-				<view class="right"><view class="right-box">上传凭证</view></view>
+				<view class="right"><view class="right-box" @click="nav('/pages/upload/upload')">上传凭证</view></view>
 			</view>
 		</view>
 		<view class="tishi">
@@ -29,9 +29,34 @@
 	</view>
 </template>
 
-<script></script>
+<script>
+import { activity } from '@/api/active.js'
+export default {
+	data(){
+		return {
+			id:'',
+		}
+	},
+	onLoad(option) {
+		this.id = option.id;
+		this.loadData();
+	},
+	methods: {
+		loadData(){
+			activity({},this.id).then(e =>{
+				console.log(e)
+			})
+		},
+		nav(url){
+			uni.navigateTo({
+				url
+			})
+		}
+	}
+}
+</script>
 
-<style lang="less">
+<style lang="scss">
 .box {
 	padding-top: 10rpx;
 	color: #fad6b0;

pages/set/userinfo.vue

@@ -8,6 +8,14 @@
 			<text class="tit">昵称</text>
 			<input class="input" type="text" v-model="userInfo.nickname" placeholder-class="placeholder" />
 		</view>
+		<view class="row">
+			<text class="tit" style="width: 240upx;">银行账号</text>
+			<input class="input" type="text"  v-model="userInfo.bank_card_no" placeholder-class="placeholder" />
+		</view>
+		<view class="row">
+			<text class="tit" style="width: 240upx;">所属银行</text>
+			<input class="input" type="text"  v-model="userInfo.bank_of_deposit" placeholder-class="placeholder" />
+		</view>
 		<view class="row">
 			<text class="tit">ID</text>
 			<input class="input" type="text"  disabled="true" v-model="userInfo.id" placeholder-class="placeholder" />
@@ -50,7 +58,7 @@ export default{
 			})
 		},
 		confirm() {
-			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname})
+			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname,bank_of_deposit:this.userInfo.bank_of_deposit,bank_card_no:this.userInfo.bank_card_no})
 				.then(e => {
 					this.$api.msg('修改成功');
 					setTimeout(()=> {

pages/upload/upload.vue

@@ -25,7 +25,7 @@
 <script>
 	import {
 		upload
-	} from '@/api/apply.js'
+	} from '@/api/user.js'
 	export default {
 		data() {
 			return {
@@ -106,7 +106,6 @@
 			width: 560rpx;
 			height: 80rpx;
 			background: linear-gradient(-74deg, #CE9C6D, #FFECD6);
-			border: 1px solid;
 			border-image: linear-gradient(115deg, #FEEBD5, #FFFFFF, #E1AD7D) 1 1;
 			box-shadow: 3rpx 4rpx 5rpx 0rpx rgba(151, 118, 74, 0.5);
 			border-radius: 40rpx;

pages/user/team.vue

@@ -23,9 +23,6 @@
 						<view class="head">
 							<view class="photo"><image v-if="avatar" :src="avatar || '/static/error/missing-face.png'"></image></view>
 						</view>
-						<!-- <view class="head-title">
-							<image src="../../static/error/missing-face.png" mode=""></image>
-						</view> -->
 					</view>
 					<view class="information">
 						<view class="name clamp">{{ name }}</view>
@@ -54,7 +51,7 @@
 
 <script>
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import { getjiedian, getReferralList, addJiedian } from '@/api/user.js';
+import { children } from '@/api/user.js';
 import { mapState, mapMutations } from 'vuex';
 export default {
 	components: {
@@ -66,20 +63,7 @@ export default {
 			phone: '', //当前节点手机号
 			avatar: '', //当前节点头像
 			id: '',
-			childList: [{
-				name:'11',
-				phone:'13300000000'
-			},{
-				name:'12',
-				phone:'13300000001'
-			},{
-				name:'13',
-				phone:'13300000003'
-			},{
-				name:'14',
-				phone:'13300000004'
-			},
-			] //当前节点的下级
+			childList: [] //当前节点的下级
 		};
 	},
 	computed: {
@@ -89,7 +73,7 @@ export default {
 		this.name = this.userInfo.nickname;
 		this.phone = this.userInfo.phone;
 		this.avatar = this.userInfo.avatar;
-		this.id = this.userInfo.uid;
+		this.id = this.userInfo.id;
 		this.loadData();
 	},
 
@@ -98,6 +82,10 @@ export default {
 
 		loadData() {
 			const obj = this;
+			children({},this.id).then(({data}) =>{
+				this.childList = data
+				console.log(data)
+			})
 		}
 	}
 };

pages/user/user.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="config iconfont"><text class="setting iconsetting" @click="navTo('/pages/set/userinfo')"></text></view>
 		</view>
-		<view class="vip-box"><image src="../../static/img/vip.png" mode=""></image></view>
+		<view class="vip-box" @click="navTo('/pages/user/upgrade')"><image src="../../static/img/vip.png" mode=""></image></view>
 
 		<view class="tt">
 			<view class="tt-box" @click="navTo('/pages/user/promotion')">