From f3acd0e41b644a493414d7f1c417ef325898382d Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Wed, 26 Oct 2022 18:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                     |  2 +-
 src/common/http.interceptor.js      | 12 ++++++------
 src/pages/otherPage/jjrent.vue      | 23 ++++++++++++++++-------
 src/pages/otherPage/jjrentVisit.vue | 15 +++++++--------
 src/pages/otherPage/rent.vue        |  4 ++--
 src/pages/tabs/index.vue            |  8 +++++---
 src/pages/tabs/login.vue            |  6 +++---
 7 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/.env.production b/.env.production
index 6f6e14c..92b14ed 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,3 @@
 VUE_APP_MODE=production
-VUE_APP_SERVER=https://xingao.quhouse.com
+VUE_APP_SERVER=https://erpx.2weisou.com/sjjy
 url1=https://chh.quhouse.com
diff --git a/src/common/http.interceptor.js b/src/common/http.interceptor.js
index 8be1547..931767b 100644
--- a/src/common/http.interceptor.js
+++ b/src/common/http.interceptor.js
@@ -39,12 +39,12 @@ const install = (Vue, vm) => {
     Vue.prototype.$u.http.interceptor.response = (res) => {
         if (res.data.ErrNo == '0000') {
             return res.data;
-        } else if (res.data.ErrNo == '0005') {
-            // uni.showToast({
-            //     title: res.data.ErrMsg || '未登录',
-            //     icon: "none",
-            //     duration: 3000
-            // })
+        } else if (res.data.ErrNo == '0005'|| res.data.ErrNo == '0002') {
+            uni.showToast({
+                title: res.data.ErrMsg || '未登录',
+                icon: "none",
+                duration: 3000
+            })
             uni.navigateTo({
                 url: '/pages/tabs/login'
             });
diff --git a/src/pages/otherPage/jjrent.vue b/src/pages/otherPage/jjrent.vue
index 47d34ce..dd6eb7c 100644
--- a/src/pages/otherPage/jjrent.vue
+++ b/src/pages/otherPage/jjrent.vue
@@ -8,7 +8,7 @@
 		
 		<view class="list-box">
 			<view class="list-item" v-for="(item,index) in listData" :key="index">
-				<image  @click="topage(item)" class="house-img" :src="item.pictrues[0].pictureUrl||'/static/kehu/pic1.png'" mode="" />
+				<image  @click="topage(item)" class="house-img" :src="item.pic" mode="" />
 				<view class="item-info">
 					<view class="house-name u-line-1">{{item.address}}</view>
 					<view class="type">
@@ -24,7 +24,7 @@
 				</view>
 			</view>
 		</view>
-    <u-modal v-model="showModal" :show-cancel-button="true" confirm-color="#FF6D25" @confirm="confirmFun" title="确认操作" content="您确认置顶？"></u-modal>
+    <u-modal v-model="showModal" :show-cancel-button="true" confirm-color="#FF6D25" @confirm="confirmFun" title="确认操作" :content="'您确认'+(isTop==0?'置顶吗?':'取消置顶吗?')"></u-modal>
 	</view>
 </template>
 <script>
@@ -46,11 +46,14 @@
 				pageNo: 1,
 				pageSize: 10,
 				loadDone: false,
+				isTop: 0
 			};
 		},
 		onLoad(options) {
 		},
 		onShow() {
+			this.loadDone = false;
+			this.pageNo = 1
 			this.getList()
 		},
 		created(){
@@ -60,10 +63,11 @@
 		},
 		methods: {
 			topfunction(item){
+				this.currentId = item.mediacyId
+				this.isTop = item.isTop
        this.showModal = true
-       this.currentId = item.mediacyId
-       this.isTop = item.isTop
-      },
+			 console.log(item.isTop)
+			},
 			// 置顶接口
       confirmFun(){
 				if(this.isTop ==1){
@@ -124,8 +128,14 @@
 					ownerMobile:this.keyword,
 				}
 				this.$u.api.intermediary({body:params}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					if(res.result&&res.result.length){
+						res.result.forEach(item=>{
+							if(item.pictrues&&item.pictrues.length){
+								let obj = item.pictrues[item.pictrues.length-1]
+								item.pic = obj.pictureUrl
+							}
+						})
 						if(this.pageNo==1){
 							this.listData = res.result
 						}else{
@@ -212,7 +222,6 @@
             line-height: 44rpx;
             background: #FFFFFF;
             border-radius: 8rpx;
-            // padding: 0 18rpx;
             font-size: 26rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
diff --git a/src/pages/otherPage/jjrentVisit.vue b/src/pages/otherPage/jjrentVisit.vue
index bb13ecf..cbd4c92 100644
--- a/src/pages/otherPage/jjrentVisit.vue
+++ b/src/pages/otherPage/jjrentVisit.vue
@@ -48,18 +48,17 @@
 		methods: {
 			upload(lists, name){
 				console.log(lists)
-				console.log(name)
 			},
 			submit() {
 				let	files = this.$refs.uUpload.lists;
-				
 				this.fileList = files.length&&files.map(item=>{
-				return {
-					url: item.url,
-					webUrl: item.url
-				}
-			})
-				console.log(this.fileList)
+					return {
+						url: item.response.result.FilePath,
+						webUrl: item.response.result.FilePath,
+					}
+				})
+				console.log(files)
+				console.log(this.fileList )
 				if(this.form.address==''){
 					uni.showToast({
 						title: '请输入地址',
diff --git a/src/pages/otherPage/rent.vue b/src/pages/otherPage/rent.vue
index a47cfae..0c19f96 100644
--- a/src/pages/otherPage/rent.vue
+++ b/src/pages/otherPage/rent.vue
@@ -119,7 +119,7 @@
 		created(){
 			this.getList()
 			this.getbaseData()
-			this.getRoomType()
+			// this.getRoomType()
 		},
 		onReachBottom() {
 			this.getList();
@@ -130,7 +130,7 @@
 				this.$u.api.region({body:{}}).then((res)=>{
 					// console.log(res)
 					this.addressList = this.addressList.concat(res.result.area)
-					// this.buildTypeList = this.buildTypeList.concat(res.result.buildType)
+					this.buildTypeList = this.buildTypeList.concat(res.result.buildType)
 					this.priceList = this.priceList.concat(res.result.rentMoney)
 					this.houseTypeList = this.houseTypeList.concat(res.result.houseType)
 					this.addressListRight = this.addressList[0].children
diff --git a/src/pages/tabs/index.vue b/src/pages/tabs/index.vue
index 167d73d..2a073e1 100644
--- a/src/pages/tabs/index.vue
+++ b/src/pages/tabs/index.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top-tabs">
 			<view class="tab" @click="topage('otherPage/rent')">
-				<image class="img" src="/static/index/czzq.png" mode="" />
+				<image  class="img" src="/static/index/czzq.png" mode="" />
 				出租专区
 			</view>
 			<view class="tab" @click="topage('otherPage/jjrent')">
@@ -112,7 +112,9 @@
 			
 		},
 		onShow() {
-		this.getGonggao()
+			this.current = 0
+			this.current1 = 0
+			this.getGonggao()
 			this.getRanking('agentRanking') // 经纪人排名
 			this.getcompanyReport(0)
 		},
@@ -135,7 +137,7 @@
 			getcompanyReport(type){
 				// 今日：0，本周：1，本月：2
 				this.$u.api.companyReport({body:{type: type}}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					this.tongjiList[0].num = res.result.deal||0
 					this.tongjiList[1].num = res.result.agent||0
 					this.tongjiList[2].num = res.result.see||0
diff --git a/src/pages/tabs/login.vue b/src/pages/tabs/login.vue
index 74988b6..98709f0 100644
--- a/src/pages/tabs/login.vue
+++ b/src/pages/tabs/login.vue
@@ -50,9 +50,9 @@
 export default {
   data() {
     return {
-      account: "zhangzj", //
-      code: "112233",
-      password: "123456",
+      account: "", //
+      code: "",
+      password: "",
       text: "获取验证码",
       timer: null,
       isfinished: true,