112233

api/set.js

@@ -20,7 +20,7 @@ export function logout(data) {
 //修改密码
 export function registerReset(data) {
 	return request({
-		url: '/api/register/reset',
+		url: '/api/reset',
 		method: 'post',
 		data
 	});

lang/en.js

@@ -4,6 +4,7 @@ module.exports = {
 		txms: 'Fill in description',
 		bcms: 'remarks',
 		scms: "Please provide relevant screenshots and descriptions for the superior's review (up to two)",
+		ptms: 'Please provide relevant screenshots and descriptions for platform review (at most two).',
 		zc: 'Register',
 		srsj: 'Please enter mobile phone number',
 		srxmm: 'Please enter a new password',
@@ -49,7 +50,13 @@ module.exports = {
 		yy:'English',
 		sy:'Index',
 		wd:'My',
-		shlb:'Review'
+		shlb:'Review',
+		zcqd:'reconfirm',
+		nsfsjqrndbf:'1、Have you confirmed that your sponsor has been upgraded to VIP volunteer？',
+		rndbfytrmy:'2、If your sponsor does not upgrade the VIP volunteer, he/she will not receive your assistance. ',
+		dndkzcqrjh:'3、When you click the reconfirm button, you will not be able to change the account provided by the recipient.',
+		nsfsjqrndbfcj:'1、Have you confirmed that your sponsor has been upgraded to primary volunteer？',
+		rndbfytrmycj:'2、If your sponsor does not upgrade the primary volunteer, he/she will not receive your assistance. ',
 	},
 	foo: {
 		tx: 'Avatar',
@@ -108,6 +115,7 @@ module.exports = {
 		jtxkhh:'Please fill in the opening bank',
 		jtxjjlxrdh:'Please fill in the emergency contact number',
 		ndqwtxskxx:'You have not filled in the payment information, do you want to go to fill in?',
+		ndqwtxzsxm:'Your current real name is incorrect, do you want to go to fill in?',
 		bt:'Must fill in',
 		zsxm:'Name',
 		yhylsjh:'The bank reserves a mobile number',
@@ -118,6 +126,9 @@ module.exports = {
 		dqyzfk:'Current aid payments',
 		dqszfk:'Current assistance payments',
 		yzfk:'Assist payments',
-		syzfk:'Suffer assist payments'
+		syzfk:'Suffer assist payments',
+		jhrs:'activated Man',
+		hzrs:'Black diamonds Man',
+		xzewm:'Download qr code',
 	}
 }

lang/zh_cn.js

@@ -4,6 +4,7 @@ module.exports =  {
 		txms: '填写描述',
 		bcms: '补充描述',
 		scms: '请提供相关截图及描述，以便受援助方审核(最多两张)',
+		ptms: '请提供相关截图及描述，以便平台审核(最多两张)',
 		zc: '注册',
 		srsj: '请输入手机号',
 		srxmm: '请输入新密码',
@@ -49,7 +50,13 @@ module.exports =  {
 		yy:'中文',
 		sy:'首页',
 		wd:'我的',
-		shlb:'审核'
+		shlb:'审核',
+		zcqd:'再次确定',
+		nsfsjqrndbf:'1、您是否确认您的帮扶引荐人已升级VIP义工？',
+		rndbfytrmy:'2、如您的帮扶引荐人没有升级VIP义工，将无法收到您的援助。',
+		dndkzcqrjh:'3、当您点开再次确认键后，将无法更改受助方提供的账户',
+		nsfsjqrndbfcj:'1、您是否确认您的帮扶引荐人已升级初级义工？',
+		rndbfytrmycj:'2、如您的帮扶引荐人没有升级初级义工，将无法收到您的援助。',
     },
     foo:{
 		tx: '头像',
@@ -107,6 +114,7 @@ module.exports =  {
 		jtxkhh:'请填写开户行',
 		jtxjjlxrdh:'请填写紧急联系人电话',
 		ndqwtxskxx:'您当前未填写收款信息,是否前往填写?',
+		ndqwtxzsxm:'您当前真实姓名不正确,是否前往填写?',
 		bt:'必填',
 		zsxm:'真实姓名',
 		yhylsjh:'银行预留手机号',
@@ -117,6 +125,9 @@ module.exports =  {
 		dqyzfk:'当前援助付款',
 		dqszfk:'当前受援助付款',
 		yzfk:'援助付款',
-		syzfk:'受援助付款'
+		syzfk:'受援助付款',
+		jhrs:'激活人数',
+		hzrs:'黑钻人数',
+		xzewm:'下载二维码',
 	}
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "BYTC",
     "appid" : "__UNI__F3A92A0",
     "description" : "",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.2.1",
+    "versionCode" : 121,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -14,7 +14,9 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -36,7 +38,13 @@
                 "maps" : {},
                 "oauth" : {},
                 "geolocation" : {},
-                "payment" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxe7542891b1e27ad1",
+                        "UniversalLinks" : ""
+                    }
+                },
                 "push" : {},
                 "share" : {},
                 "speech" : {
@@ -107,7 +115,8 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://www.boyingtc.com/api",
+                    // "target" : "http://www.boyingtc.com/api",
+                    "target" : "http://bowin.frp.liuniu946.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages/index/article.vue

@@ -11,8 +11,8 @@
 			
 			<view class="" style="color: #e7e7e8;"><span>{{time}}</span></view>
 		</view>
-		<view v-html="synopsis" class="content">
-			{{ synopsis }}
+		<view v-html="content" class="content">
+			{{ content }}
 		</view>
 	</view>
 </template>
@@ -26,7 +26,7 @@ export default {
 		return{
 			src: '',
 			title: '',
-			synopsis:'',
+			content:'',
 			time:'',
 			author:'',
 			visit:''
@@ -49,7 +49,7 @@ export default {
 				let time = getTime(e.data.updatetime)
 				obj.src = this.baseURL + e.data.coverimage;
 				obj.title = e.data.title;
-				obj.synopsis = e.data.synopsis
+				obj.content = e.data.content
 				obj.time = time;
 				obj.author = e.data.author;
 				obj.visit = e.data.visit;

pages/index/index.vue

@@ -8,15 +8,7 @@
 				<view>
 					<view class="tongz-left flex" @click="goDetails">
 						<image class="image-left" src="../../static/img/ling.png" mode=""></image>
-						<u-notice-bar
-							style="width: 100%;"
-							mode="vertical"
-							type="none"
-							color="#ffffff"
-							:volume-icon="false"
-							:more-icon="true"
-							:list="showList"
-						></u-notice-bar>
+						<u-notice-bar style="width: 100%;" mode="vertical" type="none" color="#ffffff" :volume-icon="false" :more-icon="true" :list="showList"></u-notice-bar>
 					</view>
 				</view>
 			</view>
@@ -47,6 +39,7 @@ import { mapState, mapMutations } from 'vuex';
 import { activityList } from '@/api/active.js';
 import { article } from '@/api/index.js';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
+import { getApplyList } from '../../api/apply.js';
 import store from '../../store/index.js';
 export default {
 	components: {
@@ -79,6 +72,7 @@ export default {
 					iconPath: '../../static/tabBar/center.png',
 					selectedIconPath: '../../static/tabBar/center-action.png',
 					text: this.$t('hea.shlb'),
+					count: 0,
 					pagePath: '/pages/user/applyList'
 				},
 				{
@@ -133,6 +127,14 @@ export default {
 				this.showList = arr;
 				console.log(this.showList);
 			});
+			getApplyList({
+				page: 1,
+				limit: 1,
+				status: 0
+			}).then(({ data }) => {
+				console.log(data,'1111')
+				this.tabbar[1].count = data.count
+			});
 		},
 		change(index) {
 			console.log(index);

pages/index/info.vue

@@ -30,7 +30,7 @@
 					<view class="right-box" @click="navTo(item)" style="width: 228rpx;">{{ $t('foo.yzfkxx') }}</view>
 				</view>
 				<view class="right">
-					<view class="right-box" @click="nav(item)">{{ $t('foo.scpz') }}</view>
+					<view class="right-box" @click="nav(item,2)">{{ $t('foo.scpz') }}</view>
 				</view>
 			</view>
 			<view class="" v-if="item.system_get == 1">
@@ -54,7 +54,7 @@
 				</view>
 				<view class="address">{{ num }}</view>
 				<view class="btn" style="margin-top: 50rpx;" @click="setData">{{ $t('foo.zfcbdz') }}</view>
-				<view class="btn" @click="nav(item.id)">{{ $t('foo.scpz') }}</view>
+				<view class="btn" @click="nav(item,1)">{{ $t('foo.scpz') }}</view>
 			</view>
 		</view>
 
@@ -115,8 +115,9 @@ export default {
 				}
 			});
 		},
-		nav(item) {
-			if (item.voucherimages) {
+		nav(item,type) {
+			console.log(type)
+			if (item.voucherimages != null) {
 				uni.showModal({
 					title: this.$t('foo.ts'),
 					content: this.$t('foo.yscpzsfcxsc'),
@@ -124,7 +125,7 @@ export default {
 						if (res.confirm) {
 							console.log('用户点击确定');
 							uni.navigateTo({
-								url: '/pages/upload/upload?id=' + item.id
+								url: '/pages/upload/upload?id=' + item.id + '&type=' + type
 							});
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -133,7 +134,7 @@ export default {
 				});
 			} else {
 				uni.navigateTo({
-					url: '/pages/upload/upload?id=' + item.id
+					url: '/pages/upload/upload?id=' + item.id + '&type=' + type
 				});
 			}
 		},

pages/index/infoDetail.vue

@@ -2,50 +2,67 @@
 	<view class="center">
 		<view class="box">
 			<view class="discounts">
-				<view class="title">{{$t('hea.yz')}}:</view>
+				<view class="title">{{ $t('hea.yz') }}:</view>
 				<view class="money">
 					￥
-					<text>{{ item.money * 2 || 0}}</text>
+					<text>{{ item.money * 2 || 0 }}</text>
 				</view>
 			</view>
 			<view class="main-box">
 				<view class="main-title">
 					<view class="main-title-image"><image class="image" src="../../static/icon/title.png" mode=""></image></view>
-					<view class="main-title-font">{{item.name}}</view>
+					<view class="main-title-font" v-if="item.v2_layer == 0">{{ item.name }}</view>
+					<view class="main-title-font" v-else-if="(status == '1' && item.income * 1 >= item.v2_limit * 1 && item.v2_layer != 0) || status == '2'">黑钻VIP义工受益</view>
+					<view class="main-title-font" v-else>VIP义工受益</view>
 				</view>
 				<view class="main">
-					<view class="main-item"  v-for="(ls, index) in revenueList">
+					<view class="main-item" v-for="(ls, index) in revenueList">
 						<view class="main-image"><image :src="image[index]" mode=""></image></view>
 						<view class="main-font">
-							<view class="textDetail-title">{{ index < 2 ? index + 1 + $t('hea.dsy') : index + 1 + $t('hea.dsy') + '(' + $t('hea.vipzs')+ ')' }}</view>
+							<view class="textDetail-title">{{ index < 2 ? index + 1 + $t('hea.dsy') : index + 1 + $t('hea.dsy') + '(' + $t('hea.vipzs') + ')' }}</view>
 							<view class="textDetail-content">{{ ls }}</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<!-- <view class="earnings-box">
-				<image src="../../static/img/index/vip.png" mode="" class="earnings"></image>
-				<view class="text-box">
-					<view class="textDetail" v-for="(ls, index) in revenueList">
-						<view class="textDetail-title">{{ index < 2 ? index + 1 + '度受益' : index + 1 + '度收益(黑钻VIP义工专属)' }}</view>
-						<view class="textDetail-content">{{ ls }}</view>
-					</view>
-				</view>
-			</view> -->
-			<!-- <view class="zhushi">
-				<text v-if="status == '1'">说明：当前等级援助者，升级成援助组长需要援助{{ item.v2_limit * 1 }},当前援助金额{{ item.income }}</text>
-				<text v-if="status == '2'">说明：当前等级援助组长已是最高收益</text>
-			</view> -->
 		</view>
 
-		<view class="baodan"  @click="baodan(id)" v-if="status == '0'">{{$t('hea.wyyz')}}</view>
-		<view class="baodan1"  @click="baodan(id)" v-if="status == '1'&&item.income*1<item.v2_limit*1 && item.v2_layer != 0" >{{$t('hea.lksj')}}</view>
-		<view class="baodan"  @click="baodan(id)" v-if="status == '1'&&item.income*1>=item.v2_limit*1 && item.v2_layer != 0">{{$t('hea.ljsj')}}</view>
-		<view class="baodan" v-if="status == '2'||(status == '1' && item.v2_layer == 0)" style="background: #020202;">{{$t('hea.ywc')}}</view>
+		<view class="baodan" @click="baodan(id)" v-if="status == '0'">{{ $t('hea.wyyz') }}</view>
+		<view class="baodan1" @click="baodan(id)" v-if="status == '1' && item.income * 1 < item.v2_limit * 1 && item.v2_layer != 0">{{ $t('hea.lksj') }}</view>
+		<view class="baodan" @click="baodan(id)" v-if="status == '1' && item.income * 1 >= item.v2_limit * 1 && item.v2_layer != 0">{{ $t('hea.ljsj') }}</view>
+		<view class="baodan" v-if="status == '2' || (status == '1' && item.v2_layer == 0)" style="background: #020202;">{{ $t('hea.ywc') }}</view>
+		<uni-popup ref="popup" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/tishi.png" mode=""></image></view>
+				<view class="mian">
+					<view class="font" v-if="item.v2_layer == 0">
+						{{ $t('hea.nsfsjqrndbfcj') }}
+						<br />
+						{{ $t('hea.rndbfytrmycj') }}
+						<br />
+						{{ $t('hea.dndkzcqrjh') }}
+						<br />
+					</view>
+					<view class="font" v-else>
+						{{ $t('hea.nsfsjqrndbf') }}
+						<br />
+						{{ $t('hea.rndbfytrmy') }}
+						<br />
+						{{ $t('hea.dndkzcqrjh') }}
+						<br />
+					</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">{{ $t('foo.qx') }}</view>
+						<view class="comfirm" @click="confirm">{{ countDown == 0 ? $t('hea.zcqd') : countDown }}</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import { mapState, mapMutations } from 'vuex';
 import { activitys } from '@/api/active.js';
 export default {
@@ -55,16 +72,38 @@ export default {
 			revenueList: [],
 			item: '',
 			status: '',
-			image:['../../static/icon/1.png','../../static/icon/2.png','../../static/icon/3.png','../../static/icon/4.png','../../static/icon/5.png','../../static/icon/6.png','../../static/icon/7.png']
+			show1: false,
+			time: '', //保存倒计时对象
+			countDown: 0, //倒计时
+			image: [
+				'../../static/icon/1.png',
+				'../../static/icon/2.png',
+				'../../static/icon/3.png',
+				'../../static/icon/4.png',
+				'../../static/icon/5.png',
+				'../../static/icon/6.png',
+				'../../static/icon/7.png'
+			] //七层的图片
 		};
 	},
+	watch: {
+		// 监听倒计时
+		countDown(i) {
+			if (i == 0) {
+				clearInterval(this.time);
+			}
+		}
+	},
+	components: {
+		uniPopup
+	},
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 	},
 	onLoad(option) {
 		uni.setNavigationBarTitle({
-			title:this.$t('foo.xq')
-		})
+			title: this.$t('foo.xq')
+		});
 		this.id = option.id;
 		this.loadData();
 	},
@@ -81,23 +120,22 @@ export default {
 					obj.status = '0';
 					obj.isU = false;
 				}
-				let i = e.data.v1_layer + e.data.v2_layer
-				if (e.data.v2_layer&&(obj.status == '0'||(obj.status == '1'&&e.data.income*1<e.data.v2_limit*1))){
-					i = e.data.v1_layer
+				let i = e.data.v1_layer + e.data.v2_layer;
+				if (e.data.v2_layer && (obj.status == '0' || (obj.status == '1' && e.data.income * 1 < e.data.v2_limit * 1))) {
+					i = e.data.v1_layer;
 				}
-				
-				
+
 				let money = e.data.money * 1;
 				let money1 = e.data.money * 1;
-				let people = 1
-				for (let j=0;j < i; j++){
+				let people = 1;
+				for (let j = 0; j < i; j++) {
 					people = people * 5;
 					money = money * 1 * 5;
-					obj.revenueList[j] = people +'人x' + money1 + '元=' + this.unit(money);
-					
+					obj.revenueList[j] = people + '人x' + money1 + '元=' + this.unit(money);
 				}
 			});
 		},
+		//换算单位
 		unit(num) {
 			let i = 0;
 			if (num / 10000 >= 1) {
@@ -110,12 +148,29 @@ export default {
 			}
 			return i;
 		},
+		// 弹窗 - 取消
+		cancel() {
+			this.countDown = 0;
+			this.$refs.popup.close();
+		},
+		confirm() {
+			if (this.countDown != 0) {
+				return;
+			}
+			this.$refs.popup.close();
+			uni.navigateTo({
+				url: '/pages/index/info?id=' + this.id
+			});
+		},
 		baodan(id) {
-				console.log(this.userInfo, '11111');
-			if (!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit && this.userInfo.bank_card_no == '' && this.userInfo.bank_of_deposit == '') {
+			const obj = this;
+			console.log(this.userInfo.nickname, '11111');
+			let a =/[0-9]{3}[*]{4}[0-9]{4}/;
+			
+			if (a.test(this.userInfo.nickname)){
 				uni.showModal({
 					title: this.$t('foo.ts'),
-					content: this.$t('foo.ndqwtxskxx'),
+					content: this.$t('foo.ndqwtxzsxm'),
 					success: function(res) {
 						if (res.confirm) {
 							uni.navigateTo({
@@ -126,14 +181,47 @@ export default {
 						}
 					}
 				});
-			} else {
-				if (this.status == '1' && this.item.income < this.item.v2_limit * 1) {
-					this.$api.msg('当前援助额度不足以升级黑钻VIP义工');
-					return;
-				}
-				uni.navigateTo({
-					url: '/pages/index/info?id=' + id
-				});
+			}else {
+				if (!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit && this.userInfo.bank_card_no == '' && this.userInfo.bank_of_deposit == '') {
+					uni.showModal({
+						title: this.$t('foo.ts'),
+						content: this.$t('foo.ndqwtxskxx'),
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/set/userinfo'
+								});
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				} else {
+					if (this.status == '1' && this.item.income < this.item.v2_limit * 1) {
+						this.$api.msg('当前援助额度不足以升级黑钻VIP义工');
+						return;
+					}
+					if (this.status == '0') {
+						// 判断是否在倒计时
+						if (obj.countDown > 0) {
+							return false;
+						} else {
+							obj.countDown = 15;
+							obj.time = setInterval(() => {
+								obj.countDown--;
+							}, 1000);
+							//调用验证码接口
+							this.$refs.popup.open();
+						}
+					} else {
+						uni.navigateTo({
+							url: '/pages/index/info?id=' + id
+						});
+					}
+			}
+				// uni.navigateTo({
+				// 	url: '/pages/index/info?id=' + id
+				// });
 			}
 		}
 	}
@@ -175,7 +263,6 @@ export default {
 		}
 	}
 
-	
 	.zhushi {
 		color: #e6c3a1;
 		padding: 20rpx 40rpx;
@@ -230,7 +317,7 @@ export default {
 
 		.main-title-font {
 			position: relative;
-			z-index: 100;
+			z-index: 10;
 			text-align: center;
 			line-height: 80rpx;
 			font-size: 46rpx;
@@ -265,4 +352,75 @@ export default {
 		}
 	}
 }
+.popup-box {
+	width: 650rpx;
+	padding-bottom: 40rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 650rpx;
+		height: 132rpx;
+		display: flex;
+		justify-content: center;
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
+		}
+	}
+
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+		padding: 30rpx;
+		.font {
+			text-align: left;
+			line-height: 54rpx;
+			color: #7e7457;
+			font-size: 30rpx;
+		}
+
+		.comfirm-box {
+			margin-top: 52rpx;
+			display: flex;
+			// margin-bottom: 32rpx;
+
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 250rpx;
+				height: 80rpx;
+				border: 1px solid #dcc786;
+				border-radius: 10rpx;
+				font-size: 32rpx;
+				color: #605128;
+			}
+
+			.comfirm {
+				margin-left: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 250rpx;
+				height: 80rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 10rpx;
+				font-size: 32rpx;
+				color: #605128;
+			}
+		}
+	}
+}
 </style>

pages/index/male.vue

@@ -1,46 +1,61 @@
 <template>
 	<view class="content">
 		<view class="box">
-			<view class="title" style="margin-top: 0;">{{$t('foo.yhzzyz')}}</view>
+			<view class="title" style="margin-top: 0;">{{ $t('foo.yhzzyz') }}</view>
 			<view class="detail">
+				<view class="detail-spe">{{ $t('foo.zsxm') }}：{{ name }}</view>
 				<view class="detail-spe">
-					{{$t('foo.zsxm')}}：{{ name }}
-				</view>
-				<view class="detail-spe">
-					{{$t('foo.yhylsjh')}}：{{ phone }}
-					<view class="copyband" @click="copy(yhylsjh)">{{$t('foo.fzsjh')}}</view>
+					{{ $t('foo.yhylsjh') }}：{{ phone }}
+					<view class="copyband" @click="copy(yhylsjh)">{{ $t('foo.fzsjh') }}</view>
 				</view>
 				<view class="detail-item">
-					{{$t('foo.yhzh')}}：{{ bank_card_no }}
-					<view class="copy" @click="copy(bank_card_no)">{{$t('foo.fzzh')}}</view>
+					{{ $t('foo.yhzh') }}：{{ bank_card_no }}
+					<view class="copy" @click="copy(bank_card_no)">{{ $t('foo.fzzh') }}</view>
 				</view>
 				<view class="detail-spe">
-					{{$t('foo.khh')}}：{{ bank_of_deposit }}
-					<view class="copyband" @click="copy(bank_of_deposit)">{{$t('foo.fzkhh')}}</view>
+					{{ $t('foo.khh') }}：{{ bank_of_deposit }}
+					<view class="copyband" @click="copy(bank_of_deposit)">{{ $t('foo.fzkhh') }}</view>
 				</view>
 			</view>
-			<view class="title" v-if="ali != ''">{{$t('foo.zfbsmyz')}}</view>
-			<view v-if="ali != ''" class="erweima"><image :src="ali" mode="widthFix"></image></view>
-			<view v-if="wechat != ''" class="title">{{$t('foo.wxsmyz')}}</view>
-			<view v-if="wechat != ''" class="erweima" ><image :src="wechat" mode="widthFix"></image></view>
+			<view v-if="ali != ''">
+				<view class="title">{{ $t('foo.zfbsmyz') }}</view>
+				<view class="erweima" @click="open(1)"><image :src="ali" mode="widthFix"></image></view>
+				<view class="btn" @click="down(1)">{{ $t('foo.xzewm') }}</view>
+			</view>
+			<view v-if="wechat != ''">
+				<view class="title">{{ $t('foo.wxsmyz') }}</view>
+				<view class="erweima" @click="open(2)"><image :src="wechat" mode="widthFix"></image></view>
+				<view class="btn" @click="down(2)">{{ $t('foo.xzewm') }}</view>
+			</view>
 		</view>
+		<uni-popup ref="popup" type="center">
+			<movable-area class="popup-box">
+				<movable-view class="popup-item" :scale="true" direction="all"><image :src="img" mode=""></image></movable-view>
+			</movable-area>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import { mapState, mapMutations } from 'vuex';
 export default {
+	components: {
+		uniPopup
+	},
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 	},
 	data(){
 		return {
+			img:'',
 			ali:'',
 			wechat:'',
 			bank_card_no:'',
 			bank_of_deposit:'',
 			name:'',
 			phone:'',
+			downing: false
 		}
 	},
 	onLoad(option) {
@@ -84,6 +99,59 @@ export default {
 					console.log(e);
 				}
 			});
+		},
+		open(type){
+			if(type == 1){
+				this.img = this.ali
+			}else {
+				this.img = this.wechat
+			}
+			this.$refs.popup.open();
+		},
+		down(type){
+			if(type == 1){
+				this.img = this.ali
+			}else {
+				this.img = this.wechat
+			}
+			if(this.downing){
+				return
+			}
+			this.downing = true
+			uni.downloadFile({
+				url: this.img,
+				success: res => {
+					if (res.statusCode === 200){
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function(e) {
+							console.log(e,'保存路径')
+							uni.showToast({
+								title: "保存成功",
+								icon: true
+							});
+							this.downing = false
+							},
+							fail: function() {
+								uni.showToast({
+									title: "保存失败",
+									icon: false
+								});
+								this.downing = false
+							}
+						});
+					}
+					this.downing = false
+				},
+				fail(e) {
+					uni.showToast({
+						title: '复制失败',
+						icon: false
+					});
+					this.downing = false
+					console.log(e);
+				}
+			});
 		}
 	}
 };
@@ -183,7 +251,6 @@ page {
 					height: 34rpx;
 				}
 			}
-
 		}
 
 		.erweima {
@@ -211,4 +278,32 @@ page {
 		}
 	}
 }
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	border-radius: 20rpx;
+	position: relative;
+	.popup-item {
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+.btn {
+	margin: 50rpx auto 0;
+	width: 500rpx;
+	height: 60rpx;
+	background: linear-gradient(-74deg, #ce9c6d, #ffecd6);
+	border-image: linear-gradient(115deg, #feebd5, #ffffff, #e1ad7d) 1 1;
+	border-radius: 30px;
+	line-height: 60rpx;
+	text-align: center;
+	font-size: 26rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #643912;
+}
 </style>

pages/profit/fund.vue

@@ -7,12 +7,6 @@
 				<view class="main-title-font">基金介绍</view>
 			</view>
 			<view class="main" v-html="content">
-				博赢同创.<br> 一、基金资金来源：<br> 1.博赢同创互助义工平台管理费用固定5%，作为专项基金 <br> 2.互助平台注册义工，热心人士自愿参与捐赠。<br>  二、援助对象： <br>     
-				注册时间180天以上，并成为有效合格义工90天以上的注册义工及直系亲属（仅限子女、父母）以及配偶。<br> 三、受援助重大疾病类别：<br>
-				依据中华人民共和国保险法，及中国太平人寿保险公司合同条例保险法对应的150种重疾。<br> 四、援助金额：最高50万（最高个人授援金额为个人帮扶行为的十倍）。
-				<br>五、基金池管理细则： 1.基金池基金来源、余额秉承着公平、公开、公正的原则，时时公布。 2.基金池内基金分配： (1)基金池成立之日，每月清算。
-				(2)当月基金池30％:基金池储备、应急基金，用于基金会突发性重要事务支出或国家重大灾难捐助支出。 (3)当月基金池20％基金用于基金会组织开展活动费用支出。
-				(4)当月基金池50％基金用于合格爱心义工援助。
 			</view>
 		</view>
 		<view class="index1"><image src="../../static/img/fundbottom.png" mode=""></image></view>

pages/public/forget.vue

@@ -92,20 +92,16 @@ export default {
 			registerReset({
 				// phone: obj.phone, //账号
 				// captcha: obj.code,
-				account: obj.account,
+				type:'mobile',
+				mobile: obj.phone,
 				captcha: obj.code,
-				password: obj.password,
-			}).then(function(e) {
-				// uni.setStorageSync('token', e.data.token);
-				// getUserInfo({}).then(e => {
-				// 	obj.login();
-				// 	// 保存返回用户数据
-				// 	obj.setUserInfo(e.data);
-				// 	//成功跳转首页
-				// 	uni.switchTab({
-				// 		url: '/pages/index/index'
-				// 	});
-				// });
+				newpassword: obj.password,
+			}).then(function(e) {
+				console.log(e)
+				obj.$api.msg('修改成功');
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
 			}).catch((e) => {
 				console.log(e);
 			});
@@ -114,7 +110,7 @@ export default {
 		verification() {
 			let obj = this;
 			if (this.phone == '') {
-				this.$api.msg('请输入电话号码');
+				this.$api.msg('请输入手机号');
 				return;
 			}
 			if (this.phone.length < 11) {
@@ -131,8 +127,8 @@ export default {
 				}, 1000);
 				//调用验证码接口
 				verify({
-					phone: obj.phone,
-					type: 'login'
+					mobile: obj.phone,
+					event: 'resetpwd'
 				})
 					.then(({ data }) => {})
 					.catch(err => {

pages/upload/upload.vue

@@ -1,173 +1,171 @@
-<template>
-	<view class="content">
-		<view class="upload-title">
-			{{$t('hea.scms')}}
-		</view>
-		<view class="upload-box">
-			<view class="upload-img flex">
+<template>
+	<view class="content">
+		<view class="upload-title">{{ type == 2 ? $t('hea.scms') : $t('hea.ptms') }}</view>
+		<view class="upload-box">
+			<view class="upload-img flex">
 				<image src="../../static/img/upload.png" mode="" v-if="!imgone" @click="upimg('imgone')"></image>
 				<image :src="imgone" mode="" v-if="imgone" @click="upimg('imgone')"></image>
-				<image src="../../static/img/upload.png" mode="" v-if="!imgtow"  @click="upimg('imgtow')"></image>
-				<image :src="imgtow" mode="" v-if="imgtow"  @click="upimg('imgtow')"></image>
-			</view>
-			<view class="fenge"></view>
-			<view class="upload-content">
-				<view class="describe">
-					<view class="title">
-						{{$t('hea.bcms')}}
-					</view>
-					<textarea class="title1" value=""  :placeholder="$t('hea.txms')" maxlength="140" focus="focus" placeholder-class="place"/>
-				</view>
-			</view>
-		</view>
-		<view class="submit" @click="sub">
-			{{$t('hea.tj')}}
-		</view>
-	</view>
-</template>
-<script>
-	import {
-		uploadApply
-	} from '../../api/apply.js'
-	import { uploads } from '@/api/user.js';
-	export default {
-		data() {
-			return {
-				imgone: '',
-				imgtow: '',
-				apply_id: '',
-			}
+				<image src="../../static/img/upload.png" mode="" v-if="!imgtow" @click="upimg('imgtow')"></image>
+				<image :src="imgtow" mode="" v-if="imgtow" @click="upimg('imgtow')"></image>
+			</view>
+			<view class="fenge"></view>
+			<view class="upload-content">
+				<view class="describe">
+					<view class="title">{{ $t('hea.bcms') }}</view>
+					<textarea class="title1" value="" :placeholder="$t('hea.txms')" maxlength="140" focus="focus" placeholder-class="place" />
+				</view>
+			</view>
+		</view>
+		<view class="submit" @click="sub">{{ $t('hea.tj') }}</view>
+	</view>
+</template>
+<script>
+import { uploadApply } from '../../api/apply.js';
+import { uploads } from '@/api/user.js';
+export default {
+	data() {
+		return {
+			imgone: '',
+			imgtow: '',
+			apply_id: '',
+			type: 2
+		};
+	},
+	onLoad(opt) {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.sczl')
+		});
+		this.apply_id = opt.id;
+		this.type = opt.type;
+	},
+	methods: {
+		upimg(name) {
+			uploads({
+				filename: ''
+			}).then(res => {
+				console.log(res, '++++++++++++++++');
+				this.$set(this, name, res[0].fullurl);
+			});
 		},
-		onLoad(opt) {
-			uni.setNavigationBarTitle({
-				title:this.$t('foo.sczl')
-			})
-			this.apply_id = opt.id
-		},
-		methods: {
-			upimg(name) {
-				uploads({
-					filename: ''
-				}).then(res => {
-					console.log(res,'++++++++++++++++')
-					this.$set(this,name,res[0].fullurl)
-				})
-			},
-			sub() {
-				let obj = this
-				if(obj.imgone == '' && obj.imgtow == '') {
-					return obj.$api.msg('请上传凭证')
-				}
-				uni.showLoading({
-					title: '提交中...',
-					mask: true
-				})
-				let arr = []
-				if(obj.imgone != '') {
-					arr.push(obj.imgone)
-				}
-				if(obj.imgtow != '') {
-					arr.push(obj.imgtow)
-				}
-				console.log(arr,'arr')
-				uploadApply({
-					images:arr
-				},obj.apply_id).then( res => {
-					uni.hideLoading()
+		sub() {
+			let obj = this;
+			if (obj.imgone == '' && obj.imgtow == '') {
+				return obj.$api.msg('请上传凭证');
+			}
+			uni.showLoading({
+				title: '提交中...',
+				mask: true
+			});
+			let arr = [];
+			if (obj.imgone != '') {
+				arr.push(obj.imgone);
+			}
+			if (obj.imgtow != '') {
+				arr.push(obj.imgtow);
+			}
+			console.log(arr, 'arr');
+			uploadApply(
+				{
+					images: arr
+				},
+				obj.apply_id
+			)
+				.then(res => {
+					uni.hideLoading();
 					uni.showToast({
-						title:'提交成功',
-						duration:2000
+						title: '提交成功',
+						duration: 2000
 					});
 					setTimeout(function() {
 						uni.navigateBack();
 					}, 800);
-					console.log(res,'+++++++++++++++++')
-				}).catch( err => {
-					uni.hideLoading()
-					console.log(err)
+					console.log(res, '+++++++++++++++++');
 				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		width: 100%;
-		padding: 0;
-		margin: 0;
-	}
-
-	.content {
-		
-		.upload-title {
-			padding: 30rpx 30rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 28rpx;
-		}
-
-		.upload-box {
-			width: 100%;
-			height: 450rpx;
-			background-color: #15130F;
-
-			.upload-img {
-				justify-content: flex-start;
-				margin: 30rpx;
-				padding-top: 30rpx;
-				height: 190rpx;
-				image {
-					width: 160rpx;
-					height: 100%;
-					margin-right: 15rpx;
-				}
-			}
-
-			.fenge {
-				width: 100%;
-				border: 1rpx solid #F0F0F0;
-			}
-
-			.describe {
-				display: flex;
-		
-				padding: 20rpx 30rpx;
-
-				.title {
-					width: 150rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #FFFFFF;
-				}
-
-				.title1 {
-					padding: 10rpx;
-					margin-left: 40rpx;
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #000;
-					background: #ebebeb;
-				}
-				.place {
-					color: #15130f;
-				}
-			}
-		}
-		.submit{
-			margin: 120rpx auto;
-			text-align: center;
-			line-height: 80rpx;
-			width: 560rpx;
-			height: 80rpx;
-			background: linear-gradient(-74deg, #CE9C6D, #FFECD6);
-			border-image: linear-gradient(115deg, #FEEBD5, #FFFFFF, #E1AD7D) 1 1;
-			box-shadow: 3rpx 4rpx 5rpx 0rpx rgba(151, 118, 74, 0.5);
-			border-radius: 40rpx;
-		}
-	}
+				.catch(err => {
+					uni.hideLoading();
+					console.log(err);
+				});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	width: 100%;
+	padding: 0;
+	margin: 0;
+}
+
+.content {
+	.upload-title {
+		padding: 30rpx 30rpx;
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 28rpx;
+	}
+
+	.upload-box {
+		width: 100%;
+		height: 450rpx;
+		background-color: #15130f;
+
+		.upload-img {
+			justify-content: flex-start;
+			margin: 30rpx;
+			padding-top: 30rpx;
+			height: 190rpx;
+			image {
+				width: 160rpx;
+				height: 100%;
+				margin-right: 15rpx;
+			}
+		}
+
+		.fenge {
+			width: 100%;
+			border: 1rpx solid #f0f0f0;
+		}
+
+		.describe {
+			display: flex;
+
+			padding: 20rpx 30rpx;
+
+			.title {
+				width: 150rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
+			}
+
+			.title1 {
+				padding: 10rpx;
+				margin-left: 40rpx;
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #000;
+				background: #ebebeb;
+			}
+			.place {
+				color: #15130f;
+			}
+		}
+	}
+	.submit {
+		margin: 120rpx auto;
+		text-align: center;
+		line-height: 80rpx;
+		width: 560rpx;
+		height: 80rpx;
+		background: linear-gradient(-74deg, #ce9c6d, #ffecd6);
+		border-image: linear-gradient(115deg, #feebd5, #ffffff, #e1ad7d) 1 1;
+		box-shadow: 3rpx 4rpx 5rpx 0rpx rgba(151, 118, 74, 0.5);
+		border-radius: 40rpx;
+	}
+}
 </style>

pages/user/applyList.vue

@@ -19,7 +19,7 @@
 						</view>
 						<view class="apply-info flex">
 							<view class="img-wrap"><image :src="imgitem" mode="" class="upimg" v-for="imgitem in item.voucherimages" @click="open(imgitem)"></image></view>
-							<view class="btn-wrap flex" v-if="tabCurrentIndex == 0">
+							<view class="btn-wrap flex" v-if="tabCurrentIndex == 0 && item.voucherimages != null">
 								<view class="btn btn-reject" @click="cancelApply(item)">{{ $t('hea.jj') }}</view>
 								<view class="btn btn-pass" @click="passApply(item)">{{ $t('hea.ty') }}</view>
 							</view>
@@ -123,6 +123,8 @@ export default {
 		}
 	},
 	onShow() {
+		this.navList[0].orderList = [],
+		this.navList[1].orderList = [],
 		uni.setNavigationBarTitle({
 			title: this.$t('foo.shlb')
 		});
@@ -162,6 +164,8 @@ export default {
 						let arr = item.voucherimages.split(',');
 						console.log(arr, 'ddddddddddddddddddddddd');
 						item.voucherimages = arr;
+					}else {
+						item.voucherimages = null
 					}
 					return item;
 				});

pages/user/promotion.vue

@@ -12,13 +12,13 @@
 		</view>
 		<view class="navbar flex">
 			<view class="nav-item">
-				<view class="num">{{ all.v1 }}</view>
-				<view class="font">激活人数</view>
+				<view class="num">{{ all.valid }}</view>
+				<view class="font">{{$t('foo.jhrs')}}</view>
 			</view>
 			<view class="xian"></view>
 			<view class="nav-item">
 				<view class="num">{{ all.v2 }}</view>
-				<view class="font">黑钻人数</view>
+				<view class="font">{{$t('foo.hzrs')}}</view>
 			</view>
 		</view>
 		<view class="swiper-box" :style="{ height: height }">

pages/user/team.vue

@@ -31,6 +31,9 @@
 					<view class="subordinate-box" v-for="(item, index) in childList" @click="findChildren(item)">
 						<view class="head1">
 							<image :src="item.avatar || '/static/error/missing-face.png'" mode=""></image>
+							<view class="" v-if="item.activity[0].my_join != null">
+								<view class="vip" v-if="item.activity[0].my_join.status == '1'"><image src="../../static/img/cjyg.png" mode=""></image></view>
+							</view>
 							<view class="" v-if="item.activity[1].my_join != null">
 								<view class="vip" v-if="item.activity[1].my_join.status == '1'"><image src="../../static/img/v1.png" mode=""></image></view>
 								<view class="vip" v-if="item.activity[1].my_join.status == '2'"><image src="../../static/img/v2.png" mode=""></image></view>

pages/user/user.vue

@@ -8,7 +8,8 @@
 					<view class="font-size-sm">{{ userInfo.mobile || '' }}</view>
 				</view>
 				<view class="vip">
-					<image v-if="isVip == 1" src="../../static/img/usernovip.png" mode=""></image>
+					<image v-if="isVip == 0" src="../../static/img/cjyg.png" mode=""></image>
+					<image v-if="isVip == 1" src="../../static/img/v1.png" mode=""></image>
 					<image v-if="isVip == 2" src="../../static/img/uservip.png" mode=""></image>
 				</view>
 			</view>
@@ -75,6 +76,7 @@ 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 { getApplyList } from '../../api/apply.js';
 import { getUserInfo } from '@/api/user.js';
 export default {
 	data() {
@@ -82,7 +84,7 @@ export default {
 			text: 'BYTCKF21',
 			text1: 'BYTCKF33',
 			text2: 'BYTCKF67',
-			isVip: 1,
+			isVip: -1,
 			tabbar: [
 				{
 					iconPath: '../../static/tabBar/home.png',
@@ -94,6 +96,7 @@ export default {
 					iconPath: '../../static/tabBar/center.png',
 					selectedIconPath: '../../static/tabBar/center-action.png',
 					text: this.$t('hea.shlb'),
+					count: 0,
 					pagePath: '/pages/user/applyList'
 				},
 				{
@@ -150,20 +153,41 @@ export default {
 			getUserInfo({})
 				.then(({ data }) => {
 					console.log(data, 'UserInfo+++++++++++++++++');
+					this.isVip = -1;
+					if (data.activity[0].my_join) {
+						console.log(333)
+						if (data.activity[0].my_join.status == '1'){
+							this.isVip = 0;
+						}else {
+							console.log(data.activity[0].my_join.status,'123')
+							this.isVip = -1
+						}
+					}
 					if (data.activity[1].my_join) {
+						console.log(222)
 						if (data.activity[1].my_join.status == '2') {
 							console.log(111)
 							this.isVip = 2;
-						}else {
+						}else if (data.activity[1].my_join.status == '1'){
 							this.isVip = 1;
+						}else {
+							console.log(data.activity[0].my_join.status)
 						}
 					}
-
+					
 					this.setUserInfo(data);
 				})
 				.catch(e => {
 					console.log(e);
 				});
+			getApplyList({
+				page: 1,
+				limit: 1,
+				status: 0
+			}).then(({ data }) => {
+				console.log(data,'1111')
+				this.tabbar[1].count = data.count
+			});
 		},
 		navTo(url) {
 			console.log(url);

store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		lang:'zh_cn',
-		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
+		// baseURL:"http://bowin.frp.liuniu946.com",//请求地址配置 
 		baseURL:'http://www.boyingtc.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/4aaf7ec0-2670-11ec-bb6f-8d8ebfca6692
+https://ide.dcloud.net.cn/build/download/fd50b530-2fc0-11ec-969e-bd52ee0082ac