调试页面

src/common/http.interceptor.js

@@ -19,7 +19,7 @@ const install = (Vue, vm) => {
     // 请求拦截
     Vue.prototype.$u.http.interceptor.request = (config) => {
             if (vm.vuex_token) {
-                config.data.header= {
+                config.data.header = {
                     user: {
                         token: vm.vuex_token,
                     }
@@ -40,11 +40,11 @@ const install = (Vue, vm) => {
         if (res.data.ErrNo == '0000') {
             return res.data;
         } else if (res.data.ErrNo == '0005'||res.data.ErrNo == '0002') {
-            uni.showToast({
-                title: res.data.ErrMsg || '未登录',
-                icon: "none",
-                duration: 3000
-            })
+            // uni.showToast({
+            //     title: res.data.ErrMsg || '未登录',
+            //     icon: "none",
+            //     duration: 3000
+            // })
             uni.navigateTo({
                 url: '/pages/tabs/login'
             });

src/pages.json

@@ -112,6 +112,12 @@
                 "navigationBarTitleText": "我的待办",
                 "navigationBarTextStyle": "black"
             }
+        }, {
+            "path": "dingjin_check",
+            "style": {
+                "navigationBarTitleText": "定金审核",
+                "navigationBarTextStyle": "black"
+            }
         }, {
             "path": "apply_baojie",
             "style": {
@@ -250,6 +256,12 @@
                 "navigationBarTitleText": "居间拜访",
                 "navigationBarTextStyle": "black"
             }
+        }, {
+            "path": "historyList",
+            "style": {
+                "navigationBarTitleText": "查看历史",
+                "navigationBarTextStyle": "black"
+            }
         }, {
             "path": "companywarReport",
             "style": {

src/pages/customer/selectHousesource.vue

@@ -92,7 +92,6 @@
 		padding: 0 30rpx;
 		.list-item{
 			padding: 30rpx 0;
-			font-family: PingFangSC-Regular, PingFang SC;
 			font-size: 28rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;

src/pages/my/contact_check.vue

@@ -81,7 +81,7 @@
 					pageSize:this.pageSize,
 				}
 				this.$u.api.getContractList({body:params}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					if(res.result&&res.result.length){
 						if(this.pageNo==1){
 							this.listData = res.result

src/pages/my/dingjin_check.vue

@@ -0,0 +1,212 @@
+<template>
+	<view class="container">
+		<view class="list-box">
+			<view class="list-item" v-for="(item,index) in listData" :key="index">
+				<view class="item-info">
+					<view class="name">合同地址</view>
+					<view class="value u-line-1">{{item.contractAddress}}</view>
+					<image class="path" src="/static/path.png" mode="" />
+				</view>
+				<view class="item-info">
+					<view class="name">签约时间</view>
+					<view class="value">{{item.rentDateStart}}-{{item.rentDateEnd}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">租约期限</view>
+					<view class="value">{{item.leaseTime}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">付款方式</view>
+					<view class="value">{{item.paymentWay}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">租金/月</view>
+					<view class="value">{{item.rentPrice}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">定金</view>
+					<view class="value">{{item.money}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">卫生费</view>
+					<view class="value">{{item.wsFee}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">有线费</view>
+					<view class="value">{{item.tvFee}}</view>
+				</view>
+				<view class="item-info">
+					<view class="name">服务费</view>
+					<view class="value">{{item.fee}}</view>
+				</view>
+				<view class="btn-box">
+					<!-- 审核状态 0 未审核 1 已审核 2 拒绝 -->
+					<view class="btn pass" @click="checkFun(item,1)">通过</view>
+					<view class="btn refuse" @click="checkFun(item,0)">驳回</view>
+				</view>
+			</view>
+		</view>
+		<u-modal title="确认操作" @confirm="confirm" show-cancel-button confirm-color="#FF6D25" confirm-text="通过" :mask-close-able="true" v-model="showmodal" :title-style="titleStyle">
+			<view class="slot-content">
+				<view class="my-tip">您确认通过该审核吗？</view>
+			</view>
+		</u-modal>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				showmodal: false,
+				titleStyle: {
+					fontSize: '32rpx',
+					fontFamily: 'PingFangSC-Semibold, PingFang SC',
+					fontWeight: 600,
+					color: '#333333'
+				},
+				listData: [],
+				pageNo: 1,
+				pageSize: 10,
+				loadDone: false,
+			};
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+		
+		},
+		created() {
+			this.getList()
+		},
+		onReachBottom() {
+			this.getList();
+		},
+		methods: {
+			getList(){
+				if (this.loadDone) return;
+				let params = {
+					pageNo:this.pageNo,
+					pageSize:this.pageSize,
+				}
+				this.$u.api.getDepositList({body:params}).then((res)=>{
+					// console.log(res)
+					if(res.result&&res.result.length){
+						if(this.pageNo==1){
+							this.listData = res.result
+						}else{
+							this.listData = [...this.listData, ...res.result];
+						}
+						if(res.result.length<this.pageSize){
+							this.loadDone = true;
+							return ;
+						}
+						this.pageNo += 1;
+						this.loadDone = false
+					}else{
+						this.loadDone = true;
+						if(this.pageNo==1){
+							this.listData = []
+							
+						}
+					}
+				})
+			},
+			checkFun(item,num){
+				this.showmodal = true;
+				this.contractId = item.contractId
+				this.status = num
+			},
+			confirm(){
+				this.$u.api.depositExamine({body:{contractId:this.contractId,status: this.status}}).then((res)=>{
+					if(res.ErrNo=='0000'){
+						this.showmodal = false;
+						this.$refs.uToast.show({
+							title: '审核成功',
+							icon: false,
+							type:'success'
+						})
+					}
+					this.getList()
+				})
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+.container{
+	width: 750rpx;
+	min-height: 100vh;
+	background: #F8F8F8;
+	padding-top: 20rpx;
+	.list-box{
+		.list-item{
+			padding: 30rpx;
+			background: #fff;
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #333333;
+			margin-bottom: 20rpx;
+			.item-info{
+				display: flex;
+				align-items: center;
+				margin-bottom: 24rpx;
+				font-size: 28rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				line-height: 40rpx;
+				.name{
+					flex: 0 0 112rpx;
+					color: #666666;
+					margin-right: 58rpx;
+				}
+				.value{
+					flex: 1;
+					color: #333;
+				}
+				.path{
+					flex: 0 0 14rpx;
+					width: 14rpx;
+					height: 30rpx;
+					margin-left: 10rpx;
+				}
+			
+			}
+			.btn-box{
+				display: flex;
+				justify-content: flex-end;
+				.btn{
+					width: 128rpx;
+					height: 54rpx;
+					line-height: 54rpx;
+					text-align: center;
+					font-size: 26rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					border-radius: 8rpx;
+				}
+				.pass{
+					background: #FF6D25;
+					color: #fff;
+					border: 1px solid #FF6D25;
+					margin-right: 30rpx;
+				}
+				.refuse{
+					background: #FFFFFF;
+					border: 1px solid #FF6D25;
+					color: #FF6D25;
+				}
+			}
+			
+		}
+	}
+	.my-tip{
+		text-align: center;
+		margin: 40rpx 0;
+		color: #666
+	}
+}
+</style>

src/pages/my/goonContract.vue

@@ -12,18 +12,18 @@
 				<view v-if="endDate">{{endDate}}</view>
 				<view v-else class="desc">结束日期</view>
 			</view>
-			<u-calendar v-model="calendarShow"  :min-date="mindate" :max-date="maxdate" mode="date" @change="changeDate"></u-calendar>
+			<u-calendar v-model="calendarShow" :min-date="mindate" :max-date="maxdate" mode="date" @change="changeDate"></u-calendar>
 		</view>
 		<view class="list-item" v-for="(item,index) in listData" :key="index">
 			<view class="top">
-				嘉名媛一区 16号楼 24层(刘506D
+				{{item.address||''}}({{item.account_num}})
 				<view class="goon">续期</view>
 			</view>
-			<view class="time">合同时间：2022.05.20 - 20</view>
+			<view class="time">合同时间：{{item.rent_date_end}} - {{item.rent_date_end}}</view>
 			<view class="bot">
-				<view>租客：赵彩云</view>
-				<view>租金6001</view>
-				<view class="tel"><image class="tel-icon" src="/static/my/tel.png" mode="" /> 18322783146</view>
+				<view>租客：{{item.customer_name}}</view>
+				<view>租金{{item.rent_price}}</view>
+				<view class="tel"><image class="tel-icon" src="/static/my/tel.png" mode="" />{{item.customer_tel}}</view>
 				</view>
 		</view>
 	</view>
@@ -39,13 +39,22 @@
 				maxdate: '2099-12-31',
 				type: 0,// 默认是开始时间
 				calendarShow: false,
-				listData: [{},{},{},{}]
+				listData: [],
+				pageNo: 1,
+				pageSize: 10,
+				loadDone: false,
 			};
 		},
 		onLoad(options) {
 		},
 		onShow() {
 		
+		},
+		created() {
+			this.getList()
+		},
+		onReachBottom() {
+			this.getList();
 		},
 		methods: {
 			openCalendar(type){
@@ -63,6 +72,36 @@
 			search(){
 
 			},
+			getList(){
+				if (this.loadDone) return;
+				let params = {
+					pageNo:this.pageNo,
+					pageSize:this.pageSize,
+				}
+				this.$u.api.contractList({body:params}).then((res)=>{
+					console.log(res)
+					if(res.result&&res.result.length){
+						if(this.pageNo==1){
+							this.listData = res.result
+						}else{
+							this.listData = [...this.listData, ...res.result];
+						}
+						if(res.result.length<this.pageSize){
+							this.loadDone = true;
+							return ;
+						}
+						this.pageNo += 1;
+						this.loadDone = false
+					}else{
+						this.loadDone = true;
+						if(this.pageNo==1){
+							this.listData = []
+							
+						}
+					}
+				})
+			},
+			
 			changeDate(e){
 				// console.log(e)
 				if(this.type==0){

src/pages/my/house_application.vue

@@ -128,7 +128,6 @@
 		onShow() {
 		},
 		methods: {
-			
 			confirmType(e){
 				console.log(e)
 				this.form.isNew = e[0].value
@@ -193,7 +192,6 @@
 				this.$u.api.takeHouseApply({body:params}).then((res)=>{
 					console.log(res)
 				})
-				
 			}
 		},
 	};

src/pages/my/mytodo.vue

@@ -29,7 +29,7 @@
 				<image class="img" src="/static/myTodo/fitment.png" mode="" />
 				合同审核
 			</view>
-			<view class="tab">
+			<view class="tab" @click="topage('dingjin_check')">
 				<image class="img" src="/static/myTodo/djCheck.png" mode="" />
 				定金审核
 			</view>

src/pages/my/mywarReport.vue

@@ -1,36 +1,32 @@
 <template>
-	<view class="container">
-		<view class="info u-line-1" >
-			<image class="avatar" src="/static/avatar.png" mode="" />
-			章三章三章三
-		</view>
-		<view class="cont-box">
+	<view class="container" style="background: url(../../static/warreport.png) no-repeat #F8F8F8;background-size: 750rpx 334rpx;" >
+		<view class="cont-box" v-for="(item,index) in listData" :key="index">
 			<view class="my-title">
 				<image class="cup" src="/static/cup.png" mode="" />
-				我的战报</view>
+				{{item.personName||''}}</view>
 			<view class="top-tabs">
 				<view class="tab">
-					<view class="number">2</view>
+					<view class="number">{{item.deal||0}}</view>
 					新增成交/单
 				</view>
 				<view class="tab">
-					<view class="number">32</view>
+					<view class="number">{{item.customer||0}}</view>
 					新增客户/位
 				</view>
 				<view class="tab">
-					<view class="number">12</view>
+					<view class="number">{{item.see||0}}</view>
 					新增带看/位
 				</view>
 				<view class="tab">
-					<view class="number">22</view>
+					<view class="number">{{item.agent||0}}</view>
 					新增代理合同/单
 				</view>
 				<view class="tab">
-					<view class="number">42</view>
+					<view class="number">{{item.follow||0}}</view>
 					新增客户跟进/位
 				</view>
 				<view class="tab">
-					<view class="number">12</view>
+					<view class="number">{{item.visit||0}}</view>
 					新增拜访/位
 				</view>
 			</view>
@@ -40,16 +36,60 @@
 <script>
 	export default {
 		data() {
-			return {};
+			return {
+				listData: [],
+				pageNo: 1,
+				pageSize: 10,
+				loadDone: false,
+			};
 		},
 		onLoad(options) {
+			this.type=options.type
+			this.deptId=options.deptId
+			this.getList()
 		},
 		onShow() {
-		
 		},
-		methods: {
+		created(){
 			
 		},
+		onReachBottom() {
+			this.getList();
+		},
+		methods: {
+			getList(){
+				if (this.loadDone) return;
+				let params = {
+					pageNo:this.pageNo,
+					pageSize:this.pageSize,
+					type:this.type,
+					deptId:this.deptId,
+				}
+				
+				this.$u.api.personReport({body:params}).then((res)=>{
+					// console.log(res)
+					if(res.result&&res.result.length){
+						if(this.pageNo==1){
+							this.listData = res.result
+						}else{
+							this.listData = [...this.listData, ...res.result];
+						}
+						if(res.result.length<this.pageSize){
+							this.loadDone = true;
+							return ;
+						}
+						this.pageNo += 1;
+						this.loadDone = false
+					}else{
+						this.loadDone = true;
+						if(this.pageNo==1){
+							this.listData = []
+							
+						}
+					}
+				})
+			}
+		},
 
 	};
 </script>
@@ -58,33 +98,17 @@
 .container{
 	width: 100%;
 	height: 100vh;
-	background: url('https://static.quhouse.com/26c187820b534a47a60c46663d480547.png') no-repeat #F8F8F8;;
-	background-size: contain;
-	padding: 40rpx 0;
-	.info{
-		padding: 0 48rpx;
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-		line-height: 42rpx;
-		.avatar{
-			width: 100rpx;
-			height: 100rpx;
-			flex: 0 0 100rpx;
-			border-radius: 50%;
-			border: 2rpx solid #FFFFFF;
-			margin-right: 24rpx;
-		}
-	}
+	// background: url(../../static/warreport.png) no-repeat #F8F8F8;;
+	// background: url('https://static.quhouse.com/26c187820b534a47a60c46663d480547.png') no-repeat #F8F8F8;;
+	background-size: 750rpx 334rpx;
+	background-repeat: no-repeat;
+	padding-top: 150rpx;
 	.cont-box{
 		width: 690rpx;
 		height: 376rpx;
 		background: url('https://static.quhouse.com/85043277616540cea74cc69d200bf369.png')no-repeat;
 		background-size: contain;
-		margin: 40rpx 30rpx;
+		margin: 0 30rpx 20rpx;
 		padding-top: 26rpx;
 		.my-title{
 			display: flex;

src/pages/otherPage/companywarReport.vue

@@ -13,8 +13,8 @@
 						<image class="house-icon" src="/static/house.png" mode="" />
 						{{item.deptName}}
 					</view>
-					<view class="right" @click="topage('/pages/my/mywarReport')">
-						我的战报 
+					<view class="right" @click="topage(item)">
+						个人战报 
 						<image class="path" src="/static/path.png" mode="" />
 					</view>
 				</view>
@@ -102,9 +102,9 @@
 				this.loadDone = false
 				this.getList()
 			},
-			topage(page){
+			topage(item){
 				uni.navigateTo({
-					url: page
+					url:'/pages/my/mywarReport?type='+ this.current+'&deptId='+ item.deptId
 				})
 			}
 		},

src/pages/otherPage/historyList.vue

@@ -0,0 +1,105 @@
+<template>
+	<view class="container">
+		<view class="list-box">
+			<view class="list-item" v-for="(item,index) in listData" :key="index">
+				<view class="person-info">
+					<image class="icon" src="/static/kehu/person_gray.png" mode="" />
+					<view class="name u-line-1">{{item.personName}}</view>
+				</view>
+				<view class="right">
+					<view class="house">{{item.createTime}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				listData: [],
+				pageNo: 1,
+				pageSize: 10,
+				loadDone: false,
+			};
+		},
+		onLoad(options) {
+			this.mediacyId = options.mediacyId
+			this.getList()
+		},
+		onShow() {
+		},
+		created(){
+		},
+		onReachBottom() {
+			this.getList();
+		},
+		methods: {
+			getList(){
+				if (this.loadDone) return;
+				let params = {
+					pageNo:this.pageNo,
+					pageSize:this.pageSize,
+					mediacyId: this.mediacyId
+				}
+				this.$u.api.findDetailHistory({body:params}).then((res)=>{
+					console.log(res)
+					if(res.result&&res.result.length){
+						if(this.pageNo==1){
+							this.listData = res.result
+						}else{
+							this.listData = [...this.listData, ...res.result];
+						}
+						if(res.result.length<this.pageSize){
+							this.loadDone = true;
+							return ;
+						}
+						this.pageNo += 1;
+						this.loadDone = false
+					}else{
+						this.loadDone = true;
+						if(this.pageNo==1){
+							this.listData = []
+						}
+					}
+				})
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+.container{
+	width: 750rpx;
+	min-height: 100vh;
+	background: #F8F8F8;
+	.list-box{
+		padding-top: 20rpx;
+		.list-item{
+			padding: 0 112rpx 0 30rpx;
+			height: 100rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #333333;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 20rpx;
+			background: #fff;
+			.person-info{
+				display: flex;
+				align-items: center;
+				.icon{
+					width: 28rpx;
+					height: 30rpx;
+					margin-right: 12rpx;
+				}
+				.name{
+					width: 150rpx;
+				}
+			}
+		}
+	}
+}
+</style>

src/pages/otherPage/jjrent.vue

@@ -13,7 +13,7 @@
 					<view class="house-name u-line-1">{{item.address}}</view>
 					<view class="type">
             <view class="label" @click="visit(item)">拜访</view>
-            <view class="label" @click="topfunction(item.mediacyId)">置顶</view>
+            <view class="label" @click="topfunction(item)">{{item.isTop==0?'置顶':'取消置顶'}}</view>
             <view class="label" @click="historyList(item)">历史记录</view>
           </view>
 					<view class="area">{{item.belongDistrict}}-{{item.area}}㎡</view>
@@ -51,30 +51,52 @@
 		onLoad(options) {
 		},
 		onShow() {
-		
+			this.getList()
 		},
 		created(){
-			this.getList()
 		},
 		onReachBottom() {
 			this.getList();
 		},
 		methods: {
+			topfunction(item){
+       this.showModal = true
+       this.currentId = item.mediacyId
+       this.isTop = item.isTop
+      },
+			// 置顶接口
       confirmFun(){
-        this.$u.api.stickyPost({body:{mediacyId:this.currentId}}).then((res)=>{
-					console.log(res)
-          if(res.ErrNo=='0000'){
-            uni.showToast({
-              title: res.ErrMsg,
-              icon: 'none'
-            })
-            this.getList();
-          }
-        })
+				if(this.isTop ==1){
+					this.$u.api.cancelStickyPost({body:{mediacyId:this.currentId}}).then((res)=>{
+						console.log(res)
+						if(res.ErrNo=='0000'){
+							this.loadDone = false
+							this.pageNo = 1
+							this.getList();
+							uni.showToast({
+								title: res.ErrMsg,
+								icon: 'none'
+							})
+						}
+					})
+				}else{
+					this.$u.api.stickyPost({body:{mediacyId:this.currentId}}).then((res)=>{
+						// console.log(res)
+						if(res.ErrNo=='0000'){
+							this.loadDone = false
+							this.pageNo = 1
+							uni.showToast({
+								title: res.ErrMsg,
+								icon: 'none'
+							})
+							this.getList();
+						}
+					})
+				}
       },
       historyList(item){
         uni.navigateTo({
-					url: '/pages/otherPage/jjrentVisit?masterHouseId='+ item.masterHouseId+'&mediacyId='+ item.mediacyId
+					url: '/pages/otherPage/historyList?mediacyId='+ item.mediacyId
 				})
       },
       visit(item){
@@ -82,10 +104,7 @@
 					url: '/pages/otherPage/jjrentVisit?masterHouseId='+ item.masterHouseId+'&mediacyId='+ item.mediacyId+'&address='+item.address+'&personName='+item.personName
 				})
       },
-      topfunction(id){
-       this.showModal = true
-       this.currentId = id
-      },
+     
 			topage(item){
 				uni.setStorageSync('roomInfo',item)
 				uni.navigateTo({
@@ -187,12 +206,13 @@
           justify-content: space-between;
           margin-bottom: 12rpx;
           .label{
+						width: 130rpx;
             text-align: center;
             height: 44rpx;
             line-height: 44rpx;
             background: #FFFFFF;
             border-radius: 8rpx;
-            padding: 0 28rpx;
+            // padding: 0 18rpx;
             font-size: 26rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;

src/pages/otherPage/jjrentDetail.vue

@@ -50,7 +50,7 @@
 				<view class="item-text">跟进</view>
 			</view>
 			<view class="line"></view>
-			<view class="item" @click="topage('otherPage/ledList')">
+			<view class="item" @click="historyList">
 				<image class="item-icon" src="/static/czDetail/book.png" mode="" />
 				<view class="item-text">历史记录</view>
 			</view>
@@ -70,8 +70,12 @@
 			this.roomId = options.id;
 			this.roomInfo = {}
 			this.roomInfo = uni.getStorageSync('roomInfo')
-			console.log(this.roomInfo)
-			// this.roomPictureList()
+			// console.log(this.roomInfo)
+			if(this.roomInfo.pictrues&&this.roomInfo.pictrues.length){
+				this.picList = this.roomInfo.pictrues.map(item=>
+					item.pictureUrl
+				)
+			}
 		},
 		onShow() {
 		
@@ -84,6 +88,11 @@
 				})
       },
 			
+			historyList(){
+        uni.navigateTo({
+					url: '/pages/otherPage/historyList?mediacyId='+ this.roomInfo.mediacyId
+				})
+      },
 			// 关注，取消关注
 			careFun(){
 				if(this.roomInfo.isStore==1){
@@ -108,15 +117,6 @@
 					})
 				}
 			},
-		// 图片列表
-			roomPictureList(){
-				this.$u.api.roomPictureList({body:{roomId:this.roomId}}).then((res)=>{
-					// 图片类型10 .封面 11.轮播图 
-					if(res.result&&res.result.length){
-						this.picList = res.result.map(item=>item.pictureUrl)
-					}
-				})
-			},
 			topage(page){
 				uni.navigateTo({
 					url: "/pages/" + page+'?mediacyId='+this.roomInfo.mediacyId+ '&isStore='+this.roomInfo.isStore+'&masterHouseId='+this.roomInfo.masterHouseId

src/pages/otherPage/jjrentFollow.vue

@@ -82,7 +82,9 @@
 							title: res.ErrMsg,
 							icon: 'none'
 						})
-						wx.navigateBack()
+						setTimeout(function(){
+							wx.navigateBack()
+						},1000)
 					}
 				})
 			},

src/pages/otherPage/jjrentVisit.vue

@@ -13,10 +13,10 @@
 					<u-input height="102" type="text" input-align="right" v-model="form.person" placeholder="请输入操作人"></u-input>
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" style="border:0">
 				<view class="label">上传图片</view>
 			</view>
-			<u-upload ref="uUpload" :show-progress="false" max-count="6" @on-uploaded="upload" :action="action" :auto-upload="true" :file-list="fileList" ></u-upload>
+			<u-upload upload-text="添加图片" ref="uUpload" :show-progress="false" max-count="6" @on-uploaded="upload" :action="action" :auto-upload="true" :file-list="fileList" ></u-upload>
 		</view>
 		<view class="submit-btn" @click="submit">提交</view>
 	</view>
@@ -52,7 +52,8 @@
 			},
 			submit() {
 				let	files = this.$refs.uUpload.lists;
-				this.fileList = files.length&files.map(item=>{
+				
+				this.fileList = files.length&&files.map(item=>{
 				return {
 					url: item.url,
 					webUrl: item.url
@@ -85,6 +86,7 @@
 								title: res.ErrMsg,
 								icon: 'none'
 							})
+							wx.navigateBack()
 						}
         })
 			},

src/pages/otherPage/rentDetail.vue

@@ -255,15 +255,15 @@
 		padding: 30rpx;
 		.info-item{
 			display: flex;
-			align-items: center;
+			align-items: flex-start;
 			font-size: 28rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #333333;
 			margin-bottom: 24rpx;
-
+			word-break: break-all;
 			.label{
-				width: 140rpx;
+				flex: 0 0 145rpx;
 				color: #666666;
 			}
 		}

src/pages/otherPage/shouding.vue

@@ -194,9 +194,9 @@
 				}
 				this.$u.api.deposit({body:body}).then((res)=>{
 					// 图片类型10 .封面 11.轮播图 
-					if(res.result&&res.result.length){
-						this.picList = res.result.map(item=>item.pictureUrl)
-					}
+					// if(res.result&&res.result.length){
+					// 	this.picList = res.result.map(item=>item.pictureUrl)
+					// }
 				})
 				
 			},

src/pages/tabs/index.vue

@@ -109,12 +109,12 @@
 
 		},
 		created(){
-			this.getGonggao()
-			this.getRanking('agentRanking') // 经纪人排名
-			this.getcompanyReport(0)
+			
 		},
 		onShow() {
-		
+		this.getGonggao()
+			this.getRanking('agentRanking') // 经纪人排名
+			this.getcompanyReport(0)
 		},
 		methods: {
 			// 经纪人排名与组排名

src/pages/tabs/me.vue

@@ -3,7 +3,7 @@
 		<u-navbar :is-back="false" :border-bottom="false" title="我的" background="none"></u-navbar>
 		<view class="info">
 			<image class="avatar" src="/static/avatar.png" mode="" />
-			<view class="name u-line-1">章三章三章三章三章三</view>
+			<view class="name u-line-1">{{userinfo.userName}}</view>
 		</view>
 		<view class="menu">
 			<view class="menu-item">
@@ -66,7 +66,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="logout">退出登录</view>
+		<view class="logout" @click="logout">退出登录</view>
 		<view class="agreement">
 			<view>隐私政策</view>
 			<view>服务协议</view>
@@ -76,12 +76,18 @@
 <script>
 	export default {
 		data() {
-			return {};
+			return {
+				userinfo: {}
+			};
 		},
 		onLoad(options) {
+			if(this.vuex_user.userName){
+				this.userinfo = this.vuex_user
+			}else{
+				this.userinfo = wx.getStorageSync('user')
+			}
 		},
 		onShow() {
-		
 		},
 		methods: {
 			topage(type){
@@ -89,6 +95,14 @@
 					url: '/pages/' + type
 				})
 			},
+			logout(){
+				wx.clearStorageSync()
+				this.$u.vuex("vuex_user",{});
+				this.$u.vuex("vuex_token",'');
+				wx.navigateTo({
+					url: '/pages/tabs/login'
+				})
+			}
 		},
 		onHide: function() {},
 	};