浏览代码

2023-10-17

cmy 1 年之前
父节点
当前提交
d9226bf5fe

+ 77 - 120
pages.json

@@ -76,30 +76,6 @@
 				}
 			}
 		},
-		// {
-		// 	"path": "pages/set/set",
-		// 	"style": {
-		// 		"navigationBarTitleText": "设置"
-		// 	}
-		// },
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "实名认证"
-			}
-		},
-		{
-			"path": "pages/set/password",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		},
-		{
-			"path": "pages/set/userinfo",
-			"style": {
-				"navigationBarTitleText": "修改资料"
-			}
-		},
 		{
 			"path": "pages/index/user",
 			"style": {
@@ -109,43 +85,6 @@
 				"navigationBarTitleText": "个人中心"
 			}
 		},
-		{
-			"path": "pages/user/award",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/user/yjzz",
-			"style": {
-				"navigationBarTitleText": "转账"
-			}
-		},
-		{
-			"path": "pages/user/favorites",
-			"style": {
-				"navigationBarTitleText": "推廣海報"
-			}
-		},
-
-		{
-			"path": "pages/money/paySuccess",
-			"style": {
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-		{
-			"path": "pages/money/account",
-			"style": {
-				"navigationBarTitleText": "提现账号"
-			}
-		},
 		{
 			"path": "pages/redirect/redirect",
 			"style": {
@@ -155,26 +94,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/shareQrCode",
-			"style": {
-				"navigationBarTitleText": "互娛記錄"
-			}
-		},
-		{
-			"path": "pages/user/team",
-			"style": {
-				"navigationBarTitleText": "錢包",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/user/yue",
-			"style": {
-				"navigationBarTitleText": "我的余额",
-				"navigationStyle": "custom"
-			}
-		},
 
 		{
 			"path": "pages/myPledge/myPledge",
@@ -207,20 +126,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/jump/tabulation",
-			"style": {
-				"navigationBarTitleText": "会员列表",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/transaction",
-			"style": {
-				"navigationBarTitleText": "交易密码",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/myPledge/zyXingqing",
 			"style": {
@@ -229,43 +134,95 @@
 			}
 
 		}, {
-			"path": "pages/jump/history",
+			"path": "pages/game/history",
 			"style": {
 				"navigationBarTitleText": "历史列表",
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/jump/details",
-			"style": {
-				"navigationBarTitleText": "他的粉絲",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/user/set",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
 		}
+
 	],
 	"subPackages": [{ // 模块分包
 		"root": "pages/user",
 		"name": "shop",
 		"pages": [{
-			"path": "money/recharge",
-			"style": {
-				"navigationBarTitleText": "充值",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "money/withdrawal",
-			"style": {
-				"navigationBarTitleText": "奖励提现"
+				"path": "money/recharge",
+				"style": {
+					"navigationBarTitleText": "充值",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "money/withdrawal",
+				"style": {
+					"navigationBarTitleText": "奖励提现"
+				}
+			},
+			{
+				"path": "money/team",
+				"style": {
+					"navigationBarTitleText": "錢包",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "set/set",
+				"style": {
+					"navigationBarTitleText": "设置"
+				}
+			}, {
+				"path": "set/transaction",
+				"style": {
+					"navigationBarTitleText": "交易密码",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "set/phone",
+				"style": {
+					"navigationBarTitleText": "实名认证"
+				}
+			},
+			{
+				"path": "set/password",
+				"style": {
+					"navigationBarTitleText": "修改密码"
+				}
+			},
+			{
+				"path": "set/userinfo",
+				"style": {
+					"navigationBarTitleText": "修改资料"
+				}
+			},
+			{
+				"path": "vip/tabulation",
+				"style": {
+					"navigationBarTitleText": "会员列表",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "vip/details",
+				"style": {
+					"navigationBarTitleText": "他的粉絲",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "shareQrCode",
+				"style": {
+					"navigationBarTitleText": "互娛記錄"
+				}
+			},
+			{
+				"path": "favorites",
+				"style": {
+					"navigationBarTitleText": "推廣海報"
+				}
 			}
-		}]
+		]
 	}],
 	"tabBar": {
 		"color": "#C0C4CC",

+ 0 - 0
pages/jump/history.vue → pages/game/history.vue


+ 12 - 12
pages/index/user.vue

@@ -3,7 +3,7 @@
 		<view class="top">
 			<view class="my">{{$t('home.d4')}}</view>
 			<view class="userinfo flex">
-				<view class="flex" @click="navTo('/pages/user/set')">
+				<view class="flex" @click="navTo('/pages/user/set/set')">
 					<image class="image margin-r-10" :src="userInfo.avatar || '/static/error/missing-face.png'"
 						mode="scaleToFill">
 					</image>
@@ -27,12 +27,10 @@
 					{{userWallet}}U
 				</view>
 				<view class="btn flex">
-					<navigator url="/pages/user/money/wallet/recharge">
-						<button class="btn1"> <text>{{$t('user.a7')}}</text> </button>
-					</navigator>
-					<navigator url="/pages/user/money/wallet/withdrawal">
-						<button class="btn1"> <text>{{$t('user.a6')}}</text> </button>
-					</navigator>
+					<button @click="navTo('/pages/user/money/recharge')" class="btn1"> <text>{{$t('user.a7')}}</text>
+					</button>
+					<button @click="navTo('/pages/user/money/withdrawal')" class="btn1"> <text>{{$t('user.a6')}}</text>
+					</button>
 				</view>
 			</view>
 
@@ -64,7 +62,7 @@
 			<view class="gj">
 				{{$t('user.b1')}}
 			</view>
-			<view class="user-list flex" @click="navTo('/pages/user/team')">
+			<view class="user-list flex" @click="navTo('/pages/user/money/team')">
 				<image src="../../static/shouye/yue.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b2')}}
@@ -80,7 +78,7 @@
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
 			<!-- 额外添加 -->
-			<view class="user-list flex" @click="navTo('/pages/jump/tabulation')">
+			<view class="user-list flex" @click="navTo('/pages/user/vip/tabulation')">
 				<image src="../../static/shouye/liebiao.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b4')}}
@@ -101,7 +99,7 @@
 				</view>
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
-			<view class="user-list flex" @click="navTo('/pages/user/transaction')">
+			<view class="user-list flex" @click="navTo('/pages/user/set/transaction')">
 				<image src="../../static/shouye/jiaoyi.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b7')}}
@@ -116,7 +114,7 @@
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
 			<!-- todo -->
-			<view class="user-list flex" @click="navTo('/pages/user/set')">
+			<view class="user-list flex" @click="navTo('/pages/user/set/userinfo')">
 				<image src="../../static/shouye/shezhi.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b9')}}
@@ -351,8 +349,10 @@
 				font-weight: bold;
 				padding-bottom: 50rpx;
 			}
-			.btn{
+
+			.btn {
 				padding: 0 50rpx;
+
 				.btn1 {
 					min-width: 270rpx;
 					background: #FDB242;

+ 0 - 304
pages/money/account.vue

@@ -1,304 +0,0 @@
-<template>
-	<view class="content">
-		<!-- <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 class="row b-b">
-			<text class="tit">姓名</text>
-			<input class="input" v-model="name" type="text" placeholder="请输入姓名" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b">
-			<text class="tit">{{type==3?'银行卡号':'账号'}}</text>
-			<input class="input" v-model="payment" type="text" :placeholder="'请输入'+ (type==3?'银行卡号':'账号')"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type==3">
-			<text class="tit">手机号码</text>
-			<input class="input" v-model="phone" type="text" placeholder="请输入手机号码" placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type==3">
-			<text class="tit">所属银行</text>
-			<input class="input" v-model="bank" type="text" placeholder="请输入所属银行" placeholder-class="placeholder" />
-		</view>
-		<!-- <view class="row b-b" v-if="type==3">
-			<text class="tit">所属支行</text>
-			<input class="input" v-model="bank_name" type="text" placeholder="请输入所属支行"
-				placeholder-class="placeholder" />
-		</view> -->
-
-		<button class="add-btn up" @click="confirm">提 交 保 存</button>
-	</view>
-</template>
-
-<script>
-	import {
-		aliInfo,
-		bankInfo,
-		setAliInfo,
-		setBankInfo,
-		setBank,
-		getBank
-	} from '@/api/wallet.js';
-	export default {
-		data() {
-			return {
-				type: 0,
-				payment: '',
-				name: '',
-				bank: '',
-				phone: '',
-				bank_name: '',
-				loading: false
-			};
-		},
-
-		onLoad(options) {
-			// this.tabCurrentIndex = +options.state || 0;
-			// this.loadAli();
-			// this.loadBank();
-			this.type = options.type
-			this.getBank()
-		},
-
-		methods: {
-			//加载数据
-			loadAli(source) {
-				aliInfo({}).then(({
-					data
-				}) => {
-					let order = this.navList[0].orderList;
-					this.$set(order, 'name', data.fullname)
-					this.$set(order, 'code', data.alino)
-					this.$set(order, 'id', data.id)
-				});
-			},
-			loadBank() {
-				bankInfo({}).then(({
-					data
-				}) => {
-					let order = this.navList[1].orderList;
-					this.$set(order, 'name', data.fullname);
-					this.$set(order, 'code', data.bankno);
-					this.$set(order, 'bankName', data.bank);
-					this.$set(order, 'id', data.id)
-				});
-			},
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-			// 提交保存
-			confirm() {
-				let obj = this;
-				if (obj.loading) {
-					return
-				}
-				if (obj.name == '') {
-					return obj.$api.msg('请输入姓名')
-				}
-				if (obj.payment == '') {
-					if (obj.type == 3) {
-						return obj.$api.msg('请输入银行卡号')
-					}
-					if (obj.type == 2) {
-						return obj.$api.msg('请输入账号')
-					}
-				}
-				if (obj.type == 3) {
-					if (obj.phone == '') {
-						return obj.$api.msg('请输入手机号')
-					}
-					if (obj.bank == '') {
-						return obj.$api.msg('请输入所属银行')
-					}
-					// if(obj.bank_name == '') {
-					// 	return obj.$api.msg('请输入所属支行')
-					// }
-				}
-
-				obj.loading = true
-				setBank({
-					type: obj.type,
-					name: obj.name,
-					phone: obj.phone,
-					payment: obj.payment,
-					bank: obj.bank,
-					// bank_name: obj.bank_name
-				}).then(res => {
-					obj.loading = false
-					uni.showToast({
-						title: '修改成功',
-						duration: 2000,
-						position: 'top'
-					});
-					console.log('修改成功')
-					obj.$api.prePage().dataUp()
-					setTimeout(() => {
-						uni.navigateBack()
-					}, 1500)
-				}).catch(err => {
-					obj.loading = false
-				})
-			},
-			getBank() {
-				let obj = this
-				getBank().then(res => {
-					let bank;
-					console.log(obj.type)
-					if (obj.type == 2) {
-
-						bank = res.data.zfb
-					}
-					if (obj.type == 3) {
-						console.log(res.data.bank)
-						bank = res.data.bank
-						console.log(bank)
-					}
-					console.log(bank)
-					if (bank.name) {
-						obj.name = bank.name
-						obj.phone = bank.phone
-						obj.payment = bank.payment
-						obj.bank = bank.bank
-						obj.bank_name = bank.bank_name
-					}
-
-
-				})
-			},
-			/* 保存银行卡详细 */
-			setBankInfo(obj) {
-				setBankInfo(obj)
-					.then(e => {
-						uni.showToast({
-							title: '修改成功',
-							duration: 2000,
-							position: 'top'
-						});
-						this.$api.prePage().dataUp()
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1500)
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			// 修改支付宝信息
-			setAliInfo(obj) {
-				setAliInfo(obj)
-					.then(e => {
-						uni.showToast({
-							title: '修改成功',
-							duration: 2000,
-							position: 'top'
-						});
-						this.$api.prePage().dataUp()
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1500)
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		padding: 0 30rpx;
-		height: 110rpx;
-		background: #fff;
-
-		.tit {
-			flex-shrink: 0;
-			width: 200rpx;
-			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;
-		}
-	}
-
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: 750rpx;
-	}
-
-	.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;
-				}
-			}
-		}
-	}
-
-	.add-btn {
-		&.up {
-			background-color: #a9000b;
-			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);
-	}
-</style>

+ 0 - 452
pages/money/pay.vue

@@ -1,452 +0,0 @@
-<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(4)">
-				<text class="icon iconfont iconyue"></text>
-				<view class="con">
-					<text class="tit">佣金支付</text>
-					<text>可用佣金 ¥{{ breake }}</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 {
-		getUserInfo
-	} from '@/api/user.js'
-	import {
-		createOrderkey,
-		computedOrderkey,
-		orderPay
-	} from '@/api/order.js';
-	import {
-		mapState
-	} from 'vuex';
-	// #ifdef H5
-	import weichatObj 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, //余额
-				breake: 0.0, //佣金
-				orderKey: '',
-				orderId: '', //保存订单id
-				payLoding: false, //判断是否支付中
-				type: '', //判断是否从订单中进入
-				// #ifdef H5
-				froms: '', //保存h5中数据来源对象
-				// #endif
-				pinkid: '' //保存拼团商品id
-			};
-		},
-		computed: {
-			// #ifdef H5
-			...mapState(['weichatObj']),
-			// #endif
-			...mapState('user', ['userInfo'])
-		},
-		onLoad(options) {
-			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;
-				});
-			}
-			// 保存pinkid
-			if (options.pinkid) {
-				this.pinkid = options.pinkid;
-			}
-			// 载入余额
-			getUserInfo({}).then(({
-				data
-			}) => {
-				// 获取余额
-				this.now_money = data.now_money;
-				this.breake = data.brokerage_price
-			});
-		},
-		methods: {
-			//选择支付方式
-			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';
-				}
-				if (this.payType == 4) {
-					this.payName = 'brokerage';
-				}
-			},
-			// 支付金额
-			orderMoneyPay() {
-				let obj = this;
-				console.log('支付金额')
-				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 => {
-						console.log(obj.payName, '支付类型')
-						console.log(e, '支付金额')
-						// 判断是否为余额支付
-						if (obj.payName == 'yue' && e.data.status == 'SUCCESS') {
-							if (e.status == 200) {
-								obj.paySuccessTo();
-							} else {
-								obj.$api.msg(msg);
-							}
-						}
-						if (obj.payName == 'brokerage' && 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') {
-								weichatObj.chooseWXPay(data);
-							}
-							// #endif
-							// #ifdef MP-WEIXIN
-							if (obj.payName == 'weixin' || obj.payName == 'routine') {
-								console.log('开始支付')
-								wx.requestPayment(data);
-							}
-							// #endif
-						}
-						uni.hideLoading();
-						obj.payLoding = false;
-					})
-					.catch(e => {
-						// 支付完成
-						uni.hideLoading();
-						obj.payLoding = false;
-						console.log(e);
-					});
-			},
-			// 支付成功跳转
-			paySuccessTo() {
-				let obj = this
-				uni.hideLoading();
-				uni.redirectTo({
-					url: '/pages/money/paySuccess?orderid=' + this.orderId
-				});
-
-			},
-			//确认支付
-			confirm: async function() {
-				let obj = this;
-				// 判断是否余额不足
-				if (obj.payName == 'yue' && +obj.now_money < obj.money) {
-					uni.showModal({
-						title: '提示',
-						content: '账户余额不足!',
-						showCancel: false,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-					return;
-				}
-				if (obj.payName == 'brokerage' && +obj.breake < obj.money) {
-					uni.showModal({
-						title: '提示',
-						content: '账户佣金不足!',
-						showCancel: false,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-					return;
-				}
-				uni.showLoading({
-					title: '支付中',
-					mask: true
-				})
-
-				// 支付中
-				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
-					}) => {
-						console.log('生成订单')
-						// 判断是否支付失败
-						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 == 'brokerage') {
-							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;
-	}
-</style>

+ 0 - 65
pages/money/paySuccess.vue

@@ -1,65 +0,0 @@
-<template>
-	<view class="content">
-		<text class="success-icon iconfont iconroundcheck"></text>
-		<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/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: {
-			
-		}
-	}
-</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>

+ 0 - 312
pages/money/withdrawal.vue

@@ -1,312 +0,0 @@
-<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>
-				</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>
-		</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>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
-	data() {
-		return {
-			type: 'weixin', //提现方式
-			money: '0.00', //可提现金额
-			freeze: '0.0', //冻结金额
-			withdrawal: '', //提现金额
-			minPrice: '', //最少提现金额
-			aliData: {},
-			bankData: {},
-			// #ifdef H5
-			weichatBsrowser: false
-			// #endif
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		//加载提现信息
-		this.loadData();
-		// 加载提款账号信息
-		this.loadAli();
-		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;
-			});
-		},
-		// 加载余额信息
-		async loadData() {
-			extractBank({}).then(({ data }) => {
-				this.money = data.moneyCount;//可提现余额
-				this.minPrice = data.minPrice;//最小提现
-				this.freeze =data.inmoneyCount//提现中的余额
-			});
-		},
-		// 跳转
-		navTo(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		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)
-				.then(e => {
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					console.log();
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.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-spec;
-			font-size: $font-base;
-		}
-	}
-}
-.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);
-}
-
-.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;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.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;
-}
-</style>

+ 0 - 498
pages/user/award.vue

@@ -1,498 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/icon/fanhui.png" mode=""></image>
-				</view>
-				<view class="header">我的佣金</view>
-			</view>
-			<view class="content-bg">
-				<image src="../../static/img/tg-bg.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ yj || 0 }}</view>
-				<view>我的佣金</view>
-			</view>
-			<view class="moneybtn-box">
-				<view class="money-btn"></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">{{userInfo.brokerage || '0'}}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{userInfo.extractTotalPrice || '0'}}</view>
-			</view>
-		</view> -->
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: height }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"
-						v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getCommissionInfo,
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		mapGetters
-	} from 'vuex';
-	import empty from '@/components/empty';
-	import {
-		spreadCommission,
-		userBalance,
-		extractBank
-	} from '@/api/wallet.js';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		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 {
-				userInfo: {},
-				yj: '',
-				height: '',
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				orderStatusSum: 0,
-				recharge: 0,
-				navList: [
-					// {
-					// 	state: 0,
-					// 	text: '全部',
-					// 	loadingType: 'more',
-					// 	orderList: [],
-					// 	page: 1, //当前页数
-					// 	limit: 10 //每次信息条数
-					// },
-					{
-						state: 4,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 3,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {},
-		onShow() {
-			this.extractBank()
-			this.getUserInfo()
-			this.loadData();
-		},
-		methods: {
-			getUserInfo() {
-				getUserInfo({}).then(({
-					data
-				}) => {
-					this.userInfo = data
-				});
-			},
-			extractBank() {
-				extractBank().then(res => {
-					console.log(res)
-					this.yj = res.data.brokerage_price
-				})
-			},
-			toBack() {
-				uni.switchTab({
-					url: '/pages/user/user'
-				});
-			},
-			// 页面跳转
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			//获取收入支出信息
-			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';
-
-				spreadCommission({
-						page: navItem.page,
-						limit: navItem.limit,
-
-					}, state)
-					.then(({
-						data
-					}) => {
-						if (data.length > 0) {
-							data.forEach(e => {
-
-								navItem.orderList = navItem.orderList.concat(e.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: #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;
-		/* #ifdef H5 */
-		padding-top: 90rpx;
-		/* #endif */
-		color: #ffffff;
-		text-align: center;
-		/* #ifdef APP-PLUS */
-		height: 200rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		/* #endif */
-		/* #ifdef MP-WEIXIN */
-		padding-top: 40rpx;
-		/* #endif */
-
-		.money {
-			font-size: 72rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-		}
-
-		.text {
-			font-size: 30rpx;
-		}
-	}
-
-	.moneybtn-box {
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		padding: 0rpx 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		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>

+ 1 - 1
pages/user/team.vue → pages/user/money/team.vue

@@ -4,7 +4,7 @@
 			<view class="status_bar"><!-- 这里是状态栏 --></view>
 			<view class="body-title">
 				<view class="goback-box" @click="toBack">
-					<image class="goback" src="../../static/img/fanhui.png" mode=""></image>
+					<image class="goback" src="/static/img/fanhui.png" mode=""></image>
 				</view>
 				<view class="header">{{$t('money.a1')}}</view>
 			</view>

+ 0 - 0
pages/set/password.vue → pages/user/set/password.vue


+ 0 - 0
pages/set/phone.vue → pages/user/set/phone.vue


+ 0 - 0
pages/user/set.vue → pages/user/set/set.vue


+ 0 - 0
pages/user/transaction.vue → pages/user/set/transaction.vue


+ 0 - 0
pages/set/userinfo.vue → pages/user/set/userinfo.vue


+ 2 - 2
pages/jump/details.vue → pages/user/vip/details.vue

@@ -4,14 +4,14 @@
 			<view class="top">
 				<view class="nc">123****032@qq.com</view>
 				<view class="">
-					<image class="img" src="../../static/shouye/huiyuan.png" mode=""></image>
+					<image class="img" src="/static/shouye/huiyuan.png" mode=""></image>
 				</view>
 			</view>
 			<view class="center" @click="navX">
 				<view class="sj">2023.05.05 15:00</view>
 				<view class="xq">詳情</view>
 				<view class="">
-					<image class="ima" src="../../static/icon/jt.png" mode=""></image>
+					<image class="ima" src="/static/icon/jt.png" mode=""></image>
 				</view>
 			</view>
 			<view class="xian"></view>

+ 2 - 2
pages/jump/tabulation.vue → pages/user/vip/tabulation.vue

@@ -26,14 +26,14 @@
 			<view class="top">
 				<view class="nc">123****032@qq.com</view>
 				<view class="">
-					<image class="img" src="../../static/shouye/huiyuan.png" mode=""></image>
+					<image class="img" src="/static/shouye/huiyuan.png" mode=""></image>
 				</view>
 			</view>
 			<view class="center"  @click="navX">
 				<view class="sj">2023.05.05 15:00</view>
 				<view class="xq">{{$t('huiyuan.a5')}}</view>
 				<view class="">
-					<image class="ima" src="../../static/icon/jt.png" mode=""></image>
+					<image class="ima" src="/static/icon/jt.png" mode=""></image>
 				</view>
 			</view>
 			<view class="xian"></view>

+ 0 - 471
pages/user/withdrawal.vue

@@ -1,471 +0,0 @@
-<template>
-	<view class="content">
-		<!-- <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>
-			</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>
-		</view>
-		<view class="tip" v-if="sxf*1 >0">
-			提现手续费{{sxf}}%<text v-if="withdrawal*1 !=0">,实际到账{{(withdrawal*1/100*(100-sxf*1)).toFixed(2)*1}}</text>
-		</view>
-		<view class="list">
-			<radio-group @change="tabRadio">
-				<!-- <label>
-					<view class="box">
-						<view class="icon iconfont iconweixin1"></view>
-						<view class="title-box">
-							<view class="title">
-								<text v-if="weixin_no">提现至微信</text>
-								<text v-else>请创建微信账号</text>
-							</view>
-							<view class="node">
-								<text v-if="weixin_no">账号({{ weixin_no }})</text>
-							</view>
-						</view>
-						<view class="right">
-							<radio value="weixin" color="#c29963" :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.name">提现至支付宝</text>
-								<text v-else>请创建支付宝账号</text>
-							</view>
-							<view class="node">
-								<text v-if="aliData.name">真实姓名({{ aliData.name }})</text>
-							</view>
-						</view>
-						<view class="right">
-							<radio value="alipay" color="#9c0b18" :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.name">{{ bankData.bank + ' ' + bankData.payment }}</text>
-								<text v-else>请创建银行账号</text>
-							</view>
-							<view class="node">
-								<text v-if="bankData.name">真实姓名({{ bankData.name }})</text>
-							</view>
-						</view>
-						<view class="right">
-							<radio value="bank" color="#9c0b18" :checked="type == 'bank'" />
-						</view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- <view class="row b-b" v-if="type == 'weixin'">
-			<text class="tit">微信账号</text>
-			<input class="input" type="text" v-model="weixin_no" placeholder="请输入微信账号"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'alipay'">
-			<text class="tit">支付宝账号</text>
-			<input class="input" type="text" v-model="alipay_code" placeholder="请输入支付宝账号"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'alipay'">
-			<text class="tit">支付宝姓名</text>
-			<input class="input" type="text" v-model="alipay_name" placeholder="请输入支付宝姓名"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">银行卡号</text>
-			<input class="input" type="text" v-model="bank_code" placeholder="请输入银行卡号"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">姓名</text>
-			<input class="input" type="text" v-model="bank_people" placeholder="请输入银行卡姓名"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">所属银行</text>
-			<input class="input" type="text" v-model="bank_name" placeholder="请输入所属银行"
-				placeholder-class="placeholder" />
-		</view>
-		<view class="row b-b" v-if="type == 'bank'">
-			<text class="tit">所属支行</text>
-			<input class="input" type="text" v-model="bank_belonging" placeholder="请输入所属支行"
-				placeholder-class="placeholder" />
-		</view> -->
-		<button class="add-btn modified"
-			@click="navTo('/pages/money/account?type=' + (type=='bank'?'3':'2'))">账号管理</button>
-		<button class="add-btn up" @click="confirm">提交申请</button>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		extractCash,
-		extractBank,
-		aliInfo,
-		bankInfo,
-		setBank,
-		getBank
-	} from '@/api/wallet.js';
-	import {
-		orderData,
-		getUserInfo
-	} from '@/api/user.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-		},
-		data() {
-			return {
-				sxf: '',
-				weixin_no: '',
-				type: 'bank', //提现方式
-				money: '0.00', //可提现金额
-				freeze: '0.0', //冻结金额
-				withdrawal: '', //提现金额
-				minPrice: '', //最少提现金额
-				aliData: {},
-				bankData: {},
-				weixin: {},
-				alipay_code: '',
-				alipay_name: '',
-				bank_code: '',
-				bank_people: '',
-				bank_name: '',
-				bank_belonging: '',
-				jftype: 0,
-			};
-		},
-		onLoad(options) {
-			//加载提现信息
-			this.loadData();
-			// // 加载提款账号信息
-			// this.loadAli();
-			// this.loadBank();
-			this.dataUp()
-
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-			dataUp() {
-				let obj = this
-				getBank().then(res => {
-					console.log(res.data.zfb, 'res')
-					if (res.data.zfb.name) {
-						obj.aliData = res.data.zfb
-						console.log(obj.aliData, 'obj.aliData')
-					}
-					if (res.data.bank.name) {
-						obj.bankData = res.data.bank
-					}
-				})
-			},
-			// 加载余额信息
-			async loadData() {
-
-				extractBank({}).then(({
-					data
-				}) => {
-					console.log(data, 'data+++++++++')
-					this.minPrice = data.minPrice;
-					this.money = data.brokerage_price,
-						this.sxf = data.commission
-				});
-
-			},
-			// 跳转
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			// 切换选中对象
-			tabRadio(e) {
-				this.type = e.detail.value;
-			},
-			// 提交
-			confirm() {
-				let obj = this
-				let data = {
-					extract_type: this.type, //bank -银行卡 alipay-支付宝 weixin-微信
-					money: this.withdrawal, //金额
-					type: 0 //0佣金1余额
-				};
-				// if (this.withdrawal % 100 != 0) {
-				// 	uni.showToast({
-				// 		title: '提现金额为100的倍数',
-				// 		duration: 2000,
-				// 		mask: false,
-				// 		icon: 'none'
-				// 	});
-				// 	return;
-				// }
-				if (this.withdrawal * 1 < this.minPrice * 1) {
-					uni.showToast({
-						title: '提现金额不可少于' + this.minPrice,
-						duration: 2000,
-						mask: false,
-						icon: 'none'
-					});
-					return;
-				}
-				if (this.type == 'alipay') {
-					console.log('alipay');
-					data.name = this.aliData.name;
-					data.alipay_code = this.aliData.payment;
-				}
-				if (this.type == 'bank') {
-					console.log('bank');
-					data.name = this.bankData.name;
-					data.bankname = this.bankData.bank;
-					data.cardnum = this.bankData.payment;
-					// data.bank_belonging = this.bankData.bank_name
-				}
-				if (this.type == 'weixin') {
-					console.log('weixin');
-					data.weixin = this.weixin_no
-
-				}
-
-				extractCash(data)
-					.then(e => {
-						obj.loadData()
-
-						uni.showToast({
-							title: '提交成功',
-							duration: 2000,
-							position: 'top'
-						});
-					})
-					.catch(e => {
-						console.log();
-					});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.content-money {
-		padding: 30rpx 0;
-		background: #ffffff;
-	}
-
-	.flex {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		border-radius: $border-radius-sm;
-
-		.buttom {
-			font-size: $font-lg;
-			width: 50%;
-		}
-
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-
-		.icon {
-			background-size: 100%;
-			font-size: 42rpx;
-			color: $font-color-dark;
-			font-weight: bold;
-			background-repeat: no-repeat;
-			background-position: center;
-		}
-
-		.text {
-			color: $font-color-light;
-		}
-	}
-
-	.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-spec;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.add-btn {
-		&.modified {
-			// color: #ffffff;
-			border: 1px solid #9c0b18;
-			// background-color: #fff;
-			color: #9c0b18;
-		}
-
-		&.up {
-			background: #9c0b18;
-			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);
-	}
-
-	.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;
-
-				.icon-img {
-					height: 50rpx;
-					width: 50rpx;
-				}
-			}
-
-			.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;
-	}
-
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		padding: 0 30upx;
-		height: 110upx;
-		background: #fff;
-
-		.tit {
-			flex-shrink: 0;
-			width: 250upx;
-			font-size: 30upx;
-			color: $font-color-dark;
-		}
-
-		.input {
-			flex: 1;
-			font-size: 30upx;
-			color: $font-color-dark;
-		}
-
-		.iconlocation {
-			font-size: 36upx;
-			color: $font-color-light;
-		}
-	}
-
-	.tip {
-		padding: 20rpx;
-		color: #fd3b39;
-	}
-</style>

+ 0 - 351
pages/user/yjzz.vue

@@ -1,351 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="flex">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.now_money | getMoneyStyle }}</view>
-					<text class="text">可转账余额</text>
-				</view>
-			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">收款人UID</view>
-			<view class="row"><input class="input" type="number" v-model="phone" placeholder="请输入收款人UID"
-					placeholder-class="placeholder" /></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="转入金额"
-					placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.now_money*1">全部转账</view>
-				<!-- <view class="buttom" @click="withdrawal = userInfo.dynamic_integral" v-if="type== 2">全部转账</view> -->
-			</view>
-		</view>
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">转账</button>
-	</view>
-</template>
-
-<script>
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import {
-		getUserInfo,
-		jfzz
-	} from '@/api/user.js';
-	import {
-		mapMutations,
-		mapState
-	} from 'vuex';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		data() {
-			return {
-				phone: '',
-				money: '0.00', //可提现金额
-				withdrawal: '', //提现金额
-				password: '', //支付密码
-				card: '', //转账卡号
-				name: '',
-				// #ifdef H5
-				weichatBsrowser: false,
-				// #endif
-				loding: false,
-				type: 0
-			};
-		},
-		onLoad(options) {
-			// #ifdef H5
-			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-			// #endif
-			this.dataUp();
-			if (options.type) {
-				this.type = options.type;
-			}
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'login']),
-			// 更新数据
-			dataUp() {
-				let obj = this;
-				getUserInfo({})
-					.then(e => {
-						obj.setUserInfo(e.data);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			// 切换选中对象
-			tabRadio(e) {
-				this.type = e.detail.value;
-			},
-			// 提交
-			confirm() {
-				let obj = this;
-				obj.loding = true;
-				if (obj.withdrawal == 0) {
-					obj.loding = false;
-					uni.showModal({
-						title: '提示',
-						content: '转账金额不要为0'
-					});
-					return;
-				}
-				if (obj.phone == '') {
-					return obj.$api.msg('请输入用户UID')
-				}
-				let data = {
-					other_uid: obj.phone, //编号
-					TransferMoney: obj.withdrawal, //金额
-					uid: obj.userInfo.uid
-					// type: obj.type
-				};
-				jfzz(data)
-					.then(e => {
-
-						// 允许按钮点击
-						obj.loding = false;
-						// 初始化提现金额
-						uni.showToast({
-							title: '转账成功',
-							duration: 2000,
-							position: 'top'
-						});
-						obj.dataUp();
-					})
-					.catch(e => {
-						obj.$api.msg(e.msg);
-						obj.loding = false;
-						console.log();
-					});
-			},
-			boblack() {
-				uni.navigateBack({
-					fail() {
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-					}
-				})
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.content-money {
-		padding: 30rpx 0;
-		background: #ffffff;
-	}
-
-	.item {
-		padding: 0 $page-row-spacing;
-		background-color: #ffffff;
-	}
-
-	.flex {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		border-radius: $border-radius-sm;
-		justify-content: center;
-
-		.buttom {
-			font-size: $font-lg;
-			width: 50%;
-		}
-
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-
-		.icon {
-			background-size: 100%;
-			font-size: 42rpx;
-			color: $font-color-dark;
-			font-weight: bold;
-			background-repeat: no-repeat;
-			background-position: center;
-		}
-
-		.text {
-			color: $font-color-light;
-		}
-	}
-
-	.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: #a9000b;
-				font-size: $font-base;
-			}
-		}
-	}
-
-	.add-btn {
-		width: 520rpx;
-		height: 80rpx;
-		border-radius: 20rpx;
-		margin: 140rpx auto 0;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #ffffff;
-		background-color: #a9000b;
-	}
-
-	.back-btn {
-		width: 520rpx;
-		height: 80rpx;
-		border-radius: 20rpx;
-		margin: 40rpx auto;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #303030;
-		background-color: #F8DABA;
-	}
-
-	.name {
-		background: #fff;
-		padding: 30rpx;
-	}
-
-	.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;
-
-				.icon-img {
-					height: 50rpx;
-					width: 50rpx;
-				}
-			}
-
-			.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;
-				}
-			}
-		}
-	}
-
-	.tip {
-		padding: 20rpx;
-		color: #ff0000;
-	}
-
-	/deep/ .uni-radio-input {
-		width: 45rpx;
-		height: 45rpx;
-	}
-
-	.psw-wrapper {
-		width: 548rpx;
-		height: 344rpx;
-		background-color: #FFFFFF;
-		border-radius: 15rpx 15rpx;
-
-		.psw-title {
-			width: 100%;
-			font-size: 35rpx;
-			padding: 43rpx 0 49rpx;
-			text-align: center;
-			font-weight: 800;
-		}
-
-		.psw-ipt {
-			display: block;
-			background-color: #dce3ed;
-			height: 90rpx;
-			width: 464rpx;
-			padding-left: 30rpx;
-			margin: 0 auto;
-			font-size: 80rpx;
-		}
-
-		.psw-btn text {
-			display: inline-block;
-			text-align: center;
-			width: 50%;
-			padding-top: 29rpx;
-			font-size: 35rpx;
-		}
-
-		.psw-qd {
-			color: #5771DF;
-		}
-	}
-</style>

+ 0 - 463
pages/user/yue.vue

@@ -1,463 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<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/tg-bg.png" mode=""></image>
-				</view>
-				<view class="money-box">
-					<view class="money">{{ userInfo.now_money | getMoneyStyle }}</view>
-					<view>余额</view>
-				</view>
-				<view class="moneybtn-box">
-					<!-- <view class="money-btn" style="text-decoration: underline;" @click="navto('/pages/money/freeze')">冻结记录</view> -->
-					<!-- <view class="money-btn" @click="navto('/pages/user/yjzz')">转账</view> -->
-					<view class="money-btn"></view>
-					<view class="money-btn" @click="navto('/pages/money/recharge')">钱包充值</view>
-				</view>
-			</view>
-		</view>
-		<!-- <view class="info-box flex">
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计充值</view>
-				<view class="info-num">{{ userInfo.recharge || '0' }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ userInfo.orderStatusSum || '0'}}</view>
-			</view>
-		</view> -->
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300"
-			@change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.title }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import {
-		spreadCommission,
-		userBalance,
-		yue
-	} from '@/api/wallet.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getMoneyStyle
-	} from '@/utils/rocessor.js';
-	import empty from '@/components/empty';
-	import {
-		getUserInfo
-	} from '@/api/user.js';
-	export default {
-		filters: {
-			getMoneyStyle
-		},
-		components: {
-			empty,
-		},
-		onReady(res) {
-			var _this = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box').boundingClientRect();
-					query.exec(function(res) {
-						_this.maxheight = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', _this.maxheight);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		data() {
-			return {
-				userInfo: {},
-				// 头部图高度
-				maxheight: '',
-				tabCurrentIndex: 0,
-				sr: '',
-				zc: '',
-				navList: [{
-						state: 2,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					}
-				],
-				money: ''
-			};
-		},
-		onLoad(options) {},
-		onShow() {
-			this.getUserInfo();
-			this.loadData();
-			//获取用户余额
-			// userBalance({}).then(({ data }) => {
-			// 	this.money = data.commissionCount;
-			// });
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo']),
-			navto(e) {
-				uni.navigateTo({
-					url: e
-				});
-			},
-			getUserInfo() {
-				getUserInfo({}).then(({
-					data
-				}) => {
-					this.userInfo = data
-				});
-			},
-			async loadData(source) {
-				const obj = this;
-				//这里时将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				//修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				spreadCommission({
-						page: navItem.page,
-						limit: navItem.limit,
-					}, state)
-					.then(({
-						data
-					}) => {
-						if (data.length > 0) {
-							data.forEach(e => {
-								navItem.orderList = navItem.orderList.concat(e.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;
-			},
-			toBack() {
-				uni.navigateBack();
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f2f5f4;
-		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;
-			}
-		}
-	}
-
-	.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: 25rpx;
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-		position: relative;
-		z-index: 10;
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 15px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: #000;
-				font-weight: bold;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid #FF4C4C;
-				}
-			}
-		}
-	}
-
-	//列表
-
-	.swiper-box {
-		.order-item {
-			padding: 20rpx 30rpx;
-			line-height: 1.5;
-
-			.title-box {
-				.title {
-					font-size: $font-lg;
-					color: $font-color-base;
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-
-			.money {
-				color: rgba(239, 58, 85, 1);
-				font-size: $font-lg;
-			}
-		}
-	}
-
-	.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;
-		}
-	}
-
-	.list-scroll-content {
-		background-color: #ffffff;
-		height: 100%;
-	}
-
-	.content {
-		height: 100%;
-
-		.empty-content {
-			background-color: #ffffff;
-		}
-	}
-
-	.btm-wrap {
-		height: 140rpx;
-		width: 750rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-
-		.btn {
-			width: 674rpx;
-			height: 88rpx;
-			line-height: 88rpx;
-			margin: auto;
-			background: linear-gradient(-22deg, #9a5e19, #9a5e19);
-			border-radius: 44rpx;
-			text-align: center;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #ffffff;
-		}
-	}
-</style>