Merge branch 'master' of http://git.liuniu946.com/xuhaolan/paopaoShop

api/functionalUnit.js

@@ -64,3 +64,21 @@ export function signUser(data) {
 		data
 	});
 }
+
+//天天领红包-当天可领
+export function my_award(data) {
+	return request({
+		url: '/api/game/my_award',
+		method: 'get',
+		data
+	});
+}
+
+//天天领红包-领取红包
+export function get_award(data,id) {
+	return request({
+		url: '/api/game/get_award/' + id,
+		method: 'post',
+		data
+	});
+}

api/user.js

@@ -19,14 +19,29 @@ export function lookOneself(data){
 	})
 }
 
+//绑定上级
+export function spread(data) {
+	return request({
+		url:'/api/user/spread',
+		method: 'post',
+		data
+	})
+}
 
-
+//我的推广
+export function myspread(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'POST',
+		data
+	});
+}
 
 // 订单统计信息
 export function orderData(data) {
 	return request({
 		url: '/api/order/data',
-		method: 'get',
+		method: 'get',
 		data
 	});
 }
@@ -138,4 +153,31 @@ export function transfer(data) {
 		method: 'post',
 		data
 	})
+}
+
+//余额转账
+export function yuetransfer(data) {
+	return request({
+		url:'/api/yue/trade',
+		method: 'post',
+		data
+	})
 }
+
+//现金转账
+export function cashtransfer(data) {
+	return request({
+		url:'/api/cash/trade',
+		method: 'post',
+		data
+	})
+}
+
+// 我的分红积分
+export function share(data) {
+	return request({
+		url:'/api/game',
+		method: 'get',
+		data
+	})
+}

api/wallet.js

@@ -18,6 +18,14 @@ export function userBalance(data) {
 	});
 }
 
+export function wallet(data) {
+	return request({
+		url: '/api/wallet',
+		method: 'get',
+		data
+	});
+}
+
 // 提现
 export function extractCash(data) {
 	return request({
@@ -27,6 +35,15 @@ export function extractCash(data) {
 	});
 }
 
+// 提现
+export function exchangeCash(data) {
+	return request({
+		url: '/api/extract/brokerage',
+		method: 'post',
+		data
+	});
+}
+
 // 提现信息
 export function extractBank(data) {
 	return request({
@@ -98,5 +115,20 @@ export function balance(data) {
 	});
 }
 
+// 账户余额
+export function cashList(data) {
+	return request({
+		url: '/api/cash/list',
+		method: 'get',
+		data
+	});
+}
 
-
+//充值金额
+export function moneyChong(data){
+	return request({
+		url:'/api/recharge/index',
+		method:'get',
+		data
+	})
+}

js_sdk/xb-copy/uni-copy.js

@@ -0,0 +1,33 @@
+export default function uniCopy(content) {
+	/**
+	 * 小程序端 和 app端的复制逻辑
+	 */
+	//#ifndef H5
+	uni.setClipboardData({
+		data: content,
+		success: function() {
+			console.log('success');
+			return true
+		}
+	});
+	//#endif
+	
+	/**
+	 * H5端的复制逻辑
+	 */
+	// #ifdef H5
+	if (!document.queryCommandSupported('copy')) { //为了兼容有些浏览器 queryCommandSupported 的判断
+		// 不支持
+		return false
+	}
+	let textarea = document.createElement("textarea")
+	textarea.value = content
+	textarea.readOnly = "readOnly"
+	document.body.appendChild(textarea)
+	textarea.select() // 选择对象
+	textarea.setSelectionRange(0, content.length) //核心
+	let result = document.execCommand("copy") // 执行浏览器复制命令
+	textarea.remove()
+	return result
+	// #endif
+}

pages.json

@@ -21,7 +21,17 @@
 					}
 				}
 			}
