静态页面完善

src/pages.json

@@ -148,6 +148,12 @@
                 "navigationBarTitleText": "合同审核",
                 "navigationBarTextStyle": "black"
             }
+        }, {
+            "path": "house_application",
+            "style": {
+                "navigationBarTitleText": "代房申请",
+                "navigationBarTextStyle": "black"
+            }
         }, {
             "path": "electContract",
             "style": {

src/pages/my/house_application.vue

@@ -0,0 +1,203 @@
+<template>
+	<view class="container">
+		<view class="form-box">
+			<view class="item">
+				<view class="label">类型</view>
+				<view class="input">
+					<u-input height="102" @click="typeShow = true" type="text" disabled input-align="right" v-model="form.isNewName" placeholder="请选择带看类型"></u-input>
+					<image class="path" src="/static/path.png" mode="" @click="typeShow = true"/>
+					<u-select confirm-color="#FF6D25" v-model="typeShow" :list="typeList" @confirm="confirmType"></u-select>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">地址</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.address" placeholder="请输入地址"></u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">原始户型新增</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.houseType" placeholder="请输入原始户型新增"></u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">房本面积</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.houseArea" placeholder="请输入房本面积"></u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">预计代理价格(年)</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.agentPrice" placeholder="请输入预计代理价格"></u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">免租期(年)</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.rentFree" placeholder="请输入免租期"></u-input>
+				</view>
+			</view>
+			
+			<view class="item">
+				<view class="label">付款方式</view>
+				<view class="input">
+					<u-input height="102" @click="paymentMethod = true" type="text" disabled input-align="right" v-model="form.paymentMethodName" placeholder="请选择付款方式"></u-input>
+					<image class="path" src="/static/path.png" mode="" @click="paymentMethod = true"/>
+					<u-select confirm-color="#FF6D25" v-model="paymentMethod" :list="paymentMethodlist" @confirm="confirmPaymentMethod"></u-select>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">装修配货支付总计</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.applyPerson" placeholder="请输入装修配货支付总计"></u-input>
+				</view>
+			</view>
+			<view class="item">
+				<view class="label">预计出租价格(间)</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.applyPerson" placeholder="请输入预计出租价格"></u-input>
+				</view>
+			</view>
+			<view class="item last-item">
+				<view class="label">预估利润</view>
+				<view class="input">
+					<u-input :clearable="false" type="text" input-align="right" v-model="form.estimateRentPrice" placeholder="请输入预估利润"></u-input>
+				</view>
+			</view>
+		</view>
+		<view class="submit-btn" @click="submit">提交</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				typeShow: false,
+				paymentMethod: false,
+				form: {
+					address: '',
+					houseType: '',
+					houseArea: '',
+					agentPrice: '',
+					rentFree: '',
+					addressName: '',
+					paymentMethod: '',//付款方式1年付2半年付3季付4月付
+					totalPayment: '',//装修配货支付总计
+					estimateRentPrice:'',
+					isNew: 0,//0 新签 1 续签 类型
+					isNewName:''
+				},
+				typeList: [
+					{
+						value: 0,
+						label: '新签 '
+					},
+					{
+						value: 1,
+						label: '续签'
+					},
+					{
+						value: 2,
+						label: '其他'
+					}
+				],
+				paymentMethodlist: [
+					{
+						value: '1',
+						label: '年付'
+					},
+					{
+						value: '2',
+						label: '半年付'
+					},
+					{
+						value: '3',
+						label: '季付'
+					},
+					{
+						value: '4',
+						label: '月付'
+					},
+				]
+			};
+		},
+		onLoad(options) {
+		},
+		onShow() {
+		},
+		methods: {
+			confirmType(e){
+				console.log(e)
+				this.form.isNew = e[0].value
+				this.form.isNewName = e[0].label
+			},
+			confirmPaymentMethod(e){
+				this.form.paymentMethod = e[0].value
+				this.form.paymentMethodName = e[0].label
+			},
+			submit() {
+				
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+.container {
+	width: 750rpx;
+	min-height: 100vh;
+	background: #F8F8F8;
+	padding: 20rpx 0 150rpx;
+	.form-box{
+		background: #fff;
+		padding: 0 30rpx;
+		.item{
+			height: 102rpx;
+			font-size: 30rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			line-height: 102rpx;
+			color: #333333;
+			border-bottom: 1px solid #e0e0e0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.label{
+				width:240rpx;
+				margin-right: 20rpx;
+			}
+			.input{
+				width: 340rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				.path{
+					width: 14rpx;
+					height: 30rpx;
+					margin-left: 20rpx;
+				}
+			}
+		}
+		.last-item{
+			border: 0;
+		}
+	}
+	.submit-btn{
+		width: 690rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		background: #FF6D25;
+		border-radius: 12rpx;
+		margin-left: 30rpx;
+		font-size: 32rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #FFFFFF;
+		position: fixed;
+		bottom: 60rpx;
+	}
+}
+</style>

src/pages/my/modifyPassword.vue

@@ -46,13 +46,9 @@
 		onShow() {
 		},
 		methods: {
-			
 			submit() {
-				
 			},
-			
 		},
-x
 	};
 </script>
 

