更新

pageMy/my/userBase.vue

@@ -6,7 +6,7 @@
 					姓名
 				</view>
 				<view class="user_Right">
-					{{auth.authInfo.realName}}
+					{{ auth.authInfo.realName }}
 				</view>
 			</view>
 			<view class="userBaseList">
@@ -14,7 +14,7 @@
 					性别
 				</view>
 				<view class="user_Right">
-					{{auth.authInfo.sex===1?'男':'女'}}
+					{{ auth.authInfo.sex === 1 ? '男' : '女' }}
 				</view>
 			</view>
 			<view class="userBaseList">
@@ -22,7 +22,7 @@
 					出生年月
 				</view>
 				<view class="user_Right">
-					{{birthday}}
+					{{ birthday }}
 				</view>
 			</view>
 			<view class="userBaseList">
@@ -30,7 +30,7 @@
 					手机号
 				</view>
 				<view class="user_Right">
-					{{auth.authInfo.telphone}}
+					{{ auth.authInfo.telphone }}
 				</view>
 			</view>
 			<view class="userBaseList">
@@ -53,17 +53,17 @@
 </template>
 
 <script>
-	import {
+import {
 	userInfo
-	} from '@/api/resume.js';
+} from '@/api/resume.js';
-	import {
+import {
 	dateFormat
-	} from "../../untils/format.js";
+} from "../../untils/format.js";
-	import {
+import {
 	mapGetters
-	} from 'vuex'
+} from 'vuex'
 
