2021-10-6

api/apply.js

@@ -17,6 +17,15 @@ export function getApplyList(data) {
 	})
 }
 
+//我的申请列表
+export function getMyList(data) {
+	return request({
+		url: '/api/activity/my_join',
+		method:'get',
+		data
+	})
+}
+
 //通过审核
 export function passApply(data,id) {
 	return request({

api/index.js

@@ -8,3 +8,21 @@ export function loadIndexs(data) {
 		data
 	});
 }
+
+//获取文章列表
+export function article(data) {
+	return request({
+		url: '/api/article',
+		method: 'get',
+		data
+	});
+}
+
+//获取文章详情
+export function details(data,id) {
+	return request({
+		url: '/api/article/'+id,
+		method: 'get',
+		data
+	});
+}

components/wyb-drop-down/wyb-drop-down.vue

@@ -161,7 +161,7 @@
 			},
 			activeColor: {
 				type: String,
-				default: '#2979ff'
+				default: '#e1c0a0'
 			},
 			activeWeight: {
 				type: Boolean,
@@ -169,7 +169,7 @@
 			},
 			defaultColor: {
 				type: String,
-				default: '#333'
+				default: '#fff'
 			},
 			bgColor: {
 				type: Object,
@@ -314,9 +314,11 @@
 		align-items: center;
 		justify-content: center;
 		position: relative;
+		background: #000 !important;
 	}
 	
 	.wyb-drop-down-header-item-label {
+		color: #fff !important;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -324,6 +326,7 @@
 	}
 	
 	.wyb-drop-down-header-item-icon {
+		color: #fff !important;
 		margin-left: 20rpx;
 		display: flex;
 		flex-direction: row;
@@ -362,6 +365,8 @@
 	}
 	
 	.wyb-drop-down-content-item {
+		background: #000;
+		color: #fff;
 		width: 100%;
 		height: 100rpx;
 		font-size: 30rpx;
@@ -389,7 +394,9 @@
 	}
 	
 	.wyb-drop-down-content-box {
+		padding-top: var(--status-bar-height);
 		width: 100%;
+		background-color: #000;
 	}
 	
 	.wyb-drop-down-content-slot {

lang/en.js

@@ -23,10 +23,15 @@ module.exports = {
 		wyyz: 'I want help',
 		yz: 'assistance',
 		ywc: 'Completed',
-		lksj: 'upgrade now',
+		lksj: 'Upgrade now',
+		ljsj:'Upgrade now',
 		ytg: 'Passed',
 		wtg: 'Fail',
+		dsh: 'Audit',
 		ren: 'Man',
+		wdtdrs:'The number of my team',
+		syzx:'Benefited from the center',
+		fh:'back',
 		ckxq:'View details',
 		jj: 'No',
 		ty: 'Ok',
@@ -40,7 +45,11 @@ module.exports = {
 		wdtd: 'My team',
 		wdtg: 'My promotion',
 		wdtgrs: 'My promotion number',
-		login: 'Login'
+		login: 'Login',
+		yy:'English',
+		sy:'Index',
+		wd:'My',
+		shlb:'Review'
 	},
 	foo: {
 		tx: 'Avatar',
@@ -48,12 +57,13 @@ module.exports = {
 		yhzh:'Bank Account',
 		scyh:'Belongs to the bank',
 		zh:'Account',
+		jjlxrdh:'Emergency contact number',
 		zfbskm:'Alipay payment code',
 		wxskm:'Weixin payment code',
 		tj:'Submit',
 		tcdl:'Log out',
 		sjyhskxxs:'Upper-level user payment information(up',
-		j:'Level',
+		j:'Level)',
 		cg:'Succeed',
 		sb:'Fail',
 		shz:'Under review',
@@ -63,7 +73,11 @@ module.exports = {
 		scpz:'Upload documents',
 		qxz:'Please chooseTRC20',
 		zfcbdz:'Copy the coin charging address',
-		qxxyzbbcjtxgpzbsc:'Please provide offline assistance and save screenshots related credentials and upload them',
+		qxxyzbbcjtxgpzbsc:'Please save the screenshots and upload the relevant vouchers for offline assistance. Each aid fund can be divided into two arbitrary amounts of payment, the total  ',
+		ysclbjt:'yuan Upload two screenshots',
+		
+		xtptwsf:'System platform maintenance fee collection information',
+		xtptwhf:'System platform maintenance fee',
 		ts:'Hint',
 		yscpzsfcxsc:'The certificate has been uploaded. Do you want to upload it again',
 		fzcg:'Copy success!',
@@ -74,6 +88,36 @@ module.exports = {
 		khh:'Opening bank',
 		fzkhh:'Copy',
 		zfbsmyz:'Alipay scan code assistance',
-		wxsmyz:'Wechat scan code assistance'
+		wxsmyz:'Wechat scan code assistance',
+		wjmm:'Forget the password',
+		sz:'Set',
+		xq:'Details',
+		dkxx:'Aid information',
+		wdtd:'My team',
+		wd:'My',
+		wdtg:'My promotion',
+		sczl:'Upload data',
+		shlb:'Review the list',
+		wdewm:'My QR code',
+		yjwndzzskf:'We have customized exclusive customer service for you',
+		kfwx:'WeiXin',
+		qx:'Cancel',
+		fzwx:'Copy',
+		jtxzsxm:'Please fill in your real name',
+		jtxyhkh:'Please fill in your bank card number',
+		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?',
+		bt:'Must fill in',
+		zsxm:'Name',
+		yhylsjh:'The bank reserves a mobile number',
+		fzsjh:'Copy',
+		tglb:'Notification list',
+		tgxq:'Notice details',
+		syzx:'Benefit center',
+		dqyzfk:'Current aid payments',
+		dqszfk:'Current assistance payments',
+		yzfk:'Assist payments',
+		syzfk:'Suffer assist payments'
 	}
 }

lang/zh_cn.js

@@ -3,7 +3,7 @@ module.exports =  {
 		tj: '提交',
 		txms: '填写描述',
 		bcms: '补充描述',
-		scms: '请提供相关截图及描述，以便上级审核(最多两张)',
+		scms: '请提供相关截图及描述，以便受援助方审核(最多两张)',
 		zc: '注册',
 		srsj: '请输入手机号',
 		srxmm: '请输入新密码',
@@ -19,16 +19,19 @@ module.exports =  {
 		nomore: '没有更多数据了',
 		sljzgd: '上拉显示更多',
 		vipzs: '黑钻VIP义工专属',
-		dsy: '度收益',
+		dsy: '度受益',
 		wyyz: '我要援助',
 		yz: '援助',
 		ywc: '已完成',
-		lksj: '立即升级',
+		lksj: '升级黑钻VIP义工',
+		ljsj:'立即升级黑钻VIP义工',
 		ytg: '已通过',
 		wtg: '未通过',
+		dsh: '待审核',
 		ren: '人',
+		wdtdrs:'我的援助团人数',
+		fh:'返回',
 		ckxq:'查看详情',
-		
 		jj: '拒绝',
 		ty: '同意',
 		ysh: '已审核',
@@ -37,24 +40,30 @@ module.exports =  {
 		logininfo:'您未登录，是否马上登陆?',
 		yk: '游客',
 		lxkf: '联系客服',
-		fxhy: '分享好友',
-		wdtd: '我的团队',
-		wdtg: '我的推广',
-		wdtgrs: '我的推广人数',
+		fxhy: '帮扶好友',
+		wdtd: '我的援助团',
+		wdtg: '我的帮扶',
+		wdtgrs: '我的帮扶人数',
+		syzx:'受益中心',
 		login: '登录',
+		yy:'中文',
+		sy:'首页',
+		wd:'我的',
+		shlb:'审核'
     },
     foo:{
 		tx: '头像',
-		nc: '昵称',
+		nc: '真实姓名',
 		yhzh:'银行账号',
-		scyh:'所属银行',
-		zh:'账户',
+		scyh:'开户行',
+		zh:'义工账户',
+		jjlxrdh:'紧急联系人电话',
 		zfbskm:'支付宝收款码',
 		wxskm:'微信收款码',
 		tj:'提交',
 		tcdl:'退出登录',
-		sjyhskxxs:'上级用户收款信息(上',
-		j:'级',
+		sjyhskxxs:'受助方收款信息(上',
+		j:'度)',
 		cg:'成功',
 		sb:'失败',
 		shz:'审核中',
@@ -64,7 +73,10 @@ module.exports =  {
 		scpz:'上传凭证',
 		qxz:'请选择TRC20',
 		zfcbdz:'复制充币地址',
-		qxxyzbbcjtxgpzbsc:'请线下援助并保存截图相关凭证并上传',
+		qxxyzbbcjtxgpzbsc:'请线下援助并保存截图相关凭证并上传，每一度援助金分为两笔任意金额支付，总和',
+		ysclbjt:'元上传两笔截图',
+		xtptwsf:'系统平台维护费收款信息',
+		xtptwhf:'系统平台维护费',
 		ts:'提示',
 		yscpzsfcxsc:'已上传凭证，是否重新上传',
 		fzcg:'复制成功!',
@@ -75,6 +87,36 @@ module.exports =  {
 		khh:'开户行',
 		fzkhh:'复制开户行',
 		zfbsmyz:'支付宝扫码援助',
-		wxsmyz:'微信扫码援助'
-    }
+		wxsmyz:'微信扫码援助',
+		wjmm:'忘记密码',
+		sz:'设置',
+		xq:'详情',
+		dkxx:'援助信息',
+		wdtd:'我的援助团',
+		wd:'我的',
+		wdtg:'我的帮扶',
+		sczl:'上传资料',
+		shlb:'审核列表',
+		wdewm:'我的二维码',
+		yjwndzzskf:'已经为您定制专属客服',
+		kfwx:'客服微信',
+		qx:'取消',
+		fzwx:'复制微信',
+		jtxzsxm:'请填写真实姓名',
+		jtxyhkh:'请填写银行卡号',
+		jtxkhh:'请填写开户行',
+		jtxjjlxrdh:'请填写紧急联系人电话',
+		ndqwtxskxx:'您当前未填写收款信息,是否前往填写?',
+		bt:'必填',
+		zsxm:'真实姓名',
+		yhylsjh:'银行预留手机号',
+		fzsjh:'复制手机号',
+		tglb:'通告列表',
+		tgxq:'通告详情',
+		syzx:'受益中心',
+		dqyzfk:'当前援助付款',
+		dqszfk:'当前受援助付款',
+		yzfk:'援助付款',
+		syzfk:'受援助付款'
+	}
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "BYTC",
     "appid" : "__UNI__F3A92A0",
     "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -107,7 +107,7 @@
         "devServer" : {
             "proxy" : {
                 "/api" : {
-                    "target" : "http://bowin.frp.liuniu946.com/api",
+                    "target" : "http://www.boyingtc.com/api",
                     // "changeOrigin": true,
                     "pathRewrite" : {
                         "/api" : "" // rewrite path

pages.json

@@ -89,15 +89,15 @@
 			}
 		},
 		{
-			"path": "pages/index/info",
+			"path": "pages/profit/profit",
 			"style": {
-				"navigationBarTitleText": "打款信息",
+				"navigationBarTitleText": "受益中心",
 				"navigationBarBackgroundColor": "#000000",
 				"navigationBarTextStyle": "white"
 			}
 		},
 		{
-			"path": "pages/index/infoDetail",
+			"path": "pages/profit/fund",
 			"style": {
 				"navigationBarTitleText": "详情",
 				"navigationBarBackgroundColor": "#000000",
@@ -105,46 +105,40 @@
 			}
 		},
 		{
-			"path": "pages/user/team",
+			"path": "pages/index/info",
 			"style": {
-				"navigationBarTitleText": "我的团队",
+				"navigationBarTitleText": "打款信息",
 				"navigationBarBackgroundColor": "#000000",
 				"navigationBarTextStyle": "white"
 			}
 		},
 		{
-			"path": "pages/user/user",
+			"path": "pages/index/infoDetail",
 			"style": {
-				"navigationBarTitleText": "我的",
+				"navigationBarTitleText": "详情",
 				"navigationBarBackgroundColor": "#000000",
 				"navigationBarTextStyle": "white"
 			}
 		},
 		{
-			"path": "pages/user/award",
+			"path": "pages/user/team",
 			"style": {
-				"navigationBarTitleText": "奖励明细",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarTitleText": "我的团队",
+				"navigationBarBackgroundColor": "#000000",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
-			"path": "pages/user/withdrawal",
+			"path": "pages/user/user",
 			"style": {
-				"navigationBarTitleText": "奖励提现"
+				"navigationBarTitleText": "我的",
+				"navigationBarBackgroundColor": "#000000",
+				"navigationBarTextStyle": "white"
 			}
 		},
+		
 
 
-		{
-			"path": "pages/user/scoreAccumulate",
-			"style": {
-				"navigationBarTitleText": "积分明细"
-			}
-		},
 
 
 
@@ -173,43 +167,32 @@
 					"titleNView": {
 						"backgroundColor": "#15130f",
 						"type": "float",
-						"titleText": "我的推广"
+						"titleText": "我的帮扶"
 					}
 				}
 			}
 		},
+		
 		{
-			"path": "pages/profit/profit",
+			"path": "pages/user/applyList",
 			"style": {
-				// "navigationBarTitleText": "收益中心",
+				"navigationBarTitleText": "审核列表",
 				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#15130f",
-						"type": "float",
-						"titleText": "收益中心"
-					}
-				}
+				"navigationBarBackgroundColor": "#000000"
 			}
 		},
 		{
-			"path": "pages/public/success",
+			"path": "pages/index/list",
 			"style": {
-				// "navigationBarTitleText": "收益中心",
+				"navigationBarTitleText": "通告列表",
 				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": {
-						"backgroundColor": "#000000",
-						"type": "float",
-						"titleText": "提交成功"
-					}
-				}
+				"navigationBarBackgroundColor": "#000000"
 			}
 		},
 		{
-			"path": "pages/user/applyList",
+			"path": "pages/index/article",
 			"style": {
-				"navigationBarTitleText": "审核列表",
+				"navigationBarTitleText": "通告详情",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#000000"
 			}

pages/index/article.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="center">
+		<view class="bg">
+			<image :src="src" mode=""></image>
+		</view>
+		<view class="title">
+			{{ title }}
+		</view>
+		<view class="main flex">
+			<view class="">{{ author }}</view>
+			
+			<view class="" style="color: #e7e7e8;"><span>{{time}}</span></view>
+		</view>
+		<view v-html="synopsis" class="content">
+			{{ synopsis }}
+		</view>
+	</view>
+</template>
+
+<script>
+import { details } from '@/api/index.js';
+import { mapState, mapMutations } from 'vuex';
+import { getTime } from '@/utils/rocessor.js'
+export default {
+	data(){
+		return{
+			src: '',
+			title: '',
+			synopsis:'',
+			time:'',
+			author:'',
+			visit:''
+		}
+	},
+	computed: {
+		...mapState(['baseURL']),
+	},
+	onLoad(option) {
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.tgxq')
+		})
+		this.loadData(option.id);
+	},
+	methods: {
+		async loadData(id){
+			let obj = this;
+			details({},id).then(e =>{
+				console.log(e);
+				let time = getTime(e.data.updatetime)
+				obj.src = this.baseURL + e.data.coverimage;
+				obj.title = e.data.title;
+				obj.synopsis = e.data.synopsis
+				obj.time = time;
+				obj.author = e.data.author;
+				obj.visit = e.data.visit;
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	.center{
+		height: 100%;
+	}
+	.bg{
+		width: 100%;
+		height: 474rpx;
+		image{
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.main {
+		margin: 20rpx 50rpx;
+		font-size: 24rpx;
+		color: #fff;
+		span {
+			display: inline-block;
+			padding-right: 20rpx;
+		}
+	}
+	.title{
+		width: 90%;
+		margin: 20rpx auto 0;
+		font-size: 40rpx;
+		font-weight: 500;
+		color: #ffffff;
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+	.time {
+		width: 90%;
+		margin: 0 auto;
+		margin-top: 16rpx;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+	.content{
+		width: 90%;
+		margin:0 auto;
+		margin-top: 20rpx;
+		font-size: 32rpx;
+		font-weight: 500;
+		color:#777777;
+	}
+	/deep/ .content{
+		img{
+			width: 100%;
+			height: 100%;
+		}
+	}
+</style>
+

pages/index/index.vue

@@ -1,52 +1,101 @@
-<template>
+<template>
 	<view class="content">
-		<base-nav ></base-nav>
-		<view class="top"><image src="../../static/img/index/index.png" mode="" class="bg"></image></view>
-		<view class="box">
-			<view v-for="(item, index) in list" :key="index">
-				<view class="discounts">
-					<image src="../../static/img/index/youhui1.png" mode="" class="discounts1"></image>
-					<view class="money">
-						￥
-						<text>{{ item.money * 2 }}</text>
-					</view>
-					<view class="baodan" @click="baodan(item.id)">{{$t('hea.ckxq')}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="index1">
-			<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>
+		<view class="top-top"></view>
+		<view class="lange"><base-nav></base-nav></view>
+		<view class="top">
+			<image src="../../static/img/index/index.png" mode="" class="bg"></image>
+			<view class="tongz flex">
+				<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>
+					</view>
+				</view>
+			</view>
+			<image src="../../static/img/index/yyxx.png" mode="" class="yz"></image>
+		</view>
+		<view class="box">
+			<view v-for="(item, index) in list" :key="index">
+				<view class="discounts">
+					<image :src="image[index]" mode="" class="discounts1"></image>
+					<view class="money">
+						￥
+						<text>{{ item.money * 2 }}</text>
+					</view>
+					<view class="baodan" @click="baodan(item.id)">{{ $t('hea.ckxq') }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="index1">
+			<image src="../../static/img/index/index1.png" mode=""></image>
+			<view class="bottom" @click="nav('/pages/profit/fund')"><image src="../../static/img/index/bottom.png" mode=""></image></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 baseNav from '@/pages/public/nav.vue';
+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 store from '../../store/index.js'
-export default {
+import store from '../../store/index.js';
+export default {
 	components: {
-		baseNav,
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	data() {
-		return {
-			list: [],
-			revenueList: [],
-			tabbar: tabbar,
-		};
-	},
-	onShow() {
-		if (this.hasLogin) {
-			this.loadData();
+		baseNav
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin']),
+		...mapState(['lang'])
+	},
+	watch: {
+		lang(val) {
+			this.$set(this.tabbar[0], 'text', this.$t('hea.sy'));
+			this.$set(this.tabbar[1], 'text', this.$t('hea.shlb'));
+			this.$set(this.tabbar[2], 'text', this.$t('hea.wd'));
+		}
+	},
+	data() {
+		return {
+			list: [],
+			image: ['../../static/img/index/youhui1.png', '../../static/img/index/youhui2.png'],
+			revenueList: [],
+			tabbar: [
+				{
+					iconPath: '../../static/tabBar/home.png',
+					selectedIconPath: '../../static/tabBar/home-action.png',
+					text: this.$t('hea.sy'),
+					pagePath: '/pages/index/index'
+				},
+				{
+					iconPath: '../../static/tabBar/center.png',
+					selectedIconPath: '../../static/tabBar/center-action.png',
+					text: this.$t('hea.shlb'),
+					pagePath: '/pages/user/applyList'
+				},
+				{
+					iconPath: '../../static/tabBar/user.png',
+					selectedIconPath: '../../static/tabBar/user-action.png',
+					text: this.$t('hea.wd'),
+					pagePath: '/pages/user/user'
+				}
+			],
+			showList: []
+		};
+	},
+	onShow() {
+		if (this.hasLogin) {
+			this.loadData();
 		} else {
-			let obj = this
+			let obj = this;
 			uni.showModal({
 				title: obj.$t('hea.login'),
 				content: obj.$t('hea.logininfo'),
@@ -59,178 +108,230 @@ export default {
 				fail: e => {
 					console.log(e);
 				}
-			});
-			
-		}
-	},
-	methods: {
-		baodan(id) {
-			uni.navigateTo({
-				url: '/pages/index/infoDetail?id=' + id
-			});
-		},
-		loadData() {
-			activityList({}).then(({ data }) => {
-				data.list.forEach(e => {
-					let money = e.money * 1;
-					let money1 = this.unit(e.money * 1 * 5);
-					let money2 = this.unit(e.money * 1 * 25);
-					let money3 = this.unit(e.money * 1 * 125);
-					let money4 = this.unit(e.money * 1 * 625);
-					let money5 = this.unit(e.money * 1 * 3125);
-					let money6 = this.unit(e.money * 1 * 15625);
-					let money7 = this.unit(e.money * 1 * 78125);
-					e.revenueList = [];
-					e.revenueList[0] = '5人x' + money + '元=' + money1;
-					e.revenueList[1] = '25人x' + money + '元=' + money2;
-					e.revenueList[2] = '125人x' + money + '元=' + money3;
-					e.revenueList[3] = '625人x' + money + '元=' + money4;
-					e.revenueList[4] = '3125人x' + money + '元=' + money5;
-					e.revenueList[5] = '15625人x' + money + '元=' + money6;
-					e.revenueList[6] = '78125人x' + money + '元=' + money7;
-				});
-				this.list = data.list;
-			});
-		},
-		unit(num) {
-			let i = 0;
-			if (num / 10000 >= 1) {
-				i = num / 10000 + '万元';
-				if (num / 100000000 >= 1) {
-					i = num / 100000000 + '亿元';
-				}
-			} else {
-				i = num + '元';
-			}
-			return i;
-		},
-		change(index){
-			console.log(index)
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-page {
-	height: auto;
-}
-
-.content {
-	.top {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		z-index: 10;
-		.bg {
-			width: 100%;
-			height: 1480rpx;
-		}
-	}
-
-	.box {
-		.discounts {
-			margin: 20rpx 30rpx;
-			display: flex;
-			justify-content: center;
-			position: relative;
-			width: 690rpx;
-			height: 890rpx;
-			z-index: 30;
-			.discounts1 {
-				width: 100%;
-				height: 100%;
-			}
-
-			.money {
-				margin: 0 auto;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				top: 0;
-				margin-top: 250rpx;
-				font-size: 36rpx;
-				font-family: Source Han Sans CN;
-				font-weight: bold;
-				color: #c63535;
-				line-height: 30rpx;
-				position: absolute;
-
-				text {
-					font-size: 116rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 800;
-					color: #c63535;
-					line-height: 115rpx;
-				}
-			}
-
-			.baodan {
-				position: absolute;
-				top: 690rpx;
-				width: 300rpx;
-				height: 80rpx;
-				text-align: center;
-				line-height: 80rpx;
-				color: #ffffff;
-				background: #4e2c0e;
-				font-size: 40rpx;
-				border-radius: 10rpx;
-			}
-		}
-
-		.earnings-box {
-			z-index: 100;
-			position: relative;
-			margin: 40rpx 30rpx;
-			width: 690rpx;
-			height: 1140rpx;
-			.earnings {
-				width: 100%;
-				height: 100%;
-			}
-			.text-box {
-				position: absolute;
-				top: 184rpx;
-				left: 110rpx;
-				.textDetail {
-					min-height: 134rpx;
-					max-height: 140rpx;
-					overflow: hidden;
-					padding-bottom: 64rpx;
-					.textDetail-title {
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #4e2c0e;
-						line-height: 30rpx;
-						padding-bottom: 10rpx;
-					}
-
-					.textDetail-content {
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #4e2c0e;
-						line-height: 30rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.index1 {
-		margin-top: -400rpx;
-		width: 100%;
-		height: 713rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-		.bottom {
-			width: 100%;
-			height: 100rpx;
-		}
-	}
-}
+			});
+		}
+	},
+	methods: {
+		baodan(id) {
+			uni.navigateTo({
+				url: '/pages/index/infoDetail?id=' + id
+			});
+		},
+		loadData() {
+			activityList({}).then(({ data }) => {
+				this.list = data.list;
+			});
+			article({
+				page: 1,
+				limit: 10000,
+				category_id: 14
+			}).then(({ data }) => {
+				let arr = [];
+				data.list.forEach(e => {
+					arr.push(e.synopsis);
+				});
+				this.showList = arr;
+				console.log(this.showList);
+			});
+		},
+		change(index) {
+			console.log(index);
+		},
+		nav(url) {
+			uni.navigateTo({
+				url
+			});
+		},
+		goDetails() {
+			uni.navigateTo({
+				url: '/pages/index/list'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+	height: auto;
+}
+
+.content {
+	.top-top {
+		height: var(--status-bar-height);
+		width: 100%;
+		background: #000;
+	}
+	.top {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		z-index: 10;
+		.bg {
+			width: 100%;
+			height: 900rpx;
+		}
+		.yz {
+			width: 90%;
+			height: 700rpx;
+			margin: 20rpx auto 0;
+		}
+	}
+
+	.box {
+		.discounts {
+			margin: 20rpx 30rpx;
+			display: flex;
+			justify-content: center;
+			position: relative;
+			width: 690rpx;
+			height: 890rpx;
+			z-index: 30;
+			.discounts1 {
+				width: 100%;
+				height: 100%;
+			}
+
+			.money {
+				margin: 0 auto;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				top: 0;
+				margin-top: 250rpx;
+				font-size: 36rpx;
+				font-family: Source Han Sans CN;
+				font-weight: bold;
+				color: #c63535;
+				line-height: 30rpx;
+				position: absolute;
+
+				text {
+					font-size: 116rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 800;
+					color: #c63535;
+					line-height: 115rpx;
+				}
+			}
+
+			.baodan {
+				position: absolute;
+				top: 690rpx;
+				width: 300rpx;
+				height: 80rpx;
+				text-align: center;
+				line-height: 80rpx;
+				color: #ffffff;
+				background: #4e2c0e;
+				font-size: 40rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		.earnings-box {
+			z-index: 100;
+			position: relative;
+			margin: 40rpx 30rpx;
+			width: 690rpx;
+			height: 1140rpx;
+			.earnings {
+				width: 100%;
+				height: 100%;
+			}
+			.text-box {
+				position: absolute;
+				top: 184rpx;
+				left: 110rpx;
+				.textDetail {
+					min-height: 134rpx;
+					max-height: 140rpx;
+					overflow: hidden;
+					padding-bottom: 64rpx;
+					.textDetail-title {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #4e2c0e;
+						line-height: 30rpx;
+						padding-bottom: 10rpx;
+					}
+
+					.textDetail-content {
+						font-size: 30rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #4e2c0e;
+						line-height: 30rpx;
+					}
+				}
+			}
+		}
+	}
+
+	.index1 {
+		margin-top: -200rpx;
+		width: 100%;
+		height: 713rpx;
+		position: relative;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+		.bottom {
+			height: 200rpx;
+			width: 90%;
+			margin: 0 auto;
+			position: absolute;
+			bottom: 250rpx;
+			left: 5%;
+		}
+	}
+}
+.tongz {
+	width: 690rpx;
+	height: 70rpx;
+	margin: 10rpx auto 0;
+	padding: 18rpx 30rpx 18rpx 24rpx;
+	align-items: center;
+	position: relative;
+	background: #1f2020;
+	border-radius: 30rpx;
+	.tongz-bg {
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		width: 690rpx;
+		height: 70rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.tongz-left {
+		width: 640rpx;
+		.image-left {
+			width: 40rpx;
+			height: 34rpx;
+		}
+		.tongz-font {
+			margin-left: 22rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #ffffff;
+		}
+	}
+	.tongz-right {
+		position: relative;
+		z-index: 11;
+		width: 12rpx;
+		height: 26rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
 </style>

pages/index/info.vue

@@ -2,20 +2,23 @@
 	<view class="center">
 		<view class="box" v-for="(item, index) in list" :key="index">
 			<view class="box-top flex">
-				<view class="title">{{$t('foo.sjyhskxxs')}}{{ index + 1 }}{{$t('foo.j')}})</view>
-				<view class="type">{{ item.status == '1' ? $t('foo.cg') : item.status == '2' ? $t('foo.sb') : item.status == '0' && item.voucherimages != null ? $t('foo.shz') : '' }}</view>
+				<view class="title" v-if="item.system_get == 1">{{ $t('foo.xtptwsf')}}</view>
+				<view class="title" v-else >{{ $t('foo.sjyhskxxs') }}{{ index + 1 }}{{ $t('foo.j') }}</view>
+				<view class="type">
+					{{ item.status == '1' ? $t('foo.cg') : item.status == '2' ? $t('foo.sb') : item.status == '0' && item.voucherimages != null ? $t('foo.shz') : '' }}
+				</view>
 			</view>
 			<view class="main flex" style="border-bottom: 1px solid #F0F0F0;">
 				<view class="left flex">
 					<view class="avtor" v-if="item.system_get == 0"><image :src="item.checker.avatar || '../../static/error/missing-face.png'" mode=""></image></view>
 					<view class="main-info">
-						<view class="name" v-if="item.system_get == 1">{{$t('foo.xtpt')}}</view>
+						<view class="name" v-if="item.system_get == 1">{{ $t('foo.xtpt') }}</view>
 						<view class="name" v-else>{{ item.checker.nickname || 'null' }}</view>
 						<view class="phone" v-if="item.system_get == 0">{{ item.checker.mobile }}</view>
 					</view>
 				</view>
-				<view class="right" v-if="item.system_get == 0">{{$t('foo.yzje')}}：￥{{ item.money * 1 }}</view>
-				<view class="right" v-if="item.system_get == 1">{{$t('foo.yzje')}}：{{ item.money * 1 }}U</view>
+				<view class="right" v-if="item.system_get == 0">{{ $t('foo.yzje') }}：￥{{ item.money * 1 }}</view>
+				<view class="right" v-if="item.system_get == 1">{{ $t('foo.xtptwhf')}}：{{ item.money * 1 }}U</view>
 			</view>
 			<view class="main flex" v-if="item.system_get == 0">
 				<view class="left flex">
@@ -24,14 +27,14 @@
 						<view class="name">{{ item.checker.bank_of_deposit || '暂无' }}</view>
 						<view class="name">{{ item.checker.bank_card_no || '暂无' }}</view>
 					</view> -->
-					<view class="right-box" @click="navTo('/pages/index/male')" style="width: 228rpx;">{{$t('foo.yzfkxx')}}</view>
+					<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>
-				<view class="right"><view class="right-box" @click="nav(item)">{{$t('foo.scpz')}}</view></view>
 			</view>
 			<view class="" v-if="item.system_get == 1">
-				<view class="change">
-					{{$t('foo.qxz')}}
-				</view>
+				<view class="change">{{ $t('foo.qxz') }}</view>
 				<view class="erweima">
 					<tki-qrcode
 						:cid="cid"
@@ -50,12 +53,12 @@
 					/>
 				</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" style="margin-top: 50rpx;" @click="setData">{{ $t('foo.zfcbdz') }}</view>
+				<view class="btn" @click="nav(item.id)">{{ $t('foo.scpz') }}</view>
 			</view>
 		</view>
 
-		<view class="tishi">*{{$t('foo.qxxyzbbcjtxgpzbsc')}}</view>
+		<view class="tishi">*{{ $t('foo.qxxyzbbcjtxgpzbsc') }}{{ list[0].money*1 || 0}}{{ $t('foo.ysclbjt') }}</view>
 	</view>
 </template>
 
@@ -83,6 +86,9 @@ export default {
 		};
 	},
 	onLoad(option) {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.dkxx')
+		});
 		this.id = option.id;
 		this.loadData();
 	},
@@ -125,16 +131,41 @@ export default {
 						}
 					}
 				});
-			}else {
+			} else {
 				uni.navigateTo({
 					url: '/pages/upload/upload?id=' + item.id
 				});
 			}
 		},
-		navTo(url) {
+		navTo(item) {
+			console.log(item);
+			let ali = '';
+			let wechat = '';
+			let bank_card_no = '';
+			let bank_of_deposit = '';
+			let name ='';
+			let phone = '';
+			if (item.checker.ali) {
+				ali = item.checker.ali;
+			}
+			if (item.checker.wechat) {
+				wechat = item.checker.wechat;
+			}
+			if (item.checker.bank_card_no) {
+				bank_card_no = item.checker.bank_card_no;
+			}
+			if (item.checker.nickname) {
+				name = item.checker.nickname;
+			}
+			if (item.checker.ext_mobile) {
+				phone = item.checker.ext_mobile;
+			}
+			if (item.checker.bank_of_deposit) {
+				bank_of_deposit = item.checker.bank_of_deposit;
+			}
 			uni.navigateTo({
-				url
-			})
+				url: '/pages/index/male?ali=' + ali + '&wei=' + wechat + '&bank=' + bank_of_deposit + '&info=' + bank_card_no + '&name=' + name + '&phone=' + phone
+			});
 		},
 		setData() {
 			// #ifdef APP-PLUS

pages/index/infoDetail.vue

@@ -40,7 +40,7 @@
 
 		<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.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>
 </template>
@@ -62,6 +62,9 @@ export default {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 	},
 	onLoad(option) {
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.xq')
+		})
 		this.id = option.id;
 		this.loadData();
 	},
@@ -108,11 +111,11 @@ export default {
 			return i;
 		},
 		baodan(id) {
-			if ((!this.userInfo.bank_card_no && !this.userInfo.bank_of_deposit) && this.userInfo.ali == null && this.userInfo.wechat == null) {
 				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 == '') {
 				uni.showModal({
-					title: '提示',
-					content: '您当前未填写收款信息,是否前往填写',
+					title: this.$t('foo.ts'),
+					content: this.$t('foo.ndqwtxskxx'),
 					success: function(res) {
 						if (res.confirm) {
 							uni.navigateTo({
@@ -125,7 +128,7 @@ export default {
 				});
 			} else {
 				if (this.status == '1' && this.item.income < this.item.v2_limit * 1) {
-					this.$api.msg('当前援助金额不足以升级');
+					this.$api.msg('当前援助额度不足以升级黑钻VIP义工');
 					return;
 				}
 				uni.navigateTo({
@@ -207,7 +210,7 @@ export default {
 	background-color: #1f2020;
 	border-radius: 10rpx;
 	.main-title {
-		width: 320rpx;
+		width: 400rpx;
 		height: 80rpx;
 		margin: -60rpx auto 0;
 		border-radius: 50rpx;
@@ -216,7 +219,7 @@ export default {
 			position: absolute;
 			left: 0;
 			top: 0;
-			width: 320rpx;
+			width: 400rpx;
 			height: 80rpx;
 			.image {
 				width: 100%;

pages/index/list.vue

@@ -0,0 +1,101 @@
+<template>
+	<view class="container">
+		<view v-if="list.length > 0" class="list-box flex_item" v-for="(ls,index) in list" :key='index' @click="nav(index)">
+			<image :src="baseURL + ls.coverimage"></image>
+			<view class="list-item">
+				<view class="title ellipsis">{{ls.title}}</view>
+				<view class="time">{{ls.time}}</view>
+			</view>
+		</view>
+		<!-- <view class="empty-box" v-show="list.length === 0"><u-empty></u-empty></view> -->
+	</view>
+</template>
+<script>
+import { article } from '@/api/index.js';
+import { mapState, mapMutations } from 'vuex';
+import { getTime } from '@/utils/rocessor.js';
+export default {
+	data() {
+		return {
+			list:''
+		};
+	},
+	onLoad(option){
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.tglb')
+		})
+		this.loadData();
+	},
+	onShow() {
+		
+	},
+	computed: {
+		...mapState(['baseURL']),
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	methods: {
+		// 请求载入数据
+		async loadData() {
+			let obj = this;
+			article({
+				page:1,
+				limit:10000,
+				category_id: 14
+			}).then(({ data }) => {
+				console.log(data)
+				data.list.forEach(e =>{
+					console.log(e)
+					e.time = getTime(e.updatetime)
+				})
+				obj.list = data.list;
+			});
+		},
+		nav(index){
+			uni.navigateTo({
+				url: '/pages/index/article?id=' + this.list[index].id
+			})
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	min-height: 100%;
+	.container {
+		width: 100%;
+		padding: 25rpx 27rpx;
+		
+	}
+}
+.empty-box{
+	margin-top: 100rpx;
+	width: 100%;
+	height: 500rpx;
+}
+.list-box{
+	border-bottom: 1rpx solid #E3E3E3;
+	margin-bottom: 25rpx;
+	padding-bottom: 25rpx;
+	image{
+		width: 200rpx;
+		height: 160rpx;
+		border-radius: 15rpx;
+	}
+	.list-item{
+		padding-left: 16rpx;
+		width: 80%;
+		.title{
+			height: 80rpx;
+			color: #FFFFFF;
+			font-size: 30rpx;
+			font-weight: 500;
+		}
+		.time{
+			padding-top: 40rpx;
+			color: #999999;
+			font-size: 24rpx;
+		}
+	}
+}
+</style>

pages/index/male.vue

@@ -3,19 +3,26 @@
 		<view class="box">
 			<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.yhylsjh')}}：{{ phone }}
+					<view class="copyband" @click="copy(yhylsjh)">{{$t('foo.fzsjh')}}</view>
+				</view>
 				<view class="detail-item">
-					{{$t('foo.yhzh')}}：{{ userInfo.bank_card_no }}
-					<view class="copy" @click="copy(userInfo.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')}}：{{ userInfo.bank_of_deposit }}
-					<view class="copyband" @click="copy(userInfo.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="userInfo.ali">{{$t('foo.zfbsmyz')}}</view>
-			<view v-if="userInfo.ali" class="erweima"><image :src="userInfo.ali" mode="widthFix"></image></view>
-			<view v-if="userInfo.wechat" class="title">{{$t('foo.wxsmyz')}}</view>
-			<view v-if="userInfo.wechat" class="erweima" ><image :src="userInfo.wechat" mode="widthFix"></image></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>
 	</view>
 </template>
@@ -26,8 +33,39 @@ export default {
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
 	},
-	onLoad() {
-		console.log(this.userInfo);
+	data(){
+		return {
+			ali:'',
+			wechat:'',
+			bank_card_no:'',
+			bank_of_deposit:'',
+			name:'',
+			phone:'',
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		if(option.ali != ''){
+			this.ali = option.ali
+		}
+		if(option.wei != ''){
+			this.wechat = option.wei
+		}
+		if(option.bank != ''){
+			this.bank_of_deposit = option.bank
+		}
+		if(option.info != ''){
+			this.bank_card_no = option.info
+		}
+		if(option.name != ''){
+			this.name = option.name
+		}
+		if(option.phone != ''){
+			this.phone = option.phone
+		}
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.xq')
+		})
 	},
 	methods: {
 		copy(text) {
@@ -35,12 +73,12 @@ export default {
 				data: text,
 				success: e => {
 					uni.showToast({
-						title: this.$t('this.fzcg')
+						title: this.$t('foo.fzcg')
 					});
 				},
 				fail(e) {
 					uni.showToast({
-						title: this.$t('this.fzsb'),
+						title: this.$t('foo.fzcg.fzsb'),
 						icon: false
 					});
 					console.log(e);

pages/index/video.vue

@@ -5,19 +5,19 @@
 <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('开始播放');
-		// });
-		// innerAudioContext.stop()
+		const innerAudioContext = uni.createInnerAudioContext();
+		innerAudioContext.autoplay = true;
+		innerAudioContext.startTime = 2;
+		innerAudioContext.src = '../../static/icon/video.mp3';
+		innerAudioContext.onPlay(() => {
+		  console.log('开始播放');
+		});
 		setTimeout(() => {
+			innerAudioContext.stop()
 			uni.switchTab({
 				url: '/pages/index/index'
 			});
-		}, 2500);
+		}, 5000);
 	}
 };
 </script>

pages/profit/fund.vue

@@ -0,0 +1,127 @@
+<template>
+	<view class="center">
+		<view class="top"><image src="../../static/img/fundtop.png" mode="" class="bg"></image></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">基金介绍</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>
+	</view>
+</template>
+
+<script>
+import { details } from '@/api/index.js';
+export default {
+	data() {
+		return {
+			content:''
+		};
+	},
+	onLoad() {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.xq')
+		});
+		details({},3).then(({data}) =>{
+			console.log(data)
+			this.content = data.content
+		})
+	}
+};
+</script>
+
+<style lang="scss">
+.top {
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	z-index: 10;
+	.bg {
+		height: 900rpx;
+		width: 100%;
+	}
+}
+.index1 {
+	margin-top: -400rpx;
+	width: 100%;
+	height: 713rpx;
+	position: relative;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+.main-box {
+	margin: 80rpx 30rpx 0;
+	position: relative;
+	z-index: 20;
+	padding: 20rpx;
+	background-color: #1f2020;
+	border-radius: 10rpx;
+	.main-title {
+		width: 300rpx;
+		height: 80rpx;
+		margin: -60rpx auto 0;
+		border-radius: 50rpx;
+		position: relative;
+		.main-title-image {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 300rpx;
+			height: 80rpx;
+			.image {
+				width: 100%;
+				height: 100%;
+				border-radius: 50rpx;
+			}
+		}
+
+		.main-title-font {
+			position: relative;
+			z-index: 100;
+			text-align: center;
+			line-height: 80rpx;
+			font-size: 46rpx;
+			font-weight: bold;
+			color: #54300f;
+		}
+	}
+	.main {
+		padding: 40rpx 0;
+		color: #eecca7;
+		.main-item {
+			margin-top: 20rpx;
+			width: 100%;
+			padding: 14rpx;
+			background: #e6c3a1;
+			position: relative;
+			border-radius: 20rpx;
+			.main-image {
+				position: absolute;
+				top: -2rpx;
+				left: -2rpx;
+				width: 60rpx;
+				height: 110rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.main-font {
+				font-size: 28rpx;
+				padding-left: 80rpx;
+			}
+		}
+	}
+}
+</style>

pages/profit/profit.vue

@@ -1,55 +1,97 @@
-<template>
-	<view class="content">
+<template>
+	<view class="content">
 		<view class="content-money">
-			<image src="../../static/img/centerbg.png" mode="" class="bg"></image>
-			<view class="money-box">
-				<view class="text">当前余额</view>
-				<view class="money"><text>￥</text>{{ money | getMoneyStyle }}</view>		
-			</view>
-		</view>
-		<view class="navbar">
-			<view v-for="(item,index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index}" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{'height':maxheight}" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- 订单列表 -->
-					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.title }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { mapState, mapMutations } from 'vuex';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
+			<image src="../../static/img/centerbg.png" mode="" class="bg"></image>
+			<view class="money-box flex">
+				<view class="money-item">
+					<view class="money">{{ spend }}</view>
+					<view class="text">{{ $t('foo.dqyzfk') }}</view>
+				</view>
+				<view class="money-item">
+					<view class="money">{{ income }}</view>
+					<view class="text">{{ $t('foo.dqszfk')}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
+					<!-- 订单列表 -->
+					<view class="apply-box" v-for="item in navList[0].orderList">
+						<view class="box-top">
+							<view class="left flex">
+								<image :src="userInfo.avatar" mode="" class="user-img"></image>
+								<view class="user-info">
+									<view class="user-name clamp">{{ userInfo.nickname }}</view>
+									<view class="user-phone">{{ userInfo.mobile }}</view>
+								</view>
+							</view>
+
+							<view class="right">
+								<view class="user-name clamp">￥{{ item.money * 1 }}</view>
+								<view class="user-phone">{{ item.time }}</view>
+							</view>
+						</view>
+						<view class="apply-info flex">
+							<view class="img-wrap"><image :src="imgitem" mode="" class="upimg" v-for="imgitem in item.imagelist"></image></view>
+							<view class="btn-wrap">{{ item.status == '1' ? $t('hea.ytg') : item.status == '0' ? $t('hea.dsh') : $t('hea.wtg') }}</view>
+						</view>
+					</view>
+					<uni-load-more :status="navList[0].loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+			<swiper-item class="tab-content">
+				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<!-- <empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty> -->
+					<!-- 订单列表 -->
+					<view class="apply-box" v-for="item in navList[1].orderList">
+						<view class="box-top">
+							<view class="left flex">
+								<image :src="item.user_info.avatar" mode="" class="user-img"></image>
+								<view class="user-info">
+									<view class="user-name clamp">{{ item.user_info.nickname }}</view>
+									<view class="user-phone">{{ item.user_info.mobile }}</view>
+								</view>
+							</view>
+
+							<view class="right">
+								<view class="user-name clamp">￥{{ item.money * 1 }}</view>
+								<view class="user-phone">{{ item.time }}</view>
+							</view>
+						</view>
+						<view class="apply-info flex">
+							<view class="img-wrap"><image :src="imgitem" mode="" class="upimg" v-for="imgitem in item.imagelist"></image></view>
+							<view class="btn-wrap">{{ item.status == '1' ? $t('hea.ytg') : item.status == '0' ? $t('hea.dsh') : $t('hea.wtg') }}</view>
+						</view>
+					</view>
+					<uni-load-more :status="navList[1].loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { getApplyList, getMyList } from '@/api/apply.js';
+import { mapState, mapMutations } from 'vuex';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { getTime } from '@/utils/rocessor.js';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	computed: {
+		...mapState(['lang']),
+		...mapState('user', ['hasLogin', 'userInfo', 'baseURL', 'urlFile'])
+	},
 	onReady(res) {
 		var obj = this;
 		uni.getSystemInfo({
@@ -64,241 +106,361 @@ export default {
 			},
 			fail: res => {}
 		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight:'',
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页面
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页面
-					limit: 10 //每次信息条数
-				},
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-		//获取用户余额
-		userBalance({}).then(({ data }) => {
-			this.money = data.commissionCount;
-		});
-	},
-	methods: {
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		async loadData(source) {
-			//这里时将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state+3;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			//修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-			
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					if(data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					}
-					//判断是否还有数据, 有改为more, 没有改为noMore
-					if (navItem.limit == data.length) {
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-page {
-	background: #000;
-	height: 100%;
-}
+	},
+	data() {
+		return {
+			// 头部图高度
+			maxheight: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: this.$t('foo.yzfk'),
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 1,
+					text: this.$t('foo.syzfk'),
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				}
+			],
+			spend: '', //援助金额
+			income: '' //受援助金额
+		};
+	},
+	onLoad(options) {},
+	watch: {
+		lang(val) {
+			this.$set(this.navList[0], 'text', this.$t('foo.yzfk'));
+			this.$set(this.navList[1], 'text', this.$t('foo.syzfk'));
+		}
+	},
+	onShow() {
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.syzx')
+		})
+		this.spend = this.userInfo.spend;
+		this.income = this.userInfo.income;
+		this.loadData();
+	},
+	methods: {
+		navto(e) {
+			uni.navigateTo({
+				url: e
+			});
+		},
+		async loadData(source) {
+			//这里时将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let state = navItem.state;
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			//修改当前对象状态为加载中
+			navItem.loadingType = 'loading';
+			console.log(state, '123321');
+			if (state == 1) {
+				getApplyList({
+					page: navItem.page,
+					limit: navItem.limit,
+					status: 8
+				})
+					.then(({ data }) => {
+						data.list.forEach(e => {
+							console.log(e);
+							e.time = getTime(e.updatetime);
+							if (e.voucherimages) {
+								e.imagelist = e.voucherimages.split(',');
+							}
+						});
+						if (data.list.length > 0) {
+							navItem.orderList = navItem.orderList.concat(data.list);
+							console.log(navItem.orderList);
+							navItem.page++;
+						}
+						//判断是否还有数据, 有改为more, 没有改为noMore
+						if (navItem.limit == data.list.length) {
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							navItem.loadingType = 'noMore';
+						}
+						uni.hideLoading();
+						this.$set(navItem, 'loaded', true);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			} else {
+				getMyList({ page: navItem.page, limit: navItem.limit })
+					.then(({ data }) => {
+						if (data.list.length > 0) {
+							data.list.forEach(e => {
+								console.log(e);
+								e.time = getTime(e.updatetime);
+								if (e.voucherimages) {
+									e.imagelist = e.voucherimages.split(',');
+								}
+							});
+							navItem.orderList = navItem.orderList.concat(data.list);
+							console.log(navItem.orderList);
+							navItem.page++;
+						}
+						//判断是否还有数据, 有改为more, 没有改为noMore
+						if (navItem.limit == data.list.length) {
+							navItem.loadingType = 'more';
+							return;
+						} else {
+							navItem.loadingType = 'noMore';
+						}
+						uni.hideLoading();
+						this.$set(navItem, 'loaded', true);
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			}
+		},
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #000;
+	height: 100%;
+}
 .content-money {
-	height: 430rpx;
-	padding-bottom: 30rpx;
+	height: 430rpx;
+	padding-bottom: 30rpx;
 	background: $page-color-base;
 	position: relative;
-	.bg{ 
+	.bg {
 		position: absolute;
 		width: 100%;
 		height: 430rpx;
-	}
-	.moneyTx{
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #FFFFFF;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #FFFFFF;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.buttom-box {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		padding: 20rpx 0;
-		border-radius: $border-radius-sm;
-		margin-top: -60rpx;
-		.buttom {
-			font-size: $font-lg;
-			flex-grow: 1;
-		}
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-.money-box {
-	// background-color: $base-color;
-	padding-top: var(--status-bar-height);
-	height: 368rpx;
-	color: #FAD6B0;
+	}
+	.moneyTx {
+		position: absolute;
+		top: 150rpx;
+		right: 0rpx;
+		width: 150rpx;
+		padding: 10rpx 30rpx;
+		border: 2px solid #ffffff;
+		border-top-left-radius: 99rpx;
+		border-bottom-left-radius: 99rpx;
+		color: #ffffff;
+		line-height: 1;
+		font-size: $font-base;
+	}
+	.buttom-box {
+		background-color: #ffffff;
+		text-align: center;
+		margin: 0 30rpx;
+		padding: 20rpx 0;
+		border-radius: $border-radius-sm;
+		margin-top: -60rpx;
+		.buttom {
+			font-size: $font-lg;
+			flex-grow: 1;
+		}
+		.interval {
+			width: 2px;
+			height: 60rpx;
+			background-color: #eeeeee;
+		}
+		.icon {
+			height: 50rpx;
+			width: 48rpx;
+			margin: 0 auto;
+			.icon-img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+}
+.money-box {
+	// background-color: $base-color;
+	padding-top: var(--status-bar-height);
+	height: 368rpx;
+	color: #fad6b0;
 	text-align: center;
-	position: relative;
-	.text {
-		padding-top: 147rpx;
-		font-size: $font-sm;
-	}
+	position: relative;
+	align-items: center;
+	.money-item {
+		width: 50%;
+	}
+	.text {
+		font-size: $font-sm;
+	}
 	.money {
+		padding-top: 147rpx;
 		font-size: 47px;
 		font-family: PingFang SC;
 		font-weight: bold;
 		text {
 			font-size: 24px;
-		}
-	}
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #000;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: #999999;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-//列表
-
-.swiper-box {
-	padding-top: 10rpx;
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-		}
-	}
-}
-.list-scroll-content {
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
+		}
+	}
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #000;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: #999999;
+		position: relative;
+		overflow: hidden;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+//列表
+
+.swiper-box {
+	padding-top: 10rpx;
+	.apply-box {
+		height: 317rpx;
+		width: 702rpx;
+		// background-color: red;
+		margin: 0 auto;
+		border-bottom: 1px solid #6c6a68;
+		padding-top: 30rpx;
+
+		.box-top {
+			height: 80rpx;
+			// background-color: #bfa;
+			display: flex;
+			justify-content: space-between;
+			.left {
+				justify-content: flex-start;
+			}
+			.right {
+				text-align: right;
+			}
+			.user-img {
+				width: 80rpx;
+				height: 80rpx;
+				background-color: #eee;
+				margin-right: 20rpx;
+				flex-shrink: 0;
+				border-radius: 50%;
+			}
+
+			.user-name {
+				max-width: 500rpx;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #ffffff;
+			}
+
+			.user-phone {
+				padding-top: 10rpx;
+				font-size: 22rpx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #ffffff;
+			}
+		}
+
+		.apply-info {
+			padding: 25rpx 0 0 100rpx;
+			justify-content: space-between;
+
+			.img-wrap {
+				.upimg {
+					width: 153rpx;
+					height: 152rpx;
+					border-radius: 10rpx;
+					background-color: #999;
+					margin-left: 10rpx;
+				}
+			}
+
+			.btn-wrap {
+				align-self: flex-end;
+				color: #fad6b0;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #fad6b0;
+
+				.btn {
+					width: 98rpx;
+					line-height: 47rpx;
+					text-align: center;
+				}
+
+				.btn-reject {
+					border: 1px solid #fad6b0;
+					border-radius: 5rpx;
+					color: #fad6b0;
+				}
+
+				.btn-pass {
+					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: 5rpx;
+					color: #874b19;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+}
+.list-scroll-content {
+	height: 100%;
+}
+.content {
+	height: 100%;
+	.empty-content {
+		background-color: #ffffff;
+	}
+}
 </style>

pages/public/forget.vue

@@ -49,7 +49,11 @@ export default {
 			
 		};
 	},
-	onLoad() {},
+	onLoad() {
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.wjmm')
+		})
+	},
 	watch: {
 		// 监听倒计时
 		countDown(i) {

pages/public/nav.vue

@@ -2,7 +2,7 @@
 	<view class="box">
 		<view class="header-box">
 			<view class="top-box">
-				<view class="box-right"><wyb-drop-down :zIndex='1' class="han-box" ref="dropDown" :options="options" @select="onItemSelect"></wyb-drop-down></view>
+				<view class="box-right"><wyb-drop-down :zIndex="1" class="han-box" ref="dropDown" :options="options" @select="onItemSelect"></wyb-drop-down></view>
 			</view>
 		</view>
 	</view>
@@ -10,11 +10,20 @@
 
 <script>
 import wybDropDown from '@/components/wyb-drop-down/wyb-drop-down.vue';
+import { mapState, mapMutations } from 'vuex';
 // import { goodslist,allist,aboutlist, fllist } from '../../api/api.js';
 export default {
 	components: {
 		wybDropDown
 	},
+	computed: {
+		...mapState(['lang'])
+	},
+	watch: {
+		lang(val) {
+			this.$set(this.options[0], 'header', this.$t('hea.yy'));
+		}
+	},
 	data() {
 		return {
 			show: false,
@@ -70,21 +79,21 @@ export default {
 	},
 	created() {
 		// this.init();
-		const lang = uni.getStorageSync('lang')||0;
+		const lang = uni.getStorageSync('lang') || 0;
 		this.$store.commit('changelang', this.langlist[lang]);
 	},
 	methods: {
 		// 下拉选择语言分类
 		onItemSelect(e) {
 			const lang = this.langlist[e.contentIndex];
-			uni.setStorageSync('lang',e.contentIndex)
+			uni.setStorageSync('lang', e.contentIndex);
 			this.$store.commit('changelang', lang);
 			this.$i18n.locale = lang;
 			// 保存当前选中的对象
 			this.$emit('changeSelect', e);
 			this.$refs.dropDown.close();
 			console.log(lang);
-		},
+		}
 	}
 };
 </script>
@@ -96,8 +105,8 @@ export default {
 		padding-top: 100rpx;
 	}
 }
-/deep/ .collapseItemBox{
-	.title{
+/deep/ .collapseItemBox {
+	.title {
 		padding: 30rpx;
 		font-size: 32rpx;
 		font-weight: bold;
@@ -150,13 +159,13 @@ export default {
 .header-box {
 	width: 750rpx;
 	height: 100rpx;
-	background: #fefefe;
+	background: #000;
 	display: flex;
 	align-items: center;
 	padding: 0 30rpx;
 	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	position: fixed;
-	top: 0;
+	position: flex;
+	top: var(--status-bar-height);
 	left: 0;
 	z-index: 1000;
 	.box-center {
@@ -165,7 +174,7 @@ export default {
 		margin-left: 180rpx;
 		font-size: 34rpx;
 		font-weight: bold;
-		color: #101010;
+		color: #fff;
 	}
 
 	.box-right {
@@ -215,4 +224,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

pages/set/userinfo.vue

@@ -1,102 +1,184 @@
 <template>
 	<view class="content">
+		<view class="row">
+			<view class="left">
+				<text class="tit" style="width: 160upx;">{{ $t('foo.zh') }}</text>
+				<view class="tit">ID:{{ userInfo.id }}</view>
+			</view>
+			<input class="input" type="text" disabled="true" v-model="userInfo.username" placeholder-class="placeholder" />
+		</view>
 		<view class="row1">
-			<text class="tit">{{$t('foo.tx')}}</text>
+			<text class="tit">{{ $t('foo.tx') }}</text>
 			<view class="background-img" @click.stop="imgsub"><image class="background-img" :src="userInfo.avatar" mode="aspectFill"></image></view>
 		</view>
 		<view class="row">
-			<text class="tit">{{$t('foo.nc')}}</text>
-			<input class="input" type="text" v-model="userInfo.nickname" placeholder-class="placeholder" />
+			<text class="tit" style="width: 160upx; color: #bdbdbd;">{{ $t('foo.nc') }}*</text>
+			<input class="input" type="text" v-model="userInfo.nickname" placeholder-class="placeholder" placeholder="请填写" />
 		</view>
 		<view class="row">
-			<text class="tit" style="width: 240upx;">{{$t('foo.yhzh')}}</text>
-			<input class="input" type="text"  v-model="userInfo.bank_card_no" placeholder-class="placeholder" />
+			<text class="tit" style="width: 160upx; color: #bdbdbd;">{{ $t('foo.yhzh') }}*</text>
+			<input class="input" type="text" v-model="userInfo.bank_card_no" placeholder-class="placeholder" placeholder="请填写" />
 		</view>
 		<view class="row">
-			<text class="tit" style="width: 240upx;">{{$t('foo.scyh')}}</text>
-			<input class="input" type="text"  v-model="userInfo.bank_of_deposit" placeholder-class="placeholder" />
+			<view class="left">
+				<text class="tit" style="width: 160upx; color: #bdbdbd;">{{ $t('foo.scyh') }}*</text>
+				<view class="image"><image src="../../static/img/user-bank.png" mode=""></image></view>
+			</view>
+
+			<input class="input" type="text" v-model="userInfo.bank_of_deposit" placeholder-class="placeholder" placeholder="请填写" />
 		</view>
-		<view class="row">
+		<!-- <view class="row">
 			<text class="tit">ID</text>
-			<input class="input" type="text"  disabled="true" v-model="userInfo.id" placeholder-class="placeholder" />
+			<input class="input" type="text" disabled="true" v-model="userInfo.id" placeholder-class="placeholder" />
+		</view> -->
+
+		<view class="row1">
+			<view class="left">
+				<text class="tit">{{ $t('foo.zfbskm') }}</text>
+				<view class="image"><image src="../../static/img/ali.png" mode=""></image></view>
+			</view>
+
+			<view class="background-img1" @click.stop="imgsubali">
+				<image class="background-img1" :src="userInfo.ali || '../../static/img/upload.png'" mode="aspectFill"></image>
+			</view>
+		</view>
+		<view class="row1">
+			<view class="left">
+				<text class="tit">{{ $t('foo.wxskm') }}</text>
+				<view class="image"><image src="../../static/img/weixin.png" mode=""></image></view>
+			</view>
+
+			<view class="background-img1" @click.stop="imgsubwechat">
+				<image class="background-img1" :src="userInfo.wechat || '../../static/img/upload.png'" mode="aspectFill"></image>
+			</view>
 		</view>
 		<view class="row">
-			<text class="tit">{{$t('foo.zh')}}</text>
-			<input class="input" type="text"  disabled="true" v-model="userInfo.username" placeholder-class="placeholder" />
-		</view>
-		<view class="row1">
-			<text class="tit">{{$t('foo.zfbskm')}}</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">{{$t('foo.wxskm')}}</text>
-			<view class="background-img1" @click.stop="imgsubwechat"><image class="background-img1" :src="userInfo.wechat" mode="aspectFill"></image></view>
+			<text class="tit" style="width: 140upx; color: #bdbdbd;">{{ $t('foo.jjlxrdh') }}*</text>
+			<input class="input" type="text" v-model="userInfo.ext_mobile" placeholder-class="placeholder" placeholder="请填写" />
 		</view>
-		<view class="add-btn" @click="confirm">{{$t('foo.tj')}}</view>
-		<view class="out" @click="toLogout">{{$t('foo.tcdl')}}</view>
+		<view class="tishi">*{{ $t('foo.bt') }}</view>
+		<view class="add-btn" @click="confirm">{{ $t('foo.tj') }}</view>
+		<view class="out" @click="toLogout">{{ $t('foo.tcdl') }}</view>
 	</view>
 </template>
 
 <script>
-import { mapState,mapMutations } from 'vuex';
+import { mapState, mapMutations } from 'vuex';
 import { uploads } from '@/api/user.js';
-import {userEdit,logout} from '@/api/set.js';
+import { userEdit, logout } from '@/api/set.js';
 
-export default{
-	data(){
-		return{
-			
-		}
+export default {
+	data() {
+		return {};
 	},
 	onLoad() {
-		console.log(this.userInfo)
+		let i = this.userInfo.id + '';
+		console.log(i.length);
+		if (i.length < 8) {
+			let k = '';
+			for (let j = 0; j < 8 - i.length; j++) {
+				k += '0';
+			}
+			this.userInfo.id = k + this.userInfo.id;
+		}
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.sz')
+		});
 	},
 	computed: {
-		...mapState('user',['userInfo'])
+		...mapState('user', ['userInfo'])
 	},
 	methods: {
-		...mapMutations('user',['logout']),
+		...mapMutations('user', ['logout']),
 		imgsub() {
-			console.log('上传头像')
+			console.log('上传头像');
 			uploads({
 				filename: ''
 			}).then(res => {
 				// console.log("data",data);
-				// this.userInfo.avatar = data.fullurl;
-				console.log(res,'++++++++++++++++')
+				// this.userInfo.avatar = data.fullurl;
+				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;
-			})
+			});
+		},
+		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,ali: this.userInfo.ali,wechat: this.userInfo.wechat})
+			let data = '';
+			if (this.userInfo.nickname == '') {
+				uni.showModal({
+					title: this.$t('foo.ts'),
+					content: this.$t('foo.jtxzsxm')
+				});
+				return;
+			}
+			if (this.userInfo.bank_card_no == '') {
+				uni.showModal({
+					title: this.$t('foo.ts'),
+					content: this.$t('foo.jtxyhkh')
+				});
+				return;
+			}
+			if (this.userInfo.bank_of_deposit == '') {
+				uni.showModal({
+					title: this.$t('foo.ts'),
+					content: this.$t('foo.jtxkhh')
+				});
+				return;
+			}
+			if (this.userInfo.ext_mobile == '' || this.userInfo.ext_mobile == null) {
+				uni.showModal({
+					title: this.$t('foo.ts'),
+					content: this.$t('foo.jtxjjlxrdh')
+				});
+				return;
+			}
+			if (this.userInfo.avatar.length < 255) {
+				data = {
+					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,
+					ext_mobile: this.userInfo.ext_mobile
+				};
+			} else {
+				data = {
+					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,
+					ext_mobile: this.userInfo.ext_mobile
+				};
+			}
+			userEdit(data)
 				.then(e => {
 					this.$api.msg('修改成功');
-					setTimeout(()=> {
-						uni.switchTab({
-							url:'/pages/user/user'
-						});
+					setTimeout(() => {
+						uni.navigateBack({});
 					}, 1000);
 					console.log(e);
 				})
@@ -104,97 +186,132 @@ export default{
 					console.log(e);
 				});
 		},
-		toLogout(){
+		toLogout() {
 			let obj = this;
 			uni.showModal({
-			    content: '确定要退出登录么',
-			    success: (e)=>{
-			    	if(e.confirm){
+				content: '确定要退出登录么',
+				success: e => {
+					if (e.confirm) {
 						// logout({}).then((e) => {
 						// 	uni.navigateBack();
 						// }).catch((e) => {
 						// 	console.log(e);
 						// })
+						logout({}).then()
 						uni.navigateBack();
-			    		obj.logout();
-			    	}
-			    }
+						obj.logout();
+					}
+				}
 			});
-		},
+		}
 	}
-}
+};
 </script>
 
 <style lang="scss">
-	.row1 {
+.row1 {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	position: relative;
+	padding: 0 30upx;
+	height: 110upx;
+	background: #000;
+	margin-bottom: 20upx;
+	.toux {
+		display: inline-block;
+	}
+	.tit {
+		flex-shrink: 0;
+		width: 120upx;
+		font-size: $font-lg;
+		color: #fff;
+	}
+	.left {
 		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		padding: 0 30upx;
-		height: 110upx;
-		background: #000;
-		margin-bottom: 20upx;
-		.tit {
-			flex-shrink: 0;
-			width: 120upx;
-			font-size: $font-lg;
-			color: #fff;
-		}
-		
-		.background-img {
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-			background: #f2f2f2;
-		}
-		.background-img1 {
-			width: 80rpx;
-			height: 80rpx;
-			background: #f2f2f2;
+		justify-content: start;
+	}
+	.image {
+		width: 100rpx;
+		height: 100rpx;
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
-	.row {
+	.background-img {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		background: #f2f2f2;
+	}
+	.background-img1 {
+		width: 100rpx;
+		height: 100rpx;
+		background: #000000;
+	}
+}
+.row {
+	display: flex;
+	align-items: center;
+	padding: 0 30upx;
+	height: 110upx;
+	background: #000;
+	.left {
 		display: flex;
+		justify-content: start;
 		align-items: center;
-		padding: 0 30upx;
-		height: 110upx;
-		background: #000;
-	
-		.tit {
-			flex-shrink: 0;
-			width: 120upx;
-			font-size: $font-lg;
-			color: #fff;
-		}
-		.input {
-			flex: 1;
-			text-align: right;
-			font-size: $font-base;
-			color: #fff;
+	}
+	.image {
+		width: 100rpx;
+		height: 100rpx;
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
-	.add-btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 158rpx auto 30rpx;
-		width: 560rpx;
-		height: 80rpx;
-		background: linear-gradient(-74deg, #CE9C6D, #FFECD6);
-		border-radius: 40px;
-		color: #FFFFFF;
+	.tit {
+		flex-shrink: 0;
+		width: 120upx;
+		font-size: $font-lg;
+		color: #fff;
 	}
-	.out {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin: 0 auto 30rpx;
-		width: 560rpx;
-		height: 80rpx;
-		border: 1px solid #FFECD6;
-		background: #FFFFFF;
-		border-radius: 40px;
-		color: #CE9C6D;
+	.input {
+		flex: 1;
+		text-align: right;
+		font-size: $font-base;
+		color: #fff;
 	}
-</style>
+}
+.tishi {
+	padding: 20rpx 0 120rpx 24rpx;
+	color: #fff;
+	font-size: 26rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #ffffff;
+}
+.add-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: 158rpx auto 30rpx;
+	width: 560rpx;
+	height: 80rpx;
+	background: linear-gradient(-74deg, #ce9c6d, #ffecd6);
+	border-radius: 40px;
+	color: #ffffff;
+}
+.out {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: 0 auto 30rpx;
+	width: 560rpx;
+	height: 80rpx;
+	border: 1px solid #ffecd6;
+	background: #ffffff;
+	border-radius: 40px;
+	color: #ce9c6d;
+}
+</style>

pages/upload/upload.vue

@@ -16,7 +16,7 @@
 					<view class="title">
 						{{$t('hea.bcms')}}
 					</view>
-					<textarea class="title1" value=""  :placeholder="$t('hea.txms')" maxlength="140" focus="focus" />
+					<textarea class="title1" value=""  :placeholder="$t('hea.txms')" maxlength="140" focus="focus" placeholder-class="place"/>
 				</view>
 			</view>
 		</view>
@@ -39,6 +39,9 @@
 			}
 		},
 		onLoad(opt) {
+			uni.setNavigationBarTitle({
+				title:this.$t('foo.sczl')
+			})
 			this.apply_id = opt.id
 		},
 		methods: {
@@ -141,12 +144,17 @@
 					color: #FFFFFF;
 				}
 
-				.title1 {
+				.title1 {
+					padding: 10rpx;
 					margin-left: 40rpx;
 					font-size: 26rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #999999;
+					color: #000;
+					background: #ebebeb;
+				}
+				.place {
+					color: #15130f;
 				}
 			}
 		}

pages/user/applyList.vue

@@ -20,8 +20,8 @@
 						<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 btn-reject" @click="cancelApply(item)">{{$t('hea.jj')}}</view>
-								<view class="btn btn-pass" @click="passApply(item)">{{$t('hea.ty')}}</view>
+								<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>
 							<view class="btn-wrap" v-if="tabCurrentIndex == 1">{{ item.status == 1 ? $t('hea.ytg') : $t('hea.wtg') }}</view>
 						</view>
@@ -32,12 +32,10 @@
 		</swiper>
 		<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-view class="popup-item" :scale="true" direction="all"><image :src="img" mode=""></image></movable-view>
 			</movable-area>
 		</uni-popup>
-		<u-tabbar :list="tabbar" bg-color='#000' active-color='#FAD6B0' inactive-color='#71614f' change='change'></u-tabbar>
+		<u-tabbar :list="tabbar" bg-color="#000" active-color="#FAD6B0" inactive-color="#71614f" change="change"></u-tabbar>
 	</view>
 </template>
 
@@ -45,7 +43,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'
+import { tabbar } from '@/components/tabbar/tabbar.js';
 import { mapState, mapMutations } from 'vuex';
 export default {
 	components: {
@@ -57,11 +55,30 @@ export default {
 			img: '', //图片
 			height: '',
 			tabCurrentIndex: 0,
-			tabbar: tabbar,
+			tabbar:  [
+				{
+					iconPath: '../../static/tabBar/home.png',
+					selectedIconPath: '../../static/tabBar/home-action.png',
+					text: this.$t('hea.sy'),
+					pagePath: '/pages/index/index'
+				},
+				{
+					iconPath: '../../static/tabBar/center.png',
+					selectedIconPath: '../../static/tabBar/center-action.png',
+					text: this.$t('hea.shlb'),
+					pagePath: '/pages/user/applyList'
+				},
+				{
+					iconPath: '../../static/tabBar/user.png',
+					selectedIconPath: '../../static/tabBar/user-action.png',
+					text: this.$t('hea.wd'),
+					pagePath: '/pages/user/user'
+				}
+			],
 			navList: [
 				{
 					state: 0,
-					text: '未审核',
+					text: this.$t('hea.wsh'),
 					loadingType: 'more',
 					orderList: [],
 					page: 1,
@@ -69,7 +86,7 @@ export default {
 				},
 				{
 					state: 1,
-					text: '已审核',
+					text: this.$t('hea.ysh'),
 					loadingType: 'more',
 					orderList: [],
 					page: 1,
@@ -98,12 +115,17 @@ export default {
 	},
 	watch: {
 		lang(val) {
-			this.$set(this.navList[0],'text',this.$t('hea.wsh'))
-			this.$set(this.navList[1],'text',this.$t('hea.ysh'))
-			
+			this.$set(this.navList[0], 'text', this.$t('hea.wsh'));
+			this.$set(this.navList[1], 'text', this.$t('hea.ysh'));
+			this.$set(this.tabbar[0], 'text', this.$t('hea.sy'));
+			this.$set(this.tabbar[1], 'text', this.$t('hea.shlb'));
+			this.$set(this.tabbar[2], 'text', this.$t('hea.wd'));
 		}
 	},
-	onLoad() {
+	onShow() {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.shlb')
+		});
 		this.loadData();
 	},
 	methods: {
@@ -154,6 +176,7 @@ export default {
 			});
 		},
 		cancelApply(item) {
+			const obj = this;
 			console.log(item, 'cancelApply');
 			cancelApply({}, item.id)
 				.then(res => {

pages/user/promotion.vue

@@ -4,23 +4,23 @@
 			<image src="../../static/img/promation.png" mode="" class="bg"></image>
 			<view class="money-box">
 				<view class="money">
-					{{ all || 0 }}
+					{{ all.all || 0 }}
 					<text>{{$t('hea.ren')}}</text>
 				</view>
 				<view class="text">{{$t('hea.wdtgrs')}}</view>
 			</view>
 		</view>
-		<!-- <view class="navbar flex">
+		<view class="navbar flex">
 			<view class="nav-item">
-				<view class="num">5</view>
-				<view class="font">奖励层数</view>
+				<view class="num">{{ all.v1 }}</view>
+				<view class="font">激活人数</view>
 			</view>
 			<view class="xian"></view>
 			<view class="nav-item">
-				<view class="num">120</view>
-				<view class="font">成交人数</view>
+				<view class="num">{{ all.v2 }}</view>
+				<view class="font">黑钻人数</view>
 			</view>
-		</view> -->
+		</view>
 		<view class="swiper-box" :style="{ height: height }">
 			<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData" :style="{ height: height }">
 
@@ -33,7 +33,7 @@
 						<view class="title-avatar"><image :src="item.avatar || '/static/error/missing-face.png'"></image></view>
 						<view class="list_tpl">
 							<view class="title">
-								<text>{{ item.email || item.phone }}</text>
+								<text>{{ item.mobile || item.email }}</text>
 							</view>
 							<view class="time">
 								<text>{{ item.time }}</text>
@@ -87,8 +87,12 @@ export default {
 		};
 	},
 	onShow() {
+		uni.setNavigationBarTitle({
+			title:this.$t('foo.wdtg')
+		})
 		this.id = this.userInfo.id;
 		num().then(({data}) =>{
+			console.log(data)
 			this.all = data
 		})
 		this.loadData();

pages/user/shareQrCode.vue

@@ -14,6 +14,9 @@
 				foreground="#333333" pdground="#333333" icon="" :iconSize="40" :lv="3" :onval="true" :loadMake="true"
 				:usingComponents="true" />
 		</view>
+		<view class="title">
+			ID：{{id}}
+		</view>
 		<!-- #ifndef MP-ALIPAY -->
 		<!-- <canvas :class="{ qrimg: !loading }" @longtap="alertCanv" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" /> -->
 		<!-- #endif -->
@@ -47,6 +50,7 @@
 		},
 		data() {
 			return {
+				id:'',
 				cid: 'tki-qrcode-canvas', //canvasId，页面存在多个二维码组件时需设置不同的ID
 				size: 180, //生成的二维码大小
 				unit: 'upx', //大小单位尺寸
@@ -72,6 +76,17 @@
 			};
 		},
 		onLoad() {
+			this.id = this.userInfo.id + '';
+			if (this.id.length < 8) {
+				let k = '';
+				for (let j = 0; j < 8 - this.id.length; j++) {
+					k += '0';
+				}
+				this.id = k + this.id;
+			}
+			uni.setNavigationBarTitle({
+				title:this.$t('foo.wdewm')
+			})
 			// this.loadCodeList()
 		},
 		// onReady() {
@@ -315,4 +330,15 @@
 		top: 82%;
 		left: 40%;
 	}
+	.title {
+		position: absolute;
+		top: 86%;
+		left: 50%;
+		margin-left: -100rpx;
+		width: 200rpx;
+		background: #ff3130;
+		text-align: center;
+		border-radius: 10rpx;
+		color: #FFFFFF;
+	}
 </style>

pages/user/team.vue

@@ -3,29 +3,22 @@
 		<!-- 头部 -->
 
 		<view class="container">
-			<view class="jiedianbackground">
-				<image src="../../static/img/jiedian.png" mode=""></image>
-			</view>
+			<view class="jiedianbackground"><image src="../../static/img/jiedian.png" mode=""></image></view>
 			<view class="number-box">
 				<view class="number">
-					<text>{{childList.length}}</text>
-					人
+					<text>{{ childList.length }}</text>
+					{{ $t('hea.ren') }}
 				</view>
-				<view class="renshu">我的团队人数</view>
+				<view class="renshu">{{ $t('hea.wdtdrs') }}</view>
 			</view>
 		</view>
 		<view class="message">
-			<view class="back-box" @click="back()" v-if="id != userInfo.id">
-				返回
-			</view>
+			<view class="back-box" @click="back()" v-if="id != userInfo.id">{{ $t('hea.fh') }}</view>
 			<view class="relation-box">
-
 				<view class="relation">
 					<view class="headbox">
 						<view class="head">
-							<view class="photo">
-								<image v-if="avatar" :src="avatar || '/static/error/missing-face.png'"></image>
-							</view>
+							<view class="photo"><image v-if="avatar" :src="avatar || '/static/error/missing-face.png'"></image></view>
 						</view>
 					</view>
 					<view class="information">
@@ -33,20 +26,23 @@
 						<view class="cell clamp">{{ phone }}</view>
 					</view>
 				</view>
-				<view class="sanchaji">
-					<image src="../../static/img/sanchaji.png" mode=""></image>
-				</view>
+				<view class="sanchaji"><image src="../../static/img/sanchaji.png" mode=""></image></view>
 				<view class="subordinate flex">
 					<view class="subordinate-box" v-for="(item, index) in childList" @click="findChildren(item)">
-						<view class="head">
+						<view class="head1">
 							<image :src="item.avatar || '/static/error/missing-face.png'" mode=""></image>
+							<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>
+							</view>
+								
 						</view>
 						<view class="name clamp">{{ item.nickname }}</view>
 						<view class="phone clamp">{{ item.mobile }}</view>
 					</view>
 					<template v-if="childList.length < 5">
-						<view class="subordinate-box" v-for="item in (5-childList.length)">
-							<view class="head"></view>
+						<view class="subordinate-box" v-for="item in 5 - childList.length">
+							<view class="head1"></view>
 							<view class="name clamp"></view>
 							<view class="phone clamp"></view>
 						</view>
@@ -58,323 +54,330 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import {
-		children
-	} from '@/api/user.js';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				name: '', //当前节点姓名
-				phone: '', //当前节点手机号
-				avatar: '', //当前节点头像
-				id: '',
-				childList: [], //当前节点的下级
-				fatherList: []
-			};
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import { children } from '@/api/user.js';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	components: {
+		uniPopup
+	},
+	data() {
+		return {
+			name: '', //当前节点姓名
+			phone: '', //当前节点手机号
+			avatar: '', //当前节点头像
+			id: '',
+			childList: [], //当前节点的下级
+			fatherList: []
+		};
+	},
+	computed: {
+		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	onLoad() {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.wdtd')
+		});
+		console.log(this.userInfo);
+		this.name = this.userInfo.nickname;
+		this.phone = this.userInfo.mobile;
+		this.avatar = this.userInfo.avatar;
+		this.id = this.userInfo.id;
+		this.loadData();
+	},
+
+	methods: {
+		//返回
+
+		loadData() {
+			const obj = this;
+			children({}, this.id).then(({ data }) => {
+				this.childList = data;
+				console.log(data);
+			});
 		},
-		computed: {
-			...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		async findChildren(item) {
+			//存father
+			this.fatherList.push({
+				name: this.name,
+				phone: this.phone,
+				avatar: this.avatar,
+				id: this.id
+			});
+			//设置新father
+
+			this.id = item.id;
+			await this.loadData();
+			this.name = item.nickname;
+			this.phone = item.mobile;
+			this.avatar = item.avatar;
 		},
-		onLoad() {
-			console.log(this.userInfo)
-			this.name = this.userInfo.nickname;
-			this.phone = this.userInfo.mobile;
-			this.avatar = this.userInfo.avatar;
-			this.id = this.userInfo.id
+		back() {
+			let father = this.fatherList.pop();
+			this.name = father.name;
+			this.phone = father.phone;
+			this.avatar = father.avatar;
+			this.id = father.id;
 			this.loadData();
-		},
-
-		methods: {
-			//返回
-
-			loadData() {
-				const obj = this;
-				children({}, this.id).then(({
-					data
-				}) => {
-					this.childList = data
-					console.log(data)
-				})
-			},
-			async findChildren(item) {
-				//存father
-				this.fatherList.push({
-					name: this.name,
-					phone: this.phone,
-					avatar: this.avatar,
-					id: this.id,
-				})
-				//设置新father
-
-				this.id = item.id
-				await this.loadData()
-				this.name = item.nickname
-				this.phone = item.mobile
-				this.avatar = item.avatar
-			},
-			back() {
-				let father = this.fatherList.pop()
-				this.name = father.name
-				this.phone = father.phone
-				this.avatar = father.avatar
-				this.id = father.id
-				this.loadData()
-			}
 		}
-	};
+	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		padding: 0;
-		margin: 0;
-		height: 100%;
-		background-color: #000;
-	}
-
-	.container {
+page {
+	padding: 0;
+	margin: 0;
+	height: 100%;
+	background-color: #000;
+}
+
+.container {
+	width: 750rpx;
+	height: 400rpx;
+	position: relative;
+
+	.jiedianbackground {
+		position: absolute;
 		width: 750rpx;
 		height: 400rpx;
-		position: relative;
-
-		.jiedianbackground {
-			position: absolute;
-			width: 750rpx;
-			height: 400rpx;
 
-			image {
-				width: 100%;
-				height: 100%;
-			}
+		image {
+			width: 100%;
+			height: 100%;
 		}
+	}
 
-		.number-box {
-			width: 750rpx;
-			height: 400rpx;
-			position: absolute;
-			display: flex;
-			justify-content: center;
-			flex-direction: column;
-			align-items: center;
-
-			.number {
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #fad6b0;
-
-				text {
-					font-size: 72rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					line-height: 86rpx;
-				}
-			}
+	.number-box {
+		width: 750rpx;
+		height: 400rpx;
+		position: absolute;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		align-items: center;
+
+		.number {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #fad6b0;
 
-			.renshu {
-				font-size: 30rpx;
+			text {
+				font-size: 72rpx;
 				font-family: PingFang SC;
-				font-weight: 500;
-				color: #fad6b0;
+				font-weight: bold;
+				line-height: 86rpx;
 			}
 		}
-	}
 
-	.message {
-		padding: 0 30rpx;
-		position: relative;
-
-		.back-box {
-			width: 100rpx;
-			height: 50rpx;
-			border: 1px solid #fad6b0;
-			// background-color: red;
-			position: absolute;
-			top: 0;
-			right: 20rpx;
+		.renshu {
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
 			color: #fad6b0;
-			line-height: 50rpx;
-			text-align: center;
-			border-radius: 10rpx;
-			font-size: 28rpx;
-			z-index: 9;
 		}
+	}
+}
+
+.message {
+	padding: 0 30rpx;
+	position: relative;
+
+	.back-box {
+		width: 100rpx;
+		height: 50rpx;
+		border: 1px solid #fad6b0;
+		// background-color: red;
+		position: absolute;
+		top: 0;
+		right: 20rpx;
+		color: #fad6b0;
+		line-height: 50rpx;
+		text-align: center;
+		border-radius: 10rpx;
+		font-size: 28rpx;
+		z-index: 9;
+	}
+
+	.relation-box {
+		margin-top: 100rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
 
-		.relation-box {
-			margin-top: 100rpx;
+		.relation {
+			position: relative;
 			display: flex;
-			flex-direction: column;
 			align-items: center;
 
-
-			.relation {
-				position: relative;
-				display: flex;
-				align-items: center;
-
-				.headbox {
-					position: absolute;
-					// width: 154rpx;
-					// height: 154rpx;
-
-					.head {
+			.headbox {
+				position: absolute;
+				// width: 154rpx;
+				// height: 154rpx;
+
+				.head {
+					width: 154rpx;
+					height: 154rpx;
+					background: #fff;
+					box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
+					border-radius: 50%;
+					overflow: hidden;
+					.photo {
 						width: 154rpx;
 						height: 154rpx;
-						background: #fff;
-						box-shadow: 5rpx 0rpx 5rpx 0rpx rgba(110, 171, 78, 0.26);
-						border-radius: 50%;
-						overflow: hidden;
-
-						.photo {
-							width: 154rpx;
-							height: 154rpx;
-
-							image {
-								width: 100%;
-								height: 100%;
-							}
-						}
-					}
-
-					.head-title {
-						margin: -30rpx 30rpx 0 30rpx;
-						width: 94rpx;
-						height: 32rpx;
 
 						image {
 							width: 100%;
 							height: 100%;
 						}
 					}
-
-					// .head-name{
-					// 	max-width: 100%;
-					// 	font-size: 32rpx;
-					// 	font-weight: bold;
-					// 	color: #333333;
-					// }
-					// .head-phone{
-					// 	font-size: 26rpx;
-					// 	font-weight: 500;
-					// 	color: #999999;
-					// }
 				}
 
-				.information {
-					margin-left: 77rpx;
-					display: flex;
-					padding: 20rpx 10rpx;
-					flex-direction: column;
-					width: 297rpx;
-					height: 137rpx;
-					background: linear-gradient(90deg, #393326, #27221d);
-					border: 4rpx solid #fad6b0;
-					border-radius: 10rpx;
-
-					.name {
-						text-align: left;
-						margin-left: 70rpx;
-						font-size: 32rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #fad6b0;
-					}
+				.head-title {
+					margin: -30rpx 30rpx 0 30rpx;
+					width: 94rpx;
+					height: 32rpx;
 
-					.cell {
-						text-align: left;
-						margin-left: 70rpx;
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #fad6b0;
+					image {
+						width: 100%;
+						height: 100%;
 					}
 				}
+
+				// .head-name{
+				// 	max-width: 100%;
+				// 	font-size: 32rpx;
+				// 	font-weight: bold;
+				// 	color: #333333;
+				// }
+				// .head-phone{
+				// 	font-size: 26rpx;
+				// 	font-weight: 500;
+				// 	color: #999999;
+				// }
 			}
 
-			.sanchaji {
-				margin: 30rpx 0;
-				width: 90%;
-				height: 91rpx;
+			.information {
+				margin-left: 77rpx;
+				display: flex;
+				padding: 20rpx 10rpx;
+				flex-direction: column;
+				width: 297rpx;
+				height: 137rpx;
+				background: linear-gradient(90deg, #393326, #27221d);
+				border: 4rpx solid #fad6b0;
+				border-radius: 10rpx;
+
+				.name {
+					text-align: left;
+					margin-left: 70rpx;
+					font-size: 32rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #fad6b0;
+				}
 
-				image {
-					width: 100%;
-					height: 100%;
+				.cell {
+					text-align: left;
+					margin-left: 70rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #fad6b0;
 				}
 			}
+		}
 
-			.subordinate {
-				width: 750rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: flex-start;
+		.sanchaji {
+			margin: 30rpx 0;
+			width: 90%;
+			height: 91rpx;
 
-				.subordinate-box {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
 
-					.head {
-						border-radius: 50%;
-						background: #fff;
-						width: 120rpx;
-						height: 120rpx;
+		.subordinate {
+			width: 750rpx;
+			display: flex;
+			justify-content: flex-start;
+			align-items: flex-start;
+
+			.subordinate-box {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
 
+				.head1 {
+					position: relative;
+					border-radius: 50%;
+					background: #fff;
+					width: 120rpx;
+					height: 120rpx;
+					.vip {
+						position: absolute;
+						bottom: 0;
+						left: 10%;
+						width: 94rpx;
+						height: 32rpx;
 						image {
 							width: 100%;
 							height: 100%;
+							border-radius: 0;
 						}
 					}
-
-					.name {
-						max-width: 120rpx;
-						margin-top: 10rpx;
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FFFFFF;
+					image {
+						width: 100%;
+						height: 100%;
+						border-radius: 50%;
 					}
+				}
 
-					.phone {
-						max-width: 120rpx;
-						margin-top: 10rpx;
-						font-size: 22rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #999999;
-					}
+				.name {
+					max-width: 120rpx;
+					margin-top: 10rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #ffffff;
+				}
+
+				.phone {
+					max-width: 120rpx;
+					margin-top: 10rpx;
+					font-size: 22rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
 				}
 			}
 		}
+	}
 
-		.back {
-			float: right;
-			margin-top: 40rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			image {
-				width: 24rpx;
-				height: 23rpx;
-			}
+	.back {
+		float: right;
+		margin-top: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 
-			width: 104rpx;
-			height: 39rpx;
-			border: 2rpx solid #6eab4e;
-			border-radius: 7rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #6eab4e;
+		image {
+			width: 24rpx;
+			height: 23rpx;
 		}
+
+		width: 104rpx;
+		height: 39rpx;
+		border: 2rpx solid #6eab4e;
+		border-radius: 7rpx;
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #6eab4e;
 	}
+}
 </style>

pages/user/user.vue

@@ -19,22 +19,27 @@
 		<view class="tt">
 			<view class="tt-box" @click="navTo('/pages/user/promotion')">
 				<image src="../../static/img/tuiguang.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">{{$t('hea.wdtg')}}</view>
+				<view class="tt-txt">{{ $t('hea.wdtg') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
 			<view class="tt-box" @click="navTo('/pages/user/team')">
 				<image src="../../static/img/team.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">{{$t('hea.wdtd')}}</view>
+				<view class="tt-txt">{{ $t('hea.wdtd') }}</view>
+				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
+			</view>
+			<view class="tt-box" @click="navTo('/pages/profit/profit')">
+				<image src="../../static/img/money.png" class="tt-icon5" mode=""></image>
+				<view class="tt-txt">{{ $t('hea.syzx') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
 			<view class="tt-box" @click="navTo('/pages/user/shareQrCode')">
 				<image src="../../static/img/share.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">{{$t('hea.fxhy')}}</view>
+				<view class="tt-txt">{{ $t('hea.fxhy') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
 			<view class="tt-box" @click="open()">
 				<image src="../../static/img/kefu.png" class="tt-icon1" mode=""></image>
-				<view class="tt-txt">{{$t('hea.lxkf')}}</view>
+				<view class="tt-txt">{{ $t('hea.lxkf') }}</view>
 				<image src="../../static/img/jiantou.png" class="next-icon" mode=""></image>
 			</view>
 		</view>
@@ -43,48 +48,87 @@
 				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
 				<view class="mian">
 					<view class="delivery">
-						<view class="title">已经为您定制专属客服</view>
+						<view class="title">{{ $t('foo.yjwndzzskf') }}</view>
 						<image src="../../static/img/img010.png" mode=""></image>
 					</view>
-					<view class="nocancel">客服微信: {{ text }}</view>
+					<view class="nocancel">{{ $t('foo.kfwx') }}1: {{ text }}</view>
+					<view class="nocancel">{{ $t('foo.kfwx') }}2: {{ text1 }}</view>
+					<view class="nocancel">{{ $t('foo.kfwx') }}3: {{ text2 }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="tocall('1')">{{ $t('foo.fzwx') }}1</view>
+						<view class="comfirm" @click="tocall('2')">{{ $t('foo.fzwx') }}2</view>
+					</view>
 					<view class="comfirm-box">
-						<view class="cancel" @click="cancel">取消</view>
-						<view class="comfirm" @click="tocall()">复制微信</view>
+						<view class="comfirm" @click="tocall('3')">{{ $t('foo.fzwx') }}3</view>
+						<view class="cancel" @click="cancel">{{ $t('foo.qx') }}</view>
 					</view>
 				</view>
 			</view>
 		</uni-popup>
-		<u-tabbar :list="tabbar" bg-color='#000' active-color='#FAD6B0' inactive-color='#71614f' change='change'></u-tabbar>
+		<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 { tabbar } from '@/components/tabbar/tabbar.js';
 import { mapState, mapMutations } from 'vuex';
 import { saveUrl, interceptor } from '@/utils/loginUtils.js';
 import { getUserInfo } from '@/api/user.js';
 export default {
 	data() {
 		return {
-			text: 'c1729888411',
-			isVip:1,
-			tabbar: tabbar,
+			text: 'BYTCKF21',
+			text1: 'BYTCKF33',
+			text2: 'BYTCKF67',
+			isVip: 1,
+			tabbar: [
+				{
+					iconPath: '../../static/tabBar/home.png',
+					selectedIconPath: '../../static/tabBar/home-action.png',
+					text: this.$t('hea.sy'),
+					pagePath: '/pages/index/index'
+				},
+				{
+					iconPath: '../../static/tabBar/center.png',
+					selectedIconPath: '../../static/tabBar/center-action.png',
+					text: this.$t('hea.shlb'),
+					pagePath: '/pages/user/applyList'
+				},
+				{
+					iconPath: '../../static/tabBar/user.png',
+					selectedIconPath: '../../static/tabBar/user-action.png',
+					text: this.$t('hea.wd'),
+					pagePath: '/pages/user/user'
+				}
+			]
 		};
 	},
 	components: {
 		uniPopup
 	},
+	watch: {
+		lang(val) {
+			console.log(val);
+			this.$set(this.tabbar[0], 'text', this.$t('hea.sy'));
+			this.$set(this.tabbar[1], 'text', this.$t('hea.shlb'));
+			this.$set(this.tabbar[2], 'text', this.$t('hea.wd'));
+		}
+	},
 	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+		...mapState(['lang']),
+		...mapState('user', ['hasLogin', 'userInfo', 'baseURL', 'urlFile'])
 	},
 	onShow() {
+		uni.setNavigationBarTitle({
+			title: this.$t('foo.wd')
+		});
 		//判断是否已经登录
 		if (this.hasLogin) {
 			this.loadBaseData();
 		} else {
-			let obj = this
+			let obj = this;
 			uni.showModal({
 				title: obj.$t('hea.login'),
 				content: obj.$t('hea.logininfo'),
@@ -106,9 +150,15 @@ export default {
 			getUserInfo({})
 				.then(({ data }) => {
 					console.log(data, 'UserInfo+++++++++++++++++');
-					if (data.activity[1].my_join.status == '2') {
-						this.isVip = 2
+					if (data.activity[1].my_join) {
+						if (data.activity[1].my_join.status == '2') {
+							console.log(111)
+							this.isVip = 2;
+						}else {
+							this.isVip = 1;
+						}
 					}
+
 					this.setUserInfo(data);
 				})
 				.catch(e => {
@@ -116,6 +166,7 @@ export default {
 				});
 		},
 		navTo(url) {
+			console.log(url);
 			if (!this.hasLogin) {
 				// 保存地址
 				saveUrl();
@@ -135,10 +186,21 @@ export default {
 		cancel() {
 			this.$refs.popup.close();
 		},
-		tocall() {
+		tocall(type) {
 			// #ifdef APP-PLUS
+			console.log(type)
+			let text ='';
+			if(type == '1'){
+				text = this.text
+			}
+			if(type == '2'){
+				text = this.text1
+			}
+			if(type == '3'){
+				text = this.text2
+			}
 			uni.setClipboardData({
-				data: this.text,
+				data: text,
 				success: e => {
 					uni.showToast({
 						title: '复制成功！'
@@ -246,9 +308,8 @@ page,
 		}
 		.tt-icon5 {
 			width: 44rpx;
-			height: 40rpx;
+			height: 44rpx;
 		}
-
 		.tt-txt {
 			font-size: 28rpx;
 			font-family: PingFang SC;
@@ -271,7 +332,7 @@ page,
 }
 .popup-box {
 	width: 522rpx;
-	height: 605rpx;
+	padding-bottom: 40rpx;
 	background-color: #ffffff;
 	border-radius: 20rpx;
 	position: relative;
@@ -328,6 +389,7 @@ page,
 
 			// justify-content: space-around;
 			.cancel {
+				margin-left: 32rpx;
 				display: flex;
 				align-items: center;
 				justify-content: center;

store/index.js

@@ -7,7 +7,7 @@ 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: {}, //登录信息
 		loginInterceptor:false,//是否打开强制登录

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/b531a170-20e7-11ec-a51b-d719b58fe202
+https://ide.dcloud.net.cn/build/download/4aaf7ec0-2670-11ec-bb6f-8d8ebfca6692