5-5

api/user.js

@@ -1,113 +1,113 @@
-import request from '@/utils/request'
-
-// 订单统计信息
-export function orderData(data) {
-	return request({
-		url: '/api/order/data',
-		method: 'get',
-		data
-	});
-}
-
-// 获取用户信息
-export function getUserInfo(data) {
-	return request({
-		url: '/api/userinfo',
-		method: 'get',
-		data
-	});
-}
-
-// 用户分享图
-export function spreadBanner(data) {
-	return request({
-		url: '/api/spread/banner',
-		method: 'get',
-		data
-	});
-}
-
-// 获取地址列表
-export function getAddressList(data) {
-	return request({
-		url: '/api/address/list',
-		method: 'get',
-		data
-	});
-}
-// 修改地址
-export function addressEdit(data) {
-	return request({
-		url: '/api/address/edit',
-		method: 'post',
-		data
-	});
-}
-// 删除地址
-export function addressDel(data) {
-	return request({
-		url: '/api/address/del',
-		method: 'post',
-		data
-	});
-}
-// 设为默认地址
-export function setAddressDefault(data) {
-	return request({
-		url: '/api/address/default/set',
-		method: 'post',
-		data
-	});
-}
-// 购物车列表
-export function getCartList(data) {
-	return request({
-		url: '/api/cart/list',
-		method: 'get',
-		data
-	});
-}
-
-// 修改购物车数量
-export function getCartNum(data) {
-	return request({
-		url: '/api/cart/num',
-		method: 'post',
-		data
-	});
-}
-//删除购物车
-export function cartDel(data) {
-	return request({
-		url: '/api/cart/del',
-		method: 'post',
-		data
-	});
-}
-//获取收藏夹列表
-export function getcollectList(data) {
-	return request({
-		url: '/api/collect/user',
-		method: 'get',
-		data
-	});
-}
-// 取消收藏
-export function delcollect(data) {
-	return request({
-		url: '/api/collect/del',
-		method: 'post',
-		data
-	});
-}
-
-// 兑换
-export function coral(data) {
-	return request({
-		url: '/api/change/coral',
-		method: 'post',
-		data
-	});
+import request from '@/utils/request'
+
+// 订单统计信息
+export function orderData(data) {
+	return request({
+		url: '/api/order/data',
+		method: 'get',
+		data
+	});
+}
+
+// 获取用户信息
+export function getUserInfo(data) {
+	return request({
+		url: '/api/userinfo',
+		method: 'get',
+		data
+	});
+}
+
+// 用户分享图
+export function spreadBanner(data) {
+	return request({
+		url: '/api/spread/banner',
+		method: 'get',
+		data
+	});
+}
+
+// 获取地址列表
+export function getAddressList(data) {
+	return request({
+		url: '/api/address/list',
+		method: 'get',
+		data
+	});
+}
+// 修改地址
+export function addressEdit(data) {
+	return request({
+		url: '/api/address/edit',
+		method: 'post',
+		data
+	});
+}
+// 删除地址
+export function addressDel(data) {
+	return request({
+		url: '/api/address/del',
+		method: 'post',
+		data
+	});
+}
+// 设为默认地址
+export function setAddressDefault(data) {
+	return request({
+		url: '/api/address/default/set',
+		method: 'post',
+		data
+	});
+}
+// 购物车列表
+export function getCartList(data) {
+	return request({
+		url: '/api/cart/list',
+		method: 'get',
+		data
+	});
+}
+
+// 修改购物车数量
+export function getCartNum(data) {
+	return request({
+		url: '/api/cart/num',
+		method: 'post',
+		data
+	});
+}
+//删除购物车
+export function cartDel(data) {
+	return request({
+		url: '/api/cart/del',
+		method: 'post',
+		data
+	});
+}
+//获取收藏夹列表
+export function getcollectList(data) {
+	return request({
+		url: '/api/collect/user',
+		method: 'get',
+		data
+	});
+}
+// 取消收藏
+export function delcollect(data) {
+	return request({
+		url: '/api/collect/del',
+		method: 'post',
+		data
+	});
+}
+
+// 兑换
+export function coral(data) {
+	return request({
+		url: '/api/change/coral',
+		method: 'post',
+		data
+	});
 }
 
 // transfer_accounts
@@ -120,10 +120,19 @@ export function transfer_accounts(data) {
 }
 
 // 推广的人数
-export function getSpreadPeople(data){
+export function getSpreadPeople(data) {
+	return request({
+		url: '/api/spread/people',
+		method: 'post',
+		data
+	})
+}
+
+// 购物积分互转
+export function gwjfhz(data) {
 	return request({
-		url:'/api/spread/people',
-		method:'post',
+		url: '/api/points',
+		method: 'post',
 		data
 	})
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "随心购",
     "appid" : "__UNI__474F381",
     "description" : "",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -97,7 +97,7 @@
 		{
 			"path": "pages/collection/wx",
 			"style": {
-				"navigationBarTitleText": "添加微信"
+				"navigationBarTitleText": "添加TRC20"
 			}
 		},
 		{
@@ -353,6 +353,13 @@
 
 			}
 		},
+		{
+			"path": "pages/user/mygwjfhz",
+			"style": {
+				"navigationBarTitleText": "购物积分互转"
+
+			}
+		},
 		{
 			"path": "pages/user/award",
 			"style": {

pages/category/mall.vue

@@ -1,381 +1,408 @@
 <template>
-	<view class="center">
-		<!-- 顶部logo and 搜索 start-->
-		<!-- 这里是状态栏 -->
-		<view class="status_bar"></view>
-		<view class="top-search flex">
-			<view class="top-logo">
-				<image src="../../static/icon/logo.png" mode="widthFix"></image>
-			</view>
-			<view class="search-box flex" @click="clickSearch()">
-				<image class="search" src="../../static/icon/search-h.png" mode=""></image>
-				<view class="search-font">输入关键词搜索</view>
-			</view>
-		</view>
-		<!-- 顶部logo and 搜索 end-->
-		<view class="jg"></view>
-		<!-- 轮播图 start -->
-		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
-				@click="bannerNavToUrl(item)">
-				<image :src="item.pic" />
-			</swiper-item>
-		</swiper>
-		<!-- 轮播图 end -->
-		<view class="swiper-btm flex">
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">自用购物返利</view>
-			</view>
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">分享好友赚钱</view>
-			</view>
-			<view class="btm-item flex">
-				<image src="../../static/icon/index-gou.png" mode=""></image>
-				<view class="">超值正品优惠</view>
-			</view>
-		</view>
-		<!-- 商品列表 -->
-		<view class="good-list">
-			<view class="good flex" v-for="item in goodList" @click="navto('/pages/product/product?id=' + item.id)">
-				<view class="good-img">
-					<image :src="item.image" mode=""></image>
-				</view>
-				<view class="good-info flex">
-					<view class="good-name clamp2">
-						{{item.store_name}}
-					</view>
-					<view class="good-price">
-						<view class="old-price" v-if="item.ot_price*1 > item.price*1">
-							<text class="old-left">¥{{item.ot_price}}</text> <image src="../../static/icon/down.png" mode="widthFix"></image><text class="old-right">直降{{item.ot_price*1 - item.price*1}}元</text>
-						</view>
-						<view class="new-price flex">
-							<view class="">
-								¥{{item.price}}
-							</view>
-							<!-- <view class="good-tip">
+ 	<view class="center">
+ 		<!-- 顶部logo and 搜索 start-->
+ 		<!-- 这里是状态栏 -->
+ 		<view class="status_bar"></view>
+ 		<view class="top-search flex">
+ 			<view class="top-logo">
+ 				<image src="../../static/icon/logo.png" mode="widthFix"></image>
+ 			</view>
+ 			<view class="search-box flex" @click="clickSearch()">
+ 				<image class="search" src="../../static/icon/search-h.png" mode=""></image>
+ 				<view class="search-font">输入关键词搜索</view>
+ 			</view>
+ 		</view>
+ 		<!-- 顶部logo and 搜索 end-->
+ 		<view class="jg"></view>
+ 		<!-- 轮播图 start -->
+ 		<swiper class="top-swiper" autoplay="true" duration="400" interval="5000" @change="swiperChange">
+ 			<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+ 				@click="bannerNavToUrl(item)">
+ 				<image :src="item.pic" />
+ 			</swiper-item>
+ 		</swiper>
+ 		<!-- 轮播图 end -->
+ 		<view class="swiper-btm flex">
+ 			<view class="btm-item flex">
+ 				<image src="../../static/icon/index-gou.png" mode=""></image>
+ 				<view class="">自用购物返利</view>
+ 			</view>
+ 			<view class="btm-item flex">
+ 				<image src="../../static/icon/index-gou.png" mode=""></image>
+ 				<view class="">分享好友赚钱</view>
+ 			</view>
+ 			<view class="btm-item flex">
+ 				<image src="../../static/icon/index-gou.png" mode=""></image>
+ 				<view class="">超值正品优惠</view>
+ 			</view>
+ 		</view>
+ 		<!-- 商品列表 -->
+ 		<view class="good-list">
+ 			<view class="good flex" v-for="item in goodList" @click="navto('/pages/product/product?id=' + item.id)">
+ 				<view class="good-img">
+ 					<image :src="item.image" mode=""></image>
+ 				</view>
+ 				<view class="good-info flex">
+ 					<view class="good-name clamp2">
+ 						{{item.store_name}}
+ 					</view>
+ 					<view class="good-price">
+ 						<view class="old-price" v-if="item.ot_price*1 > item.price*1">
+ 							<text class="old-left">¥{{item.ot_price}}</text>
+ 							<image src="../../static/icon/down.png" mode="widthFix"></image><text
+ 								class="old-right">直降{{item.ot_price*1 - item.price*1}}元</text>
+ 						</view>
+ 						<view class="new-price flex">
+ 							<view class="">
+ 								¥{{item.price}}
+ 							</view>
+ 							<!-- <view class="good-tip">
 								1960提货券
 							</view> -->
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-	</view>
-</template>
-
-<script>
-	import {
-		tabbar1
-	} from '@/utils/tabbar.js';
-	import {
-		loadIndexs
-	} from '@/api/index.js';
-	import { getProducts } from '@/api/product.js'
-	import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
-	export default {
-		components: {
-			uniCountdowns
-		},
-		data() {
-			return {
-				current: 0,
-				tabbar: tabbar1,
-				titleNViewBackground: '',
-				swiperCurrent: 0,
-				swiperLength: 0,
-				dataList: '',
-				carouselList: [], //轮播图列表
-				text: ['恭喜黑白灰用户拼团成功￥353元！', '恭喜黑白灰用户拼团成功￥353元！'],
-				stopTime: {
-					stopTimeH: 0,
-					stopTimeM: 24,
-					stopTimeS: 59
-				},
-				bzb: 30,
-				goodList: [],
-				page: 1,
-				limit: 10,
-				loadingType: 'more'
-			};
-		},
-		onLoad() {
-			this.loadData();
-			this.getProList()
-		},
-		onReachBottom() {
-			this.getProList()
-		},
-		methods: {
-			navto(url) {
-				uni.navigateTo({
-					url
-				})
-			},
-			loadData() {
-				loadIndexs({})
-					.then(({
-						data
-					}) => {
-						let goods = data.info;
-						this.dataList = goods.bastList; //精品推荐
-						this.carouselList = data.banner;
-					})
-					.catch(e => {});
-			},
-			goDetails(e) {
-				console.log(e, '123456');
-				uni.navigateTo({
-					url: '/pages/index/messageInfo'
-				});
-			},
-			nav(url) {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
-			// 點擊搜索框
-			clickSearch() {
-				uni.navigateTo({
-					url: '/pages/product/search'
-				});
-			},
-
-			//详情页
-			navToDetailPage(item) {
-				let id = item.id;
-				uni.navigateTo({
-					url: '/pages/product/product?id=' + id
-				});
-			},
-			getProList() {
-				let obj =this
-				if(obj.loadingType == 'loading' || obj.loadingType == 'noMore' ) {
-					return
-				}
-				obj.loadingType = 'loading' 
-				getProducts({
-					page: obj.page,
-					limit: obj.limit
-				}).then(res => {
-					obj.goodList = obj.goodList.concat(res.data)
-					obj.page++
-					if(obj.limit == res.data.length ) {
-						obj.loadingType = 'more'
-					}else {
-						obj.loadingType = 'noMore'
-					}
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.center {
-		min-height: 100%;
-		height: auto;
-		background: #ededed;
-	}
-	// 顶部搜索
-	.top-search {
-		height: 80rpx;
-		padding: 0 20rpx;
-		background-color: #fff;
-		.top-logo {
-			width: 50rpx;
-			// height: 50rpx;
-			margin-right: 10rpx;
-
-			image {
-				width: 50rpx;
-				// height: 50rpx;
-			}
-
-		}
-
-		.search-box {
-			justify-content: center;
-			width: 698rpx;
-			height: 60rpx;
-			background: #EEEEEE;
-			// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
-			border-radius: 30rpx;
-
-			.search {
-				width: 34rpx;
-				height: 34rpx;
-			}
-
-			.search-font {
-				margin-left: 14rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #CBCBCB;
-			}
-		}
-	}
-	// 顶部轮播图
-	.top-swiper {
-		width: 750rpx;
-		height: 360rpx;
-		// margin: 20rpx 0 0;
-		image {
-			width: 750rpx;
-			height: 360rpx;
-		}
-	}
-	.swiper-btm {
-		height: 60rpx;
-		width: 750rpx;
-		background-color: #fff;
-		margin-bottom: 20rpx;
-		font-size: 21rpx;
-		font-weight: 500;
-		color: #333333;
-		.btm-item {
-			flex-grow: 1;
-			justify-content: center;
-			image {
-				width: 25rpx;
-				height: 25rpx;
-				margin-right: 14rpx;
-			}
-		}
-	}
-	.jg {
-		height: 20rpx;
-		background-color: #fff;
-	}
-	.good-list {
-		width: 750rpx;
-		background: linear-gradient(0deg, #FFFFFF, #F8F8F8);
-		padding: 30rpx 0;
-		.good {
-			width: 690rpx;
-			height: 276rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-			border-radius: 10rpx;
-			margin: auto;
-			padding: 20rpx 15rpx;
-			margin-bottom: 20rpx;
-			&:last-of-type {
-				margin-bottom: 0rpx;
-			}
-			.good-img {
-				flex-shrink: 0;
-				width: 236rpx;
-				height: 236rpx;
-				border-radius: 10rpx;
-				margin-right: 22rpx;
-				image {
-					width: 236rpx;
-					height: 236rpx;
-					border-radius: 10rpx;
-				}
-			}
-			.good-info {
-				flex-grow: 1;
-				height: 100%;
-				flex-direction: column;
-				justify-content: space-between;
-				align-items: flex-start;
-				.good-name {
-					font-size: 32rpx;
-					font-weight: bold;
-					padding-top: 10rpx;
-					color: #333333;
-				}
-				.good-price {
-					width: 100%;
-					image {
-						width: 14rpx;
-						margin: 0 6rpx 0 10rpx;
-					}
-					.old-price {
-						.old-left {
-							font-size: 26rpx;
-							font-weight: 500;
-							text-decoration: line-through;
-							color: #999999;
-						}
-						.old-right {
-							font-size: 24rpx;
-							font-weight: bold;
-							color: #B59467;
-						}
-					}
-					.new-price {
-						width: 100%;
-						font-size: 36rpx;
-						font-weight: bold;
-						color: #FF4C4C;
-						justify-content: space-between;
-						.good-tip {
-							display: inline-block;
-							padding: 0 20rpx 0 17rpx;
-							min-width: 160rpx;
-							text-align: center;
-							line-height: 40rpx;
-							background: #303030;
-							font-size: 24rpx;
-							font-weight: 500;
-							color: #F8DABA;
-							border-radius: 10rpx;
-							position: relative;
-							&::before {
-								content: '';
-								display: inline-block;
-								height: 17rpx;
-								width: 17rpx;
-								background-color: #fff;
-								border-radius: 50%;
-								position: absolute;
-								top: 0;
-								bottom: 0;
-								left: -9rpx;
-								margin: auto;
-							}
-							&::after {
-								content: '';
-								display: inline-block;
-								height: 17rpx;
-								width: 17rpx;
-								background-color: #fff;
-								border-radius: 50%;
-								position: absolute;
-								top: 0;
-								bottom: 0;
-								right: -9rpx;
-								margin: auto;
-							}
-						}
-					}
-				}
-			}
-		}
-		
-	}
-	.status_bar {
-	        height: var(--status-bar-height);
-	        width: 100%;
-	        background: #fff;
-	}
-</style>
-
+ 						</view>
+ 					</view>
+ 				</view>
+ 			</view>
+ 		</view>
+ 		<uni-load-more :status="loadingType"></uni-load-more>
+ 	</view>
+ </template>
+
+ <script>
+ 	import {
+ 		tabbar1
+ 	} from '@/utils/tabbar.js';
+ 	import {
+ 		loadIndexs
+ 	} from '@/api/index.js';
+ 	import {
+ 		getProducts
+ 	} from '@/api/product.js'
+ 	import uniCountdowns from '@/components/uni-countdown/uni-countdowns.vue';
+ 	export default {
+ 		components: {
+ 			uniCountdowns
+ 		},
+ 		data() {
+ 			return {
+ 				current: 0,
+ 				tabbar: tabbar1,
+ 				titleNViewBackground: '',
+ 				swiperCurrent: 0,
+ 				swiperLength: 0,
+ 				dataList: '',
+ 				carouselList: [], //轮播图列表
+ 				text: ['恭喜黑白灰用户拼团成功￥353元！', '恭喜黑白灰用户拼团成功￥353元！'],
+ 				stopTime: {
+ 					stopTimeH: 0,
+ 					stopTimeM: 24,
+ 					stopTimeS: 59
+ 				},
+ 				bzb: 30,
+ 				goodList: [],
+ 				page: 1,
+ 				limit: 10,
+ 				loadingType: 'more'
+ 			};
+ 		},
+ 		onLoad() {
+ 			this.loadData();
+ 			this.getProList()
+ 		},
+ 		onReachBottom() {
+ 			this.getProList()
+ 		},
+ 		methods: {
+ 			navto(url) {
+ 				uni.navigateTo({
+ 					url
+ 				})
+ 			},
+ 			loadData() {
+ 				loadIndexs({})
+ 					.then(({
+ 						data
+ 					}) => {
+ 						let goods = data.info;
+ 						this.dataList = goods.bastList; //精品推荐
+ 						this.carouselList = data.banner;
+ 					})
+ 					.catch(e => {});
+ 			},
+ 			goDetails(e) {
+ 				console.log(e, '123456');
+ 				uni.navigateTo({
+ 					url: '/pages/index/messageInfo'
+ 				});
+ 			},
+ 			nav(url) {
+ 				uni.navigateTo({
+ 					url,
+ 					fail() {
+ 						uni.switchTab({
+ 							url
+ 						});
+ 					}
+ 				});
+ 			},
+ 			//轮播图切换修改背景色
+ 			swiperChange(e) {
+ 				const index = e.detail.current;
+ 				this.swiperCurrent = index;
+ 				this.titleNViewBackground = this.carouselList[index].background;
+ 			},
+ 			// 點擊搜索框
+ 			clickSearch() {
+ 				uni.navigateTo({
+ 					url: '/pages/product/search'
+ 				});
+ 			},
+
+ 			//详情页
+ 			navToDetailPage(item) {
+ 				let id = item.id;
+ 				uni.navigateTo({
+ 					url: '/pages/product/product?id=' + id
+ 				});
+ 			},
+ 			getProList() {
+ 				let obj = this
+ 				if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
+ 					return
+ 				}
+ 				obj.loadingType = 'loading'
+ 				getProducts({
+ 					page: obj.page,
+ 					limit: obj.limit
+ 				}).then(res => {
+ 					obj.goodList = obj.goodList.concat(res.data)
+ 					obj.page++
+ 					if (obj.limit == res.data.length) {
+ 						obj.loadingType = 'more'
+ 					} else {
+ 						obj.loadingType = 'noMore'
+ 					}
+ 				})
+ 			}
+ 		}
+ 	};
+ </script>
+
+ <style lang="scss">
+ 	page,
+ 	.center {
+ 		min-height: 100%;
+ 		height: auto;
+ 		background: #ededed;
+ 	}
+
+ 	// 顶部搜索
+ 	.top-search {
+ 		height: 80rpx;
+ 		padding: 0 20rpx;
+ 		background-color: #fff;
+
+ 		.top-logo {
+ 			width: 50rpx;
+ 			// height: 50rpx;
+ 			margin-right: 10rpx;
+
+ 			image {
+ 				width: 50rpx;
+ 				// height: 50rpx;
+ 			}
+
+ 		}
+
+ 		.search-box {
+ 			justify-content: center;
+ 			width: 698rpx;
+ 			height: 60rpx;
+ 			background: #EEEEEE;
+ 			// box-shadow: 0px 10rpx 20rpx 0px rgba(4, 114, 69, 0.22);
+ 			border-radius: 30rpx;
+
+ 			.search {
+ 				width: 34rpx;
+ 				height: 34rpx;
+ 			}
+
+ 			.search-font {
+ 				margin-left: 14rpx;
+ 				font-size: 28rpx;
+ 				font-family: PingFang SC;
+ 				font-weight: 500;
+ 				color: #CBCBCB;
+ 			}
+ 		}
+ 	}
+
+ 	// 顶部轮播图
+ 	.top-swiper {
+ 		width: 750rpx;
+ 		height: 360rpx;
+
+ 		// margin: 20rpx 0 0;
+ 		image {
+ 			width: 750rpx;
+ 			height: 360rpx;
+ 		}
+ 	}
+
+ 	.swiper-btm {
+ 		height: 60rpx;
+ 		width: 750rpx;
+ 		background-color: #fff;
+ 		margin-bottom: 20rpx;
+ 		font-size: 21rpx;
+ 		font-weight: 500;
+ 		color: #333333;
+
+ 		.btm-item {
+ 			flex-grow: 1;
+ 			justify-content: center;
+
+ 			image {
+ 				width: 25rpx;
+ 				height: 25rpx;
+ 				margin-right: 14rpx;
+ 			}
+ 		}
+ 	}
+
+ 	.jg {
+ 		height: 20rpx;
+ 		background-color: #fff;
+ 	}
+
+ 	.good-list {
+ 		width: 750rpx;
+ 		background: linear-gradient(0deg, #FFFFFF, #F8F8F8);
+ 		padding: 30rpx 0;
+
+ 		.good {
+ 			width: 690rpx;
+ 			height: 276rpx;
+ 			background: #FFFFFF;
+ 			box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+ 			border-radius: 10rpx;
+ 			margin: auto;
+ 			padding: 20rpx 15rpx;
+ 			margin-bottom: 20rpx;
+
+ 			&:last-of-type {
+ 				margin-bottom: 0rpx;
+ 			}
+
+ 			.good-img {
+ 				flex-shrink: 0;
+ 				width: 236rpx;
+ 				height: 236rpx;
+ 				border-radius: 10rpx;
+ 				margin-right: 22rpx;
+
+ 				image {
+ 					width: 236rpx;
+ 					height: 236rpx;
+ 					border-radius: 10rpx;
+ 				}
+ 			}
+
+ 			.good-info {
+ 				flex-grow: 1;
+ 				height: 100%;
+ 				flex-direction: column;
+ 				justify-content: space-between;
+ 				align-items: flex-start;
+
+ 				.good-name {
+ 					font-size: 32rpx;
+ 					font-weight: bold;
+ 					padding-top: 10rpx;
+ 					color: #333333;
+ 				}
+
+ 				.good-price {
+ 					width: 100%;
+
+ 					image {
+ 						width: 14rpx;
+ 						margin: 0 6rpx 0 10rpx;
+ 					}
+
+ 					.old-price {
+ 						.old-left {
+ 							font-size: 26rpx;
+ 							font-weight: 500;
+ 							text-decoration: line-through;
+ 							color: #999999;
+ 						}
+
+ 						.old-right {
+ 							font-size: 24rpx;
+ 							font-weight: bold;
+ 							color: #B59467;
+ 						}
+ 					}
+
+ 					.new-price {
+ 						width: 100%;
+ 						font-size: 36rpx;
+ 						font-weight: bold;
+ 						color: #FF4C4C;
+ 						justify-content: space-between;
+
+ 						.good-tip {
+ 							display: inline-block;
+ 							padding: 0 20rpx 0 17rpx;
+ 							min-width: 160rpx;
+ 							text-align: center;
+ 							line-height: 40rpx;
+ 							background: #303030;
+ 							font-size: 24rpx;
+ 							font-weight: 500;
+ 							color: #F8DABA;
+ 							border-radius: 10rpx;
+ 							position: relative;
+
+ 							&::before {
+ 								content: '';
+ 								display: inline-block;
+ 								height: 17rpx;
+ 								width: 17rpx;
+ 								background-color: #fff;
+ 								border-radius: 50%;
+ 								position: absolute;
+ 								top: 0;
+ 								bottom: 0;
+ 								left: -9rpx;
+ 								margin: auto;
+ 							}
+
+ 							&::after {
+ 								content: '';
+ 								display: inline-block;
+ 								height: 17rpx;
+ 								width: 17rpx;
+ 								background-color: #fff;
+ 								border-radius: 50%;
+ 								position: absolute;
+ 								top: 0;
+ 								bottom: 0;
+ 								right: -9rpx;
+ 								margin: auto;
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+
+ 	}
+
+ 	.status_bar {
+ 		height: var(--status-bar-height);
+ 		width: 100%;
+ 		background: #fff;
+ 	}
+ </style>

pages/collection/collection.vue

@@ -1,145 +1,156 @@
-<template>
-	<view class="content">
-		<view class="collection-box">
-			<view class="collection-item">
-				<view class="left">
-					<view class="img"><image src="../../static/user/mybank.png" mode=""></image></view>
-					<view class="bank">银行卡</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/bank')">
-					<view class="status" v-if="bankData.name != null">{{ bankData.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1"><text class="iconfont iconenter"></text></view>
-				</view>
-			</view>
-			<view class="collection-item">
-				<view class="left">
-					<view class="img"><image src="../../static/user/zfb.png" mode=""></image></view>
-					<view class="bank">支付宝</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/zfb')">
-					<view class="status" v-if="aliData.name != null">{{aliData.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1"><text class="iconfont iconenter"></text></view>
-				</view>
-			</view>
-			<view class="collection-item">
-				<view class="left">
-					<view class="img">
-						<image src="../../static/user/wx.png" mode=""></image>
-					</view>
-					<view class="bank">
-						微信
-					</view>
-				</view>
-				<view class="gg" @click="nav('/pages/collection/wx')">
-					<view class="status" v-if="wx.name != null">{{wx.name}}</view>
-					<view class="status" v-else>未添加</view>
-					<view class="img1">
-						<text class="iconfont iconenter"></text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex';
-import { pay_list } from '../../api/wallet.js'
-export default {
-	data() {
-		return {
-			aliData: {},
-			bankData: {},
-			wx:{},
-		};
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
-	},
-	onShow() {
-		this.loadDate();
-	},
-	methods: {
-		nav(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		loadDate() {
-			pay_list().then(({data}) =>{
-				this.wx = data.wx
-				this.aliData = data.zfb
-				this.bankData = data.bank
-			})
-		}
-	}
-};
-</script>
-<style lang="scss">
-page,
-.content {
-	height: 100%;
-	margin: 0;
-	height: 0;
-}
-
-.collection-box {
-	background: #ffffff;
-	margin: 50rpx 20rpx;
-	width: 710rpx;
-	display: flex;
-	flex-direction: column;
-
-	.collection-item {
-		margin: 35rpx 30rpx;
-		display: flex;
-		justify-content: space-between;
-
-		.left {
-			display: flex;
-
-			.img {
-				height: 40rpx;
-				width: 40rpx;
-
-				image {
-					height: 100%;
-					width: 100%;
-				}
-			}
-
-			.bank {
-				margin-left: 25rpx;
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-
-		.gg {
-			display: flex;
-
-			.status {
-				font-size: 26rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				margin-right: 20rpx;
-			}
-
-			.img1 {
-				width: 15rpx;
-				height: 25rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-}
+<template>
+	<view class="content">
+		<view class="collection-box">
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/mybank.png" mode=""></image>
+					</view>
+					<view class="bank">银行卡</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/bank')">
+					<view class="status" v-if="bankData.name != null">{{ bankData.name}}</view>
+					<view class="status" v-else>未添加</view>
+					<view class="img1"><text class="iconfont iconenter"></text></view>
+				</view>
+			</view>
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/user/zfb.png" mode=""></image>
+					</view>
+					<view class="bank">支付宝</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/zfb')">
+					<view class="status" v-if="aliData.name != null">{{aliData.name}}</view>
+					<view class="status" v-else>未添加</view>
+					<view class="img1"><text class="iconfont iconenter"></text></view>
+				</view>
+			</view>
+			<view class="collection-item">
+				<view class="left">
+					<view class="img">
+						<image src="../../static/icon/trc.png" mode=""></image>
+					</view>
+					<view class="bank">
+						TRC20
+					</view>
+				</view>
+				<view class="gg" @click="nav('/pages/collection/wx')">
+					<view class="status" v-if="wx.payment != null">{{wx.payment}}</view>
+					<view class="status" v-else>未添加</view>
+					<view class="img1">
+						<text class="iconfont iconenter"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		pay_list
+	} from '../../api/wallet.js'
+	export default {
+		data() {
+			return {
+				aliData: {},
+				bankData: {},
+				wx: {},
+			};
+		},
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		},
+		onShow() {
+			this.loadDate();
+		},
+		methods: {
+			nav(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			loadDate() {
+				pay_list().then(({
+					data
+				}) => {
+					this.wx = data.wx
+					this.aliData = data.zfb
+					this.bankData = data.bank
+				})
+			}
+		}
+	};
+</script>
+<style lang="scss">
+	page,
+	.content {
+		height: 100%;
+		margin: 0;
+		height: 0;
+	}
+
+	.collection-box {
+		background: #ffffff;
+		margin: 50rpx 20rpx;
+		width: 710rpx;
+		display: flex;
+		flex-direction: column;
+
+		.collection-item {
+			margin: 35rpx 30rpx;
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+
+				.img {
+					height: 40rpx;
+					width: 40rpx;
+
+					image {
+						height: 100%;
+						width: 100%;
+					}
+				}
+
+				.bank {
+					margin-left: 25rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+
+			.gg {
+				display: flex;
+
+				.status {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					margin-right: 20rpx;
+				}
+
+				.img1 {
+					width: 15rpx;
+					height: 25rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	}
 </style>

pages/collection/wx.vue

@@ -1,155 +1,171 @@
-<template>
-	<view class="content">
-		<view class="box">
-			<view class="wx">
-				<text>姓名</text>
-				<input type="text" v-model="name" value="" placeholder="请输入姓名" />
-			</view>
-			<view class="wx">
-				<text>微信号</text>
-				<input type="text" v-model="code" value="" placeholder="请输入微信号" />
-			</view>
-			<view class="wx">
-				<text>手机号</text>
-				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
-			</view>
-			<view class="erweima">
-				<text>微信收款码</text>
-				<view class="img" @click="uploads()">
-					<image src="../../static/user/erweima.png" mode="" v-if="image == ''"></image>
-					<image :src="image" mode="" v-else></image>
-				</view>
-			</view>
-		</view>
-		<view class="button" @click="confirm()">
-			确认
-		</view>
-	</view>
-</template>
-
-<script>
-	import { upload } from '@/api/order.js'
-	import { auction,pay_list } from '@/api/wallet.js';
-	export default {
-		data() {
-			return {
-				code:'',
-				name:'',
-				image:'',
-				phone:''
-			};
-		},
-		onLoad() {
-			pay_list().then(({data}) =>{
-				if(data.wx != ''){
-					this.name = data.wx.name
-					this.code = data.wx.payment
-					this.image = data.wx.image
-					this.phone = data.wx.phone
-				}
-			})
-		},
-		methods: {
-			uploads(){
-				upload({
-					filename: ''
-				}).then(data => {
-					this.image = data[0].url;
-				})
-			},
-			confirm() {
-				let obj = this;
-				if (!obj.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!obj.code) {
-					return this.$api.msg('请输入微信账号');
-				}
-				if (!obj.image) {
-					return this.$api.msg('请上传微信二维码');
-				}
-				if (!obj.phone) {
-					return this.$api.msg('请输入手机号码');
-				}
-				auction({
-					type:1,
-					name: obj.name,
-					payment: obj.code,
-					image: obj.image,
-					phone: obj.phone,
-				})
-					.then(e => {
-						obj.$api.msg('修改成功');
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-page , .content{
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	
-}
-.box{
-	margin:20rpx 0  100rpx 0;
-	width: 100%;
-	background: #FFFFFF;
-	
-	.wx{
-		border-bottom: #F0F0F0 solid 1rpx;
-		padding: 20rpx 0 30rpx 0;
-		display: flex;
-		text{
-			width: 150rpx;
-			margin: 0 30rpx;
-		}
-		input{
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #999999;
-			line-height: 100rpx;
-		}
-	}
-	.erweima{
-		padding: 30rpx 0;
-		display: flex;
-		text{
-			margin: 0 30rpx;
-			width: 150rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			
-		}
-		.img{
-			width: 160rpx;
-			height: 160rpx;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-.button{
-	margin: 0 auto;
-	width: 560rpx;
-	height: 80rpx;
-	background: #FD3B39;
-	border-radius: 40rpx;
-	font-size: 30rpx;
-	font-family: PingFangSC;
-	font-weight: 500;
-	color: #FFFFFF;
-	line-height: 80rpx;
-	text-align: center;
-}
+<template>
+	<view class="content">
+		<view class="box">
+			<!-- <view class="wx">
+				<text>账号</text>
+				<input type="text" v-model="name" value="" placeholder="请输入姓名" />
+			</view> -->
+			<view class="wx">
+				<text>收款地址</text>
+				<input type="text" v-model="code" value="" placeholder="请输入收款地址" />
+			</view>
+			<!-- <view class="wx">
+				<text>手机号</text>
+				<input type="text" v-model="phone" value="" placeholder="请输入手机号" />
+			</view> -->
+			<view class="erweima">
+				<text>二维码</text>
+				<view class="img" @click="uploads()">
+					<image src="../../static/user/erweima.png" mode="" v-if="image == ''"></image>
+					<image :src="image" mode="" v-else></image>
+				</view>
+			</view>
+		</view>
+		<view class="button" @click="confirm()">
+			确认
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		upload
+	} from '@/api/order.js'
+	import {
+		auction,
+		pay_list
+	} from '@/api/wallet.js';
+	export default {
+		data() {
+			return {
+				code: '',
+				name: '',
+				image: '',
+				phone: ''
+			};
+		},
+		onLoad() {
+			pay_list().then(({
+				data
+			}) => {
+				if (data.wx != '') {
+					this.name = data.wx.name
+					this.code = data.wx.payment
+					this.image = data.wx.image
+					this.phone = data.wx.phone
+				}
+			})
+		},
+		methods: {
+			uploads() {
+				upload({
+					filename: ''
+				}).then(data => {
+					this.image = data[0].url;
+				})
+			},
+			confirm() {
+				let obj = this;
+				// if (!obj.name) {
+				// 	return this.$api.msg('请输入账号');
+				// }
+				if (!obj.code) {
+					return this.$api.msg('请输入收款地址');
+				}
+				if (!obj.image) {
+					return this.$api.msg('请上传二维码');
+				}
+				// if (!obj.phone) {
+				// 	return this.$api.msg('请输入手机号码');
+				// }
+				auction({
+						type: 1,
+						// name: obj.name,
+						payment: obj.code,
+						image: obj.image,
+						// phone: obj.phone,
+					})
+					.then(e => {
+						obj.$api.msg('修改成功');
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		height: 100%;
+		margin: 0;
+		padding: 0;
+
+	}
+
+	.box {
+		margin: 20rpx 0 100rpx 0;
+		width: 100%;
+		background: #FFFFFF;
+
+		.wx {
+			border-bottom: #F0F0F0 solid 1rpx;
+			padding: 20rpx 0 30rpx 0;
+			display: flex;
+
+			text {
+				width: 150rpx;
+				margin: 0 30rpx;
+			}
+
+			input {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 100rpx;
+			}
+		}
+
+		.erweima {
+			padding: 30rpx 0;
+			display: flex;
+
+			text {
+				margin: 0 30rpx;
+				width: 150rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #333333;
+
+			}
+
+			.img {
+				width: 160rpx;
+				height: 160rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+
+	.button {
+		margin: 0 auto;
+		width: 560rpx;
+		height: 80rpx;
+		background: #FD3B39;
+		border-radius: 40rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 80rpx;
+		text-align: center;
+	}
 </style>

pages/index/index.vue

@@ -66,18 +66,20 @@
 								:show-day="false" :day="item.djs.day" :hour="item.djs.hours" :minute="item.djs.minutes"
 								:second="item.djs.seconds"></uni-countdown>
 							<!-- 进场倒计时 -->
-							<uni-countdown v-if="item.djs.over && !item.jcdjs.over" color="#C6914E" background-color="#F6EFDF"
-								:show-day="false" :day="item.jcdjs.day" :hour="item.jcdjs.hours" :minute="item.jcdjs.minutes"
-								:second="item.jcdjs.seconds"></uni-countdown>
+							<uni-countdown v-if="item.djs.over && !item.jcdjs.over" color="#C6914E"
+								background-color="#F6EFDF" :show-day="false" :day="item.jcdjs.day"
+								:hour="item.jcdjs.hours" :minute="item.jcdjs.minutes" :second="item.jcdjs.seconds">
+							</uni-countdown>
 							<!-- 场次结束倒计时 -->
-							<uni-countdown v-if="item.jcdjs.over && !item.jsdjs.over" color="#C6914E" background-color="#F6EFDF"
-								:show-day="false" :day="item.jsdjs.day" :hour="item.jsdjs.hours" :minute="item.jsdjs.minutes"
-								:second="item.jsdjs.seconds"></uni-countdown>
+							<uni-countdown v-if="item.jcdjs.over && !item.jsdjs.over" color="#C6914E"
+								background-color="#F6EFDF" :show-day="false" :day="item.jsdjs.day"
+								:hour="item.jsdjs.hours" :minute="item.jsdjs.minutes" :second="item.jsdjs.seconds">
+							</uni-countdown>
 							<!-- 第二天倒计时 -->
 							<uni-countdown v-if="item.jsdjs.over" color="#C6914E" background-color="#F6EFDF"
-								:show-day="false" :day="item.xcdjs.day" :hour="item.xcdjs.hours" :minute="item.xcdjs.minutes"
-								:second="item.xcdjs.seconds"></uni-countdown>
-<!-- 							<view class="" v-if="item.jsdjs.over" style="color: #dc262b;">
+								:show-day="false" :day="item.xcdjs.day" :hour="item.xcdjs.hours"
+								:minute="item.xcdjs.minutes" :second="item.xcdjs.seconds"></uni-countdown>
+							<!-- 							<view class="" v-if="item.jsdjs.over" style="color: #dc262b;">
 								活动已结束
 							</view> -->
 						</view>
@@ -86,7 +88,7 @@
 						</view>
 						<view class="item-btn" @click="yuyue(item)"
 							:class="{'yuyue': item.sta == 1,'jcf': item.sta == 2 && !item.jsdjs.over }">
-						<!-- 	{{item.sta == 2 ? '立即进场': (item.djs.over ? '已结束': '立即预约')}} -->
+							<!-- 	{{item.sta == 2 ? '立即进场': (item.djs.over ? '已结束': '立即预约')}} -->
 							<!-- {{item.sta == 2 ? '立即进场' : '立即预约'}} -->
 							{{item.str}}
 						</view>
@@ -292,7 +294,7 @@
 						// 预约倒计时
 						e.djs = timeComputed(e.time)
 						// 进场倒计时
-						e.jcdjs = timeComputed(e.time + 1800)
+						e.jcdjs = timeComputed(e.time + 600)
 						// 场次结束倒计时
 						e.jsdjs = timeComputed(e.e_time)
 						// 第二天预约倒计时
@@ -522,6 +524,7 @@
 						background-color: #303030;
 						color: #F8DABA;
 					}
+
 					.jcf {
 						background-color: #f42b4e;
 						color: #fff;

pages/order/order.vue

@@ -48,7 +48,9 @@
 							</view>
 						</view>
 
-						<view class="price-box">
+						<view class="price-box" style="position: relative;">
+							<text style="display: inline-block;position: absolute;left: 20rpx;"
+								v-if="currentIndex == 0 && tabIndex == 2">{{item.update_time}}</text>
 							{{(currentIndex == 0 && tabItem.state == 3) ? '当前挂售价': '实付'}}
 							<text class="price"
 								v-if="currentIndex == 0 && tabItem.state == 3">{{ moneyNum(item.hanging_price) }}</text>
@@ -93,6 +95,9 @@
 								<view class="buy-name">{{ item.nickname }}</view>
 								<view class="phone">{{ item.phone }}</view>
 							</view>
+							<view class="" style="padding-top: 5rpx;" v-if="item.status != 0 && item.status">
+								成交时间：{{item.update_time}}
+							</view>
 							<view v-if="!item.status">
 								<view class="buy-info">
 									<view class="font">挂售价格：{{ item.hanging_price }}</view>
@@ -137,7 +142,7 @@
 						消费积分
 					</view>
 				</view>
-				<input type="password" v-model="password" class="psw-ipt" focus/>
+				<input type="password" v-model="password" class="psw-ipt" focus />
 				<view class="psw-btn">
 					<text @click="cancel">取消</text>
 					<text class="psw-qd" @click="pswQd">确定</text>
@@ -237,8 +242,7 @@
 						limit: 10 //每次信息条数
 					}
 				],
-				navList1: [
-					{
+				navList1: [{
 						state: 1,
 						text: '待支付',
 						loadingType: 'more',
@@ -324,10 +328,10 @@
 		onHide() {
 			console.log('页面隐藏')
 			this.current = 1, //底部tabar选中的icon对象
-			this.currentIndex = 0, //当前选中的第一级0为我要买单，1我要卖单
-			this.tabCurrentIndex = 0, //当前选中的第二级别我要买单选中项
-			this.tabCurrentIndex1 = 0, //当前选中的第二级别我要卖单选中项
-			this.navList = [{
+				this.currentIndex = 0, //当前选中的第一级0为我要买单，1我要卖单
+				this.tabCurrentIndex = 0, //当前选中的第二级别我要买单选中项
+				this.tabCurrentIndex1 = 0, //当前选中的第二级别我要卖单选中项
+				this.navList = [{
 						state: 0,
 						text: '已过期',
 						loadingType: 'more',
@@ -364,8 +368,7 @@
 						limit: 10 //每次信息条数
 					}
 				],
-				this.navList1 = [
-					{
+				this.navList1 = [{
 						state: 1,
 						text: '待支付',
 						loadingType: 'more',

pages/public/login.vue

@@ -223,21 +223,24 @@
 							obj.login();
 							// 保存返回用户数据
 							obj.setUserInfo(e.data);
-							let ur = uni.getStorageSync('present') || '/pages/index/index';
-							//成功跳转首页
+							// let ur = uni.getStorageSync('present') || '/pages/index/index';
 							uni.switchTab({
-								url: ur,
-								fail(e) {
-									uni.navigateTo({
-										url: ur,
-										fail(e) {
-											uni.navigateTo({
-												url: '/pages/index/index',
-											});
-										}
-									});
-								}
-							});
+								url: '/pages/index/index'
+							})
+							//成功跳转首页
+							// uni.switchTab({
+							// 	url: ur,
+							// 	fail(e) {
+							// 		uni.navigateTo({
+							// 			url: ur,
+							// 			fail(e) {
+							// 				uni.navigateTo({
+							// 					url: '/pages/index/index',
+							// 				});
+							// 			}
+							// 		});
+							// 	}
+							// });
 						});
 					})
 					.catch(function(e) {

pages/user/mygwjf.vue

@@ -17,9 +17,9 @@
 				<view class="money">{{ userInfo.sp_final || '0' }}</view>
 				<view>购物积分</view>
 			</view>
-			<view class="money-btn" @click="navto('/pages/money/withdmoenys?type=shop')">
-				兑换提货券
-				<text>></text>
+			<view class="money-btn flex">
+				<text @click.stop="navto('/pages/user/mygwjfhz')">购物积分转账</text>
+				<text @click.stop="navto('/pages/money/withdmoenys?type=shop')">兑换提货券</text>
 			</view>
 		</view>
 		<view class="info-box flex">
@@ -334,7 +334,7 @@
 		position: relative;
 		z-index: 2;
 		color: #ffffff;
-		padding-right: 50rpx;
+		padding: 0 50rpx;
 		text-align: right;
 		font-size: 30rpx;
 		font-family: PingFang SC;

pages/user/mygwjfhz.vue

@@ -0,0 +1,390 @@
+<template>
+	<view class="content">
+		<view class="content-money">
+			<view class="flex">
+				<view class="buttom">
+					<view class="icon">{{ userInfo.sp_final | 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>
+		<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.sp_final">全部转账</view>
+			</view>
+		</view>
+
+		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交申请</button>
+		<button class="back-btn up" @click="boblack">返回</button>
+		<uni-popup ref="uppass" type="center">
+			<view class="psw-wrapper">
+				<view class="psw-title">请输入支付密码</view>
+				<input type="password" v-model="password" class="psw-ipt" />
+				<view class="psw-btn">
+					<text @click="cancel">取消</text>
+					<text class="psw-qd" @click="pswQd">确定</text>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		getUserInfo,
+		gwjfhz
+	} from '@/api/user.js';
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		data() {
+			return {
+				money: '0.00', //可提现金额
+				withdrawal: '', //提现金额
+				password: '', //支付密码
+				card: '', //转账卡号
+				name: '',
+				// #ifdef H5
+				weichatBsrowser: false,
+				// #endif
+				loding: false,
+				type: 'xl'
+			};
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			this.dataUp();
+			if (options.type) {
+				this.type = options.type;
+				console.log(this.type);
+			}
+		},
+		computed: {
+			...mapState('user', ['userInfo'])
+		},
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'login']),
+			// 更新数据
+			dataUp() {
+				let obj = this;
+				getUserInfo({})
+					.then(e => {
+						obj.login();
+						// 保存返回用户数据
+						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.card == '') {
+					obj.loding = false;
+					return obj.$api.msg('请输入收款人手机号码')
+				}
+				if (obj.withdrawal == 0) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '转账金额不要为0'
+					});
+					return;
+				}
+				if (obj.withdrawal * 1 > obj.userInfo.sp_final) {
+					obj.loding = false;
+					return obj.$api.msg('可转余额不足')
+				}
+
+				if (obj.card == obj.userInfo.phone) {
+					obj.loding = false;
+					uni.showModal({
+						title: '提示',
+						content: '不要输入自己的用户账号'
+					});
+				} else {
+					obj.$refs.uppass.open()
+					return
+
+
+				}
+			},
+			boblack() {
+				uni.navigateBack({
+					fail() {
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+					}
+				})
+			},
+			cancel() {
+				this.$refs.uppass.close()
+				this.password = ''
+			},
+			pswQd() {
+				let obj = this
+				let data = {
+					phone: obj.card, //编号
+					money: obj.withdrawal, //金额
+					pas: obj.password
+				};
+				gwjfhz(data)
+					.then(e => {
+
+						// 允许按钮点击
+						obj.loding = false;
+						// 初始化提现金额
+						obj.withdrawal = '';
+						uni.showToast({
+							title: '转账成功',
+							duration: 2000,
+							position: 'top'
+						});
+						obj.dataUp();
+						obj.cancel()
+					})
+					.catch(e => {
+						obj.$api.msg(e.msg);
+						obj.loding = false;
+						console.log();
+					});
+			}
+		}
+	};
+</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: #f21f5d;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		width: 520rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 140rpx auto 0;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #F8DABA;
+		background-color: #303030;
+	}
+
+	.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>

pages/user/user.vue

@@ -1,9 +1,13 @@
 <template>
 	<view class="container">
 		<view class="vheigh"></view>
-		<view class="top-image"><image src="../../static/user/user-top.png" mode=""></image></view>
+		<view class="top-image">
+			<image src="../../static/user/user-top.png" mode=""></image>
+		</view>
 		<view class="user-set flex">
-			<view class="set-logo" @click="navTo('/pages/set/userinfo')"><image src="../../static/user/user1.png" mode=""></image></view>
+			<view class="set-logo" @click="navTo('/pages/set/userinfo')">
+				<image src="../../static/user/user1.png" mode=""></image>
+			</view>
 			<!-- <view class="xx-logo"><image src="../../static/user/user2.png" mode=""></image></view> -->
 		</view>
 		<view class="user-wrap">
@@ -76,16 +80,23 @@
 			</view>
 		</view>
 		<uni-list class="tool-list">
-			<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user10.png"></uni-list-item>
-			<uni-list-item title="我的推广" @click="navTo('/pages/user/mytg')" thumb="/static/icon/mytg.png"></uni-list-item>
-			<uni-list-item title="支付密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/icon/g9.png"></uni-list-item>
-			<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user11.png"></uni-list-item>
-			<uni-list-item title="收款方式" @click="navTo('/pages/collection/collection')" thumb="/static/user/user12.png"></uni-list-item>
+			<uni-list-item title="邀请有礼" @click="navTo('/pages/user/shareQrCode')" thumb="/static/user/user10.png">
+			</uni-list-item>
+			<uni-list-item title="我的推广" @click="navTo('/pages/user/mytg')" thumb="/static/icon/mytg.png">
+			</uni-list-item>
+			<uni-list-item title="支付密码" @click="navTo('/pages/money/moneyPwd')" thumb="/static/icon/g9.png">
+			</uni-list-item>
+			<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/user/user11.png">
+			</uni-list-item>
+			<uni-list-item title="收款方式" @click="navTo('/pages/collection/collection')" thumb="/static/user/user12.png">
+			</uni-list-item>
 			<uni-list-item title="客服中心" @click="openKf()" thumb="/static/user/user13.png"></uni-list-item>
 		</uni-list>
 		<uni-popup ref="popupkf" type="center">
 			<view class="popup-box">
-				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="img">
+					<image src="../../static/img/img009.png" mode=""></image>
+				</view>
 				<view class="mian">
 					<view class="delivery">
 						<view class="title">已经为您定制专属客服</view>
@@ -101,7 +112,9 @@
 		</uni-popup>
 		<uni-popup ref="popupqd" type="center">
 			<view class="popup">
-				<view class="popup-dox"><image class="popup-logo" src="../../static/img/sign-popup.png"></image></view>
+				<view class="popup-dox">
+					<image class="popup-logo" src="../../static/img/sign-popup.png"></image>
+				</view>
 				<view class="popup-title">
 					获得
 					<text>{{ today_integral }}</text>
@@ -121,551 +134,643 @@
 	</view>
 </template>
 <script>
-import { tabbar1 } from '@/utils/tabbar.js';
-import { mapState, mapMutations } from 'vuex';
-import uniList from '@/components/uni-list/uni-list.vue';
-import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-import { orderData, getUserInfo } from '@/api/user.js';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-let startY = 0,
-	moveY = 0,
-	pageAtTop = true;
-export default {
-	components: {
-		uniList,
-		uniListItem
-	},
-	data() {
-		return {
-			current: 4,
-			tabbar: tabbar1,
-			qded: false, //是否已签到
-			text: '', //客服微信
-			today_integral: '', //签到获得的数值
-			today_type: '', //签到获得的数值单位
-			tom_integral: '', //明天签到获得的数值
-			tom_type: '', //签到获得的数值单位
-			userDowm: 0, //卡片升级专属高度
-			userMaxDowm: 0, //卡片最高高度
-			toolList: [
-				{
-					id: 't1',
-					name: '新人通道',
-					width: '56rpx',
-					heigt: '54rpx',
-					img: '../../static/icon/tool-1.png',
-					path: '/pages/user/xrtd'
-				},
-				{
-					id: 't2',
-					name: '邀请好友',
-					width: '56rpx',
-					heigt: '57rpx',
-					img: '../../static/icon/tool-2.png',
-					path: '/pages/user/shareQrCode'
-				},
-				{
-					id: 't3',
-					name: '我的粉丝',
-					width: '68rpx',
-					heigt: '53rpx',
-					img: '../../static/icon/tool-3.png',
-					path: '/pages/user/myfans'
-				},
-				{
-					id: 't4',
-					name: '我的订单',
-					width: '55rpx',
-					heigt: '54rpx',
-					img: '../../static/icon/tool-4.png',
-					path: '/pages/order/order'
-				},
-				{
-					id: 't5',
-					name: '我的商品',
-					width: '50rpx',
-					heigt: '58rpx',
-					img: '../../static/icon/tool-5.png',
-					path: '/pages/order/order'
-				},
-				{
-					id: 't6',
-					name: '馆长申请',
-					width: '59rpx',
-					heigt: '56rpx',
-					img: '../../static/icon/tool-6.png',
-					path: '/pages/user/gzsq'
-				}
-			]
-		};
-	},
-	onShow() {
-		// 判断是否已经登录
-		if (this.hasLogin) {
-			this.loadBaseData();
-		}
-		this.loadBaseData();
-	},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.container')
-			.fields(
-				{
-					size: true
-				},
-				data => {
-					// 计算最多下拉的高度
-					this.userDowm = Math.floor((data.width / 750) * 185);
-					// 计算最大触发修改高度事件
-					this.userMaxDowm = Math.floor((data.width / 750) * 250);
-				}
-			)
-			.exec();
-	},
-	// #ifndef MP
-	// onNavigationBarButtonTap(e) {
-	// 	const index = e.index;
-	// 	if (index === 0) {
-	// 		this.navTo('/pages/set/set');
-	// 	} else if (index === 1) {
-	// 		// #ifdef APP-PLUS
-	// 		const pages = getCurrentPages();
-	// 		const page = pages[pages.length - 1];
-	// 		const currentWebview = page.$getAppWebview();
-	// 		currentWebview.hideTitleNViewButtonRedDot({
-	// 			index
-	// 		});
-	// 		// #endif
-	// 		uni.navigateTo({
-	// 			url: '/pages/user/notice'
-	// 		});
-	// 	}
-	// },
-	// #endif
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		// 加载初始数据
-		loadBaseData() {
-			getUserInfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-					// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
-					orderData({})
-						.then(({ data }) => {
-							this.setOrderInfo(data);
-						})
-						.catch(e => {
-							this.setOrderInfo({
-								complete_count: 0, //完成
-								received_count: 0, //待收货
-								unshipped_count: 0, //待发货
-								order_count: 0, //订单总数
-								unpaid_count: 0 //待付款
-							});
-						});
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		/**
-		 * 统一跳转接口,拦截未登录路由
-		 * navigator标签现在默认没有转场动画，所以用view
-		 */
-		navTo(url) {
-			console.log(url);
-			if (!this.hasLogin) {
-				// 保存地址
-				saveUrl();
-				// 登录拦截
-				interceptor();
-			} else {
-			uni.navigateTo({
-				url
-			});
-			}
+	import {
+		tabbar1
+	} from '@/utils/tabbar.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import uniList from '@/components/uni-list/uni-list.vue';
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
+	import {
+		orderData,
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		saveUrl,
+		interceptor
+	} from '@/utils/loginUtils.js';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			uniList,
+			uniListItem
 		},
-		useTool(e) {
-			this.navTo(e.path);
+		data() {
+			return {
+				current: 4,
+				tabbar: tabbar1,
+				qded: false, //是否已签到
+				text: '15606861277', //客服微信
+				today_integral: '', //签到获得的数值
+				today_type: '', //签到获得的数值单位
+				tom_integral: '', //明天签到获得的数值
+				tom_type: '', //签到获得的数值单位
+				userDowm: 0, //卡片升级专属高度
+				userMaxDowm: 0, //卡片最高高度
+				toolList: [{
+						id: 't1',
+						name: '新人通道',
+						width: '56rpx',
+						heigt: '54rpx',
+						img: '../../static/icon/tool-1.png',
+						path: '/pages/user/xrtd'
+					},
+					{
+						id: 't2',
+						name: '邀请好友',
+						width: '56rpx',
+						heigt: '57rpx',
+						img: '../../static/icon/tool-2.png',
+						path: '/pages/user/shareQrCode'
+					},
+					{
+						id: 't3',
+						name: '我的粉丝',
+						width: '68rpx',
+						heigt: '53rpx',
+						img: '../../static/icon/tool-3.png',
+						path: '/pages/user/myfans'
+					},
+					{
+						id: 't4',
+						name: '我的订单',
+						width: '55rpx',
+						heigt: '54rpx',
+						img: '../../static/icon/tool-4.png',
+						path: '/pages/order/order'
+					},
+					{
+						id: 't5',
+						name: '我的商品',
+						width: '50rpx',
+						heigt: '58rpx',
+						img: '../../static/icon/tool-5.png',
+						path: '/pages/order/order'
+					},
+					{
+						id: 't6',
+						name: '馆长申请',
+						width: '59rpx',
+						heigt: '56rpx',
+						img: '../../static/icon/tool-6.png',
+						path: '/pages/user/gzsq'
+					}
+				]
+			};
 		},
-		// 签到弹窗
-		goQd() {
-			this.$refs.popupqd.open();
-			this.qded = true;
+		onShow() {
+			// 判断是否已经登录
+			if (this.hasLogin) {
+				this.loadBaseData();
+			}
+			this.loadBaseData();
 		},
-		// 关闭签到弹窗
-		closeQd() {
-			this.$refs.popupqd.close();
+		onReady() {
+			// 初始化获取页面宽度
+			uni.createSelectorQuery()
+				.select('.container')
+				.fields({
+						size: true
+					},
+					data => {
+						// 计算最多下拉的高度
+						this.userDowm = Math.floor((data.width / 750) * 185);
+						// 计算最大触发修改高度事件
+						this.userMaxDowm = Math.floor((data.width / 750) * 250);
+					}
+				)
+				.exec();
 		},
-		// 打开客服
-		openKf() {
-			this.$refs.popupkf.open();
+		// #ifndef MP
+		// onNavigationBarButtonTap(e) {
+		// 	const index = e.index;
+		// 	if (index === 0) {
+		// 		this.navTo('/pages/set/set');
+		// 	} else if (index === 1) {
+		// 		// #ifdef APP-PLUS
+		// 		const pages = getCurrentPages();
+		// 		const page = pages[pages.length - 1];
+		// 		const currentWebview = page.$getAppWebview();
+		// 		currentWebview.hideTitleNViewButtonRedDot({
+		// 			index
+		// 		});
+		// 		// #endif
+		// 		uni.navigateTo({
+		// 			url: '/pages/user/notice'
+		// 		});
+		// 	}
+		// },
+		// #endif
+		computed: {
+			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 		},
-		// 关闭客服
-		cancel() {
-			this.$refs.popupkf.close();
+		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			comfirm(text) {
+				console.log(text);
+				const result = this.uniCopy(text);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+				this.$refs.popupkf.close();
+			},
+			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
+			},
+			// 加载初始数据
+			loadBaseData() {
+				getUserInfo({})
+					.then(({
+						data
+					}) => {
+						this.setUserInfo(data);
+						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+						orderData({})
+							.then(({
+								data
+							}) => {
+								this.setOrderInfo(data);
+							})
+							.catch(e => {
+								this.setOrderInfo({
+									complete_count: 0, //完成
+									received_count: 0, //待收货
+									unshipped_count: 0, //待发货
+									order_count: 0, //订单总数
+									unpaid_count: 0 //待付款
+								});
+							});
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画，所以用view
+			 */
+			navTo(url) {
+				console.log(url);
+				if (!this.hasLogin) {
+					// 保存地址
+					saveUrl();
+					// 登录拦截
+					interceptor();
+				} else {
+					uni.navigateTo({
+						url
+					});
+				}
+			},
+			useTool(e) {
+				this.navTo(e.path);
+			},
+			// 签到弹窗
+			goQd() {
+				this.$refs.popupqd.open();
+				this.qded = true;
+			},
+			// 关闭签到弹窗
+			closeQd() {
+				this.$refs.popupqd.close();
+			},
+			// 打开客服
+			openKf() {
+				this.$refs.popupkf.open();
+			},
+			// 关闭客服
+			cancel() {
+				this.$refs.popupkf.close();
+			}
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-%flex-center {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-
-%section {
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-	background: #fff;
-	border-radius: 10rpx;
-}
-
-.container,
-page {
-	min-height: 100%;
-	height: auto;
-	background-color: $page-color-base;
-}
-
-.vheigh {
-	height: var(--status-bar-height);
-	background-color: $base-color;
-}
-
-.top-image {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 230rpx;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-
-.tool-list {
-	width: 690rpx;
-	margin: auto;
-	margin-top: 20rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-}
-
-.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;
+	%flex-center {
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10rpx;
+	}
+
+	.container,
+	page {
+		min-height: 100%;
+		height: auto;
+		background-color: $page-color-base;
+	}
+
+	.vheigh {
+		height: var(--status-bar-height);
+		background-color: $base-color;
+	}
+
+	.top-image {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 230rpx;
 
 		image {
-			border-radius: 20rpx 20rpx 0 0;
-			width: 450rpx;
-			height: 132rpx;
+			width: 100%;
+			height: 100%;
 		}
 	}
 
-	.mian {
-		margin-top: -44rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		// padding: 32rpx 32rpx;
+	.tool-list {
+		width: 690rpx;
+		margin: auto;
+		margin-top: 20rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+		border-radius: 20rpx;
+	}
+
+	.popup-box {
+		width: 522rpx;
+		height: 605rpx;
 		background-color: #ffffff;
-		border-radius: 0 0 20rpx 20rpx;
-		text-align: center;
+		border-radius: 20rpx;
+		position: relative;
 
-		.delivery {
-			font-size: 40rpx;
-			color: #333333;
+		.img {
+			position: relative;
+			top: -56rpx;
+			left: 0;
+			width: 522rpx;
+			height: 132rpx;
 			display: flex;
-			align-items: center;
-			flex-direction: column;
+			justify-content: center;
 
 			image {
-				margin-top: 48rpx;
-				width: 172rpx;
-				height: 160rpx;
+				border-radius: 20rpx 20rpx 0 0;
+				width: 450rpx;
+				height: 132rpx;
 			}
 		}
 
-		.nocancel {
-			font-size: 32rpx;
-			color: #333333;
-			margin-top: 14rpx;
-		}
-
-		.comfirm-box {
-			margin-top: 52rpx;
+		.mian {
+			margin-top: -44rpx;
 			display: flex;
-			// margin-bottom: 32rpx;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 32rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 20rpx 20rpx;
+			text-align: center;
 
-			// justify-content: space-around;
-			.cancel {
+			.delivery {
+				font-size: 40rpx;
+				color: #333333;
 				display: flex;
 				align-items: center;
-				justify-content: center;
-				width: 197rpx;
-				height: 74rpx;
-				border: 1px solid #dcc786;
-				border-radius: 38rpx;
+				flex-direction: column;
 
+				image {
+					margin-top: 48rpx;
+					width: 172rpx;
+					height: 160rpx;
+				}
+			}
+
+			.nocancel {
 				font-size: 32rpx;
-				color: #605128;
+				color: #333333;
+				margin-top: 14rpx;
 			}
 
-			.comfirm {
-				margin-left: 32rpx;
+			.comfirm-box {
+				margin-top: 52rpx;
 				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;
+				// 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;
+				}
 			}
 		}
 	}
-}
 
-.popup {
-	width: 560rpx;
-	padding-bottom: 45rpx;
-	background-color: #ffffff;
-	border-radius: 15rpx;
-	text-align: center;
-	line-height: 1;
+	.popup {
+		width: 560rpx;
+		padding-bottom: 45rpx;
+		background-color: #ffffff;
+		border-radius: 15rpx;
+		text-align: center;
+		line-height: 1;
 
-	.popup-dox {
-		position: relative;
+		.popup-dox {
+			position: relative;
 
-		.popup-logo {
-			margin: -160rpx auto 0;
-			width: 400rpx;
-			height: 200rpx;
+			.popup-logo {
+				margin: -160rpx auto 0;
+				width: 400rpx;
+				height: 200rpx;
+			}
 		}
-	}
 
-	.popup-title {
-		margin-top: 85rpx;
-		font-size: 40rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #2a2a2a;
+		.popup-title {
+			margin-top: 85rpx;
+			font-size: 40rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #2a2a2a;
 
-		text {
-			font-size: 56rpx;
-			color: #e83f30;
+			text {
+				font-size: 56rpx;
+				color: #e83f30;
+			}
 		}
-	}
 
-	.popup-tip {
-		margin-top: 20rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #8c8c8c;
+		.popup-tip {
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #8c8c8c;
 
-		text {
-			color: #e83f30;
+			text {
+				color: #e83f30;
+			}
 		}
-	}
 
-	.popup-btn {
-		margin: 58rpx auto 0;
-		width: 270rpx;
-		height: 66rpx;
-		background: #f0c838;
-		border-radius: 34rpx;
-		text-align: center;
-		line-height: 66rpx;
-		font-size: 36rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 500;
-		color: #ffffff;
+		.popup-btn {
+			margin: 58rpx auto 0;
+			width: 270rpx;
+			height: 66rpx;
+			background: #f0c838;
+			border-radius: 34rpx;
+			text-align: center;
+			line-height: 66rpx;
+			font-size: 36rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 500;
+			color: #ffffff;
+		}
 	}
-}
-.user-wrap {
-	position: relative;
-	z-index: 10;
-	width: 690rpx;
-	height: 283rpx;
-	background: #ffffff;
-	box-shadow: 0px 4rpx 13rpx 0px rgba(229, 229, 229, 0.46);
-	border-radius: 20rpx;
-	padding: 34rpx 0 40rpx;
-	margin: auto;
-	.info-left {
-		padding-left: 34rpx;
-		.user-name {
-			display: flex;
-			align-items: center;
-			image {
-				width: 120rpx;
-				height: 120rpx;
-				border-radius: 50%;
-			}
-			.user-font {
-				padding-left: 34rpx;
-				.name {
-					width: 250rpx;
-					font-size: 40rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #333333;
+
+	.user-wrap {
+		position: relative;
+		z-index: 10;
+		width: 690rpx;
+		height: 283rpx;
+		background: #ffffff;
+		box-shadow: 0px 4rpx 13rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
+		padding: 34rpx 0 40rpx;
+		margin: auto;
+
+		.info-left {
+			padding-left: 34rpx;
+
+			.user-name {
+				display: flex;
+				align-items: center;
+
+				image {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
 				}
-				.phone {
-					margin-top: 10rpx;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
+
+				.user-font {
+					padding-left: 34rpx;
+
+					.name {
+						width: 250rpx;
+						font-size: 40rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #333333;
+					}
+
+					.phone {
+						margin-top: 10rpx;
+						font-size: 20rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+					}
 				}
 			}
+
+			.kpi {
+				background: #f5eede;
+				border-radius: 30rpx 0px 0px 30rpx;
+				padding: 18rpx 24rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #c6914e;
+			}
 		}
-		.kpi {
-			background: #f5eede;
-			border-radius: 30rpx 0px 0px 30rpx;
-			padding: 18rpx 24rpx;
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #c6914e;
-		}
-	}
-	.info-right {
-		display: flex;
-		align-items: center;
-		margin-top: 54rpx;
-		padding: 0 34rpx;
-		.iright-icon {
-			width: 32rpx;
-			height: 32rpx;
-		}
-		.iright-font {
-			margin-left: 12rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-}
-.user-set {
-	justify-content: flex-end;
-	view {
-		flex-shrink: 0;
-	}
-	padding: 30rpx;
-	image {
-		height: 40rpx;
-		width: 40rpx;
-	}
-}
-.main-box {
-	margin: 20rpx auto 0;
-	width: 690rpx;
-	background: #ffffff;
-	box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
-	border-radius: 20rpx;
-	.title {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx;
-		border-bottom: 1px solid #EEEEEE;
-		.title-left {
+
+		.info-right {
 			display: flex;
 			align-items: center;
-			.title-icon {
+			margin-top: 54rpx;
+			padding: 0 34rpx;
+
+			.iright-icon {
 				width: 32rpx;
 				height: 32rpx;
 			}
-			.title-font {
-				margin-left: 20rpx;
+
+			.iright-font {
+				margin-left: 12rpx;
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #333333;
 			}
 		}
-		.title-right {
-			width: 14rpx;
-			height: 24rpx;
+	}
+
+	.user-set {
+		justify-content: flex-end;
+
+		view {
+			flex-shrink: 0;
+		}
+
+		padding: 30rpx;
+
+		image {
+			height: 40rpx;
+			width: 40rpx;
 		}
 	}
-	.main {
-		padding:50rpx 0 30rpx;
-		.item {
-			padding-bottom: 20rpx;
-			width: 33%;
+
+	.main-box {
+		margin: 20rpx auto 0;
+		width: 690rpx;
+		background: #ffffff;
+		box-shadow: 0px 4rpx 14rpx 0px rgba(229, 229, 229, 0.46);
+		border-radius: 20rpx;
+
+		.title {
 			display: flex;
-			flex-direction: column;
+			justify-content: space-between;
 			align-items: center;
-			.item-num {
-				font-size: 36rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #333333;
+			padding: 24rpx;
+			border-bottom: 1px solid #EEEEEE;
+
+			.title-left {
+				display: flex;
+				align-items: center;
+
+				.title-icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
+
+				.title-font {
+					margin-left: 20rpx;
+					font-size: 28rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
 			}
-			.item-font {
-				margin-top: 18rpx;
-				font-size: 22rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #666666;
+
+			.title-right {
+				width: 14rpx;
+				height: 24rpx;
 			}
 		}
-		.oitem {
-			width: 25%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			.oitem-image {
-				height: 50rpx;
-				width: 48rpx;
+
+		.main {
+			padding: 50rpx 0 30rpx;
+
+			.item {
+				padding-bottom: 20rpx;
+				width: 33%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.item-num {
+					font-size: 36rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+
+				.item-font {
+					margin-top: 18rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
 			}
-			.oitem-font {
-				margin-top: 20rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
+
+			.oitem {
+				width: 25%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.oitem-image {
+					height: 50rpx;
+					width: 48rpx;
+				}
+
+				.oitem-font {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
 			}
 		}
 	}
-}
-.gpai {
-	width: 100rpx;
-	line-height: 40rpx;
-	border-radius: 25rpx;
-	position: absolute;
-	top: 120rpx;
-	left: 40rpx;
-	font-size: 24rpx;
-	color: #c6914e;
-	text-align: center;
-	background-color: #f2d4ae;
-}
+
+	.gpai {
+		width: 100rpx;
+		line-height: 40rpx;
+		border-radius: 25rpx;
+		position: absolute;
+		top: 120rpx;
+		left: 40rpx;
+		font-size: 24rpx;
+		color: #c6914e;
+		text-align: center;
+		background-color: #f2d4ae;
+	}
 </style>

pages/user/withdrawal.vue

@@ -1,305 +1,368 @@
-<template>
-	<view class="content">
-		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
-		<view class="content-money">
-			<view class="flex1 ">
-				<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.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="#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.payment">{{ 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="#5dbc7c" :checked="type == 'bank'" /></view>
-					</view>
-				</label>
-			</radio-group>
-		</view>
-		<!-- #endif -->
-		<button class="add-btn up" @click="confirm">提交申请</button>
-		<button class="add-btn modified" @click="navTo('/pages/collection/collection')">账号管理</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, pay_list } from '@/api/wallet.js';
-import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		uniNoticeBar
-	},
-	data() {
-		return {
-			type: 'ali', //提现方式
-			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.loadinfo();
-	},
-	methods: {
-		//加载数据
-		async loadinfo(source) {
-			pay_list().then(({ data }) => {
-				this.aliData = data.zfb;
-				this.bankData = data.bank;
-				console.log(data);
-			});
-		},
-		// 加载余额信息
-		async loadData() {
-			extractBank({}).then(({ data }) => {
-				this.money = data.brokerage_price; //可提现余额
-				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余额
+<template>
+	<view class="content">
+		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
+		<view class="content-money">
+			<view class="flex1 ">
+				<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.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="#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.payment">{{ 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="#5dbc7c" :checked="type == 'bank'" />
+						</view>
+					</view>
+				</label>
+				<label>
+					<view class="box">
+						<view class="icon iconfont">
+							<image class="icon-img" src="/static/icon/trc.png" mode="aspectFit"></image>
+						</view>
+						<view class="title-box">
+							<view class="title">
+								<text v-if="wxData.payment">{{ wxData.payment }}</text>
+								<text v-else>请完善TRC20信息</text>
+							</view>
+							<view class="node">
+								<text v-if="wxData.payment">账号({{ wxData.payment }})</text>
+							</view>
+						</view>
+						<view class="right">
+							<radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" />
+						</view>
+					</view>
+				</label>
+			</radio-group>
+		</view>
+		<!-- #endif -->
+		<button class="add-btn up" @click="confirm">提交申请</button>
+		<button class="add-btn modified" @click="navTo('/pages/collection/collection')">账号管理</button>
+	</view>
+</template>
+
+<script>
+	import {
+		getMoneyStyle
+	} from '@/utils/rocessor.js';
+	import {
+		extractCash,
+		extractBank,
+		pay_list
+	} from '@/api/wallet.js';
+	import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
+	export default {
+		filters: {
+			getMoneyStyle
+		},
+		components: {
+			uniNoticeBar
+		},
+		data() {
+			return {
+				type: 'alipay', //提现方式
+				money: '0.00', //可提现金额
+				freeze: '0.0', //冻结金额
+				withdrawal: '', //提现金额
+				minPrice: '', //最少提现金额
+				aliData: {},
+				bankData: {},
+				wxData: {},
+				// #ifdef H5
+				weichatBsrowser: false
+				// #endif
 			};
-			console.log(this.type)
-			if (this.type == 'alipay') {
-				data.name = this.aliData.name;
-				data.alipay_code = this.aliData.payment;
-			}
-			if (this.type == 'bank') {
-				data.name = this.bankData.name;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.payment;
-			}
-			console.log(data)
-			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;
-	
-}
-.flex1 {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	display: flex;
-	justify-content: center;
-	.buttom {
-		font-size: $font-lg;
-		color: $font-color-dark;
-		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: #dc262b;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	&.modified {
-		color: #303030;
-	}
-	&.up {
-		background: #303030;
-		color: #F8DABA;
-	}
-	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;
-}
-
-.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;
-}
+		},
+		onLoad(options) {
+			// #ifdef H5
+			this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
+			// #endif
+			//加载提现信息
+			this.loadData();
+			// 加载提款账号信息
+			this.loadinfo();
+		},
+		methods: {
+			//加载数据
+			async loadinfo(source) {
+				pay_list().then(({
+					data
+				}) => {
+					this.aliData = data.zfb;
+					this.bankData = data.bank;
+					this.wxData = data.wx
+					console.log(data);
+				});
+			},
+			// 加载余额信息
+			async loadData() {
+				extractBank({}).then(({
+					data
+				}) => {
+					this.money = data.brokerage_price; //可提现余额
+					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余额
+				};
+				console.log(this.type)
+				if (this.type == 'alipay') {
+					data.name = this.aliData.name;
+					data.alipay_code = this.aliData.payment;
+				}
+				if (this.type == 'bank') {
+					data.name = this.bankData.name;
+					data.bankname = this.bankData.bank;
+					data.cardnum = this.bankData.payment;
+				}
+				console.log(data)
+				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;
+
+	}
+
+	.flex1 {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		border-radius: $border-radius-sm;
+		display: flex;
+		justify-content: center;
+
+		.buttom {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			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: #dc262b;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.add-btn {
+		&.modified {
+			color: #303030;
+		}
+
+		&.up {
+			background: #303030;
+			color: #F8DABA;
+		}
+
+		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;
+	}
+
+	.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>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/e45ee480-c21e-11ec-88d1-137e4a7d9ac2
+https://ide.dcloud.net.cn/build/download/118fe7d0-cc0c-11ec-b32b-09766fcef084

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.c1d70506.js></script><script src=/index/static/js/index.b5315871.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.dd67a10a.js></script><script src=/index/static/js/index.89120dd4.js></script></body></html>