-	export default {
+export default {
 	data() {
 		return {
 			userInfo: {}
@@ -72,69 +72,73 @@
 	computed: {
 		...mapGetters(['auth', 'authInfo']),
 		birthday() {
-				return dateFormat(new Date(this.authInfo.birthday.replace(/\-/g, "/").replace('T',' ')), "yyyy-MM");
+			if (!!this.authInfo.birthday) {
+				return dateFormat(new Date(this.authInfo.birthday.replace(/\-/g, "/").replace('T', ' ')), "yyyy-MM");
+			} else {
+				return "暂无"
+			}
 		}
 	},
-		onShow() {},
+	onShow() { },
 	methods: {
-			goSetUserBase: function() {
+		goSetUserBase: function () {
 			uni.navigateTo({
 				url: '../setUserBase/index'
 			})
 		}
 	}
-	}
+}
 </script>
 
 <style>
-	.nothingText text {
+.nothingText text {
 	color: #1B66FF;
-	}
+}
 
-	.nothingText {
+.nothingText {
 	text-align: center;
 	font-family: PingFangSC-Regular;
 	font-size: 28rpx;
 	color: #666666;
 	margin-top: 20rpx;
-	}
+}
 
-	.nothing {
+.nothing {
 	display: block;
 	margin: 0 auto;
 	width: 400rpx;
 	height: 200rpx;
 	margin-top: 50%;
-	}
+}
 
-	.user_Right {
+.user_Right {
 	font-family: PingFangSC-Regular;
 	font-size: 28rpx;
 	color: #999999;
-	}
+}
 
-	.user_left {
+.user_left {
 	font-family: PingFangSC-Regular;
 	font-size: 32rpx;
 	color: #333333;
-	}
+}
 
-	.userBaseList {
+.userBaseList {
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
 	padding: 30rpx;
 	padding-left: 0;
 	border-bottom: 1rpx solid #dddddd;
-	}
+}
 
-	.userBase {
+.userBase {
 	background-color: #fefefe;
 	padding-left: 30rpx;
 	margin-top: 30rpx;
-	}
+}
 
-	page {
+page {
 	background-color: #fff;
-	}
+}
 </style>

pageMy/setUserBase/index.vue

@@ -141,7 +141,7 @@
 				</view>
 			</view>
 		</picker>
-		<picker :range="insureList" @change="insureChange" :value="indexBao">
+		<!-- <picker :range="insureList" @change="insureChange" :value="indexBao">
 			<view class="list">
 				<view class="listLeft">
 					<view class="name">
@@ -157,7 +157,7 @@
 					<image src="@/static/img/right.svg" mode=""></image>
 				</view>
 			</view>
-		</picker>
+		</picker> -->
 		<view v-if="auth.realNameState"></view>
 		<view class="btn nocheck" v-else-if="loading">
 			<view class="bottombtn">
@@ -304,6 +304,7 @@
 			},
 			idNumberFilter,
 			identityChange(val) {
+				console.log("val",val);
 				uni.showLoading();
 				this.$store.dispatch('authLabor').then(() => {
 					this.realIndex = val.detail.value;

pages/my/my.vue

@@ -6,11 +6,12 @@
 				<image v-else src="../../static/img/head.svg" mode=""></image>
 				<view class="userRight">
 					<view class="userTel" v-if="userInfo.user_name">
-						{{phoneFilter(userInfo.user_name)}}
+						{{ auth.authInfo.realName ? stringFilterNum(auth.authInfo.realName, 1) :
+					phoneFilter(userInfo.user_name) }}
 					</view>
 					<view class="userTel" v-else> </view>
 					<view class="userContent">
-						<view style="margin-right: 40rpx;">实名认证：{{auth.realNameState?'已认证':'未认证'}}</view>
+						<view style="margin-right: 40rpx;">实名认证：{{ auth.realNameState ? '已认证' : '未认证' }}</view>
 						<!-- <view>银行卡核验：{{auth.bankCardState?'已认证':'未认证'}}</view> -->
 					</view>
 				</view>
@@ -99,14 +100,14 @@
 </template>
 
 <script>
-	import {
+import {
 	mapGetters
-	} from 'vuex'
+} from 'vuex'
-	import {
+import {
-		phoneFilter
+	phoneFilter, stringFilterNum
-	} from '@/untils/format.js'
+} from '@/untils/format.js'
-	import {labourUnionInfo} from '@/api/federation.js'
+import { labourUnionInfo } from '@/api/federation.js'
-	export default {
+export default {
 	data() {
 		return {
 			federationStatus: false
@@ -129,8 +130,8 @@
 		// this.labourUnionInfoInit()
 	},
 	methods: {
-			labourUnionInfoInit(){
+		labourUnionInfoInit() {
-				labourUnionInfo().then(e=>{
+			labourUnionInfo().then(e => {
 				this.federationStatus = e.data.data.joined
 			})
 		},
@@ -149,25 +150,26 @@
 				url
 			})
 		},
-			makePhoneCall: function() {
+		makePhoneCall: function () {
 			uni.makePhoneCall({
 				phoneNumber: "18500206848"
 			})
 		},
-			phoneFilter
+		phoneFilter,stringFilterNum
 	},
 	computed: {
 		...mapGetters(['userInfo', 'auth', 'authPass'])
 	}
-	}
+}
 </script>
 
 <style>
-	page {
+page {
 	height: 100%;
 	background: #f6f6f6;
-	}
+}
-	.federation{
+
+.federation {
 	height: 48rpx;
 	border-radius: 10rpx;
 	padding: 28rpx 30rpx;
@@ -180,8 +182,9 @@
 	align-items: center;
 	background: url(../../static/img/my/mybanner.png) no-repeat;
 	background-size: cover;
-	}
+}
-	.forMembership{
+
+.forMembership {
 	width: 140rpx;
 	height: 50rpx;
 	background: linear-gradient(112deg, #EFE0BC 0%, #D29A5A 100%, #DDBA88 100%);
@@ -192,9 +195,9 @@
 	color: #6F5931;
 	line-height: 48rpx;
 	text-align: center;
-	}
+}
 
-	.bottom {
+.bottom {
 	font-family: PingFangSC-Regular;
 	font-size: 24rpx;
 	color: #999999;
@@ -203,22 +206,22 @@
 	/* width: 100%; */
 	margin: 120rpx 0;
 	text-align: center;
-	}
+}
 
-	.btnList image:last-child {
+.btnList image:last-child {
 	width: 19rpx;
 	height: 32rpx;
 	margin-left: auto;
 	margin-right: 0;
-	}
+}
 
-	.btnList image {
+.btnList image {
 	width: 52rpx;
 	height: 52rpx;
 	margin-right: 10rpx;
-	}
+}
 
-	.btnList {
+.btnList {
 	font-family: PingFangSC-Regular;
 	font-size: 32rpx;
 	color: #333333;
@@ -226,16 +229,16 @@
 	align-items: center;
 	justify-content: flex-start;
 	padding: 30rpx 20rpx;
-	}
+}
 
-	.btn {
+.btn {
 	width: 690rpx;
 	margin: 0 auto;
 	border-radius: 15rpx;
 	background: #fefefe;
-	}
+}
 
-	.BarList {
+.BarList {
 	font-family: PingFangSC-Regular;
 	font-size: 28rpx;
 	color: #666666;
@@ -243,16 +246,16 @@
 	width: 25%;
 	text-align: center;
 	padding: 30rpx 0rpx;
-	}
+}
 
-	.BarList image {
+.BarList image {
 	width: 52rpx;
 	height: 52rpx;
 	display: block;
 	margin: 0 auto;
-	}
+}
 
-	.centerBar {
+.centerBar {
 	width: 690rpx;
 	background-color: #fefefe;
 	border-radius: 15rpx;
@@ -260,55 +263,56 @@
 	position: absolute;
 	bottom: -70rpx;
 	left: 30rpx;
-	}
+}
 
-	.userContent {
+.userContent {
 	font-family: PingFangSC-Regular;
 	font-size: 26rpx;
 	color: #FFFFFF;
 	display: flex;
-	}
+}
 
-	.userTel {
+.userTel {
 	font-family: PingFangSC-Medium;
 	font-size: 36rpx;
 	color: #FFFFFF;
-	}
+}
 
-	.userRight {
+.userRight {
 	float: left;
 	height: 50rpx;
 	line-height: 50rpx;
-	}
+}
 
-	.userTitle image {
+.userTitle image {
 	width: 100rpx;
 	height: 100rpx;
 	margin-right: 20rpx;
 	float: left;
 	border-radius: 200rpx;
 	background-color: rgba(255, 255, 255, .3);
-	}
+}
 
-	.userTitle {
+.userTitle {
 	padding: 0 30rpx;
-	}
+}
 
-	.head {
+.head {
 	background-color: #1B66FF;
 	width: 100%;
 	height: 200rpx;
 	padding-top: 200rpx;
 	position: relative;
-	}
+}
 
-	.body {
+.body {
 	background: #f6f6f6;
 	height: 100%;
 	position: relative;
 	overflow: auto;
-	}
+}
-	/* .btn-out {
+
+/* .btn-out {
 		background-color: #fefefe;
 		margin-top: 20rpx;
 		padding: 20rpx 0;

pages/project/newProject.vue

@@ -9,9 +9,10 @@
 		<view class="content">
 			<view class="typeButtonWrapper">
 				<view class="typeButtonLeft">
-
+					<view v-for="(item, index) in nonReactiveArray" :key="index"
-					<view v-for="(item, index) in nonReactiveArray" :key="index" v-show="(activeTab!=2)&&(index==1||index==0)"
+						v-show="(activeTab != 2) && (index == activeTab)"
-						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
+						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{
+				item
 			}}</view>
 				</view>
 				<!-- 筛选 -->
@@ -77,7 +78,9 @@
 						完善技能
 					</view>
 				</view> -->
-				<view v-for="(item, index) in policyContentList" :key="index" style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center" @click="goPolicyInfo(item.id)">
+				<view v-for="(item, index) in policyContentList" :key="index"
+					style="width: 90%;height: 100rpx;background-color: #fff;border-radius: 10rpx;margin:20rpx 5% 20rpx 5%;display: flex;align-items: center"
+					@click="goPolicyInfo(item.id)">
 					<image :src="item.headPic" style="width: 60rpx;height: 60rpx;margin: 0 20rpx;"></image>
 					<view style="font-size: 26rpx;">{{ item.articleTitle }}</view>
 				</view>
@@ -99,7 +102,7 @@ import {
 	recommendMission,
 	nearMission
 } from '@/api/mission.js';
-import {getPolicyContent} from '@/api/newIndex.js'
+import { getPolicyContent } from '@/api/newIndex.js'
 import {
 	getcoder
 } from "@/api/map.js";
@@ -149,7 +152,7 @@ export default {
 		}
 	},
 	onLoad: function (option) {
-		if(option.tabIndex) {
+		if (option.tabIndex) {
 			this.activeTab = option.tabIndex
 		}
 		this.getData()
@@ -249,9 +252,9 @@ export default {
 				url: '../mapSeach/mapSeach'
 			})
 		},
-		getPolicy(){
+		getPolicy() {
-			getPolicyContent(1).then(res=>{
+			getPolicyContent(1).then(res => {
-				this.policyContentList=res.data.data.records
+				this.policyContentList = res.data.data.records
 			})
 		},
 		changeTab: function (e) {
@@ -270,16 +273,16 @@ export default {
 				}
 			})
 		},
-		goPolicyInfo(data){
+		goPolicyInfo(data) {
-			if(data){
+			if (data) {
 				// var val=encodeURIComponent(data)
 
 				uni.navigateTo({
-					url:`/pages/user/policyContent?id=${data}`
+					url: `/pages/user/policyContent?id=${data}`
 				})
 
 			}
-			else{
+			else {
 				// uni.showToast({
 				// 	title:'暂无内容',
 				// 	icon:'none'
@@ -396,8 +399,8 @@ export default {
 		closePopUp() {
 			this.showPopUp = false
 		},
-		subMitPopUp({submitData,areaModal,industryModal}) {
+		subMitPopUp({ submitData, areaModal, industryModal }) {
-			console.log(submitData,areaModal,industryModal,"------确定");
+			console.log(submitData, areaModal, industryModal, "------确定");
 			this.showPopUp = false
 		}
 	}

store/models/auth.js

@@ -45,7 +45,6 @@ const auth = {
 				findAuth().then((res) => {
 					const data = res.data.data;
 					const authValue = data.authValue
-
 					commit('SET_AUTH_LABOR', convert(authValue[0]))
 					commit('SET_AUTH_REALNAME', convert(authValue[1]))
 					commit('SET_AUTH_BANKCARD', convert(authValue[2]))

untils/format.js

@@ -75,6 +75,10 @@ export function dateFormat(date, format = 'yyyy-MM-dd') {
 	return '';
 }
 
+export function stringFilterNum(val,num) {
+	return val.substring(0, num) + '**' + val.substring(7)
+}
+
 export function phoneFilter(val) {
 	return val.substring(0, 3) + '****' + val.substring(7)
 }

vue.config.js

@@ -3,7 +3,7 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                target: 'http://localhost:8000', // 本地服务接口地址
+                target: 'http://10.165.0.173:8000', // 本地服务接口地址
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'