From d4df621072effd828663330b8964968c37068f1e Mon Sep 17 00:00:00 2001 From: A1300399510 Date: Tue, 16 May 2023 21:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 12 +- app.json | 1 - app.wxss | 9 + img/arrow-White.svg | 11 + img/arrow-gray.png | Bin 0 -> 461 bytes img/top-image1.png | Bin 0 -> 2289 bytes pages/UK/UK.js | 190 ------- pages/UK/UK.json | 8 - pages/UK/UK.wxml | 83 --- pages/UK/UK.wxss | 347 ------------ pages/UK/hotCard/hotCard.js | 34 -- pages/UK/hotCard/hotCard.json | 4 - pages/UK/hotCard/hotCard.wxml | 18 - pages/UK/hotCard/hotCard.wxss | 77 --- pages/ad/ad.wxml | 1 - pages/chartroom/chartroom.js | 629 --------------------- pages/chartroom/chartroom.json | 7 - pages/chartroom/chartroom.wxml | 207 ------- pages/chartroom/chartroom.wxss | 450 --------------- pages/common/common.wxml | 2 +- pages/index/index.js | 19 +- pages/index/index.wxml | 32 +- pages/index/index.wxss | 93 ++- pages/irentList/irentList.wxml | 32 +- pages/irentList/irentList.wxss | 57 ++ pages/login/index.js | 117 ++-- pages/login/index.json | 7 - pages/login/index.wxml | 14 +- pages/login/index.wxss | 1 - pages/personList/tab/tab.js | 10 + pages/personList/tab/tab.wxml | 4 +- pages/personList/tab/tab.wxss | 1 - pages/quarantineLists/quarantineLists.wxml | 25 +- pages/quarantineLists/quarantineLists.wxss | 158 ++++++ pages/show/show.wxss | 15 +- pages/textarea/textarea.js | 239 ++------ pages/textarea/textarea.json | 7 - pages/textarea/textarea.wxml | 43 +- pages/textarea/textarea.wxss | 134 ----- project.config.json | 2 +- template/headerNav/index.js | 1 + template/headerNav/index.wxml | 4 +- utils/miucms.js | 3 +- 43 files changed, 541 insertions(+), 2567 deletions(-) create mode 100644 img/arrow-White.svg create mode 100644 img/arrow-gray.png create mode 100644 img/top-image1.png delete mode 100644 pages/UK/UK.js delete mode 100644 pages/UK/UK.json delete mode 100644 pages/UK/UK.wxml delete mode 100644 pages/UK/UK.wxss delete mode 100644 pages/UK/hotCard/hotCard.js delete mode 100644 pages/UK/hotCard/hotCard.json delete mode 100644 pages/UK/hotCard/hotCard.wxml delete mode 100644 pages/UK/hotCard/hotCard.wxss delete mode 100644 pages/chartroom/chartroom.js delete mode 100644 pages/chartroom/chartroom.json delete mode 100644 pages/chartroom/chartroom.wxml delete mode 100644 pages/chartroom/chartroom.wxss delete mode 100644 pages/login/index.json delete mode 100644 pages/login/index.wxss delete mode 100644 pages/textarea/textarea.json delete mode 100644 pages/textarea/textarea.wxss diff --git a/app.js b/app.js index 0ea7118..2228d78 100644 --- a/app.js +++ b/app.js @@ -95,9 +95,14 @@ App({ this.autoUpdate() let getAccountInfoSync = wx.getAccountInfoSync(); - if (getAccountInfoSync.miniProgram.appId == "wx9c68fbf7886ea9c4") this.globalData.topTitle = "寄托香港租房" - else this.globalData.topTitle = "寄托港校租房" - + if (getAccountInfoSync.miniProgram.appId == "wx9c68fbf7886ea9c4") { + this.globalData.topTitle = "寄托香港租房" + this.globalData.miniProgram = "xg" + } else { + this.globalData.topTitle = "寄托港校租房" + this.globalData.miniProgram = "gx" + } + }, onShow() { @@ -175,5 +180,6 @@ App({ unreadMessagesState: false, firstWxParseImgLoaddState: false, topTitle: "", // 寄托港校租房 寄托香港租房 + miniProgram: "", // 处于那个小程序 xg gx } }) \ No newline at end of file diff --git a/app.json b/app.json index 7a38458..0665612 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,6 @@ "pages": [ "pages/index/index", "pages/appeal/appeal", - "pages/UK/UK", "pages/restOfWorld/restOfWorld", "pages/personList/personList", "pages/irentList/irentList", diff --git a/app.wxss b/app.wxss index 9adc3f8..5484b8c 100644 --- a/app.wxss +++ b/app.wxss @@ -987,6 +987,15 @@ view { -moz-osx-font-smoothing: grayscale; } +@font-face { + font-family: 'Arial-Black'; + src: url('data:font/woff2;charset=utf-8;base64,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') format('woff2'), + url('data:font/woff;charset=utf-8;base64,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') format('woff'); + font-weight: 900; + font-style: normal; + font-display: swap; +} + /* 公共的flex 布局方法 */ .flexflex { diff --git a/img/arrow-White.svg b/img/arrow-White.svg new file mode 100644 index 0000000..b65098d --- /dev/null +++ b/img/arrow-White.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/img/arrow-gray.png b/img/arrow-gray.png new file mode 100644 index 0000000000000000000000000000000000000000..ababe758e0dc88637ba13c9e188c1eff4c859d7b GIT binary patch literal 461 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 { - wx.hideLoading() - var data = res.data; - var hotCity = [], beforeLength = 0; - data.hotHouseList.forEach(item=>{ - hotCity.push({ - cityName: item.cityName, - cityid:item.cityid, - length: item.houseList.length, - beforeLength: beforeLength - }) - beforeLength += item.houseList.length; - }) - that.setData({ - hotHouseList: data.hotHouseList, - strategy: data.strategy, - wechat: data.wechat, - hotCity: hotCity, - activeCity: data.hotHouseList[0].cityid, - banner: data.banner - }) - - }).catch(res => { wx.hideLoading() }) - }, - swiperList:{}, - changeHotCity(e){ - this.setData({ - activeCity:e.currentTarget.dataset.id, - current: e.currentTarget.dataset.beforelength, - activeCityIndex:e.currentTarget.dataset.index, - activeSwiperIndex:0 - }) - this.stat('cityswitch', e.currentTarget.dataset.id, e.currentTarget.dataset.name) - }, - loadHeight(e){ - if (this.data.swiperHeight>220){return false} - this.setData({ - swiperHeight: e.detail.height - }) - }, - changeSwiper(e){ - // .detail.current - if(e.detail.source== "touch"){ - // 用户主动触发 - for (var i = this.data.hotCity.length-1;i>=0;i--){ - if (e.detail.current >= this.data.hotCity[i].beforeLength) { - - if (this.data.hotCity[i].cityid != this.data.activeCity){ - this.setData({ - activeCity: this.data.hotCity[i].cityid, - activeCityIndex:i, - }) - } - this.setData({ - activeSwiperIndex: e.detail.current - this.data.hotCity[i].beforeLength - }) - break; - } - } - - } - }, - copy(e){ - wx.setClipboardData({ - data: e.currentTarget.dataset.wechat, - }) - this.stat('service', e.currentTarget.dataset.wechat, e.currentTarget.dataset.wechat) - }, - // 点击房源 - statHouse(e){ - this.stat('house', e.currentTarget.dataset.id, e.currentTarget.dataset.name) - }, - // 点击按钮 - statBtn(e) { - this.stat(e.currentTarget.dataset.type, e.currentTarget.dataset.id, e.currentTarget.dataset.name) - }, - // 统计点击 - stat(type, id, name, isOpen){ - miucms.request('https://app.gter.net/tenement/belloliving/stat', { type, relatedid: { id, name, isOpen}}).then(res => { - var data = res.data; - - - }).catch(res => { }) - }, - tominiProgram(e){ - let {path,name,id,type} = e.currentTarget.dataset; - let that = this; - wx.navigateToMiniProgram({ - appId: that.data.appid, - path, - - success(res) { - // 打开成功 - console.log('打开成功') - }, - complete(res){ - console.log('complete',res) - let isOpen = res.errMsg =='navigateToMiniProgram:ok' ? true:false; - that.stat(type, id, name, isOpen) - } - }) - } - -}) \ No newline at end of file diff --git a/pages/UK/UK.json b/pages/UK/UK.json deleted file mode 100644 index 359f2d2..0000000 --- a/pages/UK/UK.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "navigationBarTitleText": "寄托租房", - "usingComponents": { - "header-nav": "../../template/headerNav/index", - "hot-card":"./hotCard/hotCard" - }, - "enablePullDownRefresh": false -} \ No newline at end of file diff --git a/pages/UK/UK.wxml b/pages/UK/UK.wxml deleted file mode 100644 index 32d4272..0000000 --- a/pages/UK/UK.wxml +++ /dev/null @@ -1,83 +0,0 @@ - - 英国学生公寓 - - - - - - 热门公寓 - - - - {{ item.cityName }} - - - 所有城市 - - - - - - - - - - - - - - - - - - - - - - - 更多{{ hotCity[activeCityIndex].cityName }}公寓 - - - - - - - - - - 英国攻略 - - - - {{ index + 1 }} - - - - - {{ item.name }} - - - - - - 关于八楼校舍 - - - - - {{ item.name }} - 6年 - - {{ item.text }} - - - - - 欢迎联系 - 官方客服微信号： {{ wechat}} - 备注：寄托，获优先咨询 - 复制微信号 - - - - \ No newline at end of file diff --git a/pages/UK/UK.wxss b/pages/UK/UK.wxss deleted file mode 100644 index 2d795b3..0000000 --- a/pages/UK/UK.wxss +++ /dev/null @@ -1,347 +0,0 @@ -/* pages/UK/UK.wxss */ -.page-header image{ - display: block; - width: 100%; - height: 500rpx; -} -.hot-apartment{ - padding: 56rpx 0 80rpx; - -} -.hot-apartment .title{ - padding: 0 40rpx 32rpx; - font-size: 38rpx; - color: #333; - font-weight: 600; -} -.city-list{ - padding: 0 20rpx 0 40rpx; - display: flex; - flex-wrap: wrap; -} -.city-list .item{ - margin-right: 20rpx; - margin-bottom: 20rpx; - display: inline-flex; -} -.city-list .item:last-child{ - margin-right: 0; -} -.city-list .item .text{ - display: inline-flex; - align-items: center; - background: #f2f2f2; - color: #666; - padding: 0 20rpx; - line-height: 72rpx; - height: 72rpx; - border-radius: 10rpx; -} -.city-list .item.active .text{ - color: #fff; - background: #77cbc1; -} - -.city-list .item .text .you{ - display: inline-flex; - width: 16px; - height: 16px; - flex:0 0 16px; - margin-left: 4px; -} -.card-container{ - padding:20rpx 0 0 40rpx; -} -.indicator-dots{ - display: flex; - align-items: center; - justify-content: center; - padding-left: 2px; - margin: 40rpx auto 44rpx; - -} -.indicator-dots .item{ - display: inline-flex; - border:1px solid #ccc; - border-radius: 50%; - flex: 0 0 8px; - width: 8px; - height: 8px; - margin-right: 2px; -} -.indicator-dots .item.active{ - background: #77cbc1; - border-color: #77cbc1 -} -.card-container .btn .text{ - display: flex; - align-items: center; - justify-content: center; - border:1px solid #77cbc1; - color: #77cbc1; - font-size: 26rpx; - width: 400rpx; - height: 72rpx; - border-radius: 36rpx; - margin: 0 auto; -} -.card-container .btn image{ - display: inline-flex; - flex:0 0 12px; - width: 12px; - height: 12px; - margin-left: 4px; -} -.hover{ - background: transparent -} -.uk-strategy{ - border-top: 10px solid #f2f2f2; - padding: 60rpx 0 40rpx; -} -.uk-strategy .title{ - padding: 0 40rpx 40rpx; - font-size: 38rpx; - color: #333; - font-weight: 600; -} -.uk-strategy .list{ - display: flex; - justify-content: space-between; - flex-wrap: wrap; - padding: 0 40rpx 0; -} -.uk-strategy .item{ - display: inline-flex; - width: calc(50% - 10rpx); - height: 280rpx; - border-radius: 20rpx; - align-items: center; - justify-content: center; - flex-direction: column; - position: relative; - margin-bottom: 20rpx; - font-size: 30rpx; - color: #000 -} -/* app,card,job,luggage,strategy,ticket */ -.uk-strategy .item.luggage{ - background: #fef7da; -} -.uk-strategy .item .icon{ - display: inline-flex; - align-items: center; - justify-content: center; - margin-bottom: 32rpx; - height: 100rpx; -} -.uk-strategy .item.luggage .icon image{ - width: 65.6rpx; - height: 100rpx; -} -.uk-strategy .item.housetype{ - background: #e5faf5; -} -.uk-strategy .item.housetype .icon image{ - width: 103rpx; - height: 96rpx; -} -.uk-strategy .item.ticket{ - background: #eef1f6; -} -.uk-strategy .item.ticket .icon image{ - width: 95.7rpx; - height: 84rpx; -} -.uk-strategy .item.card{ - background: #faeceb; -} -.uk-strategy .item.card .icon image{ - width: 100rpx; - height: 100rpx; -} -.uk-strategy .item.job{ - background: #fff4e2; -} -.uk-strategy .item.job .icon image{ - width: 94rpx; - height: 72rpx; -} -.uk-strategy .item.app{ - background: #f0eff5; -} -.uk-strategy .item.app .icon image{ - width: 64.5rpx; - height: 98rpx; -} -.uk-strategy .item .order{ - position: absolute; - left: -16rpx; - top: -16rpx; - transform: rotateZ(-40deg); - border-bottom: 1px solid #e4e4e4; - width: 80rpx; - height: 80rpx; - color: #ccc; - font-family: Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif; - transform-origin: center; - font-size: 28rpx; -} -.uk-strategy .item .order .text{ - transform: rotateZ(40deg); - position: absolute; - left: 40rpx; - top: 34rpx; -} - -.about-belloliving{ - border-top: 10px solid #f2f2f2; - padding: 60rpx 40rpx 60rpx; -} -.about-belloliving .title{ - padding: 0 0rpx 32rpx; - font-size: 38rpx; - color: #333; - font-weight: 600; -} -.about-belloliving .list{ - background: #f9f9f9; - border-radius: 20rpx; - padding: 16rpx 40rpx; - -} -.about-belloliving .list .item{ - display: flex; - align-items: center; - padding: 44rpx 0rpx 44rpx 16rpx; - border-bottom: 1px solid #e4e4e4; -} -.about-belloliving .list .item:last-child{ - border-bottom: none; -} -.about-belloliving .list .item image{ - - width: 60rpx; - height: 60rpx; -} -.about-belloliving .list .text{ - color: #666; - display: inline-flex; - word-break: break-all; - font-size: 26rpx; - line-height: 1.6 - -} -.about-belloliving .list .sub{ - display: inline-flex; - width: 120rpx; - flex:0 0 120rpx; - margin-right: 60rpx; - color: #77cbc1; - flex-direction: column; - position: relative; - align-items: center; -} -.about-belloliving .list .icon{ - display: inline-flex; - width: 100%; - align-items: center; - justify-content: center; - margin-bottom: 20rpx; -} -.about-belloliving .list .year{ - padding-left: 0; -} -.about-belloliving .list .year .sub{ - flex: 0 0 160rpx; - width: 160rpx; - margin-right: 36rpx; -} -.about-belloliving .list .year .sub image{ - width: 160rpx; - height: 160rpx; -} -.about-belloliving .list .year .sub .name{ - position: absolute; - left: 0; - top: -10rpx; - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; - font-size: 32rpx; -} -.about-belloliving .list .year .sub .name .num{ - font-family: Impact, Haettenschweiler, 'Arial Narrow Bold', sans-serif; - margin-right: 4rpx; -} -.contact{ - margin-top: 40rpx; - background: #f9f9f9; - border-radius: 20rpx; - padding: 64rpx 0 56rpx; -} -.contact .name{ - display: flex; - align-items: center; - justify-content: center; - color: #999; -} -.contact .name::before,.contact .name::after{ - display: inline-flex; - content: ""; - width: 48rpx; - flex: 0 0 48rpx; - height: 1px; - background: #ccc; - margin: 0 20rpx; -} -.contact .belloliving-wechat{ - display: flex; - align-items: center; - justify-content: center; - margin: 40rpx 0 10rpx; - font-size: 30rpx; - color: #333; -} -.contact .belloliving-wechat .num{ - display: inline-flex; - color: #77cbc1; - background: #ebebeb; - border-radius: 6rpx; - padding: 0 28rpx; - height: 48rpx; - line-height: 46rpx; - align-items: center; - justify-content: center; - font-size: 28rpx; - -} -.contact .button{ - border:1px solid #e4e4e4; - background: transparent; - border-radius:36rpx; - height: 72rpx; - box-sizing: border-box; - width: 310rpx; - font-size: 26rpx; - margin: 40rpx auto 0; - display: flex; - align-items: center; - justify-content: center; -} -.contact .button image{ - width: 44rpx; - height: 36rpx; - margin-right: 14rpx; -} -.contact .tips{ - text-align: center; - -} -.contact .tips .text{ - color: #77cbc1; - font-weight: bold; - display: inline -} \ No newline at end of file diff --git a/pages/UK/hotCard/hotCard.js b/pages/UK/hotCard/hotCard.js deleted file mode 100644 index 2c5fc89..0000000 --- a/pages/UK/hotCard/hotCard.js +++ /dev/null @@ -1,34 +0,0 @@ -// pages/UK/hotCard/hotCard.js -Component({ - /** - * 组件的属性列表 - */ - properties: { - appid:String, - item:Object - }, - - /** - * 组件的初始数据 - */ - data: { - lazyLoad:true - }, - - /** - * 组件的方法列表 - */ - methods: { - loadImg(e){ - const query = this.createSelectorQuery(); - let that = this; - query.select('#id' + that.properties.item.id).boundingClientRect(); - - query.exec((res) => { - that.triggerEvent('loadHeight', { - height: res[0].height + 186 - }, {}) - }) - } - } -}) diff --git a/pages/UK/hotCard/hotCard.json b/pages/UK/hotCard/hotCard.json deleted file mode 100644 index e8cfaaf..0000000 --- a/pages/UK/hotCard/hotCard.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "component": true, - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/UK/hotCard/hotCard.wxml b/pages/UK/hotCard/hotCard.wxml deleted file mode 100644 index 13d57cc..0000000 --- a/pages/UK/hotCard/hotCard.wxml +++ /dev/null @@ -1,18 +0,0 @@ - - - - {{ item.title }} - - from{{ item.country_symbol + item.bottomprice}} - {{ item.country_symbol + item.oldBottomPrice}} - - - - - {{ s.name }} - {{ s.intro }} - {{ s.time }} - - - - \ No newline at end of file diff --git a/pages/UK/hotCard/hotCard.wxss b/pages/UK/hotCard/hotCard.wxss deleted file mode 100644 index 6f97b35..0000000 --- a/pages/UK/hotCard/hotCard.wxss +++ /dev/null @@ -1,77 +0,0 @@ -/* pages/UK/hotCard/hotCard.wxss */ -.card{ - border-radius: 20rpx; - overflow: hidden; - border:1px solid #f2f2f2; - margin-right: 20rpx; - padding-bottom: 24px; - height: 100%; -} -.cover{ - display: block; - width: 100%; -} -.title{ - padding: 24px 20rpx 10px; - font-size: 16px; - color: #000; - font-weight: bold; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; -} -.price{ - color: #333; - padding: 0 20rpx 20rpx; - font-size: 12px; -} -.price .now{ - color: #389afe; - display: inline; - margin: 0 6rpx 0rpx 10rpx; - font-size: 13px; -} -.price .old{ - color: #999; - display: inline; - text-decoration:line-through; -} -.distance{ - color: #000; - padding: 0 20rpx 0; - /* font-weight: 600; */ - font-size: 12px; -} -.distance image{ - display: inline-block; - width: 32rpx; - height: 32rpx; - margin-right: 6rpx; - position: relative; - top: 2px; -} -.distance .item{ - margin-bottom: 8px; - display: block; - flex-wrap: wrap; - align-items: center; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden -} -.name{ - display: inline; - color: #000; -} -.time{ - display: inline; - color: #000; -} -.intro{ - display: inline; - color: #666; - margin: 0 4rpx 0 10rpx; -} -.hover{ - background: transparent -} \ No newline at end of file diff --git a/pages/ad/ad.wxml b/pages/ad/ad.wxml index 1b73b8b..f91c064 100644 --- a/pages/ad/ad.wxml +++ b/pages/ad/ad.wxml @@ -1,5 +1,4 @@ - {{ topTitle }} diff --git a/pages/chartroom/chartroom.js b/pages/chartroom/chartroom.js deleted file mode 100644 index 13d77cf..0000000 --- a/pages/chartroom/chartroom.js +++ /dev/null @@ -1,629 +0,0 @@ -// pages/replyQuestions/replyQuestions.js -var app = getApp() -var miucms = require('../../utils/miucms.js'); -var WxParse = require('../../wxParse/wxParse.js'); -var config = {}; -var loading = false, - loading_new = false; -var have_new_msg = true; -var windowHeight = 0, - windowWidth = 0; -var tempFilePaths = [], - tempFilePath = ''; -Page({ - - /** - * 页面的初始数据 - */ - data: { - questions: [], - can_submit: false, - status: '', - avatar: '', - show_custom: false, - show_fast_reply: false, - uniqid: 'jayaiqDyHvv5', - token: '', - messageid: '', - XiaoappHKid: '', - islandlord: false, - lastmessageid: 0, - maxmessageid: 0, - page: { - next_page: 1 - }, - pagemessageid: 0, - count: 0, - data: [], - impression: [], - reply_message: '', - show_new_msg: false, - customreply: [], - q: "", - show_page: false, - can_get_new: false, - can_send: false, - function_show: false, - video_obj: { - show: false, - src: '' - }, - scrollHeight: '', //聊天记录窗口高度 - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function(options) { - this.setData({ - uniqid: options.uniqid, - q: options.q ? options.q : '' - }) - this.get_config() - }, - get_config() { - var that = this; - if (app.globalData.config.lists) { - config = app.globalData.config; - wx.showLoading({ - title: '加载中', - }) - that.setData({ - user: app.globalData.user, - status: app.globalData.status - }) - - this.to_message_show(); - } else { - setTimeout(function() { - that.get_config() - }, 200) - } - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - console.log('onShow') - var that = this; - wx.getSystemInfo({ - success: function(res) { - windowHeight = res.windowHeight; - windowWidth = res.windowWidth; - }, - }) - if (this.data.show_fast_reply) { - wx.getStorage({ - key: 'message', - success: function(res) { - console.log(res) - that.setData({ - customreply: res.data, - show_fast_reply: false - }) - wx.removeStorage({ - key: 'message', - success: function(res) {}, - }) - }, - }) - } - this.setData({ - show_page: true - }) - this.data.can_get_new && this.get_new_msg() - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - console.log('onHide') - this.setData({ - show_page: false - }) - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - console.log('onUnload') - - this.setData({ - show_page: false - }) - if (this.data.video_obj.show === true) { - this.close_video() - return false - } - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - // onShareAppMessage: function () { - - // }, - - input: function(e) { - let that = this; - - if (e.detail.value.trim() !== '') { - this.setData({ - reply_message: e.detail.value, - can_send: true - }) - } else { - this.setData({ - reply_message: e.detail.value, - can_send: false - }) - } - }, - - to_fast_reply: function(e) { - let that = this; - let data = that.data.customreply; - wx.setStorage({ - key: 'message', - data: data, - success: function(res) { - that.setData({ - show_fast_reply: true, - show_custom: false - }) - wx.navigateTo({ - url: '../setFastrReply/setFastrReply', - }) - } - }) - }, - // 在线聊天页 - to_message_show: function() { - var that = this; - // 避免重複加載 - if (loading || that.data.pagemessageid === false) { - return false - } - loading = true; - wx.showLoading({ - title: '加载中', - }) - miucms.request(app.globalData.config.message.show, { - uniqid: that.data.uniqid, - pagemessageid: that.data.pagemessageid, - }).then(data => { - - - - if (data.extraparam && data.extraparam.mode == 'alert') { - wx.showModal({ - title: '', - content: data.message, - }) - } else { - // for (let i = 0; i < data.data.length; i++) { - // if (data.data[i].event != 'Answer' && data.data[i].type == 'text') { - // data.data[i].message = data.data[i].message.split('\n') - // } else if (data.data[i].event == 'Answer'){ - // console.log('Answer', data.data[i]) - // for (let j = 0; j < data.data[i].message.length;j++){ - // console.log(data.data[i].message[j]) - // data.data[i].message[j].message = data.data[i].message[j].message.split('\n') - // } - // } - // } - that.data.data = data.data.concat(that.data.data); - if (that.data.pagemessageid == 0) { - that.setData({ - lastmessageid: data.lastmessageid, - impression: data.impression, - can_get_new: true - }) - setTimeout(function() { - that.get_new_msg() - }, 2000) - } - that.setData({ - islandlord: data.islandlord, - maxmessageid: data.maxmessageid, - // page:data.page, - pagemessageid: data.pagemessageid, - count: data.count, - data: that.data.data, - customreply: data.customreply - }) - } - }).catch(res=>{}) - }, - to_show_custom: function(e) { - var show = e.currentTarget.dataset.show == 'true' ? true : false; - - this.setData({ - show_custom: show - }) - }, - reply: function(e) { - var that = this; - if (that.data.reply_message.trim().length == 0) { - wx.showModal({ - title: '提示', - content: '不能发送空白消息', - }) - - } else { - // type '消息类型 (voice:语音,text:文本, image:图片,video:视频,map:地图) - miucms.request(app.globalData.config.message.send, { - uniqid: that.data.uniqid, - message: that.data.reply_message, - formid: e.detail.formId, - type: 'text', - }).then(data => { - if (data.extraparam && data.extraparam.mode == 'right') { - that.setData({ - reply_message: '', - can_send: false - }) - } - }).catch(res=>{}) - } - }, - upper: function() { - this.to_message_show() - }, - // 滚动到屏幕底部时，如果有新消息，则跳到新消息去，没有就不跳 - lower: function() { - - }, - scroll: function(e) { - var that = this; - if (e.detail.scrollHeight - e.detail.scrollTop > windowHeight * 1.5) { - have_new_msg = false; - } else { - have_new_msg = true; - that.setData({ - show_new_msg: false - }) - } - }, - // 获取最新消息 - get_new_msg: function() { - var that = this; - // console.log(this.data.show_page) - if (this.data.show_page === true) { - setTimeout(function() { - that.get_new_msg() - }, 1000) - } - if (loading_new) { - return false - } - loading_new = true; - - miucms.request(app.globalData.config.message.monitoring, { - uniqid: that.data.uniqid, - lastmessageid: that.data.lastmessageid - }).then(data => { - if (data.extraparam && data.extraparam.mode == 'alert') { - wx.showModal({ - title: '', - content: data.message, - }) - } else { - - // for(let i=0;i 0) { - that.data.data = that.data.data.concat(data.data); - that.setData({ - data: that.data.data - }) - if (have_new_msg) { - that.setData({ - maxmessageid: data.lastmessageid, - show_new_msg: false - }) - } else { - that.setData({ - show_new_msg: true - }) - } - } - } - }).catch(res=>{}) - }, - to_new_msg: function() { - var that = this; - that.setData({ - maxmessageid: that.data.lastmessageid, - show_new_msg: false - }) - }, - select_item: function(e) { - var content = e.currentTarget.dataset.content; - this.setData({ - reply_message: content, - show_custom: false, - can_send: true - }) - // this.reply() - }, - get_img: function() { - var that = this; - - wx.chooseImage({ - count: 9, - success: function(res) { - tempFilePaths = res.tempFilePaths; - that.upload_pic(0, res.tempFilePaths.length) - - } - }) - }, - upload_pic: function(index, length) { - var that = this; - const uploadTask = wx.uploadFile({ - url: 'https://app.gter.net/upload', - filePath: tempFilePaths[index], - name: 'files', - formData: { - uniqid: that.data.uniqid, - session: app.globalData.session - }, - header: app.globalData.header, - success: function(res) { - var data = app.return_data(res); - - - // 上传成功 - - // 发送消息 - wx.request({ - url: app.globalData.config.message.send, - data: { - session: wx.getStorageSync('session'), - uniqid: that.data.uniqid, - message: data.aid, - type: 'image', - aid: data.aid - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: app.globalData.header, - success: function(res) { - var data = app.return_data(res); - if (data.extraparam && data.extraparam.mode == 'right') {} - } - }) - index++; - if (index < length) { - that.upload_pic(index, length) - } - }, - fail: function(res) { - wx.showModal({ - content: res, - }) - } - }) - uploadTask.onProgressUpdate((res) => { - console.log('上传进度', res.progress) - }) - }, - get_video: function() { - let that = this; - wx.chooseVideo({ - count: 9, - success: function(res) { - tempFilePath = res.tempFilePath; - that.upload_video(0, 1) - } - }) - }, - upload_video: function(index, length) { - var that = this; - - const uploadTask = wx.uploadFile({ - url: 'https://app.gter.net/upload', - filePath: tempFilePath, - name: 'files', - formData: { - uniqid: that.data.uniqid, - session: app.globalData.session, - type: 'video' - }, - header: app.globalData.header, - success: function(res) { - var data = app.return_data(res); - // 发送消息 - wx.request({ - url: app.globalData.config.message.send, - data: { - session: wx.getStorageSync('session'), - uniqid: that.data.uniqid, - message: data.aid, - type: 'video', - aid: data.aid - }, - method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT - header: app.globalData.header, - success: function(res) { - var data = app.return_data(res); - if (data.extraparam && data.extraparam.mode == 'right') {} - } - }) - - }, - fail: function(res) { - console.log(res) - } - }) - // uploadTask.onProgressUpdate((res) => { - // for (let i = 0; i < that.data.imgs.length; i++) { - // if (that.data.imgs[i].id === id_now) { - // that.data.imgs[i]['progress'] = res.progress == 100 ? 0 : res.progress; - // that.setData({ - // videos: that.data.videos - // }) - // } - // } - // }) - }, - get_location: function() { - let that = this; - wx.chooseLocation({ - success: function(res) { - // 发送消息 - miucms.request(app.globalData.config.message.send, { - uniqid: that.data.uniqid, - type: 'map', - message: res, - }).then(data => { - - }).catch(res => {}) - }, - }) - }, - // 去地图 - to_map: function(e) { - console.log(e) - var that = this; - var latitude = Number(e.currentTarget.dataset.latitude); - var longitude = Number(e.currentTarget.dataset.longitude); - var address = e.currentTarget.dataset.address; - wx.openLocation({ - latitude: latitude, - longitude: longitude, - scale: 28, - // name: name, - address: address - }) - }, - imageLoad: function(e) { - let originalWidth = e.detail.width; - let originalHeight = e.detail.height; - let index = e.currentTarget.dataset.index; - this.data.data[index].image_height = originalHeight * (windowWidth - 74) / originalWidth - this.setData({ - data: this.data.data - }) - }, - // 图片预览 - previewimg: function(e) { - let arr = []; - var data = this.data.data; - for (let i = 0; i < data.length; i++) { - if (data[i].type == 'image') { - arr.push(data[i].message) - } - } - let index = e.currentTarget.dataset.index; - wx.previewImage({ - current: data[index].message, // 当前显示图片的http链接 - urls: arr // 需要预览的图片http链接列表 - }) - }, - // 设置印象 - check_item: function(e) { - var that = this; - var impression = '' + e.currentTarget.dataset.impression; - var index = e.currentTarget.dataset.index; - wx.showLoading({ - title: '数据提交中', - }) - miucms.request(app.globalData.config.message.setimpression,{ - uniqid: that.data.uniqid, - impression: impression - }).then(data=>{ - if (data.extraparam.mode == 'right') { - for (var i = 0; i < that.data.impression.length; i++) { - that.data.impression[i].selected = false; - } - that.data.impression[index].selected = true; - that.setData({ - impression: that.data.impression - }) - } - }).catch(res=>{}) - - }, - to_show_functions: function(e) { - let that = this; - if (this.data.function_show === true) { - this.onfocus() - return false - } - this.setData({ - function_show: true, - maxmessageid: that.data.data[that.data.data.length - 1].id - }) - setTimeout(function() { - wx.pageScrollTo({ - scrollTop: 5000, - }) - }, 50) - // this.get_img() - }, - onfocus: function() { - this.setData({ - function_show: false - }) - setTimeout(function() { - wx.pageScrollTo({ - scrollTop: 0, - }) - }, 50) - }, - - wxParseTagATap: function(e) { - var url = e.currentTarget.dataset.src; - // console.log(e) - wx.navigateTo({ - url: url, - }) - }, - show_video: function(e) { - var src = e.currentTarget.dataset.src; - // this.setData({ - // video_obj:{ - // show:true, - // src: src - // } - // }) - wx.navigateTo({ - url: '../video_show/video_show?src=' + src - }) - }, - -}) \ No newline at end of file diff --git a/pages/chartroom/chartroom.json b/pages/chartroom/chartroom.json deleted file mode 100644 index 0e3e86e..0000000 --- a/pages/chartroom/chartroom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "navigationBarTitleText": "在线聊天", - "enablePullDownRefresh": false, - "usingComponents": { - "header-nav": "../../template/headerNav/index" - } -} \ No newline at end of file diff --git a/pages/chartroom/chartroom.wxml b/pages/chartroom/chartroom.wxml deleted file mode 100644 index f9076f2..0000000 --- a/pages/chartroom/chartroom.wxml +++ /dev/null @@ -1,207 +0,0 @@ - - - - 在线聊天 - - - - - {{ item.name }} - - - - - - - - - {{ item.timestamp }} - - - - - {{ s.nickname }} - - - {{s.message }} - - - - - - - - {{ s.nickname }} - - - {{s.message }} - - - - - - - - - - {{ item.timestamp }} - - - - {{ item.nickname }} - - - - - 房源 - - - {{item.message }} - - - - - - {{item.message }} - - - - - - - - - - - - - {{ item.message.size || "" }} - - - - - - {{ item.message.address }} - - - - - - - - - - - {{ item.nickname }} - - - - - 房源 - - - {{item.message }} - - - - - {{item.message }} - - - - - - - - - - - - {{ item.message.size || "" }} - - - - - - {{ item.message.address }} - - - - - - - - - - - - - - - - - - - 常用 - - - - - - - - -
- 发送 - -
- - 有新消息 - - - - - - - - 图片 - - - - - - 视频 - - - - - - 位置 - - - - - - - - - - 常用回复 - - - {{ item }} - - - - - - 编辑 - - - - - - - diff --git a/pages/chartroom/chartroom.wxss b/pages/chartroom/chartroom.wxss deleted file mode 100644 index 8af448b..0000000 --- a/pages/chartroom/chartroom.wxss +++ /dev/null @@ -1,450 +0,0 @@ -/* pages/replyQuestions/replyQuestions.wxss */ -.nocontent{ - text-align: center; - color: #999; - margin: 20rpx 0; - -} -.container{ - background: #f2f2f2; - height: 100vh; -} - -/*聊天室 */ -.chart-header{ - display: flex; - padding: 0 32rpx ; - font-size: 0; - text-align: center; - border-bottom: 1px solid #e8e8e8; - height: 74px; - box-sizing: border-box; - background: #fff; - align-items: center; - justify-content: space-between; -} -.chart-header .btn{ - display: inline-flex; - width: calc(33.33% - 16rpx); - height: 80rpx; - line-height: 80rpx; - box-sizing: border-box; - border:1px solid #e8e8e8; - border-radius: 5px; - font-size: 30rpx; - color: #666; - position: relative; - justify-content: center; -} - -.chart-header .btn image{ - display: inline-block; - width: 36rpx; - height: 36rpx; - vertical-align: middle; - position: absolute; - left: 16rpx; - top: 22rpx; -} -.chart-header .btn.active{ - background: #62b1fe; - color: #fff; -} -.chart-content{ - height: calc(100vh - 400rpx); - padding:0rpx 0rpx 0rpx; - box-sizing: border-box; - background: #fff; -} -.chart-content2{ - height: calc(100vh - 630rpx); -} - -.chart-content.long{ - height: calc(100vh - 250rpx); -} -.chart-content2.long{ - height: calc(100vh - 480rpx); -} -.content-list{ - padding: 60rpx 32rpx 30rpx; -} -.content-list .times{ - font-size: 26rpx; - color: #ccc; - text-align: center; - margin-bottom: 60rpx; -} -.content-list .avatar{ - width: 64rpx; - height: 64rpx; - display: inline-block; - vertical-align: top; - border-radius: 5px; - z-index: 1000; -} -.content-list .ta,.content-list .wo{ - font-size: 0; - margin-bottom: 60rpx; - position: relative; -} -.content-list .c{ - display: inline-block; - width: calc(100% - 64rpx); - box-sizing: border-box; - padding-left: 20rpx; -} -.content-list .username{ - font-size: 26rpx; - color: #999; -} -.content-list .content{ - margin-top: 20rpx; -} -.content-list .content .article{ - width: 20rpx; - height: 21rpx; - display: inline-block; - vertical-align: middle; - position: relative; - top: -4rpx; - margin-right: 12rpx; -} -.content-list .content .bg{ - display: inline-block; - background: #eeeff3; - font-size: 30rpx; - color: #333; - padding: 20rpx; - border-radius: 5px; - word-break: break-word; -} -.content-list .content .bg view{ - min-height: 38rpx; -} -.content-list .content .pic_bg{ - display: inline-block; - font-size: 30rpx; - color: #333; - padding: 20rpx 0; - border-radius: 5px; - word-break: break-word; -} -.content-list .content .pic_bg image,.content-list .content .pic_bg video{ - max-width:calc(100vw - 148rpx); - border-radius: 5px; - -} -.content-list .content .video{ - width: 160rpx; - height: 160rpx; - background: #62b1fe; - border-radius: 5px; - position: relative; - display: inline-block -} -/* .content-list .wo .video{ - -} */ -.content-list .content .video image{ - width: 60rpx; - height: 60rpx; - position: absolute; - left: 50rpx; - top: 50rpx; -} -.content-list .content .video .num{ - color: #fff; - position: absolute; - bottom: 10rpx; - right: 10rpx; - text-align: right; - font-size: 24rpx; -} -.content-list .content .map{ - width:400rpx; - border-radius: 5px; - display: inline-block; -} -.content-list .content .map .top{ - background: #eeeff3; - color: #333; - padding:0 30rpx; - line-height: 100rpx; - height: 100rpx; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - font-size: 30rpx; - border-radius: 5px 5px 0 0; - text-align: left; - -} -.content-list .content .map image{ - width: 400rpx; - height:145.6rpx; -} -.content-list .wo .bg{ - /* animation: show_content 0.1s 1s ease-out forwards; - overflow: hidden; - position: relative; - width: 0; - height: 0; - left: -80rpx; - top: -60rpx; - z-index: 1; - background: transparent; */ - background: #75cdc1; - color: #fff; -} -.content-list .content .navigator{ - background: #62b1fe !important; - color: #fff; -} -.source{ - font-size: 24rpx; - margin-bottom: 10rpx; -} -.content-list .wo .c{ - padding: 0 20rpx 0 0; -} -.content-list .wo{ - text-align: right; - -} -.content-list .wo .username{ - text-align: right; -} -.content-list .wo .bg{ - text-align: left; - /* animation: show_contentr 0.1s 1s ease-out forwards; - overflow: hidden; - position: relative; - width: 0; - height: 0; - right: -80rpx; - top: -60rpx; - z-index: 1; - background: transparent; */ -} -@keyframes show_content{ - 0%{ - width: 0; - height: 0; - left: -80rpx; - top: -60rpx; - background: transparent; - } - 100%{ - width: auto; - height: auto; - left: 0; - top: 0; - background: #eeeff3; - } -} -@keyframes show_contentr{ - 0%{ - width: 0; - height: 0; - right: -80rpx; - top: -60rpx; - background: transparent; - } - 100%{ - width: auto; - height: auto; - right: 0; - top: 0; - background: #eeeff3; - } -} -.chart-footer{ - box-sizing: border-box; - border-top: 2rpx solid #e8e8e8; - background: #f2f2f2; - display: table; - width: 100vw; - padding: 24rpx 0 16rpx; - line-height: 78rpx; - position: relative; -} -.chart-footer .show_new_msg{ - position: absolute; - top:-80rpx; - right: 30rpx; - color: #1aad19; - z-index: 1000; -} -.chart-footer>view{ - display: table-cell; - vertical-align: top; -} -.chart-footer .l{ - width: 17%; - font-size: 30rpx; - text-align: left; - padding-left: 20rpx; - -} -.chart-footer .c{ - width: 71%; - height: 78rpx; - position: relative; -} -.chart-footer .c .text{ - width: 100%; - box-sizing: border-box; - min-height: 80rpx; - background: #fff; - border:1px solid #e8e8e8; - vertical-align: top; - border-radius: 5px; - /* position: absolute; - left: 0; - top: 0; */ - padding: 6rpx 8rpx 26rpx; - line-height: 44rpx; - height: auto; - max-height: 240rpx; -} -.chart-footer .r{ - width: 12%; - text-align: center; - display: table-cell; -} -.chart-footer .tobottom{ - width: 20rpx; - height: 10rpx; - display: inline-block; -} -.chart-footer .pic{ - width: 43.2rpx; - height: 34.4rpx; - display: inline-block; - position: relative; - top: 4rpx; -} -.chart-footer .plusgrey{ - width: 43.2rpx; - height: 43.2rpx; - display: inline-block; - position: relative; - top: 8rpx; -} -.select-options1 .title{ - text-align: center; - line-height: 160rpx; - color: #333; - font-size: 30rpx; - font-weight: 650; -} -.select-options1 .ul{ - max-height: calc(64vh - 316rpx); - overflow-y: scroll; - -webkit-overflow-scrolling: touch -} -.select-options1 .edit{ - width: 216rpx; - height: 76rpx; - border-radius: 76rpx; - line-height: 76rpx; - text-align: center; - margin: 40rpx auto; - background: #f2f2f2; - font-size: 30rpx; - color: #666; -} -.select-options1 .box .li{ - padding: 31rpx 40rpx; - line-height: 40rpx; -} -.select-options1 .edit image{ - width: 32rpx; - height: 32rpx; - display: inline-block; - position: relative; - top: 3rpx; - margin-right: 4rpx; - float: none; -} -.select-options1 .black{ - height: 36vh; -} -.send_btn{ - font-size: 30rpx; - color: #1aad19 -} -.function-box{ - border-top: 2rpx solid #e8e8e8; - background: #f2f2f2; - padding:30rpx 20rpx 40rpx 20rpx; - display: flex; - align-items: center; - justify-content: flex-start; - height: 114px; - box-sizing: border-box; - -} -.function-box .item{ - display: inline-block; - margin-right: 48rpx; - text-align: center; - color: #999; - font-size: 28rpx; - letter-spacing: 1px; -} -.function-box .item .pic-box{ - width: 110rpx; - height: 110rpx; - border:1px solid #e8e8e8; - background: #fff; - border-radius: 16rpx; - margin-bottom: 10rpx; - position: relative -} -.function-box .item image{ - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%,-50%) -} -.function-box .item .pic{ - width: 54rpx; - height: 43rpx; -} -.function-box .item .video{ - width: 54rpx; - height:54rpx; -} -.function-box .item .location{ - width: 54rpx; - height:54rpx; -} -.back-to-index{ - position: fixed; - right: 20rpx; - bottom: 140rpx; - background:#eb7b78; - border-radius: 50%; - width: 100rpx; - height: 100rpx; - z-index: 1000; -} -.back-to-index.movetop{ - bottom: 380rpx; -} -.back-to-index image{ - width: 56rpx; - height:46rpx; - position: absolute; - left:22rpx; - top: 27rpx; -} - -.page-footer{ - position: fixed; - left: 0; - bottom: 0; - width: 100vw; -} \ No newline at end of file diff --git a/pages/common/common.wxml b/pages/common/common.wxml index 0c10420..1cf521f 100644 --- a/pages/common/common.wxml +++ b/pages/common/common.wxml @@ -181,7 +181,7 @@ - + {{ item.author }} diff --git a/pages/index/index.js b/pages/index/index.js index b626325..4282331 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -41,6 +41,7 @@ Page({ pagevalue: null, // 推荐列表的 value showTOTOP: false, // 返回顶部按钮状态 + HeadSwiperHeight: 0, // 轮播图的最高度 isNewVersions: true, }, @@ -49,7 +50,7 @@ Page({ */ timer: null, onLoad: function (options) { - this.getLocationData() + // this.getLocationData() wx.showLoading() this.get_config() @@ -339,7 +340,6 @@ Page({ } else { areaPopList.splice(indexOf, 1) getLocationList[areaPopId].data[index].pitch = false - } this.setData({ areaPopList, @@ -470,10 +470,6 @@ Page({ targetData }) - // this.getPictureHeight(targetData.image).then(res => { - // altitude += res.actual - // targetData['imageLocal'] = res.path - altitude += (150 / 180 * 337 * ratio) let select = type == 'apartment' ? '#apartment' : '#general' @@ -553,14 +549,17 @@ Page({ // 轮播图的加载事件 loadHeadSwiper(e) { - if (!this.data.HeadSwiperHeight) return let ratio = app.globalData.screen_data['windowWidth'] / 750 let originalWidth = e.detail.width; let originalHeight = e.detail.height; let height = originalHeight / originalWidth * 690 * ratio - this.setData({ - HeadSwiperHeight: height - }) + + if (height > this.data.HeadSwiperHeight) { + this.setData({ + HeadSwiperHeight: height + }) + } + }, diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 2e63769..82170bc 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -10,7 +10,7 @@ - + {{ topTitle }} @@ -26,7 +26,7 @@ - + @@ -106,8 +106,17 @@ - - + + + + + + + + + + + {{ item.name }} @@ -119,13 +128,17 @@ 当前共有 {{ combination[areaIndex] && combination[areaIndex].num }} 个房源 - + + {{ item.name }} + + + @@ -336,7 +349,7 @@ - + @@ -390,7 +403,6 @@