-		}, {
+		},
+		{
+			"path": "pages/index/sign1",
+			"style": {
+				"navigationBarTitleText": "每日签到",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
 			"path": "pages/public/register",
 			"style": {
 				"navigationBarTitleText": "注册",
@@ -80,18 +90,25 @@
 		{
 			"path": "pages/user/jiedian",
 			"style": {
-				"navigationBarTitleText": "我的节点",
-				"app-plus": {
-					"titleNView": {
-						"type": false
-					}
-				}
+				"navigationBarTitleText": "我的节点"
+			}
+		},
+		{
+			"path": "pages/user/team",
+			"style": {
+				"navigationBarTitleText": "我的推广"
+			}
+		},
+		{
+			"path": "pages/user/cash",
+			"style": {
+				"navigationBarTitleText": "我的现金"
 			}
 		},
 		{
 			"path": "pages/money/withdmoenys",
 			"style": {
-				"navigationBarTitleText": "响亮积分转账"
+				"navigationBarTitleText": "转账"
 			}
 		},
 		{
@@ -253,6 +270,12 @@
 				"navigationBarTitleText": "绑定手机号"
 			}
 		},
+		{
+			"path": "pages/set/user",
+			"style": {
+				"navigationBarTitleText": "绑定上级"
+			}
+		},
 		{
 			"path": "pages/set/password",
 			"style": {
@@ -342,6 +365,12 @@
 			"style": {
 				"navigationBarTitleText": "响亮积分明细"
 			}
+		},
+		{
+			"path": "pages/user/mygx",
+			"style": {
+				"navigationBarTitleText": "我的贡献"
+			}
 		},
 		{
 			"path": "pages/order/order",

pages/cart/cart.vue

@@ -12,7 +12,16 @@
 				<view class="navigator" @click="navToLogin">去登陆></view>
 			</view>
 		</view>
-		<view v-else>
+		<view v-else>
+			<!-- 购物车头部 -->
+			<view class="cart-hand flex">
+				<view class="hand-tit">
+					购物车共 <text>{{ ' '+cartList.length}} 件</text>商品
+				</view>
+				<view class="hand-btn" @click="clearCart()">
+					清空购物车
+				</view>
+			</view>
 			<!-- 列表 -->
 			<view class="cart-list">
 				<block v-for="(item, index) in cartList" :key="item.id">
@@ -30,9 +39,9 @@
 						</view>
 						<view class="item-right">
 							<text class="clamp title">{{ item.productInfo.store_name }}</text>
-							<text class="attr">{{ item.attr_val }}</text>
+							<text class="attr">{{ item.productInfo.attrInfo.suk }}</text>
 							<text class="price">¥{{ item.productInfo.price }}</text>
-							<uni-number-box
+							<!-- <uni-number-box
 								class="step"
 								:min="1"
 								:max="item.productInfo.stock"
@@ -41,9 +50,14 @@
 								:isMin="item.cart_num === 1"
 								:index="index"
 								@eventChange="numberChange"
-							></uni-number-box>
+							></uni-number-box> -->
+							<view class="munbox flex" >
+								<image src="../../static/icon/reduce.png" mode="" @click="reduce(item,index)"></image>
+								<input type="number" :value="item.cart_num" disabled/>
+								<image src="../../static/icon/add.png" mode="" @click="add(item)"></image>
+							</view>
 						</view>
-						<text class="del-btn iconfont iconclose" @click="deleteCartItem(index)"></text>
+						<!-- <text class="del-btn iconfont iconclose" @click="deleteCartItem(index)"></text> -->
 					</view>
 				</block>
 			</view>
@@ -51,7 +65,7 @@
 			<view class="action-section">
 				<view class="checkbox">
 					<view class="iconfont iconroundcheckfill icon-checked-box" @click="check('all')" :class="{ 'icon-checked': allChecked }"></view>
-					<view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view>
+					<!-- <view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view> -->
 				</view>
 				<view class="total-box">
 					<text class="price">¥{{ total }}</text>
@@ -64,24 +78,21 @@
 				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
 			</view>
 		</view>
-		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 
-<script>
+<script>
+	import weixinObj from "@/plugin/jweixin-module/index.js";
 import { getCartList, getCartNum, cartDel } from '@/api/user.js';
 import { mapState } from 'vuex';
 import uniNumberBox from '@/components/uni-number-box.vue';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-import { tabbar } from '@/utils/tabbar.js';
 export default {
 	components: {
 		uniNumberBox
 	},
 	data() {
 		return {
-			tabbar: tabbar,
-			current: 3,
 			total: 0, //总价格
 			allChecked: false, //全选状态  true|false
 			empty: false, //空白页现实  true|false
@@ -92,7 +103,8 @@ export default {
 		// 只有登录时才加载数据
 		if (this.hasLogin) {
 			this.loadData();
-		}
+		}
+		weixinObj.hideAllNonBaseMenuItem();
 	},
 	watch: {
 		//显示空白页
@@ -106,7 +118,32 @@ export default {
 	computed: {
 		...mapState('user', ['hasLogin'])
 	},
-	methods: {
+	methods: {
+		reduce(item,index) {
+			if(item.cart_num == 1) {
+				uni.showModal({
+					content: '删除该商品？',
+					success: e => {
+						if (e.confirm) {
+							this.deleteCartItem(index)
+						}
+					}
+				});
+				
+			}else {
+				item.cart_num--
+				this.newNumberChange(item)
+			}
+		},
+		add(item) {
+			console.log(item)
+			if(item.productInfo.stock > item.cart_num) {
+				item.cart_num++
+				this.newNumberChange(item)
+			}else {
+				return 
+			}
+		},
 		//请求数据
 		async loadData() {
 			let obj = this;
@@ -179,6 +216,16 @@ export default {
 					console.log(e);
 				});
 			this.calcTotal();
+		},
+		newNumberChange(item) {
+			getCartNum({ id: item.id, number: item.cart_num })
+				.then(e => {
+					console.log(e);
+				})
+				.catch(function(e) {
+					console.log(e);
+				});
+			this.calcTotal();
 		},
 		//删除
 		deleteCartItem(index) {
@@ -275,20 +322,27 @@ export default {
 			font-size: $font-sm + 2rpx;
 			color: $font-color-disabled;
 			.navigator {
-				color: $uni-color-primary;
+				color: #f65067;
 				margin-left: 16rpx;
 			}
 		}
 	}
 }
 /* 购物车列表项 */
-.cart-item {
+.cart-item {
+	width: 710rpx;
+	height: 210rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 0px 10rpx 0rpx rgba(0, 0, 0, 0.1);
+	border-radius: 10rpx;
+	margin: 20rpx auto;
+	
 	display: flex;
 	position: relative;
-	padding: 30rpx 40rpx;
+	padding: 30rpx 26rpx 30rpx 80rpx;
 	.image-wrapper {
-		width: 230rpx;
-		height: 230rpx;
+		width: 150rpx;
+		height: 150rpx;
 		flex-shrink: 0;
 		position: relative;
 		image {
@@ -297,8 +351,11 @@ export default {
 	}
 	.checkbox {
 		position: absolute;
-		left: -16rpx;
-		top: -16rpx;
+		top: 0;
+		bottom: 0;
+		left: -65rpx;
+		margin: auto 0;
+		height: 50rpx;
 		z-index: 8;
 		font-size: 44rpx;
 		line-height: 1;
@@ -313,7 +370,23 @@ export default {
 		flex: 1;
 		overflow: hidden;
 		position: relative;
-		padding-left: 30rpx;
+		padding-left: 30rpx;
+		.munbox {
+			width: 144rpx;
+			height: 44rpx;
+			position: absolute;
+			bottom: 0;
+			right: 0;
+			input {
+				display: inline-block;
+				text-align: center;
+			}
+			image {
+				flex-shrink: 0;
+				width: 44rpx;
+				height: 44rpx;
+			}
+		}
 		.title,
 		.price {
 			font-size: $font-base + 2rpx;
@@ -325,14 +398,30 @@ export default {
 			font-size: $font-sm + 2rpx;
 			color: $font-color-light;
 			height: 50rpx;
-			line-height: 50rpx;
+			line-height: 50rpx;
+			
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
 		}
 		.price {
-			height: 50rpx;
-			line-height: 50rpx;
+			// height: 50rpx;
+			// line-height: 50rpx;
+			padding-top: 20rpx;
+			font-size: 34rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FF4C4C;
 		}
 		.step {
 			margin-top: 20rpx;
+		}
+		.title {
+			font-size: 34rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
 		}
 	}
 	.del-btn {
@@ -402,7 +491,8 @@ export default {
 		display: flex;
 		flex-direction: column;
 		text-align: right;
-		padding-right: 40rpx;
+		padding-right: 40rpx;
+		
 		.price {
 			font-size: $font-lg;
 			color: $font-color-dark;
@@ -429,5 +519,35 @@ export default {
 .action-section .checkbox.checked,
 .cart-item .checkbox.checked {
 	color: $base-color;
+}
+.cart-hand {
+	width: 750rpx;
+	height: 88rpx;
+	background: #FFFFFF;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	line-height: 88rpx;
+	padding-left: 28rpx;
+	padding-right: 26rpx;
+	.hand-tit {
+		text {
+			color: #FF4C4C;
+		}
+	
+	}
+	.hand-btn {
+		width: 164rpx;
+		height: 62rpx;
+		border: 2rpx solid #FF4C4C;
+		border-radius: 31rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FF4C4C;
+		line-height: 62rpx;
+		text-align: center;
+	}
 }
 </style>

pages/category/business.vue

@@ -1,39 +1,319 @@
 <template>
 	<view class="center">
-		<view class="kong">
+		<!-- <view class="search-top">
 			<view class="search flex">
-				<image src="../../static/index/index09.png" class="address"></image>
-				<!-- <view class="shop-name clamp" @click.stop="canChange == 0?nav('/pages/shoping/list'):''">{{ storeInfo.name }}</view> -->
 				<view class="shop-name clamp">椒江区</view>
-				<image class="shop-jt" src="../../static/index/index07.png" mode=""></image>
-				<view class="input-box flex" @click.stop="clickSearch">
+				<image class="shop-jt" src="../../static/icon/dsjh.png" mode=""></image>
+				<view class="input-box flex">
 					<view class=" input-content flex">
-						<view class="iconfont iconsearch"></view>
-						<view class="input"><input type="text" disabled value="输入关键字搜索" /></view>
+						<image src="../../static/icon/search-h.png" mode="" class="" style="width: 32rpx;height: 32rpx;">
+						</image>
+						<view class="input"><input type="text" value="输入关键字搜索" /></view>
 					</view>
 				</view>
+				<view class="search-tit" @click.stop="clickSearch">
+					搜索
+				</view>
 			</view>
-			<!-- <u-empty mode="data" text="敬请期待"></u-empty> -->
+			<view class="shop">
+				<view class="shop-title">
+					<view class="shop-item">
+						<view class="sitem-font">智能排序</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">位置距离</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">折扣优惠</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+					<view class="shop-item">
+						<view class="sitem-font">筛选</view>
+						<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<!-- <view class="jg" style="height: 180rpx;">
+			
+		</view>
+		<view class="shop">
+			<view class="shop-main flex" v-for="(item, index) in 100" :key="index">
+				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
+				<view class="main-right flex">
+					<view class="shopm-info">
+						<view class="shopm-title">
+							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
+							<view class="shopmt-good">荐</view>
+						</view>
+						<view class="address">椒江区市府大道200号</view>
+						<view class="shopmt-tip">消费最高可得10%积分</view>
+					</view>
+					<view class="right">
+						<view class="mright-top">
+							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+							<view class="mrt-font">距离0.3KM</view>
+						</view>
+						<view class="mright-bottom">
+							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
+							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view> -->
+		<view class="kong">
+			<u-empty mode="data" text="敬请期待"></u-empty>
 		</view>
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
 
 <script>
-import { tabbar } from '@/utils/tabbar.js';
-export default {
-	data() {
-		return {
-			tabbar: tabbar,
-			current: 1
-		};
-	}
-};
+	import {
+		tabbar
+	} from '@/utils/tabbar.js';
+	export default {
+		data() {
+			return {
+				tabbar: tabbar,
+				current: 1
+			};
+		},
+	};
 </script>
 
 <style lang="less">
-.kong {
-	height: 100vh;
-	width: 750rpx;
-}
+	.kong {
+		height: 100vh;
+	}
+	.search-top {
+		position: fixed;
+		top: 0;
+		z-index: 99;
+	}
+	.search {
+		justify-content: flex-start;
+		padding: 10rpx 32rpx 20rpx;
+		align-items: center;
+		background-color: #fff;
+
+		.address {
+			width: 32rpx;
+			height: 38rpx;
+		}
+
+		.shop-name {
+			height: 38rpx;
+			position: relative;
+			top: -4rpx;
+			z-index: 100;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666;
+			padding-left: 10rpx;
+		}
+
+		.shop-jt {
+			margin-left: 8rpx;
+			width: 16rpx;
+			height: 10rpx;
+		}
+
+		.input-box {
+			margin-left: 10rpx;
+			position: relative;
+			z-index: 99;
+			width: 520rpx;
+			height: 60rpx;
+			// background: rgba(255, 255, 255, 0.4);
+			border-radius: 30rpx;
+
+			.input-content {
+				position: relative;
+				z-index: 11;
+				// border-radius: 99rpx;
+				flex-grow: 1;
+				padding: 5rpx 30rpx;
+				background: #F6F6F6;
+
+				.iconsearch {
+					font-size: 50rpx;
+					color: #ffffff;
+				}
+
+				.input {
+					margin-left: 19rpx;
+					flex-grow: 1;
+					color: #666;
+					background: #F6F6F6;
+
+					input {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.input-button {
+				padding-left: 20rpx;
+				// font-size: $font-base;
+				height: 100%;
+			}
+		}
+
+		.search-tit {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #666666;
+			flex-shrink: 0;
+			padding-left: 10rpx;
+		}
+	}
+
+	.shop {
+		// margin-top: 20rpx;
+		background: #ffffff;
+		padding: 0 12rpx;
+
+		.shop-title {
+			padding: 30rpx 0 20rpx;
+			display: flex;
+			align-items: center;
+			border-bottom: 1px solid #e3e6e7;
+
+			.shop-item {
+				width: 25%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.sitem-font {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.jt-down {
+					width: 10rpx;
+					height: 8rpx;
+					margin-left: 12rpx;
+				}
+			}
+		}
+
+		.shop-main {
+			padding: 32rpx 18rpx 0 12rpx;
+			align-items: flex-start;
+			justify-content: flex-start;
+
+			.main-left {
+				width: 180rpx;
+				height: 180rpx;
+				border-radius: 10rpx;
+			}
+
+			.main-right {
+				width: 500rpx;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-left: 20rpx;
+				padding: 13rpx 0 35rpx;
+				border-bottom: 1px solid #eaeced;
+
+				.shopm-info {
+					max-width: 60%;
+					line-height: 1;
+
+					.shopm-title {
+						display: flex;
+						justify-content: flex-start;
+
+						.shopmt-font {
+							font-size: 34rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #333333;
+						}
+
+						.shopmt-good {
+							margin-left: 6rpx;
+							width: 30rpx;
+							height: 30rpx;
+							border: 1px solid #ff4c4c;
+							border-radius: 5rpx;
+							font-size: 20rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #ff4c4c;
+							text-align: center;
+							line-height: 30rpx;
+						}
+					}
+
+					.address {
+						margin-top: 16rpx;
+						font-size: 24rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+					}
+
+					.shopmt-tip {
+						position: relative;
+						margin-top: 52rpx;
+						padding: 8rpx;
+						background: #fcf3f0;
+						border-radius: 16rpx 16rpx 16rpx 0px;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ff440d;
+					}
+				}
+
+				.right {
+					height: 100%;
+					margin-top: 5rpx;
+					display: flex;
+					flex-direction: column;
+
+					.mright-top {
+						display: flex;
+						justify-content: flex-end;
+						align-items: center;
+
+						.mrt-image {
+							width: 20rpx;
+							height: 28rpx;
+						}
+
+						.mrt-font {
+							margin-left: 8rpx;
+							font-size: 22rpx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #666666;
+						}
+					}
+
+					.mright-bottom {
+						margin-top: 80rpx;
+						display: flex;
+						justify-content: flex-end;
+
+						.mrb-item {
+							width: 46rpx;
+							height: 46rpx;
+							margin-left: 14rpx;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>

pages/index/index.vue

@@ -35,9 +35,9 @@
 					<image class="nitem-image" src="../../static/index/index04.png" mode=""></image>
 					<view class="nitem-font">积分商城</view>
 				</view>
-				<view class="navbar-item" @click="navTo('')">
+				<view class="navbar-item" @click="navTo('/pages/product/list')">
 					<image class="nitem-image" src="../../static/index/index03.png" mode=""></image>
-					<view class="nitem-font">公益</view>
+					<view class="nitem-font">全部商品</view>
 				</view>
 				<view class="navbar-item" @click="navTo('/pages/user/shareQrCode')">
 					<image class="nitem-image" src="../../static/index/index02.png" mode=""></image>
@@ -53,7 +53,6 @@
 			<view class="product-title">
 				<image class="pt-image" src="../../static/index/index15.png" mode=""></image>
 				<view class="pt-title">会员礼包</view>
-				<view class="pt-tip">每日必买</view>
 			</view>
 			<view class="hotgoods">
 				<view class="hotgoods-item" v-for="item in bastList" :key="item.id" @click="navToDetailPage(item)">
@@ -89,29 +88,30 @@
 					<image class="jt-down" src="../../static/index/index06.png" mode=""></image>
 				</view>
 			</view>
-			<view class="shop-main flex" v-for="(item, index) in shoplist" :key="index">
-				<image class="main-left" src="../../static/index/index13.png" mode=""></image>
-				<view class="main-right flex">
-					<view class="shopm-info">
-						<view class="shopm-title">
-							<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
-							<view class="shopmt-good">荐</view>
-						</view>
-						<view class="address">椒江区市府大道200号</view>
-						<view class="shopmt-tip">消费最高可得10%积分</view>
-					</view>
-					<view class="right">
-						<view class="mright-top">
-							<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
-							<view class="mrt-font">距离0.3KM</view>
-						</view>
-						<view class="mright-bottom">
-							<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
-							<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
-						</view>
-					</view>
-				</view>
-			</view>
+			
+		</view>
+		<view class="shop-main flex" v-for="(item, index) in shoplist" :key="index">
+			<image class="main-left" src="../../static/index/index13.png" mode=""></image>
+			<view class="main-right flex">
+				<view class="shopm-info">
+					<view class="shopm-title">
+						<view class="shopmt-font clamp">李家烤肉11111111111111111111111111111111111111111111</view>
+						<view class="shopmt-good">荐</view>
+					</view>
+					<view class="address">椒江区市府大道200号</view>
+					<view class="shopmt-tip">消费最高可得10%积分</view>
+				</view>
+				<view class="right">
+					<view class="mright-top">
+						<image class="mrt-image" src="../../static/index/index10.png" mode=""></image>
+						<view class="mrt-font">距离0.3KM</view>
+					</view>
+					<view class="mright-bottom">
+						<image class="mrb-item" src="../../static/index/index14.png" mode=""></image>
+						<image class="mrb-item" src="../../static/index/index11.png" mode=""></image>
+					</view>
+				</view>
+			</view>
 		</view>
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
@@ -121,14 +121,14 @@
 import { lookSubpoints, lookOneself } from '../../api/user.js';
 import seckill from '../../components/seckill/seckill.vue';
 import { loadIndexs } from '@/api/index.js';
-import { getUserInfo } from '@/api/user.js';
+import { getUserInfo, spread } from '@/api/user.js';
 import { setCoupons } from '@/api/functionalUnit.js';
 import { getBargainList } from '@/api/product.js';
 import { interceptor } from '@/utils/loginUtils';
 import { mapState, mapMutations } from 'vuex';
 import { tabbar } from '@/utils/tabbar.js';
 // #ifdef H5
-import { weixindata } from '@/utils/wxAuthorized';
+import { weixindata, shareLoad } from '@/utils/wxAuthorized';
 // #endif
 export default {
 	components: {
@@ -152,21 +152,14 @@ export default {
 			shoplist: [], //商店列表
 			page: 1,
 			limit: 5,
-			actTime: new Date()
 		};
 	},
 	computed: {
-		...mapState(['loginInterceptor']),
+		...mapState(['loginInterceptor','baseURL']),
 		...mapState('user', ['hasLogin', 'userInfo'])
 	},
 	onLoad: function(option) {
 		this.getaddress();
-		// #ifndef MP
-		if (option.spread) {
-			// 存储其他邀请人
-			uni.setStorageSync('spread', option.spread);
-		}
-		// #endif
 		// #ifdef MP
 		if (option.scene) {
 			// 存储小程序邀请人
@@ -175,11 +168,14 @@ export default {
 				data: option.scene
 			});
 		}
-		// #endif
+		// #endif
+		// #ifdef H5
+		this.IndexShare();
+		//#endif
 	},
 	onShow: function() {
 		// 判断是否强制登录
-		if (this.loginInterceptor && !this.hasLogin) {
+		if (!this.hasLogin) {
 			// 登录拦截
 			interceptor();
 		}
@@ -217,7 +213,31 @@ export default {
 	},
 	// #endif
 	methods: {
-		...mapMutations(['setLat', 'setLon']),
+		...mapMutations(['setLat', 'setLon']),
+		// #ifdef H5
+		IndexShare() {
+			let obj = this;
+			let pages = getCurrentPages();
+			// 获取当前页面
+			let page = pages[pages.length - 1];
+			let path = '#/' + page.route + '?';
+			// 保存传值
+			for (let i in page.options) {
+				path += i + '=' + page.options[i] + '&';
+			}
+			console.log(obj.Path)
+			// 保存邀请人
+			path += 'spread=' + this.userInfo.uid;
+			let data = {
+				link: this.baseURL + '/index/' + path,
+				title: this.userInfo.nickname + '邀请您进入响亮商城',
+				desc:'欢迎加入响亮商城',
+				imgUrl: 'https://xl.liuniu946.com/index/static/img/logo.jpg'
+			};
+			console.log(data,'分享数据');
+			shareLoad(data);
+		},
+		// #endif
 		getaddress() {
 			console.log('dizhi+++++++++++');
 			let obj = this;
@@ -412,7 +432,7 @@ export default {
 		navToDetailPage(item) {
 			let id = item.id;
 			uni.navigateTo({
-				url: '/pages/product/product?id=' + id
+				url: '/pages/product/product?id=' + id + '&isVip=1'
 			});
 		},
 
@@ -686,7 +706,9 @@ export default {
 			}
 		}
 	}
-	.shop-main {
+	
+}
+.shop-main {
 		padding: 32rpx 18rpx 0 12rpx;
 		align-items: flex-start;
 		justify-content: flex-start;
@@ -736,7 +758,9 @@ export default {
 					color: #666666;
 				}
 				.shopmt-tip {
-					position: relative;
+					position: relative;
+					display: inline-block;
+					flex-grow: 0;
 					margin-top: 52rpx;
 					padding: 8rpx;
 					background: #fcf3f0;
@@ -781,5 +805,4 @@ export default {
 			}
 		}
 	}
-}
 </style>

pages/index/sign.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class="title-tip"><text>共获得{{sum_integral}}积分,总签到{{allSign}}天</text></view>
 		</view>
-		<calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" checksIcon="/static/img/img07.png"></calendar>
+		<!-- <calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" checksIcon="/static/img/img07.png"></calendar> -->
 	</view>
 </template>
 

pages/index/sign1.vue

@@ -0,0 +1,187 @@
+<template>
+	<view center>
+		<view class="title">天天领现金</view>
+		<view class="main after" v-if="signTrue">
+			<image class="main-bg" src="../../static/img/money-ok.png" mode=""></image>
+			<view class="num">{{ day_integral }}</view>
+		</view>
+		<view class="main before" v-if="!signTrue">
+			<image class="main-bg" src="../../static/img/money-bg.png" mode=""></image>
+			<view class="btn" :class="{ current: is_have }" @click="integral()">立即领取</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-num">{{ sum_integral }}</view>
+				<view class="info-font">获得金额</view>
+			</view>
+			<view class="info-item">
+				<view class="info-num">{{ allSign }}</view>
+				<view class="info-font">公益池金额</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import calendar from '../../components/ss-calendar/ss-calendar.vue';
+import { signList, integral, signUser, my_award, get_award } from '@/api/functionalUnit.js';
+export default {
+	components: {
+		calendar
+	},
+	data() {
+		return {
+			money: '', //保存当前月份
+			year: '', //保存当前年份
+			day: '', //保存当前日期
+			signList: [], //签到日子列表
+			actionDay: 0, //连续签到天数
+			allSign: 0, //累计签到
+			sum_integral: 0, //累计获得积分
+			day_integral: '', //今天签到的钱
+			signTrue: false,
+			is_have: true, //是否可领
+			id: ''
+		};
+	},
+	onLoad() {
+		this.signUser();
+		this.getData();
+	},
+	methods: {
+		// 获取当前时间
+		getData(current) {
+			const date = current ? new Date(current) : new Date();
+			this.year = date.getFullYear(); //保存当前年份
+			this.month = date.getMonth() + 1; //保存当前月份
+			this.day = date.getDate(); //保存当前日期
+		},
+		//获取签到用户信息
+		signUser() {
+			my_award().then(data => {
+				console.log(data);
+				this.sum_integral = data.data.all_get;
+				this.allSign = data.data.all_out;
+				if (data.data.todayAward != null) {
+					this.day_integral = data.data.todayAward.award; //今天获取的金额
+					this.id = data.data.todayAward.id;
+					this.is_have = false;
+				}
+				console.log(this.is_have);
+			});
+		},
+		// 签到
+		integral() {
+			if(is_have){
+				return
+			}
+			console.log(111);
+			get_award({}, this.id)
+				.then(e => {
+					console.log(e);
+					// 改为已签到
+					this.signTrue = true;
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.center {
+	height: auto;
+	min-height: 100%;
+	background: #ffdfd4;
+}
+.title {
+	padding-top: 66rpx;
+	text-align: center;
+	font-size: 94rpx;
+	font-family: SourceHanSansCN;
+	font-weight: bold;
+	color: #c85138;
+}
+.after {
+	padding-top: 230rpx;
+}
+.before {
+	padding-top: 590rpx;
+}
+.current {
+	color: #FFFFFF !important;
+	background: #989898 !important;
+}
+.main {
+	width: 750rpx;
+	height: 926rpx;
+	position: relative;
+	.main-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 926rpx;
+	}
+	.num {
+		line-height: 1;
+		text-align: center;
+		font-size: 122rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #eb2749;
+		opacity: 0.9;
+	}
+	.btn {
+		position: relative;
+		margin: 0 auto;
+		z-index: 10;
+		width: 420rpx;
+		height: 76rpx;
+		background: linear-gradient(180deg, #fce9a8 0%, #fecd75 100%);
+		box-shadow: 0px 16rpx 16rpx 0px rgba(159, 20, 63, 0.3), 0px 2rpx 6rpx 0px #fef5d3;
+		border-radius: 38rpx;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #cb0908;
+		line-height: 76rpx;
+		text-align: center;
+	}
+}
+.info-box {
+	margin: 24rpx auto 0;
+	padding: 22rpx 0;
+	width: 640rpx;
+	height: 160rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		border-right: 1px solid #efefef;
+		line-height: 1;
+		.info-num {
+			font-size: 50rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+		.info-font {
+			margin-top: 20rpx;
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			opacity: 0.6;
+		}
+	}
+}
+</style>

pages/money/pay.vue

@@ -1,32 +1,40 @@
-<template>
-	<view class="app">
-		<view class="price-box">
-			<text>支付金额</text>
-			<text class="price">{{ money }}</text>
-		</view>
-		<view class="pay-type-list">
-			<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>
-			<!-- #ifdef APP-PLUS -->
-			<view class="type-item b-b" @click="changePayType(2)">
-				<text class="icon iconfont iconzhifubao"></text>
-				<view class="con"><text class="tit">支付宝支付</text></view>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
-			</view>
-			<!-- #endif -->
-			<view class="type-item" @click="changePayType(3)">
-				<text class="icon iconfont iconyue"></text>
-				<view class="con">
-					<text class="tit">余额支付</text>
-					<text>可用余额 ¥{{ now_money }}</text>
-				</view>
-				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
+<template>
+	<view class="app">
+		<view class="price-box">
+			<text>支付金额</text>
+			<text class="price">{{ money }}</text>
+		</view>
+		<view class="pay-type-list">
+			<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>
+			<!-- #ifdef APP-PLUS -->
+			<view class="type-item b-b" @click="changePayType(2)">
+				<text class="icon iconfont iconzhifubao"></text>
+				<view class="con"><text class="tit">支付宝支付</text></view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
+			</view>
+			<!-- #endif -->
+			<view class="type-item" @click="changePayType(3)">
+				<text class="icon iconfont iconyue"></text>
+				<view class="con">
+					<text class="tit">余额支付</text>
+					<text>可用余额 ¥{{ now_money }}</text>
+				</view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
+			</view>
+			<view class="type-item" @click="changePayType(5)">
+				<image class="cash-icon" src="../../static/icon/mygx.png" mode=""></image>
+				<view class="con">
+					<text class="tit">现金支付</text>
+					<text>可用现金 {{ userInfo.cash }}</text>
+				</view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 5"></radio></label>
 			</view>
 			<view class="type-item" @click="changePayType(4)" v-if="isP == 1">
 				<text class="icon iconfont iconyue"></text>
@@ -35,82 +43,82 @@
 					<text>可用余额 {{ userInfo.pink_integral }}</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 4"></radio></label>
-			</view>
-		</view>
-		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
-	</view>
-</template>
-
-<script>
-import { balance } from '@/api/wallet.js';
-import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
-import { mapState,mapMutations } from 'vuex';
+			</view>
+		</view>
+		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
+	</view>
+</template>
+
+<script>
+import { balance } from '@/api/wallet.js';
+import { createOrderkey, computedOrderkey, orderPay } from '@/api/order.js';
+import { mapState, mapMutations } from 'vuex';
 import { orderData, userinfo } from '@/api/user.js';
 // #ifdef H5
 import weixinObj from '@/plugin/jweixin-module/index.js';
-// #endif
-export default {
-	data() {
-		return {
-			payType: 1, //支付类型
-			// #ifdef H5
-			payName: 'weixin',
-			// #endif
-			// #ifdef MP-WEIXIN
-			payName: 'weixin',
-			// #endif
-			orderInfo: {},
-			money: 0.0, //订单金额
-			now_money: 0.0, //余额
-			orderKey: '',
-			orderId: '', //保存订单id
-			payLoding: false, //判断是否支付中
-			type: '', //判断是否从订单中进入
-			// #ifdef H5
-			froms: '', //保存h5中数据来源对象
-			// #endif
-			pinkid: '' ,//保存拼团商品id
-			isP: 0,
-		};
-	},
-	computed: {
-		// #ifdef H5
+// #endif
+export default {
+	data() {
+		return {
+			payType: 1, //支付类型
+			// #ifdef H5
+			payName: 'weixin',
+			// #endif
+			// #ifdef MP-WEIXIN
+			payName: 'weixin',
+			// #endif
+			orderInfo: {},
+			money: 0.0, //订单金额
+			now_money: 0.0, //余额
+			orderKey: '',
+			orderId: '', //保存订单id
+			payLoding: false, //判断是否支付中
+			type: '', //判断是否从订单中进入
+			// #ifdef H5
+			froms: '', //保存h5中数据来源对象
+			// #endif
+			pinkid: '', //保存拼团商品id
+			isP: 0
+		};
+	},
+	computed: {
+		// #ifdef H5
 		...mapState(['weichatObj']),
-		...mapState('user',['userInfo'])
-		// #endif
-	},
+		...mapState('user', ['userInfo'])
+		// #endif
+	},
 	onLoad(options) {
-		if(options.isP) {
-			this.isP = options.isP
-		}
-		if (options.type == 1) {
-			this.type = 1;
-			this.orderId = options.ordid;
-			this.money = options.money;
-		} else {
-			this.orderKey = options.key;
-			let prepage = this.$api.prePage();
-			computedOrderkey({
-				orderkey: this.orderKey,
-				couponId: prepage.couponChecked.id, //优惠券编号
-				addressId: prepage.addressData.id, //地址编号
-				useIntegral: prepage.checkedPoints ? 1 : 0
-			}).then(({ data }) => {
-				// 获取支付金额
-				this.money = data.result.pay_price;
-			});
+		if (options.isP) {
+			this.isP = options.isP;
+		}
+		if (options.type == 1) {
+			this.type = 1;
+			this.orderId = options.ordid;
+			this.money = options.money;
+		} else {
+			this.orderKey = options.key;
+			let prepage = this.$api.prePage();
+			computedOrderkey({
+				orderkey: this.orderKey,
+				couponId: prepage.couponChecked.id, //优惠券编号
+				addressId: prepage.addressData.id, //地址编号
+				useIntegral: prepage.checkedPoints ? 1 : 0
+			}).then(({ data }) => {
+				// 获取支付金额
+				this.money = data.result.pay_price;
+			});
 		}
-		this.getUserInfo()
-		// 保存pinkid
-		if (options.pinkid) {
-			this.pinkid = options.pinkid;
-		}
-		// 载入余额
-		balance({}).then(({ data }) => {
-			// 获取余额
-			this.now_money = data.now_money;
-		});
-	},
+		this.getUserInfo();
+		// 保存pinkid
+		if (options.pinkid) {
+			this.pinkid = options.pinkid;
+		}
+		// 载入余额
+		balance({}).then(({ data }) => {
+			// 获取余额
+			this.now_money = data.now_money;
+		});
+	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		getUserInfo() {
@@ -121,47 +129,50 @@ export default {
 				.catch(e => {
 					console.log(e);
 				});
-		},
-		//选择支付方式
-		changePayType(type) {
-			this.payType = type;
-			if (this.payType == 1) {
-				this.payName = 'weixin';
-			}
-			if (this.payType == 2) {
-				this.payName = 'ali';
-			}
-			if (this.payType == 3) {
-				this.payName = 'yue';
+		},
+		//选择支付方式
+		changePayType(type) {
+			this.payType = type;
+			if (this.payType == 1) {
+				this.payName = 'weixin';
+			}
+			if (this.payType == 2) {
+				this.payName = 'ali';
 			}
-			if(this.payType == 4) {
+			if (this.payType == 3) {
+				this.payName = 'yue';
+			}
+			if (this.payType == 4) {
 				this.payName = 'pink_integral';
-			}
-		},
-		// 支付金额
-		orderMoneyPay() {
-			let obj = this;
-			orderPay({
-				uni: obj.orderId,
-				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
-				// #endif
-				// #ifdef MP-WEIXIN
-				from: 'routine', //来源
-				// #endif
-				// #ifdef APP-PLUS
-				from: 'app', //来源
-				// #endif
-				paytype: obj.payName //支付类型  weixin-微信 yue-余额
-			})
-				.then(e => {
-					// 判断是否为余额支付
-					if (obj.payName == 'yue' && e.data.status == 'SUCCESS') {
-						if (e.status == 200) {
-							obj.paySuccessTo();
-						} else {
-							obj.$api.msg(msg);
-						}
+			}
+			if (this.payType == 5) {
+				this.payName = 'cash';
+			}
+		},
+		// 支付金额
+		orderMoneyPay() {
+			let obj = this;
+			orderPay({
+				uni: obj.orderId,
+				// #ifdef H5
+				from: obj.froms ? 'weixin' : 'H5', //来源
+				// #endif
+				// #ifdef MP-WEIXIN
+				from: 'routine', //来源
+				// #endif
+				// #ifdef APP-PLUS
+				from: 'app', //来源
+				// #endif
+				paytype: obj.payName //支付类型  weixin-微信 yue-余额
+			})
+				.then(e => {
+					// 判断是否为余额支付
+					if (obj.payName == 'yue' && e.data.status == 'SUCCESS') {
+						if (e.status == 200) {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+						}
 					}
 					if (obj.payName == 'pink_integral' && e.data.status == 'SUCCESS') {
 						if (e.status == 200) {
@@ -169,78 +180,98 @@ export default {
 						} else {
 							obj.$api.msg(msg);
 						}
-					}
-					if (obj.payName == 'weixin' || obj.payName == 'routine') {
-						let da = e.data.result.jsConfig;
-						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) {
-								obj.paySuccessTo();
-							},
-							fail: () => {
-								uni.navigateTo({
-									url: '/pages/order/order?state=0'
-								});
-							}
-						};
-						// #ifdef H5
-						if(obj.payName == 'weixin'){
-						weixinObj.chooseWXPay(data);
-						}
-						// #endif
-						// #ifdef MP-WEIXIN
-						if(obj.payName == 'routine'){
-							wx.requestPayment(data);
-						}
-						// #endif
-					}
-					uni.hideLoading();
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					// 支付完成
-					uni.hideLoading();
-					obj.payLoding = false;
-					console.log(e);
-				});
-		},
-		// 支付成功跳转
-		paySuccessTo() {
-			uni.hideLoading();
-			uni.redirectTo({
-				url: '/pages/money/paySuccess?orderid=' + this.orderId
-			});
-		},
-		//确认支付
-		confirm: async function() {
-			let obj = this;
-			uni.showLoading({
-				title: '支付中',
-				mask: true
-			})
-			// 判断是否余额不足
-			if (obj.payName == 'pink_integral' && +obj.userInfo.pink_integral < obj.money) {
-				uni.showModal({
-					title: '提示',
-					content: '拼团积分不足！',
-					showCancel: false,
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
+					}
+					if (obj.payName == 'cash' && e.data.status == 'SUCCESS') {
+						if (e.status == 200) {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+						}
+					}
+					if (obj.payName == 'weixin' || obj.payName == 'routine') {
+						let da = e.data.result.jsConfig;
+						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) {
+								obj.paySuccessTo();
+							},
+							fail: () => {
+								uni.navigateTo({
+									url: '/pages/order/order?state=0'
+								});
+							}
+						};
+						// #ifdef H5
+						if (obj.payName == 'weixin') {
+							weixinObj.chooseWXPay(data);
+						}
+						// #endif
+						// #ifdef MP-WEIXIN
+						if (obj.payName == 'routine') {
+							wx.requestPayment(data);
+						}
+						// #endif
+					}
+					uni.hideLoading();
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					// 支付完成
+					uni.hideLoading();
+					obj.payLoding = false;
+					console.log(e);
+				});
+		},
+		// 支付成功跳转
+		paySuccessTo() {
+			uni.hideLoading();
+			uni.redirectTo({
+				url: '/pages/money/paySuccess?orderid=' + this.orderId
+			});
+		},
+		//确认支付
+		confirm: async function() {
+			let obj = this;
+			uni.showLoading({
+				title: '支付中',
+				mask: true
+			});
+			// 判断是否拼团积分不足
+			if (obj.payName == 'pink_integral' && +obj.userInfo.pink_integral < obj.money) {
+				uni.showModal({
+					title: '提示',
+					content: '拼团积分不足！',
+					showCancel: false,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
 				});
-				uni.hideLoading()
-				return;
+				uni.hideLoading();
+				return;
 			}
 			// 判断是否拼团积分不足
+			if (obj.payName == 'cash' && +obj.userInfo.cash < obj.money) {
+				uni.showModal({
+					title: '提示',
+					content: '现金不足！',
+					showCancel: false,
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+				uni.hideLoading();
+				return;
+			}
+			// 判断是否余额不足
 			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
 				uni.showModal({
 					title: '提示',
@@ -250,173 +281,183 @@ export default {
 					fail: () => {},
 					complete: () => {}
 				});
-				uni.hideLoading()
+				uni.hideLoading();
 				return;
-			}
-			// 支付中
-			obj.payLoding = true;
-			// #ifdef H5
-			// 获取当前是否为微信浏览器
-			obj.froms = uni.getStorageSync('weichatBrowser') || '';
-			// #endif
-			// 判断是否为未支付订单中跳转进入
-			if (obj.type != 1) {
-				// 初次生成订单
-				obj.firstCreateOrder();
-			} else {
-				// 已经生成订单未支付
-				obj.orderMoneyPay();
-			}
-		},
-		// 初次订单创建
-		firstCreateOrder() {
-			let obj = this;
-			// 获取下单页面数据
-			let prepage = obj.$api.prePage();
-
-			let data = {
-				real_name: prepage.addressData.real_name, //联系人名称
-				phone: prepage.addressData.phone, //联系人号码
-				couponId: prepage.couponChecked.id, //优惠券编号
-				addressId: prepage.addressData.id, //支付地址id
-				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
-				payType: obj.payName, //支付类型  weixin-微信 yue-余额
-				mark: prepage.desc, //备注
-				// #ifdef H5
-				from: obj.froms ? 'weixin' : 'H5', //来源
-				// #endif
-				// #ifdef MP-WEIXIN
-				from: 'routine', //来源
-				// #endif
-				// #ifdef APP-PLUS
-				from: 'app', //来源
-				// #endif
-				shipping_type: 1 //提货方式 1 快递 2自提
-			};
-			// 判断是否拼团商品
-			if (obj.pinkid) {
-				data.pinkId = obj.pinkid;
-			}
-			// 生成订单
-			createOrderkey(data, obj.orderKey)
-				.then(({ data, status, msg }) => {
-					// 判断是否支付失败
-					if (data.status == 'ORDER_EXIST') {
-						uni.showModal({
-							title: '提示',
-							content: msg,
-							showCancel: false
-						});
-						uni.hideLoading();
-						obj.payLoding = false;
-						return;
-					}
-					// 保存订单号
-					obj.orderId = data.result.orderId;
-					// 判断是否为余额支付
-					if (obj.payName == 'yue') {
-						if (status == 200 && data.status == 'SUCCESS') {
-							obj.paySuccessTo();
-						} else {
-							obj.$api.msg(msg);
-						}
-					} else {
-						// 立即支付
-						obj.orderMoneyPay();
-					}
-				})
-				.catch(e => {
-					uni.hideLoading();
-					obj.payLoding = false;
-					console.log(e);
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.app {
-	width: 100%;
-}
-
-.price-box {
-	background-color: #fff;
-	height: 265upx;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	font-size: 28upx;
-	color: #909399;
-
-	.price {
-		font-size: 50upx;
-		color: #303133;
-		margin-top: 12upx;
-		&:before {
-			content: '￥';
-			font-size: 40upx;
-		}
-	}
-}
-
-.pay-type-list {
-	margin-top: 20upx;
-	background-color: #fff;
-	padding-left: 60upx;
-	.type-item {
-		height: 120upx;
-		padding: 20upx 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding-right: 60upx;
-		font-size: 30upx;
-		position: relative;
-	}
-
-	.icon {
-		width: 100upx;
-		font-size: 52upx;
-	}
-	.iconyue {
-		color: #fe8e2e;
-	}
-	.iconweixin {
-		color: #36cb59;
-	}
-	.iconzhifubao {
-		color: #01aaef;
-	}
-	.tit {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		margin-bottom: 4upx;
-	}
-	.con {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		font-size: $font-sm;
-		color: $font-color-light;
-	}
-}
-.mix-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 630upx;
-	height: 80upx;
-	margin: 80upx auto 30upx;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	/* box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4); */
-}
-
-.clickbg {
-	background-color: $color-gray !important;
-}
+			}
+			// 支付中
+			obj.payLoding = true;
+			// #ifdef H5
+			// 获取当前是否为微信浏览器
+			obj.froms = uni.getStorageSync('weichatBrowser') || '';
+			// #endif
+			// 判断是否为未支付订单中跳转进入
+			if (obj.type != 1) {
+				// 初次生成订单
+				obj.firstCreateOrder();
+			} else {
+				// 已经生成订单未支付
+				obj.orderMoneyPay();
+			}
+		},
+		// 初次订单创建
+		firstCreateOrder() {
+			let obj = this;
+			// 获取下单页面数据
+			let prepage = obj.$api.prePage();
+
+			let data = {
+				real_name: prepage.addressData.real_name, //联系人名称
+				phone: prepage.addressData.phone, //联系人号码
+				couponId: prepage.couponChecked.id, //优惠券编号
+				addressId: prepage.addressData.id, //支付地址id
+				useIntegral: prepage.checkedPoints ? 1 : 0, //是否积分抵扣1为是0为否
+				payType: obj.payName, //支付类型  weixin-微信 yue-余额
+				mark: prepage.desc, //备注
+				// #ifdef H5
+				from: obj.froms ? 'weixin' : 'H5', //来源
+				// #endif
+				// #ifdef MP-WEIXIN
+				from: 'routine', //来源
+				// #endif
+				// #ifdef APP-PLUS
+				from: 'app', //来源
+				// #endif
+				shipping_type: 1 //提货方式 1 快递 2自提
+			};
+			// 判断是否拼团商品
+			if (obj.pinkid) {
+				data.pinkId = obj.pinkid;
+			}
+			// 生成订单
+			createOrderkey(data, obj.orderKey)
+				.then(({ data, status, msg }) => {
+					// 判断是否支付失败
+					if (data.status == 'ORDER_EXIST') {
+						uni.showModal({
+							title: '提示',
+							content: msg,
+							showCancel: false
+						});
+						uni.hideLoading();
+						obj.payLoding = false;
+						return;
+					}
+					// 保存订单号
+					obj.orderId = data.result.orderId;
+					// 判断是否为余额支付
+					if (obj.payName == 'yue') {
+						if (status == 200 && data.status == 'SUCCESS') {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+						}
+					} else if (obj.payName == 'cash') {
+						if (status == 200 && data.status == 'SUCCESS') {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+						}
+					} else {
+						// 立即支付
+						obj.orderMoneyPay();
+					}
+				})
+				.catch(e => {
+					uni.hideLoading();
+					obj.payLoding = false;
+					console.log(e);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.app {
+	width: 100%;
+}
+
+.price-box {
+	background-color: #fff;
+	height: 265upx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	font-size: 28upx;
+	color: #909399;
+
+	.price {
+		font-size: 50upx;
+		color: #303133;
+		margin-top: 12upx;
+		&:before {
+			content: '￥';
+			font-size: 40upx;
+		}
+	}
+}
+
+.pay-type-list {
+	margin-top: 20upx;
+	background-color: #fff;
+	padding-left: 60upx;
+	.type-item {
+		height: 120upx;
+		padding: 20upx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-right: 60upx;
+		font-size: 30upx;
+		position: relative;
+	}
+	.cash-icon {
+		width: 100rpx;
+		height: 52rpx;
+		padding-right: 50rpx;
+	}
+	.icon {
+		width: 100upx;
+		font-size: 52upx;
+	}
+	.iconyue {
+		color: #fe8e2e;
+	}
+	.iconweixin {
+		color: #36cb59;
+	}
+	.iconzhifubao {
+		color: #01aaef;
+	}
+	.tit {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		margin-bottom: 4upx;
+	}
+	.con {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+}
+.mix-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 630upx;
+	height: 80upx;
+	margin: 80upx auto 30upx;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	/* box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4); */
+}
+
+.clickbg {
+	background-color: $color-gray !important;
+}
 </style>

pages/money/paySuccess.vue

@@ -1,65 +1,84 @@
 <template>
 	<view class="content">
-		<text class="success-icon iconfont iconroundcheck"></text>
-		<text class="tit">支付成功</text>
+		<image class="success-icon" src="../../static/img/paySuccess.png" mode=""></image>
+		<text class="tit">订单支付成功</text>
 		<view class="btn-group">
-			<navigator :url="'/pages/order/orderDetail?id='+orderId" open-type="redirect" class="mix-btn">查看订单</navigator>
+			<navigator url="/pages/order/order?state=1" open-type="redirect" class="mix-btn">查看订单</navigator>
 			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				orderId:''
-			}
-		},
-		onLoad(opt) {
-			// 保存订单号
-			this.orderId = opt.orderid;
-		},
-		methods: {
-			
-		}
-	}
+export default {
+	data() {
+		return {
+			type: 2 //1为兑换支付成功2为预购成功
+		};
+	},
+	onLoad(opt) {
+		// 保存订单号
+	// 	if ('type' in opt) {
+	// 		this.type = opt.type;
+	// 	}
+	// 	if (this.type == 1) {
+	// 		uni.setNavigationBarTitle({
+	// 			title: '兑换成功'
+	// 		});
+	// 	}
+	// 	if (this.type == 2) {
+	// 		uni.setNavigationBarTitle({
+	// 			title: '预约成功'
+	// 		});
+	// 	}
+	},
+	methods: {}
+};
 </script>
 
-<style lang='scss'>
-	.content{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-	}
-	.success-icon{
-		font-size: 160upx;
-		color: #5dbc7c;
-		margin-top: 100upx;
-	}
-	.tit{
-		font-size: 38upx;
-		color: #303133;
-	}
-	.btn-group{
-		padding-top: 100upx;
-	}
-	.mix-btn {
-		margin-top: 30upx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 600upx;
-		height: 80upx;
-		font-size: $font-lg;
-		color: #fff;
-		background-color: $base-color;
-		border-radius: 10upx;
-		&.hollow{
-			background: #fff;
-			color: #303133;
-			border: 1px solid #ccc;
-		}
+<style lang="scss">
+.content {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.success-icon {
+	margin-top: 100rpx;
+	width: 302rpx;
+	height: 320rpx;
+}
+.tit {
+	margin-top: 40rpx;
+	font-size: 32rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+.btn-group {
+	padding-top: 130rpx;
+	display: flex;
+	justify-content: flex-start;
+}
+.mix-btn {
+	margin-top: 30upx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 301rpx;
+	height: 78rpx;
+	background: #EF0E74;
+	border-radius: 10rpx;
+	font-size: $font-lg;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	&.hollow {
+		margin-left: 36rpx;
+		background: #fff;
+		color: #EF0E74;
+		border: 1px solid #EF0E74;
 	}
+}
 </style>

pages/money/recharge.vue

@@ -1,267 +1,485 @@
-<template>
-	<view class="content">
-		<view class="row-box">
-			<view class="title">充值金额</view>
-			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="placeholder" />
-			</view>
-		</view>
-
-		<view class="list">
-			<radio-group @change="tabRadio">
-				<!-- #ifdef APP-PLUS -->
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title"><text>支付宝充值</text></view>
-						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>微信充值</text></view>
-							<view class="node"><text>真实姓名(代勇明)</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color=" #5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label>
-				<!-- #endif -->
-			</radio-group>
-		</view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">确认充值</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-// #ifdef H5
-import { rechargeWechat } from '@/api/wallet.js';
-// #endif
-// #ifdef MP
-import { rechargeRoutine } from '@/api/wallet.js';
-// #endif
-import { mapState } from 'vuex';
+<template>
+	<view class="content">
+		<view class="top_box">
+			<text class="yue-tit">当前余额：</text>
+			<text class="yue-num">￥{{ now_money | parseFloatNum }}</text>
+		</view>
+
+		<view class="line_box"></view>
+
+		<view class="cz_box">
+			<view class="cz_wrap">
+				<text class="cz_tit">￥</text>
+				<input class="cz_input" type="number" v-model="money" @focus="changeNum()" placeholder="请输入充值金额" placeholder-class="placeholder" />
+			</view>
+			<view class="zc_list_box">
+				<view class="zc_list_price" :class="{ seletPrice: seletNum == item.price }" @click="seletChange(item, index)" v-for="(item, index) in list" :key="index">
+					{{ item.price | parseFloatNum }}元
+				</view>
+			</view>
+		</view>
+		<!-- <view class="line_box"></view> -->
+
+		<!-- <view class="row-box">
+			<view class="title">充值金额</view>
+			<view class="row">
+				<text class="tit">￥</text>
+				<input class="input" type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="placeholder" />
+			</view>
+		</view> -->
+
+		<!-- <view class="rechar-box">
+			<view class="rechar-title">注意事项</view>
+			<view class="rechar-text" v-for="(item, index) in zhuyi" :key="index">
+				<text>{{ index + 1 }}.{{item}}</text>
+			</view>
+		</view> -->
+		<view class="line_box"></view>
+		<view class="cz-type">
+			<view class="type-left">
+				<view class="icon iconfont iconweixin"></view>
+				<view class="tit">微信充值</view>
+			</view>
+			<view class="right"><radio value="weixin" color=" #EB001C" :checked="type == 'weixin'" /></view>
+		</view>
+		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
+	</view>
+</template>
+
+<script>
+import { getMoneyStyle } from '@/utils/rocessor.js';
 // #ifdef H5
-import weixinObj from '@/plugin/jweixin-module/index.js';
-// #endif
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	data() {
-		return {
-			type: 'weixin',
-			money: '', //充值金额
-			payLoding: false //是否加载中
-		};
-	},
-	onLoad(options) {},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj'])
-		// #endif
-	},
-	methods: {
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e;
-		},
-		// 提交
-		confirm() {
-			let obj = this;
-			obj.payLoding = true;
-			// #ifdef H5
-			rechargeWechat({ price: this.money, from: this.type })
-				.then(e => {
-					let da = e.data.data;
-					weixinObj.chooseWXPay({
-						timestamp: da.timestamp,
-						nonceStr: da.nonceStr,
-						package: da.package,
-						signType: da.signType,
-						paySign: da.paySign,
-						success: function(res) {
-							uni.showToast({
-								title: '充值成功',
-								duration: 2000,
-								position: 'top'
-							});
-						}
-					});
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					obj.payLoding = false;
-					console.log(e);
-				});
-			// #endif
-			// #ifdef MP
-			rechargeRoutine({ price: this.money})
-				.then(e => {
-					let da = e.data;
-						wx.requestPayment({
-								timeStamp: da.timestamp,
-								nonceStr: da.nonceStr,
-								package: da.package,
-								signType: da.signType,
-								paySign: da.paySign,
-								success: function(res) {
-									uni.redirectTo({
-										url: '/pages/money/paySuccess'
-									});
-								},
-								
-							})
-					
-					obj.payLoding = false;
-				})
-				.catch(e => {
-					obj.payLoding = false;
-					console.log(e);
-				});
-			// #endif
-		},
-		//获取订单列表
-		loadData(source) {
-			console.log(source);
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			navItem.loadingType = 'loading';
-			setTimeout(() => {
-				let orderList = [];
-				orderList.forEach(item => {
-					navItem.orderList.push(item);
-				});
-				//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
-				this.$set(navItem, 'loaded', true);
-				//判断是否还有数据， 有改为 more， 没有改为noMore
-				navItem.loadingType = 'more';
-			}, 600);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-
-.add-btn {
-	&.modified {
-		color: $base-color;
-	}
-	&.up {
-		background-color: $base-color;
-		color: #fff;
-	}
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: $font-color;
-			font-size: $font-base;
-		}
-	}
-}
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-
-.active-bg {
-	background-color: $color-gray !important;
-}
+import { rechargeWechat, rechargeIndex } from '@/api/wallet.js';
+// #endif
+// #ifdef MP
+import { rechargeWechat, rechargeRoutine, rechargeIndex } from '@/api/wallet.js';
+// #endif
+import { mapState } from 'vuex';
+import { spreadCommission, userBalance,moneyChong } from '@/api/wallet.js';
+export default {
+	filters: {
+		getMoneyStyle,
+		// 去处小数点后的0
+		parseFloatNum(clock) {
+			return parseFloat(clock);
+		}
+	},
+	data() {
+		return {
+			type: 'weixin',
+			money: '', //充值金额
+			payLoding: false ,//是否加载中
+			list: [
+				'300',
+				'200',
+				'150',
+				'100',
+				'50'
+			],
+			now_money:'',
+			seletNum: '300',	// 选中
+			zhuyi: [],
+			quota: '',	// 送的钱
+			typeText: 0,	// 0-微信 1-佣金
+		};
+	},
+	onLoad(options) {
+		this.loadData();
+	},
+	computed: {
+		// #ifdef H5
+		...mapState(['weichatObj', 'userInfo'])
+		// #endif
+		// #ifdef MP
+		...mapState(['userInfo'])
+		// #endif
+	},
+	methods: {
+		// 跳转
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		changeNum() {
+			this.seletNum = this.money = '';
+			console.log(this.seletNum, this.money);
+		},
+		seletChange(item, index) {
+			this.seletNum = item.price;
+			this.seletMoney = item.price;
+			this.money = item.price
+		},
+		// 切换选中对象
+		tabRadio(e) {
+			this.type = e.detail.value;
+			if ( e.detail.value == 'weixin' ) {
+				this.typeText = 0
+			} else {
+				this.typeText = 1
+			}
+		},
+		// 充值金额
+		rechargeXuan(item) {
+			this.money = item.price;
+			this.quota = item.quota;
+		},
+
+		loadData() {
+			moneyChong({}).then(({data}) =>{
+				console.log(data,"123456789");
+				this.list = data.recharge_quota;
+			});
+			userBalance({}).then(({ data }) => {
+				this.now_money = data.now_money;
+			});
+		},
+
+		// 提交
+		confirm() {
+			let obj = this;
+			obj.payLoding = true;
+			if( !obj.money ) {
+				obj.$api.msg('请输入金额');
+				obj.payLoding = false;
+				return;
+			}
+			// #ifdef H5
+			rechargeWechat({
+				price: this.money,
+				from: this.type ,
+			}).then(e => {
+					let da = e.data.data;
+					obj.weichatObj.chooseWXPay({
+						timestamp: da.timestamp,
+						nonceStr: da.nonceStr,
+						package: da.package,
+						signType: da.signType,
+						paySign: da.paySign,
+						success: function(res) {
+							uni.showToast({
+								title: '充值成功',
+								duration: 2000,
+								position: 'top',
+								success: function(res) {
+									uni.navigateBack()
+								}
+							});
+						}
+					});
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #endif
+			// #ifdef MP
+			rechargeRoutine({ price: this.money})
+				.then(e => {
+					let da = e.data;
+						wx.requestPayment({
+								timeStamp: da.timestamp,
+								nonceStr: da.nonceStr,
+								package: da.package,
+								signType: da.signType,
+								paySign: da.paySign,
+								success: function(res) {
+									uni.showToast({
+										title: '充值成功',
+										duration: 2000,
+										position: 'top',
+										success: function(res) {
+											uni.navigateBack()
+										}
+									});
+								},
+
+							})
+
+					obj.payLoding = false;
+				})
+				.catch(e => {
+					obj.payLoding = false;
+					console.log(e);
+				});
+			// #endif
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+	background: #ffffff;
+}
+.top_box {
+	padding: 20rpx 26rpx 20rpx 47rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	.yue-tit {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.yue-num {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ff6f0f;
+	}
+}
+
+.line_box {
+	width: 100%;
+	height: 20rpx;
+	background: #f8f8f8;
+}
+.cz_box {
+	padding: 40rpx 20rpx 20rpx;
+	.cz_wrap {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-bottom: 20rpx;
+		border-bottom: 1px solid #e6e6e6;
+		.cz_tit {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+		}
+		.cz_input {
+			text-align: right;
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			// color: #BFBFBF;
+		}
+	}
+	.zc_list_box {
+		display: flex;
+		flex-wrap: wrap;
+		.zc_list_price {
+			width: 202rpx;
+			height: 60rpx;
+			background: #f0f0f0;
+			border-radius: 8rpx;
+			margin-top: 36rpx;
+			margin-right: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+		}
+		.seletPrice {
+			background: linear-gradient(143.2747deg, #ff6a00, #ee0979);
+			color: #ffffff;
+		}
+	}
+}
+.recha-box {
+	padding: 50rpx 30rpx 0;
+	display: flex;
+	flex-wrap: wrap;
+	.recha-frame {
+		width: 210rpx;
+		height: 181rpx;
+		border: 1px solid #dbdede;
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		margin-right: 30rpx;
+		margin-bottom: 30rpx;
+		&:nth-child(3n) {
+			margin-right: 0;
+		}
+		.recha-top {
+			display: flex;
+			align-items: center;
+			.recha-img {
+				width: 64rpx;
+				height: 62rpx;
+			}
+			.recha-tit {
+				margin-left: 10rpx;
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		.recha-song {
+			margin-top: 20rpx;
+			font-size: $font-base;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ff9900;
+		}
+	}
+	.select-frame {
+		border: 1px solid #ef041f;
+	}
+}
+
+.rechar-box {
+	padding: 30rpx 20rpx 0;
+	.rechar-title {
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+		margin-bottom: 10rpx;
+	}
+	.rechar-text {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+	}
+}
+.cz-type {
+	margin-top: 22rpx;
+	display: flex;
+	justify-content: space-between;
+	padding: 32rpx;
+	align-items: center;
+	.type-left {
+		display: flex;
+		align-items: center;
+		.icon {
+			height: 38rpx;
+			image {
+				width: 48rpx;
+				height: 38rpx;
+			}
+		}
+		.iconweixin {
+			color: #36cb59;
+		}
+		.tit {
+			margin-left: 12rpx;
+			font-size: 30rpx;
+			color: #333333;
+		}
+	}
+	.type-right {
+		image {
+			width: 36rpx;
+			height: 36rpx;
+		}
+	}
+}
+.add-btn {
+	&.modified {
+		
+	}
+	&.up {
+		color: #F21F5D;
+	}
+	margin-top: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 604rpx;
+	height: 90rpx;
+	border: 2rpx solid #F21F5D;
+	border-radius: 10rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #F21F5D;
+	line-height: 90rpx;
+	text-align: center;
+}
+.row-box {
+	margin-top: 30rpx;
+	padding: 20rpx 30rpx;
+	background: #fff;
+	.title {
+		font-size: $font-base + 2rpx;
+		color: $font-color-dark;
+	}
+	.row {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 80rpx;
+		.tit {
+			flex-shrink: 0;
+			width: 40rpx;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+		.input {
+			flex: 1;
+			font-size: 30rpx;
+			color: $font-color-dark;
+		}
+		.iconlocation {
+			font-size: 36rpx;
+			color: $font-color-light;
+		}
+
+		.buttom {
+			color: $font-color;
+			font-size: $font-base;
+		}
+	}
+}
+.list {
+	padding-left: 30rpx;
+	margin-top: 30rpx;
+	background-color: #ffffff;
+	.box {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		border-bottom: 1px solid $border-color-light;
+		padding-right: 25rpx;
+		.icon {
+			font-size: 48rpx;
+			padding-right: 20rpx;
+			display: flex;
+		}
+		.yongjing {
+			width: 48rpx;
+			height: 48rpx;
+		}
+		.iconweixin1 {
+			color: #18bf16;
+		}
+		.iconzhifubao {
+			color: #08aaec;
+		}
+		.title-box {
+			flex-grow: 1;
+			text-align: left;
+			.title {
+				font-size: $font-base + 2rpx;
+				color: $font-color-base;
+			}
+			.node {
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
+		}
+	}
+}
+/deep/ .uni-radio-input {
+	width: 45rpx;
+	height: 45rpx;
+}
+
+.active-bg {
+	background: linear-gradient(143.2747deg, #ff6a00, #ee0979) !important;
+	color: #FFFFFF !important;
+}
 </style>

pages/money/wallet.vue

@@ -1,50 +1,66 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="money-box">
-				<view class="text">可提现金额（元）</view>
-				<view class="money">{{ money | getMoneyStyle }}</view>
-			</view>
-			<view class="moneyTx" @click="navto('/pages/money/recharge')">充值</view>
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/money/recharge')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>充值</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('/pages/money/withdrawal')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></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+'px'}" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<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>
-		</swiper>
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的余额</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/myyue.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{money | getMoneyStyle}}</view>
+				<view>我的余额</view>
+			</view>
+			<view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=yue')">
+					余额转账
+				</view>
+				<view class="money-btn" @click="navto('/pages/money/recharge')">
+					余额充值
+				</view>
+			</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{recharge}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</view>
+			</view>
+		</view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+	
+					<!-- 订单列表 -->
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.title }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
 	</view>
 </template>
 
@@ -61,38 +77,37 @@ export default {
 		empty,
 		uniLoadMore
 	},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.content')
-			.fields(
-				{
-					size: true
-				},
-				data => {
-					console.log(data);
-					console.log(Math.floor((data.width / 750) * 300));
-					// 保存头部高度
-					this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-					console.log(this.maxheight);
-				}
-			)
-			.exec();
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
 	},
 	data() {
-		return {
+		return {
+			height: '',
 			// 头部图高度
 			maxheight:'',
-			tabCurrentIndex: 0,
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
 			navList: [
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
+				// {
+				// 	state: 0,
+				// 	text: '全部',
+				// 	loadingType: 'more',
+				// 	orderList: [],
+				// 	page: 1, //当前页数
+				// 	limit: 10 //每次信息条数
+				// },
 				{
 					state: 1,
 					text: '支出',
@@ -118,7 +133,7 @@ export default {
 		this.loadData();
 		// 获取用户余额
 		userBalance({}).then(({ data }) => {
-			this.money = data.now_money;
+			this.money = data.now_money;
 		});
 	},
 	methods: {
@@ -129,7 +144,8 @@ export default {
 			});
 		},
 		//获取收入支出信息
-		async loadData(source) {
+		async loadData(source) {
+			let obj = this
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -152,13 +168,17 @@ export default {
 				},
 				state
 			)
-				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
+				.then(({ data }) => {
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list[0].list);
 						console.log(navItem.orderList);
 						navItem.page++;
+					}else {
+						navItem.loadingType = 'noMore';
 					}
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list[0].list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
@@ -187,132 +207,218 @@ export default {
 };
 </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;
-		// height: 100rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1.6;
-		font-size: 32rpx;
-	}
-	.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;
-	.text {
-		padding-top: 147rpx;
-		font-size: $font-sm;
-	}
-	.money {
-		font-size: 56rpx;
-	}
-}
-
-.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: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-// 列表
-
-.swiper-box {
-	padding-top: 10rpx;
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-		}
-	}
-}
-.list-scroll-content {
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 70rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+.moneybtn-box {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding:20rpx 50rpx ;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
 </style>

pages/money/withdmoenys.vue

@@ -1,33 +1,49 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="flex">
+			<view class="flex" v-if="type == 'xl'">
 				<view class="buttom">
 					<view class="icon">{{ userInfo.integral | getMoneyStyle }}</view>
 					<text class="text">可用响亮积分</text>
 				</view>
 			</view>
+			<view class="flex" v-if="type == 'yue'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
+					<text class="text">可用余额</text>
+				</view>
+			</view>
+			<view class="flex" v-if="type == 'cash'">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
+					<text class="text">可用现金</text>
+				</view>
+			</view>
+		</view>
+		<view class="row-box">
+			<view class="title">收款人手机号</view>
+			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人手机号" placeholder-class="placeholder" /></view>
 		</view>
-		<u-form ref="uForm" class="item">
-			<u-form-item label-width='150' label="用户手机"><u-input type="text" v-model="card" /></u-form-item>
-		</u-form>
 		<view class="row-box">
 			<view class="title">转账金额</view>
 			<view class="row">
-				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" placeholder='转入金额' placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.integral">全部转账</view>
+				<!-- <text class="tit">￥</text> -->
+				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
+				<view class="buttom" v-if="type == 'xl'" @click="withdrawal = userInfo.integral">全部转账</view>
+				<view class="buttom" v-if="type == 'yue'" @click="withdrawal = userInfo.now_money">全部转账</view>
+				<view class="buttom" v-if="type == 'cash'" @click="withdrawal = userInfo.cash">全部转账</view>
 			</view>
 		</view>
-		
-		<button class="add-btn up" :class="{'action':loding}" @click="!loding?confirm():''">转入</button>
+		<view class="tip" v-if="withdrawal != 0 && type == 'xl'">实际转入{{ realmoney }}响亮积分,{{ gy }}响亮积分流入公益池</view>
+
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
 	</view>
 </template>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { getUserInfo,transfer } from '@/api/user.js';
-import { mapMutations,mapState } from 'vuex';
+import { getUserInfo, transfer, yuetransfer, cashtransfer } from '@/api/user.js';
+import { mapMutations, mapState } from 'vuex';
 export default {
 	filters: {
 		getMoneyStyle
@@ -36,13 +52,14 @@ export default {
 		return {
 			money: '0.00', //可提现金额
 			withdrawal: '', //提现金额
-			password:'',//支付密码
-			card:'',//转账卡号
-			name:'',
+			password: '', //支付密码
+			card: '', //转账卡号
+			name: '',
 			// #ifdef H5
 			weichatBsrowser: false,
 			// #endif
-			loding:false,
+			loding: false,
+			type: 'xl'
 		};
 	},
 	onLoad(options) {
@@ -50,22 +67,34 @@ export default {
 		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
 		// #endif
 		this.dataUp();
+		if (options.type) {
+			this.type = options.type;
+			console.log(this.type);
+		}
 	},
 	computed: {
-		...mapState('user', ['userInfo']) 
+		...mapState('user', ['userInfo']),
+		realmoney() {
+			return (this.withdrawal * 0.9).toFixed(2) * 1;
+		},
+		gy() {
+			return (this.withdrawal * 0.08).toFixed(2) * 1;
+		}
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'login']),
 		// 更新数据
-		dataUp(){
+		dataUp() {
 			let obj = this;
-			getUserInfo({}).then((e) => {
-				obj.login();
-				// 保存返回用户数据
-				obj.setUserInfo(e.data);
-			}).catch((e) => {
-				console.log(e);
-			})
+			getUserInfo({})
+				.then(e => {
+					obj.login();
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+				})
+				.catch(e => {
+					console.log(e);
+				});
 		},
 		// 切换选中对象
 		tabRadio(e) {
@@ -75,46 +104,86 @@ export default {
 		confirm() {
 			let obj = this;
 			obj.loding = true;
-			if(obj.withdrawal == 0){
+			if (obj.withdrawal == 0) {
 				obj.loding = false;
 				uni.showModal({
-					title:"提示",
-					content:"转账金额不要为0"
-				})
+					title: '提示',
+					content: '转账金额不要为0'
+				});
 				return;
 			}
-			if(obj.card == obj.userInfo.phone){
+			if (obj.card == obj.userInfo.phone) {
 				obj.loding = false;
 				uni.showModal({
-					title:"提示",
-					content:"不要输入自己的用户账号"
-				})
-			}else{
-				
+					title: '提示',
+					content: '不要输入自己的用户账号'
+				});
+			} else {
 				let data = {
-					to_user_account:obj.card, //编号
+					to_user_account: obj.card, //编号
 					num: obj.withdrawal //金额
+				};
+				if (obj.type == 'xl') {
+					transfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
+						});
+				}
+				if (obj.type == 'yue') {
+					yuetransfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
+						});
 				}
-				transfer(data)
-					.then(e => {
-						// 允许按钮点击
-						obj.loding = false;
-						// 初始化提现金额
-						obj.withdrawal = ''
-						uni.showToast({
-							title: '提交成功',
-							duration: 2000,
-							position: 'top'
+				if (obj.type == 'cash') {
+					cashtransfer(data)
+						.then(e => {
+							// 允许按钮点击
+							obj.loding = false;
+							// 初始化提现金额
+							obj.withdrawal = '';
+							uni.showToast({
+								title: '提交成功',
+								duration: 2000,
+								position: 'top'
+							});
+							obj.dataUp();
+						})
+						.catch(e => {
+							obj.$api.msg(e.msg);
+							obj.loding = false;
+							console.log();
 						});
-						obj.dataUp();
-					})
-					.catch(e => {
-						obj.$api.msg(e.msg)
-						obj.loding = false;
-						console.log();
-					});
+				}
 			}
-			
 		}
 	}
 };
@@ -129,9 +198,9 @@ page {
 	background: #ffffff;
 }
 
-.item{
+.item {
 	padding: 0 $page-row-spacing;
-	background-color: #FFFFFF;
+	background-color: #ffffff;
 }
 .flex {
 	background-color: #ffffff;
@@ -191,24 +260,20 @@ page {
 		}
 
 		.buttom {
-			color: $base-color;
+			color: #f21f5d;
 			font-size: $font-base;
 		}
 	}
 }
 .add-btn {
-	background: $base-color;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
+	width: 520rpx;
 	height: 80rpx;
-	margin: 0 auto;
-	margin-top: 30rpx;
-	font-size: $font-lg;
-	border-radius: 10rpx;
-	color: #fff;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	border: 2rpx solid #f21f5d;
+	border-radius: 40rpx;
+	margin: 140rpx auto;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #f21f5d;
 }
 .name {
 	background: #fff;
@@ -252,6 +317,10 @@ page {
 		}
 	}
 }
+.tip {
+	padding: 20rpx;
+	color: #ff0000;
+}
 /deep/ .uni-radio-input {
 	width: 45rpx;
 	height: 45rpx;

pages/money/withdrawal.vue

@@ -1,80 +1,31 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
 		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
 					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现金额</text>
-				</view>
-				<view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现金额</text>
+					<text class="text">可转换金额</text>
 				</view>
 			</view>
 		</view>
 		<view class="row-box">
-			<view class="title">提现金额</view>
+			<view class="title">转换金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
-				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+				<input class="input" type="number" v-model="withdrawal" placeholder="请输入消费券数量" placeholder-class="placeholder" />
+				<view class="buttom" @click="withdrawal = money">全部转换</view>
 			</view>
 		</view>
-		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
-			<radio-group @change="tabRadio">
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title"><text>提现至微信</text></view>
-						</view>
-						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont iconzhifubao"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="aliData.fullname">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.fullname">真实姓名({{ aliData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="alipay" color="#5dbc7c" :checked="type == 'alipay'" /></view>
-					</view>
-				</label>
-				<label>
-					<view class="box">
-						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="bankData.bankno">{{ bankData.bank + ' ' + bankData.bankno }}</text>
-								<text v-else>请创建银行账号</text>
-							</view>
-							<view class="node">
-								<text v-if="bankData.fullname">真实姓名({{ bankData.fullname }})</text>
-							</view>
-						</view>
-						<view class="right"><radio value="bank" color="#5dbc7c" :checked="type == 'bank'" /></view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- #endif -->
 		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button>
+		<view class="tip" v-if="withdrawal != 0">
+			实际到账{{ realmoney }}现金,{{ gy }}响亮积分
+		</view>
 	</view>
 </template>
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { exchangeCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
 	filters: {
@@ -87,9 +38,7 @@ export default {
 		return {
 			type: 'weixin', //提现方式
 			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
 			aliData: {},
 			bankData: {},
 			// #ifdef H5
@@ -107,6 +56,14 @@ export default {
 		this.loadAli();
 		this.loadBank();
 	},
+	computed:{
+		realmoney() {
+			return (this.withdrawal * 0.7).toFixed(2) * 1
+		},
+		gy() {
+			return (this.withdrawal * 0.3).toFixed(2) * 1
+		}
+	},
 	methods: {
 		// 更新数据
 		dataUp(){
@@ -128,9 +85,8 @@ export default {
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
+				this.money = data.commissionCount;//可提现余额
 				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
 			});
 		},
 		// 跳转
@@ -146,22 +102,9 @@ export default {
 		// 提交
 		confirm() {
 			let data = {
-				extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
 				money: this.withdrawal, //金额
-				money_type: 1//0佣金1余额
-			}
-			if (this.type=='alipay') {
-				data.name = this.aliData.fullname;
-				data.alipay_code = this.aliData.alino;
-			}
-			if (this.type=='bank') {
-				data.name = this.bankData.fullname;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.bankno;
 			}
-			
-			
-			extractCash(data)
+			exchangeCash(data)
 				.then(e => {
 					uni.showToast({
 						title: '提交成功',
@@ -191,8 +134,9 @@ page {
 	margin: 0 30rpx;
 	border-radius: $border-radius-sm;
 	.buttom {
+		width: 100%;
+		text-align: center;
 		font-size: $font-lg;
-		width: 50%;
 	}
 	.interval {
 		width: 2px;
@@ -305,6 +249,10 @@ page {
 		}
 	}
 }
+.tip {
+	padding: 20rpx 40rpx;
+	color: #FD3B39;
+}
 /deep/ .uni-radio-input {
 	width: 45rpx;
 	height: 45rpx;

pages/order/createOrder.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
-		<view class="navbar">
+		<!-- <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>
+		</view> -->
 
 		<!-- 地址 -->
 		<navigator v-if="tabCurrentIndex == 0" url="/pages/set/address?source=1" class="address-section">
@@ -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">
+			<!-- <view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
-			</view>
+			</view> -->
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">运费</text>
 				<text class="cell-tip">{{ Postage }}</text>
@@ -709,9 +709,9 @@ page {
 		height: 100%;
 		color: #fff;
 		font-size: 32rpx;
-		background-color: $base-color;
+		background-color: #FF4C4C;
 		&.submitNo {
-			background-color: $font-color-disabled;
+			background-color:  #FF4C4C;
 		}
 	}
 }

pages/order/order.vue

@@ -58,7 +58,7 @@
 							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
 							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
 							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
+							<button v-if="item._status._title == '未发货' && item.is_gift != 1" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
 						</view>
 					</view>
 

pages/product/common/productBottom.vue

@@ -4,10 +4,6 @@
 			<text class="iconfont iconhome"></text>
 			<text>首页</text>
 		</navigator>
-		<view class="p-b-btn" :class="{ active: goodsObjact.userCollect }" @click="toFavorite(goodsObjact)">
-			<text class="iconfont " :class="{ iconlike: !goodsObjact.userCollect, iconlikefill: goodsObjact.userCollect }"></text>
-			<text>收藏</text>
-		</view>
 		<view class="action-btn-group">
 			<button type="primary" class=" action-btn no-border add-cart-btn" @click="buy(2)">加入购物车</button>
 			<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(1)">立即购买</button>
@@ -71,10 +67,11 @@ export default {
 	bottom: 0rpx;
 	z-index: 95;
 	display: flex;
-	justify-content: center;
+	justify-content: space-between;
+	padding-left: 20rpx;
 	align-items: center;
 	width: 750rpx;
-	height: 120rpx;
+	height: 96rpx;
 	background-color: #ffffff;
 	/* box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
 	border-radius: 16rpx; */
@@ -106,8 +103,7 @@ export default {
 	}
 	.action-btn-group {
 		display: flex;
-		height: 76rpx;
-		border-radius: 100px;
+		height: 96rpx;
 		overflow: hidden;
 		margin-left: 20rpx;
 		position: relative;
@@ -119,23 +115,22 @@ export default {
 			transform: translateY(-50%);
 			height: 28rpx;
 			width: 0;
-			border-right: 1px solid rgba(255, 255, 255, 0.5);
 		}
 		.action-btn {
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			width: 270rpx;
+			width: 300rpx;
 			height: 100%;
 			font-size: $font-base;
 			padding: 0;
 			border-radius: 0;
 			background: transparent;
 			&.buy-now-btn {
-				background-color: #303e49;
+				background-color: #FF4C4C;
 			}
 			&.add-cart-btn {
-				background-color: $base-color;
+				background-color: #FFB238;
 			}
 		}
 	}

pages/product/common/productContent.vue

@@ -1,27 +1,14 @@
 <template>
 	<view class="introduce-section">
-		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
-		<button open-type="share" class="shareDate">
-			<image class="share-img" src="../../../static/img/img57.png"></image>
-			好物推荐
-		</button>
-		<text class="info" v-if="goodsObjact.store_info">{{ goodsObjact.store_info }}</text>
-		<!-- <view class="progress-box">
-			<progress :percent="goodsObjact.percent | parseIntTo" activeColor="#F65527" font-size="10" show-info border-radius="5" stroke-width="9" />
-			<view class="number">剩余{{ goodsObjact.percent | parseIntTo }}%</view>
-		</view> -->
 		<view class="price-box">
 			<text class="price-tip">¥</text>
 			<view class="price">
 				{{ goodsObjact.price }}
-				<text class="text">/份</text>
 				<text class="m-price" v-if="goodsObjact.ot_price > goodsObjact.price">¥{{ goodsObjact.ot_price }}</text>
 			</view>
 		</view>
-		<view class="price-green">
-			￥{{ goodsObjact.ot_price }}
-			<text>市场价</text>
-		</view>
+		<text class="title clamp2">{{ goodsObjact.store_name }}</text>
+		<text class="info" v-if="goodsObjact.store_info">{{ goodsObjact.store_info }}</text>
 	</view>
 </template>
 
@@ -59,15 +46,13 @@ export default {
 .introduce-section {
 	position: relative;
 	background: #fff;
-	padding: 35rpx 0rpx;
-	padding-left: 35rpx;
+	padding: 26rpx 26rpx 30rpx 20rpx;
 	.title {
-		font-size: 32rpx;
-		color: $font-color-dark;
-		.tip-o {
-			color: #ff3334;
-			padding-left: 15rpx;
-		}
+		margin-top: 26rpx;
+		font-size: 36rpx;
+		font-family: PingFang SC;
+		font-weight: 800;
+		color: #333333;
 	}
 	.shareDate {
 		position: absolute;
@@ -111,28 +96,15 @@ export default {
 		display: flex;
 		align-items: baseline;
 		height: 64rpx;
-		padding: 10rpx 0;
 		font-size: 26rpx;
-		color: $uni-color-primary;
+		color: #FF4C4C;
 	}
 	.price {
-		font-size: $font-lg + 6rpx;
+		font-size: 50rpx;
 		.text {
 			padding-left: 5rpx;
 			color: #b0b0b0;
-			font-size: 22rpx !important;
-		}
-	}
-	.price-green {
-		color: #2dbd59;
-		font-size: 28rpx !important;
-		text {
-			background: #2dbd59;
-			color: #ffffff;
-			padding: 0rpx 10rpx;
-			border-radius: 5rpx;
-			font-size: 22rpx !important;
-			margin-left: 15rpx;
+			font-size: 32rpx !important;
 		}
 	}
 	.m-price {

pages/product/list.vue

@@ -21,7 +21,7 @@
 		<view class="goods-list">
 			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
 				<view class="image-wrapper"><image :src="item.image" mode="aspectFill"></image></view>
-				<text class="title clamp">{{ item.title }}</text>
+				<text class="title clamp">{{ item.store_name }}</text>
 				<view class="price-box">
 					<text class="price">{{ item.price }}</text>
 					<text>已售 {{ item.sales }}</text>
@@ -62,7 +62,7 @@ export default {
 			filterIndex: 0, //查询类型
 			numberOrder: 0, //1 销量从低到高 2销量从高到低
 			limit: 6, //每次加载数据条数
-			page: 0, //当前页数
+			page: 1, //当前页数
 			cateId: 0, //已选三级分类id
 			priceOrder: 0, //1 价格从低到高 2价格从高到低
 			cateList: [], //分类列表
@@ -72,7 +72,7 @@ export default {
 
 	onLoad(options) {
 		// #ifdef H5
-		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
 		// #endif
 		this.cateId = options.tid;
 		this.loadCateList(options.fid, options.sid);
@@ -99,14 +99,10 @@ export default {
 		async loadCateList(fid, sid) {
 			let obj = this;
 			getCategoryList({}).then(function(e) {
-				console.log(e);
-				e.data.forEach(function(e) {
-					if (e.id == fid) {
-						obj.cateList = e.children;
-						return;
-					}
-				});
-				console.log(obj.cateList);
+				obj.cateList = e.data.filter(e => {
+					return e.id != 1
+				})
+				console.log(obj.cateList,"123456789");
 			});
 		},
 		//加载商品 ，带下拉刷新和上滑加载
@@ -141,7 +137,10 @@ export default {
 			}
 			getProducts(data).then(function(e) {
 				console.log(e.data);
-				obj.goodsList = obj.goodsList.concat(e.data);
+				let arr = e.data.filter(info => {
+					return (info.cate_id != 2)
+				})
+				obj.goodsList = obj.goodsList.concat(arr);
 				//判断是否还有下一页，有是more  没有是nomore
 				if (obj.limit==e.data.length) {
 					obj.page++
@@ -253,16 +252,16 @@ page,
 		color: $font-color-dark;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #FF4C4C;
 			&:after {
 				content: '';
 				position: absolute;
 				left: 50%;
 				bottom: 0;
 				transform: translateX(-50%);
-				width: 120rpx;
+				width: 150rpx;
 				height: 0;
-				border-bottom: 4rpx solid $base-color;
+				border-bottom: 4rpx solid #FF4C4C;
 			}
 		}
 	}
@@ -403,7 +402,7 @@ page,
 	}
 	.price {
 		font-size: $font-lg;
-		color: $uni-color-primary;
+		color: #FF4C4C;
 		line-height: 1;
 		&:before {
 			content: '￥';

pages/product/product.vue

@@ -4,6 +4,18 @@
 		<top-swiper :imgList="imgList"></top-swiper>
 		<!-- 标题 -->
 		<product-content :goodsObjact="goodsObjact"></product-content>
+		<view class="c-list">
+			<view class="c-row b-b" @click="toggleSpec">
+				<text class="tit">购买数量</text>
+				<view class="con">
+					<text class="selected-text">{{ goodsNumber }}</text>
+				</view>
+				<text class="iconfont iconenter"></text>
+			</view>
+			<view class="c-row b-b">
+				<text>每购买一个送{{goodsObjact.give_integral}}响亮积分</text>
+			</view>
+		</view>
 		<!-- 拼货时间及优惠 -->
 		<!-- <discounts @clickCoupon="Getcoupon" :Info="goodsObjact.store_info" :showCoupon="true"></discounts> -->
 		<!-- 猜你喜欢 -->
@@ -26,13 +38,13 @@
 				<view class="a-t">
 					<image :src="actionImage"></image>
 					<view class="right">
-						<text class="name">{{ goodsObjact.store_name }}</text>
-						<text class="price">¥{{ actionPrice * goodsNumber }}</text>
-						<text class="stock">库存：{{ goodsStore }}件</text>
-						<view class="selected" v-if="specList != ''">
+						<view class="good-name clamp">{{ goodsObjact.store_name }}</view>
+						<text class="price">¥{{ actionPrice }}</text>
+						<!-- <text class="stock">库存：{{ goodsObjact.stock }}件</text> -->
+						<!-- <view class="selected" v-if="goodsType == 0">
 							已选：
 							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem }}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view v-for="(item, index) in specList" :key="index" class="attr-list">
@@ -49,26 +61,26 @@
 						</text>
 					</view>
 				</view>
-				<!-- <view class="attr-list">
-					<text>购买数量</text>
+				<view class="flex">
+					<view>购买数量</view>
 					<view class="item-list">
 						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box>
 					</view>
-				</view> -->
-				<button class="btn" @click.stop="buy" v-show="buys_show">完成</button>
-				<button class="btn" style="background-color: #999999;" v-show="buys_shows">售罄</button>
+				</view>
+				<button class="btn" @click.stop="buy">确定</button>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+import uniNumberBox from '@/components/uni-number-box.vue';
 import { goodsDetail, cartAdd } from '@/api/product.js';
 import { mapState } from 'vuex';
 import store from '@/store/index.js';
 import { saveUrl } from '@/utils/loginUtils.js';
 // #ifdef H5
-import { weixindata } from '@/utils/wxAuthorized';
+import { weixindata, shareLoad } from '@/utils/wxAuthorized';
 // #endif
 // 头部轮播图
 import topSwiper from './common/topSwiper.vue';
@@ -88,6 +100,7 @@ import guessLike from './common/guessLike.vue';
 import estimate from './common/estimate.vue';
 export default {
 	components: {
+		uniNumberBox,
 		guessLike,
 		topSwiper,
 		productContent,
@@ -147,7 +160,8 @@ export default {
 				i: '', //分
 				s: '' //秒
 			},
-			userInfo: ''
+			userInfo: '',
+			isVip: '0'
 		};
 	},
 	filters: {
@@ -172,6 +186,10 @@ export default {
 			// 存储邀请人
 			uni.setStorageSync('spread', options.spread);
 		}
+		if (options.isVip) {
+			obj.isVip = options.isVip;
+		}
+		console.log(obj.isVip, 'vip');
 		saveUrl();
 		this.goodsDetail();
 		// 注册邀请信息
@@ -186,33 +204,34 @@ export default {
 		...mapState(['weichatObj', 'baseURL', 'urlFile'])
 	},
 	// 分享
-	onShareAppMessage(options) {
-		// 设置菜单中的转发按钮触发转发事件时的转发内容
-		let pages = getCurrentPages(); //获取加载的页面
-		let currentPage = pages[pages.length - 1]; //获取当前页面的对象
-		let url = currentPage.route; //当前页面url
-		let item = currentPage.options; //如果要获取url中所带的参数可以查看options
-		let shareObj = {
-			title: this.goodsObjact.store_name + '   价格：' + this.goodsObjact.price, // 默认是小程序的名称(可以写slogan等)
-			path: url + '?id=' + item.id + '&spread=' + this.userInfo.uid, // 默认是当前页面，必须是以‘/’开头的完整路径
-			imageUrl: this.goodsObjact.image,
-			success: function(res) {
-				// 转发成功之后的回调
-				if (res.errMsg == 'shareAppMessage:ok') {
-				}
-			},
-			fail: function() {
-				// 转发失败之后的回调
-				if (res.errMsg == 'shareAppMessage:fail cancel') {
-					// 用户取消转发
-				} else if (res.errMsg == 'shareAppMessage:fail') {
-					// 转发失败，其中 detail message 为详细失败信息
-				}
-			}
-		};
-
-		return shareObj;
-	},
+	// onShareAppMessage(options) {
+	// 	// 设置菜单中的转发按钮触发转发事件时的转发内容
+	// 	let pages = getCurrentPages(); //获取加载的页面
+	// 	let currentPage = pages[pages.length - 1]; //获取当前页面的对象
+	// 	let url = currentPage.route; //当前页面url
+	// 	let item = currentPage.options; //如果要获取url中所带的参数可以查看options
+	// 	let shareObj = {
+	// 		title: this.goodsObjact.store_name,
+	// 		desc: obj.goodsObjact.store_info,
+	// 		path: url + '?id=' + item.id + '&spread=' + this.userInfo.uid, // 默认是当前页面，必须是以‘/’开头的完整路径
+	// 		imageUrl: this.goodsObjact.image,
+	// 		success: function(res) {
+	// 			// 转发成功之后的回调
+	// 			if (res.errMsg == 'shareAppMessage:ok') {
+	// 			}
+	// 		},
+	// 		fail: function() {
+	// 			// 转发失败之后的回调
+	// 			if (res.errMsg == 'shareAppMessage:fail cancel') {
+	// 				// 用户取消转发
+	// 			} else if (res.errMsg == 'shareAppMessage:fail') {
+	// 				// 转发失败，其中 detail message 为详细失败信息
+	// 			}
+	// 		}
+	// 	};
+
+	// 	return shareObj;
+	// },
 	methods: {
 		//选择规格
 		selectSpec(item, arr, ind) {
@@ -266,6 +285,31 @@ export default {
 				url: '/pages/coupon/getcoupon'
 			});
 		},
+		// #ifdef H5
+		// 加载微信html5页面分享方法
+		shareDate() {
+			let obj = this;
+			// 保存分享人id链接
+			let url = window.location.href + '&spread=' + this.userInfo.uid;
+			// 判断是否微信浏览器
+			let bool = uni.getStorageSync('weichatBrowser') || '';
+			if (bool) {
+				// 过滤微信强制添加的链接地址
+				url = url.replace(/[\?,&]from=singlemessage/g, '');
+				let data = {
+					link: url, // 分享链接
+					imgUrl: obj.goodsObjact.image, // 分享图标
+					desc: obj.goodsObjact.store_info,
+					title: obj.goodsObjact.store_name,
+					success: function(e) {
+						console.log(e);
+					}
+				};
+				console.log(data, '分享');
+				shareLoad(data);
+			}
+		},
+		// #endif
 		//详情页
 		navToDetailPage(item) {
 			let id = item.id;
@@ -344,11 +388,71 @@ export default {
 					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
 				}
 				obj.shopId = data.mer_id; //保存商店id
+				// #ifdef H5
+				obj.shareDate();
+				// #endif
 			});
 		},
+		// #ifdef H5
+		// 加载微信html5页面分享方法
+		shareDate() {
+			let obj = this;
+			// 保存分享人id链接
+			let url = window.location.href + '&spread=' + this.userInfo.uid;
+			// 判断是否微信浏览器
+			let bool = uni.getStorageSync('weichatBrowser') || '';
+			if (bool) {
+				// 过滤微信强制添加的链接地址
+				url = url.replace(/[\?,&]from=singlemessage/g, '');
+				let data = {
+					link: url, // 分享链接
+					imgUrl: obj.goodsObjact.image, // 分享图标
+					desc: obj.goodsObjact.store_info,
+					title: obj.goodsObjact.store_name,
+					success: function(e) {
+						console.log(e);
+					}
+				};
+				shareLoad(data);
+			}
+		},
+		// #endif
 		// 立即购买
 		buy() {
 			let obj = this;
+			console.log(obj.userInfo);
+			if (obj.userInfo.lock_spread_user == null) {
+				if (obj.userInfo.unlock_spread_user == null) {
+					uni.showModal({
+						title: '提示',
+						content: '您未绑定或锁定邀请人，无法购买会员礼包,是否前往绑定关系',
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定');
+								uni.navigateTo({
+									url: '/pages/set/user'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return;
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '已锁定邀请人:' + obj.userInfo.unlock_spread_user.phone + '购买商品后将绑定关系',
+						success: function(res) {
+							if (res.confirm) {
+								obj.buy1();
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					return;
+				}
+			}
 			// 创建传值对象
 			let data = {
 				cartNum: obj.goodsNumber, //商品数量
@@ -384,6 +488,42 @@ export default {
 					console.log(e);
 				});
 		},
+		buy1() {
+			let obj = this;
+			let data = {
+				cartNum: obj.goodsNumber, //商品数量
+				new: 1,
+				productId: obj.goodsid, //商品编号
+				uniqueId: obj.uniqueId
+			};
+
+			if (obj.type == 2) {
+				data.new = 0;
+			}
+			cartAdd(data)
+				.then(function(e) {
+					let da = e.data;
+					if (obj.type == 1) {
+						// 跳转到支付页
+						uni.navigateTo({
+							url: '/pages/order/createOrder?id=' + da.cartId
+						});
+					}
+					if (obj.type == 2) {
+						uni.showToast({
+							title: '成功加入购物车',
+							type: 'top',
+							duration: 2000,
+							icon: 'none'
+						});
+						obj.goodsDetail();
+					}
+					obj.toggleSpec();
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
 		// 阻止触发上级事件
 		stopPrevent() {}
 	}
@@ -399,32 +539,27 @@ export default {
 	right: 0;
 	bottom: 0;
 	z-index: 99;
+
 	&.show {
 		display: block;
-
 		.mask {
 			animation: showPopup 0.2s linear both;
 		}
-
 		.layer {
 			animation: showLayer 0.2s linear both;
 		}
 	}
-
 	&.hide {
 		.mask {
 			animation: hidePopup 0.2s linear both;
 		}
-
 		.layer {
 			animation: hideLayer 0.2s linear both;
 		}
 	}
-
 	&.none {
 		display: none;
 	}
-
 	.mask {
 		position: fixed;
 		top: 0;
@@ -433,62 +568,53 @@ export default {
 		z-index: 1;
 		background-color: rgba(0, 0, 0, 0.4);
 	}
-
 	.layer {
 		position: fixed;
 		z-index: 99;
 		bottom: 0;
 		width: 100%;
-		min-height: 35vh;
+		min-height: 30vh;
 		border-radius: 10rpx 10rpx 0 0;
 		background-color: #fff;
-
 		.btn {
 			height: 66rpx;
 			line-height: 66rpx;
 			border-radius: 100rpx;
-			background: $uni-color-primary;
+			// background: $uni-color-primary;
+			background: #FF4C4C;
 			font-size: $font-base + 2rpx;
 			color: #fff;
 			margin: 30rpx auto 20rpx;
 		}
 	}
-
 	@keyframes showPopup {
 		0% {
 			opacity: 0;
 		}
-
 		100% {
 			opacity: 1;
 		}
 	}
-
 	@keyframes hidePopup {
 		0% {
 			opacity: 1;
 		}
-
 		100% {
 			opacity: 0;
 		}
 	}
-
 	@keyframes showLayer {
 		0% {
 			transform: translateY(120%);
 		}
-
 		100% {
 			transform: translateY(0%);
 		}
 	}
-
 	@keyframes hideLayer {
 		0% {
 			transform: translateY(0);
 		}
-
 		100% {
 			transform: translateY(120%);
 		}
@@ -496,18 +622,15 @@ export default {
 }
 /* 规格选择弹窗 */
 .attr-content {
-	padding: 25rpx 30rpx;
-
+	padding: 10rpx 30rpx;
 	.a-t {
 		display: flex;
-
 		image {
 			width: 170rpx;
 			height: 170rpx;
 			flex-shrink: 0;
 			border-radius: 8rpx;
 		}
-
 		.right {
 			display: flex;
 			flex-direction: column;
@@ -515,30 +638,30 @@ export default {
 			font-size: $font-sm + 2rpx;
 			color: $font-color-base;
 			line-height: 42rpx;
-			width: 75%;
-
-			.price {
-				font-size: $font-lg;
-				color: $uni-color-primary;
-				margin: 10rpx 0rpx;
+			.good-name {
+				padding-top: 20rpx;
+				max-width: 320rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #1d2023;
+				line-height: 42rpx;
+				margin-bottom: 15rpx;
 			}
-
-			.name {
-				font-size: 32rpx;
-				color: $font-color-dark;
-				height: 50rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-				display: block;
+			.price {
+				font-size: 60rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ff6f0f;
+				// font-size: $font-lg;
+				// color: $uni-color-primary;
+				// margin-bottom: 10rpx;
 			}
-
 			.selected-text {
 				margin-right: 10rpx;
 			}
 		}
 	}
-
 	.attr-list {
 		display: flex;
 		flex-direction: column;
@@ -547,17 +670,16 @@ export default {
 		padding-top: 30rpx;
 		padding-left: 10rpx;
 	}
-
 	.item-list {
 		padding: 20rpx 0 0;
 		display: flex;
 		flex-wrap: wrap;
-
-		text {
+		.tit {
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			background: #eee;
+			// margin-left: 10rpx;
 			margin-right: 20rpx;
 			margin-bottom: 20rpx;
 			border-radius: 100rpx;
@@ -567,10 +689,10 @@ export default {
 			font-size: $font-base;
 			color: $font-color-dark;
 		}
-
 		.selected {
-			background: #ddffdf;
-			color: $uni-color-primary;
+			background: #FCEFF1;
+			border: 1px solid #EF041F;
+			color: #EF041F;
 		}
 	}
 }
@@ -609,4 +731,46 @@ page {
 	width: 100% !important;
 	height: auto;
 }
+.c-list {
+	margin-top: 20rpx;
+	font-size: $font-sm + 2rpx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.tit {
+		width: 140rpx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10rpx;
+		}
+	}
+	.bz-list {
+		height: 40rpx;
+		font-size: $font-sm + 2rpx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30rpx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40rpx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
 </style>

pages/redirect/redirect.vue

@@ -32,10 +32,8 @@ export default {
 			let obj = this;
 			let url = window.location.href;
 			let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
-			let spread = uni.getStorageSync('spread')||'';
 			wechatAuth({
 				code: code,
-				spread:spread,
 			}).then(({ data }) => {
 				obj.wchatAuth(data);
 			}).catch((e) => {

pages/set/phone.vue

@@ -57,7 +57,7 @@ export default {
 				this.$api.msg('请输入电话号码');
 				return;
 			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.account)) {
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
 				this.$api.msg('请输入正确的手机号');
 				return;
 			}

pages/set/user.vue

@@ -0,0 +1,167 @@
+<template>
+	<view class="container">
+		<view class="row b-b">
+			<text class="tit">手机号</text>
+			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
+		</view>
+		<view>
+			<!-- <view class="row b-b">
+				<text class="tit">验证码</text>
+				<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
+				<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
+			</view> -->
+			<button class="add-btn" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+import { spread, userinfo } from '@/api/user.js';
+export default {
+	data() {
+		return {
+			time: '', //保存倒计时对象
+			countDown: 0, //倒计时
+			account: '', //手机号
+			captcha: '', //验证码
+			password: '', //新密码
+			loding: false //是否载入中
+		};
+	},
+	watch: {
+		// 监听倒计时
+		countDown(i) {
+			if (i == 0) {
+				clearInterval(this.time);
+			}
+		}
+	},
+	computed: {
+		...mapState(['userInfo'])
+	},
+	onLoad() {
+		if (this.userInfo.phone == null) {
+			this.account = '';
+		} else {
+			this.account = this.userInfo.phone;
+			this.show = false;
+		}
+	},
+	methods: {
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		//发送验证码
+		verification() {
+			let obj = this;
+			if (this.account == '') {
+				this.$api.msg('请输入电话号码');
+				return;
+			}
+			if (!/(^1[2|3|4|5|6|7|8|9][0-9]{9}$)/.test(this.account)) {
+				this.$api.msg('请输入正确的手机号');
+				return;
+			}
+			// 判断是否在倒计时
+			if (obj.countDown > 0) {
+				return false;
+			} else {
+				obj.countDown = 60;
+				obj.time = setInterval(() => {
+					obj.countDown--;
+				}, 1000);
+				//调用验证码接口
+				verify({
+					phone: obj.account,
+					type: 'BDING_CODE'
+				})
+					.then(({ data }) => {})
+					.catch(err => {
+						console.log(err);
+					});
+			}
+		},
+		confirm(e) {
+			let obj = this;
+			obj.loding = true;
+			spread({
+				phone: obj.account,
+			})
+				.then(({ data }) => {
+					obj.$api.msg('绑定成功！');
+					userinfo({})
+						.then(({ data }) => {
+							this.setUserInfo(data);
+						})
+						.catch(e => {
+							console.log(e);
+						});
+					setTimeout(function() {
+						obj.loding = false;
+						uni.navigateBack({
+							
+						})
+					}, 1000);
+				})
+				.catch(err => {
+					obj.loding = false;
+					console.log(err);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30rpx;
+	height: 110rpx;
+	background: #fff;
+
+	.tit {
+		flex-shrink: 0;
+		width: 120rpx;
+		font-size: 30rpx;
+		color: $font-color-dark;
+	}
+	.input {
+		flex: 1;
+		font-size: 30rpx;
+		color: $font-color-dark;
+	}
+	.iconlocation {
+		font-size: 36rpx;
+		color: $font-color-light;
+	}
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690rpx;
+	height: 80rpx;
+	margin: 60rpx auto;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10rpx;
+	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+
+.bg-gray {
+	background-color: $color-gray;
+}
+.code {
+	color: #5dbc7c;
+	font-size: 23rpx;
+	border-left: 1px solid #eeeeee;
+	width: 150rpx;
+	flex-shrink: 0;
+	text-align: center;
+}
+</style>

pages/user/award.vue

@@ -1,307 +1,421 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="money-box">
-				<view class="text">可提现佣金（元）</view>
-				<view class="money">{{ money | 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+'px'}" 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>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { spreadCommission, userBalance, extractBank } 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
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady() {
-		//初始化获取页面宽度
-		uni.createSelectorQuery().select('.content')
-			.fields(
-			{
-				size:true
-			},
-			data => {
-				console.log(data);
-				console.log(Math.floor((data.width /750) * 300));
-				//保存头部高度
-				this.maxheight =data.height - Math.floor((data.width / 750) * 570);
-				console.log(this.maxheight);
-				}
-			)
-			.exec();
-	},
-	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();
-		//获取用户余额
-		extractBank({}).then(({ data }) => {
-			this.money = data.commissionCount;
-			// this.minPrice = data.minPrice;
-			// this.freeze = data.incommissionCount;
-		});
-	},
-	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;
-	.text {
-		padding-top: 147rpx;
-		font-size: $font-sm;
-	}
-	.money {
-		font-size: 56rpx;
-	}
-}
-
-.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: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-//列表
-
-.swiper-box {
-	padding-top: 10rpx;
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-		}
-	}
-}
-.list-scroll-content {
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的补贴券</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/yongjin-bg.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.brokerage_price }}</view>
+				<view>我的补贴券</view>
+			</view>
+			<view class="money-btn" @click="navto('/pages/money/withdrawal')">
+				补贴券转换
+				<text>></text>
+			</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{recharge}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</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>
+						<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">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
+import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	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.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
+			navList: [
+				{
+					state: 0,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 ,//每次信息条数
+					loaded: false
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 ,//每次信息条数
+					loaded: false
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.navigateBack({});
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this;
+			//这里是将订单挂载到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 }) => {
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+						console.log(data);
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list[0].list);
+						console.log(navItem.orderList);
+						navItem.page++;
+					}else {
+						navItem.loadingType = 'noMore';
+					}
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
 </style>

pages/user/cash.vue

@@ -0,0 +1,417 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的现金</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/cash-bg.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ userInfo.cash }}</view>
+				<view>我的现金</view>
+			</view>
+			<view class="moneybtn-box">
+				<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=cash')">
+					现金转账
+				</view>
+				<view class="money-btn" @click="navto('/pages/user/withdrawal')">
+					现金提现
+				</view>
+			</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{recharge}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</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>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { cashList, userBalance } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
+import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	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.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
+			navList: [
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.navigateBack({});
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			let obj = this
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+
+			cashList(
+				{
+					page: navItem.page,
+					limit: navItem.limit,
+					pm: state
+				}
+			)
+				.then(({ data }) => {
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						navItem.orderList = navItem.orderList.concat(data.list);
+						console.log(navItem.orderList);
+						navItem.page++;
+					}
+					if (navItem.limit == data.list.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.moneybtn-box {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding:20rpx 50rpx ;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		&.current {
+			color: #000;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+</style>

pages/user/jiedian.vue

@@ -1,205 +1,185 @@
 <template>
 	<view class="contant">
-		<view class="jiedian-box" v-for="(item,index) in jieList">
+		<view class="jiedian-box" v-for="(item, index) in jieList">
 			<view class="box-top">
 				<view class="title-top">
-					<view class="img">
-						<image src="../../static/img/jiedian01.png" mode=""></image>
-					</view>
-					<view class="title">
-						响亮节点
-					</view>
+					<view class="img"><image src="../../static/img/jiedian01.png" mode=""></image></view>
+					<view class="title">响亮节点</view>
 				</view>
-				<!-- <view class="xiangqing" @click="navTo(item.id)">
-					详情>
-				</view> -->
-				<text class="xiangqing" @click="navTo(item.id)">
+				<view class="xiangqing" @click="navTo(item.id)">
+					详情
+					<text>></text>
+				</view>
+				<!-- <text class="xiangqing" @click="navTo(item.id)">
 						详情>
-					</text>
+					</text> -->
 			</view>
 			<view class="box-bottom">
 				<view class="shouyi">
-					<view class="jiedian">
-						节点收益
-					</view>
-					<view class="number">
-						{{item.get}}
-					</view>
+					<view class="jiedian">节点收益</view>
+					<view class="number">{{ item.get }}</view>
 				</view>
 				<view class="shouyi">
-					<view class="jiedian">
-						团队人数
-					</view>
-					<view class="number">
-						{{item.children_num}}
-					</view>
+					<view class="jiedian">团队人数</view>
+					<view class="number">{{ item.children_num }}</view>
 				</view>
 				<view class="shouyi">
-					<view class="jiedian">
-						参加时间
-					</view>
-					<view class="number">
-						{{item.add_time | getTime}}
-					</view>
+					<view class="jiedian">参加时间</view>
+					<view class="number">{{ item.add_time | getTime }}</view>
 				</view>
 			</view>
-
 		</view>
-		<uni-load-more  :status="loadingType"></uni-load-more>
+		<uni-load-more :status="loadingType"></uni-load-more>
 	</view>
 </template>
 
 <script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	// import getTime from '../../utils/rocessor.js'
-	import {
-		lookSubpoints,
-		lookOneself
-	} from '../../api/user.js'
-	export default {
-		data() {
-			return {
-				jieList: [],
-				page: 1, //当前页数
-				limit: 10, //每次信息条数
-				loadingType: 'more',
-			};
-		},
-		filters: {
-			getTime(val) {
-				let str = ''
-				if(val) {
-					const date = new Date(val*1000);
-					const year = date.getFullYear();
-					const mon = date.getMonth() + 1;
-					const day = date.getDate();
-					const hours = date.getHours();
-					const minu = date.getMinutes();
-					const sec = date.getSeconds();
-					str =  year + '-' + mon + '-' + day + ' ' + hours + ':' + minu + ':' + sec;
-				}
-				return str
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { lookSubpoints, lookOneself } from '../../api/user.js';
+export default {
+	data() {
+		return {
+			jieList: [],
+			page: 1, //当前页数
+			limit: 10, //每次信息条数
+			loadingType: 'more'
+		};
+	},
+	filters: {
+		getTime(val) {
+			let str = '';
+			if (val) {
+				const date = new Date(val * 1000);
+				const year = date.getFullYear();
+				const mon = date.getMonth() + 1;
+				const day = date.getDate();
+				const hours = date.getHours();
+				const minu = date.getMinutes();
+				const sec = date.getSeconds();
+				str = year + '-' + mon + '-' + day + ' ' + hours + ':' + minu + ':' + sec;
 			}
-		},
-		// onLoad() {
-		// 	this.lookMyjiedian()
-		// },
-		onShow() {
-			this.lookMyjiedian()
-		},
-		onReachBottom(){
-			this.lookMyjiedian()
-		},
-		methods: {
-			lookMyjiedian() {
-				let obj = this
-				if(obj.loadingType=="noMore" ||obj.loadingType=='loading'){
-					return
-					
-				}
-				obj.loadingType ='loading'
-				lookOneself(
-				{
-					page: obj.page,
-					limit: obj.limit
-				}).then(res => {
-					
-					console.log(res);
-					obj.jieList = obj.jieList.concat(res.data.points)
-					if(res.data.points.length!=obj.limit){
-						obj.loadingType='noMore'
-						
-					}else{
-						obj.loadingType = 'more'
-						obj.page++
-					}
-					console.log(obj.loadingType, '2222222');
-				})
-			},
-			navTo(id) {
-				uni.navigateTo({
-					url: './jiedianDetails?id=' + id
-				})
+			return str;
+		}
+	},
+	// onLoad() {
+	// 	this.lookMyjiedian()
+	// },
+	onShow() {
+		this.lookMyjiedian();
+	},
+	onReachBottom() {
+		this.lookMyjiedian();
+	},
+	methods: {
+		lookMyjiedian() {
+			let obj = this;
+			if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
+				return;
 			}
+			obj.loadingType = 'loading';
+			lookOneself({
+				page: obj.page,
+				limit: obj.limit
+			}).then(res => {
+				console.log(res);
+				obj.jieList = obj.jieList.concat(res.data.points);
+				if (res.data.points.length != obj.limit) {
+					obj.loadingType = 'noMore';
+				} else {
+					obj.loadingType = 'more';
+					obj.page++;
+				}
+				console.log(obj.loadingType, '2222222');
+			});
+		},
+		navTo(id) {
+			uni.navigateTo({
+				url: './jiedianDetails?id=' + id
+			});
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	page,.contant {
-		// background: #F3F3F3;
-		
-		margin: 0;
-		padding: 0;
-		height: 100%;
-		width: 100%;
-	}
-
-	.jiedian-box {
-
-		background: #FFFFFF;
+page,
+.contant {
+	// background: #F3F3F3;
+
+	margin: 0;
+	padding: 0;
+	height: 100%;
+	width: 100%;
+}
+
+.jiedian-box {
+	background: #ffffff;
+	display: flex;
+	flex-direction: column;
+	padding: 30rpx;
+	justify-content: space-between;
+	margin: 20rpx 30rpx;
+	border-radius: 15rpx;
+	box-shadow: 2px 2px 0px #ebeef5;
+}
+
+.box-top {
+	display: flex;
+	justify-content: space-between;
+	text-align: center;
+	line-height: 1;
+	.title-top {
 		display: flex;
-		flex-direction: column;
-		padding: 30rpx;
-		justify-content: space-between;
-		margin: 20rpx 30rpx;
-		border-radius: 15rpx;
-		box-shadow: 2px 2px 0px #EBEEF5;
-	}
-
-	.box-top {
-		display: flex;
-		justify-content: space-between;
+		justify-content: center;
 		text-align: center;
 
-		.title-top {
-			display: flex;
-			justify-content: center;
-			text-align: center;
-
-			.img {
-				width: 40rpx;
-				height: 40rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.title {
-				margin-left: 5rpx;
-				font-size: 32rpx;
-				font-weight: bold;
+		.img {
+			width: 40rpx;
+			height: 40rpx;
 
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
 
-		.xiangqing {
-			color: red;
-			font-size: 28rpx;
-			line-height: 40rpx;
+		.title {
+			margin-left: 5rpx;
+			font-size: 32rpx;
+			font-weight: bold;
 		}
 	}
 
-	.box-bottom {
-		margin-top: 20rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		text-align: center;
-	}
-
-	.shouyi {
-		margin: 6rpx 0;
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.jiedian {
-		font-size: 26rpx;
-		color: #999999;
+	.xiangqing {
+		color: red;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		text {
+			display: inline-block;
+			margin-left: 10rpx;
+		}
 	}
-
-	.number {}
+}
+
+.box-bottom {
+	margin-top: 20rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	text-align: center;
+}
+
+.shouyi {
+	margin: 6rpx 0;
+	display: flex;
+	justify-content: space-between;
+}
+
+.jiedian {
+	font-size: 26rpx;
+	color: #999999;
+}
+
+.number {
+}
 </style>

pages/user/jiedianDetails.vue

@@ -22,14 +22,14 @@
 			</view>
 		</view>
 		<view class="box-1">
-			<view class="tuandui-box" v-for="item in childrenList">
+			<view class="tuandui-box" v-for="item in childrenList" @click="next(item.id)">
 				<view class="box-img">
 					<image :src="item.user.avatar" mode=""></image>
 				</view>
 				<view class="box-content">
 					<view class="content-top">
 						<view class="content-top-left">
-							<view class="name">
+							<view class="name clamp">
 								{{item.user.nickname}}
 							</view>
 							<view class="time">
@@ -44,14 +44,14 @@
 						<view class="xianlu">
 							线路：{{item.way}}
 						</view>
-						<!-- <view class="number">
-							团队共{{item.parent_id}}人
-						</view> -->
 					</view>
 				</view>
 			</view>
 		</view>
 		<uni-load-more :status="loadingType"></uni-load-more>
+		<view class="btn" v-if="parentList.length != 0" @click="back()">
+			返回上一层
+		</view>
 	</view>
 </template>
 
@@ -68,6 +68,7 @@
 		data() {
 			return {
 				dtailId: '',
+				parentList:[],//父亲节点
 				childrenList: [],
 				jieList: [],
 				childrenNum: '',
@@ -96,8 +97,6 @@
 		},
 		onLoad(option) {
 			this.detailId = option.id
-			console.log(this.detailId, '上一个页面');
-			console.log(option, '22223333');
 			this.lookDetail()
 			this.lookMyjiedian()
 
@@ -108,19 +107,17 @@
 				lookOneself().then(res => {
 
 					console.log(res);
-					obj.jieList = res.data.points.map(e => {
-						return e
-					})
+					obj.jieList = res.data.points;
 					console.log(obj.jieList, '11');
 					obj.childrenNum = obj.jieList[0].children_num
 					obj.money = obj.jieList[0].get
 					console.log(obj.childrenNum, obj.money);
 				})
 			},
-			
 			lookDetail() {
 				let obj = this
 				if(obj.loadingType=='loading' || obj.loadingType=='noMore'){
+					console.log("进入");
 					return
 				}
 				obj.loadingType = 'loading'
@@ -139,11 +136,25 @@
 						obj.loadingType='more'
 						obj.page++
 					}
-					
-					
-
 					console.log(obj.childrenList, '详细数据1');
 				})
+			},
+			next(id) {
+				console.log(id,"id");
+				if(this.parentList.length == 11) {
+					return
+				}
+				this.parentList.push(this.detailId)
+				this.detailId = id
+				this.loadingType='more'
+				this.childrenList = [],
+				this.lookDetail()
+			},
+			back() {
+				this.detailId = this.parentList.pop();
+				this.loadingType='more'
+				this.childrenList = [],
+				this.lookDetail()
 			}
 		}
 	}
@@ -255,9 +266,7 @@
 						text-overflow: ellipsis;
 						font-size: 30rpx;
 						font-weight: bold;
-
 					}
-
 					.time {
 						color: #999999;
 						margin-left: 15rpx;
@@ -288,4 +297,21 @@
 			}
 		}
 	}
+.btn {
+	position: fixed;
+	bottom: 30rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+	width: 604rpx;
+	height: 90rpx;
+	border: 2px solid #F21F5D;
+	border-radius: 45rpx;
+	font-size: 34rpx;
+	font-family: SourceHanSansCN;
+	font-weight: 400;
+	color: #EF0E74;
+	line-height: 90rpx;
+	text-align: center;
+}
 </style>

pages/user/mygx.vue

@@ -0,0 +1,407 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">我的分红积分</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/mygx.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{ my_point }}</view>
+				<view>我的分红积分</view>
+				<view>1分红积分价值{{ price * 1}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
+import { share } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
+import empty from '@/uview-ui/components/u-empty/u-empty.vue';
+export default {
+	filters: {
+		getMoneyStyle
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	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.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			price: 0,
+			my_point: 0,
+			navList: [
+				{
+					state: 0,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				},
+				{
+					state: 1,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10, //每次信息条数
+					loaded: false
+				}
+			],
+			money: ''
+		};
+	},
+	onLoad(options) {},
+	onShow() {
+		share().then(({data}) =>{
+			this.price = data.price;
+			this.my_point = data.my_point;
+			console.log(data);
+		})
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.navigateBack({});
+		},
+		//获取收入支出信息
+		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' || navItem.loadingType == 'noMore') {
+				//防止重复加载
+				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++;
+					}
+					if (navItem.limit == data.length) {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'more';
+						return;
+					} else {
+						//判断是否还有数据， 有改为 more， 没有改为noMore
+						navItem.loadingType = 'noMore';
+					}
+					uni.hideLoading();
+					this.$set(navItem, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f1f1f1;
+	height: 100%;
+}
+
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+
+.content-money {
+	position: relative;
+	height: 480rpx;
+
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+
+	.text {
+		font-size: 30rpx;
+	}
+}
+
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #ffffff;
+
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
+.navbar {
+	margin-top: 20rpx;
+	display: flex;
+	height: 88rpx;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+
+		&.current {
+			color: #000;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid #fe5b38;
+			}
+		}
+	}
+}
+
+//列表
+.swiper-box {
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
+
+	.order-item {
+		padding: 20rpx 30rpx;
+		line-height: 1.5;
+
+		.title-box {
+			.title {
+				font-size: $font-lg;
+				color: $font-color-base;
+			}
+
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+
+		.money {
+			color: #fd5b23;
+			font-size: $font-lg;
+			text-align: right;
+
+			.status {
+				color: $font-color-light;
+			}
+		}
+	}
+}
+
+.list-scroll-content {
+	background: #ffffff;
+	height: 100%;
+}
+
+.content {
+	height: 100%;
+
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
+
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
+	position: fixed;
+	bottom: 48rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+</style>

pages/user/scoreAccumulate.vue

@@ -1,68 +1,134 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="body-title">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+				<view class="header">响亮积分</view>
+			</view>
+			<view class="content-bg"><image src="../../static/img/myjf.png" mode=""></image></view>
+			<view class="money-box">
+				<view class="money">{{userInfo.integral | getMoneyStyle}}</view>
+				<view>我的响亮积分</view>
+			</view>
+			<view class="money-btn" @click="navto('/pages/money/withdmoenys')">
+				积分转账
+				<text>></text>
+			</view>
+		</view>
+		<view class="info-box flex">
+			<view class="info-item">
+				<view class="info-font">累计收入</view>
+				<view class="info-num">{{recharge}}</view>
+			</view>
+			<view class="shu"></view>
+			<view class="info-item">
+				<view class="info-font">累计支出</view>
+				<view class="info-num">{{orderStatusSum}}</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" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
+	
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view>
+						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.mark }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
 							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
+								<view v-if="item.status == 0" class="status">待发放</view>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<view class="btn" @click="navto('/pages/money/withdmoenys')">
-			响亮积分转账
-		</view>
 	</view>
 </template>
 
 <script>
-	
 import { integrallist } from '@/api/functionalUnit.js';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+import { mapState, mapMutations } from 'vuex';
 export default {
+	filters: {
+		getMoneyStyle
+	},
 	components: {
 		empty,
 		uniLoadMore
 	},
-	onReady() {
-		
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onReady(res) {
+		var _this = this;
+		uni.getSystemInfo({
+			success: resu => {
+				const query = uni.createSelectorQuery();
+				query.select('.swiper-box').boundingClientRect();
+				query.exec(function(res) {
+					_this.height = resu.windowHeight - res[0].top + 'px';
+					console.log('打印页面的剩余高度', _this.height);
+				});
+			},
+			fail: res => {}
+		});
 	},
 	data() {
 		return {
+			height: '',
+			// 头部图高度
+			maxheight:'',
 			tabCurrentIndex: 0,
+			orderStatusSum: 0,
+			recharge: 0,
 			navList: [
+				// {
+				// 	state: 0,
+				// 	text: '全部',
+				// 	loadingType: 'more',
+				// 	orderList: [],
+				// 	page: 1, //当前页数
+				// 	limit: 10 //每次信息条数
+				// },
 				{
 					state: 0,
-					text: '全部',
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
 		};
 	},
+	onLoad(options) {},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
 	},
 	methods: {
@@ -74,6 +140,7 @@ export default {
 		},
 		//获取收入支出信息
 		async loadData(source) {
+			let obj = this
 			//这里是将订单挂载到tab列表下
 			let index = this.tabCurrentIndex;
 			let navItem = this.navList[index];
@@ -92,16 +159,20 @@ export default {
 			integrallist(
 				{
 					page: navItem.page,
-					limit: navItem.limit
+					limit: navItem.limit,
+					pm: state
 				},
-				state
 			)
 				.then(({ data }) => {
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data);
+					obj.recharge = data.income;
+					obj.orderStatusSum = data.expend;
+					if (data.list.length > 0) {
+						console.log(data);
+						navItem.orderList = navItem.orderList.concat(data.list);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
-					if (navItem.limit == data.length) {
+					if (navItem.limit == data.list.length) {
 						//判断是否还有数据， 有改为 more， 没有改为noMore
 						navItem.loadingType = 'more';
 						return;
@@ -125,6 +196,11 @@ export default {
 		//顶部tab点击
 		tabClick(index) {
 			this.tabCurrentIndex = index;
+		},
+		toBack() {
+			uni.navigateBack({
+				
+			})
 		}
 	}
 };
@@ -132,12 +208,137 @@ export default {
 
 <style lang="scss">
 page {
-	background: #ffffff;
+	background: #f1f1f1;
 	height: 100%;
 }
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+.content-money {
+	position: relative;
+	height: 480rpx;
+	.content-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		width: 750rpx;
+		height: 480rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			left: 18rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+
+		.goback {
+			z-index: 100;
+			width: 34rpx;
+			height: 34rpx;
+		}
+	}
+}
+.info-box {
+	width: 670rpx;
+	height: 186rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 20rpx;
+	margin: -100rpx auto 0;
+	position: relative;
+	z-index: 2;
+	.info-item {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1;
+		.info-font {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #999999;
+		}
+		.info-num {
+			margin-top: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #181818;
+		}
+	}
+	.shu {
+		width: 2rpx;
+		height: 74rpx;
+		background: #dcdfe6;
+	}
+}
+.money-box {
+	position: relative;
+	z-index: 2;
+	padding-top: 90rpx;
+	color: #ffffff;
+	text-align: center;
+	.money {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+	}
+	.text {
+		font-size: 30rpx;
+	}
+}
+.money-btn {
+	position: relative;
+	z-index: 2;
+	color: #ffffff;
+	padding-right: 50rpx;
+	text-align: right;
+	font-size: 30rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #FFFFFF;
+	text {
+		display: inline-block;
+		padding-left: 10rpx;
+	}
+}
+
 .navbar {
+	margin-top: 20rpx;
 	display: flex;
-	height: 40px;
+	height: 88rpx;
 	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
@@ -150,10 +351,10 @@ page {
 		align-items: center;
 		height: 100%;
 		font-size: 15px;
-		color: $font-color-dark;
+		color: #999999;
 		position: relative;
 		&.current {
-			color: $base-color;
+			color: #000;
 			&:after {
 				content: '';
 				position: absolute;
@@ -162,16 +363,16 @@ page {
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid $base-color;
+				border-bottom: 2px solid #fe5b38;
 			}
 		}
 	}
 }
-// 列表
-
+//列表
 .swiper-box {
-	height: calc(100% - 44px);
-	padding-top: 10rpx;
+	.order-item:last-child {
+		margin-bottom: 60rpx;
+	}
 	.order-item {
 		padding: 20rpx 30rpx;
 		line-height: 1.5;
@@ -188,10 +389,15 @@ page {
 		.money {
 			color: #fd5b23;
 			font-size: $font-lg;
+			text-align: right;
+			.status {
+				color: $font-color-light;
+			}
 		}
 	}
 }
 .list-scroll-content {
+	background: #ffffff;
 	height: 100%;
 }
 .content {
@@ -200,19 +406,21 @@ page {
 		background-color: #ffffff;
 	}
 }
-.btn {
+.btn-box {
+	width: 674rpx;
+	height: 88rpx;
+	background: linear-gradient(0deg, #2e58ff, #32c6ff);
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+	text-align: center;
+	line-height: 88rpx;
 	position: fixed;
-	bottom: 30rpx;
+	bottom: 48rpx;
 	left: 0;
 	right: 0;
-	width: 690upx;
-	height: 80upx;
 	margin: 0 auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10upx;
-	text-align: center;
-	line-height: 80upx;
 }
 </style>

pages/user/team.vue

@@ -0,0 +1,492 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="status_bar"><!-- 这里是状态栏 --></view>
+			<view class="money-box">
+				<view class="money-frame">
+					<view class="money_num">
+						<text class="money_ren">共</text>
+						{{ all || '0' }}
+						<text class="money_ren">人</text>
+					</view>
+				</view>
+			</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 class="list-scroll-content" :style="{ height: maxheight }" scroll-y @scrolltolower="loadData">
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
+						<view class="title-box flex_item">
+							<view class="title-avatar"><image :src="item.avatar"></image></view>
+							<view class="list_tpl">
+								<view class="title">
+									<view class="title-name clamp">{{ item.nickname }}</view>
+								</view>
+								<view class="time">
+									<text>{{ item.time }}</text>
+								</view>
+							</view>
+							<view class="money">
+								<text>{{ item.self_achievement == null ? '未购买' : item.self_achievement + '元' }}</text>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+<script>
+import { myspread } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	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.height);
+				});
+			},
+			fail: res => {}
+		});
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '直接推荐',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			all: '',
+			list: '',
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onLoad(options) {},
+	onShow() {
+		this.loadData();
+	},
+	methods: {
+		// 页面跳转
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		//获取收入支出信息
+		async loadData(source) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			if (navItem.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			myspread({
+				page: navItem.page,
+				limit: navItem.limit
+			})
+				.then(({ data }) => {
+					console.log(data);
+					this.all = data.total;
+					if (data.list.length > 0) {
+						this.list = data.list;
+						navItem.orderList = navItem.orderList.concat(data.list);
+						navItem.page++;
+					}
+					this.$nextTick(function() {
+						if (navItem.limit == data.list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'noMore';
+						}
+					});
+					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;
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.switchTab({
+				url: '/pages/user/user'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #f8f8f8;
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background: #5dbc7c;
+}
+.content-money {
+	background: #5dbc7c;
+	padding-bottom: 30rpx;
+	.buttom-box {
+		position: relative;
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 30rpx 0;
+		border-radius: $border-radius-sm;
+		margin-top: -80rpx;
+
+		.buttom {
+			font-size: $font-lg;
+			flex-grow: 1;
+
+			.money {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #ff0000;
+			}
+		}
+
+		.text {
+			color: #666666;
+		}
+
+		.interval {
+			width: 2rpx;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+
+.money-box {
+	height: 484rpx;
+	color: #ffffff;
+	text-align: center;
+	font-size: 35rpx;
+	position: relative;
+	.header {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80rpx;
+		font-size: 32rpx;
+		font-weight: 700;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.goback-box {
+		position: absolute;
+		left: 18rpx;
+		top: 0;
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.goback {
+		z-index: 100;
+		width: 34rpx;
+		height: 34rpx;
+	}
+	.right {
+		position: absolute;
+		top: 140rpx;
+		right: 40rpx;
+		text-align: right;
+		line-height: 1;
+		.right-num {
+			font-size: 50rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+
+			color: #ffffff;
+		}
+		.right-font {
+			margin-top: 10rpx;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #ffffff;
+		}
+		.time {
+			font-size: 26rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 35px;
+		}
+	}
+	.user {
+		position: absolute;
+		top: 140rpx;
+		left: 34rpx;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		z-index: 10;
+		.avtor {
+			width: 102rpx;
+			height: 102rpx;
+			border-radius: 50%;
+			position: relative;
+			.portrait {
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+			}
+			.he {
+				position: absolute;
+				height: 30rpx;
+				bottom: -4rpx;
+				left: 0;
+				.image {
+					width: 102rpx;
+					height: 30rpx;
+				}
+			}
+		}
+		.name {
+			margin-left: 30rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			display: flex;
+			justify-content: start;
+			.name-left {
+				width: 220rpx;
+			}
+			.name-right {
+				margin-left: 20rpx;
+				width: 50rpx;
+				height: 60rpx;
+				position: relative;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				.level {
+					position: absolute;
+					top: 35%;
+					left: 50%;
+					margin-left: -12rpx;
+					font-size: 20rpx;
+				}
+			}
+		}
+		.id {
+			margin-left: 30rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+		}
+	}
+
+	.money_img {
+		width: 100%;
+		height: 120rpx;
+		text-align: center;
+		padding-top: 50rpx;
+		padding-bottom: 135rpx;
+
+		image {
+			width: 120rpx;
+			height: 120rpx;
+			border: 4rpx solid #fd5f6f;
+			border-radius: 50%;
+		}
+	}
+
+	.money-frame {
+		position: absolute;
+		top: 0;
+		width: 100%;
+		padding-top: 200rpx;
+	}
+	.money_num {
+		font-size: 72rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #ffffff;
+
+		.money_ren {
+			font-size: 36rpx;
+		}
+	}
+}
+
+.order-item {
+	padding: 20rpx 30rpx;
+	line-height: 1.5;
+
+	.title-box {
+		width: 100%;
+
+		.title-avatar {
+			flex-shrink: 0;
+			width: 100rpx;
+			height: 100rpx;
+			margin-right: 25rpx;
+			border-radius: 100%;
+			image {
+				width: 100%;
+				height: 100%;
+				border-radius: 100%;
+			}
+		}
+
+		.list_tpl {
+			width: 85%;
+
+			.title {
+				display: flex;
+				justify-content: flex-start;
+				font-size: $font-lg;
+				color: $font-color-base;
+				overflow: hidden; //超出的文本隐藏
+				text-overflow: ellipsis; //溢出用省略号显示
+				white-space: nowrap;
+				line-height: 1;
+				text-align: center;
+				.title-name {
+					max-width: 40%;
+				}
+				.dl {
+					margin-left: 10rpx;
+					width: 93rpx;
+					height: 32rpx;
+					border-radius: 16rpx;
+					image {
+						width: 93rpx;
+						height: 32rpx;
+						border-radius: 16rpx;
+					}
+				}
+				.class {
+					display: inline-block;
+					margin-left: 10rpx;
+					padding: 6rpx;
+					text-align: center;
+					border: 1px solid #2e58ff;
+					border-radius: 16rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #2e58ff;
+				}
+			}
+
+			.time {
+				font-size: $font-base;
+				color: $font-color-light;
+			}
+		}
+	}
+
+	.money {
+		width: 50%;
+		text-align: right;
+		color: #db1935;
+		font-size: $font-lg;
+	}
+}
+.yeji {
+	position: relative;
+	margin: -72rpx auto 0;
+	width: 690rpx;
+	height: 143rpx;
+	background: #ffffff;
+	box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(50, 50, 52, 0.06);
+	border-radius: 10rpx;
+	display: flex;
+	align-items: center;
+
+	.yeji-a {
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		.yeji-top {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.yeji-buttom {
+			font-size: 42rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+
+	.border {
+		width: 1rpx;
+		height: 51rpx;
+		background: #dddddd;
+	}
+}
+</style>

pages/user/user.vue

@@ -1,170 +1,141 @@
 <template>
 	<view class="container">
 		<view class="vheigh"></view>
-		<scroll-view class="content-box" scroll-y="true">
-			<view class="user-section">
-				<view class="bg"></view>
-				<view class="user-info-box ">
-					<view class="detail flex" @click="navTo('/pages/set/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.lock_spread_user != null">邀请人:{{ userInfo.lock_spread_user.phone }}</view>
-							<view class="font-size-sm" v-if="userInfo.unlock_spread_user != null" @click.stop="navTo('/pages/index/index')">
-								已锁定邀请人:{{ userInfo.unlock_spread_user.phone }}购买会员礼包绑定关系
-							</view>
-						</view>
-					</view>
-					<view class="config iconfont">
-						<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
-						<!-- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text> -->
-					</view>
+		<view class="user-top">
+			<image src="../../static/img/user-top-bg.png" mode="" class="user-top-bg"></image>
+			<view class="user-info" @click="navTo('/pages/set/set')">
+				<image class="avtar" :src="userInfo.avatar" mode=""></image>
+				<view class="name">{{ userInfo.nickname }}</view>
+				<view class="phone">{{ userInfo.phone }}</view>
+			</view>
+			<view class="sy-box flex">
+				<view class="sy-item" @click="navTo('/pages/money/wallet')">
+					<view class="sy-item-name">余额</view>
+					<view class="sy-item-val">{{ userInfo.now_money  || '0.00' }}</view>
+				</view>
+				<view class="jg"></view>
+				<view class="sy-item" @click="navTo('/pages/user/scoreAccumulate')">
+					<view class="sy-item-name">响亮积分</view>
+					<view class="sy-item-val">{{ userInfo.integral || '0.00' }}</view>
+				</view>
+				<view class="jg"></view>
+				<view class="sy-item" @click="navTo('/pages/user/cash')">
+					<view class="sy-item-name">现金</view>
+					<view class="sy-item-val">{{ userInfo.cash }}</view>
 				</view>
-				<!-- 会员卡功能 -->
-				<!-- <view class="vip-card-box">
-					<image class="card-bg" src="/static/img/vip-card-bg.png" mode=""></image>
-					<view class="b-btn">我要升级</view>
-					<view class="tit">
-						<text class="iconfont icon-iLinkapp-"></text>
-						升级专享优惠权益
-					</view>
-					<text class="e-m">DCloud Union</text>
-					<text class="e-b">开通会员开发无bug 一测就上线</text>
-				</view> -->
 			</view>
-
-			<!-- <view
-				class="cover-container"
-				:style="[
-					{
-						transform: coverTransform,
-						transition: coverTransition
-					}
-				]"
-				@touchstart="coverTouchstart"
-				@touchmove="coverTouchmove"
-				@touchend="coverTouchend"
-			> -->
-			<view class="cover-container">
-				<image class="arc" src="/static/img/arc.png"></image>
-
-				<view class="tj-sction">
-					<view class="tj-item" @click="navTo('/pages/money/wallet')">
-						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
-						<text>余额</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/award')">
-						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
-						<text>佣金</text>
-					</view>
-					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
-						<text class="num">{{ userInfo.integral || '0.00' }}</text>
-						<text>响亮积分</text>
-					</view>
+		</view>
+		<view class="item-box">
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myyj.png" mode="aspectFit"></image></view>
+					<text>我的补贴券</text>
 				</view>
-				<!-- 订单 -->
-
-				<view class="item-box">
-					<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的订单</text></view>
-						<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover">
-							<text>全部订单</text>
-							<text class="iconfont iconenter"></text>
-						</view>
-					</view> -->
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.unpaid_count > 0">
-									<text>{{ orderInfo.unpaid_count }}</text>
-								</view>
-							</view>
-							<text>待付款</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
-							<view class=" icon position-relative">
-								<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.unshipped_count > 0">
-									<text>{{ orderInfo.unshipped_count }}</text>
-								</view>
-							</view>
-							<text>待发货</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
-								<view class="corner" v-if="orderInfo.received_count > 0">
-									<text>{{ orderInfo.received_count }}</text>
-								</view>
-							</view>
-							<text>待收货</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/order/order?state=3')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon position-relative">
-								<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
-								<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
-									<text>{{ orderInfo.complete_count }}</text>
-								</view> -->
-							</view>
-							<text>已完成</text>
+				<view class="order-item" @click="navTo('')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myqb.png" mode="aspectFit"></image></view>
+					<text>公益基金</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/user/mygx')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/mygx.png" mode="aspectFit"></image></view>
+					<text>分红积分</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/user/jiedian')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon"><image class="icon-img" src="/static/icon/myjd.png" mode="aspectFit"></image></view>
+					<text>我的节点</text>
+				</view>
+			</view>
+		</view>
+		<!-- 订单 -->
+		<view class="item-box item-box-b">
+			<view class="box-title flex ">
+				<view class="title"><text>我的订单</text></view>
+				<view class="link" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"><text class="iconfont iconenter"></text></view>
+			</view>
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.unpaid_count > 0">
+							<text>{{ orderInfo.unpaid_count }}</text>
 						</view>
 					</view>
+					<text>待付款</text>
 				</view>
-				<view class="item-box">
-					<!-- <view class="box-title flex borde-b">
-						<view class="title"><text>我的资产</text></view>
-					</view> -->
-					<view class="order-section">
-						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-							<text>我的钱包</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/jiedian')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-							<text>我的节点</text>
+				<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover" :hover-stay-time="50">
+					<view class=" icon position-relative">
+						<image class="icon-img" src="/static/icon/i2.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.unshipped_count > 0">
+							<text>{{ orderInfo.unshipped_count }}</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
-							<text>奖励明细</text>
-						</view>
-						<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
-							<text>积分明细</text>
+					</view>
+					<text>待发货</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon position-relative">
+						<image class="icon-img" src="/static/icon/i3.png" mode="aspectFit"></image>
+						<view class="corner" v-if="orderInfo.received_count > 0">
+							<text>{{ orderInfo.received_count }}</text>
 						</view>
-						<!-- <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
-							<text>通用币</text>
+					</view>
+					<text>待收货</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
+					<view class="icon position-relative">
+						<image class="icon-img" src="/static/icon/i4.png" mode="aspectFit"></image>
+						<!-- <view class="corner" v-if="orderInfo.complete_count > 0">
+							<text>{{ orderInfo.complete_count }}</text>
 						</view> -->
 					</view>
+					<text>已完成</text>
 				</view>
-
-				<!-- 浏览历史 -->
-				<view class="history-section icon">
-					<!-- <view class="sec-header">
-						<text class="iconfont iconfavor"></text>
-						<text>浏览历史</text>
-					</view> -->
-					<!-- <scroll-view scroll-x class="h-list">
-						<image
-							class="h-list-image"
-							@click="navTo('/pages/product/product')"
-							src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553105186633&di=c121a29beece4e14269948d990f9e720&imgtype=0&src=http%3A%2F%2Fimg004.hc360.cn%2Fm8%2FM04%2FDE%2FDE%2FwKhQplZ-QteEBvsbAAAAADUkobU751.jpg"
-							mode="aspectFill"
-						></image>
-					</scroll-view> -->
-					<uni-list>
-						<uni-list-item title="我的节点" @click="navTo('/pages/user/jiedian')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="我的钱包" @click="navTo('/pages/money/wallet')" thumb="/static/icon/img11.png"></uni-list-item>
-						<uni-list-item title="我的卡卷" @click="navTo('/pages/user/coupon')" thumb="/static/icon/img12.png"></uni-list-item>
-						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
-						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
-						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
-						<uni-list-item title="绑定手机" @click="navTo('/pages/set/phone')" thumb="/static/icon/img09.png"></uni-list-item>
-					</uni-list>
+			</view>
+		</view>
+		<!--  -->
+		<view class="btm-box flex" @click="navTo('/pages/user/team')">
+			<image src="../../static/icon/mytg.png" mode="widthFix" class="left-img"></image>
+			<view class="">我的推广</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/user/shareQrCode')">
+			<image src="../../static/icon/tghb.png" mode="widthFix" class="left-img"></image>
+			<view class="">推广海报</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/set/address')">
+			<image src="../../static/icon/shdz.png" mode="widthFix" class="left-img"></image>
+			<view class="">收货地址</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="kfOpen">
+			<image src="../../static/icon/kf.png" mode="widthFix" class="left-img"></image>
+			<view class="">客服</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm-box flex" @click="navTo('/pages/set/phone')">
+			<image src="../../static/icon/bdsj.png" mode="widthFix" class="left-img"></image>
+			<view class="">绑定手机</view>
+			<image src="../../static/icon/goto.png" mode="widthFix" class="right-img"></image>
+		</view>
+		<view class="btm" style="height: 44px;"></view>
+		<!-- 客服 -->
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				<view class="img">
+					<image src="../../static/img/img009.png" mode=""></image>
+				</view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="kfClose()">取消</view>
+						<view class="comfirm" @click="comfirm(text)">复制微信</view>
+					</view>
 				</view>
 			</view>
-		</scroll-view>
+		</uni-popup>
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 	</view>
 </template>
@@ -175,6 +146,7 @@ import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
 import { orderData, userinfo } from '@/api/user.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { tabbar } from '@/utils/tabbar.js';
+import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 let startY = 0,
 	moveY = 0,
 	pageAtTop = true;
@@ -185,6 +157,7 @@ export default {
 	},
 	data() {
 		return {
+			text: '',
 			tabbar: tabbar,
 			current: 4,
 			coverTransform: 'translateY(0px)',
@@ -272,6 +245,9 @@ export default {
 		 * navigator标签现在默认没有转场动画，所以用view
 		 */
 		navTo(url) {
+			if(url == ''){
+				this.$api.msg('敬请期待')
+			}
 			if (!this.hasLogin) {
 				// 保存地址
 				saveUrl();
@@ -331,7 +307,28 @@ export default {
 			this.moving = false;
 			this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
 			this.coverTransform = 'translateY(0px)';
-		}
+		},
+		kfOpen() {
+			this.$refs.popupkf.open()
+		},
+		kfClose() {
+			this.$refs.popupkf.close()
+		},
+		comfirm(text) {
+			console.log(text);
+			const result = uniCopy(text);
+			if (result === false) {
+				uni.showToast({
+					title: '不支持'
+				});
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+			this.$refs.popup.close();
+		},
 	}
 };
 </script>
@@ -339,12 +336,14 @@ export default {
 page {
 	height: 100%;
 }
+
 %flex-center {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
 }
+
 %section {
 	display: flex;
 	justify-content: space-around;
@@ -352,21 +351,26 @@ page {
 	background: #fff;
 	border-radius: 10rpx;
 }
+
 .container {
 	height: 100%;
 	background-color: $page-color-base;
 }
+
 .content-box {
 	height: 100%;
 }
+
 .vheigh {
 	height: var(--status-bar-height);
 	background-color: $base-color;
 }
+
 .user-section {
 	height: 435rpx;
 	padding: 15rpx 30rpx 0;
 	position: relative;
+
 	.bg {
 		position: absolute;
 		left: 0;
@@ -376,6 +380,7 @@ page {
 		background-color: $base-color;
 	}
 }
+
 .user-info-box {
 	height: 180rpx;
 	color: white;
@@ -384,10 +389,13 @@ page {
 	justify-content: space-between;
 	position: relative;
 	z-index: 1;
+
 	.detail {
 		height: 130rpx;
+
 		.portrait-box {
 			height: 100%;
+
 			.portrait {
 				width: 130rpx;
 				height: 100%;
@@ -395,18 +403,22 @@ page {
 				border-radius: 50%;
 			}
 		}
+
 		.info-box {
 			margin-left: 20rpx;
 			line-height: 1.5;
+
 			.username {
 				font-size: $font-lg + 6rpx;
 				height: 100%;
 			}
 		}
 	}
+
 	.config {
 		font-size: 48rpx;
 		height: 130rpx;
+
 		.setting {
 			margin-right: 51rpx;
 		}
@@ -423,6 +435,7 @@ page {
 	overflow: hidden;
 	position: relative;
 	padding: 20rpx 24rpx;
+
 	.card-bg {
 		position: absolute;
 		top: 20rpx;
@@ -430,6 +443,7 @@ page {
 		width: 380rpx;
 		height: 260rpx;
 	}
+
 	.b-btn {
 		position: absolute;
 		right: 20rpx;
@@ -444,21 +458,25 @@ page {
 		background: linear-gradient(left, #f9e6af, #ffd465);
 		z-index: 1;
 	}
+
 	.tit {
 		font-size: $font-base + 2rpx;
 		color: #f7d680;
 		margin-bottom: 28rpx;
+
 		.iconfont {
 			color: #f6e5a3;
 			margin-right: 16rpx;
 		}
 	}
+
 	.e-b {
 		font-size: $font-sm;
 		color: #d8cba9;
 		margin-top: 10rpx;
 	}
 }
+
 .cover-container {
 	background: $page-color-base;
 	margin-top: -150rpx;
@@ -466,6 +484,7 @@ page {
 	position: relative;
 	background: #f5f5f5;
 	padding-bottom: 20rpx;
+
 	.arc {
 		position: absolute;
 		left: 0;
@@ -474,8 +493,10 @@ page {
 		height: 36rpx;
 	}
 }
+
 .tj-sction {
 	@extend %section;
+
 	.tj-item {
 		@extend %flex-center;
 		flex-direction: column;
@@ -483,6 +504,7 @@ page {
 		font-size: $font-sm;
 		color: #75787d;
 	}
+
 	.num {
 		font-size: $font-lg;
 		color: $font-color-dark;
@@ -491,24 +513,34 @@ page {
 }
 
 .item-box {
-	border-radius: 10rpx;
+	width: 708rpx;
+	height: 163rpx;
+	background: #fff;
+	border-radius: 28rpx;
 	background-color: white;
-	margin-top: 20rpx;
+	margin: -40rpx auto 30rpx;
+	position: relative;
+
+	// margin-top: 20rpx;
 	.box-title {
 		line-height: 1;
 		padding: 30rpx;
+
 		.title {
 			font-size: $font-lg;
 			font-weight: bold;
 		}
+
 		.link {
 			font-size: $font-base - 2rpx;
 			color: $font-color-light;
 		}
 	}
+
 	.order-section {
 		@extend %section;
 		padding: 28rpx 0;
+
 		.order-item {
 			@extend %flex-center;
 			width: 120rpx;
@@ -517,14 +549,17 @@ page {
 			font-size: $font-sm;
 			color: $font-color-dark;
 		}
+
 		.iconfont {
 			font-size: 48rpx;
 			margin-bottom: 18rpx;
 			color: #fa436a;
 		}
+
 		.icon-shouhoutuikuan {
 			font-size: 44rpx;
 		}
+
 		.icon {
 			height: 50rpx;
 			width: 48rpx;
@@ -532,6 +567,7 @@ page {
 			background-size: 100%;
 			background-repeat: no-repeat;
 			background-position: center;
+
 			.icon-img {
 				width: 100%;
 				height: 100%;
@@ -545,6 +581,7 @@ page {
 	margin-top: 20rpx;
 	background: #fff;
 	border-radius: 10rpx;
+
 	.sec-header {
 		display: flex;
 		align-items: center;
@@ -553,6 +590,7 @@ page {
 		line-height: 40rpx;
 		margin-left: 30rpx;
 		padding-top: 30rpx;
+
 		.iconfont {
 			font-size: 44rpx;
 			color: $color-red;
@@ -560,9 +598,11 @@ page {
 			line-height: 40rpx;
 		}
 	}
+
 	.h-list {
 		white-space: nowrap;
 		padding: 30rpx 30rpx 0;
+
 		.h-list-image {
 			display: inline-block;
 			width: 160rpx;
@@ -572,4 +612,192 @@ page {
 		}
 	}
 }
+
+.user-top {
+	height: 564rpx;
+	position: relative;
+
+	.user-top-bg {
+		width: 750rpx;
+		height: 564rpx;
+		// width: 100%;
+		// position: absolute;
+	}
+	.user-info {
+		width: 750rpx;
+		position: absolute;
+		top: 66rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		.avtar {
+			width: 134rpx;
+			height: 134rpx;
+			border-radius: 50%;
+		}
+		.name {
+			margin-top: 20rpx;
+			font-size: 39rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+		.phone {
+			margin-top: 13rpx;
+			font-size: 29rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+	}
+
+	.sy-box {
+		position: absolute;
+		bottom: 30rpx;
+		height: 148rpx;
+		width: 750rpx;
+
+		// background-color: #bfa;
+		.sy-item {
+			width: 30%;
+			flex-grow: 1;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+
+			.sy-item-val {
+				font-size: 39rpx;
+			}
+		}
+
+		.jg {
+			width: 2rpx;
+			height: 68rpx;
+			background-color: #fff;
+		}
+	}
+}
+
+.item-box-b {
+	width: 710rpx;
+	height: 221rpx;
+	background: #ffffff;
+	margin: 20rpx auto 60rpx;
+}
+
+.btm-box {
+	width: 706rpx;
+	height: 104rpx;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 28rpx;
+	margin: 20rpx auto;
+	position: relative;
+	padding: 0 33rpx 0 24rpx;
+	font-size: 29rpx;
+	font-weight: bold;
+	color: #5d5d5d;
+	.left-img {
+		width: 40rpx;
+	}
+	.right-img {
+		width: 14rpx;
+	}
+	view {
+		flex-grow: 1;
+		padding-left: 12rpx;
+	}
+}
+.popup-box {
+		width: 522rpx;
+		height: 605rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		position: relative;
+
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
+			display: flex;
+			justify-content: center;
+
+			image {
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
+			}
+		}
+
+		.mian {
+			margin-top: -44rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
+
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+
+				.title {}
+
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
+				font-size: 32rpx;
+				color: #333333;
+				margin-top: 14rpx;
+			}
+
+			.comfirm-box {
+				margin-top: 52rpx;
+				display: flex;
+				// margin-bottom: 32rpx;
+
+				// justify-content: space-around;
+				.cancel {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					border: 1px solid #dcc786;
+					border-radius: 38rpx;
+
+					font-size: 32rpx;
+					color: #605128;
+				}
+
+				.comfirm {
+					margin-left: 32rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 197rpx;
+					height: 74rpx;
+					background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+					border-radius: 38px;
+					font-size: 32rpx;
+					color: #605128;
+				}
+			}
+		}
+	}
 </style>

pages/user/withdrawal.vue

@@ -1,27 +1,26 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="实际到账70%,剩余30%转化为响亮积分"></uni-notice-bar>
+		<!-- <uni-notice-bar single="true" text="实际到账98%"></uni-notice-bar> -->
 		<view class="content-money">
 			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
-					<view class="icon">{{ money | getMoneyStyle }}</view>
-					<text class="text">可提现佣金</text>
+					<view class="icon">{{ userInfo.cash | getMoneyStyle }}</view>
+					<text class="text">可提现现金</text>
 				</view>
-				<!-- <view class="interval"></view>
-				<view class="buttom">
-					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
-					<text class="text">待审核提现佣金</text>
-				</view> -->
 			</view>
 		</view>
+		
 		<view class="row-box">
 			<view class="title">提现金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
 				<input class="input" type="number" v-model="withdrawal" :placeholder="'最低提现金额' + minPrice + '元'" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = money">全部提现</view>
+				<view class="buttom" @click="withdrawal = userInfo.cash">全部提现</view>
 			</view>
 		</view>
+		<view class="tip" v-if="withdrawal != 0">
+			实际到账 {{ real }}元
+		</view>
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list" >
 			<radio-group @change="tabRadio">
@@ -95,6 +94,8 @@
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { orderData, getUserInfo } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 export default {
 	filters: {
@@ -103,6 +104,12 @@ export default {
 	components: {
 		uniNoticeBar
 	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		real() {
+			return (this.withdrawal * 0.98).toFixed(2) * 1;
+		}
+	},
 	data() {
 		return {
 			type: 'alipay', //提现方式
@@ -133,29 +140,11 @@ export default {
 		// this.loadBank();
 	},
 	methods: {
-		// 更新数据
-		// dataUp() {
-		// 	this.loadAli();
-		// 	this.loadBank();
-		// },
-		// //加载数据
-		// async loadAli(source) {
-		// 	aliInfo({}).then(e => {
-		// 		this.aliData = e.data;
-		// 	});
-		// },
-		// // 加载银行卡信息
-		// async loadBank() {
-		// 	bankInfo({}).then(e => {
-		// 		this.bankData = e.data;
-		// 	});
-		// },
+		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
-				this.money = data.commissionCount;
 				this.minPrice = data.minPrice;
-				this.freeze = data.incommissionCount;
 			});
 		},
 		// 跳转
@@ -185,17 +174,6 @@ export default {
 				});
 				return;
 			}
-			// if (this.type == 'alipay') {
-			// 	console.log('alipay');
-			// 	data.name = this.aliData.fullname;
-			// 	data.alipay_code = this.aliData.alino;
-			// }
-			// if (this.type == 'bank') {
-			// 	console.log(bank);
-			// 	data.name = this.bankData.fullname;
-			// 	data.bankname = this.bankData.bank;
-			// 	data.cardnum = this.bankData.bankno;
-			// }
 			if (this.type == 'alipay') {
 				console.log('alipay');
 				data.name = this.alipay_name;
@@ -210,6 +188,13 @@ export default {
 
 			extractCash(data)
 				.then(e => {
+					getUserInfo({})
+						.then(({ data }) => {
+							this.setUserInfo(data);
+						})
+						.catch(e => {
+							console.log(e);
+						});
 					uni.showToast({
 						title: '提交成功',
 						duration: 2000,
@@ -380,4 +365,8 @@ page {
 		color: $font-color-light;
 	}
 }
+.tip {
+	padding: 20rpx;
+	color: #FD3B39;
+}
 </style>

uni.scss

@@ -5,7 +5,7 @@ $page-row-spacing: 30rpx;
 $page-color-base: #f8f8f8;//页面背景颜色
 $page-color-light: #f8f6fc;
 // 主题颜色
-$base-color: #5dbc7c;//项目颜色
+$base-color: #f65067;//项目颜色
 $box-shadow-color:#5dbc7c;//阴影颜色
 $font-color:#5dbc7c;//字体颜色
 $font-color-spec: #5dbc7c;//可操作文字颜色

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.0c0314dc.js></script><script src=/index/static/js/index.38e54b04.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.0c0314dc.js></script><script src=/index/static/js/index.74c92c56.js></script></body></html>