Merge branch 'feature_业主工会' of http://192.168.4.246:3000/elab-damai-h5/h5-elab-open-ownerUnion into feature_业主工会

components/subComponents/dmWithDrawal.vue

@@ -104,7 +104,8 @@
 				if (res && res.data.success) {
 					uni.showToast({
 						icon:"none",
-						title:"提现成功"
+						title:"申请成功，请稍后至提现记录查看结果",
+						duration:3000
 					});
 					this.$emit("updata")
 					this.knowAction()

pages/homePage/homePage.vue

@@ -5,7 +5,7 @@
 			<view class="liveContent">
 				<view class="backDiv"></view>
 				<view class="title">分享好房 · 躺平赚钱</view>
-				<view class="subTitle" @click="setEnv">新手赚钱帮助 ></view>
+				<view class="subTitle"></view>
 				<view class="levelDiv"
 					style="background: url('https://dm.static.elab-plus.com/yezhu/h5/icon_line_back.png') center/100% 100% no-repeat;">
 					<view class="" v-if="userInfo.userId">
@@ -125,41 +125,13 @@
 				<view class="content_tuiguang_city">
 					<view class="city_num" :style="{color:titleColor}"><countTo :startVal='0' :endVal='Number(userInfo.taskCount)' :duration='3000'></countTo>个</view>
 					<text class="city_num_desc" :style="{color:contentColor}">推广任务</text>
-					<view class="city_list" @click="showOptions(1)">
-						<text class="city_name" :style="{color:titleColor}">{{city}}</text>
-						<image class="city_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
-							mode=""></image>
-					</view>
-			
 				</view>
 				<view class="content_tuiguang_money"> 
-					<view class="money_num" :style="{color:color2}"> ￥<countTo :startVal='0' :decimals='2' :endVal='Number(userInfo.surplusTaskAmount)' :duration='1000'></countTo></view>
+					<view class="money_num" :style="{color:color2}"> ￥<countTo :startVal='0' :decimals='2' :endVal='Math.floor(Number(userInfo.surplusTaskAmount)*100)/100' :duration='1000'></countTo></view>
 					<text class="money_num_des" :style="{color:contentColor}">剩余任务金额</text>
-					<view class="money_list" @click="showOptions(2)">
-						<text class="money_name" :style="{color:titleColor}">{{typeName}}</text>
-						<image class="money_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
-							mode=""></image>
-					</view>
-					<image class="money_bg" src="https://dm.static.elab-plus.com/yezhu/icon_money_bg.png" mode="">
-					</image>
-				</view>
-			</view>
-			<view class="content_tuiguang" style="height: auto;" v-else>
-				<view class="content_tuiguang_city">
-					<view class="city_list" style="margin-top: 30rpx;margin-bottom: 30rpx;" @click="showOptions(1)">
-						<text class="city_name">{{city}}</text>
-						<image class="city_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
-							mode=""></image>
-					</view>
-				</view>
-				<view class="content_tuiguang_money" >
-					<view class="money_list" style="margin-top: 30rpx;margin-bottom: 30rpx;" @click="showOptions(2)">
-						<text class="money_name" >{{typeName}}</text>
-						<image class="money_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
-							mode=""></image>
-					</view>
 				</view>
 			</view>
+			
 			<view class="content_list">
 				<view class="content_title" :style="{color:titleColor}">
 					<view class="content_title_poi">
@@ -179,6 +151,23 @@
 						邀请好友
 					</view>
 				</view>
+				
+				<view class="content_tuiguang_new" style="height: auto;">
+					<view class="content_tuiguang_city">
+						<view class="city_list" style="margin-top: 30rpx;margin-bottom: 30rpx;" @click="showOptions(1)">
+							<text class="city_name">{{city}}</text>
+							<image class="city_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
+								mode=""></image>
+						</view>
+					</view>
+					<view class="content_tuiguang_money" >
+						<view class="money_list" style="margin-top: 30rpx;margin-bottom: 30rpx;" @click="showOptions(2)">
+							<text class="money_name" >{{typeName}}</text>
+							<image class="money_more" src="https://dm.static.elab-plus.com/yezhu/icon_ios_back%402x.png"
+								mode=""></image>
+						</view>
+					</view>
+				</view>
 
 				<view class="list_item" v-for="(item,index) in  houseList" :key='index'>
 					<view class="list_item" @click="goDetailAction(item,1)">
@@ -191,14 +180,14 @@
 							<text class="house_hk" v-else></text>
 							<view class="house_address">
 								<image src="https://dm.static.elab-plus.com/yezhu/icon_location.png" mode=""></image>
-								<text style="width: 100%;" :style="{color:contentColor}">{{item.city}} · {{item.minPrice}}-{{item.maxPrice}}元/m²  {{item.bizFormat?'· '+item.bizFormat:''}}</text>
+								<text style="width: 100%;" :style="{color:contentColor}">{{item.city}} {{item.minPrice?"· "+item.minPrice:""}}{{item.maxPrice?'-'+item.maxPrice:""}}{{(item.maxPrice||item.minPrice)?'元/m²':''}} {{item.bizFormat?'· '+item.bizFormat:''}}</text>
 							</view>
 							<view class="house_num">
-								<image src="https://dm.static.elab-plus.com/yezhu/icon_family.png" mode=""></image>
+								<image src="https://dm.static.elab-plus.com/yezhu/icon_home_house.png" mode=""></image>
 								<text style="width: 100%;" :style="{color:contentColor}">{{item.projectLayout}}</text>
 							</view>
-							<text class="house_desc" :style="{color:contentColor}">{{item.taskEndTime}}</text>
-						</view>
+							<text class="house_desc" :style="{color:contentColor}">{{item.taskEndTime | formattime }}</text>
+						</view> 
 					</view>
 					
 					<view class="item_share" :style="{background:color1}" @click="toShareCard(item.projectId,2)">
@@ -233,8 +222,20 @@
 	import dmHomeChoose from "@/components/subComponents/dmHomeChoose.vue"
 	import showGuide from '@/components/subComponents/showGuide.vue'
 	import countTo from 'vue-count-to';
+	import {displayDateFormatChi} from '@/static/format.js'
 	let app = getApp();
 	export default {
+		filters:{
+			formattime(val){
+				if(val){
+					val = val.replace(/-/g,'/');
+					let time = new Date(val).getTime();
+					return displayDateFormatChi(time) +'前推广赚佣金'
+				}else{
+					return "";
+				}
+			}
+		},
 		data() {
 			return {
 				color4: '#F5F5F7',
@@ -606,6 +607,7 @@
 				text-align: left;
 				color: #ffffff;
 				margin-top: 20rpx;
+				height: 40rpx;
 				z-index: 2;
 			}
 
@@ -864,7 +866,7 @@
 			}
 
 			.content_tuiguang {
-				height: 220rpx;
+				height: 140rpx;
 				display: flex;
 				box-sizing: border-box;
 				background: #ffffff;
@@ -983,6 +985,117 @@
 				margin-left: 30rpx;
 				margin-right: 30rpx;
 				padding-bottom: 50rpx;
+				
+				.content_tuiguang_new{
+					display: flex;
+					box-sizing: border-box;
+					background: #ffffff;
+					border-radius: 16rpx;
+					margin-top: 20rpx;
+					padding-left: 40rpx;
+					padding-right: 40rpx;
+					justify-content: space-between;
+					position: relative;
+					.content_tuiguang_city {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						width: 50%;
+					
+						.city_num {
+							font-size: 40rpx;
+							font-family: DIN Alternate, DIN Alternate-Bold;
+							font-weight: 700;
+							text-align: center;
+							color: #262626;
+					
+						}
+					
+						.city_num_desc {
+							font-size: 24rpx;
+							font-family: Verdana, Verdana-Regular;
+							font-weight: 400;
+							text-align: center;
+							color: #b1b1b1;
+						}
+					
+						.city_list {
+							display: flex;
+							justify-content: center;
+							margin-top: 52rpx;
+							align-items: center;
+					
+							.city_name {
+								font-size: 26rpx;
+								font-family: Verdana, Verdana-Regular;
+								font-weight: 400;
+								text-align: left;
+								color: #262626;
+							}
+					
+							.city_more {
+								width: 26rpx;
+								height: 26rpx;
+								margin-left: 8rpx;
+							}
+						}
+					}
+					
+					.content_tuiguang_money {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						width: 50%;
+					
+						.money_num {
+							font-size: 40rpx;
+							font-family: DIN Alternate, DIN Alternate-Bold;
+							font-weight: 700;
+							text-align: center;
+							color: #fd8f3c;
+						}
+					
+						.money_num_des {
+							font-size: 24rpx;
+							font-family: Verdana, Verdana-Regular;
+							font-weight: 400;
+							text-align: center;
+							color: #b1b1b1;
+						}
+					
+						.money_list {
+							display: flex;
+							justify-content: center;
+							margin-top: 52rpx;
+							align-items: center;
+							z-index: 11;
+					
+							.money_name {
+								font-size: 26rpx;
+								font-family: Verdana, Verdana-Regular;
+								font-weight: 400;
+								text-align: left;
+								color: #262626;
+							}
+					
+							.money_more {
+								width: 26rpx;
+								height: 26rpx;
+								margin-left: 8rpx;
+							}
+						}
+					
+						.money_bg {
+							position: absolute;
+							right: 0rpx;
+							top: 0;
+							width: 220rpx;
+							height: 220rpx;
+						}
+					}
+				}
 
 				.content_title {
 					display: flex;
@@ -1147,10 +1260,9 @@
 							margin-top: 12rpx;
 
 							image {
-								width: 24rpx;
-								height: 26rpx;
+								width: 32rpx;
+								height: 30rpx;
 								margin-right: 8rpx;
-								margin-top: 6rpx;
 							}
 
 							text {

pages/ownerCertification/ownerCertification.vue

@@ -7,7 +7,7 @@
 			<view class="user_item">
 				<text class="item_name" :style="{color:titleColor}">姓名</text>
 				<view class="item_right">
-					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" v-model="name" @input="onKeyYHKNameInput" placeholder="请输入姓名" @blur='inputName' @confirm='inputName'/>
+					<input placeholder-class="item_right_name_placeholder" :style="{color:titleColor}" class="item_right_name" type="text" v-model="name" maxlength="15" @input="onKeyYHKNameInput" placeholder="请输入姓名" @blur='inputName' @confirm='inputName'/>
 					<image class="icon_right" src="../../static/icons/icon_right_yezhu.png" mode=""></image>
 				</view>
 			</view>

pages/revenueRankingPage/revenueRankingPage.vue

@@ -77,7 +77,10 @@
 		},
 		filters:{
 			nameFilter(val){
-				return val.charAt(0)+("*".repeat(val.length-1))
+				if(val){
+					return val.charAt(0)+("*".repeat(val.length-1))
+				}
+				return ""
 			}
 		},
 		components:{