3-18-1

api/wallet.js

@@ -113,5 +113,12 @@ export function getRechargeList(data) {
 	});
 }
 
-
-
+
+//	积分列表
+export function integrallist(data) {
+	return request({
+		url: '/api/integral/list',
+		method: 'get',
+		data
+	});
+}

pages/award/award.vue

@@ -118,7 +118,7 @@ export default {
 		this.loadData();
 		// 获取用户余额
 		extractBank({}).then(({ data }) => {
-			this.money = data.commissionCount;
+			this.money = data.brokerage_price;
 			// 冻结佣金
 			this.freezeMoney = data.freezePrice;
 		});

pages/award/withdrawal.vue

@@ -22,6 +22,9 @@
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
+		<view class="tip" v-if="withdrawal != 0">
+			实际到账{{real}}元，手续费{{sxf}}元，转换为消费券{{xfq}}元，转换为股份{{gf}}元，转换为余额{{yue}}元
+		</view>
 		<!-- <view class="row-box">
 			<view class="title">手续费</view>
 			<view class="row">
@@ -32,7 +35,7 @@
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list">
 			<radio-group @change="tabRadio">
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconweixin1"></view>
 						<view class="title-box">
@@ -40,7 +43,7 @@
 						</view>
 						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
 					</view>
-				</label>
+				</label> -->
 				<label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
@@ -92,11 +95,16 @@ export default {
 	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
+			type: 'alipay', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
+			reall:'',//实际到账
+			sxfl:'',//手续费率
+			xfql:'',//消费券率
+			gfl:'',//股份率
+			yuel:'',//余额率
 			aliData: {},
 			bankData: {},
 			charge:0,
@@ -115,6 +123,23 @@ export default {
 		this.loadAli();
 		this.loadBank();
 	},
+	computed: {
+		real() {
+			return (this.withdrawal * this.reall).toFixed(2) * 1 
+		},
+		sxf() {
+			return (this.withdrawal * this.sxfl).toFixed(2) * 1
+		},
+		xfq() {
+			return (this.withdrawal * this.xfql).toFixed(2) * 1
+		},
+		gf() {
+			return (this.withdrawal * this.gfl).toFixed(2) * 1
+		},
+		yue() {
+			return (this.withdrawal * this.yuel).toFixed(2) * 1
+		},
+	},
 	methods: {
 		// 更新数据
 		dataUp() {
@@ -138,8 +163,13 @@ export default {
 			extractBank({}).then(({ data }) => {
 				this.money = data.commissionCount;
 				this.minPrice = data.minPrice;
-				this.freeze = data.incommissionCount;
+				this.freeze = data.broken_commission;
 				this.charge = data.cash_out;
+				this.sxfl = (data.commission/100).toFixed(2) * 1
+				this.xfql = (data.commission_consumer/100).toFixed(5) * 1
+				this.gfl = (data.commission_gf/100).toFixed(2) * 1
+				this.yuel = (data.commission_yue/100).toFixed(2) * 1
+				this.reall = (1 - this.sxfl - this.xfql - this.gfl - this.yuel).toFixed(2) * 1
 			});
 		},
 		// 跳转
@@ -267,6 +297,10 @@ page {
 		}
 	}
 }
+.tip {
+	padding: 20rpx;
+	color: #E51C23;
+}
 .add-btn {
 	&.modified {
 		color: $base-color;

pages/index/index.vue

@@ -26,10 +26,10 @@
 		</view>
 		<!-- 分类 -->
 		<view class="cate-section">
-			<navigator url="/pages/category/category" open-type="switchTab">
+			<navigator url="/pages/product/classify?type=5" >
 				<view class="cate-item">
 					<image class="Uimg" src="/static/icon/in2.png"></image>
-					<text>全部分类</text>
+					<text>套餐商品</text>
 				</view>
 			</navigator>
 			<navigator :url="canChange==0 ? '/pages/shoping/list?type=5': '/pages/shoping/list'">
@@ -53,7 +53,7 @@
 		</view>
 
 		<!-- 积分兑换 -->
-		<!-- <view class="main-box">
+		<view class="main-box">
 			<view class="main-top">
 				<image src="../../static/icon/indexI.png" mode="" class="main-icon"></image>
 				<view class="main-title">积分兑换</view>
@@ -68,18 +68,18 @@
 					<image src="../../static/icon/fanhui.png" class="go" mode=""></image>
 				</view>
 				<view class="commodity flex">
-					<view class="commodity-item" v-for="(item, index) in goodsList" :key="item.id" @click="navToDetailPage(item)">
+					<view class="commodity-item" v-for="(item, index) in integralList" :key="item.id" @click="navToDetailPagejf(item)">
 						<image class="commodity-image" :src="item.image" mode=""></image>
 						<view class="commodity-title clamp">{{ item.store_name }}</view>
 						<view class="price">￥{{ item.ot_price }}</view>
 						<view class="vip-price">
-							<image src="../../static/icon/jf.png" mode=""></image>
-							<text>{{ item.price }}</text>
+							<!-- <image src="../../static/icon/jf.png" mode=""></image> -->
+							<text>￥{{ item.price }}</text>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view> -->
+		</view>
 		<!-- 消费券专区 -->
 		<view class="main-box">
 			<view class="main-top">
@@ -158,6 +158,7 @@ export default {
 			carouselList: [], //轮播列表
 			goodsList: [], //积分商品列表
 			bastList: [], //消费券商品列表
+			integralList:[],//积分商品列表
 			bastBanner: [], //促销商品列表
 			menusList: [], //头部菜单
 			userServant: [
@@ -338,6 +339,7 @@ export default {
 				this.swiperLength = this.carouselList.length;
 				this.menusList = data.menus;
 				this.goodsList = goods.bastList; //最新商品
+				this.integralList = goods.integralList;
 			});
 			getProducts({
 				page: 1,
@@ -368,6 +370,12 @@ export default {
 				url: '/pages/product/product?id=' + item.id
 			});
 		},
+		//积分详情页
+		navToDetailPagejf(item) {
+			uni.navigateTo({
+				url: '/pages/product/product?id=' + item.id
+			});
+		},
 		//消费券详情页
 		navToDetailvoucher(item) {
 			uni.navigateTo({

pages/order/createOrder.vue

@@ -90,7 +90,7 @@
 				<text class="cell-tit clamp">优惠金额</text>
 				<text class="cell-tip red">-￥35</text>
 			</view> -->
-			<view class="yt-list-cell b-b" v-if="integralAll > 0 && !is_change">
+			<view class="yt-list-cell b-b" v-if="shopList[0].productInfo.max_use_integral > 0">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
 			</view>

pages/prefecture/integral.vue

@@ -11,11 +11,11 @@
 					<view class="old-price">
 						<text class="old">￥{{good.ot_price}}</text>
 						<image src="../../static/icon/down.png" mode=""></image>
-						<text class="zj">直降{{good.ot_price - good.use_max_integral}}元</text>
+						<text class="zj">直降{{good.price - good.ot_price}}元</text>
 					</view>
 					<view class="integral-wrap">
 						<image src="../../static/icon/jf.png" mode=""></image>
-						<text class="price">{{good.use_max_integral}}</text>
+						<text class="price">{{good.ot_price}}</text>
 					</view>
 				</view>
 				<view class="btn" @click="nav(good.id)">
@@ -72,7 +72,7 @@ export default {
 		},
 		// 请求载入数据
 		async loadData() {
-			groomList({}, 5)
+			groomList({}, 6)
 				.then(({ data }) => {
 					// 保存轮播图
 					this.bannerImg = data.banner;

pages/product/classify.vue

@@ -15,6 +15,7 @@
 				<text v-if="type == 2">热门榜单</text>
 				<text v-if="type == 3">首发新品</text>
 				<text v-if="type == 4">促销单品</text>
+				<text v-if="type == 5">套餐商品</text>
 			</view>
 			<view class="title-border"></view>
 		</view>

pages/product/product.vue

@@ -100,10 +100,10 @@
 				<text class="con t-r red">领取优惠券</text>
 				<text class="iconfont iconenter"></text>
 			</view> -->
-			<view class="c-row b-b" v-if="goodsObjact.is_integral == 1 && goodsType == 0">
+			<view class="c-row b-b" v-if="goodsObjact.max_use_integral != 0 ">
 				<text class="tit">积分</text>
 				<view class="bz-list con">
-					<text>最高抵扣￥{{ moneyNum(goodsObjact.use_max_integral) == 0 ? moneyNum(goodsObjact.price) : moneyNum(goodsObjact.use_max_integral) }}</text>
+					<text>最高抵扣￥{{ moneyNum(goodsObjact.max_use_integral) == 0 ? moneyNum(goodsObjact.price) : moneyNum(goodsObjact.max_use_integral) }}</text>
 				</view>
 			</view>
 		</view>
@@ -228,7 +228,8 @@ export default {
 		}
 	},
 	data() {
-		return {
+		return {
+			paying: false,//是否正在支付
 			details: '',
 			reply: '', //评论
 			type: 1, //默认支付方式add为
@@ -396,7 +397,8 @@ export default {
 			groupGoods({}, this.goodsid).then(function({ data }) {
 				obj.pink = data.pink[0]; //保存拼团信息
 				let goods = data.storeInfo;
-				obj.goodsObjact = goods;
+				obj.goodsObjact = goods;
+				console.log(goods,'123456');
 				obj.imgList = goods.images; //保存轮播图
 				obj.specList = data.productAttr; //保存分类列表
 				obj.productValue = data.productValue; //保存分类查询数据
@@ -461,7 +463,7 @@ export default {
 				let goods = data.storeInfo;
 				let store_info = data.system_store// 保存店铺信息
 				console.log(store_info)
-				obj.storeObjact = store_info
+				obj.storeObjact = store_info;
 				obj.goodsObjact = goods;
 				obj.reply = data.reply; //保存评论列表
 				obj.imgList = goods.slider_image; //保存轮播图
@@ -566,7 +568,7 @@ export default {
 		},
 		// 立即购买
 		buy() {
-			let obj = this;
+			let obj = this;
 			let data = {
 				cartNum: obj.goodsNumber, //商品数量
 				uniqueId: obj.uniqueId, //商品标签
@@ -574,7 +576,11 @@ export default {
 				mer_id: obj.shopId,
 				is_consumer: 0,
 				// type: 0,//0为余额支付  1为消费券支付 2为积分支付
-			};
+			};
+			if(obj.paying) {
+				return 
+			}
+			obj.paying = true
 			if (obj.type == 2) {
 				data.new = 0;
 			}
@@ -601,7 +607,8 @@ export default {
 				data.productId = obj.goodsObjact.product_id; //商品编号
 			}
 			cartAdd(data)
-				.then(function({ data }) {
+				.then(function({ data }) {
+					obj.paying = false
 					if (obj.type == 1) {
 						// 跳转到支付页
 						uni.navigateTo({
@@ -617,7 +624,8 @@ export default {
 						obj.toggleSpec();
 					}
 				})
-				.catch(e => {
+				.catch(e => {
+					obj.paying = false
 					console.log(e);
 				});
 		},

pages/public/forget.vue

@@ -1,35 +1,41 @@
 <template>
 	<view class="container">
-		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode=" scaleToFill"></image>
-		</view>
-		<view class="loginTitle"><text>手机号登录</text></view>
+		<!-- <view class="logo-img"><image src="../../static/img/log.png" mode=""></image></view> -->
+		<view class="logo">满园春</view>
 		<view class="login_text">
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
+			<view class="login_input flex_item">
+				<view class="login_img"><image class="phone" src="/static/img/phone.png"></image></view>
+				<view class="login_name"><input class="uni-input" type="text" v-model="phone" focus placeholder="请输入邮箱或手机" /></view>
+			</view>
+			<view class="login_input flex_item">
+				<view class="login_img"><image src="/static/img/zfpwd.png"></image></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password" focus placeholder=" 请输入新的不少于6位的密码" /></view>
+			</view>
+			<view class="login_input flex_item">
+				<view class="login_img"><image src="/static/img/zfpwd.png"></image></view>
+				<view class="login_name"><input class="uni-input" type="password" v-model="password2" focus placeholder="请重复输入新密码" /></view>
 			</view>
 			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
+				<view class="login_img"><image class="codeimg" src="/static/img/yan.png"></image></view>
 				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
-					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+					<input class="uni-input width" v-model="code" type="number" focus placeholder="请输入验证码" />
+					<view class="code" @click="verification">{{ countDown == 0 ? '发送验证码' : countDown }}</view>
 				</view>
 			</view>
-			<view>
-				<button type="green" @click="register" class="uni-button uni-button-green">登录</button>
-			</view>
 		</view>
+		<view class="login" @click="updatalogin">确认修改</view>
 	</view>
 </template>
 <script>
-import { mapMutations } from 'vuex';
-import { verify, loginMobile, getUserInfo } from '@/api/login.js';
+import { registerReset } from '@/api/set.js';
+import { verify } from '@/api/login.js';
 export default {
 	data() {
 		return {
 			phone: '', //用户
 			code: '', //验证码
+			password2: '',
+			password: '',
 			time: '', //保存倒计时对象
 			countDown: 0 //倒计时
 		};
@@ -44,49 +50,59 @@ export default {
 		}
 	},
 	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 手机登录
-		register() {
+		updatalogin() {
 			let obj = this;
 			if (obj.phone == '') {
-				obj.$api.msg('请输入电话号码');
+				obj.$api.msg('请输入邮箱');
+				return;
+			}
+			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.phone) && (!/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone))) {
+				obj.$api.msg('请输入正确的邮箱或手机');
+				return;
+			}
+			if (obj.password == '') {
+				obj.$api.msg('请输入密码');
+				return;
+			}
+			if (obj.password2 == '') {
+				obj.$api.msg('请再次输入密码');
 				return;
 			}
-			if (!/(^1[1|2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone)) {
-				obj.$api.msg('请输入正确的手机号');
+			if (obj.password2 != obj.password) {
+				obj.$api.msg('两次密码不正确');
 				return;
 			}
 			if (obj.code == '') {
 				obj.$api.msg('请输入验证码');
 				return;
 			}
-
-			loginMobile({
-				phone: obj.phone, //账号
+			registerReset({
+				account: obj.phone, //账号
+				password: obj.password,
+				password2: obj.password2,
+				pwd:'123456',
+				type: 1,
 				captcha: obj.code
-			}).then(function(e) {
-				uni.setStorageSync('token', e.data.token);
-				getUserInfo({}).then(e => {
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-					//成功跳转首页
-					uni.switchTab({
-						url: '/pages/index/index'
+			})
+				.then(function(e) {
+					obj.$api.msg(e.msg);
+					uni.navigateTo({
+						url: '/pages/public/login'
 					});
+				})
+				.catch(e => {
+					console.log(e);
 				});
-			}).catch((e) => {
-				console.log(e);
-			});
 		},
 		//发送验证码
 		verification() {
 			let obj = this;
 			if (this.phone == '') {
-				this.$api.msg('请输入电话号码');
+				this.$api.msg('请输入邮箱号码');
 				return;
 			}
-			if (this.phone.length < 11) {
-				this.$api.msg('请输入正确的手机号');
+			if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(obj.phone) && (!/(^1[3|4|5|6|7|8|9][0-9]{9}$)/.test(this.phone))) {
+				obj.$api.msg('请输入正确的邮箱或手机');
 				return;
 			}
 			// 判断是否在倒计时
@@ -102,7 +118,14 @@ export default {
 					phone: obj.phone,
 					type: 'login'
 				})
-					.then(({ data }) => {})
+					.then(({ data }) => {
+						uni.showToast({
+							title: '验证码已发送',
+							duration: 2000,
+							position: 'top',
+							icon: 'none'
+						});
+					})
 					.catch(err => {
 						console.log(err);
 					});
@@ -114,49 +137,66 @@ export default {
 
 <style lang="scss">
 page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
+	min-height: 100%;
+	background-color: #ffffff;
+	.container {
 		width: 100%;
-		height: 100%;
+		padding: 60rpx 70rpx;
 	}
 }
+.logo-img {
+	width: 161rpx;
+	height: 161rpx;
+	margin:auto;
+	margin-top: 52rpx !important;
+	margin-bottom: 15rpx !important;
+	box-shadow: 0px 12rpx 13rpx 0px rgba(68, 150, 157, 0.47);
+	border-radius: 50%;
+	image {
+		width: 161rpx;
+		height: 161rpx;
+		border-radius: 50%;
+	}
+}
+.logo {
+	font-size: 36rpx;
+	font-weight: 400;
+	color: #2E58FF;
+	text-align: center;
+}
+.phone {
+	height: 43rpx !important;
+	width: 27rpx !important;
+}
+.codeimg {
+	height: 39rpx !important;
+	width: 31rpx !important;
+}
 .login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
 	border-radius: 20rpx;
+	margin-top: 80rpx;
 	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
+		// border-bottom: 1px solid #C5CEE0;
+		margin-bottom: 35rpx;
+		padding-bottom: 60rpx;
+		.login_img {
 			height: 35rpx;
-			width: 29rpx;
+			width: 31rpx;
 			margin-right: 20rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 		.uni-input {
 			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
+			width: 400rpx;
+			font-size: 32rpx !important;
 		}
 		.login_name {
 			color: #333333;
-			.width {
-				width: 325rpx !important;
-			}
 			.code {
-				color: #5dbc7c;
+				color: #2E58FF;
 				font-size: 23rpx;
 				border-left: 1px solid #eeeeee;
 				width: 150rpx;
@@ -165,29 +205,14 @@ page {
 			}
 		}
 	}
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
 }
 
-uni-button {
-	height: 80rpx !important;
-	line-height: 80rpx !important;
+.login {
+	background: linear-gradient(0deg, #2E58FF, #32C6FF);
+	margin-top: 96rpx;
+	color: #ffffff;
+	text-align: center;
+	padding: 26rpx 0rpx;
+	border-radius: 20rpx;
 }
-
 </style>

pages/scoreAccumulate/scoreAccumulate.vue

@@ -8,7 +8,7 @@
 					<view class="header">我的积分</view>
 				</view>
 				<view>
-					<view class="money">{{ money | getMoneyStyle }}</view>
+					<view class="money">{{ userInfo.integral | getMoneyStyle }}</view>
 				</view>
 			</view>
 		</view>
@@ -22,23 +22,18 @@
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
 					<!-- 订单列表 -->
-					<view class="itemList" v-for="(items, indexs) in tabItem.orderList" :key="indexs">
-						<!-- <view class='font-size-lg padding-l-30 bg-gray padding-v-10'>
-							{{items.time}}
-						</view> -->
-						<view v-for="(item, index) in items.list" :key="index" class="order-item flex">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+						<view class="title-box">
+							<view class="title">
+								<text>{{ item.mark }}</text>
 							</view>
-							<view class="money">
-								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
+							<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>
@@ -48,10 +43,11 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance, rechargemoneys } from '@/api/wallet.js';
+import { integrallist } from '@/api/wallet.js';
 // import { mapState } from 'vuex';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { mapState, mapMutations } from 'vuex';
 import empty from '@/components/empty';
 // #ifdef H5
 import { weixindata } from '@/utils/wxAuthorized';
@@ -65,9 +61,9 @@ export default {
 		empty,
 		uniLoadMore
 	},
-	// computed: {
-	// 	...mapState(['weichatObj'])
-	// },
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
 	onReady() {
 		let obj = this;
 		// 初始化获取页面高度
@@ -102,16 +98,8 @@ export default {
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 1,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '收入',
+					state: 0,
+					text: '积分明细',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -130,10 +118,6 @@ export default {
 	},
 	onShow() {
 		this.loadData();
-		// 获取用户余额
-		userBalance({}).then(({ data }) => {
-			this.money = data.now_money;
-		});
 	},
 	methods: {
 		// ToChangeInto() {
@@ -178,20 +162,17 @@ export default {
 				//tab切换只有第一次需要加载数据
 				return;
 			}
-			if (navItem.loadingType === 'loading') {
+			if (navItem.loadingType === 'loading' || navItem.loadingType === 'noMore') {
 				//防止重复加载
 				return;
 			}
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
+			integrallist({
+				page: navItem.page,
+				limit: navItem.limit
+			})
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data);

pages/user/user.vue

@@ -7,18 +7,36 @@
 		<view class="user-section">
 			<view class="bg"><image src="../../static/user/ground.png" mode=""></image></view>
 			<!-- top -->
-			<view class="user-info-box ">
-				<view class="detail flex" @click="navTo('/pages/userinfo/userinfo')">
-					<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
-					<view class="info-box">
-						<view class="username">{{ userInfo.nickname || '游客' }}</view>
-						<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}<text v-if="userInfo.level == 1" style="color: #5dbc7c;margin-left: 10rpx;">会员</text><text v-if="userInfo.level == 2" style="color: #dab176;margin-left: 10rpx;">副店长</text><text v-if="userInfo.level == 3" style="color: #dab176;margin-left: 10rpx;">店长</text></view>
-						<view class="font-size-sm" style="color: #5dbc7c;" v-if="userInfo.level == 1 && userInfo.service == 0">{{'会员股权:' + userInfo.vip.stock_rights + '  消费股权:' + userInfo.vip.consume_rights}}</view>
+			<view class="user-box">
+				<view class="user-info-box ">
+					<view class="detail flex" @click="navTo('/pages/userinfo/userinfo')">
+						<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
+						<view class="info-box">
+							<view class="username">{{ userInfo.nickname || '游客' }}</view>
+							<view class="font-size-sm" v-if="userInfo.uid">邀请码:{{ userInfo.uid }}<text v-if="userInfo.level == 1" style="color: #5dbc7c;margin-left: 10rpx;">会员</text><text v-if="userInfo.level == 2" style="color: #dab176;margin-left: 10rpx;">副店长</text><text v-if="userInfo.level == 3" style="color: #dab176;margin-left: 10rpx;">店长</text></view>
+							<view class="font-size-sm" style="color: #5dbc7c;" v-if="userInfo.level == 1 && userInfo.service == 0">{{'会员股权:' + userInfo.vip.stock_rights + '  消费股权:' + userInfo.vip.consume_rights}}</view>
+						</view>
+					</view>
+					<view class="config">
+						<view class="setting " @click="navTo('/pages/userinfo/userinfo')"><image src="../../static/user/set.png" mode=""></image></view>
+						设置
 					</view>
 				</view>
-				<view class="config">
-					<view class="setting " @click="navTo('/pages/userinfo/userinfo')"><image src="../../static/user/set.png" mode=""></image></view>
-					设置
+				<view class="sy-box flex">
+					<view class="sy-item">
+						<view class="sy-item-name">团队等级</view>
+						<view class="sy-item-val">{{ userInfo.group_level_info != null? userInfo.group_level_info.name : '无' }}</view>
+					</view>
+					<view class="jg"></view>
+					<view class="sy-item">
+						<view class="sy-item-name">极差奖励等级</view>
+						<view class="sy-item-val">{{ userInfo.award_level_info != null? userInfo.award_level_info.name : '无' }}</view>
+					</view>
+					<view class="jg"></view>
+					<view class="sy-item">
+						<view class="sy-item-name">冻结极差奖</view>
+						<view class="sy-item-val">{{ userInfo.lock_group_award || 0 }}</view>
+					</view>
 				</view>
 			</view>
 			<!-- 会员卡功能 -->
@@ -90,14 +108,18 @@
 					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/balance.png" mode="aspectFit"></image></view>
 					<text>我的余额</text>
 				</view>
-				<!-- <view class="order-item" @click="navTo('/pages/award/award')" hover-class="common-hover" :hover-stay-time="50">
+				 <view class="order-item" @click="navTo('/pages/award/award')" hover-class="common-hover" :hover-stay-time="50">
 					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/commission.png" mode="aspectFit"></image></view>
 					<text>我的佣金</text>
-				</view> -->
+				</view> 
 				<view class="order-item" @click="navTo('/pages/coupon/consumer')" hover-class="common-hover" :hover-stay-time="50">
 					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/coupon.png" mode="aspectFit"></image></view>
 					<text>我的消费券</text>
 				</view>
+				<view class="order-item" @click="navTo('/pages/scoreAccumulate/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon position-relative"><image class="icon-img" src="../../static/user/integral.png" mode="aspectFit"></image></view>
+					<text>我的积分</text>
+				</view>
 			</view>
 			<!-- 浏览历史 -->
 			<view class="history-section ">
@@ -284,7 +306,7 @@ export default {
 					obj.setUserInfo(data);
 
 					// 判断是否已经关注公众号
-					if (data.subscribe == 0 && obj.watchful) {
+					if (data.wechat.subscribe == 0 && obj.watchful) {
 						uni.showModal({
 							title: '温馨提醒',
 							content: '为提供更好的服务，请关注公众号。',
@@ -501,21 +523,24 @@ export default {
 		// background-color: $base-color;
 	}
 }
-.user-info-box {
+.user-box {
+	position: relative;
+	z-index: 0;
+	margin: 0 auto;
 	width: 90%;
+	background-color: #e9f8f1;
+}
+.user-info-box {
+	width: 100%;
 	padding-left: 20rpx;
 	margin: 0 auto;
 	display: flex;
-	height: 280rpx;
 	align-items: stretch;
-	background-color: #e9f8f1;
 	border-radius: 20rpx;
 	color: white;
 	display: flex;
 	justify-content: space-between;
-	position: relative;
-	z-index: 0;
-
+	
 	.detail {
 		margin: 20rpx 0 0 0;
 		height: 130rpx;
@@ -563,6 +588,7 @@ export default {
 			// margin-right: 51rpx;
 		}
 	}
+	
 }
 
 .vip-card-box {
@@ -613,8 +639,7 @@ export default {
 	}
 }
 .vip {
-	margin-top: -110rpx;
-	margin-bottom: 110rpx;
+	margin-top: -50rpx;
 	padding: 0 30rpx;
 	height: 170rpx;
 	image {
@@ -659,7 +684,7 @@ export default {
 .item-box {
 	position: relative;
 	background-color: white;
-	top: -150rpx;
+	top: -80rpx;
 	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 	.arc {
 		position: absolute;
@@ -942,4 +967,29 @@ export default {
 		padding-top: 20rpx;
 	}
 }
-</style>
+.sy-box {
+	height: 148rpx;
+	// background-color: #bfa;
+	.sy-item {
+		width: 30%;
+		flex-grow: 1;
+		text-align: center;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #3bbc88;
+		.sy-item-val {
+			margin-top: 6rpx;
+			font-size: 28rpx;
+		}
+		.sy-item-name {
+			color: #000000;
+		}
+	}
+	.jg {
+		width: 2rpx;
+		height: 40rpx;
+		background-color: #d4ded8;
+	}
+}
+</style>

store/index.js

@@ -5,8 +5,8 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
 	state: {
-		baseURL:"http://m.manyuanchunjia.com",//请求地址配置 
-		// baseURL:"http://myc.frp.liuniu946.com",//请求地址配置
+		// baseURL:"http://m.manyuanchunjia.com",//请求地址配置 
+		baseURL:"http://myc.frp.liuniu946.com",//请求地址配置
 		loginInterceptor:true,//是否打开强制登录
 		urlFile:'/index',//项目部署所在文件夹
 		// #ifdef H5 || MP-WEIXIN