优化

App.vue

@@ -68,6 +68,11 @@
 <style lang="scss">
 	/*每个页面公共css */
 	@import "@/uni_modules/uview-ui/index.scss";
+	
+	@font-face {
+		font-family: 'D-DINCondensed';
+		src: url("@/static/Bebas.TTF");
+	}
 
 	* {
 		box-sizing: border-box;

components/CusProvinceCityArea/index.vue

@@ -6,7 +6,8 @@
 				<view class="box-top-title">{{ title }}</view>
 				<view class="box-top-btn qd" @click="handleConfirm">确定</view>
 			</view>
-			<picker-view :value="pickerValue" @change="handlePickerChange" class="picker-view">
+			<picker-view :value="pickerValue" @change="handlePickerChange" class="picker-view" 
+				item-height="88rpx" :indicator-style="{'height':'88rpx'}" mask-style="background-color: transparent;">
 				<!-- 省份列 -->
 				<picker-view-column>
 					<view class="picker-item" :class="{ 'selected-item': pickerValue[0] === index }" v-for="(province, index) in provinces" :key="province.id">
@@ -197,11 +198,13 @@ export default {
 
 .picker-view {
 	width: 100%;
-	height: 380rpx;
-	margin: 40rpx 0 80rpx;
+	height: 580rpx;
+	margin: 100rpx 0;
 }
 
-.picker-item {
+.picker-item {
+	height: 88rpx;
+	line-height: 88rpx;
 	display: flex;
 	align-items: center;
 	justify-content: center;

components/CusTeamInfoFill/index.vue

@@ -4,13 +4,13 @@
 			<view class="form-item adfacjb">
 				<view class="form-item-title">团队名称</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" border="none" inputAlign="right" fontSize="28rpx" color="#002846"/>
+					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" border="none" inputAlign="right" fontSize="28rpx" color="#6B7280"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
 				<view class="form-item-title">所在公司</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" border="none" inputAlign="right" fontSize="28rpx" color="#002846"/>
+					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" border="none" inputAlign="right" fontSize="28rpx" color="#6B7280"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
@@ -59,7 +59,7 @@
 		<view class="box">
 			<view class="box-title">团队简介</view>
 			<view class="box-textarea">
-				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #536387;" :placeholderStyle="{'color':'#536387','font-size':'28rpx','line-height':'40rpx'}" 
+				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #6B7280;" :placeholderStyle="{'color':'#B3BFC8','font-size':'28rpx','line-height':'40rpx'}" 
 				v-model="teamInfo.brief" placeholder="示例：这是一个为公司ERP系统升级而组建的36人团队，成员由公司副总经理、各部门总监以及各部门核心骨干组成。团队成员工作地点分布在香港、上海、苏州、深圳和东莞等地。团队成员年龄在35-50岁之间，男女比例比较均衡，大部份成员在该公司同事超过十年。"></u-textarea>
 			</view>
 		</view>
@@ -265,7 +265,7 @@
 						line-height: 40rpx;
 						margin-right: 10rpx;
 						&.active{
-							color: #002846;
+							color: #6B7280;
 							line-height: 30rpx;
 						}
 					}

pages/home.vue

@@ -146,6 +146,7 @@
 			if(options.shareUserId) uni.setStorageSync('shareUserId',options.shareUserId)
 			if(options.shareTQId) uni.setStorageSync('shareTQId',options.shareTQId)
 			if(options.shareTQId||uni.getStorageSync('shareTQId')){
+				// if(uni.getStorageSync('userInfo')&&uni.getStorageSync('shareUserId')==JSON.parse(uni.getStorageSync('userInfo')).id) return
 				// 邀请进来的并且已经登录的
 				if(uni.getStorageSync('userInfo')){
 					this.$api.get('/wx/queShareCheck',{
@@ -154,11 +155,13 @@
 						referrerId:uni.getStorageSync('shareUserId')||'',
 						teamQuestionnaireId:uni.getStorageSync('shareTQId')||'',
 					}).then(({data:res})=>{
-						if(res.code===0&&res.data==1) this.questionnaireKindShow = true;
-						else if(res.code!==0){
+						this.$showModal(`queShareCheck接口入参channelType:${uni.getStorageSync('channelType')},
+						referrerId:${uni.getStorageSync('shareUserId')},teamQuestionnaireId:${uni.getStorageSync('shareTQId')}
+						------返回数据res:${JSON.stringify(res)}`)
+						if(res.code!==0){
 							this.teamKindMsg = res.msg||'';
 							this.teamKindShow = true;
-						}
+						}else if(res.code===0&&res.data==1) this.questionnaireKindShow = true;
 					})
 				}
 			}
@@ -193,15 +196,15 @@
 			getPerillPJ(){
 				this.$api.get('/core/teammember/que/questionnaireStats').then(res=>{
 					if(res.data.code!==0) return
-					this.perillPJ = res.data.data;
-					this.perillPJ.sum = (this.perillPJ.completed||0)+(this.perillPJ.uncompleted||0);
+					this.perillPJ = res.data.data||{};
+					this.perillPJ.sum = (this.perillPJ?.completed||0)+(this.perillPJ?.uncompleted||0);
 				})
 			},
 			getPerillBG(){
 				this.$api.get('/core/report/reportStats').then(res=>{
 					if(res.data.code!==0) return
-					this.perillBG = res.data.data;
-					this.perillBG.sum = (this.perillBG.received||0)+(this.perillBG.sent||0);
+					this.perillBG = res.data.data||{};
+					this.perillBG.sum = (this.perillBG?.received||0)+(this.perillBG?.sent||0);
 				})
 			},
 			getWjList(){

pagesPublish/industry.vue

@@ -30,7 +30,7 @@
 				</view>
 			</view> -->
 			<view class="bottom-top">
-				当前选择行业：<span>{{firstName}} - {{secondName}}</span>
+				已选：<span>{{firstName}} - {{secondName}}</span>
 			</view>
 			<view class="bottom-btns adfacjb">
 				<!-- <view class="bottom-btns-btn" @click="clear">清空条件</view> -->
@@ -204,7 +204,7 @@
 				&-item{
 					padding: 30rpx 100rpx 30rpx 30rpx;
 					font-family: PingFang-SC, PingFang-SC;
-					font-weight: bold;
+					font-weight: 400;
 					font-size: 26rpx;
 					color: #002846;
 					line-height: 37rpx;

pagesPublish/rechargeCenter.vue

@@ -26,7 +26,7 @@
 								v-for="(item,index) in priceList" :key="index" @click="changePrice(item,index)">
 								<view class="box-price-pre-once" v-if="index===0">限时优惠</view>
 								<view class="box-price-pre-times">{{item.frequency<11?(item.frequency+'次'):'超过10次'}}</view>
-								<view class="box-price-pre-money"><span>￥</span>{{item.price}}<span v-if="item.frequency>10">/次</span></view>
+								<view class="box-price-pre-money"><span>￥</span>{{item.price}}<span v-if="item.frequency>10"></span><span style="font-size: 36rpx;">/次</span></view>
 								<view class="box-price-pre-bottom">
 									{{item.frequency==1?'首次登录赠送1次':(item.frequency>10?('超过10次，￥'+item.price+'/次'):('￥'+(item.price/item.frequency)+'/次'))}}
 								</view>
@@ -341,7 +341,7 @@
 					&-money{
 						font-family: D-DINCondensed, D-DINCondensed;
 						font-weight: bold;
-						font-size: 80rpx;
+						font-size: 53rpx;
 						color: #002846;
 						line-height: 87rpx;
 						margin-top: 20rpx;
@@ -416,6 +416,7 @@
 				border-radius: 24rpx;
 				&-left{
 					padding-left: 30rpx;
+					align-items: baseline;
 					&-text{
 						font-family: PingFangSC, PingFang SC;
 						font-weight: 400;
@@ -426,10 +427,11 @@
 					&-money{
 						font-family: D-DINCondensed, D-DINCondensed;
 						font-weight: bold;
-						font-size: 48rpx;
+						font-size: 36rpx;
 						color: #FCEED2;
 						line-height: 52rpx;
 						margin-left: 9rpx;
+						align-items: baseline;
 						span{
 							font-family: D-DINCondensed, D-DINCondensed;
 							font-weight: bold;