diff --git a/app.js b/app.js
index a22fa6b..6a22e89 100644
--- a/app.js
+++ b/app.js
@@ -135,7 +135,6 @@ App({
     },
     onError: function () {
         // 这里回调错误信息
-        console.log('onError')
     },
     // get: function () {
     //   return this.globalData.config;
diff --git a/app.json b/app.json
index 78e43ae..56a5626 100644
--- a/app.json
+++ b/app.json
@@ -73,7 +73,7 @@
     "requiredBackgroundModes": ["location"],
     "plugins": {
         "chooseLocation": {
-            "version": "1.0.11",
+            "version": "1.0.12",
             "provider": "wx76a9a06e5b4e693e"
         }
     }
diff --git a/img/intermediary-agent.png b/img/intermediary-agent.png
deleted file mode 100644
index f5fc25b..0000000
Binary files a/img/intermediary-agent.png and /dev/null differ
diff --git a/pages/appeal/appeal.js b/pages/appeal/appeal.js
index 2365031..26e6e7b 100644
--- a/pages/appeal/appeal.js
+++ b/pages/appeal/appeal.js
@@ -56,7 +56,6 @@ Page({
         miucms.request(`${app.globalData.baseURL}/tenement/appeal`, {
             token: this.data.token
         }).then(res => {
-            // console.log(res);
             if (res.code == 200) {
                 let data = res.data
                 this.setData({
@@ -98,7 +97,6 @@ Page({
                     let tempFiles = res.tempFiles
                     let isLt10M = true;
                     tempFiles.forEach((item, index) => {
-                        console.log("item", item, index);
                         if (index == tempFiles.length - 1 && kind == 'proof') {
                             wx.hideLoading()
                         }
@@ -123,7 +121,6 @@ Page({
                 }
             },
             fail: err => {
-                console.log(err);
                 wx.hideLoading()
             }
         })
diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js
index 4652e22..a7a0b59 100644
--- a/pages/askHousing/askHousing.js
+++ b/pages/askHousing/askHousing.js
@@ -1304,7 +1304,6 @@ Page({
             return
         }
 
-        console.log("type", this.data.newinfo['type']);
         if (this.data.fieldinfo[this.data.popUpit][this.data.step].field == "gender" && this.data.newinfo['type'] && this.data.newinfo['type'].indexOf("合租") == -1) {
             this.setData({
                 step: this.data.step + 1
@@ -1331,8 +1330,6 @@ Page({
             return
         }
 
-        console.log("field", field);
-
         this.optionScroll(this.data.fieldinfoNew[popUpdate.field].field)
         if (popUpdate.popUpIs == 'unilineInput' || popUpdate.popUpIs == 'multilineInput' || popUpdate.popUpIs == 'multilineInput1') {
             this.data.focustitle = popUpdate.field
@@ -1368,7 +1365,6 @@ Page({
             field,
             popupit
         } = e.currentTarget.dataset
-        console.log("field", field);
         if (field == 'introduction') value = value.substr(0, 500)
         else if (field == 'address') value = value.substr(0, 100)
         else if (field == 'subject') value = value.substr(0, 80)
@@ -1490,8 +1486,6 @@ Page({
                 // 出租方式
                 if (element.field == "type") {
                     let fieldinfoNew = this.data.fieldinfoNew
-                    console.log("fieldinfoNew", fieldinfoNew, "field", element.field);
-                    console.log("fieldinfoNew[element.field]", fieldinfoNew[element.field]);
                     fieldinfoNew[element.field].choices.forEach(el => {
                         if (el.choices) {
                             el.choices.forEach(e => {
@@ -1505,8 +1499,6 @@ Page({
 
                     if (newinfo.type && newinfo.type >>> 0 == 2) newinfo["gender"] = null
 
-
-                    console.log("newinfo.type", newinfo.type);
                 }
 
                 // 出租时长
@@ -1782,7 +1774,6 @@ Page({
         let value = e.detail.value
         let popUpdate = this.data.popUpdate
 
-        console.log(value, "value");
         this.setData({
             [`newinfo.${popUpdate.field}`]: value,
             [`popUpdate.value`]: value
diff --git a/pages/edit/edit.js b/pages/edit/edit.js
index 4245a70..9e821d2 100644
--- a/pages/edit/edit.js
+++ b/pages/edit/edit.js
@@ -2131,7 +2131,6 @@ Page({
     // 上传二维码
     UploadQRCodeSend(imgUrl) {
         let that = this
-        console.log("imgUrl", imgUrl);
         const uploadTask = wx.uploadFile({
             url: `${app.globalData.baseURL}/tenement/v2/api/publish/uploadweixinqrcode`,
             filePath: imgUrl,
diff --git a/pages/index/index.js b/pages/index/index.js
index 1106504..fe07180 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -121,7 +121,6 @@ Page({
         if (el['select']) listType = el['type']
       })
       data.apartment = data.apartment.slice(0, 5)
-      // console.log("data", data.apartment);
 
       this.setData({
         ...data,
@@ -160,7 +159,6 @@ Page({
       // data.data.banner[0]
       data.data.banner[0]['finderUserName'] = "sphnKNr2yUjovYn"
       data.data.banner[0]['feedId'] = "export/UzFfAgtgekIEAQAAAAAA2WM6nDqilAAAAAstQy6ubaLX4KHWvLEZgBPEnIFMGRgfQe-HzNPgMJovs0j3nb0lBUSqGdvZ_3I-"
-      console.log(data.data.banner[0]);
 
       that.setData({
           HKapartment: data.data.HKapartment,
@@ -333,7 +331,6 @@ Page({
   // 新 点击 搜索
   search(e) {
     let value = e.detail.value
-    console.log(value);
   },
 
   // 打开 区域找房 的 弹窗
@@ -628,8 +625,6 @@ Page({
     return
 
     this.pinterestImgLoadCount++
-    console.log("pinterestImgLoadCount", this.pinterestImgLoadCount);
-
 
     if (this.getListDataState) return
 
diff --git a/pages/irentDetail/irentDetail.wxss b/pages/irentDetail/irentDetail.wxss
index fd57d0c..9814a08 100644
--- a/pages/irentDetail/irentDetail.wxss
+++ b/pages/irentDetail/irentDetail.wxss
@@ -826,6 +826,7 @@ map .clickmap {
     padding: 0 30rpx;
     margin-bottom: 37.5rpx;
     word-break: break-word;
+    white-space: pre-wrap;
 }
 
 .all-apartments {
diff --git a/pages/irentList/irentList.js b/pages/irentList/irentList.js
index 19d8e15..2527a82 100644
--- a/pages/irentList/irentList.js
+++ b/pages/irentList/irentList.js
@@ -91,7 +91,6 @@ Page({
             })
         }
 
-        // console.log("operationsTop", this.data.operationsTop);
 
         if (e.scrollTop > 1000 && !this.data.showTOTOP) {
             this.setData({
@@ -132,9 +131,6 @@ Page({
 
         // brandSelectionObj['school'] = 6
 
-
-        // console.log("brandSelectionObj1", brandSelectionObj);
-
         // this.data.roomtype.value = options.roomtype || '';
         // this.data.roomlistings.value = options.roomlistings || '';
         // this.data.brands.value = options.brands || '';
@@ -205,7 +201,6 @@ Page({
     get_config() {
         var that = this;
         if (app.globalData.config.lists) {
-            console.log("app", app.globalData.wechat);
             config = app.globalData.config;
             that.setData({
                 user: app.globalData.user,
diff --git a/pages/irentPark/irentPark.js b/pages/irentPark/irentPark.js
index 9165e82..e8efba7 100644
--- a/pages/irentPark/irentPark.js
+++ b/pages/irentPark/irentPark.js
@@ -207,13 +207,11 @@ Page({
     let that = this;
     let div = '';
     div += '<div>' + message + '</div>';
-    // console.log(div)
     // let noteBox = 'noteBox.' + box;
     WxParse.wxParse('noteBox', 'html', '<div>' + div + '</div>', that, 0);
   },
   select_shows: function (e) {
     let box = e.currentTarget.dataset.box;
-    // console.log(box)
     this.data.selectBox[box].show = true;
     this.setData({
       selectBox: this.data.selectBox
@@ -241,7 +239,6 @@ Page({
     console.log(e)
     let letter = e.currentTarget.dataset.letter;
     this.data.fields[letter].defalt = e.detail.value;
-    // console.log(this.data.fields[letter].defalt)
     this.setData({
       fields: this.data.fields
     })
@@ -317,9 +314,7 @@ Page({
   copy(e){
     const content = e.currentTarget.dataset.content;
     miucms.copy(content).then((res)=>{
-      console.log('res',res)
     }).catch(err=>{
-      console.log(err)
     })
     
   },
diff --git a/pages/search/search.js b/pages/search/search.js
index 58fa81c..b2fbbf0 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -306,7 +306,6 @@ Page({
     // 提交
     submit: function () {
         // this.data.kw = this.data.kw.trim();
-        console.log(this.data.kw, "this.data.kw");
         if (this.data.kw == '') {
             wx.showToast({
                 title: '请输入内容~',
@@ -329,7 +328,6 @@ Page({
                 data: this.data.log,
             })
         }
-        console.log("this.data.isAskingSearch", this.data.isAskingSearch);
         if (this.data.isAskingSearch) {
             this.data.asking = {
                 data: [],
@@ -471,7 +469,6 @@ Page({
             // miucms.request(`${app.globalData.baseURL}/tenement/housingresources/lists`, {
             'keyword': this.data.kw
         }).then(data => {
-            // console.log("data", data);
             if (data.code != 200) {
                 wx.showToast({
                     title: data.message,
@@ -675,7 +672,6 @@ Page({
             requestData["brand"] = requestData['value']
             this.data.brands.value = requestData['value']
         }
-        console.log(this.data.isAskingSearch, "isAskingSearch");
         if (this.data.isAskingSearch) {
             this.data.asking = {
                 data: [],
diff --git a/pages/share/share.js b/pages/share/share.js
index a635f2e..2bba9fd 100644
--- a/pages/share/share.js
+++ b/pages/share/share.js
@@ -94,7 +94,6 @@ Page({
 
       },
       fail: function (res) {
-        console.log(res)
       }
     })
 
@@ -111,7 +110,6 @@ Page({
     wx.getImageInfo({
       src: that.data.imgs[index],
       success: function (res) {
-        console.log(res);
         wx.hideLoading()
         if (res.errMsg != 'getImageInfo:ok') return
         // return
@@ -186,7 +184,6 @@ Page({
               success: modalSuccess => {
                 wx.openSetting({
                   success(settingdata) {
-                    console.log(settingdata);
                     if (settingdata.authSetting['scope.writePhotosAlbum']) {
                       wx.showModal({
                         title: '提示',
diff --git a/pages/user/user.js b/pages/user/user.js
index b0b59b8..33c5a40 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -654,16 +654,8 @@ Page({
             return
         }
 
-        // console.log("item", item);
-
         const upState = this.getTopUpState()
-        // console.log("upState", upState);
-
         // upState: false 代表24小时内 没有弹出认证弹窗
-        // console.log("intermediary:", item.intermediary == 1, this.data.user.intermediary == 0, "弹出认证中介");
-        // console.log("intermediary:", item.intermediary == 3, item.verified == 0, "弹出认证房源");
-
-
         miucms.request(app.globalData.baseURL + "/tenement/post/ding", {
             token
         }).then(res => {
@@ -744,13 +736,11 @@ Page({
         var topUpState = wx.getStorageSync('topUpState');
         if (topUpState) {
             var now = new Date().getTime();
-            if (now < topUpState.expireTime) {
-                // console.log("用户在24小时内进行了充值操作，topUpState 为 true");
-                return true;
-            }
+            // 用户在24小时内进行了充值操作，topUpState 为 true
+            if (now < topUpState.expireTime) return true;
         }
 
-        // console.log("用户超过24小时未进行充值操作，topUpState 为 false");
+        // 用户超过24小时未进行充值操作，topUpState 为 false
         return false;
     },
 
diff --git a/pages/video_show/video_show.js b/pages/video_show/video_show.js
index ca30aef..68afd31 100644
--- a/pages/video_show/video_show.js
+++ b/pages/video_show/video_show.js
@@ -89,22 +89,38 @@ Page({
             liveLength: this.data.liveLength,
         })
 
+      //   if (this.data.current >= this.data.videoLength + this.data.liveLength) {
+      //     this.setData({
+      //         tab: 'img',
+      //         imgIndex: this.data.current + this.data.videoLength + this.data.liveLength
+      //     })
+      // } else if (this.data.current >= this.data.liveLength) {
+      //     this.setData({
+      //         tab: 'video',
+      //         videoIndex: this.data.current + this.data.liveLength
+      //     })
+      // } else {
+      //     this.setData({
+      //         tab: 'live',
+      //         liveIndex: this.data.current
+      //     })
+      // }
+
+        let tab = "live"
+        let index = this.data.current
+
         if (this.data.current >= this.data.videoLength + this.data.liveLength) {
-            this.setData({
-                tab: 'img',
-                imgIndex: this.data.current + this.data.videoLength + this.data.liveLength
-            })
+          tab = "img"
+          index = this.data.current + this.data.videoLength + this.data.liveLength
         } else if (this.data.current >= this.data.liveLength) {
-            this.setData({
-                tab: 'video',
-                videoIndex: this.data.current + this.data.liveLength
-            })
-        } else {
-            this.setData({
-                tab: 'live',
-                liveIndex: this.data.current
-            })
+          tab = "video"
+          index = this.data.current + this.data.liveLength
         }
+
+        this.setData({
+          tab,
+          [`${tab}Index`]: index
+        })
     },
     // 切换图片或视频
     changeTab(e) {
@@ -152,7 +168,6 @@ Page({
     },
 
     bindloadedmetadata(e) {
-        console.log(e, "e");
         this.setData({
             videoLoading: false
         })
diff --git a/template/bannerAD/bannerAD.js b/template/bannerAD/bannerAD.js
index 0661f34..5db7011 100644
--- a/template/bannerAD/bannerAD.js
+++ b/template/bannerAD/bannerAD.js
@@ -63,7 +63,6 @@ Component({
 
     },
     bindtimeupdate(e){
-      // console.log(e)
       this.currentTime = e.detail.currentTime;
     },
     currentTime:0,
@@ -71,7 +70,6 @@ Component({
       let that = this;
       const query = this.createSelectorQuery();
       query.select('#video' + this.properties.index).boundingClientRect(function (rect) {
-        // console.log(rect.width)
         that.setData({
           height: rect.width * that.properties.item.annex.height / that.properties.item.annex.width
         })
diff --git a/template/datepickerview/datepickerview.js b/template/datepickerview/datepickerview.js
index 92b057e..94a650a 100644
--- a/template/datepickerview/datepickerview.js
+++ b/template/datepickerview/datepickerview.js
@@ -26,7 +26,6 @@ Component({
     dialogh: 0
   },
   attached: function () {
-    console.log('attached')
     that = this
     that.animation = wx.createAnimation({
       duration: 300
diff --git a/template/toTop/toTop.wxml b/template/toTop/toTop.wxml
index 8fd7d02..7ac07e2 100644
--- a/template/toTop/toTop.wxml
+++ b/template/toTop/toTop.wxml
@@ -1,3 +1,3 @@
 <view class="to-top-btn" bindtap='toTop'>
-  <image src="../../img/totop.png"></image>
+  <image class="to-top-btn-img" src="../../img/totop.png"></image>
 </view>
diff --git a/template/toTop/toTop.wxss b/template/toTop/toTop.wxss
index 2c8bee6..3aaf6b9 100644
--- a/template/toTop/toTop.wxss
+++ b/template/toTop/toTop.wxss
@@ -15,7 +15,7 @@
   background: rgba(0,0,0,0.4);
   z-index: 1003;
 }
-.to-top-btn image{
+.to-top-btn .to-top-btn-img{
   width: 46rpx;
   height: 46rpx;
 }
\ No newline at end of file
diff --git a/utils/miucms.js b/utils/miucms.js
index d40cb5a..b2b8bae 100644
--- a/utils/miucms.js
+++ b/utils/miucms.js
@@ -33,7 +33,6 @@ function sendData(code) {
             'Authorization': wx.getStorageSync('Authorization') || ''
         },
         success: function (res) {
-            // console.log(res)
             var data = typeof res.data == 'string' ? JSON.parse(res.data) : res.data;
 
             // 将配置与用户session存于本地
@@ -104,7 +103,6 @@ function verify() {
 // 验证验证码并注册
 function register(o) {
     var config = wx.getStorageSync('config')
-    // console.log('register',config)
     var self = this;
     wx.request({
         url: config.user.register,
@@ -144,7 +142,6 @@ function login() {
 
 //获取用户信息
 function getUserInfo(o) {
-    // console.log('getUserInfogetUserInfo')
     login().then(res => {
         var code = res.code;
         o(code);
@@ -332,7 +329,6 @@ const wxget = function (url, data = {}) {
                     resolve(res.data)
                 } else if (res.data.code == 401) {
                     // 需要授权
-                    // console.log(app)
                     app.globalData.user.uid = 0;
                     wx.showToast({
                         icon: 'none',
@@ -440,7 +436,7 @@ const useSocket = () => {
     })
 
     app.globalData.socketTask.onClose(function () {
-        console.log('socket关闭了', new Date())
+        // console.log('socket关闭了', new Date())
         socketCount++
         if (socketCount > 3) return
         setTimeout(() => useSocket(), 3000);
diff --git a/wxParse/html2json.js b/wxParse/html2json.js
index 8545829..dfdb420 100644
--- a/wxParse/html2json.js
+++ b/wxParse/html2json.js
@@ -113,7 +113,6 @@ function html2json(html, bindName, lineFeed) {
                     var name = attr.name;
                     var value = attr.value;
                     if (name == 'class') {
-                        // console.log(value);
                         //  value = value.join("")
                         node.classStr = value;
                     }
diff --git a/wxParse/wxParse.js b/wxParse/wxParse.js
index b72a8b3..197b692 100644
--- a/wxParse/wxParse.js
+++ b/wxParse/wxParse.js
@@ -37,12 +37,10 @@ function wxParse(bindName = 'wxParseData', type = 'html', data = '<div class="co
   var transData = {}; //存放转化后的数据
   if (type == 'html') {
     transData = HtmlToJson.html2json(data, bindName, lineFeed);
-    // console.log(JSON.stringify(transData, ' ', ' '));
   } else if (type == 'md' || type == 'markdown') {
     var converter = new showdown.Converter();
     var html = converter.makeHtml(data);
     transData = HtmlToJson.html2json(html, bindName);
-    // console.log(JSON.stringify(transData, ' ', ' '));
   }
   transData.view = {};
   transData.view.imagePadding = 0;
@@ -58,10 +56,8 @@ function wxParse(bindName = 'wxParseData', type = 'html', data = '<div class="co
 // 图片点击事件
 function wxParseImgTap(e) {
   var that = this;
-  console.log("that.data[tagFrom]", that.data[tagFrom]);
   var nowImgUrl = e.target.dataset.src;
   var tagFrom = e.target.dataset.from;
-  console.log("tagFrom", tagFrom);
   if (typeof (tagFrom) != 'undefined' && tagFrom.length > 0) {
     wx.previewImage({
       current: nowImgUrl, // 当前显示图片的http链接
@@ -121,12 +117,9 @@ function wxAutoImageCal(originalWidth, originalHeight, that, bindName) {
   windowWidth = realWindowWidth - 2 * padding;
   windowHeight = realWindowHeight;
   //判断按照那种方式进行缩放
-  // console.log("windowWidth" + windowWidth);
   if (originalWidth > windowWidth) { //在图片width大于手机屏幕width时候
     autoWidth = windowWidth;
-    // console.log("autoWidth" + autoWidth);
     autoHeight = (autoWidth * originalHeight) / originalWidth;
-    // console.log("autoHeight" + autoHeight);
     results.imageWidth = autoWidth;
     results.imageheight = autoHeight;
   } else { //否则展示原来的数据