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

components/tabbar/tabbar.js

@@ -0,0 +1,19 @@
+export const tabbar = [{
+		iconPath: '../../static/tabBar/home.png',
+		selectedIconPath: '../../static/tabBar/home-action.png',
+		text: '首页',
+		pagePath: '/pages/index/index'
+	},
+	{
+		iconPath: '../../static/tabBar/center.png',
+		selectedIconPath: '../../static/tabBar/center-action.png',
+		text: '审核',
+		pagePath: '/pages/user/applyList'
+	},
+	{
+		iconPath: '../../static/tabBar/user.png',
+		selectedIconPath: '../../static/tabBar/user-action.png',
+		text: '我的',
+		pagePath: '/pages/user/user'
+	}
+]

pages.json

@@ -80,6 +80,14 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/index/male",
+			"style": {
+				"navigationBarTitleText": "详情",
+				"navigationBarBackgroundColor": "#000000",
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/index/info",
 			"style": {

pages/index/index.vue

@@ -8,7 +8,7 @@
 					<image src="../../static/img/index/youhui1.png" mode="" class="discounts1"></image>
 					<view class="money">
 						￥
-						<text>{{ item.money*2 }}</text>
+						<text>{{ item.money * 2 }}</text>
 					</view>
 					<view class="baodan" @click="baodan(item.id)">{{$t('hea.ckxq')}}</view>
 				</view>
@@ -18,11 +18,13 @@
 			<image src="../../static/img/index/index1.png" mode=""></image>
 			<!-- <view class="bottom"></view> -->
 		</view>
+		<u-tabbar :list="tabbar" bg-color='#000' active-color='#FAD6B0' inactive-color='#71614f' change='change'></u-tabbar>
 	</view>
 </template>
 <script>
 import baseNav from '@/pages/public/nav.vue';
 import { mapState, mapMutations } from 'vuex';
+import { tabbar } from '@/components/tabbar/tabbar.js'
 import { activityList } from '@/api/active.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import store from '../../store/index.js'
@@ -36,7 +38,8 @@ export default {
 	data() {
 		return {
 			list: [],
-			revenueList: []
+			revenueList: [],
+			tabbar: tabbar,
 		};
 	},
 	onShow() {
@@ -100,6 +103,9 @@ export default {
 				i = num + '元';
 			}
 			return i;
+		},
+		change(index){
+			console.log(index)
 		}
 	}
 };

pages/index/info.vue

@@ -19,11 +19,12 @@
 			</view>
 			<view class="main flex" v-if="item.system_get == 0">
 				<view class="left flex">
-					<view class="bank"><image src="../../static/img/bank.png" mode=""></image></view>
+					<!-- <view class="bank"><image src="../../static/img/bank.png" mode=""></image></view>
 					<view class="main-info">
 						<view class="name">{{ item.checker.bank_of_deposit || '暂无' }}</view>
 						<view class="name">{{ item.checker.bank_card_no || '暂无' }}</view>
-					</view>
+					</view> -->
+					<view class="right-box" @click="navTo('/pages/index/male')" style="width: 228rpx;">援助付款信息</view>
 				</view>
 				<view class="right"><view class="right-box" @click="nav(item)">上传凭证</view></view>
 			</view>
@@ -130,6 +131,11 @@ export default {
 				});
 			}
 		},
