调整细节

components/subComponents/dmHomeChoose.vue

@@ -21,16 +21,17 @@
 					</view>
 					<view class="content_right">
 						<view class="content_city" v-if="tab==1">
-							<view class="city_province">
+							<scroll-view scroll-y="true" class="city_province">
 								<view class="province_item" v-for="(item1,index1) in region" :key='index1.id' @click="chooceProvince(item1)" :style="{'color':provinceId==item1.id?color1:'#999999','background':provinceId==item1.id?'#FFFFFF':'transparent'}">
 									{{item1.name}}
 								</view>
-							</view>
-							<view class="city_town">
+							</scroll-view>
+							
+							<scroll-view scroll-y="true" class="city_town">
 								<view class="city_item" v-for="(item2,index2) in cities" :key='item2.id' @click="chooseCity(item2)" :style="{'color':cityId==item2.id?color1:'#999999'}">
 									{{item2.name}}
 								</view>
-							</view>
+							</scroll-view>
 						</view>
 						<view class="content_type" v-if="tab==2">
 							<view class="content_type_item" v-for="(item,index) in  types" :key='item.value' @click="typeChooce(item)" :style='{color:currentType==item.value?color1:"#999999"}'>
@@ -90,7 +91,6 @@
 				type: String,
 				default: '20rpx'
 			},
