11-11-2

pages/appointment/appointment.vue

@@ -30,18 +30,10 @@
 								<view class="info-tit">收益：</view>
 								<view class="info-val">{{item.day}}天/{{item.proportion}}%</view>
 							</view>
-							<!-- <view class="info-data">
-								<view class="info-tit">开始时间：</view>
-								<view class="info-val">10:20</view>
-							</view> -->
 							<view class="info-data">
 								<view class="info-tit">可获通证：</view>
 								<view class="info-val">{{item.pass}}%</view>
 							</view>
-							<!-- <view class="info-data">
-								<view class="info-tit">终止释放时间：</view>
-								<view class="info-val">10:20</view>
-							</view> -->
 							<view class="info-data" v-if="item.status == 1 || item.status == -1">
 								<view class="info-tit">是否中奖：</view>
 								<view class="info-val">{{item.status == 1?'中奖':item.status == -1 ? '未中奖': ''}}</view>
@@ -50,6 +42,17 @@
 								<view class="info-tit">价值：</view>
 								<view class="info-val">{{item.price}}</view>
 							</view>
+							<view class="upimg" v-if="item.status == 1">
+								<view class="up-tit">
+									打款凭证：
+								</view>
+								<view class="img-wrap" v-if="item.pay_evaluation" @click="lookimg(item.pay_evaluation)">
+									<image :src="item.pay_evaluation" mode=""></image>
+								</view>
+								<view class="" style="color: #0F253A;font-weight: bold;font-size: 26rpx;" v-else>
+									上传支付凭证
+								</view>
+							</view>
 							<view class="btn-wrap flex" v-if="item.status == 1 || item.status == 2">
 								<!-- <view class="btn" @click="open(item.id)"> -->
 								<view class="btn" @click="navto('/pages/purchase/upload?id=' + item.id + '&paytype=' + JSON.stringify(item.touser) )">
@@ -62,25 +65,16 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-		<uni-popup ref="popup1" type="center" :maskClick="false">
-			<view class="upload-wrap">
-				<view class="tit">
-					上传支付凭证
-				</view>
-				<view class="up-wrap" @click="imgsub('upimg')">
-					<image :src="upimg" mode="" v-if="upimg"></image>
-					<image v-else src="../../static/img/upimg.png" mode=""></image>
-				</view>
-				<view class="btn-wrap">
-					<view class="btn qx" @click="qx">
-						取消
-					</view>
-					<view class="btn" @click="evaluationUpload">提交</view>
-				</view>
-				
+		<uni-popup ref="lookimg" type="center">
+			<view class="pop-wrap" style="position: relative;" >
+				<movable-area class="popup-box">
+					<movable-view class="popup-item" :scale="true" direction="all">
+						<image :src="chooseImg" mode=""></image>
+					</movable-view>
+				</movable-area>
+				<image src="../../static/icon/close.png" mode="" class="close" style="width: 80rpx;height: 80rpx;" @click="closePup"></image>
 			</view>
 		</uni-popup>
-		<!-- <u-tabbar v-model="current" :list="tabbar" active-color="#FF0000" inactive-color="#f19c99"></u-tabbar> -->
 	</view>
 </template>
 