src/pages/my/myapply.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="container">
 		<view class="top-tabs">
-			<view class="tab" @click="topage('apply_baojie')">
+			<view class="tab" @click="topage('house_application')">
 				<image class="img" src="/static/myapply/apply.png" mode="" />
-				待房申请
+				代房申请
 			</view>
 			<view class="tab" @click="topage('apply_baojie')">
 				<image class="img" src="/static/myapply/clear.png" mode="" />

src/pages/tabs/customer.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top-box">
 			<view class="search-box">
-				<u-search v-model="keyword"  :show-action="false" :clearabled="true" bg-color="#F8F8F8" shape="round" height="78"></u-search>
+				<u-search v-model="keyword" placeholder="请输入客户姓名/手机号" :show-action="false" :clearabled="true" bg-color="#F8F8F8" shape="round" height="78"></u-search>
 			</view>
 			<view class="addCustomer" @click="toaddCustomer">增加客户</view>
 		</view>
@@ -14,13 +14,13 @@
 			<view class="list-item" v-for="(item,index) in listData" :key="index">
 				<view class="item-top">
 					<view class="item-left">
-						<view class="person">颂女士<image class="love" src="/static/kehu/love.png" mode="" /></view> 
-						<view class="time">刘晓洁于2019-01-17录入</view>
-						<view class="diffDay">未跟进时间：1239天</view>
+						<view class="person">{{item.customerName}}<image class="love" src="/static/kehu/love.png" mode="" /></view> 
+						<view class="time">{{item.belongPerson}}于{{item.createTime}}录入</view>
+						<view class="diffDay">未跟进时间：{{item.missingDays}}天</view>
 					</view>
 					<view class="item-right">
 						<image style="margin-right: 40rpx;" src="/static/kehu/news.png" mode="" />
-						<image src="/static/kehu/call.png" mode="" />
+						<image @click="tocall(item.customerMobile)" src="/static/kehu/call.png" mode="" />
 					</view>
 				</view>
 				<view class="item-bot">
@@ -78,14 +78,32 @@
 				],
 				zujinshow: false,
 				huxingshow: false,