-			option:[String,Number]
 		},
 		
 		data() {
@@ -127,7 +127,8 @@
 				province:"",
 				provinceId:"",
 				city:"",
-				cityId:""
+				cityId:"",
+				typeName:"",
 			}
 		},
 		mounted() {
@@ -139,6 +140,9 @@
 			this.cities = region[0].children[0].children;
 		},
 		methods: {
+			setOptionType(option){
+				this.tab = option;
+			},
 			show() {
 				this.visible = true
 				setTimeout(() => {
@@ -146,7 +150,7 @@
 					this.containerVisible = true
 				}, 20)
 				console.log("regin",region)
-				this.tab = this.option;
+				
 			},
 			hide() {
 				this.maskBgColor = ''
@@ -171,7 +175,8 @@
 				this.tab = tab;
 			},
 			typeChooce(item){
-				this.currentType = item.value
+				this.currentType = item.value;
+				this.typeName = item.title;
 			},
 			chooceProvince(item){
 				this.cities = item.children;
@@ -183,18 +188,17 @@
 				this.cityId = item.id;
 			},
 			reset(){
-				if(this.tab==1){
-					 this.city = "";
-					 this.cityId = "";
-					 this.province = "";
-					 this.provinceId = "";
-				}else {
-					this.currentType = "";
-				}
+				this.city = "";
+				this.cityId = "";
+				this.province = "";
+				this.provinceId = "";
+				this.currentType = "";
+				this.typeName = "";
 			},
 			confirm(){
 				let param = {
 					type:this.currentType,
+					typeName:this.typeName,
 					city:this.city,
 				}
 				this.$emit('chooiceType',param)
@@ -293,13 +297,14 @@
 				}
 				.content_right{
 					box-sizing: border-box;
-					height: 476rpx;
+				    height: 100%;
 					.content_city{
 						display: flex;
 						height: 100%;
 						box-sizing: border-box;
 						.city_province{
 							width: 280rpx;
+							min-width: 280rpx;
 							height: 100%;
 							box-sizing: border-box;
 							padding-top: 50rpx;

components/subComponents/dmLogin.vue

@@ -1,5 +1,5 @@
 <template>
-	<dmDialog ref='popView' :isShowTitle="true" title="登陆" :isShowClose="true" :isShowConfirm="false" @close='close'>
+	<dmDialog ref='popView' :isShowTitle="true" title="登录" :isShowClose="true" :isShowConfirm="false" @close='close'>
 		<view class="content">
 			<view class="user_item">
 				<text class="item_name">手机号</text>

components/subComponents/dmLoginNotice.vue

@@ -1,5 +1,5 @@
 <template>
-	<dmDialog ref='popView' :isShowTitle="true" title="登陆提醒" :isShowClose="true" :isShowConfirm="false" >
+	<dmDialog ref='popView' :isShowTitle="true" title="登录提醒" :isShowClose="true" :isShowConfirm="false" >
 		<view class="content">
 			<text class="desc">您还未进行登录，无法使用该功能\n点击登录后可以完整查看及使用</text>
 			<view class="confirm" @click="toLogin">

pages/homePage/homePage.vue

@@ -8,17 +8,31 @@
 				<view class="subTitle" @click="setEnv">新手赚钱帮助 ></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="level_top" v-if="userInfo.userId">
-						<image class="level_icon" src="https://dm.static.elab-plus.com/yezhu/h5/icon_Level.png" mode="">
-						</image>
-						<view class="level_text">{{userInfo.curlevel}}</view>
-						<view class="level_des">/达到 {{userInfo.nextIncome}} 收益可升级</view>
-						<view class="level_update">
-							<text>升级攻略</text>
-							<image class="level_right_icon"
-								src="https://dm.static.elab-plus.com/yezhu/h5/icon_right.png" mode=""></image>
+					<view class="" v-if="userInfo.userId">
+						<view class="level_top" v-if="userInfo.ownersUnion">
+							<image class="level_icon" src="https://dm.static.elab-plus.com/yezhu/h5/icon_Level.png" mode="">
+							</image>
+							<view class="level_text">{{userInfo.curlevel}}</view>
+							<view class="level_des">/达到 {{userInfo.nextIncome}} 收益可升级</view>
+							<view class="level_update">
+								<text>升级攻略</text>
+								<image class="level_right_icon"
+									src="https://dm.static.elab-plus.com/yezhu/h5/icon_right.png" mode=""></image>
+							</view>
+						</view>
+						<view class="level_top" v-else @click="toYezhu">
+							<image class="level_icon" src="https://dm.static.elab-plus.com/yezhu/h5/icon_Level.png" mode="">
+							</image>
+							<view class="level_text_login">业主认证</view>
+							<view class="level_des"></view>
+							<view class="level_update">
+								<text>立即认证</text>
+								<image class="level_right_icon"
+									src="https://dm.static.elab-plus.com/yezhu/h5/icon_right.png" mode=""></image>
+							</view>
 						</view>
 					</view>
+					
 					<view class="level_top" v-else @click="toLogin">
 						<image class="level_icon" src="https://dm.static.elab-plus.com/yezhu/h5/icon_Level.png" mode="">
 						</image>
@@ -30,10 +44,16 @@
 								src="https://dm.static.elab-plus.com/yezhu/h5/icon_right.png" mode=""></image>
 						</view>
 					</view>
-					<view class="level_bottom" v-if="userInfo.userId">
-						<levelView :currentLevel='userInfo.curIncome' :nextLevel='userInfo.nextIncome' :currentLevelTxt='userInfo.curlevel' :nextLevelTxt='userInfo.nextLevel'>
-						</levelView>
+					<view class="" v-if="userInfo.userId">
+						<view class="level_bottom" v-if="userInfo.ownersUnion">
+							<levelView :currentLevel='userInfo.curIncome' :nextLevel='userInfo.nextIncome' :currentLevelTxt='userInfo.curlevel' :nextLevelTxt='userInfo.nextLevel'>
+							</levelView>
+						</view>
+						<view class="level_bottom_login" v-else >
+							点此进行业主认证，审核后实时等级升级
+						</view>
 					</view>
+					
 					<view class="level_bottom_login" v-else >
 						点此进行登录注册，开始赚钱吧
 					</view>
@@ -55,8 +75,8 @@
 					<view class="item_guide">
 						<image class="guide_img" src="https://dm.static.elab-plus.com/yezhu/icon_yezhu.png" mode="">
 						</image>
-						<text class="guide_title" @click="clearToken">注册业主</text>
-						<text class="guide_desc">业主注册审核\n实时等级升级</text>
+						<text class="guide_title" @click="clearToken">业主认证</text>
+						<text class="guide_desc">业主认证审核\n实时等级升级</text>
 					</view>
 					<image class="icon_guide" src="https://dm.static.elab-plus.com/yezhu/icon_to_guide.png" mode="">
 					</image>
@@ -85,7 +105,7 @@
 			<view class="content_tab">
 				<view class="tab_item" @click="toYezhu">
 					<image class="icon_tab"  src="../../static/icons/icon_zcyz_user.png" mode=""></image>
-					<text class="txt_tab">注册业主</text>
+					<text class="txt_tab">业主认证</text>
 				</view>
 				<view class="tab_item" @click="toShouYiPage">
 					<image class="icon_tab" src="../../static/icons/icon_shouyi_user.png" mode=""></image>
@@ -104,8 +124,8 @@
 				<view class="content_tuiguang_city">
 					<text class="city_num">{{userInfo.taskCount||0}}个</text>
 					<text class="city_num_desc">推广任务</text>
-					<view class="city_list" @click="showOptions(2)">
-						<text class="city_name">城市</text>
+					<view class="city_list" @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>
@@ -114,8 +134,8 @@
 				<view class="content_tuiguang_money">
 					<text class="money_num">￥{{Number(userInfo.surplusTaskAmount).toFixed(2)||'0.00'}}</text>
 					<text class="money_num_des">剩余任务金额</text>
-					<view class="money_list" @click="showOptions(1)">
-						<text class="money_name" >类型</text>
+					<view class="money_list" @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>
@@ -182,7 +202,7 @@
 		<login></login>
 		<login-notice></login-notice>
 		<dmMine ref='mine' :userInfo='userInfo'></dmMine>
-		<dmHomeChoose ref='chooseType' :option='option'  @chooiceType="chooiceType"></dmHomeChoose>
+		<dmHomeChoose ref='chooseType' :option='optionType'  @chooiceType="chooiceType"></dmHomeChoose>
 	</view>
 </template>
 
@@ -221,9 +241,10 @@
 				pageNo:1,
 				pageSize:10,
 				noMore:false,
-				city:"",
+				city:"城市",
 				type:"",
-				option:"1"
+				typeName:"类型",
+				optionType:1
 			}
 		},
 		mounted() {
@@ -261,8 +282,9 @@
 				this.getHomePage();
 			},
 			chooiceType(e){
-				this.city = e.city;
+				this.city = e.city==''?"城市":e.city;
 				this.type = e.type;
+				this.typeName = e.typeName==''?'类型':e.typeName;
 				this.pageNo = 1;
 				this.getHomePage();
 			},
@@ -270,10 +292,10 @@
 				let ret = await this.$myRequest({
 					url: "/project/homePage",
 					data: {
-						"city": this.city,
+						"city": this.city=='城市'?'':this.city,
 						"pageNo": this.pageNo,
 						"pageSize": this.pageSize,
-						"taskCategoryId": this.type
+						"taskCategoryId": this.type,
 					}
 				})
 				if (ret.data.success) {
@@ -411,7 +433,8 @@
 				
 			},
 			showOptions(option){
-				this.option = option;
+				this.$refs.chooseType.setOptionType(option);
+				this.$forceUpdate();
 				this.$refs.chooseType.show()
 			}
 		},

pages/ownerCertification/ownerCertification.vue

@@ -27,7 +27,7 @@
 			<view class="user_item">
 				<text class="item_name">手机号</text>
 				<view class="item_right">
-					<input v-if="mobileOld" placeholder-class="item_right_name_placeholder" type='number' maxlength="11"  class="item_right_name_placeholder" :value="mobileOld" disabled/>
+					<input v-if="mobileOld" placeholder-class="item_right_name_placeholder" type='number' maxlength="11"  class="item_right_name" style="color: #b1b1b1;" :value="mobileOld" disabled/>
 					<input v-else placeholder-class="item_right_name_placeholder" type='number' maxlength="11" style="width: calc(100% - 150rpx);" class="item_right_name" :value="mobile" placeholder="请输入" @blur='inputMobile' @confirm='inputMobile'/>
 					<view class="veritify" @click="getVeritify" v-if="!mobileOld">
 						{{veritifyTxt}}