+		navTo(url) {
+			uni.navigateTo({
+				url
+			})
+		},
 		setData() {
 			// #ifdef APP-PLUS
 			uni.setClipboardData({
@@ -218,20 +224,20 @@ export default {
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #fad6b0;
-			.right-box {
-				width: 188rpx;
-				height: 56rpx;
-				background: linear-gradient(-74deg, #ce9c6d, #ffecd6);
-				border-image: linear-gradient(115deg, #feebd5, #ffffff, #e1ad7d) 1 1;
-				box-shadow: 3rpx 4rpx 5rpx 0px rgba(151, 118, 74, 0.5);
-				border-radius: 28rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #643912;
-				text-align: center;
-				line-height: 56rpx;
-			}
+		}
+		.right-box {
+			width: 188rpx;
+			height: 56rpx;
+			background: linear-gradient(-74deg, #ce9c6d, #ffecd6);
+			border-image: linear-gradient(115deg, #feebd5, #ffffff, #e1ad7d) 1 1;
+			box-shadow: 3rpx 4rpx 5rpx 0px rgba(151, 118, 74, 0.5);
+			border-radius: 28rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #643912;
+			text-align: center;
+			line-height: 56rpx;
 		}
 	}
 }

pages/index/infoDetail.vue

@@ -108,11 +108,11 @@ export default {
 			return i;
 		},
 		baodan(id) {
-			if (!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit) {
+			if ((!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit) && this.userInfo.ali == null && this.userInfo.wechat == null) {
 				console.log(this.userInfo, '11111');
 				uni.showModal({
 					title: '提示',
-					content: '您当前未填写银行卡信息和所属银行是否前往填写',
+					content: '您当前未填写收款信息,是否前往填写',
 					success: function(res) {
 						if (res.confirm) {
 							uni.navigateTo({

pages/index/male.vue

@@ -0,0 +1,176 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="title" style="margin-top: 0;">1.银行转账援助</view>
+			<view class="detail">
+				<view class="detail-item">
+					银行账户：{{ userInfo.bank_card_no }}
+					<view class="copy" @click="copy(userInfo.bank_card_no)">复制账号</view>
+				</view>
+				<view class="detail-spe">
+					开户行：{{ userInfo.bank_of_deposit }}
+					<view class="copyband" @click="copy(userInfo.bank_of_deposit)">复制开户行</view>
+				</view>
+			</view>
+			<view class="title" v-if="userInfo.ali">2.支付宝扫码援助</view>
+			<view v-if="userInfo.ali" class="erweima"><image :src="userInfo.ali" mode="widthFix"></image></view>
+			<view v-if="userInfo.wechat" class="title">3.微信扫码援助</view>
+			<view v-if="userInfo.wechat" class="erweima" ><image :src="userInfo.wechat" mode="widthFix"></image></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+export default {
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onLoad() {
+		console.log(this.userInfo);
+	},
+	methods: {
+		copy(text) {
+			uni.setClipboardData({
+				data: text,
+				success: e => {
+					uni.showToast({
+						title: '复制成功！'
+					});
+				},
+				fail(e) {
+					uni.showToast({
+						title: '复制失败',
+						icon: false
+					});
+					console.log(e);
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+body,
+page {
+	height: 100%;
+	background-color: #000;
+}
+
+.content {
+	background-color: #000;
+	line-height: 1;
+	padding-top: 25rpx;
+	padding: 24rpx 24rpx 90rpx;
+
+	.cross {
+		margin-left: 6rpx;
+		height: 76rpx;
+		line-height: 76rpx;
+		color: #444444;
+		border-bottom: 1rpx solid #cccccc;
+	}
+
+	.image {
+		margin-top: 44rpx;
+		margin-bottom: 48rpx;
+		height: 404rpx;
+		width: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.box {
+		padding: 20rpx 0 24rpx;
+		color: #fff;
+		.title {
+			margin-top: 60rpx;
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+		}
+
+		.detail {
+			padding-top: 10rpx;
+			font-size: 28rpx;
+			line-height: 40rpx;
+			.detail-spe {
+				margin-top: 10rpx;
+				line-height: 46rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box; //必须结合的属性，将对象作为弹性伸缩盒子模型显示
+				-webkit-line-clamp: 2; //控制文本的行数
+				-webkit-box-orient: vertical; //必须结合的属性，设置或检索伸缩盒对象的子元素的排列方式
+
+				.copyband {
+					display: flex;
+					float: right;
+					// float: right;
+					justify-content: center;
+					border-radius: 10rpx;
+					line-height: 34rpx;
+					font-size: 24rpx;
+					color: #fff;
+					// padding: 0 24rpx;
+					width: 168rpx;
+					height: 34rpx;
+					margin-top: 8rpx;
+				}
+			}
+
+			.detail-item {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				// height: 40rpx;
+				line-height: 46rpx;
+				color: #fff;
+				margin-top: 10rpx;
+
+				.copy {
+					width: 168rpx;
+					display: flex;
+					justify-content: center;
+					background-color: #f1f1f1;
+					border-radius: 10rpx;
+					line-height: 34rpx;
+					font-size: 24rpx;
+					color: #333;
+					padding: 0 24rpx;
+					// width: 144rpx;
+					height: 34rpx;
+				}
+			}
+
+		}
+
+		.erweima {
+			width: 362rpx;
+			margin: 26rpx auto;
+			image {
+				width: 100%;
+			}
+		}
+		.zfb {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #0b9edd;
+			margin-top: 36rpx;
+			text-align: center;
+		}
+		.weixin {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #02974a;
+			margin-top: 36rpx;
+			text-align: center;
+		}
+	}
+}
+</style>

pages/index/video.vue

@@ -1,37 +1,34 @@
 <template>
-	<view class="center">
-		<image src="../../static/img/start.gif" mode=""></image>
-	</view>
+	<view class="center"><image src="../../static/img/start.gif" mode=""></image></view>
 </template>
 
 <script>
-	export default{
-		onLoad() {
-			
-			const innerAudioContext = uni.createInnerAudioContext();
-			innerAudioContext.autoplay = true;
-			innerAudioContext.startTime = 2;
-			innerAudioContext.src = 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-hello-uniapp/2cc220e0-c27a-11ea-9dfb-6da8e309e0d8.mp3';
-			innerAudioContext.onPlay(() => {
-			  console.log('开始播放');
+export default {
+	onLoad() {
+		// const innerAudioContext = uni.createInnerAudioContext();
+		// innerAudioContext.autoplay = true;
+		// innerAudioContext.startTime = 2;
+		// innerAudioContext.src = 'https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-hello-uniapp/2cc220e0-c27a-11ea-9dfb-6da8e309e0d8.mp3';
+		// innerAudioContext.onPlay(() => {
+		//   console.log('开始播放');
+		// });
+		// innerAudioContext.stop()
+		setTimeout(() => {
+			uni.switchTab({
+				url: '/pages/index/index'
 			});
-			setTimeout(()=>{
-				innerAudioContext.stop()
-				uni.switchTab({
-					url:'/pages/index/index'
-				})()
-			},2500)
-		}
+		}, 2500);
 	}
+};
 </script>
 
 <style lang="scss">
-	.center{
+.center {
+	width: 100%;
+	height: 100vh;
+	image {
 		width: 100%;
-		height: 100vh;
-		image{
-			width: 100%;
-			height: 100%;
-		}
+		height: 100%;
 	}
+}
 </style>

pages/set/userinfo.vue

@@ -23,6 +23,14 @@
 		<view class="row">
 			<text class="tit">账户</text>
 			<input class="input" type="text"  disabled="true" v-model="userInfo.username" placeholder-class="placeholder" />
+		</view>
+		<view class="row1">
+			<text class="tit">支付宝收款码</text>
+			<view class="background-img1" @click.stop="imgsubali"><image class="background-img1" :src="userInfo.ali" mode="aspectFill"></image></view>
+		</view>
+		<view class="row1">
+			<text class="tit">微信收款码</text>
+			<view class="background-img1" @click.stop="imgsubwechat"><image class="background-img1" :src="userInfo.wechat" mode="aspectFill"></image></view>
 		</view>
 		<view class="add-btn" @click="confirm">提交</view>
 		<view class="out" @click="toLogout">退出登录</view>
@@ -58,9 +66,31 @@ export default{
 				console.log(res,'++++++++++++++++')
 				this.userInfo.avatar = res[0].fullurl;
 			})
+		},
+		imgsubali() {
+			console.log('上传支付宝二维码')
+			uploads({
+				filename: ''
+			}).then(res => {
+				// console.log("data",data);
+				// this.userInfo.avatar = data.fullurl;
+				console.log(res,'++++++++++++++++')
+				this.userInfo.ali = res[0].fullurl;
+			})
+		},
+		imgsubwechat() {
+			console.log('上传微信二维码')
+			uploads({
+				filename: ''
+			}).then(res => {
+				// console.log("data",data);
+				// this.userInfo.avatar = data.fullurl;
+				console.log(res,'++++++++++++++++')
+				this.userInfo.wechat = res[0].fullurl;
+			})
 		},
 		confirm() {
-			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname,bank_of_deposit:this.userInfo.bank_of_deposit,bank_card_no:this.userInfo.bank_card_no})
+			userEdit({ avatar: this.userInfo.avatar ,nickname: this.userInfo.nickname,bank_of_deposit:this.userInfo.bank_of_deposit,bank_card_no:this.userInfo.bank_card_no,ali: this.userInfo.ali,wechat: this.userInfo.wechat})
 				.then(e => {
 					this.$api.msg('修改成功');
 					setTimeout(()=> {
@@ -117,6 +147,11 @@ export default{
 			height: 80rpx;
 			border-radius: 50%;
 			background: #f2f2f2;
+		}
+		.background-img1 {
+			width: 80rpx;
+			height: 80rpx;
+			background: #f2f2f2;
 		}
 	}
 	.row {

pages/user/applyList.vue

@@ -37,6 +37,7 @@
 				</movable-view>
 			</movable-area>
 		</uni-popup>
+		<u-tabbar :list="tabbar" bg-color='#000' active-color='#FAD6B0' inactive-color='#71614f' change='change'></u-tabbar>
 	</view>
 </template>
 
@@ -44,6 +45,7 @@
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import { getApplyList, passApply, cancelApply } from '../../api/apply.js';
 import empty from '@/components/empty';
+import { tabbar } from '@/components/tabbar/tabbar.js'
 export default {
 	components: {
 		empty,
@@ -54,6 +56,7 @@ export default {
 			img: '', //图片
 			height: '',
 			tabCurrentIndex: 0,
+			tabbar: tabbar,
 			navList: [
 				{
 					state: 0,

pages/user/user.vue

@@ -54,13 +54,14 @@
 				</view>
 			</view>
 		</uni-popup>
+		<u-tabbar :list="tabbar" bg-color='#000' active-color='#FAD6B0' inactive-color='#71614f' change='change'></u-tabbar>
 	</view>
 </template>
 
 <script>
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import uniCopy from '@/utils/uni-copy.js';
-
+import { tabbar } from '@/components/tabbar/tabbar.js'
 import { mapState, mapMutations } from 'vuex';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { getUserInfo } from '@/api/user.js';
@@ -69,6 +70,7 @@ export default {
 		return {
 			text: 'c1729888411',
 			isVip:1,
+			tabbar: tabbar,
 		};
 	},
 	components: {