+				pageNo: 1,
+				pageSize: 10,
 			};
 		},
 		onLoad(options) {
 		},
 		onShow() {
 		
+		},
+		created() {
+			this.getcustomerList()
 		},
 		methods: {
+			getcustomerList(){
+				let body = {
+					pageNo:this.pageNo,
+					pageSize:this.pageSize,
+					houseType: '',//房型： 1,开间  2,一居 3,二居 4,三居 5,四居 6,其他
+					rentPriceMin: '',//最小租金
+					rentPriceMax:''
+				}
+				this.$u.api.customerFind({body:body}).then((res)=>{
+					console.log(res)
+					this.listData = res.result
+				})
+			},
 			secectZujin(item){
 				this.searchForm.zujinval = item.value
 			},

src/pages/tabs/gonggao.vue

@@ -1,16 +1,16 @@
 <template>
 	<view class="container">
-		<view class="list" v-for="(item,index) in list" :key="index">
+		<view class="list" v-for="(item,index) in gonggaoList" :key="index">
 			<view class="item-top">
-				<view class="title" :class="{'boldtitle':item.dot}">
-					<view class="dot" v-if="item.dot"></view>
-					<view class="u-line-1" style="max-width: 580rpx;">{{item.name}}</view>
+				<view class="title" :class="{'boldtitle':item.content==1}">
+					<view class="dot" v-if="item.content"></view>
+					<view class="u-line-1" style="max-width: 580rpx;">{{item.title}}</view>
 				</view>
 				<image class="arrow" src="/static/index/right-arrow.png" mode="" />
 			</view>
 			<view class="item-mid">
 				<view class="time">{{item.time}}</view>
-				<view class="from">{{item.from}}</view>
+				<view class="from">{{item.deptName}}</view>
 			</view>
 			<view class="item-bot">
 				<view class="btn"><image class="img" src="/static/answer.png" mode="" />回复列表</view>
@@ -23,22 +23,10 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					name: '办公区管理制度',
-					dot: true,
-					time: '2022-05-20 18:00:00',
-					from:'来自人力资源部'
-				},{
-					name: '关于人才招聘及新员工试用期管理实施办法',
-					dot: true,
-					time: '2022-05-20 18:00:00',
-					from:'来自人力资源部'
-				},{
-					name: '关于李秀峰等人的岗位调整与任命通知',
-					dot: false,
-					time: '2022-05-20 18:00:00',
-					from:'来自人力资源部'
-				}]
+				gonggaoList: [],
+				pageNo: 1,
+				pageSize: 10,
+				loadDone: false,
 			};
 		},
 		onLoad(options) {
@@ -46,7 +34,31 @@
 		onShow() {
 		
 		},
-		methods: {},
+		created(){
+			this.getGonggao()
+		},
+		onReachBottom() {
+			this.getGonggao();
+		},
+		methods: {
+			getGonggao(){
+				if (this.loadDone) return;
+				this.$u.api.applist({body:{pageNo:this.pageNo,pageSize:this.pageSize}}).then((res)=>{
+					console.log(res)
+					if(res.result&&res.result.length){
+						if(this.pageNo==1){
+							this.gonggaoList = res.result
+						}else{
+							this.gonggaoList = [...this.gonggaoList, ...res.result];
+						}
+						this.pageNo += 1;
+						this.loadDone = false
+					}else{
+						this.loadDone = true;
+					}
+				})
+			},
+		},
 	};
 </script>
 

src/pages/tabs/index.vue

@@ -18,14 +18,13 @@
 				我的待办
 			</view>
 		</view>
-		<open-data type="groupName" open-gid="tGspFe44Y83pmo9BfOxzXlFmR1r50"></open-data>
 		<view class="gonggao">
 			<view class="left">
 				<view class="title">公告</view>
 				<view class="dot"></view>
 			</view>
 			<view class="right">
-				<u-notice-bar type="none" padding="18rpx 0" font-size="28" color="#303030" mode="vertical" :volume-icon="false" :more-icon="false" :list="list"></u-notice-bar>
+				<u-notice-bar type="none" :speed="200"  padding="18rpx 0" font-size="28" color="#303030" mode="vertical" :volume-icon="false" :more-icon="false" :list="gonggaoList"></u-notice-bar>
 			</view>
 			<image class="more-icon" src="/static/index/right-arrow.png" mode="" />
 		</view>
@@ -63,10 +62,7 @@
 	export default {
 		data() {
 			return {
-				list: ['关于人才招聘及新员工试用期管理实施',
-					'平明送客楚山孤平明送客楚山孤',
-					'关于人才招聘及新员工试用期管理实施123',
-					'一片冰心在玉壶一片冰心在玉壶一片冰心在玉壶'],
+				gonggaoList: [],
 				tabList: [{
 					name: '今日战报'
 				}, {
@@ -100,23 +96,23 @@
 				rankList: [{},{},{}],
 				current: 0,
 				current1: 0,
-				openGid:''
 			};
 		},
 		onLoad(options) {
-			let that = this
-			wx.showShareMenu({
-				withShareTicket: true
-			})
-			app.getShareTiket(function (globalData) {
-			console.log('clickReload---globalData-->' + JSON.stringify(globalData))
-				that.openGid= globalData.openGid
-			})
+		},
+		created(){
+			this.getGonggao()
 		},
 		onShow() {
 		
 		},
 		methods: {
+			getGonggao(){
+				this.$u.api.applist({body:{pageNo:1,pageSize:20}}).then((res)=>{
+					console.log(res)
+					this.gonggaoList = res.result.map(item=>item.title)
+				})
+			},
 			change(index){
 				this.current = index
 			},