@@ -144,6 +138,7 @@
 		},
 		data() {
 			return {
+				chooseImg: '',
 				height: '',
 				currentIndex: 0,
 				navList: [{
@@ -201,6 +196,15 @@
 			});
 		},
 		methods: {
+			lookimg(src) {
+				console.log(src,'chooseImg++++++')
+				this.chooseImg = src
+				this.$refs.lookimg.open()
+			},
+			closePup() {
+				this.chooseImg = ''
+				this.$refs.lookimg.close()
+			},
 			navto(url) {
 				uni.navigateTo({
 					url: url
@@ -411,6 +415,32 @@
 					font-weight: bold;
 				}
 			}
+			.upimg {
+				padding-top: 10rpx;
+				display: flex;
+			
+				.up-tit {
+					display: inline-block;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #6D7C88;
+				}
+			
+				.img-wrap {
+					width: 153rpx;
+					height: 152rpx;
+			
+					border-radius: 20rpx;
+			
+					image {
+						border-radius: 20rpx;
+						width: 153rpx;
+						height: 152rpx;
+						// background-color: red;
+					}
+				}
+			}
 			.btn-wrap {
 				padding-top: 20rpx;
 				width: 100%;
@@ -431,53 +461,41 @@
 
 		}
 	}
-	.upload-wrap {
-		width: 500rpx;
-		height: 500rpx;
-		background-color: #fff;
+	
+	.pop-wrap {
+		width: 522rpx;
+		height: 800rpx;
+		// background-color: red;
+	}
+	.popup-box {
+		width: 522rpx;
+		height: 800rpx;
 		border-radius: 20rpx;
-		.tit {
-			padding: 30rpx 25rpx;
-			text-align: center;
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #101010;
-		}
-		
-		.up-wrap {
-			margin:auto;
-			width: 225rpx;
-			height: 225rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-		
+		position: relative;
+		overflow: hidden;
+		background-color: #fff;
+		.popup-item {
+			width: 100%;
+			height: 100%;
+			
+			
 			image {
-				width: 225rpx;
-				height: 225rpx;
-				border-radius: 10rpx;
-			}
-		}
-		.btn-wrap {
-			display: flex;
-			.btn {
-				margin: 50rpx auto 0;
-				width: 150rpx;
-				line-height: 84rpx;
-				background: linear-gradient(30deg, #FF4C4C, #FE6238);
-				border-radius: 10rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #FFFFFF;
-				text-align: center;
-			}
-			.qx {
-				background: #fff;
-				border: 1px solid #999;
-				color: #999;
+				width: 100%;
+				// height: 100%;
 			}
 		}
 		
 	}
+	.close {
+		display: block;
+		width: 40rpx;
+		height: 40rpx;
+		border: 50%;
+		position: absolute;
+		// background-color: red;
+		bottom: -100rpx;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+	}
 </style>

pages/purchase/upload.vue

@@ -13,6 +13,13 @@
 				<view class="item-name">微信号</view>
 				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.wx_no" />
 			</view>
+			<view class="base-item flex" v-if="type == '微信'">
+				<view class="item-name">收款码</view>
+				<view class="img-wrap">
+					<image :src="toUser.wx_qr" mode=""></image>
+				</view>
+				
+			</view>
 			<view class="base-item flex" v-if="type == '支付宝'">
 				<view class="item-name">支付宝姓名</view>
 				<input type="text" value="" class="item-val" placeholder="" v-model="toUser.alipay_name" />
@@ -89,6 +96,14 @@
 			//提交审核
 			evaluationUpload() {
 				let obj = this
+				if(obj.type == '') {
+					obj.$api.msg('请选择支付方式')
+					return 
+				}
+				if(obj.upimg == '') {
+					obj.$api.msg('请选择上传的凭证')
+					return 
+				}
 				evaluationUpload({
 					pay_evaluation: obj.upimg,
 					id: obj.chooseId
@@ -173,6 +188,14 @@
 			font-weight: 500;
 			color: #333333;
 			padding-left: 25rpx;
+			.img-wrap {
+					width: 478rpx;
+				image {
+					width: 200rpx;
+					height: 200rpx;
+				}
+			}
+			
 			.avatar {
 				margin: auto;
 				width: 200rpx;

pages/sellout/sellout.vue

@@ -286,11 +286,13 @@
 				}
 
 				.user-logo {
+					display: block;
 					width: 46rpx;
 					height: 46rpx;
 					border-radius: 50%;
-					background-color: red;
-					padding-right: 10rpx;
+					// background-color: red;
+					// padding-right: 10rpx;
+					margin-right: 10rpx;
 				}
 			}
 

pages/vip/fwbDetail.vue

@@ -14,11 +14,11 @@
 					<view class="data-tit">推广收益</view>
 				</view>
 				<view class="data" @click="navto('/pages/vip/mytz')">
-					<view class="data-val">200</view>
+					<view class="data-val">{{userInfo.now_money}}</view>
 					<view class="data-tit">我的通证</view>
 				</view>
 				<view class="data" @click="navto('/pages/user/integral')">
-					<view class="data-val">200</view>
+					<view class="data-val">{{userInfo.integral}}</view>
 					<view class="data-tit">我的积分</view>
 				</view>
 			</view>
@@ -92,6 +92,7 @@
 </template>
 
 <script>
+	import { orderData, getUserInfo,service } from '@/api/user.js';
 	import { getPackageList, packageReserve, packageExchange } from '@/api/package.js'
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import { mapState, mapMutations } from 'vuex';
@@ -133,8 +134,10 @@
 			// this.getPackageList()
 			console.log(this.userInfo)
 			this.loadData()
+			this.getUserInfo()
 		},
 		methods: {
+			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
 			getPackageList() {
 				getPackageList().then(res => {
 					console.log(res,'getPackageList')
@@ -190,6 +193,7 @@
 						title:'兑换成功',
 						duration:2000
 					});
+					this.getUserInfo()
 				}).catch(err => {
 					console.log(err)
 				})
@@ -208,28 +212,22 @@
 						title:'预约成功',
 						duration:2000
 					});
+					this.getUserInfo()
 					console.log(res)
 				}).catch(err => {
 					console.log(err)
 				})
 			},
-			//判断是否由基本信息
-			judgeBase() {
-				let obj = this
-				console.log(obj.userInfo.wx_qr,'obj.userInfo.wx_qr')
-				if(obj.userInfo.wx_qr) {
-					console.log('hhhhhh')
-					console.log(obj.userInfo.wx_qr)
-				}else {
-					console.log(obj.userInfo.wx_qr,'console.log(obj.userInfo.wx_qr)')
-					// obj.$api.msg('修改成功');
-					setTimeout(()=> {
-						uni.navigateTo({
-							url:'/pages/set/userdata'
-						})
-					}, 1000);
-					return
-				}
+			getUserInfo() {
+				getUserInfo({})
+					.then(({ data }) => {
+						console.log(data)
+						this.setUserInfo(data);
+						console.log(data)
+					})
+					.catch(e => {
+						console.log(e);
+					});
 			}
 		}
 	}